Просмотр исходного кода

Add Reft and Right side aligned action buttons to the message box
CURA-4952

Aleksei S 6 лет назад
Родитель
Сommit
b46a08f566

+ 1 - 1
cura/CuraApplication.py

@@ -452,7 +452,7 @@ class CuraApplication(QtApplication):
 
     ## A reusable dialogbox
     #
-    showMessageBox = pyqtSignal(str, str, str, str, str, int, int, arguments = ["title", "footer", "text", "informativeText", "detailedText", "buttons", "icon"])
+    showMessageBox = pyqtSignal(str, str, str, str, int, int, arguments = ["title", "text", "informativeText", "detailedText", "buttons", "icon"])
 
     def messageBox(self, title, text, informativeText = "", detailedText = "", buttons = QMessageBox.Ok, icon = QMessageBox.NoIcon, callback = None, callback_arguments = []):
         self._message_box_callback = callback

+ 12 - 2
plugins/FirmwareUpdateChecker/FirmwareUpdateCheckerJob.py

@@ -75,9 +75,19 @@ class FirmwareUpdateCheckerJob(Job):
                         machine_name=machine_name),
                         title=i18n_catalog.i18nc(
                                           "@info:title The %s gets replaced with the printer name.",
-                                          "New %s firmware available") % machine_name,
-                        footer = footer_message)
+                                          "New %s firmware available") % machine_name)
 
+                    message.addAction("download",
+                                      i18n_catalog.i18nc("@action:button", "How to update"),
+                                      "[no_icon]",
+                                      "[no_description]",
+                                      button_style=Message.ActionButtonStyle.LINK,
+                                      button_align=Message.ActionButtonStyle.BUTTON_ALIGN_LEFT)
+
+
+                    # If we do this in a cool way, the download url should be available in the JSON file
+                    if self._set_download_url_callback:
+                        self._set_download_url_callback("https://ultimaker.com/en/resources/20500-upgrade-firmware")
                     message.actionTriggered.connect(self._callback)
                     message.show()
 

+ 3 - 2
plugins/SliceInfoPlugin/SliceInfo.py

@@ -46,10 +46,11 @@ class SliceInfo(QObject, Extension):
                                                    dismissable = False,
                                                    title = catalog.i18nc("@info:title", "Collecting Data"))
 
-            self.send_slice_info_message.addAction("Dismiss", name = catalog.i18nc("@action:button", "Allow"), icon = None,
-                    description = catalog.i18nc("@action:tooltip", "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing."))
             self.send_slice_info_message.addAction("MoreInfo", name = catalog.i18nc("@action:button", "More info"), icon = None,
                     description = catalog.i18nc("@action:tooltip", "See more information on what data Cura sends."), button_style = Message.ActionButtonStyle.LINK)
+
+            self.send_slice_info_message.addAction("Dismiss", name = catalog.i18nc("@action:button", "Allow"), icon = None,
+                    description = catalog.i18nc("@action:tooltip", "Allow Cura to send anonymized usage statistics to help prioritize future improvements to Cura. Some of your preferences and settings are sent, the Cura version and a hash of the models you're slicing."))
             self.send_slice_info_message.actionTriggered.connect(self.messageActionTriggered)
             self.send_slice_info_message.show()