overlay.py: Implement non-intrusive notifications

Author: irgolic

Orange/canvas/__main__.py

@@ -180,34 +180,6 @@ def make_sql_logger(level=logging.INFO):
     sql_log.addHandler(handler)
 
 
-def show_survey():
-    # If run for the first time, open a browser tab with a survey
-    settings = QSettings()
-    show_survey = settings.value("startup/show-survey", True, type=bool)
-    if show_survey:
-        question = QMessageBox(
-            QMessageBox.Question,
-            'Orange Survey',
-            'We would like to know more about how our software is used.\n\n'
-            'Would you care to fill our short 1-minute survey?',
-            QMessageBox.Yes | QMessageBox.No)
-        question.setDefaultButton(QMessageBox.Yes)
-        later = question.addButton('Ask again later', QMessageBox.NoRole)
-        question.setEscapeButton(later)
-
-        def handle_response(result):
-            if result == QMessageBox.Yes:
-                success = QDesktopServices.openUrl(
-                    QUrl("https://orange.biolab.si/survey/short.html"))
-                settings.setValue("startup/show-survey", not success)
-            else:
-                settings.setValue("startup/show-survey", result != QMessageBox.No)
-
-        question.finished.connect(handle_response)
-        question.show()
-        return question
-
-
 def check_for_updates():
     settings = QSettings()
     check_updates = settings.value('startup/check-updates', True, type=bool)
@@ -433,6 +405,8 @@ def onrequest(url):
 
     settings = QSettings()
 
+    settings.setValue('startup/launch-count', settings.value('startup/launch-count', 0, int) + 1)
+
     stylesheet = options.stylesheet or defaultstylesheet
     stylesheet_string = None
 
@@ -558,7 +532,6 @@ def show_message(message):
         canvas_window.load_scheme(open_requests[-1].toLocalFile())
 
     # local references prevent destruction
-    survey = show_survey()
     update_check = check_for_updates()
     send_stat = send_usage_statistics()
 
@@ -591,7 +564,6 @@ def show_message(message):
         status = 42
 
     del canvas_window
-    del survey
     del update_check
     del send_stat
 

Orange/canvas/application/canvasmain.py

@@ -53,14 +53,14 @@ def user_documents_path():
         return QDesktopServices.storageLocation(
             QDesktopServices.DocumentsLocation)
 
-from ...widgets.utils.overlay import MessageOverlayWidget
-
 from ..gui.dropshadow import DropShadowFrame
 from ..gui.dock import CollapsibleDockWidget
 from ..gui.quickhelp import QuickHelpTipEvent
 from ..gui.utils import message_critical, message_question, \
                         message_warning, message_information
 
+from ..utils.overlay import NotificationWidget, NotificationOverlay
+
 from ..document.usagestatistics import UsageStatistics
 
 from ..help import HelpManager
@@ -384,15 +384,48 @@ def touch():
 
         self.setMinimumSize(600, 500)
 
-        # ask for anonymous data collection permission
-        def requestDataCollectionPermission():
-            permDialogButtons = MessageOverlayWidget.AcceptRole | MessageOverlayWidget.RejectRole
-            permDialog = MessageOverlayWidget(parent=w,
-                                              text="Do you wish to share anonymous usage "
-                                                   "statistics to help improve Orange?",
+        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=permDialogButtons)
-            btnOK = permDialog.button(MessageOverlayWidget.AcceptRole)
+                                              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():
@@ -405,22 +438,18 @@ def shareData():
             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(w)
+                                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()
 
-        settings = config.settings()
-        if not settings["error-reporting/permission-requested"]:
-            requestDataCollectionPermission()
-
     def setup_actions(self):
         """Initialize main window actions.
         """
@@ -1912,6 +1941,7 @@ def closeEvent(self, event):
         settings.endGroup()
         self.help_dock.close()
         self.log_dock.close()
+        self.notification_overlay.close()
         super().closeEvent(event)
 
     __did_restore = False

Orange/canvas/config.py

@@ -56,6 +56,8 @@ def init():
      ("startup/check-updates", bool, True,
       "Check for updates"),
 
+     ("startup/launch-count", int, 0, ""),
+
      ("stylesheet", str, "orange",
       "QSS stylesheet to use"),
 

Orange/canvas/gui/stackedwidget.py

@@ -86,12 +86,25 @@ def maximumSize(self):
         else:
             return QStackedLayout.maximumSize(self)
 
+    def hasHeightForWidth(self) -> bool:
+        current = self.currentWidget()
+        if current is not None:
+            return current.hasHeightForWidth()
+        else:
+            return False
+
+    def heightForWidth(self, width: int) -> int:
+        current = self.currentWidget()
+        if current is not None:
+            return current.heightForWidth(width)
+        else:
+            return -1
+
     def geometry(self):
         # Reimplemented due to QTBUG-47107.
         return QRect(self.__rect)
 
-    def setGeometry(self, rect):
-        # type: (QRect) -> None
+    def setGeometry(self, rect: QRect) -> None:
         if rect == self.__rect:
             return
         self.__rect = QRect(rect)