From 091e87aeb3318d4420686f532cf68deb7fbdf753 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sat, 16 Nov 2013 22:30:39 +0100 Subject: [PATCH 1/3] EditEntryWidget: move the URL field beneath the password. --- src/gui/entry/EditEntryWidgetMain.ui | 29 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index d61de074..40347e11 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -34,16 +34,6 @@ - - - - URL: - - - - - - @@ -104,16 +94,26 @@ + + + + + + URL: + + + + - + Expires - + @@ -134,14 +134,14 @@ - + Notes: - + @@ -164,7 +164,6 @@ titleEdit usernameEdit - urlEdit passwordEdit passwordRepeatEdit togglePasswordButton From 9080864167938e8b7b4347d0e4142f4e1ddf7f26 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 17 Nov 2013 10:15:50 +0100 Subject: [PATCH 2/3] Fix tab focus order in ui files. --- src/gui/ChangeMasterKeyWidget.ui | 4 ++-- src/gui/DatabaseSettingsWidget.ui | 6 ++++++ src/gui/EditWidget.ui | 4 ++++ src/gui/EditWidgetIcons.ui | 8 ++++++++ src/gui/EditWidgetProperties.ui | 6 ++++++ src/gui/PasswordGeneratorWidget.ui | 13 +++++++++++++ src/gui/SearchWidget.ui | 7 +++++++ src/gui/SettingsWidgetGeneral.ui | 9 +++++++++ src/gui/SettingsWidgetSecurity.ui | 4 ++++ src/gui/entry/EditEntryWidgetAdvanced.ui | 11 +++++++++++ src/gui/entry/EditEntryWidgetAutoType.ui | 13 +++++++++++++ src/gui/entry/EditEntryWidgetHistory.ui | 7 +++++++ src/gui/entry/EditEntryWidgetMain.ui | 3 ++- src/gui/group/EditGroupWidgetMain.ui | 8 ++++++++ 14 files changed, 100 insertions(+), 3 deletions(-) diff --git a/src/gui/ChangeMasterKeyWidget.ui b/src/gui/ChangeMasterKeyWidget.ui index da758366..712e91f6 100644 --- a/src/gui/ChangeMasterKeyWidget.ui +++ b/src/gui/ChangeMasterKeyWidget.ui @@ -7,7 +7,7 @@ 0 0 438 - 242 + 249 @@ -154,8 +154,8 @@ passwordGroup enterPasswordEdit - repeatPasswordEdit togglePasswordButton + repeatPasswordEdit keyFileGroup keyFileCombo browseKeyFileButton diff --git a/src/gui/DatabaseSettingsWidget.ui b/src/gui/DatabaseSettingsWidget.ui index 95c74c4e..5d1f3d9f 100644 --- a/src/gui/DatabaseSettingsWidget.ui +++ b/src/gui/DatabaseSettingsWidget.ui @@ -188,8 +188,14 @@ dbNameEdit dbDescriptionEdit + transformRoundsSpinBox + transformBenchmarkButton defaultUsernameEdit recycleBinEnabledCheckBox + historyMaxItemsCheckBox + historyMaxItemsSpinBox + historyMaxSizeCheckBox + historyMaxSizeSpinBox buttonBox diff --git a/src/gui/EditWidget.ui b/src/gui/EditWidget.ui index 73885f0f..3891007a 100644 --- a/src/gui/EditWidget.ui +++ b/src/gui/EditWidget.ui @@ -64,6 +64,10 @@
gui/entry/EditEntryWidget_p.h
+ + categoryList + buttonBox + diff --git a/src/gui/EditWidgetIcons.ui b/src/gui/EditWidgetIcons.ui index 4a0d39fc..bbdcebca 100644 --- a/src/gui/EditWidgetIcons.ui +++ b/src/gui/EditWidgetIcons.ui @@ -95,6 +95,14 @@ + + defaultIconsRadio + defaultIconsView + customIconsRadio + customIconsView + addButton + deleteButton + diff --git a/src/gui/EditWidgetProperties.ui b/src/gui/EditWidgetProperties.ui index 04881dfc..24a692e7 100644 --- a/src/gui/EditWidgetProperties.ui +++ b/src/gui/EditWidgetProperties.ui @@ -84,6 +84,12 @@ + + createdEdit + modifiedEdit + accessedEdit + uuidEdit + diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui index c11b124e..2b6d7a69 100644 --- a/src/gui/PasswordGeneratorWidget.ui +++ b/src/gui/PasswordGeneratorWidget.ui @@ -171,6 +171,19 @@ + + checkBoxLower + checkBoxNumbers + checkBoxUpper + checkBoxSpecialChars + checkBoxExcludeAlike + checkBoxEnsureEvery + spinBoxLength + editNewPassword + togglePasswordButton + buttonGenerate + buttonApply + diff --git a/src/gui/SearchWidget.ui b/src/gui/SearchWidget.ui index d6205768..c3d59b8d 100644 --- a/src/gui/SearchWidget.ui +++ b/src/gui/SearchWidget.ui @@ -93,6 +93,13 @@
gui/LineEdit.h
+ + closeSearchButton + searchEdit + caseSensitiveCheckBox + searchCurrentRadioButton + searchRootRadioButton + diff --git a/src/gui/SettingsWidgetGeneral.ui b/src/gui/SettingsWidgetGeneral.ui index 79acad88..8bcefa34 100644 --- a/src/gui/SettingsWidgetGeneral.ui +++ b/src/gui/SettingsWidgetGeneral.ui @@ -78,6 +78,15 @@
autotype/ShortcutWidget.h
+ + rememberLastDatabasesCheckBox + openPreviousDatabasesOnStartupCheckBox + modifiedExpandedChangedCheckBox + autoSaveOnExitCheckBox + autoSaveAfterEveryChangeCheckBox + minimizeOnCopyCheckBox + autoTypeShortcutWidget + diff --git a/src/gui/SettingsWidgetSecurity.ui b/src/gui/SettingsWidgetSecurity.ui index 4c6d45ec..3980b48a 100644 --- a/src/gui/SettingsWidgetSecurity.ui +++ b/src/gui/SettingsWidgetSecurity.ui @@ -36,6 +36,10 @@ + + clearClipboardCheckBox + clearClipboardSpinBox + diff --git a/src/gui/entry/EditEntryWidgetAdvanced.ui b/src/gui/entry/EditEntryWidgetAdvanced.ui index cc4dd224..ff7ccbb7 100644 --- a/src/gui/entry/EditEntryWidgetAdvanced.ui +++ b/src/gui/entry/EditEntryWidgetAdvanced.ui @@ -140,6 +140,17 @@
gui/entry/EditEntryWidget_p.h
+ + attributesView + attributesEdit + addAttributeButton + editAttributeButton + removeAttributeButton + attachmentsView + addAttachmentButton + removeAttachmentButton + saveAttachmentButton + diff --git a/src/gui/entry/EditEntryWidgetAutoType.ui b/src/gui/entry/EditEntryWidgetAutoType.ui index c1245e67..e3288a33 100644 --- a/src/gui/entry/EditEntryWidgetAutoType.ui +++ b/src/gui/entry/EditEntryWidgetAutoType.ui @@ -235,6 +235,19 @@
autotype/WindowSelectComboBox.h
+ + enableButton + inheritSequenceButton + customSequenceButton + sequenceEdit + assocView + windowTitleCombo + defaultWindowSequenceButton + customWindowSequenceButton + windowSequenceEdit + assocAddButton + assocRemoveButton + diff --git a/src/gui/entry/EditEntryWidgetHistory.ui b/src/gui/entry/EditEntryWidgetHistory.ui index 29aec545..1ef452f0 100644 --- a/src/gui/entry/EditEntryWidgetHistory.ui +++ b/src/gui/entry/EditEntryWidgetHistory.ui @@ -64,6 +64,13 @@ + + historyView + showButton + restoreButton + deleteButton + deleteAllButton + diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index 40347e11..5b0001f8 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -165,9 +165,10 @@ titleEdit usernameEdit passwordEdit - passwordRepeatEdit togglePasswordButton + passwordRepeatEdit tooglePasswordGeneratorButton + urlEdit expireCheck expireDatePicker expirePresets diff --git a/src/gui/group/EditGroupWidgetMain.ui b/src/gui/group/EditGroupWidgetMain.ui index 71bc1c96..c528c18a 100644 --- a/src/gui/group/EditGroupWidgetMain.ui +++ b/src/gui/group/EditGroupWidgetMain.ui @@ -77,6 +77,14 @@ + + editName + editNotes + expireCheck + expireDatePicker + searchComboBox + autotypeComboBox + From 755241df5ca492ddf96f3ef904f03ff0f9ae74de Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Sun, 17 Nov 2013 10:55:58 +0100 Subject: [PATCH 3/3] Focus entryView when pressing enter in the search field. --- src/gui/DatabaseWidget.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index e6b8a4e2..d6484478 100644 --- a/src/gui/DatabaseWidget.cpp +++ b/src/gui/DatabaseWidget.cpp @@ -155,6 +155,7 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent) connect(m_searchUi->caseSensitiveCheckBox, SIGNAL(toggled(bool)), this, SLOT(startSearch())); connect(m_searchUi->searchCurrentRadioButton, SIGNAL(toggled(bool)), this, SLOT(startSearch())); connect(m_searchUi->searchRootRadioButton, SIGNAL(toggled(bool)), this, SLOT(startSearch())); + connect(m_searchUi->searchEdit, SIGNAL(returnPressed()), m_entryView, SLOT(setFocus())); connect(m_searchTimer, SIGNAL(timeout()), this, SLOT(search())); connect(closeAction, SIGNAL(triggered()), this, SLOT(closeSearch()));