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

Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/aga/qubes-manager

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-03-09 09:46:56 +01:00
commit 4e7b110fa9
2 changed files with 88 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubesmanager/settings.py
View File

@ -224,6 +224,16 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
text = "Yes" if self.vm.installed_by_rpm == True else "No" text = "Yes" if self.vm.installed_by_rpm == True else "No"
self.rpm_label.setText(text) self.rpm_label.setText(text)
#networking info
if self.vm.is_networked():
self.networking_groupbox.setEnabled(True);
self.ip_label.setText(self.vm.ip if self.vm.ip is not None else "none")
self.netmask_label.setText(self.vm.netmask if self.vm.netmask is not None else "none")
self.gateway_label.setText(self.vm.gateway if self.vm.gateway is not None else "none")
else:
self.networking_groupbox.setEnabled(False);
#maxmem #maxmem
self.priv_size.setValue(int(self.vm.maxmem)/1024) self.priv_size.setValue(int(self.vm.maxmem)/1024)
self.priv_size.setMinimum(0) self.priv_size.setMinimum(0)

90
settingsdlg.ui
View File

@ -38,8 +38,8 @@
<attribute name="title"> <attribute name="title">
<string>Basic</string> <string>Basic</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QGridLayout" name="gridLayout_11">
<item> <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_3"> <widget class="QGroupBox" name="groupBox_3">
<property name="title"> <property name="title">
<string>Settings</string> <string>Settings</string>
@ -55,7 +55,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="vmname"> <widget class="QLineEdit" name="vmname">
<property name="text"> <property name="text">
<string>myappvm</string> <string>----</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -102,18 +102,15 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QGroupBox" name="groupBox_4"> <widget class="QGroupBox" name="groupBox_4">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="title"> <property name="title">
<string>Info</string> <string>General</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_4"> <layout class="QFormLayout" name="formLayout_4">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="text"> <property name="text">
@ -130,7 +127,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>AppVM</string> <string>---</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -150,14 +147,14 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>No</string> <string>---</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -199,7 +196,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="3" column="0">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -212,6 +209,75 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="1">
<widget class="QGroupBox" name="networking_groupbox">
<property name="title">
<string>Networking</string>
</property>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>IP:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="ip_label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>---</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Netmask:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="netmask_label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>---</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Gateway:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="gateway_label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>---</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="advanced_tab"> <widget class="QWidget" name="advanced_tab">