[Pkg-privacy-commits] [tails-installer] 14/31: New UI changes for liveusb creation method
anonym
anonym-tails-guest at moszumanska.debian.org
Thu Jan 12 15:14:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
anonym-tails-guest pushed a commit to annotated tag 3.13.0
in repository tails-installer.
commit 73ebffb0168d0097714b336d62545aa2b012578b
Author: Luke Macken <lmacken at redhat.com>
Date: Tue Nov 25 19:07:33 2014 -0700
New UI changes for liveusb creation method
---
data/liveusb-creator.ui | 59 ++++++++++++++++++++++++++++++++++++++++++++-----
liveusb/linux_dialog.py | 32 ++++++++++++++++++++-------
2 files changed, 77 insertions(+), 14 deletions(-)
diff --git a/data/liveusb-creator.ui b/data/liveusb-creator.ui
index 2623ff8..25592b1 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>419</height>
</rect>
</property>
<property name="sizePolicy">
@@ -26,7 +26,7 @@
<property name="geometry">
<rect>
<x>130</x>
- <y>350</y>
+ <y>380</y>
<width>158</width>
<height>34</height>
</rect>
@@ -42,7 +42,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>200</y>
+ <y>230</y>
<width>401</width>
<height>111</height>
</rect>
@@ -63,7 +63,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>320</y>
+ <y>350</y>
<width>401</width>
<height>23</height>
</rect>
@@ -188,7 +188,7 @@
<property name="geometry">
<rect>
<x>10</x>
- <y>140</y>
+ <y>130</y>
<width>191</width>
<height>51</height>
</rect>
@@ -248,7 +248,7 @@
<property name="geometry">
<rect>
<x>210</x>
- <y>140</y>
+ <y>130</y>
<width>201</width>
<height>51</height>
</rect>
@@ -300,6 +300,53 @@
<pixmap resource="resources.qrc">:/liveusb-header.png</pixmap>
</property>
</widget>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>180</y>
+ <width>401</width>
+ <height>41</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>8</pointsize>
+ </font>
+ </property>
+ <property name="title">
+ <string>Method</string>
+ </property>
+ <widget class="QRadioButton" name="nonDestructiveButton">
+ <property name="geometry">
+ <rect>
+ <x>50</x>
+ <y>10</y>
+ <width>131</width>
+ <height>26</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Non-destructive (cp)</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QRadioButton" name="destructiveButton">
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>10</y>
+ <width>171</width>
+ <height>26</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Over-write device (dd)</string>
+ </property>
+ </widget>
+ </widget>
</widget>
<resources>
<include location="resources.qrc"/>
diff --git a/liveusb/linux_dialog.py b/liveusb/linux_dialog.py
index 754af54..f1c106a 100644
--- a/liveusb/linux_dialog.py
+++ b/liveusb/linux_dialog.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'data/liveusb-creator.ui'
#
-# Created: Tue Jan 15 12:09:54 2013
-# by: PyQt4 UI code generator 4.9.6
+# Created: Tue Nov 25 16:22:22 2014
+# by: PyQt4 UI code generator 4.10.2
#
# WARNING! All changes made in this file will be lost!
@@ -26,7 +26,7 @@ except AttributeError:
class Ui_Dialog(object):
def setupUi(self, Dialog):
Dialog.setObjectName(_fromUtf8("Dialog"))
- Dialog.resize(422, 388)
+ Dialog.resize(422, 419)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(0)
@@ -34,17 +34,17 @@ class Ui_Dialog(object):
Dialog.setSizePolicy(sizePolicy)
self.startButton = QtGui.QPushButton(Dialog)
self.startButton.setEnabled(True)
- self.startButton.setGeometry(QtCore.QRect(130, 350, 158, 34))
+ self.startButton.setGeometry(QtCore.QRect(130, 380, 158, 34))
self.startButton.setObjectName(_fromUtf8("startButton"))
self.textEdit = QtGui.QTextEdit(Dialog)
- self.textEdit.setGeometry(QtCore.QRect(10, 200, 401, 111))
+ self.textEdit.setGeometry(QtCore.QRect(10, 230, 401, 111))
font = QtGui.QFont()
font.setPointSize(8)
self.textEdit.setFont(font)
self.textEdit.setReadOnly(True)
self.textEdit.setObjectName(_fromUtf8("textEdit"))
self.progressBar = QtGui.QProgressBar(Dialog)
- self.progressBar.setGeometry(QtCore.QRect(10, 320, 401, 23))
+ self.progressBar.setGeometry(QtCore.QRect(10, 350, 401, 23))
self.progressBar.setProperty("value", 0)
self.progressBar.setObjectName(_fromUtf8("progressBar"))
self.downloadGroup = QtGui.QGroupBox(Dialog)
@@ -83,7 +83,7 @@ class Ui_Dialog(object):
self.isoBttn.setGeometry(QtCore.QRect(11, 18, 141, 25))
self.isoBttn.setObjectName(_fromUtf8("isoBttn"))
self.groupBox_2 = QtGui.QGroupBox(Dialog)
- self.groupBox_2.setGeometry(QtCore.QRect(10, 140, 191, 51))
+ self.groupBox_2.setGeometry(QtCore.QRect(10, 130, 191, 51))
font = QtGui.QFont()
font.setPointSize(8)
self.groupBox_2.setFont(font)
@@ -101,7 +101,7 @@ class Ui_Dialog(object):
self.refreshDevicesButton.setFlat(True)
self.refreshDevicesButton.setObjectName(_fromUtf8("refreshDevicesButton"))
self.overlayTitle = QtGui.QGroupBox(Dialog)
- self.overlayTitle.setGeometry(QtCore.QRect(210, 140, 201, 51))
+ self.overlayTitle.setGeometry(QtCore.QRect(210, 130, 201, 51))
font = QtGui.QFont()
font.setPointSize(8)
self.overlayTitle.setFont(font)
@@ -117,6 +117,19 @@ class Ui_Dialog(object):
self.label.setText(_fromUtf8(""))
self.label.setPixmap(QtGui.QPixmap(_fromUtf8(":/liveusb-header.png")))
self.label.setObjectName(_fromUtf8("label"))
+ self.groupBox_3 = QtGui.QGroupBox(Dialog)
+ self.groupBox_3.setGeometry(QtCore.QRect(10, 180, 401, 41))
+ font = QtGui.QFont()
+ font.setPointSize(8)
+ self.groupBox_3.setFont(font)
+ self.groupBox_3.setObjectName(_fromUtf8("groupBox_3"))
+ self.nonDestructiveButton = QtGui.QRadioButton(self.groupBox_3)
+ self.nonDestructiveButton.setGeometry(QtCore.QRect(50, 10, 131, 26))
+ self.nonDestructiveButton.setChecked(True)
+ self.nonDestructiveButton.setObjectName(_fromUtf8("nonDestructiveButton"))
+ self.destructiveButton = QtGui.QRadioButton(self.groupBox_3)
+ self.destructiveButton.setGeometry(QtCore.QRect(210, 10, 171, 26))
+ self.destructiveButton.setObjectName(_fromUtf8("destructiveButton"))
self.retranslateUi(Dialog)
QtCore.QMetaObject.connectSlotsByName(Dialog)
@@ -138,5 +151,8 @@ class Ui_Dialog(object):
self.groupBox_2.setTitle(_translate("Dialog", "Target Device", None))
self.overlayTitle.setWhatsThis(_translate("Dialog", "By allocating extra space on your USB stick for a persistent overlay, you will be able to store data and make permanent modifications to your live operating system. Without it, you will not be able to save data that will persist after a reboot.", "comment!"))
self.overlayTitle.setTitle(_translate("Dialog", "Persistent Storage (0 MB)", None))
+ self.groupBox_3.setTitle(_translate("Dialog", "Method", None))
+ self.nonDestructiveButton.setText(_translate("Dialog", "Non-destructive (cp)", None))
+ self.destructiveButton.setText(_translate("Dialog", "Over-write device (dd)", None))
import resources_rc
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git
More information about the Pkg-privacy-commits
mailing list