From 34543b3ecd0247c0abfb8aee6c3982f4c5d4beee Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sat, 19 Feb 2022 14:23:32 -0500 Subject: [PATCH] ui: Remove use of deprecated GtkAlignment Mostly this is replaced with widget padding, and GtkBox for generic containers Signed-off-by: Cole Robinson --- ui/addhardware.ui | 21 +- ui/addstorage.ui | 88 +-- ui/clone.ui | 610 +++++++------- ui/console.ui | 37 +- ui/createconn.ui | 4 +- ui/createnet.ui | 597 +++++++------- ui/createpool.ui | 7 +- ui/createvm.ui | 710 +++++++---------- ui/createvol.ui | 21 +- ui/details.ui | 357 ++++++--- ui/fsdetails.ui | 16 +- ui/host.ui | 292 ++++--- ui/hostnets.ui | 7 +- ui/hoststorage.ui | 46 +- ui/manager.ui | 16 +- ui/migrate.ui | 607 +++++++------- ui/oslist.ui | 1 + ui/preferences.ui | 1276 +++++++++++++++--------------- ui/snapshots.ui | 532 ++++++------- ui/snapshotsnew.ui | 7 +- ui/storagebrowse.ui | 2 +- ui/vmwindow.ui | 8 +- ui/xmleditor.ui | 4 +- virtManager/details/details.py | 1 + virtManager/details/serialcon.py | 4 +- virtManager/error.py | 9 +- virtManager/host.py | 2 + 27 files changed, 2584 insertions(+), 2698 deletions(-) diff --git a/ui/addhardware.ui b/ui/addhardware.ui index b9b0c04a..fa88127b 100644 --- a/ui/addhardware.ui +++ b/ui/addhardware.ui @@ -108,7 +108,7 @@ - + True False @@ -125,7 +125,7 @@ vertical 18 - + True False @@ -210,7 +210,7 @@ - + True False @@ -443,7 +443,7 @@ - + True False False @@ -458,7 +458,7 @@ - + True False False @@ -570,7 +570,7 @@ - + True False @@ -1192,7 +1192,7 @@ - + True False @@ -1341,7 +1341,7 @@ - + True False @@ -1369,6 +1369,11 @@ + + False + True + 0 + diff --git a/ui/addstorage.ui b/ui/addstorage.ui index ad9db464..6e26a9e0 100644 --- a/ui/addstorage.ui +++ b/ui/addstorage.ui @@ -43,51 +43,26 @@ - + True False - 22 + 22 + vertical + 4 - + True False - vertical - 4 + 6 - + True - False - 6 - - - True - True - end - 0.0 - adjustment1 - 1 - 1 - - - False - False - 0 - - - - - True - False - _GiB - True - storage-size - - - False - True - 1 - - + True + end + 0.0 + adjustment1 + 1 + 1 False @@ -96,28 +71,47 @@ - + True False - start - Free Space - True - + _GiB + True + storage-size False - False + True 1 + + False + False + 0 + + + + + True + False + start + Free Space + True + + + + False + False + 1 + False - False + True 1 diff --git a/ui/clone.ui b/ui/clone.ui index 52d17874..84e75c79 100644 --- a/ui/clone.ui +++ b/ui/clone.ui @@ -2,6 +2,305 @@ + + False + 5 + Change storage path + center-on-parent + True + dialog + + + + True + False + vertical + 2 + + + True + False + end + + + _Cancel + True + True + True + True + + + + False + False + 0 + + + + + _OK + True + True + True + True + + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 6 + vertical + 12 + + + + True + False + 6 + 6 + + + + True + False + center + True + 6 + 12 + + + True + False + start + size + + + 1 + 2 + + + + + True + False + start + target + + + 1 + 1 + + + + + True + False + orig-path + True + start + + + 1 + 0 + + + + + True + False + end + end + Size: + True + + + + 0 + 2 + + + + + True + False + end + Target: + True + + + + 0 + 1 + + + + + True + False + end + center + Path: + True + + + + 0 + 0 + + + + + 1 + 1 + + + + + True + False + start + Existing disk + + + 0 + 0 + 2 + + + + + True + False + 18 + 18 + drive-harddisk + 6 + + + 0 + 1 + + + + + False + False + 0 + + + + + + True + False + 6 + 6 + 6 + + + Create a new disk (c_lone) for the virtual machine + True + True + False + start + True + True + + + + 0 + 0 + 3 + + + + + True + True + True + 25 + + + new-path + + + + + 1 + 1 + + + + + _Browse... + True + True + True + True + + + + 2 + 1 + + + + + True + False + end + New _Path: + True + True + change-storage-new + + + 0 + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + change-storage-cancel + change-storage-ok + + False Clone Virtual Machine @@ -435,315 +734,4 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp - - False - 5 - Change storage path - center-on-parent - True - dialog - - - - True - False - vertical - 2 - - - True - False - end - - - _Cancel - True - True - True - True - - - - False - False - 0 - - - - - _OK - True - True - True - True - - - - False - False - 1 - - - - - False - True - end - 0 - - - - - True - False - 6 - vertical - 12 - - - - True - False - 6 - 6 - - - True - False - 18 - 18 - - - True - False - drive-harddisk - 6 - - - - - 0 - 1 - - - - - - True - False - center - True - 6 - 12 - - - True - False - start - size - - - 1 - 2 - - - - - True - False - start - target - - - 1 - 1 - - - - - True - False - orig-path - True - start - - - 1 - 0 - - - - - True - False - end - end - Size: - True - - - - 0 - 2 - - - - - True - False - end - Target: - True - - - - 0 - 1 - - - - - True - False - end - center - Path: - True - - - - 0 - 0 - - - - - 1 - 1 - - - - - True - False - start - Existing disk - - - 0 - 0 - 2 - - - - - False - False - 0 - - - - - - True - False - 6 - 6 - 6 - - - True - False - - - True - False - end - New _Path: - True - True - change-storage-new - - - - - 0 - 1 - - - - - Create a new disk (c_lone) for the virtual machine - True - True - False - start - True - True - - - - 0 - 0 - 3 - - - - - True - True - True - 25 - - - new-path - - - - - 1 - 1 - - - - - _Browse... - True - True - True - True - - - - 2 - 1 - - - - - True - True - 1 - - - - - False - True - 1 - - - - - - change-storage-cancel - change-storage-ok - - diff --git a/ui/console.ui b/ui/console.ui index 03a084a0..b4d5fcb0 100644 --- a/ui/console.ui +++ b/ui/console.ui @@ -5,6 +5,7 @@ True True + True False @@ -199,43 +200,13 @@ - - True - False - - - - - - 2 - 0 - + - - True - False - - - - - - 2 - 2 - + - - True - False - - - - - - 0 - 2 - + diff --git a/ui/createconn.ui b/ui/createconn.ui index 6b28473c..03f8546f 100644 --- a/ui/createconn.ui +++ b/ui/createconn.ui @@ -179,7 +179,7 @@ True False start - 24 + 24 H_ostname: True hostname @@ -194,7 +194,7 @@ True False start - 24 + 24 2 2 _Username: diff --git a/ui/createnet.ui b/ui/createnet.ui index 71d37bc7..1d77c51d 100644 --- a/ui/createnet.ui +++ b/ui/createnet.ui @@ -98,7 +98,7 @@ vertical 12 - + True False @@ -301,62 +301,30 @@ - + True False - 15 + 15 + vertical + 6 - + True False vertical - 6 + 3 - + True False - vertical - 3 + 6 - + True False - 6 - - - True - False - end - _Network: - True - - - False - True - 0 - - - - - True - True - start - 20 - ● - 25 - - - - ipv4-network - - - - - False - True - 1 - - + end + _Network: + True False @@ -364,6 +332,27 @@ 0 + + + True + True + start + 20 + ● + 25 + + + + ipv4-network + + + + + False + True + 1 + + False @@ -371,99 +360,102 @@ 0 + + + False + True + 0 + + + + + + True + False + 3 + 6 - - + True - False - 3 - 6 - - - True - True - 1 - 1 - 15 - ● - 25 - - - ipv4-start - - + True + 15 + ● + 25 + + + ipv4-start - - 1 - 1 - - - - - True - True - 15 - ● - - - ipv4-end - - - - - 1 - 2 - - - - - True - False - end - Start: - - - 0 - 1 - - - - - True - False - end - End: - - - 0 - 2 - - - - - Enable DHCPv4 - True - True - False - start - True - True - - - - 0 - 0 - 2 - - False - True - 1 + 1 + 1 + + + + + True + True + 15 + ● + + + ipv4-end + + + + + 1 + 2 + + + + + True + False + end + Start: + + + 0 + 1 + + + + + True + False + end + End: + + + 0 + 2 + + + + + Enable DHCPv4 + True + True + False + start + True + True + + + + 0 + 0 + 2 + + False + True + 1 + @@ -520,62 +512,30 @@ - + True False - 15 + 15 + vertical + 6 - + True False vertical - 6 + 3 - + True False - vertical - 3 + 6 - + True False - 6 - - - True - False - end - _Network: - True - - - False - True - 0 - - - - - True - True - start - 40 - ● - 25 - - - - ipv6-network - - - - - False - True - 1 - - + end + _Network: + True False @@ -583,104 +543,130 @@ 0 - - - False - False - 0 - - - - - - True - False - 3 - 6 - + True True + start 40 ● 25 + - - ipv6-start + + ipv6-network - 1 - 1 - - - - - True - True - 40 - ● - - - ipv6-end - - - - - 1 - 2 - - - - - True - False - end - Start: - - - 0 - 1 - - - - - True - False - start - End: - - - 0 - 2 - - - - - Enable DHCPv6 - True - True - False - start - True - True - - - - 0 - 0 - 2 + False + True + 1 False True - 1 + 0 + + False + False + 0 + + + + + + True + False + 3 + 6 + + + True + True + 40 + ● + 25 + + + ipv6-start + + + + + 1 + 1 + + + + + True + True + 40 + ● + + + ipv6-end + + + + + 1 + 2 + + + + + True + False + end + Start: + + + 0 + 1 + + + + + True + False + start + End: + + + 0 + 2 + + + + + Enable DHCPv6 + True + True + False + start + True + True + + + + 0 + 0 + 2 + + + + + False + True + 1 + @@ -713,68 +699,62 @@ True True - + + True False - 15 + 15 + 6 + 6 - - + True - False - 6 - 6 - - - True - True - ● - 20 - - - domain-custom - - + True + ● + 20 + + + domain-custom - - 1 - 1 - - - - - Use net_work name - True - True - False - start - True - True - True - net-dns-use-custom - - - 0 - 0 - 2 - - - - - Cust_om - True - True - False - True - True - - - - 0 - 1 - + + 1 + 1 + + + + + Use net_work name + True + True + False + start + True + True + True + net-dns-use-custom + + + 0 + 0 + 2 + + + + + Cust_om + True + True + False + True + True + + + + 0 + 1 + @@ -794,6 +774,11 @@ + + False + True + 0 + diff --git a/ui/createpool.ui b/ui/createpool.ui index 0e52e0a9..fa98f1e0 100644 --- a/ui/createpool.ui +++ b/ui/createpool.ui @@ -86,7 +86,7 @@ vertical 18 - + True False @@ -454,6 +454,11 @@ + + False + True + 0 + diff --git a/ui/createvm.ui b/ui/createvm.ui index 4de94034..8b359c93 100644 --- a/ui/createvm.ui +++ b/ui/createvm.ui @@ -131,11 +131,9 @@ vertical 15 - + True False - 3 - 3 True @@ -176,53 +174,47 @@ - + True False - 15 + 12 + vertical + 3 - + + _Virtual machine True - False - vertical - 3 - - - _Virtual machine - True - True - False - start - True - True - True - - - - False - False - 0 - - - - - _Container - True - True - False - start - True - True - vz-virt-type-hvm - - - - False - False - 1 - - + True + False + start + True + True + True + + + False + False + 0 + + + + + _Container + True + True + False + start + True + True + vz-virt-type-hvm + + + + False + False + 1 + @@ -258,93 +250,87 @@ - + True False - 15 + 12 + vertical + 3 - + + _Local install media (ISO image or CDROM) True - False - vertical - 3 - - - _Local install media (ISO image or CDROM) - True - True - False - start - True - True - True - - - - False - True - 0 - - - - - Network _Install (HTTP, HTTPS, or FTP) - True - True - False - start - True - True - method-local - - - - False - True - 1 - - - - - Import _existing disk image - True - True - False - start - True - True - method-local - - - - False - True - 2 - - - - - Ma_nual install - True - True - False - start - True - True - method-local - - - - False - True - 3 - - + True + False + start + True + True + True + + + False + True + 0 + + + + + Network _Install (HTTP, HTTPS, or FTP) + True + True + False + start + True + True + method-local + + + + False + True + 1 + + + + + Import _existing disk image + True + True + False + start + True + True + method-local + + + + False + True + 2 + + + + + Ma_nual install + True + True + False + start + True + True + method-local + + + + False + True + 3 + - True + False True 1 @@ -375,53 +361,47 @@ - + True False - 15 + 12 + vertical + 3 - + + _Application container True - False - vertical - 3 - - - _Application container - True - True - False - start - True - True - True - - - - False - False - 0 - - - - - O_perating system container - True - True - False - start - True - True - method-container-app - - - - False - False - 1 - - + True + False + start + True + True + True + + + False + False + 0 + + + + + O_perating system container + True + True + False + start + True + True + method-container-app + + + + False + False + 1 + @@ -631,131 +611,112 @@ bar start True - + + True False - 8 - 15 + 12 + 6 + 6 - - + True False - 6 - 6 - - - True - False - - - - 1 - 2 - - - - - True - False - - - - 1 - 0 - - - - - True - False - end - _Xen Type: - True - xen-type - - - 0 - 0 - - - - - True - False - end - _Architecture: - True - arch - - - 0 - 2 - - - - - True - False - end - _Machine Type: - True - machine - - - 0 - 3 - - - - - True - False - - - - 1 - 3 - - - - - True - False - end - _Virt Type: - True - virt-type - - - 0 - 1 - - - - - True - False - - - - 1 - 1 - - - - - - - - - - - - - - + + + 1 + 2 + + + + + True + False + + + + 1 + 0 + + + + + True + False + end + _Xen Type: + True + xen-type + + + 0 + 0 + + + + + True + False + end + _Architecture: + True + arch + + + 0 + 2 + + + + + True + False + end + _Machine Type: + True + machine + + + 0 + 3 + + + + + True + False + + + + 1 + 3 + + + + + True + False + end + _Virt Type: + True + virt-type + + + 0 + 1 + + + + + True + False + + + + 1 + 1 + @@ -827,7 +788,7 @@ bar False 5 - + True False @@ -942,70 +903,44 @@ bar True True - + + True False + 12 + 4 + 6 - - + True False - 4 - 6 - - - True - False - end - Kerne_l options: - True - install-urlopts-entry + end + Kerne_l options: + True + install-urlopts-entry + + + 0 + 0 + + + + + True + True + center + True + ● + + + install-urlopts-entry - - 0 - 0 - - - - - True - True - center - True - ● - - - install-urlopts-entry - - - - - 1 - 0 - - - - - - - - - - - - - - - - - - - - - - + + 1 + 0 + @@ -1458,6 +1393,7 @@ connections is not yet supported.</small> True True False + start True @@ -1532,6 +1468,7 @@ connections is not yet supported.</small> True True False + start True @@ -1799,7 +1736,7 @@ connections is not yet supported.</small> - + True False @@ -2078,7 +2015,7 @@ connections is not yet supported.</small> - + True False @@ -2138,7 +2075,7 @@ connections is not yet supported.</small> True False - False + start 6 6 @@ -2364,18 +2301,7 @@ connections is not yet supported.</small> - - True - False - False - - - - - - 0 - 6 - + @@ -2395,69 +2321,26 @@ connections is not yet supported.</small> True True - 6 - + + True False - 20 + 12 + 6 + 6 - + True False - vertical - 6 - - - True - False - 6 - - - True - False - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - True - 0 - + + + 0 + 0 + @@ -2493,6 +2376,11 @@ connections is not yet supported.</small> + + False + True + 0 + diff --git a/ui/createvol.ui b/ui/createvol.ui index 24811cee..813d06b2 100644 --- a/ui/createvol.ui +++ b/ui/createvol.ui @@ -102,12 +102,11 @@ vertical 18 - + 400 400 True False - 1 True @@ -282,6 +281,7 @@ True False + start 6 6 @@ -342,17 +342,7 @@ - - True - False - - - - - - 0 - 1 - + @@ -448,6 +438,11 @@ + + False + True + 0 + diff --git a/ui/details.ui b/ui/details.ui index e6146b34..10b30824 100644 --- a/ui/details.ui +++ b/ui/details.ui @@ -151,7 +151,7 @@ vertical 6 - + True False @@ -173,11 +173,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -349,6 +349,11 @@ + + False + True + 0 + @@ -374,11 +379,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -643,6 +648,11 @@ + + False + True + 0 + @@ -691,10 +701,10 @@ 0 none - + True False - 12 + 12 @@ -704,7 +714,7 @@ 6 6 - + True False True @@ -742,6 +752,11 @@ + + False + True + 0 + @@ -766,11 +781,11 @@ True True - + True False - 3 - 21 + 21 + 3 150 @@ -792,6 +807,11 @@ + + False + True + 0 + @@ -922,10 +942,10 @@ 0 none - + True False - 12 + 12 True @@ -933,7 +953,7 @@ vertical 3 - + 75 True False @@ -961,6 +981,11 @@ + + False + True + 0 + @@ -986,10 +1011,10 @@ 0 none - + True False - 12 + 12 True @@ -997,7 +1022,7 @@ vertical 3 - + 75 True False @@ -1025,6 +1050,11 @@ + + False + True + 0 + @@ -1050,10 +1080,10 @@ 0 none - + True False - 12 + 12 True @@ -1061,7 +1091,7 @@ vertical 3 - + 75 True False @@ -1090,6 +1120,11 @@ + + False + True + 0 + @@ -1115,10 +1150,10 @@ 0 none - + True False - 12 + 12 True @@ -1126,7 +1161,7 @@ vertical 3 - + 75 True False @@ -1155,6 +1190,11 @@ + + False + True + 0 + @@ -1216,11 +1256,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 True @@ -1349,6 +1389,11 @@ + + False + True + 0 + @@ -1374,11 +1419,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -1459,6 +1504,11 @@ + + False + True + 0 + @@ -1483,11 +1533,11 @@ True True - + True False - 23 - 12 + 23 + 12 True @@ -1631,6 +1681,11 @@ + + False + True + 0 + @@ -1683,11 +1738,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -1873,6 +1928,11 @@ + + False + True + 0 + @@ -1925,11 +1985,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 Start virt_ual machine on host boot up @@ -1941,6 +2001,11 @@ True + + False + True + 0 + @@ -1965,11 +2030,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -2031,6 +2096,11 @@ + + False + True + 0 + @@ -2055,11 +2125,11 @@ start False - + True False - 3 - 12 + 12 + 3 True @@ -2334,6 +2404,11 @@ + + False + True + 0 + @@ -2359,11 +2434,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 True @@ -2497,6 +2572,11 @@ + + False + True + 0 + @@ -2548,11 +2628,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 True @@ -2649,7 +2729,7 @@ False 6 - + True False @@ -2767,7 +2847,7 @@ - + True False @@ -2781,6 +2861,11 @@ + + False + True + 0 + @@ -2856,11 +2941,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -2917,7 +3002,7 @@ - + True False False @@ -2932,7 +3017,7 @@ - + True False False @@ -3077,6 +3162,11 @@ + + False + True + 0 + @@ -3129,11 +3219,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -3194,6 +3284,11 @@ + + False + True + 0 + @@ -3245,11 +3340,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -3303,11 +3398,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -3349,6 +3444,11 @@ + + False + True + 0 + @@ -3400,11 +3500,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -3586,6 +3686,11 @@ + + False + True + 0 + @@ -3637,11 +3742,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -3703,6 +3808,11 @@ + + False + True + 0 + @@ -3869,11 +3979,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -3946,6 +4056,11 @@ + + False + True + 0 + @@ -3992,11 +4107,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -4116,6 +4231,11 @@ + + False + True + 0 + @@ -4155,11 +4275,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -4206,19 +4326,19 @@ 0 none - + True False - 3 - 12 + 12 + 3 - + + True False 3 - 2 - 8 4 + 8 True @@ -4229,8 +4349,8 @@ smartcard-mode-text - GTK_FILL - + 0 + 0 @@ -4253,12 +4373,15 @@ 1 - 2 - GTK_FILL - GTK_FILL + 0 + + False + True + 0 + @@ -4305,11 +4428,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -4367,6 +4490,11 @@ + + False + True + 0 + @@ -4412,11 +4540,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -4465,10 +4593,10 @@ 0 none - + True False - 12 + 12 @@ -4527,6 +4655,11 @@ + + False + True + 0 + @@ -4566,10 +4699,10 @@ 0 none - + True False - 12 + 12 @@ -4604,6 +4737,11 @@ + + False + True + 0 + @@ -4643,11 +4781,11 @@ 0 none - + True False - 3 - 12 + 12 + 3 @@ -4683,6 +4821,11 @@ + + False + True + 0 + diff --git a/ui/fsdetails.ui b/ui/fsdetails.ui index 07526800..c1ca733e 100644 --- a/ui/fsdetails.ui +++ b/ui/fsdetails.ui @@ -135,19 +135,6 @@ 6 - - - True - False - - - - - - 0 - 7 - - True @@ -309,5 +296,8 @@ + + + diff --git a/ui/host.ui b/ui/host.ui index 722a4da7..a1d163f4 100644 --- a/ui/host.ui +++ b/ui/host.ui @@ -46,9 +46,9 @@ - _Close True False + _Close True @@ -56,9 +56,9 @@ - _Quit True False + _Quit True @@ -100,101 +100,95 @@ 0 none - + + True False - 20 + 12 + 3 + 3 + 6 - - + True False - 3 - 3 - 6 - - - True - False - end - Libvirt URI: - 1 - - - 0 - 1 - - - - - True - False - start - example.com - True - end - - - 1 - 1 - - - - - True - True - False - True - True - - - - 1 - 2 - - - - - True - True - 30 - - - - 1 - 0 - - - - - True - False - end - _Name: - True - overview-name - 1 - - - 0 - 0 - - - - - True - False - end - A_utoconnect: - True - config-autoconnect - - - 0 - 2 - - + end + Libvirt URI: + 1 + + 0 + 1 + + + + + True + False + start + example.com + True + end + + + 1 + 1 + + + + + True + True + False + True + True + + + + 1 + 2 + + + + + True + True + 30 + + + + 1 + 0 + + + + + True + False + end + _Name: + True + overview-name + 1 + + + 0 + 0 + + + + + True + False + end + A_utoconnect: + True + config-autoconnect + + + 0 + 2 + @@ -226,45 +220,39 @@ 0 none - + True False - 12 + 12 + vertical + 3 - + + 75 True False - vertical - 3 - - 75 - True - False - - - - - - False - True - 0 - - - - - True - False - end - 60% - - - False - True - 1 - + + + False + True + 0 + + + + + True + False + end + 60% + + + False + True + 1 + @@ -290,45 +278,39 @@ 0 none - + True False - 12 + 12 + vertical + 3 - + + 75 True False - vertical - 3 - - 75 - True - False - - - - - - False - True - 0 - - - - - True - False - end - 1.59 GiB of 2.2 GiB - - - False - True - 1 - + + + False + True + 0 + + + + + True + False + end + 1.59 GiB of 2.2 GiB + + + False + True + 1 + @@ -375,7 +357,7 @@ - + True False @@ -399,7 +381,7 @@ - + True False diff --git a/ui/hostnets.ui b/ui/hostnets.ui index 81337a6f..585765a9 100644 --- a/ui/hostnets.ui +++ b/ui/hostnets.ui @@ -52,7 +52,7 @@ True False - + True False @@ -462,6 +462,11 @@ + + False + True + 0 + diff --git a/ui/hoststorage.ui b/ui/hoststorage.ui index 7fe5a902..40d0ac9a 100644 --- a/ui/hoststorage.ui +++ b/ui/hoststorage.ui @@ -135,27 +135,13 @@ 6 + _Browse Local True True True Browse local filesystem + True - - - True - False - 2 - 2 - - - True - False - _Browse Local - True - - - - False @@ -185,8 +171,8 @@ True True True - True Choose the selected volume + True @@ -201,8 +187,8 @@ True True False - True Apply pool changes + True @@ -266,7 +252,7 @@ True False - + True False @@ -276,7 +262,7 @@ vertical 6 - + True False @@ -447,21 +433,6 @@ 1 - - - - - - - - - - - - - - - False @@ -631,6 +602,11 @@ + + False + True + 0 + diff --git a/ui/manager.ui b/ui/manager.ui index f5e362f2..7a41b760 100644 --- a/ui/manager.ui +++ b/ui/manager.ui @@ -30,9 +30,9 @@ False - _Add Connection... True False + _Add Connection... True @@ -54,9 +54,9 @@ - _Close True False + _Close True @@ -64,9 +64,9 @@ - _Quit True False + _Quit True @@ -87,27 +87,27 @@ False - _Connection Details True False + _Connection Details True - _Virtual Machine Details True False + _Virtual Machine Details True - _Delete True False + _Delete True @@ -120,9 +120,9 @@ - _Preferences True False + _Preferences True @@ -217,9 +217,9 @@ False - _About True False + _About True diff --git a/ui/migrate.ui b/ui/migrate.ui index 6fa9dd17..89e8b156 100644 --- a/ui/migrate.ui +++ b/ui/migrate.ui @@ -84,7 +84,7 @@ vertical 18 - + True False @@ -212,166 +212,41 @@ 0 none - + + True False - 22 + 12 + 12 - - + + True False - 12 + 6 + 6 - - + True False - 6 - 6 - - - True - False - end - _Address: - True - migrate-set-address - - - 0 - 0 - - - - - True - False - start - _Port: - True - migrate-set-port - - - 0 - 1 - - - - - True - True - False - start - True - - - - address-check - - - - - 1 - 0 - - - - - True - True - False - start - True - - - - port-check - - - - - 1 - 1 - - - - - True - False - - - True - True - ● - 0 - adjustment1 - - - False - True - 0 - - - - - True - False - start - Let libvirt decide - - - True - True - 1 - - - - - 2 - 1 - - - - - True - False - - - True - True - ● - - - address-text - - - - - False - True - 0 - - - - - True - False - start - Let libvirt decide - - - False - True - 1 - - - - - 2 - 0 - - + end + _Address: + True + migrate-set-address + + + 0 + 0 + + + + + True + False + start + _Port: + True + migrate-set-port 0 @@ -379,21 +254,54 @@ - + + True + True + False + start + True + + + + address-check + + + + + 1 + 0 + + + + + True + True + False + start + True + + + + port-check + + + + + 1 + 1 + + + + True False - 6 - + True - False - Tunnel migration through the libvirtd connection channel, rather than having the hypervisor open a separate network connection to the destination. The source libvirt instance connects directly to the destination libvirt instance. - -This can simplify setup since no additional firewall ports need to be open, and will encrypt migration traffic if your libvirt connection is encrypted. But it can be difficult to make this work with SSH transport. - end - M_ode: - True - migrate-mode + True + ● + 0 + adjustment1 False @@ -402,12 +310,51 @@ This can simplify setup since no additional firewall ports need to be open, and - + True False start - False - + Let libvirt decide + + + True + True + 1 + + + + + 2 + 1 + + + + + True + False + + + True + True + ● + + + address-text + + + + + False + True + 0 + + + + + True + False + start + Let libvirt decide False @@ -416,95 +363,142 @@ This can simplify setup since no additional firewall ports need to be open, and + + 2 + 0 + + + + + 0 + 1 + + + + + True + False + 6 + + + True + False + Tunnel migration through the libvirtd connection channel, rather than having the hypervisor open a separate network connection to the destination. The source libvirt instance connects directly to the destination libvirt instance. + +This can simplify setup since no additional firewall ports need to be open, and will encrypt migration traffic if your libvirt connection is encrypted. But it can be difficult to make this work with SSH transport. + end + M_ode: + True + migrate-mode + + + False + True + 0 + + + + + True + False + start + False + + + + False + True + 1 + + + + + 0 + 0 + + + + + + True + False + 6 + + + True + False + True + 6 + + + True + False + start + dialog-warning + + + False + True + 0 + + + + + True + False + start + <span size="small">foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz</span> + True + True + 0 + 40 + + + False + True + 1 + + + + + 1 + 1 + + + + + True + False + start + False + _URI: + True + migrate-tunnel-uri + 0 0 - - + True - False - 6 - - - True - False - True - 6 - - - True - False - start - dialog-warning - - - False - True - 0 - - - - - True - False - start - <span size="small">foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz</span> - True - True - 0 - 40 - - - False - True - 1 - - - - - 1 - 1 - - - - - True - False - start - False - _URI: - True - migrate-tunnel-uri - - - 0 - 0 - - - - - True - True - True - - - 1 - 0 - - - - - + True + True - 0 - 2 + 1 + 0 + + + + + 0 + 2 + @@ -527,80 +521,74 @@ This can simplify setup since no additional firewall ports need to be open, and True True - 6 - + + True False - 22 + 12 + 6 + 6 + 6 - - + True False - 6 - 6 - - - True - False - By default libvirt will refuse to migrate a VM for certain configurations that could lead to malfunctioning guests, like if a disk's cache mode is not 'none'. + By default libvirt will refuse to migrate a VM for certain configurations that could lead to malfunctioning guests, like if a disk's cache mode is not 'none'. Enabling this option tells libvirt to skip those checks. - start - A_llow unsafe: - True - migrate-unsafe - - - 0 - 0 - - - - - True - True - False - start - True - - - 1 - 0 - - - - - True - False - By default, the migrated VM config is removed from the source host, and saved persistently on the destination host. The destination host is considered the new home of the VM. + start + A_llow unsafe: + True + migrate-unsafe + + + 0 + 0 + + + + + True + True + False + start + True + + + 1 + 0 + + + + + True + False + By default, the migrated VM config is removed from the source host, and saved persistently on the destination host. The destination host is considered the new home of the VM. If 'temporary' is selected, the migration is considered only a temporary move: the source host maintains a copy of the VM config, and the running copy moved to the destination is only transient, and will disappear when it is shutdown. - start - _Temporary move: - True - migrate-temporary - - - 0 - 1 - - - - - True - True - False - start - True - - - 1 - 1 - - + start + _Temporary move: + True + migrate-temporary + + 0 + 1 + + + + + True + True + False + start + True + + + 1 + 1 + @@ -626,6 +614,11 @@ If 'temporary' is selected, the migration is considered only a temporary move: t + + False + True + 0 + diff --git a/ui/oslist.ui b/ui/oslist.ui index c00e266b..9213c8cb 100644 --- a/ui/oslist.ui +++ b/ui/oslist.ui @@ -5,6 +5,7 @@ True True + True edit-find-symbolic False False diff --git a/ui/preferences.ui b/ui/preferences.ui index c6e3666d..294d66a8 100644 --- a/ui/preferences.ui +++ b/ui/preferences.ui @@ -33,27 +33,45 @@ 0 none - + + True False - 12 + 12 + 6 + 6 - - + + Enable _system tray icon + True + True + False + start + True + True + + + + 0 + 0 + + + + + True False - 6 - 6 + 3 - - Enable _system tray icon + + Enable libgues_tfs VM introspection True True False start True True - + 0 @@ -61,85 +79,61 @@ - - - True + False - 3 + 3 - - Enable libgues_tfs VM introspection + True - True - False - start - True - True - + False + dialog-warning - 0 - 0 + False + True + 0 - + + True False - 3 - - - True - False - dialog-warning - - - False - True - 0 - - - - - True - False - <small>You must restart the application for this change to take effect</small> - True - - - False - True - 1 - - + <small>You must restart the application for this change to take effect</small> + True - 0 - 1 + False + True + 1 - - 0 - 2 - - - - - Enable _XML editing - True - True - False - start - True - True - - 0 1 + + 0 + 2 + + + + + Enable _XML editing + True + True + False + start + True + True + + + + 0 + 1 + @@ -180,186 +174,179 @@ 0 none - + + True False - 12 + 3 + 6 - - + True False - 3 - 6 + start + Poll _Disk I/O + True + prefs-stats-enable-disk + + + 0 + 2 + + + + + True + True + False + start + True + + + + 1 + 2 + + + + + True + False + start + Poll _Network I/O + True + prefs-stats-enable-net + + + 0 + 3 + + + + + True + True + False + start + True + + + + 1 + 3 + + + + + True + False + start + Poll _Memory stats + True + prefs-stats-enable-memory + + + 0 + 4 + + + + + True + True + False + start + True + + + + 1 + 4 + + + + + True + False + start + _Update status every + True + + + 0 + 0 + + + + + True + False + 3 - - True - False - start - Poll _Disk I/O - True - prefs-stats-enable-disk - - - 0 - 2 - - - - + True True - False - start - True - - - - 1 - 2 - - - - - True - False - start - Poll _Network I/O - True - prefs-stats-enable-net - - - 0 - 3 - - - - - True - True - False - start - True - - - - 1 - 3 - - - - - True - False - start - Poll _Memory stats - True - prefs-stats-enable-memory - - - 0 - 4 - - - - - True - True - False - start - True - - - - 1 - 4 - - - - - True - False - start - _Update status every - True - - - 0 - 0 - - - - - True - False - 3 - - - True - True - ● - adjustment1 - - - - cpu-poll - - + ● + adjustment1 + + + + cpu-poll - - False - True - 0 - - - - - True - False - start - seconds - - - False - True - 1 - - 1 - 0 + False + True + 0 - + True False start - Poll C_PU usage - True - prefs-stats-enable-cpu + seconds - 0 - 1 - - - - - True - True - False - start - True - - - - 1 - 1 + False + True + 1 + + 1 + 0 + + + + + True + False + start + Poll C_PU usage + True + prefs-stats-enable-cpu + + + 0 + 1 + + + + + True + True + False + start + True + + + + 1 + 1 + @@ -407,124 +394,118 @@ 0 none - + + True False - 12 + 12 + 6 + 6 - - + True False - 6 - 6 - - - True - False - start - Gra_phics type: - True - prefs-graphics-type - - - 0 - 0 - - - - - True - False - Default storage format for new disk images. - start - _Storage format: - True - prefs-storage-format - - - 0 - 1 - - - - - True - False - - - - 1 - 0 - - - - - True - False - Default storage format for new disk images. - - - - 1 - 1 - - - - - True - False - Default CPU setting for new VMs. This is typically a tradeoff between performance + start + Gra_phics type: + True + prefs-graphics-type + + + 0 + 0 + + + + + True + False + Default storage format for new disk images. + start + _Storage format: + True + prefs-storage-format + + + 0 + 1 + + + + + True + False + + + + 1 + 0 + + + + + True + False + Default storage format for new disk images. + + + + 1 + 1 + + + + + True + False + Default CPU setting for new VMs. This is typically a tradeoff between performance and migration compatibility: if using the 'copy host' option, your servers will need identical CPUs in order to migrate the VM. - start - CPU _default: - True - prefs-cpu-default - - - 0 - 2 - - - - - True - False - - - - 1 - 2 - - - - - True - False - Default Firmware for new VMs. Boot using either BIOS or UEFI. - start - x86 _Firmware: - True - prefs-firmware-default - - - 0 - 3 - - - - - True - False - - - - 1 - 3 - - + start + CPU _default: + True + prefs-cpu-default + + 0 + 2 + + + + + True + False + + + + 1 + 2 + + + + + True + False + Default Firmware for new VMs. Boot using either BIOS or UEFI. + start + x86 _Firmware: + True + prefs-firmware-default + + + 0 + 3 + + + + + True + False + + + + 1 + 3 + @@ -573,177 +554,171 @@ identical CPUs in order to migrate the VM. 0 none - + + True False - 12 + 12 + 3 + 6 - - + + True + False + start + Graphical console _scaling: + True + prefs-console-scaling + + + 0 + 0 + + + + True False - 3 - 6 - + True False start - Graphical console _scaling: + Gr_ab keys: True - prefs-console-scaling + prefs-keys-grab-changebtn - 0 - 0 + False + True + 0 - - True - False - - - True - False - start - Gr_ab keys: - True - prefs-keys-grab-changebtn - - - False - True - 0 - - - - - True - False - start - Not supported - - - True - True - 8 - 1 - - - - - 0 - 2 - - - - - True - False - - - - 1 - 0 - - - - - Change... - True - True - True - start - False - - - - 1 - 2 - - - - - True - False - Change guest resolution when the guest window size is changed. Only works with properly configured guest using spice and the desktop agent. - start - _Resize guest with window: - True - prefs-console-resizeguest - 2 - - - 0 - 1 - - - - - True - False - - - - 1 - 1 - - - - + True False start - SPICE _USB Redirection: - True - prefs-console-autoredir + Not supported - 0 - 3 - - - - - True - False - - - - 1 - 3 - - - - - True - False - If disabled, the VM window will not automatically connect to the running VM graphical console. - start - Console autoconnec_t: - True - prefs-console-autoconnect - - - 0 - 4 - - - - - True - True - False - True - - - - 1 - 4 + True + True + 8 + 1 + + 0 + 2 + + + + + True + False + + + + 1 + 0 + + + + + Change... + True + True + True + start + False + + + + 1 + 2 + + + + + True + False + Change guest resolution when the guest window size is changed. Only works with properly configured guest using spice and the desktop agent. + start + _Resize guest with window: + True + prefs-console-resizeguest + 2 + + + 0 + 1 + + + + + True + False + + + + 1 + 1 + + + + + True + False + start + SPICE _USB Redirection: + True + prefs-console-autoredir + + + 0 + 3 + + + + + True + False + + + + 1 + 3 + + + + + True + False + If disabled, the VM window will not automatically connect to the running VM graphical console. + start + Console autoconnec_t: + True + prefs-console-autoconnect + + + 0 + 4 + + + + + True + True + False + True + + + + 1 + 4 + @@ -785,182 +760,175 @@ identical CPUs in order to migrate the VM. 0 none - + + True False - 6 - 12 + 12 + 6 + 12 - - + True False - 6 - 12 - - - True - False - start - _Force Poweroff: - True - prefs-confirm-forcepoweroff - - - 0 - 0 - - - - - True - True - False - True - - - - 1 - 0 - - - - - True - False - start - Poweroff/_Reboot/Save: - True - prefs-confirm-poweroff - - - 0 - 1 - - - - - True - False - start - _Pause: - True - prefs-confirm-pause - - - 0 - 2 - - - - - True - True - False - True - - - - 1 - 1 - - - - - True - True - False - True - - - - 1 - 2 - - - - - True - True - False - True - - - - 1 - 3 - - - - - True - False - start - Device re_moval: - True - prefs-confirm-removedev - - - 0 - 3 - - - - - True - False - start - _Unapplied changes: - True - prefs-confirm-unapplied - - - 0 - 4 - - - - - True - True - False - True - - - - 1 - 4 - - - - - True - False - start - _Deleting storage: - True - prefs-confirm-delstorage - - - 0 - 5 - - - - - True - True - False - start - True - - - - 1 - 5 - - + start + _Force Poweroff: + True + prefs-confirm-forcepoweroff + + 0 + 0 + + + + + True + True + False + True + + + + 1 + 0 + + + + + True + False + start + Poweroff/_Reboot/Save: + True + prefs-confirm-poweroff + + + 0 + 1 + + + + + True + False + start + _Pause: + True + prefs-confirm-pause + + + 0 + 2 + + + + + True + True + False + True + + + + 1 + 1 + + + + + True + True + False + True + + + + 1 + 2 + + + + + True + True + False + True + + + + 1 + 3 + + + + + True + False + start + Device re_moval: + True + prefs-confirm-removedev + + + 0 + 3 + + + + + True + False + start + _Unapplied changes: + True + prefs-confirm-unapplied + + + 0 + 4 + + + + + True + True + False + True + + + + 1 + 4 + + + + + True + False + start + _Deleting storage: + True + prefs-confirm-delstorage + + + 0 + 5 + + + + + True + True + False + start + True + + + + 1 + 5 + @@ -1009,10 +977,10 @@ identical CPUs in order to migrate the VM. _Close - True True True True + True diff --git a/ui/snapshots.ui b/ui/snapshots.ui index 3b53497c..139f7944 100644 --- a/ui/snapshots.ui +++ b/ui/snapshots.ui @@ -53,310 +53,304 @@ - + True - False - 12 + True + 12 + False - + True - True - False + False + vertical + 12 - + + True False - vertical - 12 + 6 + 6 - - + True False - 6 - 6 + start + start + Description: + + + 0 + 5 + + + + + 80 + True + True + True + in - - True - False - start - start - Description: - - - 0 - 5 - - - - - 80 + True True - True - in - - - True - True - 2 - 2 - - - snapshot-description - - + 2 + 2 + + + snapshot-description + + + + 1 + 5 + + + + + True + False + start + VM State: + + + 0 + 3 + + + + + True + False + 3 + + + True + False + image-missing + - 1 - 5 + False + True + 0 - + True False start - VM State: + Shut down - 0 - 3 - - - - - True - False - 3 - - - True - False - image-missing - - - False - True - 0 - - - - - True - False - start - Shut down - - - False - True - 1 - - - - - 1 - 3 - - - - - True - False - start - Timestamp: - - - 0 - 2 - - - - - True - False - start - label - - - 1 - 2 - - - - - True - False - start - <b>snapshot 'foo'</b> - True - - - 0 - 0 - 2 - - - - - True - False - start - Snapshot Mode: - - - 0 - 4 - - - - - True - False - start - label - - - 1 - 4 - - - - - True - False - start - start - Screenshot: - - - 0 - 6 - - - - - True - False - - - True - False - image-missing - - - False - True - 0 - - - - - True - False - No screenshot available - - - False - True - 1 - - - - - 1 - 6 - - - - - True - False - 3 - - - True - False - dialog-information - 2 - - - False - True - 0 - - - - - True - False - start - <small><i>This was the most recently applied snapshot.</i></small> - True - - - False - True - 1 - - - - - 0 - 1 - 2 + False + True + 1 - False - True - 0 + 1 + 3 + + + + + True + False + start + Timestamp: + + + 0 + 2 + + + + + True + False + start + label + + + 1 + 2 + + + + + True + False + start + <b>snapshot 'foo'</b> + True + + + 0 + 0 + 2 + + + + + True + False + start + Snapshot Mode: + + + 0 + 4 + + + + + True + False + start + label + + + 1 + 4 + + + + + True + False + start + start + Screenshot: + + + 0 + 6 + + + + + True + False + + + True + False + image-missing + + + False + True + 0 + + + + + True + False + No screenshot available + + + False + True + 1 + + + + + 1 + 6 + + + + + True + False + 3 + + + True + False + dialog-information + 2 + + + False + True + 0 + + + + + True + False + start + <small><i>This was the most recently applied snapshot.</i></small> + True + + + False + True + 1 + + + + + 0 + 1 + 2 - - - - True - False - details - - False - - - - - True - False - error label - - - snapshot-error-label - - - - - 1 - - - - - True - False - empty - - - 1 - False + False + True + 0 + + + True + False + details + + + False + + + + + True + False + error label + + + snapshot-error-label + + + + + 1 + + + + + True + False + empty + + + 1 + False + + True @@ -507,9 +501,9 @@ True True True - True Save updated snapshot metadata Save updated snapshot metadata + True diff --git a/ui/snapshotsnew.ui b/ui/snapshotsnew.ui index 144e9b19..8763e3d4 100644 --- a/ui/snapshotsnew.ui +++ b/ui/snapshotsnew.ui @@ -85,7 +85,7 @@ vertical 18 - + True False @@ -229,6 +229,11 @@ + + False + True + 0 + diff --git a/ui/storagebrowse.ui b/ui/storagebrowse.ui index d6f88121..f501ef84 100644 --- a/ui/storagebrowse.ui +++ b/ui/storagebrowse.ui @@ -12,7 +12,7 @@ dialog - + True False diff --git a/ui/vmwindow.ui b/ui/vmwindow.ui index 9dddc83e..fe33b2b4 100644 --- a/ui/vmwindow.ui +++ b/ui/vmwindow.ui @@ -44,9 +44,9 @@ - _Close True False + _Close True @@ -54,9 +54,9 @@ - _Quit True False + _Quit True @@ -475,7 +475,7 @@ False - + True False @@ -494,7 +494,7 @@ - + True False diff --git a/ui/xmleditor.ui b/ui/xmleditor.ui index ab61e05f..fd719055 100644 --- a/ui/xmleditor.ui +++ b/ui/xmleditor.ui @@ -11,7 +11,7 @@ True False - 6 + 6 6 vertical @@ -40,7 +40,7 @@ True False - 6 + 6 6 6 diff --git a/virtManager/details/details.py b/virtManager/details/details.py index 8f344c7d..75051006 100644 --- a/virtManager/details/details.py +++ b/virtManager/details/details.py @@ -556,6 +556,7 @@ class vmmDetails(vmmGObjectUI): def _init_graphs(self): def _make_graph(): g = Sparkline() + g.set_hexpand(True) g.set_property("reversed", True) g.show() return g diff --git a/virtManager/details/serialcon.py b/virtManager/details/serialcon.py index 42dbc78d..8a87c92f 100644 --- a/virtManager/details/serialcon.py +++ b/virtManager/details/serialcon.py @@ -261,8 +261,8 @@ class vmmSerialConsole(vmmGObject): self._box.set_show_tabs(False) self._box.set_show_border(False) - align = Gtk.Alignment() - align.set_padding(2, 2, 2, 2) + align = Gtk.Box() + align.set_border_width(2) evbox = Gtk.EventBox() evbox.modify_bg(Gtk.StateType.NORMAL, Gdk.Color(0, 0, 0)) terminalbox = Gtk.HBox() diff --git a/virtManager/error.py b/virtManager/error.py index af202b8b..8d78efae 100644 --- a/virtManager/error.py +++ b/virtManager/error.py @@ -326,7 +326,6 @@ class _errorDialog (Gtk.MessageDialog): self.get_accessible().set_name("vmm dialog") self.chk_vbox = None - self.chk_align = None self.init_chkbox() self.buffer = None @@ -338,13 +337,9 @@ class _errorDialog (Gtk.MessageDialog): self.chk_vbox = Gtk.VBox(False, False) self.chk_vbox.set_spacing(0) - self.chk_align = Gtk.Alignment() - self.chk_align.set_padding(0, 0, 0, 0) - self.chk_align.add(self.chk_vbox) - - self.chk_align.show_all() + self.chk_vbox.show_all() self.vbox.pack_start( # pylint: disable=no-member - self.chk_align, False, False, 0) + self.chk_vbox, False, False, 0) def init_details(self): # Init details buffer diff --git a/virtManager/host.py b/virtManager/host.py index 663b320d..74f303ae 100644 --- a/virtManager/host.py +++ b/virtManager/host.py @@ -141,10 +141,12 @@ class vmmHost(vmmGObjectUI): self.widget("config-autoconnect").set_active(auto) self._cpu_usage_graph = Sparkline() + self._cpu_usage_graph.set_hexpand(True) self._cpu_usage_graph.show() self.widget("performance-cpu-align").add(self._cpu_usage_graph) self._memory_usage_graph = Sparkline() + self._memory_usage_graph.set_hexpand(True) self._memory_usage_graph.show() self.widget("performance-memory-align").add(self._memory_usage_graph)