fixed layout using right definition of Dimension Horiz and Vert

1 files changed, 18 insertions, 19 deletions

diff --git a/lib/isodumper.py b/lib/isodumper.py
index 5bd3fa4..7af9f59 100755
--- a/lib/isodumper.py
+++ b/lib/isodumper.py
@@ -1066,33 +1066,34 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         # self.ancrage = self.factory.createReplacePoint(self.dialog)
         self.box = self.factory.createVBox(layout)
         self.bannerbox = self.factory.createHBox(self.box)
+        self.bannerbox.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.banner = self.factory.createImage(
             self.bannerbox, "/usr/share/isodumper/header.svg"
         )
         self.banner.setAutoScale(True)
+        self.banner.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.devicebox = self.factory.createHBox(self.box)
         self.devicelist = self.factory.createComboBox(
             self.devicebox, _("Select the device to work on:"), False
         )
         self.devicelist.setNotify()
-        align = self.factory.createRight(self.devicebox)
-        self.devicelist.setStretchable(0, True)
-        self.refreshbt = self.factory.createPushButton(align, _("Update list"))
-        # self.refreshbt.setStretchable(0, True)
-        self.refreshbt.setStretchable(1, True)
+        self.devicelist.setStretchable(yui.YUIDimension.YD_HORIZ, True)
+        self.factory.createHSpacing(self.devicebox)
+        self.refreshbt = self.factory.createPushButton(self.devicebox, _("Update list"))
+        self.refreshbt.setStretchable(yui.YUIDimension.YD_VERT, True)
         self.operation_frame = self.factory.createFrame(
             self.box, _("Select operations")
         )
         self.operationbox = self.factory.createVBox(self.operation_frame)
         self.labelbox = self.factory.createHBox(self.operationbox)
-        self.labelbox.setStretchable(0, True)
+        self.labelbox.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.factory.createLabel(
             self.labelbox,
            "\n".join( [
                _("The selected operations will be executed in order from top to bottom."),
                _("If both write image and create partition are selected, the partition will be created in the free space after the image."),
                ]),
-        ).setStretchable(0, True)
+        ).setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.backupbox = self.factory.createHBox(self.operationbox)
         self.backup_cbox = self.factory.createCheckBox(
             self.backupbox, _("Backup the device to:")
@@ -1102,8 +1103,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         self.backup_select = self.factory.createPushButton(
             self.backupbox, self.ChooseImage
         )
-        self.backup_select.setStretchable(0, True)
-        self.factory.createHStretch(self.backupbox)
+        self.backup_select.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.writebox = self.factory.createHBox(self.operationbox)
         self.write_cbox = self.factory.createCheckBox(
             self.writebox, _("Write Image from:")
@@ -1111,8 +1111,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         self.write_cbox.setNotify()
         #   add file picker for image file
         self.ima = self.factory.createPushButton(self.writebox, self.ChooseImage)
-        self.ima.setStretchable(0, True)
-        self.factory.createHStretch(self.writebox)
+        self.ima.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         # self.writebt = self.factory.createPushButton(self.writebox, _("&Write to device"))
         self.partitionbox = self.factory.createHBox(self.operationbox)
         self.partition_cbox = self.factory.createCheckBox(
@@ -1135,7 +1134,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         self.partition_label = self.factory.createInputField(
             self.partitionbox, _("Label:")
         )
-        self.partition_label.setStretchable(0, True)
+        self.partition_label.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.persistencebox = self.factory.createHBox(self.operationbox)
         self.cryptcb = self.factory.createCheckBox(
             self.persistencebox, _("Encrypt partition using LUKS, with key:")
@@ -1144,7 +1143,7 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         self.cryptkey = self.factory.createInputField(
             self.persistencebox, _("Key:"), password_mode=True
         )
-        self.cryptkey.setStretchable(0, True)
+        self.cryptkey.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.execute_frame = self.factory.createFrame(self.box, _("Execution"))
         self.execute_framevb = self.factory.createVBox(self.execute_frame)
         self.execute_label = self.factory.createLabel(
@@ -1158,18 +1157,18 @@ exFAT, NTFS or ext. You can specify a volume name and the format in a new dialog
         self.progress = self.factory.createProgressBar(
             self.progressbox, _("Progress"), 100
         )
-        self.progress.setStretchable(0, True)
+        self.progress.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.reportbox = self.factory.createHBox(self.box)
-        self.reportbox.setWeight(1, 30)
+        self.reportbox.setWeight(yui.YUIDimension.YD_VERT, 30)
         self.logview = self.factory.createLogView(self.reportbox, _("Report"), 5)
-        self.logview.setStretchable(0, True)
+        self.logview.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.buttonsbox = self.factory.createHBox(self.box)
         self.aboutbt = self.factory.createPushButton(self.buttonsbox, _("About"))
-        self.aboutbt.setStretchable(0, True)
+        self.aboutbt.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.helpbt = self.factory.createPushButton(self.buttonsbox, _("Help"))
-        self.helpbt.setStretchable(0, True)
+        self.helpbt.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         self.quitbt = self.factory.createPushButton(self.buttonsbox, _("Quit"))
-        self.quitbt.setStretchable(0, True)
+        self.quitbt.setStretchable(yui.YUIDimension.YD_HORIZ, True)
         # Connect events
         self.eventManager.addWidgetEvent(self.quitbt, self.confirm_close)
         self.eventManager.addWidgetEvent(self.ima, self.ask_image)