Merge lp:~wxl/usb-creator/usb-creator into lp:usb-creator

[ԜаӀtеr Ⅼарсһуnѕkі]

Move progress dialog setup to the install method on the KDE frontend. Thanks to Paul Worrall for the patch! (LP: #1629715)

Without this, usb-creator-kde is completely non-functional. It has been this way since at least Xenial. This is the first step to an SRU that far back.

The long story short is that it moves the progress dialog— that otherwise blocks normal function— from class initialization to the install method, so it won't launch without user input, as expected.

[Marc Deslauriers (mdeslaur)]

LGTM!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2019-07-02 11:54:26 +0000
+++ debian/changelog	2019-07-15 04:22:37 +0000
@@ -1,7 +1,12 @@
 usb-creator (0.3.7) UNRELEASED; urgency=medium
 
+  [ Marc Deslauriers ]
   * Change version strings to 0.3.7 for next release
 
+  [ Walter Lapchynski ]
+  * Move progress dialog setup to the install method on the KDE frontend.
+    Thanks to Paul Worrall for the patch! (LP: #1629715) 
+
  -- Marc Deslauriers <[e-mail]>  Tue, 02 Jul 2019 07:53:57 -0400
 
 usb-creator (0.3.6) eoan; urgency=medium

=== modified file 'usbcreator/frontends/kde/frontend.py'
--- usbcreator/frontends/kde/frontend.py	2015-12-11 17:37:20 +0000
+++ usbcreator/frontends/kde/frontend.py	2019-07-15 04:22:37 +0000
@@ -179,17 +179,6 @@
         self.__mainWindow.ui_dest_list.header().setSectionResizeMode(0, QHeaderView.Stretch)
         self.__mainWindow.ui_dest_list.header().setSectionResizeMode(1, QHeaderView.ResizeToContents)
         self.__mainWindow.ui_dest_list.header().setSectionResizeMode(2, QHeaderView.ResizeToContents)
-        self.progress_bar = QProgressDialog("",_('Cancel'),0,100,self.__mainWindow)
-        #set title of progress window (same as gtk frontend)
-        self.progress_bar.setWindowTitle(_('Installing'))
-        #prevent progress bar from emitting reset on reaching max value (and auto closing)
-        self.progress_bar.setAutoReset(False)
-        #force immediate showing, rather than waiting...
-        self.progress_bar.setMinimumDuration(0)
-        #must disconnect the canceled() SIGNAL, otherwise the progress bar is actually destroyed
-        self.progress_bar.canceled.disconnect(self.progress_bar.cancel)
-        #now we connect our own signal to display a warning dialog instead
-        self.progress_bar.canceled.connect(self.warning_dialog)
 
         #show the window
         self.__mainWindow.show()
@@ -434,6 +423,18 @@
 
             self.__mainWindow.hide()
             self.delete_timeout(self.update_loop)
+
+            self.progress_bar = QProgressDialog("",_('Cancel'),0,100,self.__mainWindow)
+            #set title of progress window (same as gtk frontend)
+            self.progress_bar.setWindowTitle(_('Installing'))
+            #prevent progress bar from emitting reset on reaching max value (and auto closing)
+            self.progress_bar.setAutoReset(False)
+            #force immediate showing, rather than waiting...
+            self.progress_bar.setMinimumDuration(0)
+            #must disconnect the canceled() SIGNAL, otherwise the progress bar is actually destroyed
+            self.progress_bar.canceled.disconnect(self.progress_bar.cancel)
+            #now we connect our own signal to display a warning dialog instead
+            self.progress_bar.canceled.connect(self.warning_dialog)
             starting_up = _('Starting up')
             self.progress_bar.setLabelText(starting_up)
             self.progress_bar.show()