diff options
author | saturneric <[email protected]> | 2024-05-03 14:47:08 +0000 |
---|---|---|
committer | saturneric <[email protected]> | 2024-05-03 14:47:08 +0000 |
commit | b5f7516f77ef8e0949115ff3ad01f6c7b1658537 (patch) | |
tree | 44378bd4fdaa7c9a278fa7f766f58d709166e0c8 | |
parent | feat: support theme changing by user (diff) | |
download | GpgFrontend-b5f7516f77ef8e0949115ff3ad01f6c7b1658537.tar.gz GpgFrontend-b5f7516f77ef8e0949115ff3ad01f6c7b1658537.zip |
fix: correct some spelling mistakes
-rw-r--r-- | src/init.cpp | 4 | ||||
-rw-r--r-- | src/init.h | 4 | ||||
-rw-r--r-- | src/main.cpp | 14 | ||||
-rw-r--r-- | src/ui/dialog/help/GnupgTab.cpp | 20 | ||||
-rw-r--r-- | src/ui/main_window/MainWindow.cpp | 15 | ||||
-rw-r--r-- | src/ui/main_window/MainWindow.h | 4 | ||||
-rw-r--r-- | src/ui/main_window/MainWindowSlotFunction.cpp | 2 | ||||
-rw-r--r-- | src/ui/main_window/MainWindowUI.cpp | 8 |
8 files changed, 36 insertions, 35 deletions
diff --git a/src/init.cpp b/src/init.cpp index e5936d31..b3156d1f 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -106,7 +106,7 @@ void InitGlobalPathEnv() { } } -void InitGlobalBasicalEnv(const GFCxtWPtr &p_ctx, bool gui_mode) { +void InitGlobalBasicEnv(const GFCxtWPtr &p_ctx, bool gui_mode) { GFCxtSPtr ctx = p_ctx.lock(); if (ctx == nullptr) { return; @@ -161,7 +161,7 @@ void InitLocale() { QLocale::setDefault(target_locale); } -void ShutdownGlobalBasicalEnv(const GFCxtWPtr &p_ctx) { +void ShutdownGlobalBasicEnv(const GFCxtWPtr &p_ctx) { GFCxtSPtr ctx = p_ctx.lock(); if (ctx == nullptr) { return; @@ -56,13 +56,13 @@ void InitLocale(); * * @param args */ -void InitGlobalBasicalEnv(const GFCxtWPtr &, bool); +void InitGlobalBasicEnv(const GFCxtWPtr &, bool); /** * @brief * * @param p_ctx */ -void ShutdownGlobalBasicalEnv(const GFCxtWPtr &p_ctx); +void ShutdownGlobalBasicEnv(const GFCxtWPtr &p_ctx); } // namespace GpgFrontend
\ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index abc6ed56..a99f3e30 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -33,9 +33,11 @@ #include "GpgFrontendContext.h" #include "app.h" #include "cmd.h" -#include "core/utils/MemoryUtils.h" #include "init.h" +// +#include "core/utils/MemoryUtils.h" + /** * * @param argc @@ -43,7 +45,7 @@ * @return */ auto main(int argc, char* argv[]) -> int { - GpgFrontend::GFCxtSPtr ctx = + GpgFrontend::GFCxtSPtr const ctx = GpgFrontend::SecureCreateSharedObject<GpgFrontend::GpgFrontendContext>( argc, argv); ctx->InitApplication(); @@ -79,17 +81,17 @@ auto main(int argc, char* argv[]) -> int { ctx->gather_external_gnupg_info = false; ctx->load_default_gpg_context = false; - InitGlobalBasicalEnv(ctx, false); + InitGlobalBasicEnv(ctx, false); rtn = RunTest(ctx); - ShutdownGlobalBasicalEnv(ctx); + ShutdownGlobalBasicEnv(ctx); return rtn; } ctx->gather_external_gnupg_info = true; ctx->load_default_gpg_context = true; - InitGlobalBasicalEnv(ctx, true); + InitGlobalBasicEnv(ctx, true); rtn = StartApplication(ctx); - ShutdownGlobalBasicalEnv(ctx); + ShutdownGlobalBasicEnv(ctx); return rtn; } diff --git a/src/ui/dialog/help/GnupgTab.cpp b/src/ui/dialog/help/GnupgTab.cpp index 07f07b82..ac018def 100644 --- a/src/ui/dialog/help/GnupgTab.cpp +++ b/src/ui/dialog/help/GnupgTab.cpp @@ -57,11 +57,11 @@ GnupgTab::GnupgTab(QWidget* parent) ui_->componentDetailsTable->setSelectionBehavior( QAbstractItemView::SelectRows); - // tableitems not editable + // table items not editable ui_->componentDetailsTable->setEditTriggers( QAbstractItemView::NoEditTriggers); - // no focus (rectangle around tableitems) + // no focus (rectangle around table items) // may be it should focus on whole row ui_->componentDetailsTable->setFocusPolicy(Qt::NoFocus); ui_->componentDetailsTable->setAlternatingRowColors(true); @@ -70,7 +70,7 @@ GnupgTab::GnupgTab(QWidget* parent) directories_column_titles << tr("Directory Type") << tr("Path"); ui_->directoriesDetailsTable->setColumnCount( - directories_column_titles.length()); + static_cast<int>(directories_column_titles.length())); ui_->directoriesDetailsTable->setHorizontalHeaderLabels( directories_column_titles); ui_->directoriesDetailsTable->horizontalHeader()->setStretchLastSection( @@ -78,11 +78,11 @@ GnupgTab::GnupgTab(QWidget* parent) ui_->directoriesDetailsTable->setSelectionBehavior( QAbstractItemView::SelectRows); - // tableitems not editable + // table items not editable ui_->directoriesDetailsTable->setEditTriggers( QAbstractItemView::NoEditTriggers); - // no focus (rectangle around tableitems) + // no focus (rectangle around table items) // may be it should focus on whole row ui_->directoriesDetailsTable->setFocusPolicy(Qt::NoFocus); ui_->directoriesDetailsTable->setAlternatingRowColors(true); @@ -97,10 +97,10 @@ GnupgTab::GnupgTab(QWidget* parent) ui_->optionDetailsTable->horizontalHeader()->setStretchLastSection(false); ui_->optionDetailsTable->setSelectionBehavior(QAbstractItemView::SelectRows); - // tableitems not editable + // table items not editable ui_->optionDetailsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); - // no focus (rectangle around tableitems) + // no focus (rectangle around table items) // may be it should focus on whole row ui_->optionDetailsTable->setFocusPolicy(Qt::NoFocus); ui_->optionDetailsTable->setAlternatingRowColors(true); @@ -179,7 +179,8 @@ void GnupgTab::process_software_info() { auto directories = Module::ListRTChildKeys(kGnuPGInfoGatheringModuleID, QString("gnupg.dirs")); - ui_->directoriesDetailsTable->setRowCount(directories.size()); + ui_->directoriesDetailsTable->setRowCount( + static_cast<int>(directories.size())); row = 0; for (auto& dir : directories) { @@ -202,7 +203,7 @@ void GnupgTab::process_software_info() { ui_->directoriesDetailsTable->resizeColumnsToContents(); - // calcualte the total row number of configuration table + // calculate the total row number of configuration table row = 0; for (auto& component : components) { auto options = Module::ListRTChildKeys( @@ -299,7 +300,6 @@ void GnupgTab::process_software_info() { ui_->loadProgressBar->hide(); ui_->tabWidget->setDisabled(false); - // ui_->configurationDetailsTable->resizeColumnsToContents(); } void GnupgTab::gather_gnupg_info() { diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index e1c355c4..d7cc9754 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -31,7 +31,6 @@ #include "core/function/CacheManager.h" #include "core/function/CoreSignalStation.h" #include "core/function/GlobalSettingStation.h" -#include "core/function/gpg/GpgAdvancedOperator.h" #include "core/model/GpgPassphraseContext.h" #include "core/model/SettingsObject.h" #include "core/module/ModuleManager.h" @@ -120,7 +119,7 @@ void MainWindow::Init() noexcept { m_key_list_->AddMenuAction(copy_key_default_uid_to_clipboard_act_); m_key_list_->AddMenuAction(copy_key_id_to_clipboard_act_); m_key_list_->AddMenuAction(set_owner_trust_of_key_act_); - m_key_list_->AddMenuAction(add_key_2_favourtie_act_); + m_key_list_->AddMenuAction(add_key_2_favourite_act_); m_key_list_->AddMenuAction(remove_key_from_favourtie_act_); m_key_list_->AddSeparator(); @@ -134,9 +133,9 @@ void MainWindow::Init() noexcept { this, kVersionCheckingModuleID, "version.loading_done", [=](Module::Namespace, Module::Key, int, std::any) { GF_UI_LOG_DEBUG( - "versionchecking version.loading_done changed, calling slot " + "version-checking version.loading_done changed, calling slot " "version upgrade"); - this->slot_version_upgrade_nofity(); + this->slot_version_upgrade_notify(); }); // loading process is done @@ -148,7 +147,7 @@ void MainWindow::Init() noexcept { // check if need to open wizard window auto settings = GlobalSettingStation::GetInstance().GetSettings(); - bool show_wizard = settings.value("wizard/show_wizard", true).toBool(); + auto show_wizard = settings.value("wizard/show_wizard", true).toBool(); if (show_wizard) slot_start_wizard(); } catch (...) { @@ -195,7 +194,7 @@ void MainWindow::recover_editor_unsaved_pages_from_cache() { bool first = true; - QJsonArray unsaved_page_array = json_data.array(); + auto unsaved_page_array = json_data.array(); for (const auto &value_ref : unsaved_page_array) { if (!value_ref.isObject()) continue; auto unsaved_page_json = value_ref.toObject(); @@ -205,8 +204,8 @@ void MainWindow::recover_editor_unsaved_pages_from_cache() { continue; } - QString title = unsaved_page_json["title"].toString(); - QString content = unsaved_page_json["content"].toString(); + 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", diff --git a/src/ui/main_window/MainWindow.h b/src/ui/main_window/MainWindow.h index 6847ec4a..197fb04c 100644 --- a/src/ui/main_window/MainWindow.h +++ b/src/ui/main_window/MainWindow.h @@ -357,7 +357,7 @@ class MainWindow : public GeneralMainWindow { /** * @details called when need to upgrade. */ - void slot_version_upgrade_nofity(); + void slot_version_upgrade_notify(); /** * @details @@ -489,7 +489,7 @@ class MainWindow : public GeneralMainWindow { QAction* copy_key_id_to_clipboard_act_{}; ///< QAction* copy_key_default_uid_to_clipboard_act_{}; ///< - QAction* add_key_2_favourtie_act_{}; ///< + QAction* add_key_2_favourite_act_{}; ///< QAction* remove_key_from_favourtie_act_{}; ///< QAction* set_owner_trust_of_key_act_{}; ///< diff --git a/src/ui/main_window/MainWindowSlotFunction.cpp b/src/ui/main_window/MainWindowSlotFunction.cpp index 4a95d450..7d50b85a 100644 --- a/src/ui/main_window/MainWindowSlotFunction.cpp +++ b/src/ui/main_window/MainWindowSlotFunction.cpp @@ -262,7 +262,7 @@ void MainWindow::SlotOpenFile(const QString& path) { edit_->SlotOpenFile(path); } -void MainWindow::slot_version_upgrade_nofity() { +void MainWindow::slot_version_upgrade_notify() { GF_UI_LOG_DEBUG( "slot version upgrade notify called, checking version info from rt..."); auto is_loading_done = Module::RetrieveRTValueTypedOrDefault<>( diff --git a/src/ui/main_window/MainWindowUI.cpp b/src/ui/main_window/MainWindowUI.cpp index 475eed0e..02b630d2 100644 --- a/src/ui/main_window/MainWindowUI.cpp +++ b/src/ui/main_window/MainWindowUI.cpp @@ -500,10 +500,10 @@ void MainWindow::create_actions() { connect(show_key_details_act_, &QAction::triggered, this, &MainWindow::slot_show_key_details); - add_key_2_favourtie_act_ = new QAction(tr("Add To Favourite"), this); - add_key_2_favourtie_act_->setToolTip(tr("Add this key to Favourite Table")); - add_key_2_favourtie_act_->setData(QVariant("add_key_2_favourite_action")); - connect(add_key_2_favourtie_act_, &QAction::triggered, this, + add_key_2_favourite_act_ = new QAction(tr("Add To Favourite"), this); + add_key_2_favourite_act_->setToolTip(tr("Add this key to Favourite Table")); + add_key_2_favourite_act_->setData(QVariant("add_key_2_favourite_action")); + connect(add_key_2_favourite_act_, &QAction::triggered, this, &MainWindow::slot_add_key_2_favourite); remove_key_from_favourtie_act_ = |