Remove ModifiedOnExpandedStateChanges config option.

I'm pretty sure noone knew what it actually does.
This is the sort of option users shouldn't be bothered with.
This commit is contained in:
Felix Geyer 2014-11-30 23:04:17 +01:00
parent 8fd69e084e
commit 07e4fbacd4
4 changed files with 12 additions and 29 deletions

View File

@ -90,7 +90,6 @@ void Config::init(const QString& fileName)
m_defaults.insert("RememberLastDatabases", true); m_defaults.insert("RememberLastDatabases", true);
m_defaults.insert("OpenPreviousDatabasesOnStartup", true); m_defaults.insert("OpenPreviousDatabasesOnStartup", true);
m_defaults.insert("ModifiedOnExpandedStateChanges", true);
m_defaults.insert("AutoSaveAfterEveryChange", false); m_defaults.insert("AutoSaveAfterEveryChange", false);
m_defaults.insert("AutoSaveOnExit", false); m_defaults.insert("AutoSaveOnExit", false);
m_defaults.insert("ShowToolbar", true); m_defaults.insert("ShowToolbar", true);

View File

@ -248,9 +248,7 @@ void Group::setExpanded(bool expanded)
if (m_data.isExpanded != expanded) { if (m_data.isExpanded != expanded) {
m_data.isExpanded = expanded; m_data.isExpanded = expanded;
updateTimeinfo(); updateTimeinfo();
if (config()->get("ModifiedOnExpandedStateChanges").toBool()) { Q_EMIT modified();
Q_EMIT modified();
}
} }
} }

View File

@ -65,7 +65,6 @@ void SettingsWidget::loadSettings()
m_generalUi->rememberLastDatabasesCheckBox->setChecked(config()->get("RememberLastDatabases").toBool()); m_generalUi->rememberLastDatabasesCheckBox->setChecked(config()->get("RememberLastDatabases").toBool());
m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked( m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(
config()->get("OpenPreviousDatabasesOnStartup").toBool()); config()->get("OpenPreviousDatabasesOnStartup").toBool());
m_generalUi->modifiedExpandedChangedCheckBox->setChecked(config()->get("ModifiedOnExpandedStateChanges").toBool());
m_generalUi->autoSaveAfterEveryChangeCheckBox->setChecked(config()->get("AutoSaveAfterEveryChange").toBool()); m_generalUi->autoSaveAfterEveryChangeCheckBox->setChecked(config()->get("AutoSaveAfterEveryChange").toBool());
m_generalUi->autoSaveOnExitCheckBox->setChecked(config()->get("AutoSaveOnExit").toBool()); m_generalUi->autoSaveOnExitCheckBox->setChecked(config()->get("AutoSaveOnExit").toBool());
m_generalUi->minimizeOnCopyCheckBox->setChecked(config()->get("MinimizeOnCopy").toBool()); m_generalUi->minimizeOnCopyCheckBox->setChecked(config()->get("MinimizeOnCopy").toBool());
@ -111,8 +110,6 @@ void SettingsWidget::saveSettings()
config()->set("RememberLastDatabases", m_generalUi->rememberLastDatabasesCheckBox->isChecked()); config()->set("RememberLastDatabases", m_generalUi->rememberLastDatabasesCheckBox->isChecked());
config()->set("OpenPreviousDatabasesOnStartup", config()->set("OpenPreviousDatabasesOnStartup",
m_generalUi->openPreviousDatabasesOnStartupCheckBox->isChecked()); m_generalUi->openPreviousDatabasesOnStartupCheckBox->isChecked());
config()->set("ModifiedOnExpandedStateChanges",
m_generalUi->modifiedExpandedChangedCheckBox->isChecked());
config()->set("AutoSaveAfterEveryChange", config()->set("AutoSaveAfterEveryChange",
m_generalUi->autoSaveAfterEveryChangeCheckBox->isChecked()); m_generalUi->autoSaveAfterEveryChangeCheckBox->isChecked());
config()->set("AutoSaveOnExit", m_generalUi->autoSaveOnExitCheckBox->isChecked()); config()->set("AutoSaveOnExit", m_generalUi->autoSaveOnExitCheckBox->isChecked());

