From c4b6eea0c191f9688f40964a471421b4f5d20339 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageia.org>
Date: Tue, 20 Mar 2018 21:39:53 +0100
Subject: Improve the interface (mga#18268)

---
 lib/isodumper.py | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/isodumper.py b/lib/isodumper.py
index ce80d59..ae7d86a 100755
--- a/lib/isodumper.py
+++ b/lib/isodumper.py
@@ -467,7 +467,6 @@ NTFS or ext. You can specify a volume name and the format in a new dialog box.<B
         self.bannerbox = self.atelier.createHBox(self.box)
         self.banner=self.atelier.createImage(self.bannerbox,"/usr/share/isodumper/header.svg")
         self.devicebox = self.atelier.createHBox(self.box)
-        self.devicebox.setWeight(1,10)
         self.devicelist=self.atelier.createComboBox(self.devicebox,_("Device to work on:"),False)
         self.devicelist.setNotify()
         self.devicelist.setStretchable(0,True)
@@ -490,23 +489,19 @@ NTFS or ext. You can specify a volume name and the format in a new dialog box.<B
         self.backupbt = self.atelier.createPushButton(self.backupbox, _("Backup the device" ))
         self.backupbt.setDisabled()
         self.formatbox = self.atelier.createHBox(self.box)
-        #self.formatbox.setWeight(1,10)
         self.atelier.createLabel(self.formatbox,_("Format the device in FAT, NTFS or ext:"))
         self.atelier.createHStretch(self.formatbox)
         self.formatbt = self.atelier.createPushButton(self.formatbox, _("Format the device" ))
         self.formatbt.setDisabled()
         self.progressbox = self.atelier.createHBox(self.box)
-        self.progressbox.setWeight(1,10)
         self.progress = self.atelier.createProgressBar(self.progressbox,_("Progress"),100)
         self.progress.setStretchable(0,True)
         self.reportbox = self.atelier.createHBox(self.box)
-        #self.reportbox.setWeight(1,10)
+        self.reportbox.setWeight(1,30)
         self.logview = self.atelier.createLogView(self.reportbox,_("Report"), 10)
         self.logview.setStretchable(0,True)
-        #self.reportbox.setWeight(1,20)
         self.buttonsbox = self.atelier.createHBox(self.box)
-        #self.buttonsbox.setWeight(1,10)
-        self.refreshbt = self.atelier.createPushButton(self.buttonsbox, _("Refresh" ))
+        self.refreshbt = self.atelier.createPushButton(self.devicebox, _("Refresh" ))
         self.refreshbt.setStretchable(0,True)
         self.aboutbt = self.atelier.createPushButton(self.buttonsbox, _("About" ))
         self.aboutbt.setStretchable(0,True)
@@ -530,11 +525,6 @@ NTFS or ext. You can specify a volume name and the format in a new dialog box.<B
         self.ancrage.showChild()
 
     def ask_format(self):
-        self.ima.setDisabled()
-        self.formatbt.setDisabled()
-        self.backup_select.setDisabled()
-        self.writebt.setDisabled()
-        self.devicelist.setDisabled()
         atelier =  yui.YUI.widgetFactory()       
         dialog = atelier.createPopupDialog()
 #        dialog.setTitle(_("Choose format"))
@@ -572,7 +562,7 @@ NTFS or ext. You can specify a volume name and the format in a new dialog box.<B
                     format_label = label.value()
                     break
             if event.widget() == cancelbt:
-                self.restore()
+                #self.restore()
                 returncode = False
                 break
         dialog.destroy()
@@ -651,7 +641,6 @@ NTFS or ext. You can specify a volume name and the format in a new dialog box.<B
                 if self.backup_img_name != '':
                         self.backup_choosed()
             if event.widget() == self.formatbt:
-                    self.wip_unsensitive()
                     code,format_type,name = self.ask_format()
                     if code:
                         self.do_format(format_type,name)
-- 
cgit v1.2.1