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

Remove obsolete sections from VM Settings:

Browse Source 
- drive image
- paths
This commit is contained in:
Marta Marczykowska-Górecka 2017-09-08 22:39:54 +02:00
parent c85fbab6f6
commit 0e5feeac0d
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
2 changed files with 12 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qubesmanager/settings.py
View File

@ -454,18 +454,18 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
self.vm.features.get('services.meminfo-writer', True))
self.max_mem_size.setEnabled(self.include_in_balancing.isChecked())
try:
self.root_img_path.setText('{volume.pool}:{volume.vid}'.format(
volume=self.vm.volumes['root']))
except AttributeError:
self.root_img_path.setText("n/a")
try:
self.volatile_img_path.setText('{volume.pool}:{volume.vid}'.format(
volume=self.vm.volumes['volatile']))
except AttributeError:
self.volatile_img_path.setText('n/a')
self.private_img_path.setText('{volume.pool}:{volume.vid}'.format(
volume=self.vm.volumes['private']))
# try:
# self.root_img_path.setText('{volume.pool}:{volume.vid}'.format(
# volume=self.vm.volumes['root']))
# except AttributeError:
# self.root_img_path.setText("n/a")
# try:
# self.volatile_img_path.setText('{volume.pool}:{volume.vid}'.format(
# volume=self.vm.volumes['volatile']))
# except AttributeError:
# self.volatile_img_path.setText('n/a')
# self.private_img_path.setText('{volume.pool}:{volume.vid}'.format(
# volume=self.vm.volumes['private']))
#kernel

223
ui/settingsdlg.ui
View File

@ -538,63 +538,6 @@
</layout>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_11">
<property name="enabled">
<bool>true</bool>
</property>
<property name="title">
<string>Paths</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>root img:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="root_img_path">
<property name="text">
<string>root_img_path</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>root volatile img:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="volatile_img_path">
<property name="text">
<string>volatile_path</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>private img:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="private_img_path">
<property name="text">
<string>private_path</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
@ -608,172 +551,6 @@
</property>
</spacer>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="other_groupbox">
<property name="title">
<string>Other</string>
</property>
<layout class="QFormLayout" name="formLayout_2">
<item row="1" column="0">
<widget class="QLabel" name="label_26">
<property name="text">
<string>Default DispVM:</string>
</property>
<property name="buddy">
<cstring>default_dispvm</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="default_dispvm"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="1" rowspan="3" colspan="2">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="kernel_groupbox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Kernel</string>
</property>
<layout class="QFormLayout" name="formLayout_9">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_19">
<property name="text">
<string>Kernel:</string>
</property>
<property name="buddy">
<cstring>kernel</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="kernel"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_20">
<property name="text">
<string>Kernel opts:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="kernel_opts">
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="text">
<string>[]</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="drive_groupbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Additional drive</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout_18">
<item row="5" column="1">
<widget class="QLineEdit" name="drive_path"/>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="drive_domain"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_52">
<property name="text">
<string>Path:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="drive_type"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_53">
<property name="text">
<string>Backend domain:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_51">
<property name="text">
<string>Type:</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QToolButton" name="drive_path_button">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="6" column="0" colspan="3">
<widget class="QLabel" name="drive_running_warning">
<property name="enabled">
<bool>true</bool>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">color: rgb(255, 0, 0);</string>
</property>
<property name="text">
<string>New drive will be used only at next VM startup</string>
</property>
<property name="textFormat">
<enum>Qt::AutoText</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="firewall_tab">