From 95997d27106daf91336847f50efaaa32279b7fc7 Mon Sep 17 00:00:00 2001 From: saturneric Date: Mon, 16 Oct 2023 17:54:05 +0800 Subject: fix: check and update copyright at files --- src/ui/widgets/HelpPage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/widgets/HelpPage.cpp') diff --git a/src/ui/widgets/HelpPage.cpp b/src/ui/widgets/HelpPage.cpp index b116df30..67572678 100644 --- a/src/ui/widgets/HelpPage.cpp +++ b/src/ui/widgets/HelpPage.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2021 Saturneric + * Copyright (C) 2021 Saturneric * * This file is part of GpgFrontend. * @@ -20,7 +20,7 @@ * the gpg4usb project, which is under GPL-3.0-or-later. * * All the source code of GpgFrontend was modified and released by - * Saturneric starting on May 12, 2021. + * Saturneric starting on May 12, 2021. * * SPDX-License-Identifier: GPL-3.0-or-later * -- cgit v1.2.3 From 4994f4eaa1211d402b791660ad6221154a4c2405 Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 16 Jan 2024 11:49:50 +0800 Subject: fix: make task and threading system safer --- src/ui/widgets/HelpPage.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/ui/widgets/HelpPage.cpp') diff --git a/src/ui/widgets/HelpPage.cpp b/src/ui/widgets/HelpPage.cpp index 67572678..dc82d279 100644 --- a/src/ui/widgets/HelpPage.cpp +++ b/src/ui/widgets/HelpPage.cpp @@ -28,8 +28,6 @@ #include "ui/widgets/HelpPage.h" -#include - namespace GpgFrontend::UI { HelpPage::HelpPage(const QString& path, QWidget* parent) : QWidget(parent) { -- cgit v1.2.3 From e8d604cf2924ab101c2a102c23d5028473289814 Mon Sep 17 00:00:00 2001 From: saturneric Date: Thu, 18 Jan 2024 21:47:17 +0800 Subject: fix: slove discovered bugs --- src/ui/widgets/HelpPage.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/ui/widgets/HelpPage.cpp') diff --git a/src/ui/widgets/HelpPage.cpp b/src/ui/widgets/HelpPage.cpp index dc82d279..e3ebac6f 100644 --- a/src/ui/widgets/HelpPage.cpp +++ b/src/ui/widgets/HelpPage.cpp @@ -64,10 +64,9 @@ QUrl HelpPage::localized_help(const QUrl& url) { QStringList fileparts = filename.split("."); // QSettings settings; - QString lang = - QSettings().value("int/lang", QLocale::system().name()).toString(); + QString lang = QSettings().value("int/lang", QLocale().name()).toString(); if (lang.isEmpty()) { - lang = QLocale::system().name(); + lang = QLocale().name(); } fileparts.insert(1, lang); -- cgit v1.2.3 From f22ceca734868a4cb946c232f661aad72da01ded Mon Sep 17 00:00:00 2001 From: saturneric Date: Fri, 19 Jan 2024 20:10:17 +0800 Subject: fix: slove discovered faults and bugs --- src/ui/widgets/HelpPage.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/ui/widgets/HelpPage.cpp') diff --git a/src/ui/widgets/HelpPage.cpp b/src/ui/widgets/HelpPage.cpp index e3ebac6f..78169944 100644 --- a/src/ui/widgets/HelpPage.cpp +++ b/src/ui/widgets/HelpPage.cpp @@ -32,11 +32,11 @@ namespace GpgFrontend::UI { HelpPage::HelpPage(const QString& path, QWidget* parent) : QWidget(parent) { browser_ = new QTextBrowser(); - auto* mainLayout = new QVBoxLayout(); - mainLayout->setSpacing(0); - mainLayout->addWidget(browser_); - mainLayout->setContentsMargins(0, 0, 0, 0); - setLayout(mainLayout); + auto* main_layout = new QVBoxLayout(); + main_layout->setSpacing(0); + main_layout->addWidget(browser_); + main_layout->setContentsMargins(0, 0, 0, 0); + setLayout(main_layout); connect(browser_, &QTextBrowser::anchorClicked, this, &HelpPage::slot_open_url); @@ -57,7 +57,7 @@ void HelpPage::slot_open_url(const QUrl& url) { * @param url * @return */ -QUrl HelpPage::localized_help(const QUrl& url) { +auto HelpPage::localized_help(const QUrl& url) -> QUrl { QString path = url.toLocalFile(); QString filename = path.mid(path.lastIndexOf("/") + 1); QString filepath = path.left(path.lastIndexOf("/") + 1); @@ -74,9 +74,8 @@ QUrl HelpPage::localized_help(const QUrl& url) { if (QFile(QUrl(langfile).toLocalFile()).exists()) { return langfile; - } else { - return path; } + return path; } QTextBrowser* HelpPage::GetBrowser() { return browser_; } -- cgit v1.2.3