Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-new-database-shortcut

Browse Source
This commit is contained in:
TheZ3ro 2017-04-21 10:40:07 +02:00 committed by GitHub
commit 47aec87a56
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/autotype/mac/AutoTypeMac.cpp
View File

@ -403,12 +403,12 @@ uint16 AutoTypePlatformMac::qtToNativeKeyCode(Qt::Key key)
// //
CGEventFlags AutoTypePlatformMac::qtToNativeModifiers(Qt::KeyboardModifiers modifiers, bool native) CGEventFlags AutoTypePlatformMac::qtToNativeModifiers(Qt::KeyboardModifiers modifiers, bool native)
{ {
CGEventFlags nativeModifiers = 0; CGEventFlags nativeModifiers = CGEventFlags(0);
CGEventFlags shiftMod = shiftKey; CGEventFlags shiftMod = CGEventFlags(shiftKey);
CGEventFlags cmdMod = cmdKey; CGEventFlags cmdMod = CGEventFlags(cmdKey);
CGEventFlags optionMod = optionKey; CGEventFlags optionMod = CGEventFlags(optionKey);
CGEventFlags controlMod = controlKey; CGEventFlags controlMod = CGEventFlags(controlKey);
if (native) { if (native) {
shiftMod = kCGEventFlagMaskShift; shiftMod = kCGEventFlagMaskShift;

1
src/core/Config.cpp
View File

@ -113,6 +113,7 @@ void Config::init(const QString& fileName)
m_defaults.insert("UseGroupIconOnEntryCreation", false); m_defaults.insert("UseGroupIconOnEntryCreation", false);
m_defaults.insert("AutoTypeEntryTitleMatch", true); m_defaults.insert("AutoTypeEntryTitleMatch", true);
m_defaults.insert("UseGroupIconOnEntryCreation", true); m_defaults.insert("UseGroupIconOnEntryCreation", true);
m_defaults.insert("IgnoreGroupExpansion", false);
m_defaults.insert("security/clearclipboard", true); m_defaults.insert("security/clearclipboard", true);
m_defaults.insert("security/clearclipboardtimeout", 10); m_defaults.insert("security/clearclipboardtimeout", 10);
m_defaults.insert("security/lockdatabaseidle", false); m_defaults.insert("security/lockdatabaseidle", false);

3
src/core/Group.cpp
View File

@ -296,6 +296,9 @@ 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("IgnoreGroupExpansion").toBool()) {
return;
}
emit modified(); emit modified();
} }
} }

3
src/gui/SettingsWidget.cpp
View File

@ -115,6 +115,7 @@ void SettingsWidget::loadSettings()
m_generalUi->minimizeOnCopyCheckBox->setChecked(config()->get("MinimizeOnCopy").toBool()); m_generalUi->minimizeOnCopyCheckBox->setChecked(config()->get("MinimizeOnCopy").toBool());
m_generalUi->useGroupIconOnEntryCreationCheckBox->setChecked(config()->get("UseGroupIconOnEntryCreation").toBool()); m_generalUi->useGroupIconOnEntryCreationCheckBox->setChecked(config()->get("UseGroupIconOnEntryCreation").toBool());
m_generalUi->autoTypeEntryTitleMatchCheckBox->setChecked(config()->get("AutoTypeEntryTitleMatch").toBool()); m_generalUi->autoTypeEntryTitleMatchCheckBox->setChecked(config()->get("AutoTypeEntryTitleMatch").toBool());
m_generalUi->ignoreGroupExpansionCheckBox->setChecked(config()->get("IgnoreGroupExpansion").toBool());
m_generalUi->languageComboBox->clear(); m_generalUi->languageComboBox->clear();
QList<QPair<QString, QString> > languages = Translator::availableLanguages(); QList<QPair<QString, QString> > languages = Translator::availableLanguages();
@ -180,6 +181,8 @@ void SettingsWidget::saveSettings()
config()->set("MinimizeOnCopy", m_generalUi->minimizeOnCopyCheckBox->isChecked()); config()->set("MinimizeOnCopy", m_generalUi->minimizeOnCopyCheckBox->isChecked());
config()->set("UseGroupIconOnEntryCreation", config()->set("UseGroupIconOnEntryCreation",
m_generalUi->useGroupIconOnEntryCreationCheckBox->isChecked()); m_generalUi->useGroupIconOnEntryCreationCheckBox->isChecked());
config()->set("IgnoreGroupExpansion",
m_generalUi->ignoreGroupExpansionCheckBox->isChecked());
config()->set("AutoTypeEntryTitleMatch", config()->set("AutoTypeEntryTitleMatch",
m_generalUi->autoTypeEntryTitleMatchCheckBox->isChecked()); m_generalUi->autoTypeEntryTitleMatchCheckBox->isChecked());
int currentLangIndex = m_generalUi->languageComboBox->currentIndex(); int currentLangIndex = m_generalUi->languageComboBox->currentIndex();

7
src/gui/SettingsWidgetGeneral.ui
View File

@ -105,6 +105,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="ignoreGroupExpansionCheckBox">
<property name="text">
<string>Don't mark database as modified for non-data changes (e.g., expanding groups)</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QWidget" name="systraySettings" native="true"> <widget class="QWidget" name="systraySettings" native="true">
<layout class="QVBoxLayout" name="systrayLayout"> <layout class="QVBoxLayout" name="systrayLayout">