Make process more transparent and safe

Open-MSS · May 28, 2021 · 7727b6b · 7727b6b
1 parent 24808f2
commit 7727b6b
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 128 deletions.
diff --git a/mslib/msui/mss_pyui.py b/mslib/msui/mss_pyui.py
@@ -229,8 +229,6 @@ def __init__(self, *args):
         self.last_save_directory = config_loader(dataset="data_dir")
         self.mscolab_window = None
         self.config_editor = None
-        self.progressBar.setVisible(False)
-        self.labelUpdate.setVisible(False)
 
         # Connect Qt SIGNALs:
         # ===================
@@ -283,12 +281,6 @@ def __init__(self, *args):
         if "pytest" not in sys.modules:
             self.updater = Updater(self)
             self.updater.on_update_available.connect(self.notify_on_update)
-            self.updater.on_status_update.connect(lambda s: (self.labelUpdate.setVisible(True),
-                                                             self.labelUpdate.setText(s)))
-            self.updater.on_progress_update.connect(lambda i: (self.progressBar.setVisible(True),
-                                                               self.progressBar.setValue(i)))
-            self.updater.on_update_finished.connect(lambda: self.progressBar.setVisible(False))
-            self.updater.on_update_failed.connect(lambda: self.progressBar.setVisible(False))
             self.updater.run()
 
     @staticmethod

diff --git a/mslib/msui/mss_qt.py b/mslib/msui/mss_qt.py
@@ -164,6 +164,7 @@ def variant_to_float(variant, locale=QtCore.QLocale()):
 for mod in [
         "ui_about_dialog",
         "ui_shortcuts",
+        "ui_updater_dialog",
         "ui_hexagon_dockwidget",
         "ui_kmloverlay_dockwidget",
         "ui_customize_kml",

diff --git a/mslib/msui/qt5/ui_mainwindow.py b/mslib/msui/qt5/ui_mainwindow.py
@@ -43,18 +43,6 @@ def setupUi(self, MSSMainWindow):
         self.labelStatusbar.setScaledContents(False)
         self.labelStatusbar.setObjectName("labelStatusbar")
         self.verticalLayout.addWidget(self.labelStatusbar)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.labelUpdate = QtWidgets.QLabel(self.centralwidget)
-        self.labelUpdate.setMinimumSize(QtCore.QSize(0, 0))
-        self.labelUpdate.setObjectName("labelUpdate")
-        self.horizontalLayout.addWidget(self.labelUpdate)
-        self.progressBar = QtWidgets.QProgressBar(self.centralwidget)
-        self.progressBar.setMaximumSize(QtCore.QSize(16777215, 16777215))
-        self.progressBar.setProperty("value", 0)
-        self.progressBar.setObjectName("progressBar")
-        self.horizontalLayout.addWidget(self.progressBar)
-        self.verticalLayout.addLayout(self.horizontalLayout)
         MSSMainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtWidgets.QMenuBar(MSSMainWindow)
         self.menubar.setGeometry(QtCore.QRect(0, 0, 442, 20))
@@ -150,7 +138,6 @@ def retranslateUi(self, MSSMainWindow):
         self.groupBox.setTitle(_translate("MSSMainWindow", "Open Views:"))
         self.listViews.setToolTip(_translate("MSSMainWindow", "Double-click a view to bring it to the front."))
         self.labelStatusbar.setText(_translate("MSSMainWindow", "Status : "))
-        self.labelUpdate.setText(_translate("MSSMainWindow", "Checking for Updates..."))
         self.menu_File.setTitle(_translate("MSSMainWindow", "&File"))
         self.menuImport_Flight_Track.setTitle(_translate("MSSMainWindow", "Import Flight Track"))
         self.menuExport_Active_Flight_Track.setTitle(_translate("MSSMainWindow", "Export Active Flight Track"))

diff --git a/mslib/msui/qt5/ui_updater_dialog.py b/mslib/msui/qt5/ui_updater_dialog.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'mslib/msui/ui/ui_updater_dialog.ui'
+#
+# Created by: PyQt5 UI code generator 5.12.3
+#
+# WARNING! All changes made in this file will be lost!
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_Updater(object):
+    def setupUi(self, Updater):
+        Updater.setObjectName("Updater")
+        Updater.setWindowModality(QtCore.Qt.ApplicationModal)
+        Updater.resize(854, 353)
+        self.verticalLayout = QtWidgets.QVBoxLayout(Updater)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.statusLabel = QtWidgets.QLabel(Updater)
+        self.statusLabel.setObjectName("statusLabel")
+        self.verticalLayout.addWidget(self.statusLabel)
+        self.output = QtWidgets.QPlainTextEdit(Updater)
+        self.output.setLineWrapMode(QtWidgets.QPlainTextEdit.NoWrap)
+        self.output.setReadOnly(True)
+        self.output.setCenterOnScroll(False)
+        self.output.setObjectName("output")
+        self.verticalLayout.addWidget(self.output)
+
+        self.retranslateUi(Updater)
+        QtCore.QMetaObject.connectSlotsByName(Updater)
+
+    def retranslateUi(self, Updater):
+        _translate = QtCore.QCoreApplication.translate
+        Updater.setWindowTitle(_translate("Updater", "Updater"))
+        self.statusLabel.setText(_translate("Updater", "Status"))
diff --git a/mslib/msui/ui/ui_mainwindow.ui b/mslib/msui/ui/ui_mainwindow.ui
@@ -74,36 +74,6 @@ Save a flight track to name it.</string>
       </property>
      </widget>
     </item>
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QLabel" name="labelUpdate">
-        <property name="minimumSize">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Checking for Updates...</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QProgressBar" name="progressBar">
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="value">
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </item>
    </layout>
   </widget>
   <widget class="QMenuBar" name="menubar">

diff --git a/mslib/msui/ui/ui_updater_dialog.ui b/mslib/msui/ui/ui_updater_dialog.ui
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Updater</class>
+ <widget class="QDialog" name="Updater">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>854</width>
+    <height>353</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Updater</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="statusLabel">
+     <property name="text">
+      <string>Status</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QPlainTextEdit" name="output">
+     <property name="lineWrapMode">
+      <enum>QPlainTextEdit::NoWrap</enum>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="centerOnScroll">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>