diff options
| -rw-r--r-- | gpgwin.cpp | 13 | ||||
| -rwxr-xr-x | keymgmt.cpp | 5 | ||||
| -rwxr-xr-x | settingsdialog.cpp | 5 |
3 files changed, 7 insertions, 16 deletions
@@ -58,7 +58,6 @@ GpgWin::GpgWin() mKeyList->addMenuAction(appendSelectedKeysAct); restoreSettings(); - } void GpgWin::restoreSettings() @@ -85,9 +84,10 @@ void GpgWin::restoreSettings() // Iconstyle Qt::ToolButtonStyle buttonStyle = static_cast<Qt::ToolButtonStyle>(settings.value("toolbar/iconstyle", Qt::ToolButtonTextUnderIcon).toUInt()); this->setToolButtonStyle(buttonStyle); - // state sets pos & size of dock-widgets + settings.sync(); this->restoreState(settings.value("window/windowState").toByteArray()); + } void GpgWin::createActions() @@ -560,14 +560,6 @@ void GpgWin::importKeyDialog() } /** - * Delete a selected (not checked!) Key(s) from keylist - */ -/*void GpgWin::deleteSelectedKeys() -{ - mCtx->deleteKeys(mKeyList->getSelected()); -}*/ - -/** * Append the selected (not checked!) Key(s) To Textedit */ void GpgWin::appendSelectedKeys() @@ -580,7 +572,6 @@ void GpgWin::appendSelectedKeys() void GpgWin::fileEncryption() { - new FileEncryptionDialog(mCtx, iconPath); } diff --git a/keymgmt.cpp b/keymgmt.cpp index 45e23fd..f4a33fb 100755 --- a/keymgmt.cpp +++ b/keymgmt.cpp @@ -42,10 +42,11 @@ KeyMgmt::KeyMgmt(GpgME::Context *ctx, QString iconpath) /* Restore the iconstyle */ QSettings settings; + settings.sync(); QSize iconSize = settings.value("toolbar/iconsize", QSize(32, 32)).toSize(); Qt::ToolButtonStyle buttonStyle = static_cast<Qt::ToolButtonStyle>(settings.value("toolbar/iconstyle", Qt::ToolButtonTextUnderIcon).toUInt()); - setIconSize(iconSize); - setToolButtonStyle(buttonStyle); + this->setIconSize(iconSize); + this->setToolButtonStyle(buttonStyle); setWindowTitle(tr("Keymanagement")); mKeyList->addMenuAction(deleteSelectedKeysAct); diff --git a/settingsdialog.cpp b/settingsdialog.cpp index 6c9c8c6..df16245 100755 --- a/settingsdialog.cpp +++ b/settingsdialog.cpp @@ -40,8 +40,7 @@ SettingsDialog::SettingsDialog() setWindowTitle(tr("Settings")); resize(500, 200); setModal(true); - - + /***************************************** * Icon-Size-Box *****************************************/ @@ -195,6 +194,7 @@ void SettingsDialog::applySettings() } settings.setValue("window/windowSave", windowSizeCheckBox->checkState()); + accept(); } @@ -223,7 +223,6 @@ QHash<QString, QString> SettingsDialog::listLanguages() { QString language = translator.translate("SettingsDialog", "English"); languages.insert(locale, language); - } return languages; } |