diff options
| author | Saturn&Eric <[email protected]> | 2024-01-30 05:38:51 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-01-30 05:38:51 +0000 |
| commit | 60b8aafec9b59da71ae5c36708f5533870c2f499 (patch) | |
| tree | 2118b1847c356a5b0a53a13785f1b4f932fefa9f /src/ui/main_window/MainWindow.cpp | |
| parent | Merge pull request #126 from saturneric/dev/2.1.1/main (diff) | |
| parent | doc: update translations (diff) | |
| download | GpgFrontend-60b8aafec9b59da71ae5c36708f5533870c2f499.tar.gz GpgFrontend-60b8aafec9b59da71ae5c36708f5533870c2f499.zip | |
Merge pull request #127 from saturneric/dev/2.1.1/main
Develop 2.1.2.2
Diffstat (limited to '')
| -rw-r--r-- | src/ui/main_window/MainWindow.cpp | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index ef7910ab..27634570 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -103,6 +103,12 @@ void MainWindow::Init() noexcept { [=](const QString &message, int timeout) { statusBar()->showMessage(message, timeout); }); + connect(UISignalStation::GetInstance(), + &UISignalStation::SignalMainWindowlUpdateBasicalOperaMenu, this, + &MainWindow::SlotUpdateCryptoMenuStatus); + connect(UISignalStation::GetInstance(), + &UISignalStation::SignalMainWindowOpenFile, this, + &MainWindow::SlotOpenFile); m_key_list_->AddMenuAction(append_selected_keys_act_); m_key_list_->AddMenuAction(append_key_create_date_to_editor_act_); @@ -123,21 +129,6 @@ void MainWindow::Init() noexcept { edit_->CurTextPage()->setFocus(); - // before application exit - connect(qApp, &QCoreApplication::aboutToQuit, this, []() { - GF_UI_LOG_DEBUG("about to quit process started"); - - if (GlobalSettingStation::GetInstance() - .GetSettings() - .value("basic/clear_gpg_password_cache", false) - .toBool()) { - GpgFrontend::GpgAdvancedOperator::ClearGpgPasswordCache( - [](int, DataObjectPtr) { - - }); - } - }); - Module::ListenRTPublishEvent( this, "com.bktus.gpgfrontend.module.integrated.version-checking", "version.loading_done", @@ -178,8 +169,8 @@ void MainWindow::restore_settings() { if (key_server.default_server < 0) key_server.default_server = 0; auto settings = GlobalSettingStation::GetInstance().GetSettings(); - if (!settings.contains("basic/non_ascii_when_export")) { - settings.setValue("basic/non_ascii_when_export", true); + if (!settings.contains("gnupg/non_ascii_at_file_operation")) { + settings.setValue("gnupg/non_ascii_at_file_operation", true); } // set appearance |