thooge
/
keepassx1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another bunch of GUI changes 

Auto-save database on program exit: apply adjusted patch #1900048 (closes #1792317)

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@159 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
sniperbeamer 2008-02-24 20:47:28 +00:00
parent fecd1109b3
commit 7b15707c6d
15 changed files with 206 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/KpxConfig.h
View File

@ -78,6 +78,7 @@ public:
bool startLocked(){return settings.value("Options/StartLocked",false).toBool();} bool startLocked(){return settings.value("Options/StartLocked",false).toBool();}
QString mountDir(){return settings.value("Options/MountDir",DEFAULT_MOUNT_DIR).toString();} QString mountDir(){return settings.value("Options/MountDir",DEFAULT_MOUNT_DIR).toString();}
bool openLastFile(){return settings.value("Options/OpenLastFile",true).toBool();} bool openLastFile(){return settings.value("Options/OpenLastFile",true).toBool();}
bool autoSave(){return settings.value("Options/AutoSave",false).toBool();}
QString pwGenCharList(){return settings.value("Options/PwGenCharList").toString();} QString pwGenCharList(){return settings.value("Options/PwGenCharList").toString();}
int pwGenLength(){return settings.value("Options/PwGenLength",25).toInt();} int pwGenLength(){return settings.value("Options/PwGenLength",25).toInt();}
QBitArray pwGenOptions(){return stringToBitArray(settings.value("Options/PwGenOptions","1111100001").toString(),10);} QBitArray pwGenOptions(){return stringToBitArray(settings.value("Options/PwGenOptions","1111100001").toString(),10);}
@ -134,6 +135,7 @@ public:
void setStartLocked(bool value){settings.setValue("Options/StartLocked",value);} void setStartLocked(bool value){settings.setValue("Options/StartLocked",value);}
void setMountDir(const QString& value){settings.setValue("Options/MountDir",value);} void setMountDir(const QString& value){settings.setValue("Options/MountDir",value);}
void setOpenLastFile(bool value){settings.setValue("Options/OpenLastFile",value);} void setOpenLastFile(bool value){settings.setValue("Options/OpenLastFile",value);}
void setAutoSave(bool value){settings.setValue("Options/AutoSave",value);}
void setPwGenCharList(const QString& value){settings.setValue("Options/PwGenCharList",value);} void setPwGenCharList(const QString& value){settings.setValue("Options/PwGenCharList",value);}
void setPwGenLength(int value){settings.setValue("Options/PwGenLength",value);} void setPwGenLength(int value){settings.setValue("Options/PwGenLength",value);}
void setPwGenOptions(const QBitArray& value){settings.setValue("Options/PwGenOptions",bitArrayToString(value));} void setPwGenOptions(const QBitArray& value){settings.setValue("Options/PwGenOptions",bitArrayToString(value));}

23
src/dialogs/AutoTypeDlg.cpp
View File

