Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qubesos/pr/109'

Browse Source 
* qubesos/pr/109:
  Pylint whitespace fix
  Fixed Backup GUI size
  Add option to turn off computer after backup to Backup GUI
This commit is contained in:
Marek Marczykowski-Górecki 2018-07-12 23:47:35 +02:00
commit 0a44c931da
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 91 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubesmanager/backup.py
View File

@ -348,6 +348,12 @@ class BackupVMsWindow(ui_backupdlg.Ui_Backup, multiselectwidget.QtGui.QWizard):
self.button(self.FinishButton).setEnabled(True) self.button(self.FinishButton).setEnabled(True)
self.showFileDialog.setEnabled(False) self.showFileDialog.setEnabled(False)
self.cleanup_temporary_files() self.cleanup_temporary_files()
# turn off only when backup was successful
if self.thread_monitor.success and \
self.turn_off_checkbox.isChecked():
os.system('systemctl poweroff')
signal.signal(signal.SIGCHLD, old_sigchld_handler) signal.signal(signal.SIGCHLD, old_sigchld_handler)
def reject(self): def reject(self):

100
ui/backupdlg.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>737</width> <width>737</width>
<height>420</height> <height>618</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -156,28 +156,21 @@
<property name="title"> <property name="title">
<string>Backup destination directory</string> <string>Backup destination directory</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <property name="alignment">
<item row="3" column="2"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
<widget class="QLineEdit" name="dir_line_edit"/>
</item>
<item row="3" column="3">
<widget class="QToolButton" name="select_path_button">
<property name="text">
<string>...</string>
</property> </property>
</widget> <layout class="QFormLayout" name="formLayout_2">
</item> <item row="0" column="0">
<item row="1" column="2">
<widget class="QComboBox" name="appvm_combobox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Target qube:</string> <string>Target qube:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="0" column="1">
<widget class="QComboBox" name="appvm_combobox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Backup directory or command:</string> <string>Backup directory or command:</string>
@ -187,42 +180,46 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QLineEdit" name="dir_line_edit"/>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="select_path_button">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>100</height>
</size>
</property>
<property name="title"> <property name="title">
<string>Save backup profile</string> <string>Save backup profile</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="label_8">
<property name="geometry">
<rect>
<x>10</x>
<y>30</y>
<width>267</width>
<height>25</height>
</rect>
</property>
<property name="text"> <property name="text">
<string>Save settings as default backup profile:</string> <string>Save settings as default backup profile:</string>
</property> </property>
</widget> </widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="save_profile_checkbox"> <widget class="QCheckBox" name="save_profile_checkbox">
<property name="geometry">
<rect>
<x>270</x>
<y>30</y>
<width>539</width>
<height>25</height>
</rect>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
@ -230,15 +227,9 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
<property name="geometry">
<rect>
<x>10</x>
<y>60</y>
<width>511</width>
<height>16</height>
</rect>
</property>
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -250,6 +241,8 @@
<string>WARNING: password will be saved in dom0 in plain text.</string> <string>WARNING: password will be saved in dom0 in plain text.</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
@ -310,6 +303,31 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<widget class="QGroupBox" name="groupBox_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Other</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<layout class="QFormLayout" name="formLayout_4">
<item row="0" column="0">
<widget class="QCheckBox" name="turn_off_checkbox">
<property name="text">
<string>Turn computer off after backup is finished</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWizardPage" name="confirm_page"> <widget class="QWizardPage" name="confirm_page">