Merge pull request #334 from ales-erjavec/application-urls

[ENH] Add 'Donate' application url role

Author: ajdapretnar

i18n/si/msgs.jaml

@@ -14,11 +14,13 @@ config.py:
     class `Config`:
         def `core_packages`:
             orange-canvas-core >= 0.1a, < 0.2a: false
+        FAQ: Pogosta vprašanja
         Bug Report: Poročila o napakah
         Quick Start: Hiter začetek
         Documentation: Uporabniška navodila
         Screencasts: Zaslonski posnetki
         Feedback: Povratne informacije
+        Donate: Doniraj
     class `Default`:
         biolab.si: false
         Orange Canvas Core: false
@@ -98,6 +100,8 @@ config.py:
     HTTP proxy.: false
     network/https-proxy: false
     HTTPS proxy.: false
+    network/use-certs: false
+    Use system certificates.: Uporabi sistemske certifikate.
     def `log_dir`:
         darwin: false
         ~/Library/Logs: false
@@ -465,6 +469,18 @@ application/canvasmain.py:
             examples-action: false
             Browse example workflows.: Prebrskaj primere delotokov
             Examples.svg: false
+            Frequent Questions...: Pogosta vprašanja
+            frequent-questions: false
+            FAQ: Pogosta vprašanja
+            Submit Feedback...: Pošlji povratno informacijo
+            submit-feedback-action: false
+            Feedback: Povratna informacija
+            Submit a Bug Report...: Pošlji poročilo o napaki
+            submit-bug-report-action: false
+            Bug Report: Poročilo o napaki
+            Donate...: Doniraj
+            donate-action: false
+            Donate: Doniraj
             About: O programu
             about-action: false
             Show about dialog.: Pokaži opis programa
@@ -705,6 +721,7 @@ application/canvasmain.py:
             Welcome to {}: Dobrodošli v programu {}
             Welcome: Dobrodošli
             Feedback: false
+            Donate: Doniraj
             New: Nov
             Open a new workflow.: Odpri nov delotok
             New.svg: false
@@ -790,6 +807,8 @@ application/canvasmain.py:
             show-channel-names: false
             open-anchors-on-hover: false
             enable-node-animations: false
+            network: false
+            use-certs: false
     def `index`:
         key: false
         predicate: false
@@ -1054,6 +1073,8 @@ application/settings.py:
             HTTP proxy:: true
             network/https-proxy: false
             HTTPS proxy:: true
+            network/use-certs: false
+            Use system certificates:: Uporabi sistemske certifikate.
         def `reset`:
             Error reseting %r: false
         def `exec_`:
@@ -1119,12 +1140,16 @@ WelcomeActionButton:focus {
         def `__init__`:
             showAtStartup: false
             feedbackUrl: false
+            donateUrl: false
         def `setupUi`:
             bottom-bar: false
             Show at startup: Pokaži ob zagonu
         def `setFeedbackUrl`:
             Help us improve!: Pomagaj, da bomo še boljši
             <a href="{url}">{text}</a>: false
+        def `setDonateUrl`:
+            Donate: Doniraj
+            <a href="{url}">{text}</a>: false
         def `addRow`:
             light-orange: false
         def `insertRow`:

orangecanvas/application/canvasmain.py

@@ -499,6 +499,30 @@ def config_url_action(action, role):
             icon=load_styled_svg_icon("Examples.svg")
         )
 
+        self.frequent_questions_action = QAction(
+            self.tr("Frequent Questions..."), self,
+            objectName="frequent-questions"
+        )
+        config_url_action(self.frequent_questions_action, "FAQ")
+
+        self.submit_feedback_action = QAction(
+            self.tr("Submit Feedback..."), self,
+            objectName="submit-feedback-action",
+        )
+        config_url_action(self.submit_feedback_action, "Feedback")
+
+        self.submit_bug_report_action = QAction(
+            self.tr("Submit a Bug Report..."), self,
+            objectName="submit-bug-report-action",
+        )
+        config_url_action(self.submit_bug_report_action, "Bug Report")
+
+        self.donate_action = QAction(
+            self.tr("Donate..."), self,
+            objectName="donate-action",
+        )
+        config_url_action(self.donate_action, "Donate")
+
         self.about_action = QAction(
             self.tr("About"), self,
             objectName="about-action",
@@ -762,7 +786,13 @@ def setup_menu(self):
             self.examples_action,
             self.documentation_action
         ])
