diff options
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/GpgFrontendApplication.cpp | 3 | ||||
-rw-r--r-- | src/ui/GpgFrontendUIInit.cpp | 2 | ||||
-rw-r--r-- | src/ui/UserInterfaceUtils.cpp | 2 | ||||
-rw-r--r-- | src/ui/dialog/Wizard.cpp | 2 | ||||
-rw-r--r-- | src/ui/dialog/gnupg/GnuPGControllerDialog.cpp | 8 | ||||
-rw-r--r-- | src/ui/dialog/keypair_details/KeyPairOperaTab.cpp | 2 | ||||
-rw-r--r-- | src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp | 2 | ||||
-rw-r--r-- | src/ui/dialog/settings/SettingsAdvanced.cpp | 2 | ||||
-rw-r--r-- | src/ui/dialog/settings/SettingsGeneral.cpp | 4 | ||||
-rw-r--r-- | src/ui/dialog/settings/SettingsNetwork.cpp | 4 | ||||
-rw-r--r-- | src/ui/main_window/MainWindow.cpp | 20 | ||||
-rw-r--r-- | src/ui/widgets/KeyList.cpp | 2 | ||||
-rw-r--r-- | src/ui/widgets/TextEdit.cpp | 2 |
13 files changed, 30 insertions, 25 deletions
diff --git a/src/ui/GpgFrontendApplication.cpp b/src/ui/GpgFrontendApplication.cpp index 5c422f49..6f80f534 100644 --- a/src/ui/GpgFrontendApplication.cpp +++ b/src/ui/GpgFrontendApplication.cpp @@ -29,6 +29,7 @@ #include "ui/GpgFrontendApplication.h" #include <QTextCodec> +#include <boost/stacktrace.hpp> #include "GpgFrontendBuildInfo.h" @@ -77,6 +78,8 @@ bool GpgFrontendApplication::notify(QObject *receiver, QEvent *event) { app_done = QApplication::notify(receiver, event); } catch (const std::exception &ex) { SPDLOG_ERROR("exception caught in notify: {}", ex.what()); + SPDLOG_ERROR("exception stacktrace: {}", + boost::stacktrace::to_string(boost::stacktrace::stacktrace())); QMessageBox::information(nullptr, _("Standard Exception Thrown"), _("Oops, an standard exception was thrown " "during the running of the " diff --git a/src/ui/GpgFrontendUIInit.cpp b/src/ui/GpgFrontendUIInit.cpp index 03132abc..49bc01fb 100644 --- a/src/ui/GpgFrontendUIInit.cpp +++ b/src/ui/GpgFrontendUIInit.cpp @@ -252,7 +252,7 @@ void ShutdownUILoggingSystem() { void init_locale() { // get the instance of the GlobalSettingStation auto& settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetUISettings(); + GpgFrontend::GlobalSettingStation::GetInstance().GetMainSettings(); // create general settings if not exist if (!settings.exists("general") || diff --git a/src/ui/UserInterfaceUtils.cpp b/src/ui/UserInterfaceUtils.cpp index 954ee42f..e44eae4d 100644 --- a/src/ui/UserInterfaceUtils.cpp +++ b/src/ui/UserInterfaceUtils.cpp @@ -341,7 +341,7 @@ void CommonUtils::SlotImportKeyFromKeyServer( std::string target_keyserver; try { - auto &settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto &settings = GlobalSettingStation::GetInstance().GetMainSettings(); SettingsObject key_server_json("key_server"); // get key servers from settings diff --git a/src/ui/dialog/Wizard.cpp b/src/ui/dialog/Wizard.cpp index 2a73477b..24ffe496 100644 --- a/src/ui/dialog/Wizard.cpp +++ b/src/ui/dialog/Wizard.cpp @@ -57,7 +57,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().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); if (!settings.exists("wizard")) { settings.add("wizard", libconfig::Setting::TypeGroup); } diff --git a/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp b/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp index 4bcd2957..f80b6c7a 100644 --- a/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp +++ b/src/ui/dialog/gnupg/GnuPGControllerDialog.cpp @@ -101,7 +101,7 @@ GnuPGControllerDialog::GnuPGControllerDialog(QWidget* parent) return; } - auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); auto& general = settings["general"]; // update settings @@ -138,7 +138,7 @@ GnuPGControllerDialog::GnuPGControllerDialog(QWidget* parent) return; } - auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); auto& general = settings["general"]; // update settings @@ -268,7 +268,7 @@ void GnuPGControllerDialog::slot_update_custom_gnupg_install_path_label( } void GnuPGControllerDialog::set_settings() { - auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); try { bool non_ascii_when_export = @@ -319,7 +319,7 @@ void GnuPGControllerDialog::set_settings() { void GnuPGControllerDialog::apply_settings() { auto& settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetUISettings(); + GpgFrontend::GlobalSettingStation::GetInstance().GetMainSettings(); if (!settings.exists("general") || settings.lookup("general").getType() != libconfig::Setting::TypeGroup) diff --git a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp index cdc3d09e..d141c971 100644 --- a/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp +++ b/src/ui/dialog/keypair_details/KeyPairOperaTab.cpp @@ -79,7 +79,7 @@ KeyPairOperaTab::KeyPairOperaTab(const std::string& key_id, QWidget* parent) auto advance_h_box_layout = new QHBoxLayout(); // get settings - auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); // read settings bool forbid_all_gnupg_connection = false; try { diff --git a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp index e3eb755a..ff4ed77f 100644 --- a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp +++ b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp @@ -100,7 +100,7 @@ void KeySetExpireDateDialog::slot_confirm() { void KeySetExpireDateDialog::init() { ui_->setupUi(this); - auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); bool longer_expiration_date = false; try { diff --git a/src/ui/dialog/settings/SettingsAdvanced.cpp b/src/ui/dialog/settings/SettingsAdvanced.cpp index 03b0d761..f7c6eeaa 100644 --- a/src/ui/dialog/settings/SettingsAdvanced.cpp +++ b/src/ui/dialog/settings/SettingsAdvanced.cpp @@ -68,7 +68,7 @@ void AdvancedTab::SetSettings() { void AdvancedTab::ApplySettings() { auto& settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetUISettings(); + GpgFrontend::GlobalSettingStation::GetInstance().GetMainSettings(); if (!settings.exists("advanced") || settings.lookup("advanced").getType() != libconfig::Setting::TypeGroup) diff --git a/src/ui/dialog/settings/SettingsGeneral.cpp b/src/ui/dialog/settings/SettingsGeneral.cpp index 72bb4a69..08d45adf 100644 --- a/src/ui/dialog/settings/SettingsGeneral.cpp +++ b/src/ui/dialog/settings/SettingsGeneral.cpp @@ -116,7 +116,7 @@ GeneralTab::GeneralTab(QWidget* parent) * appropriately **********************************/ void GeneralTab::SetSettings() { - auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); try { bool save_key_checked = settings.lookup("general.save_key_checked"); @@ -186,7 +186,7 @@ void GeneralTab::SetSettings() { *************************************/ void GeneralTab::ApplySettings() { auto& settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetUISettings(); + GpgFrontend::GlobalSettingStation::GetInstance().GetMainSettings(); if (!settings.exists("general") || settings.lookup("general").getType() != libconfig::Setting::TypeGroup) diff --git a/src/ui/dialog/settings/SettingsNetwork.cpp b/src/ui/dialog/settings/SettingsNetwork.cpp index c2e74ca9..83b97ed2 100644 --- a/src/ui/dialog/settings/SettingsNetwork.cpp +++ b/src/ui/dialog/settings/SettingsNetwork.cpp @@ -97,7 +97,7 @@ GpgFrontend::UI::NetworkTab::NetworkTab(QWidget *parent) } void GpgFrontend::UI::NetworkTab::SetSettings() { - auto &settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto &settings = GlobalSettingStation::GetInstance().GetMainSettings(); try { std::string proxy_host = settings.lookup("proxy.proxy_host"); @@ -190,7 +190,7 @@ void GpgFrontend::UI::NetworkTab::SetSettings() { void GpgFrontend::UI::NetworkTab::ApplySettings() { auto &settings = - GpgFrontend::GlobalSettingStation::GetInstance().GetUISettings(); + GpgFrontend::GlobalSettingStation::GetInstance().GetMainSettings(); if (!settings.exists("proxy") || settings.lookup("proxy").getType() != libconfig::Setting::TypeGroup) diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index a6c2a57c..8d6a9310 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -32,6 +32,7 @@ #include "core/function/CacheManager.h" #include "core/function/GlobalSettingStation.h" #include "core/function/gpg/GpgAdvancedOperator.h" +#include "core/module/ModuleManager.h" #include "main_window/GeneralMainWindow.h" #include "nlohmann/json_fwd.hpp" #include "spdlog/spdlog.h" @@ -120,7 +121,7 @@ void MainWindow::Init() noexcept { edit_->CurTextPage()->setFocus(); - auto &settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto &settings = GlobalSettingStation::GetInstance().GetMainSettings(); if (!settings.exists("wizard") || settings.lookup("wizard").getType() != libconfig::Setting::TypeGroup) @@ -144,17 +145,18 @@ void MainWindow::Init() noexcept { } emit SignalLoaded(); + Module::TriggerEvent("APPLICATION_LOADED"); // if not prohibit update checking if (!prohibit_update_checking_) { - auto *version_task = new VersionCheckTask(); + // auto *version_task = new VersionCheckTask(); - connect(version_task, &VersionCheckTask::SignalUpgradeVersion, this, - &MainWindow::slot_version_upgrade); + // connect(version_task, &VersionCheckTask::SignalUpgradeVersion, this, + // &MainWindow::slot_version_upgrade); - Thread::TaskRunnerGetter::GetInstance() - .GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_Network) - ->PostTask(version_task); + // Thread::TaskRunnerGetter::GetInstance() + // .GetTaskRunner(Thread::TaskRunnerGetter::kTaskRunnerType_Network) + // ->PostTask(version_task); } // before application exit @@ -198,7 +200,7 @@ void MainWindow::restore_settings() { key_server_json["default_server"] = 0; } - auto &settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto &settings = GlobalSettingStation::GetInstance().GetMainSettings(); if (!settings.exists("general") || settings.lookup("general").getType() != libconfig::Setting::TypeGroup) @@ -303,7 +305,7 @@ void MainWindow::save_settings() { for (const auto &key_id : *key_ids_need_to_store) default_key_checked.push_back(key_id); } else { - auto &settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto &settings = GlobalSettingStation::GetInstance().GetMainSettings(); settings["general"].remove("save_key_checked"); } diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp index 63c1eb24..e867735b 100644 --- a/src/ui/widgets/KeyList.cpp +++ b/src/ui/widgets/KeyList.cpp @@ -380,7 +380,7 @@ void KeyList::dropEvent(QDropEvent* event) { dialog->exec(); if (dialog->result() == QDialog::Rejected) return; - auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); if (!settings.exists("general") || settings.lookup("general").getType() != libconfig::Setting::TypeGroup) diff --git a/src/ui/widgets/TextEdit.cpp b/src/ui/widgets/TextEdit.cpp index 56097b1a..f44c076c 100644 --- a/src/ui/widgets/TextEdit.cpp +++ b/src/ui/widgets/TextEdit.cpp @@ -632,7 +632,7 @@ void TextEdit::slot_file_page_path_changed(const QString& path) const { void TextEdit::slot_save_status_to_cache_for_revovery() { if (this->text_page_data_modified_count_++ % 8 != 0) return; - auto& settings = GlobalSettingStation::GetInstance().GetUISettings(); + auto& settings = GlobalSettingStation::GetInstance().GetMainSettings(); bool restore_text_editor_page = false; try { restore_text_editor_page = |