View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>456</width> <width>456</width>
<height>340</height> <height>313</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
@ -32,78 +32,68 @@
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QCheckBox" name="modifiedExpandedChangedCheckBox">
<property name="text">
<string>Mark as modified on expanded state changes</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="autoSaveOnExitCheckBox"> <widget class="QCheckBox" name="autoSaveOnExitCheckBox">
<property name="text"> <property name="text">
<string>Automatically save on exit</string> <string>Automatically save on exit</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<widget class="QCheckBox" name="autoSaveAfterEveryChangeCheckBox"> <widget class="QCheckBox" name="autoSaveAfterEveryChangeCheckBox">
<property name="text"> <property name="text">
<string>Automatically save after every change</string> <string>Automatically save after every change</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="4" column="0">
<widget class="QCheckBox" name="minimizeOnCopyCheckBox"> <widget class="QCheckBox" name="minimizeOnCopyCheckBox">
<property name="text"> <property name="text">
<string>Minimize when copying to clipboard</string> <string>Minimize when copying to clipboard</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="5" column="0">
<widget class="QCheckBox" name="useGroupIconOnEntryCreationCheckBox"> <widget class="QCheckBox" name="useGroupIconOnEntryCreationCheckBox">
<property name="text"> <property name="text">
<string>Use group icon on entry creation</string> <string>Use group icon on entry creation</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0"> <item row="6" column="0">
<widget class="QLabel" name="autoTypeShortcutLabel"> <widget class="QLabel" name="autoTypeShortcutLabel">
<property name="text"> <property name="text">
<string>Global Auto-Type shortcut</string> <string>Global Auto-Type shortcut</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="6" column="1">
<widget class="ShortcutWidget" name="autoTypeShortcutWidget"/> <widget class="ShortcutWidget" name="autoTypeShortcutWidget"/>
</item> </item>
<item row="8" column="0"> <item row="7" column="0">
<widget class="QCheckBox" name="autoTypeEntryTitleMatchCheckBox"> <widget class="QCheckBox" name="autoTypeEntryTitleMatchCheckBox">
<property name="text"> <property name="text">
<string>Use entry title to match windows for global auto-type</string> <string>Use entry title to match windows for global auto-type</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="8" column="0">
<widget class="QLabel" name="languageLabel"> <widget class="QLabel" name="languageLabel">
<property name="text"> <property name="text">
<string>Language</string> <string>Language</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="8" column="1">
<widget class="QComboBox" name="languageComboBox"/> <widget class="QComboBox" name="languageComboBox"/>
</item> </item>
<item row="10" column="0"> <item row="9" column="0">
<widget class="QCheckBox" name="systrayShowCheckBox"> <widget class="QCheckBox" name="systrayShowCheckBox">
<property name="text"> <property name="text">
<string>Show a system tray icon</string> <string>Show a system tray icon</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="0"> <item row="10" column="0">
<widget class="QCheckBox" name="systrayMinimizeToTrayCheckBox"> <widget class="QCheckBox" name="systrayMinimizeToTrayCheckBox">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -125,7 +115,6 @@
<tabstops> <tabstops>
<tabstop>rememberLastDatabasesCheckBox</tabstop> <tabstop>rememberLastDatabasesCheckBox</tabstop>
<tabstop>openPreviousDatabasesOnStartupCheckBox</tabstop> <tabstop>openPreviousDatabasesOnStartupCheckBox</tabstop>
<tabstop>modifiedExpandedChangedCheckBox</tabstop>
<tabstop>autoSaveOnExitCheckBox</tabstop> <tabstop>autoSaveOnExitCheckBox</tabstop>
<tabstop>autoSaveAfterEveryChangeCheckBox</tabstop> <tabstop>autoSaveAfterEveryChangeCheckBox</tabstop>
<tabstop>minimizeOnCopyCheckBox</tabstop> <tabstop>minimizeOnCopyCheckBox</tabstop>