summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <tails@boum.org>2014-06-12 17:56:57 +0200
committerTails developers <tails@boum.org>2014-06-12 18:12:21 +0200
commitc5bd9e6a69933e3bf4110e6a94e561d5814842e4 (patch)
tree94555f828fe01aebb7b3a8860917ea650cde3537
parent51a8deee535a9f86799959f1b8ba6c124da831dd (diff)
Rearrange GUI so the titles are not partially hidden. (Closes: #7319)
For instance, the "Target Device" label's "g"-tail was hidden under the combo box listing available target devices.
-rwxr-xr-xdata/liveusb-creator.ui38
-rw-r--r--liveusb/dialog.py45
-rw-r--r--liveusb/launcher_ui.py15
-rwxr-xr-xliveusb/resources_rc.py4
4 files changed, 42 insertions, 60 deletions
diff --git a/data/liveusb-creator.ui b/data/liveusb-creator.ui
index 77ae1e8..b089e36 100755
--- a/data/liveusb-creator.ui
+++ b/data/liveusb-creator.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>422</width>
- <height>388</height>
+ <height>408</height>
</rect>
</property>
<property name="sizePolicy">
@@ -37,7 +37,7 @@
<x>0</x>
<y>0</y>
<width>421</width>
- <height>381</height>
+ <height>401</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@@ -64,13 +64,13 @@
<property name="minimumSize">
<size>
<width>161</width>
- <height>51</height>
+ <height>61</height>
</size>
</property>
<property name="baseSize">
<size>
<width>161</width>
- <height>51</height>
+ <height>61</height>
</size>
</property>
<property name="font">
@@ -87,8 +87,8 @@
<widget class="QPushButton" name="isoBttn">
<property name="geometry">
<rect>
- <x>11</x>
- <y>18</y>
+ <x>10</x>
+ <y>30</y>
<width>141</width>
<height>25</height>
</rect>
@@ -137,13 +137,13 @@
<property name="minimumSize">
<size>
<width>201</width>
- <height>51</height>
+ <height>61</height>
</size>
</property>
<property name="baseSize">
<size>
<width>201</width>
- <height>51</height>
+ <height>61</height>
</size>
</property>
<property name="font">
@@ -161,7 +161,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>20</y>
+ <y>30</y>
<width>181</width>
<height>22</height>
</rect>
@@ -181,13 +181,13 @@
<property name="minimumSize">
<size>
<width>191</width>
- <height>51</height>
+ <height>61</height>
</size>
</property>
<property name="baseSize">
<size>
<width>191</width>
- <height>51</height>
+ <height>61</height>
</size>
</property>
<property name="font">
@@ -205,9 +205,9 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>20</y>
- <width>391</width>
- <height>22</height>
+ <y>30</y>
+ <width>400</width>
+ <height>24</height>
</rect>
</property>
<property name="editable">
@@ -226,14 +226,14 @@
<widget class="QGroupBox" name="overlayTitle">
<property name="minimumSize">
<size>
- <width>0</width>
- <height>0</height>
+ <width>201</width>
+ <height>61</height>
</size>
</property>
<property name="baseSize">
<size>
<width>201</width>
- <height>51</height>
+ <height>61</height>
</size>
</property>
<property name="font">
@@ -251,7 +251,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>20</y>
+ <y>30</y>
<width>181</width>
<height>21</height>
</rect>
@@ -281,7 +281,7 @@
<property name="minimumSize">
<size>
<width>401</width>
- <height>111</height>
+ <height>110</height>
</size>
</property>
<property name="baseSize">
diff --git a/liveusb/dialog.py b/liveusb/dialog.py
index 9843443..6885b78 100644
--- a/liveusb/dialog.py
+++ b/liveusb/dialog.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'data/liveusb-creator.ui'
#
-# Created: Sun May 11 12:03:50 2014
-# by: PyQt4 UI code generator 4.10.4
+# Created: Thu Jun 12 17:55:34 2014
+# by: PyQt4 UI code generator 4.9.3
#
# WARNING! All changes made in this file will be lost!
@@ -23,21 +23,12 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
- def _fromUtf8(s):
- return s
-
-try:
- _encoding = QtGui.QApplication.UnicodeUTF8
- def _translate(context, text, disambig):
- return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
- def _translate(context, text, disambig):
- return QtGui.QApplication.translate(context, text, disambig)
+ _fromUtf8 = lambda s: s
class Ui_Dialog(object):
def setupUi(self, Dialog):
Dialog.setObjectName(_fromUtf8("Dialog"))
- Dialog.resize(422, 388)
+ Dialog.resize(422, 408)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -46,7 +37,7 @@ class Ui_Dialog(object):
Dialog.setMinimumSize(QtCore.QSize(0, 0))
Dialog.setBaseSize(QtCore.QSize(422, 388))
self.layoutWidget = QtGui.QWidget(Dialog)
- self.layoutWidget.setGeometry(QtCore.QRect(0, 0, 421, 381))
+ self.layoutWidget.setGeometry(QtCore.QRect(0, 0, 421, 401))
self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget)
self.verticalLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
@@ -61,14 +52,14 @@ class Ui_Dialog(object):
self.sourceHorizontalLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
self.sourceHorizontalLayout.setObjectName(_fromUtf8("sourceHorizontalLayout"))
self.sourceFileGroupBox = QtGui.QGroupBox(self.layoutWidget)
- self.sourceFileGroupBox.setMinimumSize(QtCore.QSize(161, 51))
- self.sourceFileGroupBox.setBaseSize(QtCore.QSize(161, 51))
+ self.sourceFileGroupBox.setMinimumSize(QtCore.QSize(161, 61))
+ self.sourceFileGroupBox.setBaseSize(QtCore.QSize(161, 61))
font = QtGui.QFont()
font.setPointSize(11)
self.sourceFileGroupBox.setFont(font)
self.sourceFileGroupBox.setObjectName(_fromUtf8("sourceFileGroupBox"))
self.isoBttn = QtGui.QPushButton(self.sourceFileGroupBox)
- self.isoBttn.setGeometry(QtCore.QRect(11, 18, 141, 25))
+ self.isoBttn.setGeometry(QtCore.QRect(10, 30, 141, 25))
self.isoBttn.setObjectName(_fromUtf8("isoBttn"))
self.sourceHorizontalLayout.addWidget(self.sourceFileGroupBox)
self.orLabel = QtGui.QLabel(self.layoutWidget)
@@ -84,14 +75,14 @@ class Ui_Dialog(object):
self.orLabel.setObjectName(_fromUtf8("orLabel"))
self.sourceHorizontalLayout.addWidget(self.orLabel)
self.downloadGroupBox = QtGui.QGroupBox(self.layoutWidget)
- self.downloadGroupBox.setMinimumSize(QtCore.QSize(201, 51))
- self.downloadGroupBox.setBaseSize(QtCore.QSize(201, 51))
+ self.downloadGroupBox.setMinimumSize(QtCore.QSize(201, 61))
+ self.downloadGroupBox.setBaseSize(QtCore.QSize(201, 61))
font = QtGui.QFont()
font.setPointSize(11)
self.downloadGroupBox.setFont(font)
self.downloadGroupBox.setObjectName(_fromUtf8("downloadGroupBox"))
self.downloadCombo = QtGui.QComboBox(self.downloadGroupBox)
- self.downloadCombo.setGeometry(QtCore.QRect(10, 20, 181, 22))
+ self.downloadCombo.setGeometry(QtCore.QRect(10, 30, 181, 22))
self.downloadCombo.setObjectName(_fromUtf8("downloadCombo"))
self.sourceHorizontalLayout.addWidget(self.downloadGroupBox)
self.verticalLayout.addLayout(self.sourceHorizontalLayout)
@@ -99,28 +90,28 @@ class Ui_Dialog(object):
self.targetHorizontalLayout.setSpacing(10)
self.targetHorizontalLayout.setObjectName(_fromUtf8("targetHorizontalLayout"))
self.targetGroupBox = QtGui.QGroupBox(self.layoutWidget)
- self.targetGroupBox.setMinimumSize(QtCore.QSize(191, 51))
- self.targetGroupBox.setBaseSize(QtCore.QSize(191, 51))
+ self.targetGroupBox.setMinimumSize(QtCore.QSize(191, 61))
+ self.targetGroupBox.setBaseSize(QtCore.QSize(191, 61))
font = QtGui.QFont()
font.setPointSize(11)
self.targetGroupBox.setFont(font)
self.targetGroupBox.setObjectName(_fromUtf8("targetGroupBox"))
self.driveBox = QtGui.QComboBox(self.targetGroupBox)
- self.driveBox.setGeometry(QtCore.QRect(10, 20, 391, 22))
+ self.driveBox.setGeometry(QtCore.QRect(10, 30, 400, 24))
self.driveBox.setEditable(False)
self.driveBox.setInsertPolicy(QtGui.QComboBox.InsertAtTop)
self.driveBox.setDuplicatesEnabled(False)
self.driveBox.setObjectName(_fromUtf8("driveBox"))
self.targetHorizontalLayout.addWidget(self.targetGroupBox)
self.overlayTitle = QtGui.QGroupBox(self.layoutWidget)
- self.overlayTitle.setMinimumSize(QtCore.QSize(0, 0))
- self.overlayTitle.setBaseSize(QtCore.QSize(201, 51))
+ self.overlayTitle.setMinimumSize(QtCore.QSize(201, 61))
+ self.overlayTitle.setBaseSize(QtCore.QSize(201, 61))
font = QtGui.QFont()
font.setPointSize(11)
self.overlayTitle.setFont(font)
self.overlayTitle.setObjectName(_fromUtf8("overlayTitle"))
self.overlaySlider = QtGui.QSlider(self.overlayTitle)
- self.overlaySlider.setGeometry(QtCore.QRect(10, 20, 181, 21))
+ self.overlaySlider.setGeometry(QtCore.QRect(10, 30, 181, 21))
self.overlaySlider.setMaximum(2047)
self.overlaySlider.setOrientation(QtCore.Qt.Horizontal)
self.overlaySlider.setTickPosition(QtGui.QSlider.NoTicks)
@@ -133,7 +124,7 @@ class Ui_Dialog(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.textEdit.sizePolicy().hasHeightForWidth())
self.textEdit.setSizePolicy(sizePolicy)
- self.textEdit.setMinimumSize(QtCore.QSize(401, 111))
+ self.textEdit.setMinimumSize(QtCore.QSize(401, 110))
self.textEdit.setBaseSize(QtCore.QSize(401, 111))
font = QtGui.QFont()
font.setPointSize(11)
diff --git a/liveusb/launcher_ui.py b/liveusb/launcher_ui.py
index 64ceabb..4a94462 100644
--- a/liveusb/launcher_ui.py
+++ b/liveusb/launcher_ui.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'data/liveusb-creator-launcher.ui'
#
-# Created: Sun May 11 12:03:50 2014
-# by: PyQt4 UI code generator 4.10.4
+# Created: Thu Jun 12 17:55:34 2014
+# by: PyQt4 UI code generator 4.9.3
#
# WARNING! All changes made in this file will be lost!
@@ -23,16 +23,7 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
- def _fromUtf8(s):
- return s
-
-try:
- _encoding = QtGui.QApplication.UnicodeUTF8
- def _translate(context, text, disambig):
- return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
- def _translate(context, text, disambig):
- return QtGui.QApplication.translate(context, text, disambig)
+ _fromUtf8 = lambda s: s
class Ui_Dialog(object):
def setupUi(self, Dialog):
diff --git a/liveusb/resources_rc.py b/liveusb/resources_rc.py
index 41a53d2..812458c 100755
--- a/liveusb/resources_rc.py
+++ b/liveusb/resources_rc.py
@@ -2,8 +2,8 @@
# Resource object code
#
-# Created: Sun May 11 12:03:50 2014
-# by: The Resource Compiler for PyQt (Qt v4.8.6)
+# Created: Thu Jun 12 17:55:34 2014
+# by: The Resource Compiler for PyQt (Qt v4.8.2)
#
# WARNING! All changes made in this file will be lost!