Skip to content

Commit 8edd811

Browse files
marmarekmarmarek
committed
Merge remote-tracking branch 'origin/pr/262'
* origin/pr/262: Notify usage of preloaded disposable Add preload disposable setting to global config
2 parents 1867ded + 26cdf14 commit 8edd811

4 files changed

Lines changed: 435 additions & 32 deletions

File tree

‎qubes_config/global_config.glade‎

Lines changed: 148 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@
976976
<property name="can-focus">False</property>
977977
<property name="vscroll-policy">natural</property>
978978
<child>
979-
<!-- n-columns=2 n-rows=25 -->
979+
<!-- n-columns=2 n-rows=26 -->
980980
<object class="GtkGrid" id="basics_contents">
981981
<property name="visible">True</property>
982982
<property name="can-focus">False</property>
@@ -1069,7 +1069,7 @@
10691069
</object>
10701070
<packing>
10711071
<property name="left-attach">0</property>
1072-
<property name="top-attach">9</property>
1072+
<property name="top-attach">10</property>
10731073
<property name="width">2</property>
10741074
</packing>
10751075
</child>
@@ -1085,7 +1085,7 @@
10851085
</object>
10861086
<packing>
10871087
<property name="left-attach">0</property>
1088-
<property name="top-attach">12</property>
1088+
<property name="top-attach">13</property>
10891089
</packing>
10901090
</child>
10911091
<child>
@@ -1101,7 +1101,7 @@
11011101
</object>
11021102
<packing>
11031103
<property name="left-attach">1</property>
1104-
<property name="top-attach">12</property>
1104+
<property name="top-attach">13</property>
11051105
</packing>
11061106
</child>
11071107
<child>
@@ -1114,7 +1114,7 @@
11141114
</object>
11151115
<packing>
11161116
<property name="left-attach">1</property>
1117-
<property name="top-attach">13</property>
1117+
<property name="top-attach">14</property>
11181118
</packing>
11191119
</child>
11201120
<child>
@@ -1127,7 +1127,7 @@
11271127
</object>
11281128
<packing>
11291129
<property name="left-attach">1</property>
1130-
<property name="top-attach">14</property>
1130+
<property name="top-attach">15</property>
11311131
</packing>
11321132
</child>
11331133
<child>
@@ -1238,7 +1238,7 @@
12381238
</object>
12391239
<packing>
12401240
<property name="left-attach">0</property>
1241-
<property name="top-attach">16</property>
1241+
<property name="top-attach">17</property>
12421242
<property name="width">2</property>
12431243
</packing>
12441244
</child>
@@ -1255,7 +1255,7 @@
12551255
</object>
12561256
<packing>
12571257
<property name="left-attach">0</property>
1258-
<property name="top-attach">17</property>
1258+
<property name="top-attach">18</property>
12591259
<property name="width">2</property>
12601260
</packing>
12611261
</child>
@@ -1271,7 +1271,7 @@
12711271
</object>
12721272
<packing>
12731273
<property name="left-attach">0</property>
1274-
<property name="top-attach">21</property>
1274+
<property name="top-attach">22</property>
12751275
<property name="width">2</property>
12761276
</packing>
12771277
</child>
@@ -1283,7 +1283,7 @@
12831283
</object>
12841284
<packing>
12851285
<property name="left-attach">1</property>
1286-
<property name="top-attach">23</property>
1286+
<property name="top-attach">24</property>
12871287
</packing>
12881288
</child>
12891289
<child>
@@ -1295,7 +1295,7 @@
12951295
</object>
12961296
<packing>
12971297
<property name="left-attach">0</property>
1298-
<property name="top-attach">24</property>
1298+
<property name="top-attach">25</property>
12991299
<property name="width">2</property>
13001300
</packing>
13011301
</child>
@@ -1312,7 +1312,7 @@
13121312
</object>
13131313
<packing>
13141314
<property name="left-attach">0</property>
1315-
<property name="top-attach">22</property>
1315+
<property name="top-attach">23</property>
13161316
<property name="width">2</property>
13171317
</packing>
13181318
</child>
@@ -1462,7 +1462,7 @@
14621462
</object>
14631463
<packing>
14641464
<property name="left-attach">0</property>
1465-
<property name="top-attach">10</property>
1465+
<property name="top-attach">11</property>
14661466
<property name="width">2</property>
14671467
</packing>
14681468
</child>
@@ -1509,7 +1509,7 @@
15091509
</object>
15101510
<packing>
15111511
<property name="left-attach">0</property>
1512-
<property name="top-attach">11</property>
1512+
<property name="top-attach">12</property>
15131513
<property name="width">2</property>
15141514
</packing>
15151515
</child>
@@ -1554,7 +1554,7 @@
15541554
</object>
15551555
<packing>
15561556
<property name="left-attach">0</property>
1557-
<property name="top-attach">13</property>
1557+
<property name="top-attach">14</property>
15581558
</packing>
15591559
</child>
15601560
<child>
@@ -1578,7 +1578,7 @@
15781578
</object>
15791579
<packing>
15801580
<property name="left-attach">0</property>
1581-
<property name="top-attach">8</property>
1581+
<property name="top-attach">9</property>
15821582
</packing>
15831583
</child>
15841584
<child>
@@ -1590,7 +1590,7 @@
15901590
</object>
15911591
<packing>
15921592
<property name="left-attach">0</property>
1593-
<property name="top-attach">15</property>
1593+
<property name="top-attach">16</property>
15941594
</packing>
15951595
</child>
15961596
<child>
@@ -1602,7 +1602,7 @@
16021602
</object>
16031603
<packing>
16041604
<property name="left-attach">0</property>
1605-
<property name="top-attach">20</property>
1605+
<property name="top-attach">21</property>
16061606
</packing>
16071607
</child>
16081608
<child>
@@ -1633,7 +1633,7 @@
16331633
</object>
16341634
<packing>
16351635
<property name="left-attach">0</property>
1636-
<property name="top-attach">14</property>
1636+
<property name="top-attach">15</property>
16371637
</packing>
16381638
</child>
16391639
<child>
@@ -1648,7 +1648,7 @@
16481648
</object>
16491649
<packing>
16501650
<property name="left-attach">0</property>
1651-
<property name="top-attach">23</property>
1651+
<property name="top-attach">24</property>
16521652
</packing>
16531653
</child>
16541654
<child>
@@ -1663,7 +1663,7 @@
16631663
</object>
16641664
<packing>
16651665
<property name="left-attach">0</property>
1666-
<property name="top-attach">18</property>
1666+
<property name="top-attach">19</property>
16671667
</packing>
16681668
</child>
16691669
<child>
@@ -1678,7 +1678,7 @@
16781678
</object>
16791679
<packing>
16801680
<property name="left-attach">0</property>
1681-
<property name="top-attach">19</property>
1681+
<property name="top-attach">20</property>
16821682
</packing>
16831683
</child>
16841684
<child>
@@ -1718,7 +1718,7 @@
17181718
</object>
17191719
<packing>
17201720
<property name="left-attach">1</property>
1721-
<property name="top-attach">18</property>
1721+
<property name="top-attach">19</property>
17221722
</packing>
17231723
</child>
17241724
<child>
@@ -1758,7 +1758,131 @@
17581758
</object>
17591759
<packing>
17601760
<property name="left-attach">1</property>
1761-
<property name="top-attach">19</property>
1761+
<property name="top-attach">20</property>
1762+
</packing>
1763+
</child>
1764+
<child>
1765+
<object class="GtkBox">
1766+
<property name="visible">True</property>
1767+
<property name="can-focus">False</property>
1768+
<property name="orientation">vertical</property>
1769+
<child>
1770+
<object class="GtkLabel">
1771+
<property name="visible">True</property>
1772+
<property name="can-focus">False</property>
1773+
<property name="label" translatable="yes">Preload disposable qubes:</property>
1774+
<property name="wrap">True</property>
1775+
<property name="xalign">0</property>
1776+
<style>
1777+
<class name="main_text"/>
1778+
</style>
1779+
</object>
1780+
<packing>
1781+
<property name="expand">False</property>
1782+
<property name="fill">True</property>
1783+
<property name="position">0</property>
1784+
</packing>
1785+
</child>
1786+
<child>
1787+
<object class="GtkBox">
1788+
<property name="visible">True</property>
1789+
<property name="can-focus">False</property>
1790+
<property name="orientation">vertical</property>
1791+
<child>
1792+
<object class="GtkLabel">
1793+
<property name="visible">True</property>
1794+
<property name="can-focus">False</property>
1795+
<property name="label" translatable="yes">Maximum number of disposable qubes (created from the default disposable template) to queue in the background. They are available immediately, but each one reserves memory. This setting takes precedence over the default disposable template's preload setting.</property>
1796+
<property name="wrap">True</property>
1797+
<property name="xalign">0</property>
1798+
<style>
1799+
<class name="explanation"/>
1800+
</style>
1801+
</object>
1802+
<packing>
1803+
<property name="expand">False</property>
1804+
<property name="fill">True</property>
1805+
<property name="position">1</property>
1806+
</packing>
1807+
</child>
1808+
</object>
1809+
<packing>
1810+
<property name="expand">False</property>
1811+
<property name="fill">True</property>
1812+
<property name="position">1</property>
1813+
</packing>
1814+
</child>
1815+
</object>
1816+
<packing>
1817+
<property name="left-attach">0</property>
1818+
<property name="top-attach">8</property>
1819+
</packing>
1820+
</child>
1821+
<child>
1822+
<object class="GtkBox">
1823+
<property name="visible">True</property>
1824+
<property name="can-focus">False</property>
1825+
<property name="halign">start</property>
1826+
<child>
1827+
<object class="GtkCheckButton" id="basics_preload_dispvm_check">
1828+
<property name="visible">True</property>
1829+
<property name="can-focus">True</property>
1830+
<property name="receives-default">False</property>
1831+
<property name="margin-top">5</property>
1832+
<property name="margin-bottom">10</property>
1833+
<property name="draw-indicator">True</property>
1834+
<child>
1835+
<object class="GtkBox">
1836+
<property name="visible">True</property>
1837+
<property name="can-focus">False</property>
1838+
<property name="orientation">vertical</property>
1839+
<child>
1840+
<object class="GtkLabel">
1841+
<property name="visible">True</property>
1842+
<property name="can-focus">False</property>
1843+
<property name="wrap">True</property>
1844+
<property name="xalign">0</property>
1845+
<style>
1846+
<class name="main_text"/>
1847+
</style>
1848+
</object>
1849+
<packing>
1850+
<property name="expand">False</property>
1851+
<property name="fill">True</property>
1852+
<property name="position">0</property>
1853+
</packing>
1854+
</child>
1855+
</object>
1856+
</child>
1857+
</object>
1858+
<packing>
1859+
<property name="expand">False</property>
1860+
<property name="fill">True</property>
1861+
<property name="position">2</property>
1862+
</packing>
1863+
</child>
1864+
<child>
1865+
<object class="GtkSpinButton" id="basics_preload_dispvm">
1866+
<property name="visible">True</property>
1867+
<property name="can-focus">True</property>
1868+
<property name="halign">start</property>
1869+
<property name="valign">center</property>
1870+
<property name="margin-left">5</property>
1871+
<property name="margin-start">5</property>
1872+
<property name="margin-bottom">5</property>
1873+
<property name="hexpand">True</property>
1874+
<property name="max-width-chars">4</property>
1875+
</object>
1876+
<packing>
1877+
<property name="expand">False</property>
1878+
<property name="fill">True</property>
1879+
<property name="position">3</property>
1880+
</packing>
1881+
</child>
1882+
</object>
1883+
<packing>
1884+
<property name="left-attach">1</property>
1885+
<property name="top-attach">8</property>
17621886
</packing>
17631887
</child>
17641888
<child>

0 commit comments

Comments
 (0)