diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp index d6de2240..7088dd99 100644 --- a/src/core/GpgCoreInit.cpp +++ b/src/core/GpgCoreInit.cpp @@ -304,7 +304,7 @@ auto GetComponentPathsByGpgConf(const QString& gpgconf_install_fs_path) } auto DecideGpgConfPath(const QString& default_gpgconf_path) -> QString { - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); auto use_custom_gnupg_install_path = settings.value("gnupg/use_custom_gnupg_install_path", false).toBool(); auto custom_gnupg_install_path = @@ -470,7 +470,7 @@ auto InitGpgFrontendCore(CoreInitArgs args) -> int { auto default_home_path = Module::RetrieveRTValueTypedOrDefault<>( "core", "gpgme.ctx.default_database_path", QString{}); - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); // read settings from config file auto forbid_all_gnupg_connection = diff --git a/src/core/module/ModuleInit.cpp b/src/core/module/ModuleInit.cpp index 9f282a5f..ed9068c7 100644 --- a/src/core/module/ModuleInit.cpp +++ b/src/core/module/ModuleInit.cpp @@ -78,10 +78,7 @@ auto LoadExternalMods() -> QMap { void LoadGpgFrontendModules(ModuleInitArgs) { // give user ability to give up all modules auto disable_loading_all_modules = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("basic/disable_loading_all_modules", false) - .toBool(); + GetSettings().value("basic/disable_loading_all_modules", false).toBool(); if (disable_loading_all_modules) return; // must init at default thread before core diff --git a/src/init.cpp b/src/init.cpp index 54745d65..8ab49f08 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -57,16 +57,12 @@ int setenv(const char *name, const char *value, int overwrite) { void InitGlobalPathEnv() { // read settings bool use_custom_gnupg_install_path = - GlobalSettingStation::GetInstance() - .GetSettings() + GetSettings() .value("gnupg/use_custom_gnupg_install_path", false) .toBool(); QString custom_gnupg_install_path = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("gnupg/custom_gnupg_install_path") - .toString(); + GetSettings().value("gnupg/custom_gnupg_install_path").toString(); // add custom gnupg install path into env $PATH if (use_custom_gnupg_install_path && !custom_gnupg_install_path.isEmpty()) { @@ -79,10 +75,7 @@ void InitGlobalPathEnv() { QString modified_path_value = getenv("PATH"); } - if (GlobalSettingStation::GetInstance() - .GetSettings() - .value("gnupg/enable_gpgme_debug_log", false) - .toBool()) { + if (GetSettings().value("gnupg/enable_gpgme_debug_log", false).toBool()) { qputenv("GPGME_DEBUG", QString("9:%1").arg(QDir::currentPath() + "/gpgme.log").toUtf8()); } @@ -142,8 +135,7 @@ void InitGlobalBasicEnv(const GFCxtWPtr &p_ctx, bool gui_mode) { */ void InitLocale() { // get the instance of the GlobalSettingStation - auto settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GpgFrontend::GetSettings(); // read from settings file auto lang = settings.value("basic/lang").toString(); diff --git a/src/ui/GpgFrontendUIInit.cpp b/src/ui/GpgFrontendUIInit.cpp index bc41f5f7..9b24141f 100644 --- a/src/ui/GpgFrontendUIInit.cpp +++ b/src/ui/GpgFrontendUIInit.cpp @@ -127,7 +127,7 @@ void InitGpgFrontendUI(QApplication* /*app*/) { // init locale InitUITranslations(); - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); auto theme = settings.value("appearance/theme").toString(); #if defined(_WIN32) || defined(WIN32) diff --git a/src/ui/dialog/Wizard.cpp b/src/ui/dialog/Wizard.cpp index 3a3c0800..ee70239a 100644 --- a/src/ui/dialog/Wizard.cpp +++ b/src/ui/dialog/Wizard.cpp @@ -45,10 +45,7 @@ Wizard::Wizard(QWidget* parent) : QWizard(parent) { setPixmap(QWizard::LogoPixmap, QPixmap(":/icons/gpgfrontend_logo.png").scaled(64, 64)); - int next_page_id = GlobalSettingStation::GetInstance() - .GetSettings() - .value("wizard.next_page", -1) - .toInt(); + int next_page_id = GetSettings().value("wizard.next_page", -1).toInt(); setStartId(next_page_id); connect(this, &Wizard::accepted, this, &Wizard::slot_wizard_accepted); @@ -57,7 +54,7 @@ Wizard::Wizard(QWidget* parent) : QWizard(parent) { void Wizard::slot_wizard_accepted() { // Don't show is mapped to show -> negation try { - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); settings.setValue("wizard/show_wizard", false); } catch (...) { FLOG_W("setting operation error"); diff --git a/src/ui/dialog/controller/GnuPGControllerDialog.cpp b/src/ui/dialog/controller/GnuPGControllerDialog.cpp index bedfc5de..e68e208a 100644 --- a/src/ui/dialog/controller/GnuPGControllerDialog.cpp +++ b/src/ui/dialog/controller/GnuPGControllerDialog.cpp @@ -204,10 +204,7 @@ void GnuPGControllerDialog::slot_update_custom_gnupg_install_path_label( if (custom_gnupg_path_.isEmpty()) { // read from settings file QString custom_gnupg_install_path = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("gnupg/custom_gnupg_install_path") - .toString(); + GetSettings().value("gnupg/custom_gnupg_install_path").toString(); custom_gnupg_path_ = custom_gnupg_install_path; } @@ -232,7 +229,7 @@ void GnuPGControllerDialog::slot_update_custom_gnupg_install_path_label( } void GnuPGControllerDialog::set_settings() { - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); auto non_ascii_at_file_operation = settings.value("gnupg/non_ascii_at_file_operation", true).toBool(); @@ -285,8 +282,7 @@ void GnuPGControllerDialog::set_settings() { } void GnuPGControllerDialog::apply_settings() { - auto settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GpgFrontend::GetSettings(); settings.setValue("gnupg/non_ascii_at_file_operation", ui_->asciiModeCheckBox->isChecked()); diff --git a/src/ui/dialog/controller/ModuleControllerDialog.cpp b/src/ui/dialog/controller/ModuleControllerDialog.cpp index 77949a61..2b842c7f 100644 --- a/src/ui/dialog/controller/ModuleControllerDialog.cpp +++ b/src/ui/dialog/controller/ModuleControllerDialog.cpp @@ -108,10 +108,7 @@ ModuleControllerDialog::ModuleControllerDialog(QWidget* parent) // give user ability to give up all modules auto disable_loading_all_modules = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("basic/disable_loading_all_modules", false) - .toBool(); + GetSettings().value("basic/disable_loading_all_modules", false).toBool(); if (disable_loading_all_modules) { ui_->tabWidget->setTabEnabled(0, false); } diff --git a/src/ui/dialog/import_export/KeyServerImportDialog.cpp b/src/ui/dialog/import_export/KeyServerImportDialog.cpp index c15df158..e3c66245 100644 --- a/src/ui/dialog/import_export/KeyServerImportDialog.cpp +++ b/src/ui/dialog/import_export/KeyServerImportDialog.cpp @@ -43,8 +43,7 @@ KeyServerImportDialog::KeyServerImportDialog(int channel, QWidget* parent) : GeneralDialog("key_server_import_dialog", parent), current_gpg_context_channel_(channel) { auto forbid_all_gnupg_connection = - GlobalSettingStation::GetInstance() - .GetSettings() + GetSettings() .value("network/forbid_all_gnupg_connection", false) .toBool(); if (forbid_all_gnupg_connection) { diff --git a/src/ui/dialog/key_generate/KeygenDialog.cpp b/src/ui/dialog/key_generate/KeygenDialog.cpp index e29f6b64..c9006b0c 100644 --- a/src/ui/dialog/key_generate/KeygenDialog.cpp +++ b/src/ui/dialog/key_generate/KeygenDialog.cpp @@ -48,10 +48,7 @@ KeyGenDialog::KeyGenDialog(int channel, QWidget* parent) new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); bool const longer_expiration_date = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("basic/longer_expiration_date", false) - .toBool(); + GetSettings().value("basic/longer_expiration_date", false).toBool(); max_date_time_ = longer_expiration_date ? QDateTime::currentDateTime().toLocalTime().addYears(30) @@ -141,8 +138,7 @@ void KeyGenDialog::slot_key_gen_accept() { } } - if (!GlobalSettingStation::GetInstance() - .GetSettings() + if (!GetSettings() .value("gnupg/use_pinentry_as_password_input_dialog", QString::fromLocal8Bit(qgetenv("container")) != "flatpak") .toBool() && diff --git a/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp index dd88aac2..1af2d767 100644 --- a/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp +++ b/src/ui/dialog/key_generate/SubkeyGenerateDialog.cpp @@ -50,10 +50,7 @@ SubkeyGenerateDialog::SubkeyGenerateDialog(int channel, const KeyId& key_id, assert(key_.IsGood()); bool longer_expiration_date = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("basic/longer_expiration_date", false) - .toBool(); + GetSettings().value("basic/longer_expiration_date", false).toBool(); max_date_time_ = longer_expiration_date ? QDateTime::currentDateTime().toLocalTime().addYears(30) diff --git a/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp b/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp index 21c16107..8450083f 100644 --- a/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp +++ b/src/ui/dialog/keypair_details/KeyPairDetailTab.cpp @@ -306,16 +306,10 @@ void KeyPairDetailTab::slot_refresh_key() { void KeyPairDetailTab::slot_query_key_publish_state() { bool forbid_all_gnupg_connection = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("network/forbid_all_gnupg_connection") - .toBool(); + GetSettings().value("network/forbid_all_gnupg_connection").toBool(); bool auto_fetch_key_publish_status = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("network/auto_fetch_key_publish_status") - .toBool(); + GetSettings().value("network/auto_fetch_key_publish_status").toBool(); if (forbid_all_gnupg_connection || !auto_fetch_key_publish_status) return; diff --git a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp index 35352bbd..89bceeeb 100644 --- a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp +++ b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp @@ -92,7 +92,7 @@ KeyPairOperaTab::KeyPairOperaTab(int channel, const QString& key_id, auto* advance_h_box_layout = new QHBoxLayout(); - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); // read settings bool forbid_all_gnupg_connection = diff --git a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp index d621e261..e8987029 100644 --- a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp +++ b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp @@ -95,8 +95,7 @@ void KeySetExpireDateDialog::slot_confirm() { void KeySetExpireDateDialog::init() { ui_->setupUi(this); - auto settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GpgFrontend::GetSettings(); bool longer_expiration_date = settings.value("basic/longer_expiration_date").toBool(); diff --git a/src/ui/dialog/settings/SettingsAppearance.cpp b/src/ui/dialog/settings/SettingsAppearance.cpp index 6c0d18c7..2c675251 100644 --- a/src/ui/dialog/settings/SettingsAppearance.cpp +++ b/src/ui/dialog/settings/SettingsAppearance.cpp @@ -135,7 +135,7 @@ void AppearanceTab::SetSettings() { ui_->themeComboBox->addItem(s.toLower()); } - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); auto theme = settings.value("appearance/theme").toString(); auto target_theme_index = ui_->themeComboBox->findText(theme); @@ -224,7 +224,7 @@ void AppearanceTab::ApplySettings() { general_settings_state.Store(appearance.ToJson()); - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); settings.setValue("appearance/theme", ui_->themeComboBox->currentText()); } diff --git a/src/ui/dialog/settings/SettingsGeneral.cpp b/src/ui/dialog/settings/SettingsGeneral.cpp index 73599729..7df9ff1c 100644 --- a/src/ui/dialog/settings/SettingsGeneral.cpp +++ b/src/ui/dialog/settings/SettingsGeneral.cpp @@ -109,7 +109,7 @@ GeneralTab::GeneralTab(QWidget* parent) } void GeneralTab::SetSettings() { - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); auto clear_gpg_password_cache = settings.value("basic/clear_gpg_password_cache", true).toBool(); @@ -147,8 +147,7 @@ void GeneralTab::SetSettings() { } void GeneralTab::ApplySettings() { - auto settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GpgFrontend::GetSettings(); settings.setValue("basic/longer_expiration_date", ui_->longerKeyExpirationDateCheckBox->isChecked()); diff --git a/src/ui/dialog/settings/SettingsNetwork.cpp b/src/ui/dialog/settings/SettingsNetwork.cpp index 8a95c177..66f3abb1 100644 --- a/src/ui/dialog/settings/SettingsNetwork.cpp +++ b/src/ui/dialog/settings/SettingsNetwork.cpp @@ -101,7 +101,7 @@ GpgFrontend::UI::NetworkTab::NetworkTab(QWidget *parent) } void GpgFrontend::UI::NetworkTab::SetSettings() { - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); auto proxy_host = settings.value("proxy/proxy_host").toString(); ui_->proxyServerAddressEdit->setText(proxy_host); @@ -146,8 +146,7 @@ void GpgFrontend::UI::NetworkTab::SetSettings() { } void GpgFrontend::UI::NetworkTab::ApplySettings() { - auto settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GpgFrontend::GetSettings(); settings.setValue("proxy/proxy_host", ui_->proxyServerAddressEdit->text()); settings.setValue("proxy/username", ui_->usernameEdit->text()); diff --git a/src/ui/main_window/KeyMgmt.cpp b/src/ui/main_window/KeyMgmt.cpp index 218d1fa4..e2f09f40 100644 --- a/src/ui/main_window/KeyMgmt.cpp +++ b/src/ui/main_window/KeyMgmt.cpp @@ -179,8 +179,7 @@ void KeyMgmt::create_actions() { }); bool const forbid_all_gnupg_connection = - GlobalSettingStation::GetInstance() - .GetSettings() + GetSettings() .value("network/forbid_all_gnupg_connection", false) .toBool(); diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index b32d9c94..e0f7a49a 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -138,7 +138,7 @@ void MainWindow::Init() noexcept { Module::TriggerEvent("APPLICATION_LOADED"); // check version information - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); auto prohibit_update_checking = settings.value("network/prohibit_update_checking").toBool(); if (!prohibit_update_checking) { @@ -175,7 +175,7 @@ void MainWindow::restore_settings() { if (key_server.server_list.empty()) key_server.ResetDefaultServerList(); if (key_server.default_server < 0) key_server.default_server = 0; - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); if (!settings.contains("gnupg/non_ascii_at_file_operation")) { settings.setValue("gnupg/non_ascii_at_file_operation", true); } diff --git a/src/ui/main_window/MainWindowFileSlotFunction.cpp b/src/ui/main_window/MainWindowFileSlotFunction.cpp index 7958505b..d6a651c8 100644 --- a/src/ui/main_window/MainWindowFileSlotFunction.cpp +++ b/src/ui/main_window/MainWindowFileSlotFunction.cpp @@ -307,10 +307,7 @@ void MainWindow::SlotFileEncrypt(const QStringList& paths) { auto contexts = QSharedPointer::create(); bool const non_ascii_at_file_operation = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("gnupg/non_ascii_at_file_operation", true) - .toBool(); + GetSettings().value("gnupg/non_ascii_at_file_operation", true).toBool(); contexts->ascii = !non_ascii_at_file_operation; @@ -534,10 +531,7 @@ void MainWindow::SlotFileSign(const QStringList& paths) { auto contexts = QSharedPointer::create(); bool const non_ascii_at_file_operation = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("gnupg/non_ascii_at_file_operation", true) - .toBool(); + GetSettings().value("gnupg/non_ascii_at_file_operation", true).toBool(); contexts->ascii = !non_ascii_at_file_operation; @@ -768,10 +762,7 @@ void MainWindow::SlotFileEncryptSign(const QStringList& paths) { auto contexts = QSharedPointer::create(); bool const non_ascii_at_file_operation = - GlobalSettingStation::GetInstance() - .GetSettings() - .value("gnupg/non_ascii_at_file_operation", true) - .toBool(); + GetSettings().value("gnupg/non_ascii_at_file_operation", true).toBool(); contexts->ascii = !non_ascii_at_file_operation; diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp index 16b4eed6..56c46824 100644 --- a/src/ui/main_window/MainWindowUI.cpp +++ b/src/ui/main_window/MainWindowUI.cpp @@ -201,8 +201,7 @@ void MainWindow::create_actions() { }); bool forbid_all_gnupg_connection = - GlobalSettingStation::GetInstance() - .GetSettings() + GetSettings() .value("network/forbid_all_gnupg_connection", false) .toBool(); diff --git a/src/ui/widgets/HelpPage.cpp b/src/ui/widgets/HelpPage.cpp index 314f6093..6d6b857d 100644 --- a/src/ui/widgets/HelpPage.cpp +++ b/src/ui/widgets/HelpPage.cpp @@ -66,10 +66,7 @@ auto HelpPage::localized_help(const QUrl& url) -> QUrl { QStringList fileparts = filename.split("."); // QSettings settings; - QString lang = GlobalSettingStation::GetInstance() - .GetSettings() - .value("int/lang", QLocale().name()) - .toString(); + QString lang = GetSettings().value("int/lang", QLocale().name()).toString(); if (lang.isEmpty()) { lang = QLocale().name(); } diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp index a7309725..1d954f86 100644 --- a/src/ui/widgets/KeyList.cpp +++ b/src/ui/widgets/KeyList.cpp @@ -50,8 +50,7 @@ KeyList::KeyList(int channel, KeyMenuAbility menu_ability, model_(GpgKeyGetter::GetInstance(channel).GetGpgKeyTableModel()), fixed_columns_filter_(fixed_columns_filter), global_column_filter_(static_cast( - GlobalSettingStation::GetInstance() - .GetSettings() + GetSettings() .value("keys/global_columns_filter", static_cast(GpgKeyTableColumn::kALL)) .toUInt())) { @@ -210,8 +209,7 @@ void KeyList::init() { popup_menu_ = new QMenu(this); auto forbid_all_gnupg_connection = - GlobalSettingStation::GetInstance() - .GetSettings() + GetSettings() .value("network/forbid_all_gnupg_connection", false) .toBool(); @@ -243,9 +241,8 @@ void KeyList::init() { UISignalStation::GetInstance(), &UISignalStation::SignalRefreshStatusBar); connect(this, &KeyList::SignalColumnTypeChange, this, [=]() { - GlobalSettingStation::GetInstance().GetSettings().setValue( - "keys/global_columns_filter", - static_cast(global_column_filter_)); + GetSettings().setValue("keys/global_columns_filter", + static_cast(global_column_filter_)); }); setAcceptDrops(true); @@ -481,10 +478,8 @@ void KeyList::dropEvent(QDropEvent* event) { // "always import keys"-CheckBox auto* check_box = new QCheckBox(tr("Always import without bothering.")); - auto confirm_import_keys = GlobalSettingStation::GetInstance() - .GetSettings() - .value("basic/confirm_import_keys", true) - .toBool(); + auto confirm_import_keys = + GetSettings().value("basic/confirm_import_keys", true).toBool(); if (confirm_import_keys) check_box->setCheckState(Qt::Checked); // Buttons for ok and cancel @@ -504,7 +499,7 @@ void KeyList::dropEvent(QDropEvent* event) { dialog->exec(); if (dialog->result() == QDialog::Rejected) return; - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); settings.setValue("basic/confirm_import_keys", check_box->isChecked()); } diff --git a/src/ui/widgets/TextEditTabWidget.cpp b/src/ui/widgets/TextEditTabWidget.cpp index 69f95b1f..0427a6e8 100644 --- a/src/ui/widgets/TextEditTabWidget.cpp +++ b/src/ui/widgets/TextEditTabWidget.cpp @@ -201,7 +201,7 @@ auto TextEditTabWidget::stripped_name(const QString& full_file_name) void TextEditTabWidget::slot_save_status_to_cache_for_recovery() { if (this->text_page_data_modified_count_++ % 8 != 0) return; - auto settings = GlobalSettingStation::GetInstance().GetSettings(); + auto settings = GetSettings(); bool restore_text_editor_page = settings.value("basic/restore_text_editor_page", false).toBool(); diff --git a/src/ui/widgets/VerifyKeyDetailBox.cpp b/src/ui/widgets/VerifyKeyDetailBox.cpp index 387fd36e..079c0e9d 100644 --- a/src/ui/widgets/VerifyKeyDetailBox.cpp +++ b/src/ui/widgets/VerifyKeyDetailBox.cpp @@ -49,8 +49,7 @@ VerifyKeyDetailBox::VerifyKeyDetailBox(int channel, this->setTitle("A Error Signature"); bool forbid_all_gnupg_connection = - GlobalSettingStation::GetInstance() - .GetSettings() + GetSettings() .value("network/forbid_all_gnupg_connection", false) .toBool();