From c58119c3cd67ebdf92981142de4e40bb390d5f76 Mon Sep 17 00:00:00 2001 From: shenleban tongying Date: Thu, 5 Jan 2023 20:32:05 -0500 Subject: [PATCH 1/2] fix cmake build --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index caa35c1a..1cb9fed2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,8 +329,6 @@ set(PROJECT_SOURCES history.hh historypanewidget.cc historypanewidget.hh - hotkeyedit.cc - hotkeyedit.hh hotkeywrapper.cc hotkeywrapper.hh htmlescape.cc From ce037dbfda1d4d4c4204e5cd4f84659d41c66ffa Mon Sep 17 00:00:00 2001 From: shenleban tongying Date: Thu, 5 Jan 2023 20:34:53 -0500 Subject: [PATCH 2/2] doc: update urls Replace old goldendict.org --- README.md | 2 +- article_maker.cc | 4 ++-- main.cc | 2 +- mainwindow.cc | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0c88c0c3..ffa6f534 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ To start coding, the easiest way is load the `goldendict.pro` file to Qt Creator ## Support -Bug reporting: [GoldenDict issue tracker](https://github.com/goldendict/goldendict/issues) +Bug reporting: [GoldenDict issue tracker](https://github.com/xiaoyifang/goldendict/issues) General discussions: [discussions](https://github.com/xiaoyifang/goldendict/discussions) diff --git a/article_maker.cc b/article_maker.cc index 0a6a885d..904024d1 100644 --- a/article_maker.cc +++ b/article_maker.cc @@ -259,8 +259,8 @@ sptr< Dictionary::DataRequest > ArticleMaker::makeDefinitionFor( "

To customize program, check out the available preferences at Edit|Preferences. " "All settings there have tooltips, be sure to read them if you are in doubt about anything." "

Should you need further help, have any questions, " -"suggestions or just wonder what the others think, you are welcome at the program's forum." -"

Check program's website for the updates. " +"suggestions or just wonder what the others think, you are welcome at the program's forum." +"

Check program's website for the updates. " "

(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later." ).toUtf8().data(); diff --git a/main.cc b/main.cc index 478ec028..b8cac235 100644 --- a/main.cc +++ b/main.cc @@ -325,7 +325,7 @@ int main( int argc, char ** argv ) } app.setApplicationName( "GoldenDict" ); - app.setOrganizationDomain( "http://goldendict.org/" ); + app.setOrganizationDomain( "https://github.com/xiaoyifang/goldendict" ); //this line will forbid stylesheet applying on GroupComboBox // app.setStyle(new GdAppStyle); diff --git a/mainwindow.cc b/mainwindow.cc index 7590fb89..63422f32 100644 --- a/mainwindow.cc +++ b/mainwindow.cc @@ -3207,7 +3207,7 @@ void MainWindow::showMainWindow() void MainWindow::visitHomepage() { - QDesktopServices::openUrl( QUrl( "http://goldendict.org/" ) ); + QDesktopServices::openUrl( QApplication::organizationDomain() ); } void MainWindow::openConfigFolder() @@ -3217,7 +3217,7 @@ void MainWindow::openConfigFolder() void MainWindow::visitForum() { - QDesktopServices::openUrl( QUrl( "http://goldendict.org/forum/" ) ); + QDesktopServices::openUrl( QUrl( "https://github.com/xiaoyifang/goldendict/discussions" ) ); } void MainWindow::showAbout()