diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index a67646ef1..dffbe69d0 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -287,7 +287,7 @@ void DatabaseWidget::createEntry()
void DatabaseWidget::setIconFromParent()
{
- if (!config()->get("UseGroupIconOnEntryCreation").toBool()) {
+ if (!config()->get("UseGroupIconOnEntryCreation", true).toBool()) {
return;
}
diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp
index 660d5a864..d8f50a3b0 100644
--- a/src/gui/SettingsWidget.cpp
+++ b/src/gui/SettingsWidget.cpp
@@ -61,13 +61,13 @@ SettingsWidget::SettingsWidget(QWidget* parent)
addPage(tr("General"), FilePath::instance()->icon("categories", "preferences-other"), m_generalWidget);
addPage(tr("Security"), FilePath::instance()->icon("status", "security-high"), m_secWidget);
- m_generalUi->autoTypeShortcutWidget->setVisible(autoType()->isAvailable());
- m_generalUi->autoTypeShortcutLabel->setVisible(autoType()->isAvailable());
+ if (!autoType()->isAvailable()) {
+ m_generalUi->generalSettingsTabWidget->removeTab(1);
+ }
+
#ifdef Q_OS_MAC
// systray not useful on OS X
- m_generalUi->systrayShowCheckBox->setVisible(false);
- m_generalUi->systrayMinimizeOnCloseCheckBox->setVisible(false);
- m_generalUi->systrayMinimizeToTrayCheckBox->setVisible(false);
+ m_generalUi->systraySettings->setVisible(false);
#endif
connect(this, SIGNAL(accepted()), SLOT(saveSettings()));
@@ -106,7 +106,7 @@ void SettingsWidget::loadSettings()
m_generalUi->autoSaveOnExitCheckBox->setChecked(config()->get("AutoSaveOnExit").toBool());
m_generalUi->autoReloadOnChangeCheckBox->setChecked(config()->get("AutoReloadOnChange").toBool());
m_generalUi->minimizeOnCopyCheckBox->setChecked(config()->get("MinimizeOnCopy").toBool());
- m_generalUi->useGroupIconOnEntryCreationCheckBox->setChecked(config()->get("UseGroupIconOnEntryCreation").toBool());
+ m_generalUi->useGroupIconOnEntryCreationCheckBox->setChecked(config()->get("UseGroupIconOnEntryCreation", true).toBool());
m_generalUi->autoTypeEntryTitleMatchCheckBox->setChecked(config()->get("AutoTypeEntryTitleMatch").toBool());
m_generalUi->languageComboBox->clear();
diff --git a/src/gui/SettingsWidgetGeneral.ui b/src/gui/SettingsWidgetGeneral.ui
index 400a6ce02..b58f31e80 100644
--- a/src/gui/SettingsWidgetGeneral.ui
+++ b/src/gui/SettingsWidgetGeneral.ui
@@ -7,230 +7,349 @@
0
0
684
- 452
+ 732
-
-
- QFormLayout::AllNonFixedFieldsGrow
+
+
+ 0
- -
-
-
- Remember last databases
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 0
-
- true
-
-
-
- -
-
-
- Remember last key files
-
-
- true
-
-
-
- -
-
-
- Load previous databases on startup
-
-
-
- -
-
-
- Automatically save on exit
-
-
-
- -
-
-
- Automatically save after every change
-
-
-
- -
-
-
- Automatically reload the database when modified externally
-
-
-
- -
-
-
- Minimize when copying to clipboard
-
-
-
- -
-
-
- Minimize window at application startup
-
-
-
- -
-
-
- Use group icon on entry creation
-
-
-
- -
-
-
-
-
-
- Global Auto-Type shortcut
-
-
- Qt::AlignLeft
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 400
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
+
+
+ Basic Settings
+
+
+
-
+
+
+ Remember last databases
+
+
+ true
+
+
+
+ -
+
+
+ Remember last key files and security dongles
+
+
+ true
+
+
+
+ -
+
+
+ Load previous databases on startup
+
+
+
+ -
+
+
+ Automatically save on exit
+
+
+
+ -
+
+
+ Automatically save after every change
+
+
+
+ -
+
+
+ Automatically reload the database when modified externally
+
+
+
+ -
+
+
+ Minimize when copying to clipboard
+
+
+
+ -
+
+
+ Minimize window at application startup
+
+
+
+ -
+
+
+ Use group icon on entry creation
+
+
+ true
+
+
+
+ -
+
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 30
+
+
+
+
+ -
+
+
+ Show a system tray icon
+
+
+
+ -
+
+
+ 0
+
+
+ QLayout::SetMaximumSize
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+
+ 0
+ 0
+
+
+
+ Hide window to system tray when minimized
+
+
+
+
+
+ -
+
+
+ 0
+
+
+ QLayout::SetMaximumSize
+
+
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+ Hide window to system tray instead of app exit
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Fixed
+
+
+
+ 20
+ 30
+
+
+
+
+ -
+
+
+ 15
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Language
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Expanding
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ Auto-Type
+
+
+ -
+
+
+ Use entry title to match windows for global Auto-Type
+
+
+
+ -
+
+
+ 15
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ Global Auto-Type shortcut
+
+
+ Qt::AlignLeading
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
-
- -
-
-
- Use entry title to match windows for global auto-type
-
- -
-
-
-
-
-
- Language
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 400
-
-
-
-
-
-
-
-
-
- -
-
-
- -
-
-
- Show a system tray icon
-
-
-
- -
-
-
- QLayout::SetMaximumSize
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- false
-
-
-
- 0
- 0
-
-
-
- Hide window to system tray when minimized
-
-
-
-
-
- -
-
-
- QLayout::SetMaximumSize
-
-
-
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- false
-
-
- Hide window to system tray instead of app exit
-
-
-
-
-
@@ -240,15 +359,6 @@
autotype/ShortcutWidget.h
-
- rememberLastDatabasesCheckBox
- rememberLastKeyFilesCheckBox
- openPreviousDatabasesOnStartupCheckBox
- autoSaveOnExitCheckBox
- autoSaveAfterEveryChangeCheckBox
- minimizeOnCopyCheckBox
- autoTypeShortcutWidget
-