diff --git a/src/gui/ChangeMasterKeyWidget.ui b/src/gui/ChangeMasterKeyWidget.ui index da7583666..712e91f65 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 95c74c4e4..5d1f3d9f1 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/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp index e6b8a4e27..d6484478d 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())); diff --git a/src/gui/EditWidget.ui b/src/gui/EditWidget.ui index 73885f0f0..3891007a1 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 4a0d39fc2..bbdcebca5 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 04881dfca..24a692e73 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 c11b124e9..2b6d7a69f 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 d6205768a..c3d59b8d1 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 79acad88b..8bcefa342 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 4c6d45ecb..3980b48a1 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 cc4dd2242..ff7ccbb73 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 c1245e67c..e3288a33f 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 29aec5453..1ef452f09 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 d61de074d..5b0001f8b 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,11 +164,11 @@ titleEdit usernameEdit - urlEdit passwordEdit - passwordRepeatEdit togglePasswordButton + passwordRepeatEdit tooglePasswordGeneratorButton + urlEdit expireCheck expireDatePicker expirePresets diff --git a/src/gui/group/EditGroupWidgetMain.ui b/src/gui/group/EditGroupWidgetMain.ui index 71bc1c961..c528c18ad 100644 --- a/src/gui/group/EditGroupWidgetMain.ui +++ b/src/gui/group/EditGroupWidgetMain.ui @@ -77,6 +77,14 @@ + + editName + editNotes + expireCheck + expireDatePicker + searchComboBox + autotypeComboBox +