Merge remote-tracking branch 'origin/pr/127'

* origin/pr/127:
  Changed blank kernelopts in VM settings from [] to -
  Fixed kernelopts in VM settings

qubesmanager/settings.py

@@ -648,6 +648,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
                 None,
                 allow_default=True, allow_none=True)
             self.kernel.currentIndexChanged.connect(self.kernel_changed)
+            self.kernel_opts.setText(getattr(self.vm, 'kernelopts', '-'))
         else:
             self.kernel_groupbox.setVisible(False)
 

ui/settingsdlg.ui

@@ -483,6 +483,7 @@ border-width: 1px;</string>
                 <property name="font">
                  <font>
                   <weight>50</weight>
+                  <italic>true</italic>
                   <bold>false</bold>
                  </font>
                 </property>