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

qubesmanager/settings.py

@@ -224,6 +224,16 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
         text = "Yes" if self.vm.installed_by_rpm == True else "No"
         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
         self.priv_size.setValue(int(self.vm.maxmem)/1024)
         self.priv_size.setMinimum(0)

settingsdlg.ui

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