-
+        self.help_menu.addSeparator()
+        self.help_menu.addActions([
+            self.frequent_questions_action,
+            self.submit_feedback_action,
+            self.submit_bug_report_action,
+            self.donate_action,
+        ])
         menu_bar.addMenu(self.help_menu)
 
         self.setMenuBar(menu_bar)
@@ -1979,6 +2009,10 @@ def welcome_dialog(self):
         if feedback:
             dialog.setFeedbackUrl(feedback)
 
+        donate = config.default.APPLICATION_URLS.get("Donate", "")
+        if donate:
+            dialog.setDonateUrl(donate)
+
         def new_scheme():
             if not self.is_transient():
                 self.new_workflow_window()

orangecanvas/application/tests/test_welcomedialog.py

@@ -38,3 +38,6 @@ def p(a):
         self.qWait()
         self.assertIs(action[0], d.triggeredAction())
         self.assertIs(action[0], action1)
+
+        d.setDonateUrl("https://example.com/donate")
+        d.setFeedbackUrl("https://example.com/feedback")

orangecanvas/application/welcomedialog.py

@@ -118,17 +118,21 @@ class WelcomeDialog(QDialog):
     def __init__(self, *args, **kwargs):
         showAtStartup = kwargs.pop("showAtStartup", True)
         feedbackUrl = kwargs.pop("feedbackUrl", "")
+        donateUrl = kwargs.pop("donateUrl", "")
         super().__init__(*args, **kwargs)
 
         self.__triggeredAction = None  # type: Optional[QAction]
         self.__showAtStartupCheck = None
         self.__mainLayout = None
         self.__feedbackUrl = None
         self.__feedbackLabel = None
+        self.__donateUrl = None
+        self.__donateLabel = None
 
         self.setupUi()
 
         self.setFeedbackUrl(feedbackUrl)
+        self.setDonateUrl(donateUrl)
         self.setShowAtStartup(showAtStartup)
 
     def setupUi(self):
@@ -159,13 +163,22 @@ def setupUi(self):
             openExternalLinks=True,
             visible=False,
         )
+        self.__donateLabel = QLabel(
+            textInteractionFlags=Qt.TextBrowserInteraction,
+            openExternalLinks=True,
+            visible=False,
+        )
 
         bottom_bar_layout.addWidget(
             self.__showAtStartupCheck, alignment=Qt.AlignVCenter | Qt.AlignLeft
         )
+        bottom_bar_layout.addStretch(10)
         bottom_bar_layout.addWidget(
             self.__feedbackLabel, alignment=Qt.AlignVCenter | Qt.AlignRight
         )
+        bottom_bar_layout.addWidget(
+            self.__donateLabel, alignment=Qt.AlignVCenter | Qt.AlignRight
+        )
         self.layout().addWidget(bottom_bar, alignment=Qt.AlignBottom,
                                 stretch=1)
 
@@ -202,6 +215,20 @@ def setFeedbackUrl(self, url):
             self.__feedbackLabel.setText("")
         self.__feedbackLabel.setVisible(bool(url))
 
+    def setDonateUrl(self, url: str) -> None:
+        """
+        Set an 'Donate' url. When set a link is displayed in the bottom row.
+        """
+        self.__donateUrl = url
+        if url:
+            text = self.tr("Donate")
+            self.__donateLabel.setText(
+                '<a href="{url}">{text}</a>'.format(url=url, text=escape(text))
+            )
+        else:
+            self.__donateLabel.setText("")
+        self.__donateLabel.setVisible(bool(url))
+
     def addRow(self, actions, background="light-orange"):
         """Add a row with `actions`.
         """

orangecanvas/config.py

@@ -194,6 +194,8 @@ def workflow_constructor(self, *args, **kwargs):
     #: Standard application urls. If defined to a valid url appropriate actions
     #: are defined in various contexts
     APPLICATION_URLS = {
+        #: FAQ
+        "FAQ": None,
         #: Submit a bug report action in the Help menu
         "Bug Report": None,
         #: A url quick tour/getting started url
@@ -204,6 +206,8 @@ def workflow_constructor(self, *args, **kwargs):
         "Screencasts": None,
         #: Used for 'Submit Feedback' action in the help menu
         "Feedback": None,
+        #: A Donate action in the help menu
+        "Donate": None,
     }  # type: Dict[str, Optional[str]]