summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <tails@boum.org>2014-05-11 10:04:12 +0000
committerTails developers <tails@boum.org>2014-05-11 10:04:12 +0000
commitf1d9b5949c99cc65a3a277ee2a47345247a364a0 (patch)
tree66ab4a2a416cd138fd68b05735e49d8fdfa8b887
parent993fd5390bf4d9f50b71ccddc9855c128cac097d (diff)
Update Qt resource files with newer Qt dev tools.feature/logo
The previous commit did the same, but with an older PyQt4 code generator than used previously, and I don't want to make guesses about what impact this might have.
-rw-r--r--liveusb/dialog.py61
-rw-r--r--liveusb/launcher_ui.py47
-rwxr-xr-xliveusb/resources_rc.py4
3 files changed, 71 insertions, 41 deletions
diff --git a/liveusb/dialog.py b/liveusb/dialog.py
index f9a0503..07f1642 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 Apr 27 16:40:48 2014
-# by: PyQt4 UI code generator 4.7.3
+# Created: Sun May 11 12:03:50 2014
+# by: PyQt4 UI code generator 4.10.4
#
# WARNING! All changes made in this file will be lost!
@@ -20,9 +20,23 @@ def translate_and_brand(string):
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)
+
class Ui_Dialog(object):
def setupUi(self, Dialog):
- Dialog.setObjectName("Dialog")
+ Dialog.setObjectName(_fromUtf8("Dialog"))
Dialog.resize(422, 388)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
@@ -33,40 +47,41 @@ class Ui_Dialog(object):
Dialog.setBaseSize(QtCore.QSize(422, 388))
self.layoutWidget = QtGui.QWidget(Dialog)
self.layoutWidget.setGeometry(QtCore.QRect(0, 0, 421, 381))
- self.layoutWidget.setObjectName("layoutWidget")
+ self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
self.verticalLayout = QtGui.QVBoxLayout(self.layoutWidget)
self.verticalLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
- self.verticalLayout.setObjectName("verticalLayout")
+ self.verticalLayout.setMargin(0)
+ self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
self.titleLabel = QtGui.QLabel(self.layoutWidget)
- self.titleLabel.setText("")
- self.titleLabel.setObjectName("titleLabel")
+ self.titleLabel.setText(_fromUtf8(""))
+ self.titleLabel.setObjectName(_fromUtf8("titleLabel"))
self.verticalLayout.addWidget(self.titleLabel)
self.sourceHorizontalLayout = QtGui.QHBoxLayout()
self.sourceHorizontalLayout.setSpacing(6)
self.sourceHorizontalLayout.setSizeConstraint(QtGui.QLayout.SetDefaultConstraint)
- self.sourceHorizontalLayout.setObjectName("sourceHorizontalLayout")
+ 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))
font = QtGui.QFont()
font.setPointSize(8)
self.sourceFileGroupBox.setFont(font)
- self.sourceFileGroupBox.setObjectName("sourceFileGroupBox")
+ self.sourceFileGroupBox.setObjectName(_fromUtf8("sourceFileGroupBox"))
self.isoBttn = QtGui.QPushButton(self.sourceFileGroupBox)
self.isoBttn.setGeometry(QtCore.QRect(11, 18, 141, 25))
- self.isoBttn.setObjectName("isoBttn")
+ self.isoBttn.setObjectName(_fromUtf8("isoBttn"))
self.sourceHorizontalLayout.addWidget(self.sourceFileGroupBox)
self.orLabel = QtGui.QLabel(self.layoutWidget)
self.orLabel.setMinimumSize(QtCore.QSize(23, 24))
self.orLabel.setBaseSize(QtCore.QSize(23, 24))
font = QtGui.QFont()
- font.setFamily("Verdana")
+ font.setFamily(_fromUtf8("Verdana"))
font.setPointSize(10)
- font.setWeight(75)
font.setBold(True)
+ font.setWeight(75)
self.orLabel.setFont(font)
self.orLabel.setAlignment(QtCore.Qt.AlignCenter)
- self.orLabel.setObjectName("orLabel")
+ self.orLabel.setObjectName(_fromUtf8("orLabel"))
self.sourceHorizontalLayout.addWidget(self.orLabel)
self.downloadGroupBox = QtGui.QGroupBox(self.layoutWidget)
self.downloadGroupBox.setMinimumSize(QtCore.QSize(201, 51))
@@ -74,28 +89,28 @@ class Ui_Dialog(object):
font = QtGui.QFont()
font.setPointSize(8)
self.downloadGroupBox.setFont(font)
- self.downloadGroupBox.setObjectName("downloadGroupBox")
+ self.downloadGroupBox.setObjectName(_fromUtf8("downloadGroupBox"))
self.downloadCombo = QtGui.QComboBox(self.downloadGroupBox)
self.downloadCombo.setGeometry(QtCore.QRect(10, 20, 181, 22))
- self.downloadCombo.setObjectName("downloadCombo")
+ self.downloadCombo.setObjectName(_fromUtf8("downloadCombo"))
self.sourceHorizontalLayout.addWidget(self.downloadGroupBox)
self.verticalLayout.addLayout(self.sourceHorizontalLayout)
self.targetHorizontalLayout = QtGui.QHBoxLayout()
self.targetHorizontalLayout.setSpacing(10)
- self.targetHorizontalLayout.setObjectName("targetHorizontalLayout")
+ 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))
font = QtGui.QFont()
font.setPointSize(8)
self.targetGroupBox.setFont(font)
- self.targetGroupBox.setObjectName("targetGroupBox")
+ self.targetGroupBox.setObjectName(_fromUtf8("targetGroupBox"))
self.driveBox = QtGui.QComboBox(self.targetGroupBox)
self.driveBox.setGeometry(QtCore.QRect(10, 20, 391, 22))
self.driveBox.setEditable(False)
self.driveBox.setInsertPolicy(QtGui.QComboBox.InsertAtTop)
self.driveBox.setDuplicatesEnabled(False)
- self.driveBox.setObjectName("driveBox")
+ self.driveBox.setObjectName(_fromUtf8("driveBox"))
self.targetHorizontalLayout.addWidget(self.targetGroupBox)
self.overlayTitle = QtGui.QGroupBox(self.layoutWidget)
self.overlayTitle.setMinimumSize(QtCore.QSize(0, 0))
@@ -103,13 +118,13 @@ class Ui_Dialog(object):
font = QtGui.QFont()
font.setPointSize(8)
self.overlayTitle.setFont(font)
- self.overlayTitle.setObjectName("overlayTitle")
+ self.overlayTitle.setObjectName(_fromUtf8("overlayTitle"))
self.overlaySlider = QtGui.QSlider(self.overlayTitle)
self.overlaySlider.setGeometry(QtCore.QRect(10, 20, 181, 21))
self.overlaySlider.setMaximum(2047)
self.overlaySlider.setOrientation(QtCore.Qt.Horizontal)
self.overlaySlider.setTickPosition(QtGui.QSlider.NoTicks)
- self.overlaySlider.setObjectName("overlaySlider")
+ self.overlaySlider.setObjectName(_fromUtf8("overlaySlider"))
self.targetHorizontalLayout.addWidget(self.overlayTitle)
self.verticalLayout.addLayout(self.targetHorizontalLayout)
self.textEdit = QtGui.QTextEdit(self.layoutWidget)
@@ -124,17 +139,17 @@ class Ui_Dialog(object):
font.setPointSize(8)
self.textEdit.setFont(font)
self.textEdit.setReadOnly(True)
- self.textEdit.setObjectName("textEdit")
+ self.textEdit.setObjectName(_fromUtf8("textEdit"))
self.verticalLayout.addWidget(self.textEdit)
self.progressBar = QtGui.QProgressBar(self.layoutWidget)
self.progressBar.setMinimumSize(QtCore.QSize(401, 23))
self.progressBar.setBaseSize(QtCore.QSize(401, 23))
self.progressBar.setProperty("value", 0)
- self.progressBar.setObjectName("progressBar")
+ self.progressBar.setObjectName(_fromUtf8("progressBar"))
self.verticalLayout.addWidget(self.progressBar)
self.startButton = QtGui.QPushButton(self.layoutWidget)
self.startButton.setEnabled(True)
- self.startButton.setObjectName("startButton")
+ self.startButton.setObjectName(_fromUtf8("startButton"))
self.verticalLayout.addWidget(self.startButton)
self.retranslateUi(Dialog)
diff --git a/liveusb/launcher_ui.py b/liveusb/launcher_ui.py
index 4718d71..d03c256 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 Apr 27 16:40:48 2014
-# by: PyQt4 UI code generator 4.7.3
+# Created: Sun May 11 12:03:50 2014
+# by: PyQt4 UI code generator 4.10.4
#
# WARNING! All changes made in this file will be lost!
@@ -20,9 +20,23 @@ def translate_and_brand(string):
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)
+
class Ui_Dialog(object):
def setupUi(self, Dialog):
- Dialog.setObjectName("Dialog")
+ Dialog.setObjectName(_fromUtf8("Dialog"))
Dialog.resize(530, 363)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.MinimumExpanding)
sizePolicy.setHorizontalStretch(0)
@@ -34,13 +48,14 @@ class Ui_Dialog(object):
Dialog.setBaseSize(QtCore.QSize(512, 300))
self.widget = QtGui.QWidget(Dialog)
self.widget.setGeometry(QtCore.QRect(2, 9, 520, 349))
- self.widget.setObjectName("widget")
+ self.widget.setObjectName(_fromUtf8("widget"))
self.verticalLayout = QtGui.QVBoxLayout(self.widget)
- self.verticalLayout.setObjectName("verticalLayout")
+ self.verticalLayout.setMargin(0)
+ self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
self.gridLayout = QtGui.QGridLayout()
self.gridLayout.setContentsMargins(6, -1, 6, -1)
self.gridLayout.setVerticalSpacing(6)
- self.gridLayout.setObjectName("gridLayout")
+ self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
self.cloneInstallButton = QtGui.QPushButton(self.widget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding)
sizePolicy.setHorizontalStretch(0)
@@ -52,11 +67,11 @@ class Ui_Dialog(object):
self.cloneInstallButton.setBaseSize(QtCore.QSize(200, 96))
font = QtGui.QFont()
font.setPointSize(12)
- font.setWeight(75)
font.setBold(True)
+ font.setWeight(75)
self.cloneInstallButton.setFont(font)
self.cloneInstallButton.setIconSize(QtCore.QSize(64, 64))
- self.cloneInstallButton.setObjectName("cloneInstallButton")
+ self.cloneInstallButton.setObjectName(_fromUtf8("cloneInstallButton"))
self.gridLayout.addWidget(self.cloneInstallButton, 0, 0, 1, 1)
self.cloneInstallLabel = QtGui.QLabel(self.widget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.MinimumExpanding)
@@ -69,7 +84,7 @@ class Ui_Dialog(object):
self.cloneInstallLabel.setBaseSize(QtCore.QSize(300, 96))
self.cloneInstallLabel.setWordWrap(True)
self.cloneInstallLabel.setMargin(6)
- self.cloneInstallLabel.setObjectName("cloneInstallLabel")
+ self.cloneInstallLabel.setObjectName(_fromUtf8("cloneInstallLabel"))
self.gridLayout.addWidget(self.cloneInstallLabel, 0, 1, 1, 1)
self.cloneUpgradeButton = QtGui.QPushButton(self.widget)
self.cloneUpgradeButton.setEnabled(True)
@@ -82,11 +97,11 @@ class Ui_Dialog(object):
self.cloneUpgradeButton.setBaseSize(QtCore.QSize(0, 96))
font = QtGui.QFont()
font.setPointSize(12)
- font.setWeight(75)
font.setBold(True)
+ font.setWeight(75)
self.cloneUpgradeButton.setFont(font)
self.cloneUpgradeButton.setIconSize(QtCore.QSize(128, 128))
- self.cloneUpgradeButton.setObjectName("cloneUpgradeButton")
+ self.cloneUpgradeButton.setObjectName(_fromUtf8("cloneUpgradeButton"))
self.gridLayout.addWidget(self.cloneUpgradeButton, 1, 0, 1, 1)
self.cloneUpgradeLabel = QtGui.QLabel(self.widget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.MinimumExpanding)
@@ -99,7 +114,7 @@ class Ui_Dialog(object):
self.cloneUpgradeLabel.setBaseSize(QtCore.QSize(300, 96))
self.cloneUpgradeLabel.setWordWrap(True)
self.cloneUpgradeLabel.setMargin(6)
- self.cloneUpgradeLabel.setObjectName("cloneUpgradeLabel")
+ self.cloneUpgradeLabel.setObjectName(_fromUtf8("cloneUpgradeLabel"))
self.gridLayout.addWidget(self.cloneUpgradeLabel, 1, 1, 1, 1)
self.upgradeFromIsoButton = QtGui.QPushButton(self.widget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.MinimumExpanding)
@@ -111,11 +126,11 @@ class Ui_Dialog(object):
self.upgradeFromIsoButton.setBaseSize(QtCore.QSize(0, 96))
font = QtGui.QFont()
font.setPointSize(12)
- font.setWeight(75)
font.setBold(True)
+ font.setWeight(75)
self.upgradeFromIsoButton.setFont(font)
self.upgradeFromIsoButton.setIconSize(QtCore.QSize(128, 128))
- self.upgradeFromIsoButton.setObjectName("upgradeFromIsoButton")
+ self.upgradeFromIsoButton.setObjectName(_fromUtf8("upgradeFromIsoButton"))
self.gridLayout.addWidget(self.upgradeFromIsoButton, 2, 0, 1, 1)
self.upgradeFromIsoLabel = QtGui.QLabel(self.widget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.MinimumExpanding)
@@ -128,12 +143,12 @@ class Ui_Dialog(object):
self.upgradeFromIsoLabel.setBaseSize(QtCore.QSize(300, 96))
self.upgradeFromIsoLabel.setWordWrap(True)
self.upgradeFromIsoLabel.setMargin(6)
- self.upgradeFromIsoLabel.setObjectName("upgradeFromIsoLabel")
+ self.upgradeFromIsoLabel.setObjectName(_fromUtf8("upgradeFromIsoLabel"))
self.gridLayout.addWidget(self.upgradeFromIsoLabel, 2, 1, 1, 1)
self.verticalLayout.addLayout(self.gridLayout)
self.helpLabel = QtGui.QLabel(self.widget)
self.helpLabel.setMargin(6)
- self.helpLabel.setObjectName("helpLabel")
+ self.helpLabel.setObjectName(_fromUtf8("helpLabel"))
self.verticalLayout.addWidget(self.helpLabel)
self.retranslateUi(Dialog)
diff --git a/liveusb/resources_rc.py b/liveusb/resources_rc.py
index 21107d7..41a53d2 100755
--- a/liveusb/resources_rc.py
+++ b/liveusb/resources_rc.py
@@ -2,8 +2,8 @@
# Resource object code
#
-# Created: Sun Apr 27 16:40:48 2014
-# by: The Resource Compiler for PyQt (Qt v4.6.3)
+# Created: Sun May 11 12:03:50 2014
+# by: The Resource Compiler for PyQt (Qt v4.8.6)
#
# WARNING! All changes made in this file will be lost!