canvasmain -> __main__.py: Reimplement survey and statistics request as notifications

Author: irgolic

Orange/canvas/__main__.py

@@ -19,7 +19,7 @@
 
 import pkg_resources
 
-from AnyQt.QtGui import QFont, QColor, QPalette, QDesktopServices
+from AnyQt.QtGui import QFont, QColor, QPalette, QDesktopServices, QIcon
 from AnyQt.QtWidgets import QMessageBox
 from AnyQt.QtCore import (
     Qt, QDir, QUrl, QSettings, QThread, pyqtSignal, QT_VERSION
@@ -39,6 +39,7 @@
 from Orange.canvas.registry import qt
 from Orange.canvas.registry import WidgetRegistry, set_global_registry
 from Orange.canvas.registry import cache
+from Orange.canvas.utils.overlay import NotificationWidget, NotificationOverlay
 
 log = logging.getLogger(__name__)
 
@@ -180,6 +181,57 @@ def make_sql_logger(level=logging.INFO):
     sql_log.addHandler(handler)
 
 
+def setup_notifications():
+    settings = config.settings()
+
+    # If run for the fifth time, prompt short survey
+    show_survey = settings["startup/show-short-survey"] and \
+                  settings["startup/launch-count"] >= 5
+    if show_survey:
+        surveyDialogButtons = NotificationWidget.Ok | NotificationWidget.Close
+        surveyDialog = NotificationWidget(icon=QIcon("Orange/widgets/icons/information.png"),
+                                          title="Survey",
+                                          text="We want to understand our users better.\n"
+                                               "Would you like to take a short survey?",
+                                          standardButtons=surveyDialogButtons)
+
+        def handle_response(button):
+            if surveyDialog.buttonRole(button) == NotificationWidget.AcceptRole:
+                success = QDesktopServices.openUrl(
+                    QUrl("https://orange.biolab.si/survey/short.html"))
+                settings["startup/show-short-survey"] = not success
+            elif surveyDialog.buttonRole(button) == NotificationWidget.RejectRole:
+                settings["startup/show-short-survey"] = False
+
+        surveyDialog.clicked.connect(handle_response)
+
+        NotificationOverlay.registerNotification(surveyDialog)
+
+    # data collection permission
+    if not settings["error-reporting/permission-requested"]:
+        permDialogButtons = NotificationWidget.Ok | NotificationWidget.Close
+        permDialog = NotificationWidget(icon=QIcon("distribute/icon-48.png"),
+                                        title="Anonymous Usage Statistics",
+                                        text="Do you wish to opt-in to sharing "
+                                             "statistics about how you use Orange?\n"
+                                             "All data is anonymized and used "
+                                             "exclusively for understanding how users "
+                                             "interact with Orange.",
+                                        standardButtons=permDialogButtons)
+        btnOK = permDialog.button(NotificationWidget.AcceptRole)
+        btnOK.setText("Allow")
+
+        def handle_response(button):
+            if permDialog.buttonRole(button) != permDialog.DismissRole:
+                settings["error-reporting/permission-requested"] = True
+            if permDialog.buttonRole(button) == permDialog.AcceptRole:
+                settings["error-reporting/send-statistics"] = True
+
+        permDialog.clicked.connect(handle_response)
+
+        NotificationOverlay.registerNotification(permDialog)
+
+
 def check_for_updates():
     settings = QSettings()
     check_updates = settings.value('startup/check-updates', True, type=bool)
@@ -244,8 +296,8 @@ def compare_versions(latest):
         thread.start()
         return thread
 
-def send_usage_statistics():
 
+def send_usage_statistics():
     class SendUsageStatistics(QThread):
         def run(self):
             try:
@@ -259,6 +311,7 @@ def run(self):
     thread.start()
     return thread
 
+
 def main(argv=None):
     if argv is None:
         argv = sys.argv
@@ -531,6 +584,9 @@ def show_message(message):
                  open_requests[-1])
         canvas_window.load_scheme(open_requests[-1].toLocalFile())
 
+    # initialize notifications
+    setup_notifications()
+
     # local references prevent destruction
     update_check = check_for_updates()
     send_stat = send_usage_statistics()

Orange/canvas/application/canvasmain.py

@@ -386,70 +386,6 @@ def touch():
 
         self.notification_overlay = NotificationOverlay(self.scheme_widget)
 
-        self.setup_notifications()
-
-    def setup_notifications(self):
-        settings = config.settings()
-
-        # If run for the first time, prompt short survey
-        show_survey = settings["startup/show-survey"]
-        if show_survey:
-            surveyDialogButtons = NotificationWidget.Ok | NotificationWidget.Close
-            surveyDialog = NotificationWidget(parent=self.scheme_widget,
-                                              icon=QIcon("Orange/Dlg_down3.png"),
-                                              title="Survey",
-                                              text="We want to get to know our users better.\n"
-                                                   "Would you care to fill out a "
-                                                   "1-minute survey?",
-                                              wordWrap=True,
-                                              standardButtons=surveyDialogButtons)
-
-            def handle_response(button):
-                if surveyDialog.buttonRole(button) == NotificationWidget.AcceptRole:
-                    success = QDesktopServices.openUrl(
-                        QUrl("https://orange.biolab.si/survey/short.html"))
-                    settings["startup/show-survey"] = not success
-                elif surveyDialog.buttonRole(button) == NotificationWidget.RejectRole:
-                    settings["startup/show-survey"] = False
-
-            surveyDialog.clicked.connect(handle_response)
-
-            surveyDialog.setWidget(self.scheme_widget)
-            surveyDialog.show()
-
-        # data collection permission
-        if not settings["error-reporting/permission-requested"]:
-            permDialogButtons = NotificationWidget.AcceptRole | NotificationWidget.RejectRole
-            permDialog = NotificationWidget(parent=self.scheme_widget,
-                                            text="Do you wish to share anonymous usage "
-                                                 "statistics to help improve Orange?",
-                                            wordWrap=True,
-                                            standardButtons=permDialogButtons)
-            btnOK = permDialog.button(NotificationWidget.AcceptRole)
-            btnOK.setText("Allow")
-
-            def respondToRequest():
-                settings["error-reporting/permission-requested"] = True
-
-            def shareData():
-                settings["error-reporting/send-statistics"] = True
-
-            permDialog.clicked.connect(respondToRequest)
-            permDialog.accepted.connect(shareData)
-
-            permDialog.setStyleSheet("""
-                                MessageOverlayWidget {
-                                    background: qlineargradient(
-                                        x1: 0, y1: 0, x2: 0, y2: 1,
-                                        stop:0 #666, stop:0.3 #6D6D6D, stop:1 #666)
-                                }
-                                MessageOverlayWidget QLabel#text-label {
-                                    color: white;
-                                }""")
-
-            permDialog.setWidget(self.scheme_widget)
-            permDialog.show()
-
     def setup_actions(self):
         """Initialize main window actions.
         """

Orange/canvas/config.py

@@ -58,6 +58,9 @@ def init():
 
      ("startup/launch-count", int, 0, ""),
 
+     ("startup/show-short-survey", bool, True,
+      "Has the user not been asked to take a short survey yet"),
+
      ("stylesheet", str, "orange",
       "QSS stylesheet to use"),