Skip to content

Commit

Permalink
fix: discovered issues by testing
Browse files Browse the repository at this point in the history
  • Loading branch information
saturneric committed Dec 3, 2024
1 parent 78b1b78 commit 46d376d
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .gitea/workflows/develop-qt5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ name: Develop CI Qt5

on:
push:
branches: [main, develop, "dev/**"]
branches: ["dev/**"]
paths-ignore:
- "resource/lfs/locale/**"
- "**.md"
pull_request:
branches: [main, develop, "dev/**"]
branches: ["dev/**"]
paths-ignore:
- "resource/lfs/locale/**"
- "**.md"
Expand Down
4 changes: 2 additions & 2 deletions .gitea/workflows/develop-qt6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ name: Develop CI Qt6

on:
push:
branches: [main, develop, "dev/**"]
branches: ["dev/**"]
paths-ignore:
- "resource/lfs/locale/**"
- "**.md"
pull_request:
branches: [main, develop, "dev/**"]
branches: ["dev/**"]
paths-ignore:
- "resource/lfs/locale/**"
- "**.md"
Expand Down
2 changes: 2 additions & 0 deletions gpgfrontend.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
<file alias="email-check.png">resource/lfs/icons/email-check.png</file>
<file alias="email-open.png">resource/lfs/icons/email-open.png</file>
<file alias="export-email.png">resource/lfs/icons/export-email.png</file>
<file alias="warning-filling.png">resource/lfs/icons/warning-filling.png</file>
<file alias="upgrade.png">resource/lfs/icons/upgrade.png</file>
</qresource>
<qresource prefix="/test/key">
<file alias="pv1.key">resource/lfs/test/data/pv1.key</file>
Expand Down
Binary file added resource/lfs/icons/upgrade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resource/lfs/icons/warning-filling.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 24 additions & 7 deletions src/cmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,18 +171,35 @@ auto PrintEnvInfo() -> int {
}

auto ParseLogLevel(const QString& log_level) -> int {
// default value
if (log_level == "none") return 0;

if (log_level == "debug") {
QLoggingCategory::setFilterRules(
"core.debug=true\nui.debug=true\ntest.debug=true\nmodule.debug=true");
"core.debug=true\n"
"ui.debug=true\n"
"module.debug=true\n"
"test.debug=true");
} else if (log_level == "info") {
QLoggingCategory::setFilterRules(
"*.debug=false\ncore.info=true\nui.info=true\ntest.info="
"true\nmodule.info=true");
} else if (log_level == "warning") {
QLoggingCategory::setFilterRules("*.debug=false\n*.info=false\n");
} else if (log_level == "critical") {
"*.debug=false\n"
"core.info=true\n"
"ui.info=true\n"
"module.info=true\n"
"test.debug=true");
} else if (log_level == "warn") {
QLoggingCategory::setFilterRules(
"*.debug=false\n"
"*.info=false\n"
"core.warning=true\n"
"ui.warning=true\n"
"module.warning=true\n"
"test.warning=true\n");
} else if (log_level == "error") {
QLoggingCategory::setFilterRules(
"*.debug=false\n*.info=false\n*.warning=false\n");
"*.debug=false\n"
"*.info=false\n"
"*.warning=false");
} else {
qWarning() << "unknown log level: " << log_level;
}
Expand Down
2 changes: 2 additions & 0 deletions src/core/utils/GpgUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ auto GPGFRONTEND_CORE_EXPORT GetGpgKeyDatabaseInfos()
#else
gpg_key_database_info_cache.reserve(
static_cast<qsizetype>(context_index_list.size()));
std::fill_n(std::back_inserter(gpg_key_database_info_cache),
context_index_list.size(), KeyDatabaseInfo{});
#endif

for (auto& context_index : context_index_list) {
Expand Down
4 changes: 1 addition & 3 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ auto main(int argc, char* argv[]) -> int {
{{"v", "version"}, "show version information"},
{{"t", "test"}, "run all unit test cases"},
{{"e", "environment"}, "show environment information"},
{{"l", "log-level"},
"set log level (trace, debug, info, warn, error)",
"debug"},
{{"l", "log-level"}, "set log level (debug, info, warn, error)", "none"},
});

parser.process(*ctx->GetApp());
Expand Down
17 changes: 16 additions & 1 deletion src/ui/main_window/MainWindowSlotFunction.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,8 @@ void MainWindow::SlotOpenFile(const QString& path) {
}

void MainWindow::slot_version_upgrade_notify() {
if (!Module::IsModuleActivate(kVersionCheckingModuleID)) return;

auto is_loading_done = Module::RetrieveRTValueTypedOrDefault<>(
kVersionCheckingModuleID, "version.loading_done", false);
if (!is_loading_done) {
Expand Down Expand Up @@ -323,6 +325,13 @@ void MainWindow::slot_version_upgrade_notify() {
statusBar()->showMessage(
tr("GpgFrontend Upgradeable (New Version: %1).").arg(latest_version),
30000);

auto* b = new QToolButton();
b->setToolButtonStyle(Qt::ToolButtonIconOnly);
b->setIcon(QIcon(":/icons/upgrade.png"));
connect(b, &QPushButton::clicked,
[=]() { (new AboutDialog(tr("Update"), this))->show(); });
statusBar()->addPermanentWidget(b);
} else if (is_current_a_withdrawn_version) {
auto response = QMessageBox::warning(
this, tr("Withdrawn Version"),
Expand All @@ -338,13 +347,19 @@ void MainWindow::slot_version_upgrade_notify() {
QDesktopServices::openUrl(
QUrl("https://github.com/saturneric/GpgFrontend/releases/latest"));
}

} else if (!is_current_version_released) {
statusBar()->showMessage(
tr("This may be a BETA Version (Latest Stable Version: %1).")
.arg(latest_version),
30000);

auto* b = new QToolButton();
b->setToolButtonStyle(Qt::ToolButtonIconOnly);
b->setIcon(QIcon(":/icons/warning-filling.png"));
connect(b, &QPushButton::clicked,
[=]() { (new AboutDialog(tr("Update"), this))->show(); });
statusBar()->addPermanentWidget(b);

} else if (is_git_commit_hash_mismatch) {
QMessageBox::information(
this, tr("Commit Hash Mismatch"),
Expand Down

0 comments on commit 46d376d

Please sign in to comment.