From 160aeb4879cbf0331d9e35897cc5ffbf5ef0f31e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 29 Sep 2021 09:28:09 -0400 Subject: [PATCH] Simplify our ui files Run gtk4-builder-tool simplify over our ui files, we simplify some more things now. --- demos/widget-factory/widget-factory.ui | 713 ++++++++++++------------- gtk/ui/gtkaboutdialog.ui | 46 +- gtk/ui/gtkappchooserdialog.ui | 22 +- gtk/ui/gtkappchooserwidget.ui | 20 +- gtk/ui/gtkassistant.ui | 18 +- gtk/ui/gtkcolorchooserdialog.ui | 8 +- gtk/ui/gtkcoloreditor.ui | 24 +- gtk/ui/gtkcombobox.ui | 26 +- gtk/ui/gtkdialog.ui | 4 +- gtk/ui/gtkdropdown.ui | 73 ++- gtk/ui/gtkemojichooser.ui | 76 +-- gtk/ui/gtkemojicompletion.ui | 2 +- gtk/ui/gtkfilechooserdialog.ui | 6 +- gtk/ui/gtkfilechooserwidget.ui | 66 +-- gtk/ui/gtkfontchooserdialog.ui | 8 +- gtk/ui/gtkfontchooserwidget.ui | 65 ++- gtk/ui/gtklockbutton.ui | 8 +- gtk/ui/gtkmediacontrols.ui | 9 +- gtk/ui/gtkmessagedialog.ui | 12 +- gtk/ui/gtkpagesetupunixdialog.ui | 34 +- gtk/ui/gtkplacesview.ui | 50 +- gtk/ui/gtkplacesviewrow.ui | 16 +- gtk/ui/gtkprintunixdialog.ui | 250 +++++---- gtk/ui/gtkscalebutton.ui | 13 +- gtk/ui/gtksidebarrow.ui | 16 +- gtk/ui/gtkstatusbar.ui | 6 +- gtk/ui/gtkvideo.ui | 10 +- gtk/ui/gtkvolumebutton.ui | 6 +- 28 files changed, 797 insertions(+), 810 deletions(-) diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index b7a6ee442f..259c4def99 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -132,7 +132,6 @@ 100 - 0 50 1 10 @@ -242,13 +241,13 @@ italic - italic + 2 underline - single + 1 @@ -437,7 +436,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - center + 3 0 @@ -446,12 +445,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - 0 1000 250 50 50 - 0 @@ -466,7 +463,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - vertical + 1 10 10 10 @@ -474,29 +471,29 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 250 - crossfade + 1 page1 - Page _1 + Page _1 1 - vertical + 1 10 10 - vertical + 1 10 1 - comboboxentry + comboboxentry @@ -513,7 +510,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. • - comboboxentry + comboboxentry @@ -522,7 +519,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 • - Click icon to change mode + Click icon to change mode view-refresh-symbolic Change mode @@ -531,7 +528,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 0 - entry + entry @@ -542,7 +539,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 - entry + entry 1 @@ -555,9 +552,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - fill 1 - Password… + Password… @@ -612,13 +608,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 20 - label + label 0 - label + label @@ -644,13 +640,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 6 - checkbutton + checkbutton 1 - checkbutton + checkbutton 0 1 @@ -659,7 +655,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - checkbutton + checkbutton 1 0 @@ -669,7 +665,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - checkbutton + checkbutton 0 1 @@ -680,7 +676,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - checkbutton + checkbutton 0 0 @@ -690,7 +686,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - checkbutton + checkbutton 0 1 @@ -701,7 +697,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - radiobutton + radiobutton 1 1 @@ -711,7 +707,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - radiobutton + radiobutton radiobutton1 1 @@ -721,7 +717,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - radiobutton + radiobutton 1 radiobutton1 @@ -732,7 +728,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - radiobutton + radiobutton 0 1 @@ -743,7 +739,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - radiobutton + radiobutton 0 radiobutton4 @@ -754,7 +750,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - radiobutton + radiobutton 0 1 radiobutton4 @@ -805,31 +801,31 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - vertical + 1 10 - togglebutton + togglebutton 1 - togglebutton + togglebutton 0 1 - togglebutton + togglebutton 1 1 - togglebutton + togglebutton 0 1 1 @@ -870,12 +866,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 #31316867a09f - 1 - link button + link button 1 1 0 @@ -884,25 +879,25 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - center + 3 0 - center + 3 - vertical + 1 6 1 - vertical + 1 6 @@ -945,14 +940,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 - vertical + 1 1 adjustment1 0 75 - 0 @@ -961,7 +955,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. adjustment1 0 75 - 0 @@ -970,7 +963,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - 0 0 0 adjustment3 @@ -994,17 +986,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 - vertical + 1 0.5 - end + 2 - vertical + 1 0.5 1 - start + 1 @@ -1017,26 +1009,26 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 100 - vertical + 1 adjustment1 0 75 -1 1 - end + 2 100 0 - vertical + 1 adjustment1 0 75 -1 1 - start + 1 @@ -1047,7 +1039,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - vertical + 1 10 1 @@ -1065,73 +1057,90 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - <b>Text Styles</b> + <b>Text Styles</b> 1 1 - never - automatic + 2 1 1 - vertical + 1 10 Large Title - + Title 1 - + Title 2 - + Title 3 - + Title 4 - + Heading - + Body - + Caption Heading - + Caption - + @@ -1144,13 +1153,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - vertical + 1 6 1 150 - always + 0 1 1 @@ -1163,7 +1172,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - Cool + Cool @@ -1175,7 +1184,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - Icon + Icon 1 @@ -1187,14 +1196,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - Name + Name 1 1 1 2 - end + 3 2 @@ -1204,14 +1213,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - Nick + Nick 1 1 1 3 - end + 3 3 @@ -1255,10 +1264,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus. /org/gtk/WidgetFactory4/sunset.jpg - + - copy @@ -1273,7 +1281,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - page 1 + page 1 @@ -1289,7 +1297,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - copy @@ -1304,7 +1311,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - page 2 + page 2 @@ -1320,7 +1327,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - copy @@ -1335,7 +1341,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - page 3 + page 3 @@ -1344,17 +1350,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - right + 1 - vertical + 1 - page 1 + page 1 @@ -1364,12 +1370,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 - vertical + 1 - page 2 + page 2 @@ -1379,12 +1385,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 2 - vertical + 1 - page 3 + page 3 @@ -1393,17 +1399,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - bottom + 3 - vertical + 1 - page 1 + page 1 @@ -1413,12 +1419,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 - vertical + 1 - page 2 + page 2 @@ -1428,12 +1434,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 2 - vertical + 1 - page 3 + page 3 @@ -1442,17 +1448,17 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - left + 0 - vertical + 1 - page 1 + page 1 @@ -1462,12 +1468,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 - vertical + 1 - page 2 + page 2 @@ -1477,12 +1483,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 2 - vertical + 1 - page 3 + page 3 @@ -1498,15 +1504,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus. page2 - Page _2 + Page _2 1 - swing-down - center - start + 9 + 3 + 1 - New + New document-new - Create a new document + Create a new document - Save + Save document-save - Save the current document + Save the current document @@ -1917,18 +1921,18 @@ microphone-sensitivity-medium-symbolic - Search + Search edit-find win.search - Search for it + Search for it 0 - Insert + Insert insert-image - Insert something + Insert something @@ -2015,7 +2019,7 @@ microphone-sensitivity-medium-symbolic 1 - vertical + 1 @@ -2041,11 +2045,11 @@ microphone-sensitivity-medium-symbolic - vertical + 1 10 - center + 3 @@ -2053,7 +2057,7 @@ microphone-sensitivity-medium-symbolic 1 - vertical + 1 1 @@ -2061,7 +2065,7 @@ microphone-sensitivity-medium-symbolic 226 - multiple + 3 iconsmodel @@ -2105,32 +2109,32 @@ microphone-sensitivity-medium-symbolic - Expander + Expander - _Inform + _Inform 1 - _Act + _Act 1 - _Configure + _Configure 1 - S_elect + S_elect 1 @@ -2145,39 +2149,39 @@ microphone-sensitivity-medium-symbolic page3 - Page _3 + Page _3 1 10 - vertical + 1 10 - vertical + 1 4 - never - always + 2 + 0 300 1 - vertical + 2 1 1 charlemodel - multiple + 3 - Name + Name @@ -2188,7 +2192,7 @@ microphone-sensitivity-medium-symbolic - Birth + Birth @@ -2199,7 +2203,7 @@ microphone-sensitivity-medium-symbolic - Death + Death @@ -2215,21 +2219,21 @@ microphone-sensitivity-medium-symbolic 1 - start + 1 1 - <small>Data source: <a href="http://en.wikipedia.org/wiki/Charlemagne#Ancestry">Wikipedia</a></small> + <small>Data source: <a href="http://en.wikipedia.org/wiki/Charlemagne#Ancestry">Wikipedia</a></small> - never + 2 1 1 - multiple + 3 0 @@ -2239,7 +2243,7 @@ microphone-sensitivity-medium-symbolic - vertical + 1 10 @@ -2250,14 +2254,14 @@ microphone-sensitivity-medium-symbolic 6 - center + 3 open_popover Open - center + 3 @@ -2488,13 +2492,13 @@ microphone-sensitivity-medium-symbolic Pages - vertical + 1 20 20 20 20 - center - center + 3 + 3 @@ -2539,101 +2543,101 @@ microphone-sensitivity-medium-symbolic + + + 1 + - - vertical - - - - document-open-symbolic - 0 - Insert ⌘ - - - - - send-to-symbolic - 0 - Insert ⚽ - - - - - view-fullscreen-symbolic - 0 - Insert ⤢ - - - - - star-new-symbolic - 0 - Insert ☆ - - + + document-open-symbolic + 0 + Insert ⌘ - - 1 - 1 - - - + + send-to-symbolic + 0 + Insert ⚽ - - vertical - - - vertical - - - - 0 - edit-cut-symbolic - 0 - Cut - - - - - 0 - edit-copy-symbolic - 0 - Copy - - - - - 0 - edit-paste-symbolic - 0 - Paste - - - - - - - 0 - end - edit-delete-symbolic - 0 - Delete - - + + view-fullscreen-symbolic + 0 + Insert ⤢ + + + + + star-new-symbolic + 0 + Insert ☆ + + + 1 + 1 + + + + + + + + 1 + + + 1 + + + + 0 + edit-cut-symbolic + 0 + Cut + + + + + 0 + edit-copy-symbolic + 0 + Copy + + + + + 0 + edit-paste-symbolic + 0 + Paste + + + + + + + 0 + 2 + edit-delete-symbolic + 0 + Delete + + + + + + @@ -2644,7 +2648,7 @@ microphone-sensitivity-medium-symbolic 20 20 20 - end + 2 @@ -2668,13 +2672,12 @@ microphone-sensitivity-medium-symbolic 1 - 0 adjustment1 - vertical + 1 .5 @@ -44,7 +44,7 @@ name label - center + 2 1 @@ -52,23 +52,23 @@ 400 100 - over-up-down + 16 600 1 main - About + About - vertical + 1 8 0 version 1.0 - center + 2 1 @@ -76,7 +76,7 @@ 0 comments - center + 2 1 1 60 @@ -94,7 +94,7 @@ 0 copyright - center + 2 1 1 60 @@ -105,7 +105,7 @@ 0 license 1 - center + 2 1 1 60 @@ -120,14 +120,14 @@ credits 0 - Credits + Credits - vertical + 1 8 - never + 2 1 1 @@ -137,9 +137,9 @@ - center - start - vertical + 3 + 1 + 1 2 8 5 @@ -160,14 +160,14 @@ license 0 - License + License - vertical + 1 8 - never + 2 1 1 @@ -203,14 +203,14 @@ system 0 - System + System - vertical + 1 8 - never + 2 1 1 diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui index 654bb31d30..dece4176c6 100644 --- a/gtk/ui/gtkappchooserdialog.ui +++ b/gtk/ui/gtkappchooserdialog.ui @@ -1,10 +1,10 @@ - _View All Applications + _View All Applications 1 1 - _Find New Applications + _Find New Applications 1 1 - vertical + 2 diff --git a/gtk/ui/gtkappchooserwidget.ui b/gtk/ui/gtkappchooserwidget.ui index cfce252c1a..ac2c485abf 100644 --- a/gtk/ui/gtkappchooserwidget.ui +++ b/gtk/ui/gtkappchooserwidget.ui @@ -24,7 +24,7 @@ 400 300 - never + 2 1 @@ -33,7 +33,7 @@ - browse + 2 @@ -45,7 +45,7 @@ 6 - word + 0 350 @@ -64,7 +64,7 @@ - end + 3 3 @@ -79,9 +79,9 @@ 0 - vertical - center - center + 1 + 3 + 3 application-x-executable-symbolic @@ -97,9 +97,9 @@ - No applications found. - center - center + No applications found. + 3 + 3 1 diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui index f8742b5f0a..4e8c906a90 100644 --- a/gtk/ui/gtkassistant.ui +++ b/gtk/ui/gtkassistant.ui @@ -10,7 +10,7 @@ - vertical + 1 @@ -18,7 +18,7 @@ - vertical + 1 1 @@ -28,7 +28,7 @@ - end + 2 6 6 6 @@ -37,7 +37,7 @@ 0 - _Close + _Close 1 1 @@ -21,7 +21,7 @@ 1 - end + 2 diff --git a/gtk/ui/gtkdropdown.ui b/gtk/ui/gtkdropdown.ui index 16e55b5b3d..2b789853db 100644 --- a/gtk/ui/gtkdropdown.ui +++ b/gtk/ui/gtkdropdown.ui @@ -9,7 +9,6 @@ 0 - fill 1 0 @@ -17,7 +16,7 @@ empty - (None) + (None) 0 @@ -43,52 +42,50 @@ - - - start - 0 - 1 - - - - vertical + + + 1 + 0 + - - 0 - + + 1 - - - - 1 - 6 - 6 - Search… + + 0 + + + + + + 1 + 6 + 6 + Search… + + - - - - - never - automatic - 400 - 1 - - - 1 + + 2 + 400 + 1 + + + + 1 + + - - diff --git a/gtk/ui/gtkemojichooser.ui b/gtk/ui/gtkemojichooser.ui index 4a2dc407fa..280b152ce1 100644 --- a/gtk/ui/gtkemojichooser.ui +++ b/gtk/ui/gtkemojichooser.ui @@ -7,7 +7,7 @@ - vertical + 1 - vertical + 1 6 6 6 @@ -48,7 +48,7 @@ 1 - none + 0 @@ -66,14 +66,14 @@ - Smileys & People + Smileys & People 0 1 - none + 0 @@ -91,14 +91,14 @@ - Body & Clothing + Body & Clothing 0 1 - none + 0 @@ -116,98 +116,98 @@ - Animals & Nature + Animals & Nature 0 1 - none + 0 - Food & Drink + Food & Drink 0 1 - none + 0 - Travel & Places + Travel & Places 0 1 - none + 0 - Activities + Activities 0 1 - none + 0 - Objects + Objects 0 1 - none + 0 - Symbols + Symbols 0 1 - none + 0 - Flags + Flags 0 1 - none + 0 @@ -220,14 +220,14 @@ 3 10 - none + 0 0 - Recent + Recent @@ -236,7 +236,7 @@ 0 - Smileys & People + Smileys & People @@ -245,7 +245,7 @@ 0 - Body & Clothing + Body & Clothing @@ -254,7 +254,7 @@ 0 - Animals & Nature + Animals & Nature @@ -263,7 +263,7 @@ 0 - Food & Drink + Food & Drink @@ -272,7 +272,7 @@ 0 - Travel & Places + Travel & Places @@ -281,7 +281,7 @@ 0 - Activities + Activities @@ -290,7 +290,7 @@ 0 - Objects + Objects @@ -299,7 +299,7 @@ 0 - Symbols + Symbols @@ -308,7 +308,7 @@ 0 - Flags + Flags @@ -326,8 +326,8 @@ 12 - center - center + 3 + 3 @@ -346,7 +346,7 @@ - No Results Found + No Results Found @@ -359,7 +359,7 @@ - Try a different search + Try a different search diff --git a/gtk/ui/gtkemojicompletion.ui b/gtk/ui/gtkemojicompletion.ui index 5d975abefe..9d6797a41c 100644 --- a/gtk/ui/gtkemojicompletion.ui +++ b/gtk/ui/gtkemojicompletion.ui @@ -8,7 +8,7 @@ - none + 0 diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui index c48e07f2b5..53ed506135 100644 --- a/gtk/ui/gtkfilechooserdialog.ui +++ b/gtk/ui/gtkfilechooserdialog.ui @@ -5,7 +5,7 @@ - vertical + 1 6 @@ -13,7 +13,7 @@ 6 6 1 - end + 2 @@ -26,6 +26,6 @@ - vertical + 2 diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui index 9346afd767..f9d0426511 100644 --- a/gtk/ui/gtkfilechooserwidget.ui +++ b/gtk/ui/gtkfilechooserwidget.ui @@ -3,10 +3,10 @@ - vertical + 2 @@ -375,8 +375,8 @@ 6 - Folder Name - start + Folder Name + 1 new_folder_name_entry @@ -401,7 +401,7 @@ 0 - _Create + _Create 1 @@ -271,7 +267,7 @@ - No Fonts Found + No Fonts Found @@ -301,7 +297,7 @@ tweaks - vertical + 1 6 @@ -309,7 +305,7 @@ 6 12 12 - end + 3 0 @@ -325,14 +321,14 @@ - Preview text + Preview text - never + 2 1 1 - vertical + 1 12 12 12 @@ -352,9 +348,9 @@ 12 - Size + Size 0 - baseline + 4 0 0 @@ -365,7 +361,6 @@ 1 slider_adjustment - 0 0 1 @@ -376,7 +371,7 @@ spin_adjustment - center + 3 2 @@ -388,7 +383,7 @@ - vertical + 1 12 diff --git a/gtk/ui/gtklockbutton.ui b/gtk/ui/gtklockbutton.ui index a5bb4538f6..9cf27e7389 100644 --- a/gtk/ui/gtklockbutton.ui +++ b/gtk/ui/gtklockbutton.ui @@ -4,8 +4,8 @@ 1 - center - center + 3 + 3 6 @@ -17,13 +17,13 @@ 0 - Lock + Lock 0 - Unlock + Unlock diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui index eaca2ae17c..08799d64e6 100644 --- a/gtk/ui/gtkmediacontrols.ui +++ b/gtk/ui/gtkmediacontrols.ui @@ -21,8 +21,8 @@ 1 - center - center + 3 + 3 0 media-playback-start-symbolic @@ -33,14 +33,13 @@ - + time_adjustment - 0 0 1 @@ -48,7 +47,7 @@ - + diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui index 42c6528b4a..5d0a760f74 100644 --- a/gtk/ui/gtkmessagedialog.ui +++ b/gtk/ui/gtkmessagedialog.ui @@ -10,7 +10,7 @@ - vertical + 1 20 @@ -19,13 +19,13 @@ 30 - vertical + 1 10 1 - center - start + 3 + 1 1 60 @@ -34,8 +34,8 @@ 0 2 - center - start + 3 + 1 1 1 60 diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui index 1fe89e5575..79b5edce16 100644 --- a/gtk/ui/gtkpagesetupunixdialog.ui +++ b/gtk/ui/gtkpagesetupunixdialog.ui @@ -2,10 +2,10 @@