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

Merge remote-tracking branch 'qubesos/pr/80'

Browse Source 
* qubesos/pr/80:
  changes as requested by @marmarek
  Minor textual update for Global Settings

While resolving conflict, reverted global settings window size to sane
value.
This commit is contained in:
Marek Marczykowski-Górecki 2018-03-28 18:00:45 +02:00
commit fd766dd651
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/globalsettingsdlg.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>974</width> <width>651</width>
<height>587</height> <height>386</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -38,12 +38,16 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>UpdateVM:</string> <string>Dom0 UpdateVM:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="update_vm_combo"/> <widget class="QComboBox" name="update_vm_combo">
<property name="toolTip">
<string>This is updateVM ONLY for dom0; if you want to change updateVMs for other VMs, use /etc/qubes-rpc/policy/qubes.UpdatesProxy</string>
</property>
</widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">