aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsaturneric <[email protected]>2024-04-11 19:55:57 +0000
committersaturneric <[email protected]>2024-04-11 19:56:05 +0000
commite6be01ca8fdce75b2c1d5be32e0a00d4bda29b8d (patch)
treeac51625707d1c7d97c123ae3c58c8653e859dcd8 /src
parentrefactor: reduce core prebuild headers and isolate core to modules (diff)
downloadGpgFrontend-e6be01ca8fdce75b2c1d5be32e0a00d4bda29b8d.tar.gz
GpgFrontend-e6be01ca8fdce75b2c1d5be32e0a00d4bda29b8d.zip
fix: find and solve some issues on module management
Diffstat (limited to 'src')
-rw-r--r--src/core/GpgCoreInit.cpp10
-rw-r--r--src/core/function/gpg/GpgAdvancedOperator.cpp12
-rw-r--r--src/module/integrated/gnupg_info_gathering_module/CMakeLists.txt10
-rw-r--r--src/module/integrated/version_checking_module/CMakeLists.txt10
-rw-r--r--src/module/integrated/version_checking_module/VersionCheckTask.cpp6
-rw-r--r--src/ui/dialog/controller/ModuleControllerDialog.cpp22
-rw-r--r--src/ui/dialog/controller/ModuleControllerDialog.h2
-rw-r--r--src/ui/dialog/help/AboutDialog.cpp31
-rw-r--r--src/ui/dialog/help/AboutDialog.h3
-rw-r--r--src/ui/dialog/help/GnupgTab.cpp16
-rw-r--r--src/ui/main_window/MainWindow.cpp2
-rw-r--r--src/ui/main_window/MainWindowSlotFunction.cpp10
12 files changed, 71 insertions, 63 deletions
diff --git a/src/core/GpgCoreInit.cpp b/src/core/GpgCoreInit.cpp
index 8268f798..8b2dbbed 100644
--- a/src/core/GpgCoreInit.cpp
+++ b/src/core/GpgCoreInit.cpp
@@ -415,12 +415,12 @@ void InitGpgFrontendCore(CoreInitArgs args) {
Module::UpsertRTValue("core", "env.state.basic", 1);
CoreSignalStation::GetInstance()->SignalGoodGnupgEnv();
- // if gnupg-info-gathering module activated
+ // if gnupg_info_gathering module activated
if (args.gather_external_gnupg_info &&
Module::IsModuleAcivate("com.bktus.gpgfrontend.module."
- "integrated.gnupg-info-gathering")) {
+ "integrated.gnupg_info_gathering")) {
GF_CORE_LOG_DEBUG(
- "module gnupg-info-gathering is activated, "
+ "module gnupg_info_gathering is activated, "
"loading external gnupg info...");
// gather external gnupg info
@@ -438,7 +438,7 @@ void InitGpgFrontendCore(CoreInitArgs args) {
"com.bktus.gpgfrontend.module.integrated.gnupg-info-"
"gathering") {
GF_CORE_LOG_DEBUG(
- "received callback from gnupg-info-gathering ");
+ "received callback from gnupg_info_gathering ");
// try to restart all components
auto settings =
@@ -460,7 +460,7 @@ void InitGpgFrontendCore(CoreInitArgs args) {
}
});
} else {
- GF_CORE_LOG_DEBUG("gnupg-info-gathering is not activated");
+ GF_CORE_LOG_DEBUG("gnupg_info_gathering is not activated");
Module::UpsertRTValue("core", "env.state.all", 1);
}
return 0;
diff --git a/src/core/function/gpg/GpgAdvancedOperator.cpp b/src/core/function/gpg/GpgAdvancedOperator.cpp
index 3fc831ed..6e67bfb7 100644
--- a/src/core/function/gpg/GpgAdvancedOperator.cpp
+++ b/src/core/function/gpg/GpgAdvancedOperator.cpp
@@ -140,12 +140,12 @@ void GpgFrontend::GpgAdvancedOperator::ResetConfigures(OperationCallback cb) {
void GpgFrontend::GpgAdvancedOperator::StartGpgAgent(OperationCallback cb) {
const auto gpg_agent_path = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
"gnupg.gpg_agent_path", QString{});
GF_CORE_LOG_DEBUG("got gnupg agent path from rt: {}", gpg_agent_path);
const auto home_path = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
"gnupg.home_path", QString{});
GF_CORE_LOG_DEBUG("got gnupg home path from rt: {}", home_path);
@@ -165,12 +165,12 @@ void GpgFrontend::GpgAdvancedOperator::StartGpgAgent(OperationCallback cb) {
void GpgFrontend::GpgAdvancedOperator::StartDirmngr(OperationCallback cb) {
const auto dirmngr_path = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
"gnupg.dirmngr_path", QString{});
GF_CORE_LOG_DEBUG("got gnupg dirmngr path from rt: {}", dirmngr_path);
const auto home_path = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
"gnupg.home_path", QString{});
GF_CORE_LOG_DEBUG("got gnupg home path from rt: {}", home_path);
@@ -190,12 +190,12 @@ void GpgFrontend::GpgAdvancedOperator::StartDirmngr(OperationCallback cb) {
void GpgFrontend::GpgAdvancedOperator::StartKeyBoxd(OperationCallback cb) {
const auto keyboxd_path = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
"gnupg.keyboxd_path", QString{});
GF_CORE_LOG_DEBUG("got gnupg keyboxd path from rt: {}", keyboxd_path);
const auto home_path = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
"gnupg.home_path", QString{});
GF_CORE_LOG_DEBUG("got gnupg home path from rt: {}", home_path);
diff --git a/src/module/integrated/gnupg_info_gathering_module/CMakeLists.txt b/src/module/integrated/gnupg_info_gathering_module/CMakeLists.txt
index 578d60d3..21219031 100644
--- a/src/module/integrated/gnupg_info_gathering_module/CMakeLists.txt
+++ b/src/module/integrated/gnupg_info_gathering_module/CMakeLists.txt
@@ -23,7 +23,7 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
-# com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering
+# com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering
aux_source_directory(. INTEGRATED_MODULE_SOURCE)
@@ -37,6 +37,10 @@ generate_export_header(gpgfrontend_gnupg_info_gathering
target_include_directories(gpgfrontend_gnupg_info_gathering PRIVATE
${CMAKE_SOURCE_DIR}/third_party/spdlog/include)
+# set output directory
+set_target_properties(gpgfrontend_gnupg_info_gathering PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods)
+
if (XCODE_BUILD)
set_target_properties(gpgfrontend_gnupg_info_gathering
PROPERTIES
@@ -56,9 +60,7 @@ target_link_libraries(gpgfrontend_gnupg_info_gathering PRIVATE
Qt6::Core)
-# set output directory
-set_target_properties(gpgfrontend_gnupg_info_gathering PROPERTIES
- LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods)
+
# property
set_property(TARGET gpgfrontend_gnupg_info_gathering PROPERTY AUTOMOC ON)
diff --git a/src/module/integrated/version_checking_module/CMakeLists.txt b/src/module/integrated/version_checking_module/CMakeLists.txt
index 9b6fa271..19706e87 100644
--- a/src/module/integrated/version_checking_module/CMakeLists.txt
+++ b/src/module/integrated/version_checking_module/CMakeLists.txt
@@ -23,7 +23,7 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
-# com.bktus.gpgfrontend.module.integrated.version-checking
+# com.bktus.gpgfrontend.module.integrated.version_checking
aux_source_directory(. INTEGRATED_MODULE_SOURCE)
@@ -37,6 +37,10 @@ generate_export_header(gpgfrontend_version_checking
target_include_directories(gpgfrontend_version_checking PRIVATE
${CMAKE_SOURCE_DIR}/third_party/spdlog/include)
+# set output directory
+set_target_properties(gpgfrontend_version_checking PROPERTIES
+ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods)
+
if (XCODE_BUILD)
set_target_properties(gpgfrontend_version_checking
PROPERTIES
@@ -59,10 +63,6 @@ else()
target_link_libraries(gpgfrontend_version_checking PUBLIC Qt6::Core Qt6::Network)
endif()
-# set output directory
-set_target_properties(gpgfrontend_version_checking PROPERTIES
- LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mods)
-
# property
set_property(TARGET gpgfrontend_version_checking PROPERTY AUTOMOC ON)
diff --git a/src/module/integrated/version_checking_module/VersionCheckTask.cpp b/src/module/integrated/version_checking_module/VersionCheckTask.cpp
index 044f81ec..5ea9c48e 100644
--- a/src/module/integrated/version_checking_module/VersionCheckTask.cpp
+++ b/src/module/integrated/version_checking_module/VersionCheckTask.cpp
@@ -78,9 +78,9 @@ void VersionCheckTask::slot_parse_latest_version_info() {
auto version_match = re.match(latest_version);
if (version_match.hasMatch()) {
latest_version = version_match.captured(0);
- GFModuleLogInfo(
- fmt::format("latest version from github: {}", latest_version)
- .c_str());
+ GFModuleLogInfo(fmt::format("latest released version from github: {}",
+ latest_version)
+ .c_str());
} else {
latest_version = current_version_;
GFModuleLogWarn(
diff --git a/src/ui/dialog/controller/ModuleControllerDialog.cpp b/src/ui/dialog/controller/ModuleControllerDialog.cpp
index 309ad8e1..ad2bf918 100644
--- a/src/ui/dialog/controller/ModuleControllerDialog.cpp
+++ b/src/ui/dialog/controller/ModuleControllerDialog.cpp
@@ -40,10 +40,10 @@ ModuleControllerDialog::ModuleControllerDialog(QWidget* parent)
: QDialog(parent),
ui_(std::make_shared<Ui_ModuleControllerDialog>()),
model_list_view_(new ModuleListView(this)),
- module_mamager_(&Module::ModuleManager::GetInstance()) {
+ module_manager_(&Module::ModuleManager::GetInstance()) {
ui_->setupUi(this);
- model_list_view_->setMinimumWidth(250);
+ model_list_view_->setFixedWidth(250);
model_list_view_->setViewMode(QListView::ListMode);
model_list_view_->setMovement(QListView::Static);
@@ -55,10 +55,10 @@ ModuleControllerDialog::ModuleControllerDialog(QWidget* parent)
auto module_id = model_list_view_->GetCurrentModuleID();
if (module_id.isEmpty()) return;
- if (!module_mamager_->IsModuleActivated(module_id)) {
- module_mamager_->ActiveModule(module_id);
+ if (!module_manager_->IsModuleActivated(module_id)) {
+ module_manager_->ActiveModule(module_id);
} else {
- module_mamager_->DeactiveModule(module_id);
+ module_manager_->DeactiveModule(module_id);
}
QTimer::singleShot(1000, [=]() { slot_load_module_details(module_id); });
@@ -73,17 +73,17 @@ ModuleControllerDialog::ModuleControllerDialog(QWidget* parent)
void ModuleControllerDialog::slot_load_module_details(
Module::ModuleIdentifier module_id) {
- GF_UI_LOG_DEBUG("loading module detailes, module id: {}", module_id);
+ GF_UI_LOG_DEBUG("loading module details, module id: {}", module_id);
- auto module = module_mamager_->SearchModule(module_id);
-
- ui_->moduleIDLabel->setText(module->GetModuleIdentifier());
+ auto module = module_manager_->SearchModule(module_id);
QString buffer;
QTextStream info(&buffer);
+
info << "# BASIC INFO" << Qt::endl << Qt::endl;
+ info << tr("ID") << ": " << module->GetModuleIdentifier() << Qt::endl;
info << tr("Version") << ": " << module->GetModuleVersion() << Qt::endl;
info << tr("SDK Version") << ": " << module->GetModuleSDKVersion()
<< Qt::endl;
@@ -92,7 +92,7 @@ void ModuleControllerDialog::slot_load_module_details(
info << tr("Hash") << ": " << module->GetModuleHash() << Qt::endl;
info << tr("Path") << ": " << module->GetModulePath() << Qt::endl;
- bool if_activated = module_mamager_->IsModuleActivated(module_id);
+ bool if_activated = module_manager_->IsModuleActivated(module_id);
info << tr("Active") << ": " << (if_activated ? tr("True") : tr("False"))
<< Qt::endl;
@@ -109,7 +109,7 @@ void ModuleControllerDialog::slot_load_module_details(
info << "# Listening Event" << Qt::endl << Qt::endl;
- auto listening_event_ids = module_mamager_->GetModuleListening(module_id);
+ auto listening_event_ids = module_manager_->GetModuleListening(module_id);
for (const auto& event_id : listening_event_ids) {
info << " - " << event_id << "\n";
}
diff --git a/src/ui/dialog/controller/ModuleControllerDialog.h b/src/ui/dialog/controller/ModuleControllerDialog.h
index 57444aea..001e4614 100644
--- a/src/ui/dialog/controller/ModuleControllerDialog.h
+++ b/src/ui/dialog/controller/ModuleControllerDialog.h
@@ -56,7 +56,7 @@ class ModuleControllerDialog : public QDialog {
private:
std::shared_ptr<Ui_ModuleControllerDialog> ui_; ///<
ModuleListView* model_list_view_;
- Module::ModuleManager* module_mamager_;
+ Module::ModuleManager* module_manager_;
};
} // namespace GpgFrontend::UI
diff --git a/src/ui/dialog/help/AboutDialog.cpp b/src/ui/dialog/help/AboutDialog.cpp
index e1fa3535..cd577f89 100644
--- a/src/ui/dialog/help/AboutDialog.cpp
+++ b/src/ui/dialog/help/AboutDialog.cpp
@@ -42,14 +42,23 @@ AboutDialog::AboutDialog(int defaultIndex, QWidget* parent)
auto* tab_widget = new QTabWidget;
auto* info_tab = new InfoTab();
- auto* gnupg_tab = new GnupgTab();
auto* translators_tab = new TranslatorsTab();
- update_tab_ = new UpdateTab();
tab_widget->addTab(info_tab, tr("About GpgFrontend"));
- tab_widget->addTab(gnupg_tab, tr("GnuPG"));
+
+ if (Module::IsModuleAcivate("com.bktus.gpgfrontend.module."
+ "integrated.gnupg_info_gathering")) {
+ auto* gnupg_tab = new GnupgTab();
+ tab_widget->addTab(gnupg_tab, tr("GnuPG"));
+ }
+
tab_widget->addTab(translators_tab, tr("Translators"));
- tab_widget->addTab(update_tab_, tr("Update"));
+
+ if (Module::IsModuleAcivate("com.bktus.gpgfrontend.module."
+ "integrated.version_checking")) {
+ auto* update_tab = new UpdateTab();
+ tab_widget->addTab(update_tab, tr("Update"));
+ }
connect(tab_widget, &QTabWidget::currentChanged, this,
[&](int index) { GF_UI_LOG_DEBUG("current index: {}", index); });
@@ -189,12 +198,12 @@ void UpdateTab::showEvent(QShowEvent* event) {
GF_UI_LOG_DEBUG("loading version loading info from rt");
auto is_loading_done = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.loading_done", false);
if (!is_loading_done) {
Module::ListenRTPublishEvent(
- this, "com.bktus.gpgfrontend.module.integrated.version-checking",
+ this, "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.loading_done",
[=](Module::Namespace, Module::Key, int, std::any) {
GF_UI_LOG_DEBUG(
@@ -213,7 +222,7 @@ void UpdateTab::slot_show_version_status() {
this->pb_->setHidden(true);
auto is_loading_done = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.loading_done", false);
if (!is_loading_done) {
@@ -222,19 +231,19 @@ void UpdateTab::slot_show_version_status() {
}
auto is_need_upgrade = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.need_upgrade", false);
auto is_current_a_withdrawn_version = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.current_a_withdrawn_version", false);
auto is_current_version_released = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.current_version_released", false);
auto latest_version = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.latest_version", QString{});
latest_version_label_->setText("<center><b>" +
diff --git a/src/ui/dialog/help/AboutDialog.h b/src/ui/dialog/help/AboutDialog.h
index b7871a29..86576123 100644
--- a/src/ui/dialog/help/AboutDialog.h
+++ b/src/ui/dialog/help/AboutDialog.h
@@ -129,9 +129,6 @@ class AboutDialog : public GeneralDialog {
* @param ev
*/
void showEvent(QShowEvent* ev) override;
-
- private:
- UpdateTab* update_tab_; ///<
};
} // namespace GpgFrontend::UI
diff --git a/src/ui/dialog/help/GnupgTab.cpp b/src/ui/dialog/help/GnupgTab.cpp
index 1aceed1a..5d3f21aa 100644
--- a/src/ui/dialog/help/GnupgTab.cpp
+++ b/src/ui/dialog/help/GnupgTab.cpp
@@ -115,7 +115,7 @@ void GpgFrontend::UI::GnupgTab::process_software_info() {
QString::fromStdString(fmt::format("Version: {}", gnupg_version)));
auto components = Module::ListRTChildKeys(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
"gnupg.components");
GF_UI_LOG_DEBUG("got gnupg components from rt, size: {}", components.size());
@@ -124,7 +124,7 @@ void GpgFrontend::UI::GnupgTab::process_software_info() {
int row = 0;
for (auto& component : components) {
auto component_info_json_bytes = Module::RetrieveRTValueTypedOrDefault(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
QString("gnupg.components.%1").arg(component), QByteArray{});
GF_UI_LOG_DEBUG("got gnupg component {} info from rt", component);
@@ -171,7 +171,7 @@ void GpgFrontend::UI::GnupgTab::process_software_info() {
ui_->componentDetailsTable->resizeColumnsToContents();
auto directories = Module::ListRTChildKeys(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
QString("gnupg.dirs"));
ui_->directoriesDetailsTable->setRowCount(directories.size());
@@ -179,7 +179,7 @@ void GpgFrontend::UI::GnupgTab::process_software_info() {
row = 0;
for (auto& dir : directories) {
const auto dir_path = Module::RetrieveRTValueTypedOrDefault(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
QString("gnupg.dirs.%1").arg(dir), QString{});
if (dir_path.isEmpty()) continue;
@@ -201,12 +201,12 @@ void GpgFrontend::UI::GnupgTab::process_software_info() {
row = 0;
for (auto& component : components) {
auto options = Module::ListRTChildKeys(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
QString("gnupg.components.%1.options").arg(component));
for (auto& option : options) {
const auto option_info_json =
QJsonDocument::fromJson(Module::RetrieveRTValueTypedOrDefault(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
QString("gnupg.components.%1.options.%2")
.arg(component)
.arg(option),
@@ -228,12 +228,12 @@ void GpgFrontend::UI::GnupgTab::process_software_info() {
QString configuration_group;
for (auto& component : components) {
auto options = Module::ListRTChildKeys(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
QString("gnupg.components.%1.options").arg(component));
for (auto& option : options) {
auto option_info_json_bytes = Module::RetrieveRTValueTypedOrDefault(
- "com.bktus.gpgfrontend.module.integrated.gnupg-info-gathering",
+ "com.bktus.gpgfrontend.module.integrated.gnupg_info_gathering",
QString("gnupg.components.%1.options.%2").arg(component).arg(option),
QByteArray{});
GF_UI_LOG_DEBUG("got gnupg component's option {} info from rt, info: {}",
diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp
index a7bd63d8..c7acb5bc 100644
--- a/src/ui/main_window/MainWindow.cpp
+++ b/src/ui/main_window/MainWindow.cpp
@@ -131,7 +131,7 @@ void MainWindow::Init() noexcept {
edit_->CurTextPage()->setFocus();
Module::ListenRTPublishEvent(
- this, "com.bktus.gpgfrontend.module.integrated.version-checking",
+ this, "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.loading_done",
[=](Module::Namespace, Module::Key, int, std::any) {
GF_UI_LOG_DEBUG(
diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp
index 61c5de56..8483b578 100644
--- a/src/ui/main_window/MainWindowSlotFunction.cpp
+++ b/src/ui/main_window/MainWindowSlotFunction.cpp
@@ -266,7 +266,7 @@ void MainWindow::slot_version_upgrade_nofity() {
GF_UI_LOG_DEBUG(
"slot version upgrade notify called, checking version info from rt...");
auto is_loading_done = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.loading_done", false);
GF_UI_LOG_DEBUG("checking version info from rt, is loading done state: {}",
@@ -277,19 +277,19 @@ void MainWindow::slot_version_upgrade_nofity() {
}
auto is_need_upgrade = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.need_upgrade", false);
auto is_current_a_withdrawn_version = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.current_a_withdrawn_version", false);
auto is_current_version_released = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.current_version_released", false);
auto latest_version = Module::RetrieveRTValueTypedOrDefault<>(
- "com.bktus.gpgfrontend.module.integrated.version-checking",
+ "com.bktus.gpgfrontend.module.integrated.version_checking",
"version.latest_version", QString{});
GF_UI_LOG_DEBUG(