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

* origin/pr/226:
  reworded memory balancing descriptions in Global Settings
This commit is contained in:
Marek Marczykowski-Górecki 2020-01-16 04:42:22 +01:00
commit 8902727e0f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -120,10 +120,10 @@
</size>
</property>
<property name="title">
<string>Default memory settings</string>
<string>Memory Balancer Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_6">
<property name="enabled">
<bool>true</bool>
@ -133,7 +133,7 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="2" column="1">
<widget class="QSpinBox" name="min_vm_mem">
<property name="enabled">
<bool>true</bool>
@ -149,21 +149,14 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_7">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>dom0 memory boost:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<item row="3" column="1">
<widget class="QSpinBox" name="dom0_mem_boost">
<property name="enabled">
<bool>true</bool>
</property>
<property name="toolTip">
<string>Additional memory allocated to dom0 by Qubes Memory Balancer.</string>
</property>
<property name="suffix">
<string> MiB</string>
</property>
@ -175,6 +168,29 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="enabled">
<bool>true</bool>
</property>
<property name="toolTip">
<string>Additional memory allocated to dom0 by Qubes Memory Balancer.</string>
</property>
<property name="text">
<string>Additional dom0 memory:</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Memory balancing is used for dom0 and all qubes that have memory balancing enabled (by default all qubes, except for those with PCI devices connected, such as sys-net and sys-usb).</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>