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

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

Browse Source 
* origin/pr/127:
  Changed blank kernelopts in VM settings from [] to -
  Fixed kernelopts in VM settings
This commit is contained in:
Marek Marczykowski-Górecki 2018-09-29 13:53:50 +02:00
commit 70adf9cca9
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qubesmanager/settings.py
View File

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

1
ui/settingsdlg.ui
View File

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