@ -25,21 +25,25 @@
AutoTypeDlg::AutoTypeDlg(QList<IEntryHandle*> entries, QList<int> numbers){ AutoTypeDlg::AutoTypeDlg(QList<IEntryHandle*> entries, QList<int> numbers){
setupUi(this); setupUi(this);
createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("Auto-Type"),width());
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint); setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint);
setGeometry( QRect(QApplication::desktop()->screenGeometry(QCursor::pos()).center() - rect().center(), size()) ); setGeometry( QRect(QApplication::desktop()->screenGeometry(QCursor::pos()).center() - rect().center(), size()) );
setWindowIcon(getIcon("keepassx")); setWindowIcon(getIcon("keepassx"));
entryList->setAlternatingRowColors(config->alternatingRowColors()); entryList->setAlternatingRowColors(config->alternatingRowColors());
bool hideUsernames = config->hideUsernames();
if (hideUsernames)
entryList->setHeaderLabels(QStringList() << tr("Group") << tr("Title"));
else
entryList->setHeaderLabels(QStringList() << tr("Group") << tr("Title") << tr("Username"));
QList<QTreeWidgetItem*> itemList; QList<QTreeWidgetItem*> itemList;
AutoTypeEntry autoTypeEntry; AutoTypeEntry autoTypeEntry;
for (int i=0; i<entries.size(); i++){ for (int i=0; i<entries.size(); i++){
QStringList cols; QStringList cols;
cols << entries[i]->group()->title() << entries[i]->title(); cols << entries[i]->group()->title() << entries[i]->title();
if (config->hideUsernames()) if (!hideUsernames)
cols << "****";
else
cols << entries[i]->username(); cols << entries[i]->username();
QTreeWidgetItem* widgetItem = new QTreeWidgetItem(cols); QTreeWidgetItem* widgetItem = new QTreeWidgetItem(cols);
@ -55,7 +59,12 @@ AutoTypeDlg::AutoTypeDlg(QList<IEntryHandle*> entries, QList<int> numbers){
entryList->resizeColumnToContents(0); entryList->resizeColumnToContents(0);
entryList->resizeColumnToContents(1); entryList->resizeColumnToContents(1);
entryList->resizeColumnToContents(2); if (!hideUsernames)
entryList->resizeColumnToContents(2);
entryList->setColumnWidth(0, entryList->columnWidth(0)+10);
if (!hideUsernames)
entryList->setColumnWidth(1, entryList->columnWidth(1)+10);
connect(ButtonBox, SIGNAL(rejected()), SLOT(close())); connect(ButtonBox, SIGNAL(rejected()), SLOT(close()));
connect(entryList, SIGNAL(itemClicked(QTreeWidgetItem*,int)), SLOT(itemSelected(QTreeWidgetItem*))); connect(entryList, SIGNAL(itemClicked(QTreeWidgetItem*,int)), SLOT(itemSelected(QTreeWidgetItem*)));
@ -77,6 +86,10 @@ void AutoTypeDlg::paintEvent(QPaintEvent* event){
painter.drawPixmap(QPoint(0,0),BannerPixmap); painter.drawPixmap(QPoint(0,0),BannerPixmap);
} }
void AutoTypeDlg::resizeEvent(QResizeEvent* event){
createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("Auto-Type"),width());
}
void AutoTypeDlg::itemSelected(QTreeWidgetItem* item){ void AutoTypeDlg::itemSelected(QTreeWidgetItem* item){
close(); close();
QString err; QString err;

1
src/dialogs/AutoTypeDlg.h
View File

@ -29,6 +29,7 @@ class AutoTypeDlg : public QWidget, private Ui::AutoTypeDlg
protected: protected:
void paintEvent(QPaintEvent* event); void paintEvent(QPaintEvent* event);
void resizeEvent(QResizeEvent* event);
private slots: private slots:
void itemSelected(QTreeWidgetItem* item); void itemSelected(QTreeWidgetItem* item);

6
src/dialogs/ManageBookmarksDlg.cpp
View File

@ -26,7 +26,6 @@
ManageBookmarksDlg::ManageBookmarksDlg(QWidget* parent):QDialog(parent) ManageBookmarksDlg::ManageBookmarksDlg(QWidget* parent):QDialog(parent)
{ {
setupUi(this); setupUi(this);
createBanner(&BannerPixmap,getPixmap("bookmark"),tr("Manage Bookmarks"),width());
for(int i=0;i<KpxBookmarks::count();i++){ for(int i=0;i<KpxBookmarks::count();i++){
QListWidgetItem* item=new QListWidgetItem(ListWidget); QListWidgetItem* item=new QListWidgetItem(ListWidget);
@ -55,7 +54,10 @@ void ManageBookmarksDlg::paintEvent(QPaintEvent *event){
painter.drawPixmap(QPoint(0,0),BannerPixmap); painter.drawPixmap(QPoint(0,0),BannerPixmap);
} }
void ManageBookmarksDlg::resizeEvent(QResizeEvent* event){
createBanner(&BannerPixmap,getPixmap("bookmark"),tr("Manage Bookmarks"),width());
QDialog::resizeEvent(event);
}
void ManageBookmarksDlg::OnButtonAdd(){ void ManageBookmarksDlg::OnButtonAdd(){
AddBookmarkDlg dlg(this); AddBookmarkDlg dlg(this);

1
src/dialogs/ManageBookmarksDlg.h
View File

@ -35,6 +35,7 @@ class ManageBookmarksDlg : public QDialog, private Ui::ManageBookmarksDlg
private: private:
QPixmap BannerPixmap; QPixmap BannerPixmap;
virtual void paintEvent(QPaintEvent*); virtual void paintEvent(QPaintEvent*);
virtual void resizeEvent(QResizeEvent*);
virtual void closeEvent(QCloseEvent* event); virtual void closeEvent(QCloseEvent* event);
private slots: private slots:
void OnButtonAdd(); void OnButtonAdd();

2
src/dialogs/SettingsDlg.cpp
View File

@ -79,6 +79,7 @@ CSettingsDlg::CSettingsDlg(QWidget* parent):QDialog(parent,Qt::Dialog)
CheckBox_StartMinimized->setChecked(config->startMinimized()); CheckBox_StartMinimized->setChecked(config->startMinimized());
CheckBox_StartLocked->setChecked(config->startLocked()); CheckBox_StartLocked->setChecked(config->startLocked());
checkBox_SaveFileDlgHistory->setChecked(config->saveFileDlgHistory()); checkBox_SaveFileDlgHistory->setChecked(config->saveFileDlgHistory());
CheckBox_AutoSave->setChecked(config->autoSave());
checkBox_AskBeforeDelete->setChecked(config->askBeforeDelete()); checkBox_AskBeforeDelete->setChecked(config->askBeforeDelete());
switch(config->groupTreeState()){ switch(config->groupTreeState()){
@ -211,6 +212,7 @@ void CSettingsDlg::apply(){
else config->setGroupTreeState(KpxConfig::DoNothing); else config->setGroupTreeState(KpxConfig::DoNothing);
config->setOpenLastFile(CheckBox_OpenLast->isChecked()); config->setOpenLastFile(CheckBox_OpenLast->isChecked());
config->setRememberLastKey(CheckBox_RememberLastKey->isChecked()); config->setRememberLastKey(CheckBox_RememberLastKey->isChecked());
config->setAutoSave(CheckBox_AutoSave->isChecked());
config->setAskBeforeDelete(checkBox_AskBeforeDelete->isChecked()); config->setAskBeforeDelete(checkBox_AskBeforeDelete->isChecked());
//Appearence //Appearence

22
src/forms/AutoTypeDlg.ui
View File

@ -5,7 +5,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>502</width> <width>439</width>
<height>300</height> <height>300</height>
</rect> </rect>
</property> </property>
@ -23,7 +23,7 @@
</property> </property>
<property name="sizeHint" > <property name="sizeHint" >
<size> <size>
<width>481</width> <width>1</width>
<height>50</height> <height>50</height>
</size> </size>
</property> </property>
@ -50,21 +50,9 @@
<property name="allColumnsShowFocus" > <property name="allColumnsShowFocus" >
<bool>true</bool> <bool>true</bool>
</property> </property>
<column> <property name="columnCount" >
<property name="text" > <number>0</number>
<string>Group</string> </property>
</property>
</column>
<column>
<property name="text" >
<string>Title</string>
</property>
</column>
<column>
<property name="text" >
<string>Username</string>
</property>
</column>
</widget> </widget>
</item> </item>
<item> <item>

8
src/forms/EditEntryDlg.ui
View File

@ -556,11 +556,15 @@
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11" />
<tabstops> <tabstops>
<tabstop>Combo_Group</tabstop>
<tabstop>Button_Icons</tabstop>
<tabstop>Edit_Title</tabstop> <tabstop>Edit_Title</tabstop>
<tabstop>Edit_UserName</tabstop> <tabstop>Edit_UserName</tabstop>
<tabstop>Edit_URL</tabstop> <tabstop>Edit_URL</tabstop>
<tabstop>Edit_Password</tabstop> <tabstop>Edit_Password</tabstop>
<tabstop>ButtonEchoMode</tabstop>
<tabstop>Edit_Password_w</tabstop> <tabstop>Edit_Password_w</tabstop>
<tabstop>ButtonGenPw</tabstop>
<tabstop>Edit_Comment</tabstop> <tabstop>Edit_Comment</tabstop>
<tabstop>DateTime_Expire</tabstop> <tabstop>DateTime_Expire</tabstop>
<tabstop>ButtonExpirePresets</tabstop> <tabstop>ButtonExpirePresets</tabstop>
@ -569,11 +573,7 @@
<tabstop>ButtonOpenAttachment</tabstop> <tabstop>ButtonOpenAttachment</tabstop>
<tabstop>ButtonSaveAttachment</tabstop> <tabstop>ButtonSaveAttachment</tabstop>
<tabstop>ButtonDeleteAttachment</tabstop> <tabstop>ButtonDeleteAttachment</tabstop>
<tabstop>ButtonEchoMode</tabstop>
<tabstop>ButtonGenPw</tabstop>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
<tabstop>Combo_Group</tabstop>
<tabstop>Button_Icons</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

50
src/forms/MainWindow.ui
View File

@ -154,7 +154,7 @@
</widget> </widget>
<widget class="QMenu" name="menuBookmarks" > <widget class="QMenu" name="menuBookmarks" >
<property name="title" > <property name="title" >
<string>Bookmarks</string> <string>&amp;Bookmarks</string>
</property> </property>
</widget> </widget>
<addaction name="FileNewAction" /> <addaction name="FileNewAction" />
@ -202,7 +202,7 @@
</property> </property>
<widget class="QMenu" name="menuTool_Button_Sizes" > <widget class="QMenu" name="menuTool_Button_Sizes" >
<property name="title" > <property name="title" >
<string>Toolbar Icon Size</string> <string>&amp;Toolbar Icon Size</string>
</property> </property>
<addaction name="ViewToolButtonSize16Action" /> <addaction name="ViewToolButtonSize16Action" />
<addaction name="ViewToolButtonSize22Action" /> <addaction name="ViewToolButtonSize22Action" />
@ -210,7 +210,7 @@
</widget> </widget>
<widget class="QMenu" name="menuColumns" > <widget class="QMenu" name="menuColumns" >
<property name="title" > <property name="title" >
<string>Columns</string> <string>&amp;Columns</string>
</property> </property>
<addaction name="ViewColumnsGroupAction" /> <addaction name="ViewColumnsGroupAction" />
<addaction name="separator" /> <addaction name="separator" />
@ -253,7 +253,7 @@
</widget> </widget>
<action name="ManageBookmarksAction" > <action name="ManageBookmarksAction" >
<property name="text" > <property name="text" >
<string>Manage Bookmarks...</string> <string>&amp;Manage Bookmarks...</string>
</property> </property>
</action> </action>
<action name="FileOpenAction" > <action name="FileOpenAction" >
@ -366,7 +366,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Show Entry Details</string> <string>Show &amp;Entry Details</string>
</property> </property>
</action> </action>
<action name="ViewHideUsernamesAction" > <action name="ViewHideUsernamesAction" >
@ -374,7 +374,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Hide Usernames</string> <string>Hide &amp;Usernames</string>
</property> </property>
</action> </action>
<action name="ViewHidePasswordsAction" > <action name="ViewHidePasswordsAction" >
@ -382,7 +382,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Hide Passwords</string> <string>Hide &amp;Passwords</string>
</property> </property>
</action> </action>
<action name="ViewColumnsTitleAction" > <action name="ViewColumnsTitleAction" >
@ -390,7 +390,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Title</string> <string>&amp;Title</string>
</property> </property>
</action> </action>
<action name="ViewColumnsUsernameAction" > <action name="ViewColumnsUsernameAction" >
@ -398,7 +398,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Username</string> <string>User&amp;name</string>
</property> </property>
</action> </action>
<action name="ViewColumnsUrlAction" > <action name="ViewColumnsUrlAction" >
@ -406,7 +406,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>URL</string> <string>&amp;URL</string>
</property> </property>
</action> </action>
<action name="ViewColumnsPasswordAction" > <action name="ViewColumnsPasswordAction" >
@ -414,7 +414,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Password</string> <string>&amp;Password</string>
</property> </property>
</action> </action>
<action name="ViewColumnsCommentAction" > <action name="ViewColumnsCommentAction" >
@ -422,7 +422,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Comment</string> <string>&amp;Comment</string>
</property> </property>
</action> </action>
<action name="ViewColumnsExpireAction" > <action name="ViewColumnsExpireAction" >
@ -430,7 +430,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Expires</string> <string>E&amp;xpires</string>
</property> </property>
</action> </action>
<action name="ViewColumnsCreationAction" > <action name="ViewColumnsCreationAction" >
@ -438,7 +438,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Creation</string> <string>C&amp;reation</string>
</property> </property>
</action> </action>
<action name="ViewColumnsLastChangeAction" > <action name="ViewColumnsLastChangeAction" >
@ -446,7 +446,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Last Change</string> <string>&amp;Last Change</string>
</property> </property>
</action> </action>
<action name="ViewColumnsLastAccessAction" > <action name="ViewColumnsLastAccessAction" >
@ -454,7 +454,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Last Access</string> <string>Last &amp;Access</string>
</property> </property>
</action> </action>
<action name="ViewColumnsAttachmentAction" > <action name="ViewColumnsAttachmentAction" >
@ -462,7 +462,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Attachment</string> <string>A&amp;ttachment</string>
</property> </property>
</action> </action>
<action name="ExtrasSettingsAction" > <action name="ExtrasSettingsAction" >
@ -480,7 +480,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Show Statusbar</string> <string>Show &amp;Statusbar</string>
</property> </property>
</action> </action>
<action name="HelpHandbookAction" > <action name="HelpHandbookAction" >
@ -506,7 +506,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>16x16</string> <string>&amp;16x16</string>
</property> </property>
</action> </action>
<action name="ViewToolButtonSize22Action" > <action name="ViewToolButtonSize22Action" >
@ -514,7 +514,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>22x22</string> <string>&amp;22x22</string>
</property> </property>
</action> </action>
<action name="ViewToolButtonSize28Action" > <action name="ViewToolButtonSize28Action" >
@ -522,7 +522,7 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>28x28</string> <string>2&amp;8x28</string>
</property> </property>
</action> </action>
<action name="FileNewKdbAction" > <action name="FileNewKdbAction" >
@ -553,12 +553,12 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text" >
<string>Group (search results only)</string> <string>&amp;Group (search results only)</string>
</property> </property>
</action> </action>
<action name="ExtrasShowExpiredEntriesAction" > <action name="ExtrasShowExpiredEntriesAction" >
<property name="text" > <property name="text" >
<string>Show Expired Entries...</string> <string>Show &amp;Expired Entries...</string>
</property> </property>
</action> </action>
<action name="ExtrasTrashCanAction" > <action name="ExtrasTrashCanAction" >
@ -571,12 +571,12 @@
</action> </action>
<action name="AddBookmarkAction" > <action name="AddBookmarkAction" >
<property name="text" > <property name="text" >
<string>Add Bookmark...</string> <string>&amp;Add Bookmark...</string>
</property> </property>
</action> </action>
<action name="AddThisAsBookmarkAction" > <action name="AddThisAsBookmarkAction" >
<property name="text" > <property name="text" >
<string>Bookmark this Database...</string> <string>Bookmark &amp;this Database...</string>
</property> </property>
</action> </action>
</widget> </widget>

3
src/forms/PasswordDlg.ui
View File

@ -317,12 +317,13 @@
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11" />
<tabstops> <tabstops>
<tabstop>Edit_Password</tabstop> <tabstop>Edit_Password</tabstop>
<tabstop>ButtonChangeEchoMode</tabstop>
<tabstop>Edit_PasswordRep</tabstop> <tabstop>Edit_PasswordRep</tabstop>
<tabstop>Combo_Dirs</tabstop> <tabstop>Combo_Dirs</tabstop>
<tabstop>ButtonBrowse</tabstop> <tabstop>ButtonBrowse</tabstop>
<tabstop>CheckBox_Both</tabstop> <tabstop>CheckBox_Both</tabstop>
<tabstop>ButtonBox</tabstop>
<tabstop>Button_Bookmarks</tabstop> <tabstop>Button_Bookmarks</tabstop>
<tabstop>ButtonChangeEchoMode</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

138
src/forms/PasswordGenDlg.ui
View File

@ -10,9 +10,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Maximum" hsizetype="Maximum" >
<hsizetype>4</hsizetype>
<vsizetype>4</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -21,12 +19,21 @@
<string>Password Generator</string> <string>Password Generator</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@ -49,12 +56,21 @@
<string>Options</string> <string>Options</string>
</property> </property>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>9</number>
</property>
<property name="topMargin" >
<number>9</number>
</property>
<property name="rightMargin" >
<number>9</number>
</property>
<property name="bottomMargin" >
<number>9</number>
</property>
<item> <item>
<widget class="QRadioButton" name="Radio_1" > <widget class="QRadioButton" name="Radio_1" >
<property name="text" > <property name="text" >
@ -67,12 +83,21 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@ -91,10 +116,22 @@
</item> </item>
<item> <item>
<layout class="QGridLayout" > <layout class="QGridLayout" >
<property name="margin" > <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0" >
@ -202,12 +239,21 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@ -251,12 +297,21 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="textLabel1" > <widget class="QLabel" name="textLabel1" >
<property name="text" > <property name="text" >
@ -266,12 +321,12 @@
</item> </item>
<item> <item>
<widget class="QSpinBox" name="Spin_Num" > <widget class="QSpinBox" name="Spin_Num" >
<property name="maximum" >
<number>10000</number>
</property>
<property name="minimum" > <property name="minimum" >
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum" >
<number>10000</number>
</property>
<property name="value" > <property name="value" >
<number>20</number> <number>20</number>
</property> </property>
@ -303,9 +358,7 @@
<item> <item>
<widget class="QProgressBar" name="Progress_Quali" > <widget class="QProgressBar" name="Progress_Quali" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
<hsizetype>7</hsizetype>
<vsizetype>1</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -331,12 +384,21 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<widget class="QCheckBox" name="Check_CollectEntropy" > <widget class="QCheckBox" name="Check_CollectEntropy" >
<property name="text" > <property name="text" >
@ -393,12 +455,21 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" > <layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="textLabel4" > <widget class="QLabel" name="textLabel4" >
<property name="text" > <property name="text" >
@ -445,6 +516,7 @@
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11" />
<tabstops> <tabstops>
<tabstop>DialogButtons</tabstop>
<tabstop>Radio_1</tabstop> <tabstop>Radio_1</tabstop>
<tabstop>checkBox1</tabstop> <tabstop>checkBox1</tabstop>
<tabstop>checkBox2</tabstop> <tabstop>checkBox2</tabstop>
@ -455,7 +527,9 @@
<tabstop>checkBox7</tabstop> <tabstop>checkBox7</tabstop>
<tabstop>Radio_2</tabstop> <tabstop>Radio_2</tabstop>
<tabstop>Edit_chars</tabstop> <tabstop>Edit_chars</tabstop>
<tabstop>Spin_Num</tabstop>
<tabstop>Check_CollectEntropy</tabstop> <tabstop>Check_CollectEntropy</tabstop>
<tabstop>Check_CollectOncePerSession</tabstop>
<tabstop>Edit_dest</tabstop> <tabstop>Edit_dest</tabstop>
<tabstop>ButtonGenerate</tabstop> <tabstop>ButtonGenerate</tabstop>
</tabstops> </tabstops>

2
src/forms/SearchDlg.ui
View File

@ -270,12 +270,14 @@
<tabstop>Edit_Search</tabstop> <tabstop>Edit_Search</tabstop>
<tabstop>checkBox_Cs</tabstop> <tabstop>checkBox_Cs</tabstop>
<tabstop>checkBox_regExp</tabstop> <tabstop>checkBox_regExp</tabstop>
<tabstop>checkBox_Recursive</tabstop>
<tabstop>checkBox_Title</tabstop> <tabstop>checkBox_Title</tabstop>
<tabstop>checkBox_Username</tabstop> <tabstop>checkBox_Username</tabstop>
<tabstop>checkBox_Password</tabstop> <tabstop>checkBox_Password</tabstop>
<tabstop>checkBox_Comment</tabstop> <tabstop>checkBox_Comment</tabstop>
<tabstop>checkBox_URL</tabstop> <tabstop>checkBox_URL</tabstop>
<tabstop>checkBox_Attachment</tabstop> <tabstop>checkBox_Attachment</tabstop>
<tabstop>ButtonBox</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>

14
src/forms/SettingsDlg.ui
View File

@ -299,6 +299,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QCheckBox" name="CheckBox_AutoSave" >
<property name="text" >
<string>Automatically save database on exit</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QCheckBox" name="checkBox_AskBeforeDelete" > <widget class="QCheckBox" name="checkBox_AskBeforeDelete" >
<property name="text" > <property name="text" >
@ -1280,7 +1287,7 @@
<item> <item>
<widget class="QCheckBox" name="CheckBox_EntryTitlesMatch" > <widget class="QCheckBox" name="CheckBox_EntryTitlesMatch" >
<property name="text" > <property name="text" >
<string>Use entry titles to match the window for Global Auto-Type</string> <string>Use entries' title to match the window for Global Auto-Type</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1352,6 +1359,11 @@
<tabstop>IntPlugin_Button_Config</tabstop> <tabstop>IntPlugin_Button_Config</tabstop>
<tabstop>SpinBox_AutoTypePreGap</tabstop> <tabstop>SpinBox_AutoTypePreGap</tabstop>
<tabstop>SpinBox_AutoTypeKeyStrokeDelay</tabstop> <tabstop>SpinBox_AutoTypeKeyStrokeDelay</tabstop>
<tabstop>Box_BrowserCmd</tabstop>
<tabstop>Edit_BrowserCmd</tabstop>
<tabstop>Button_BrowserCmdBrowse</tabstop>
<tabstop>Edit_MountDir</tabstop>
<tabstop>Button_MountDirBrowse</tabstop>
<tabstop>CheckBox_SaveRelativePaths</tabstop> <tabstop>CheckBox_SaveRelativePaths</tabstop>
<tabstop>Edit_GlobalShortcut</tabstop> <tabstop>Edit_GlobalShortcut</tabstop>
<tabstop>CheckBox_EntryTitlesMatch</tabstop> <tabstop>CheckBox_EntryTitlesMatch</tabstop>

24
src/mainwindow.cpp
View File

@ -38,7 +38,7 @@
#include <QStatusBar> #include <QStatusBar>
#include "KpxFirefox.h" //#include "KpxFirefox.h"
#include "lib/random.h" #include "lib/random.h"
#include "lib/AutoType.h" #include "lib/AutoType.h"
#include "lib/FileDialogs.h" #include "lib/FileDialogs.h"
@ -357,8 +357,9 @@ void KeepassMainWindow::setupMenus(){
_add_export(export_Txt); _add_export(export_Txt);
_add_export(export_KeePassX_Xml); _add_export(export_KeePassX_Xml);
//FileNewMenu->setShortcut(tr("Ctrl+N")); FileNewAction->setShortcut(tr("Ctrl+N"));
FileOpenAction->setShortcut(tr("Ctrl+O")); FileOpenAction->setShortcut(tr("Ctrl+O"));
FileCloseAction->setShortcut(tr("Ctrl+W"));
FileSaveAction->setShortcut(tr("Ctrl+S")); FileSaveAction->setShortcut(tr("Ctrl+S"));
FileUnLockWorkspaceAction->setShortcut(tr("Ctrl+L")); FileUnLockWorkspaceAction->setShortcut(tr("Ctrl+L"));
FileExitAction->setShortcut(tr("Ctrl+Q")); FileExitAction->setShortcut(tr("Ctrl+Q"));
@ -371,11 +372,12 @@ void KeepassMainWindow::setupMenus(){
EditDeleteEntryAction->setShortcut(tr("Ctrl+D")); EditDeleteEntryAction->setShortcut(tr("Ctrl+D"));
EditCloneEntryAction->setShortcut(tr("Ctrl+K")); EditCloneEntryAction->setShortcut(tr("Ctrl+K"));
EditSearchAction->setShortcut(tr("Ctrl+F")); EditSearchAction->setShortcut(tr("Ctrl+F"));
ExtrasPasswordGenAction->setShortcut(tr("Ctrl+P"));
ExtrasShowExpiredEntriesAction->setShortcut(tr("Ctrl+X"));
#ifdef AUTOTYPE #ifdef AUTOTYPE
EditAutoTypeAction->setShortcut(tr("Ctrl+V")); EditAutoTypeAction->setShortcut(tr("Ctrl+V"));
#endif #endif
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
FileCloseAction->setShortcut(tr("Ctrl+W"));
FileSaveAsAction->setShortcut(tr("Shift+Ctrl+S")); FileSaveAsAction->setShortcut(tr("Shift+Ctrl+S"));
EditGroupSearchAction->setShortcut(tr("Shift+Ctrl+F")); EditGroupSearchAction->setShortcut(tr("Shift+Ctrl+F"));
#endif #endif
@ -471,11 +473,17 @@ bool KeepassMainWindow::closeDatabase(bool lock){
Q_ASSERT(FileOpen); Q_ASSERT(FileOpen);
Q_ASSERT(db!=NULL); Q_ASSERT(db!=NULL);
if(ModFlag){ if(ModFlag){
int r=QMessageBox::question(this,tr("Save modified file?"), if(config->autoSave()){
tr("The current file was modified. Do you want\nto save the changes?"),tr("Yes"),tr("No"),tr("Cancel"),2,2); if(!OnFileSave()) return false;
if(r==2)return false; //Abbrechen }
if(r==0) //Ja (Datei speichern) else{
if(!OnFileSave())return false; QMessageBox::StandardButton r=QMessageBox::question(this,tr("Save modified file?"),
tr("The current file was modified. Do you want\nto save the changes?"),
QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel, QMessageBox::Yes);
if(r==QMessageBox::Cancel) return false; //Cancel
if(r==QMessageBox::Yes) //Yes (Save file)
if(!OnFileSave()) return false;
}
} }
db->close(); db->close();
delete db; delete db;

13
todo
View File

@ -1,8 +1,5 @@
Database: Mass modify entries
-need to change the interface of the generic Database class so that no direct references Backup group (exclude from search)
or pointers to group or entry objects are used: Improve password generator
1. approach: CEntry e=getEntry( ...by any attrib...); //get a COPY Manually select language
e.Title="Blubb"; kde4 plugin: clear klipper history
setEntey(e);
2. approach: EntryID id=getEntryID(...by any attrib...); //get an ID (maybe the list index)
setEntryTitle(id,"Blubb");