Set the rename dialog box stretchable

2 files changed, 105 insertions, 117 deletions

diff --git a/mageiaSync/mageiaSyncDBrename.py b/mageiaSync/mageiaSyncDBrename.py
index 7164889..4e550ba 100644
--- a/mageiaSync/mageiaSyncDBrename.py
+++ b/mageiaSync/mageiaSyncDBrename.py
@@ -11,43 +11,43 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_renameDialog(object):
     def setupUi(self, renameDialog):
         renameDialog.setObjectName("renameDialog")
-        renameDialog.resize(562, 138)
-        self.buttonBox = QtWidgets.QDialogButtonBox(renameDialog)
-        self.buttonBox.setGeometry(QtCore.QRect(10, 100, 541, 32))
-        self.buttonBox.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
-        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
-        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
-        self.buttonBox.setCenterButtons(True)
-        self.buttonBox.setObjectName("buttonBox")
-        self.gridLayoutWidget = QtWidgets.QWidget(renameDialog)
-        self.gridLayoutWidget.setGeometry(QtCore.QRect(0, 0, 655, 115))
-        self.gridLayoutWidget.setObjectName("gridLayoutWidget")
-        self.gridLayout = QtWidgets.QGridLayout(self.gridLayoutWidget)
+        renameDialog.resize(667, 155)
+        self.gridLayout = QtWidgets.QGridLayout(renameDialog)
         self.gridLayout.setObjectName("gridLayout")
-        self.label = QtWidgets.QLabel(self.gridLayoutWidget)
-        self.label.setObjectName("label")
-        self.gridLayout.addWidget(self.label, 2, 0, 1, 1)
-        self.oldRelease = QtWidgets.QLineEdit(self.gridLayoutWidget)
-        self.oldRelease.setObjectName("oldRelease")
-        self.gridLayout.addWidget(self.oldRelease, 2, 1, 1, 1)
-        self.label_2 = QtWidgets.QLabel(self.gridLayoutWidget)
-        self.label_2.setObjectName("label_2")
-        self.gridLayout.addWidget(self.label_2, 3, 0, 1, 1)
-        self.label_3 = QtWidgets.QLabel(self.gridLayoutWidget)
+        self.gridLayout_2 = QtWidgets.QGridLayout()
+        self.gridLayout_2.setObjectName("gridLayout_2")
+        self.label_3 = QtWidgets.QLabel(renameDialog)
         self.label_3.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
         self.label_3.setWordWrap(False)
         self.label_3.setObjectName("label_3")
-        self.gridLayout.addWidget(self.label_3, 0, 0, 1, 2)
-        self.label_4 = QtWidgets.QLabel(self.gridLayoutWidget)
+        self.gridLayout_2.addWidget(self.label_3, 0, 0, 1, 2)
+        self.label_4 = QtWidgets.QLabel(renameDialog)
         self.label_4.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
         self.label_4.setObjectName("label_4")
-        self.gridLayout.addWidget(self.label_4, 1, 0, 1, 1)
-        self.chooseDir = QtWidgets.QPushButton(self.gridLayoutWidget)
+        self.gridLayout_2.addWidget(self.label_4, 1, 0, 1, 1)
+        self.chooseDir = QtWidgets.QPushButton(renameDialog)
         self.chooseDir.setObjectName("chooseDir")
-        self.gridLayout.addWidget(self.chooseDir, 1, 1, 1, 1)
-        self.newRelease = QtWidgets.QLineEdit(self.gridLayoutWidget)
+        self.gridLayout_2.addWidget(self.chooseDir, 1, 1, 1, 1)
+        self.label = QtWidgets.QLabel(renameDialog)
+        self.label.setObjectName("label")
+        self.gridLayout_2.addWidget(self.label, 2, 0, 1, 1)
+        self.oldRelease = QtWidgets.QLineEdit(renameDialog)
+        self.oldRelease.setObjectName("oldRelease")
+        self.gridLayout_2.addWidget(self.oldRelease, 2, 1, 1, 1)
+        self.label_2 = QtWidgets.QLabel(renameDialog)
+        self.label_2.setObjectName("label_2")
+        self.gridLayout_2.addWidget(self.label_2, 3, 0, 1, 1)
+        self.newRelease = QtWidgets.QLineEdit(renameDialog)
         self.newRelease.setObjectName("newRelease")
