From 63500cbbee8b91d9789e550fd3f027ae2e18059c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 21 Mar 2023 22:19:28 +0100 Subject: gnu: Add converseen. * gnu/packages/image.scm (converseen): New variable. * gnu/packages/patches/converseen-hide-non-free-pointers.patch: * gnu/packages/patches/converseen-hide-updates-checks.patch: New files. * gnu/local.mk: Register files above. --- .../converseen-hide-non-free-pointers.patch | 198 +++++++++++++++++++++ .../patches/converseen-hide-updates-checks.patch | 110 ++++++++++++ 2 files changed, 308 insertions(+) create mode 100644 gnu/packages/patches/converseen-hide-non-free-pointers.patch create mode 100644 gnu/packages/patches/converseen-hide-updates-checks.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/converseen-hide-non-free-pointers.patch b/gnu/packages/patches/converseen-hide-non-free-pointers.patch new file mode 100644 index 0000000000..b4994733cd --- /dev/null +++ b/gnu/packages/patches/converseen-hide-non-free-pointers.patch @@ -0,0 +1,198 @@ +Remove pointers to PayPal and Facebook. +Upstream status: Guix-specific, not forwarded upstream. + +diff --git a/src/dialoginfo.cpp b/src/dialoginfo.cpp +index 3302f55..b64f414 100755 +--- a/src/dialoginfo.cpp ++++ b/src/dialoginfo.cpp +@@ -31,7 +31,6 @@ DialogInfo::DialogInfo(QWidget *parent) : + setupUi(this); + + connect(pushClose, SIGNAL(clicked()), this, SLOT(close())); +- connect(pushFacebook, SIGNAL(clicked()), this, SLOT(openFacebookPage())); + + QString appVersion; + QString magickVersion; +@@ -63,8 +62,3 @@ void DialogInfo::openFacebookPage() + QDesktopServices::openUrl(QUrl("https://www.facebook.com/converseen", QUrl::TolerantMode)); + } + +-void DialogInfo::on_pushDonatePayPal_clicked() +-{ +- QDesktopServices::openUrl(QUrl("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HQA6TBT5354FC", QUrl::TolerantMode)); +-} +- +diff --git a/src/dialoginfo.h b/src/dialoginfo.h +index 4c13776..f1b7ea3 100755 +--- a/src/dialoginfo.h ++++ b/src/dialoginfo.h +@@ -33,7 +33,6 @@ public: + + private slots: + void openFacebookPage(); +- void on_pushDonatePayPal_clicked(); + }; + + #endif // DIALOGINFO_H +diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp +index 83a365f..9a44492 100755 +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -162,7 +162,6 @@ void MainWindowImpl::createActions() + connect(actionConvert, SIGNAL(triggered()), this, SLOT(elabora())); + + connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); +- connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); + connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); + } + +diff --git a/ui/dialoginfo.ui b/ui/dialoginfo.ui +index b2c7788..20b9d9d 100755 +--- a/ui/dialoginfo.ui ++++ b/ui/dialoginfo.ui +@@ -254,122 +254,6 @@ p, li { white-space: pre-wrap; } + + + +- +- +- +- +- +- <html><head/><body><p align="center"><span style=" font-weight:600;">If you appreciate this work and would like to support the project, you are welcome to donate via PayPal</span></p></body></html> +- +- +- true +- +- +- +- +- +- +- +- +- +- +- +- +- :/Images/res/btn_donateCC_LG.png:/Images/res/btn_donateCC_LG.png +- +- +- +- 150 +- 50 +- +- +- +- true +- +- +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- 40 +- 20 +- +- +- +- +- +- +- +- +- +- <html><head/><body><p><span style=" font-size:11pt; font-weight:600;">Follow Converseen:</span></p></body></html> +- +- +- +- +- +- +- PointingHandCursor +- +- +- +- +- +- +- :/Images/res/facebook-icon.png:/Images/res/facebook-icon.png +- +- +- +- 32 +- 32 +- +- +- +- true +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- +- 40 +- 20 +- +- +- +- +- +- +- +- +- +- Qt::Horizontal +- +- +- + + + +diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui +index 28df8cc..0ee7f37 100755 +--- a/ui/mainwindow.ui ++++ b/ui/mainwindow.ui +@@ -1334,18 +1334,6 @@ p, li { white-space: pre-wrap; } + F1 + + +- +- +- +- :/Images/res/paypal_mini.png:/Images/res/paypal_mini.png +- +- +- &Donate via Paypal +- +- +- Donate via Paypal +- +- + + + &Report bug... diff --git a/gnu/packages/patches/converseen-hide-updates-checks.patch b/gnu/packages/patches/converseen-hide-updates-checks.patch new file mode 100644 index 0000000000..c4c80b5bec --- /dev/null +++ b/gnu/packages/patches/converseen-hide-updates-checks.patch @@ -0,0 +1,110 @@ +Remove Check updates button and Auto check updates option. +Upstream status: Guix-specific, not forwarded upstream. + +diff --git a/src/dialogoptions.cpp b/src/dialogoptions.cpp +index 704e75c..bb3f9b0 100755 +--- a/src/dialogoptions.cpp ++++ b/src/dialogoptions.cpp +@@ -71,23 +71,10 @@ void DialogOptions::setOverwriteMode() + IniSettings::setOverwriteMode(true); + } + +-void DialogOptions::setAutoUpdates() +-{ +- bool enabled; +- +- if (checkCheckUpdates->isChecked()) +- enabled = true; +- else +- enabled = false; +- +- IniSettings::setAutoChechUpdates(enabled); +-} +- + void DialogOptions::saveOptions() + { + setLanguage(); + setOverwriteMode(); +- setAutoUpdates(); + + IniSettings::settings->sync(); + accept(); +@@ -102,12 +89,6 @@ void DialogOptions::loadSettings() + else + radioAskFirst->setChecked(true); + +- bool autoUpdates = IniSettings::isAutoChechUpdates(); +- if (autoUpdates) +- checkCheckUpdates->setCheckState(Qt::Checked); +- else +- checkCheckUpdates->setCheckState(Qt::Unchecked); +- + Translator t; + + int idx = comboLangs->findText(t.currentLanguage(), Qt::MatchExactly); +diff --git a/src/mainwindowimpl.cpp b/src/mainwindowimpl.cpp +index 2b6d68d..83a365f 100755 +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -164,7 +164,6 @@ void MainWindowImpl::createActions() + connect(actionInfo, SIGNAL(triggered()), this, SLOT(about())); + connect(actionDonatePaypal, SIGNAL(triggered()), this, SLOT(openPaypalLink())); + connect(actionReportBug, SIGNAL(triggered()), this, SLOT(bugReport())); +- connect(actionCheckForUpdates, SIGNAL(triggered()), this, SLOT(checkForUpdates())); + } + + void MainWindowImpl::setupMenu() +diff --git a/ui/dialogoptions.ui b/ui/dialogoptions.ui +index e59148d..6cb23f5 100755 +--- a/ui/dialogoptions.ui ++++ b/ui/dialogoptions.ui +@@ -66,22 +66,6 @@ + + + +- +- +- +- Updates +- +- +- +- +- +- Checks for updates automatically +- +- +- +- +- +- + + + +diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui +index a5f55f0..28df8cc 100755 +--- a/ui/mainwindow.ui ++++ b/ui/mainwindow.ui +@@ -190,7 +190,6 @@ + + + +- + + + +@@ -1365,14 +1364,6 @@ p, li { white-space: pre-wrap; } + Import windows icon (*.ico *.icon) + + +- +- +- &Check for updates +- +- +- Check if a new version of Converseen is available +- +- + + + -- cgit 1.4.1