From d0333031c1f593998a501eff866f091ff2f036be Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 28 Jun 2024 23:05:25 +0200 Subject: feat: user can select shown columns at key table --- src/ui/main_window/MainWindow.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/ui/main_window/MainWindow.cpp') diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index c50cfc5e..7e2bbe85 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -61,10 +61,13 @@ void MainWindow::Init() noexcept { setCentralWidget(edit_); /* the list of Keys available*/ - m_key_list_ = - new KeyList(KeyMenuAbility::REFRESH | KeyMenuAbility::UNCHECK_ALL | - KeyMenuAbility::SEARCH_BAR, - this); + m_key_list_ = new KeyList( + KeyMenuAbility::REFRESH | KeyMenuAbility::UNCHECK_ALL | + KeyMenuAbility::SEARCH_BAR, + GpgKeyTableColumn::kTYPE | GpgKeyTableColumn::kNAME | + GpgKeyTableColumn::kKEY_ID | GpgKeyTableColumn::kEMAIL_ADDRESS | + GpgKeyTableColumn::kUSAGE | GpgKeyTableColumn::kOWNER_TRUST, + this); info_board_ = new InfoBoardWidget(this); -- cgit v1.2.3 From 19926663f11c1013d0c68ccc92f2a4e236942ce9 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 28 Jun 2024 23:20:04 +0200 Subject: refactor: rewrite KeyMenuAbility --- src/ui/main_window/MainWindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/ui/main_window/MainWindow.cpp') diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index 7e2bbe85..868112a0 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -62,8 +62,9 @@ void MainWindow::Init() noexcept { /* the list of Keys available*/ m_key_list_ = new KeyList( - KeyMenuAbility::REFRESH | KeyMenuAbility::UNCHECK_ALL | - KeyMenuAbility::SEARCH_BAR, + KeyMenuAbility::kREFRESH | KeyMenuAbility::kCHECK_ALL | + KeyMenuAbility::kUNCHECK_ALL | KeyMenuAbility::kCOLUMN_FILTER | + KeyMenuAbility::kSEARCH_BAR, GpgKeyTableColumn::kTYPE | GpgKeyTableColumn::kNAME | GpgKeyTableColumn::kKEY_ID | GpgKeyTableColumn::kEMAIL_ADDRESS | GpgKeyTableColumn::kUSAGE | GpgKeyTableColumn::kOWNER_TRUST, -- cgit v1.2.3 From 37a62a8d0b590710b902376ca3320cc05e954b63 Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 26 Jul 2024 18:24:34 +0200 Subject: feat: remove spdlog and clean up log --- src/ui/main_window/MainWindow.cpp | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/ui/main_window/MainWindow.cpp') diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index 868112a0..1e795325 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -136,9 +136,9 @@ void MainWindow::Init() noexcept { Module::ListenRTPublishEvent( this, kVersionCheckingModuleID, "version.loading_done", [=](Module::Namespace, Module::Key, int, std::any) { - GF_UI_LOG_DEBUG( - "version-checking version.loading_done changed, calling slot " - "version upgrade"); + qCDebug(ui, + "version-checking version.loading_done changed, calling slot " + "version upgrade"); this->slot_version_upgrade_notify(); }); @@ -155,7 +155,7 @@ void MainWindow::Init() noexcept { if (show_wizard) slot_start_wizard(); } catch (...) { - GF_UI_LOG_ERROR(tr("Critical error occur while loading GpgFrontend.")); + qCWarning(ui) << tr("Critical error occur while loading GpgFrontend."); QMessageBox::critical( nullptr, tr("Loading Failed"), tr("Critical error occur while loading GpgFrontend.")); @@ -165,8 +165,6 @@ void MainWindow::Init() noexcept { } void MainWindow::restore_settings() { - GF_UI_LOG_DEBUG("restore settings for main windows"); - KeyServerSO key_server(SettingsObject("key_server")); if (key_server.server_list.empty()) key_server.ResetDefaultServerList(); if (key_server.default_server < 0) key_server.default_server = 0; @@ -181,8 +179,6 @@ void MainWindow::restore_settings() { prohibit_update_checking_ = settings.value("network/prohibit_update_check").toBool(); - - GF_UI_LOG_DEBUG("settings restored"); } void MainWindow::recover_editor_unsaved_pages_from_cache() { @@ -193,9 +189,6 @@ void MainWindow::recover_editor_unsaved_pages_from_cache() { return; } - GF_UI_LOG_DEBUG("plan ot recover unsaved page from cache, page array: {}", - json_data.toJson()); - bool first = true; auto unsaved_page_array = json_data.array(); @@ -211,10 +204,6 @@ void MainWindow::recover_editor_unsaved_pages_from_cache() { auto title = unsaved_page_json["title"].toString(); auto content = unsaved_page_json["content"].toString(); - GF_UI_LOG_DEBUG( - "recovering unsaved page from cache, page title: {}, content size", - title, content.size()); - if (first) { edit_->SlotCloseTab(); first = false; -- cgit v1.2.3 From e8efa4d104a889f60b2096510a7c492d74ed6b66 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sat, 27 Jul 2024 14:18:56 +0200 Subject: feat: move pinentry out of source code --- src/ui/main_window/MainWindow.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/ui/main_window/MainWindow.cpp') diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index 1e795325..1b9329c7 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -45,10 +45,6 @@ namespace GpgFrontend::UI { MainWindow::MainWindow() : GeneralMainWindow("main_window") { this->setMinimumSize(1200, 700); this->setWindowTitle(qApp->applicationName()); - - connect(CoreSignalStation::GetInstance(), - &CoreSignalStation::SignalNeedUserInputPassphrase, this, - &MainWindow::SlotRaisePinentry); } void MainWindow::Init() noexcept { -- cgit v1.2.3 From 1b3925284a988070d539ce9bd0a734670da6f468 Mon Sep 17 00:00:00 2001 From: saturneric Date: Sun, 28 Jul 2024 23:09:43 +0200 Subject: fix: adjust min size of main window and key management --- src/ui/main_window/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/main_window/MainWindow.cpp') diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index 1b9329c7..3106f226 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -43,7 +43,7 @@ namespace GpgFrontend::UI { MainWindow::MainWindow() : GeneralMainWindow("main_window") { - this->setMinimumSize(1200, 700); + this->setMinimumSize(1200, 870); this->setWindowTitle(qApp->applicationName()); } -- cgit v1.2.3