-        self.gridLayout.addWidget(self.newRelease, 3, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.newRelease, 3, 1, 1, 1)
+        self.gridLayout.addLayout(self.gridLayout_2, 0, 0, 1, 1)
+        self.buttonBox = QtWidgets.QDialogButtonBox(renameDialog)
+        self.buttonBox.setLocale(QtCore.QLocale(QtCore.QLocale.English, QtCore.QLocale.UnitedStates))
+        self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
+        self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok)
+        self.buttonBox.setCenterButtons(True)
+        self.buttonBox.setObjectName("buttonBox")
+        self.gridLayout.addWidget(self.buttonBox, 1, 0, 1, 1)
 
         self.retranslateUi(renameDialog)
         self.buttonBox.accepted.connect(renameDialog.accept)
@@ -59,9 +59,9 @@ class Ui_renameDialog(object):
     def retranslateUi(self, renameDialog):
         _translate = QtCore.QCoreApplication.translate
         renameDialog.setWindowTitle(_translate("renameDialog", "Rename release"))
-        self.label.setText(_translate("renameDialog", "Old release"))
-        self.label_2.setText(_translate("renameDialog", "New release"))
         self.label_3.setText(_translate("renameDialog", "This action renames the directories and names from a former version to a new one."))
         self.label_4.setText(_translate("renameDialog", "Base directory"))
         self.chooseDir.setText(_translate("renameDialog", "PushButton"))
+        self.label.setText(_translate("renameDialog", "Old release"))
+        self.label_2.setText(_translate("renameDialog", "New release"))
 
diff --git a/mageiaSync/mageiaSyncDBrename.ui b/mageiaSync/mageiaSyncDBrename.ui
index 9db208e..8b4b348 100644
--- a/mageiaSync/mageiaSyncDBrename.ui
+++ b/mageiaSync/mageiaSyncDBrename.ui
@@ -6,97 +6,85 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>562</width>
-    <height>138</height>
+    <width>667</width>
+    <height>155</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Rename release</string>
   </property>
-  <widget class="QDialogButtonBox" name="buttonBox">
-   <property name="geometry">
-    <rect>
-     <x>10</x>
-     <y>100</y>
-     <width>541</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="locale">
-    <locale language="English" country="UnitedStates"/>
-   </property>
-   <property name="orientation">
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <property name="standardButtons">
-    <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-   </property>
-   <property name="centerButtons">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QWidget" name="gridLayoutWidget">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>655</width>
-     <height>115</height>
-    </rect>
-   </property>
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="2" column="0">
-     <widget class="QLabel" name="label">
-      <property name="text">
-       <string>Old release</string>
-      </property>
-     </widget>
-    </item>
-    <item row="2" column="1">
-     <widget class="QLineEdit" name="oldRelease"/>
-    </item>
-    <item row="3" column="0">
-     <widget class="QLabel" name="label_2">
-      <property name="text">
-       <string>New release</string>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="0" colspan="2">
-     <widget class="QLabel" name="label_3">
-      <property name="locale">
-       <locale language="English" country="UnitedStates"/>
-      </property>
-      <property name="text">
-       <string>This action renames the directories and names from a former version to a new one.</string>
-      </property>
-      <property name="wordWrap">
-       <bool>false</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="label_4">
-      <property name="locale">
-       <locale language="English" country="UnitedStates"/>
-      </property>
-      <property name="text">
-       <string>Base directory</string>
-      </property>
-     </widget>
-    </item>
-    <item row="1" column="1">
-     <widget class="QPushButton" name="chooseDir">
-      <property name="text">
-       <string>PushButton</string>
-      </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QLineEdit" name="newRelease"/>
-    </item>
-   </layout>
-  </widget>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="0" column="0" colspan="2">
+      <widget class="QLabel" name="label_3">
+       <property name="locale">
+        <locale language="English" country="UnitedStates"/>
+       </property>
+       <property name="text">
+        <string>This action renames the directories and names from a former version to a new one.</string>
+       </property>
+       <property name="wordWrap">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="locale">
+        <locale language="English" country="UnitedStates"/>
+       </property>
+       <property name="text">
+        <string>Base directory</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QPushButton" name="chooseDir">
+       <property name="text">
+        <string>PushButton</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Old release</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="oldRelease"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>New release</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="newRelease"/>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="locale">
+      <locale language="English" country="UnitedStates"/>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+     <property name="centerButtons">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <tabstops>
   <tabstop>chooseDir</tabstop>