diff --git a/src/forms/AboutDlg.ui b/src/forms/AboutDlg.ui index b53c153..eb41709 100644 --- a/src/forms/AboutDlg.ui +++ b/src/forms/AboutDlg.ui @@ -34,18 +34,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -75,18 +63,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -137,18 +113,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -167,18 +131,6 @@ - - 0 - - - 0 - - - 0 - - - 0 - @@ -216,18 +168,6 @@ General Public License (GPL) version 2. 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -245,18 +185,6 @@ General Public License (GPL) version 2. 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -274,18 +202,6 @@ General Public License (GPL) version 2. 6 - - 9 - - - 9 - - - 9 - - - 9 - diff --git a/src/forms/CalendarDlg.ui b/src/forms/CalendarDlg.ui index b47ffe8..1e2093f 100644 --- a/src/forms/CalendarDlg.ui +++ b/src/forms/CalendarDlg.ui @@ -13,9 +13,6 @@ Calendar - - 9 - 6 diff --git a/src/forms/CollectEntropyDlg.ui b/src/forms/CollectEntropyDlg.ui index 02ae961..e241704 100644 --- a/src/forms/CollectEntropyDlg.ui +++ b/src/forms/CollectEntropyDlg.ui @@ -10,9 +10,7 @@ - - 4 - 4 + 0 0 @@ -27,9 +25,6 @@ Random Number Generator - - 9 - 6 @@ -52,9 +47,7 @@ - - 5 - 4 + 0 0 @@ -87,9 +80,7 @@ Please move the mouse and/or press some keys until enought entropy for a reseed - - 5 - 0 + 0 0 @@ -111,9 +102,6 @@ Please move the mouse and/or press some keys until enought entropy for a reseed - - 9 - 6 @@ -136,9 +124,7 @@ Please move the mouse and/or press some keys until enought entropy for a reseed - - 0 - 0 + 0 0 @@ -177,9 +163,6 @@ Please move the mouse and/or press some keys until enought entropy for a reseed - - 9 - 6 diff --git a/src/forms/CustomizeDetailViewDlg.ui b/src/forms/CustomizeDetailViewDlg.ui index e1cced5..c228e9a 100644 --- a/src/forms/CustomizeDetailViewDlg.ui +++ b/src/forms/CustomizeDetailViewDlg.ui @@ -16,18 +16,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -41,35 +29,11 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -321,18 +285,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - diff --git a/src/forms/EditEntryDlg.ui b/src/forms/EditEntryDlg.ui index 33849c4..85bc0d8 100644 --- a/src/forms/EditEntryDlg.ui +++ b/src/forms/EditEntryDlg.ui @@ -20,18 +20,6 @@ true - - 9 - - - 9 - - - 9 - - - 9 - 6 @@ -40,18 +28,6 @@ - - 0 - - - 0 - - - 0 - - - 0 - 6 @@ -287,18 +263,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -367,18 +331,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -412,18 +364,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -466,18 +406,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - diff --git a/src/forms/EditGroupDlg.ui b/src/forms/EditGroupDlg.ui index c4468eb..f5f85e5 100644 --- a/src/forms/EditGroupDlg.ui +++ b/src/forms/EditGroupDlg.ui @@ -35,32 +35,8 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - - - 0 - - - 0 - - - 0 - - - 0 - 6 @@ -136,7 +112,6 @@ EditTitle ComboIconPicker - diff --git a/src/forms/ExpiredEntriesDlg.ui b/src/forms/ExpiredEntriesDlg.ui index e9bb679..761b96f 100644 --- a/src/forms/ExpiredEntriesDlg.ui +++ b/src/forms/ExpiredEntriesDlg.ui @@ -13,9 +13,6 @@ Expired Entries - - 9 - 6 diff --git a/src/forms/MainWindow.ui b/src/forms/MainWindow.ui index 670da92..25f569c 100644 --- a/src/forms/MainWindow.ui +++ b/src/forms/MainWindow.ui @@ -18,21 +18,6 @@ - - 6 - - - 9 - - - 9 - - - 9 - - - 9 - diff --git a/src/forms/PasswordDlg.ui b/src/forms/PasswordDlg.ui index a0575a5..200a6cc 100644 --- a/src/forms/PasswordDlg.ui +++ b/src/forms/PasswordDlg.ui @@ -128,32 +128,8 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - 6 @@ -200,18 +176,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -261,18 +225,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - diff --git a/src/forms/PasswordGenDlg.ui b/src/forms/PasswordGenDlg.ui index ad70f81..42926e3 100644 --- a/src/forms/PasswordGenDlg.ui +++ b/src/forms/PasswordGenDlg.ui @@ -22,18 +22,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -59,18 +47,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -86,18 +62,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -116,18 +80,6 @@ - - 0 - - - 0 - - - 0 - - - 0 - 6 @@ -242,18 +194,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -300,18 +240,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -387,18 +315,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -458,18 +374,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - diff --git a/src/forms/SearchDlg.ui b/src/forms/SearchDlg.ui index 570e9a8..76a4248 100644 --- a/src/forms/SearchDlg.ui +++ b/src/forms/SearchDlg.ui @@ -34,18 +34,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -64,18 +52,6 @@ - - 0 - - - 0 - - - 0 - - - 0 - 4 @@ -104,18 +80,6 @@ Include: - - 9 - - - 9 - - - 9 - - - 9 - 6 @@ -190,18 +154,6 @@ 0 - - 0 - - - 0 - - - 0 - - - 0 - diff --git a/src/forms/SettingsDlg.ui b/src/forms/SettingsDlg.ui index cbe7552..6b8adcc 100644 --- a/src/forms/SettingsDlg.ui +++ b/src/forms/SettingsDlg.ui @@ -19,18 +19,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -242,18 +230,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -336,18 +312,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -357,32 +321,8 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - - - 0 - - - 0 - - - 0 - - - 0 - 6 @@ -636,18 +576,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -674,18 +602,6 @@ - - 0 - - - 0 - - - 0 - - - 0 - 6 @@ -760,18 +676,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -787,18 +691,6 @@ 0 - - 9 - - - 9 - - - 9 - - - 9 - @@ -824,18 +716,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -947,18 +827,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -990,18 +858,6 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - @@ -1031,18 +887,6 @@ 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -1095,36 +939,12 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - Auto-Type Fine Tuning - - 9 - - - 9 - - - 9 - - - 9 - 6 diff --git a/src/forms/SimplePasswordDlg.ui b/src/forms/SimplePasswordDlg.ui index ee2c1be..87656b9 100644 --- a/src/forms/SimplePasswordDlg.ui +++ b/src/forms/SimplePasswordDlg.ui @@ -34,35 +34,11 @@ 6 - - 9 - - - 9 - - - 9 - - - 9 - 6 - - 0 - - - 0 - - - 0 - - - 0 - @@ -125,7 +101,6 @@ - diff --git a/src/main.cpp b/src/main.cpp index 22efab0..db219fd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -101,6 +101,8 @@ int main(int argc, char **_argv) #if defined Q_WS_MACX DataDir=AppDir+"/../Resources/keepassx"; +#elif defined Q_WS_WIN + DataDir=AppDir+"/share"; #else DataDir=AppDir+"/../share/keepassx"; #endif diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 412482f..64d6849 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -77,6 +77,7 @@ KeepassMainWindow::KeepassMainWindow(const QString& ArgFile,bool ArgMin,bool Arg IsLocked=false; InUnLock=false; unlockDlg=NULL; + db=NULL; setupUi(this); #ifdef Q_WS_MAC setUnifiedTitleAndToolBarOnMac(true); diff --git a/src/src.pro b/src/src.pro index 1f67fb8..3b1096e 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,5 +1,5 @@ -CONFIG = qt uic resources thread stl warn_off release +CONFIG = qt uic resources thread stl warn_off QT += xml DEPENDPATH += crypto dialogs export forms import lib translations res @@ -11,14 +11,18 @@ OBJECTS_DIR = ../build RCC_DIR = ../build/rcc isEqual(DEBUG,1) { - CONFIG += debug + CONFIG += debug +} +else { + CONFIG += release } +win32:QMAKE_WIN32 = 1 #------------------------------------------------------------------------------- # Platform Specific: Unix (except MacOS X) #------------------------------------------------------------------------------- -unix : !macx { +unix : !macx : !isEqual(QMAKE_WIN32,1) { isEmpty(PREFIX):PREFIX = /usr !isEqual(AUTOTYPE,0) { DEFINES += AUTOTYPE @@ -74,7 +78,7 @@ macx { #------------------------------------------------------------------------------- # Platform Specific: Windows #------------------------------------------------------------------------------- -win32 { +isEqual(QMAKE_WIN32,1) { CONFIG += windows isEmpty(PREFIX):PREFIX = "C:/Program files/KeePassX" TARGET = ../bin/KeePassX @@ -179,7 +183,7 @@ HEADERS += lib/UrlLabel.h \ # plugins/interfaces/IGnomeInit.h \ plugins/interfaces/IIconTheme.h \ KpxConfig.h \ -# KpxFirefox.h \ +# KpxFirefox.h \ dialogs/AddBookmarkDlg.h \ lib/bookmarks.h \ dialogs/ManageBookmarksDlg.h