diff options
| author | Idan Horowitz <idan.horowitz@gmail.com> | 2022-02-12 19:17:01 +0200 |
|---|---|---|
| committer | Idan Horowitz <idan.horowitz@gmail.com> | 2022-02-13 02:36:35 +0200 |
| commit | c8ab45e79fd5845402c6aaf69890e103036e16ef (patch) | |
| tree | 6a28508d9d953345d80eb6d4f99cc6f40628bc27 | |
| parent | 4c451422c35b3c2044d3b005a7af32d18ce9b194 (diff) | |
| download | serenity-c8ab45e79fd5845402c6aaf69890e103036e16ef.zip | |
Userland: Run gml-format
This brings the existing GML files up to spec with the new requirements
54 files changed, 259 insertions, 253 deletions
diff --git a/Userland/Applications/Browser/BrowserWindow.gml b/Userland/Applications/Browser/BrowserWindow.gml index f02adc0630..d0e1a90672 100644 --- a/Userland/Applications/Browser/BrowserWindow.gml +++ b/Userland/Applications/Browser/BrowserWindow.gml @@ -1,7 +1,7 @@ @GUI::Widget { name: "browser" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::HorizontalSeparator { name: "top_line" diff --git a/Userland/Applications/Browser/EditBookmark.gml b/Userland/Applications/Browser/EditBookmark.gml index c6e41cc796..4daad3f12e 100644 --- a/Userland/Applications/Browser/EditBookmark.gml +++ b/Userland/Applications/Browser/EditBookmark.gml @@ -8,7 +8,7 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Title:" @@ -23,7 +23,7 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "URL:" @@ -38,9 +38,9 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/Browser/Tab.gml b/Userland/Applications/Browser/Tab.gml index d6c3ea135a..8371af44df 100644 --- a/Userland/Applications/Browser/Tab.gml +++ b/Userland/Applications/Browser/Tab.gml @@ -5,6 +5,7 @@ @GUI::ToolbarContainer { name: "toolbar_container" + @GUI::Toolbar { name: "toolbar" } @@ -12,8 +13,7 @@ @GUI::Widget { name: "webview_container" - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} } @GUI::Statusbar { diff --git a/Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml b/Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml index 1583cdc5bf..da4fabd1d1 100644 --- a/Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml +++ b/Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml @@ -112,8 +112,8 @@ layout: @GUI::HorizontalBoxLayout { spacing: 16 } - name: "search_engine_combobox_group" + @GUI::Widget { fixed_width: 32 } @@ -133,8 +133,8 @@ layout: @GUI::HorizontalBoxLayout { spacing: 16 } - name: "custom_search_engine_group" + @GUI::Widget { fixed_width: 32 } diff --git a/Userland/Applications/Calculator/CalculatorWindow.gml b/Userland/Applications/Calculator/CalculatorWindow.gml index fccca448e5..40972e6274 100644 --- a/Userland/Applications/Calculator/CalculatorWindow.gml +++ b/Userland/Applications/Calculator/CalculatorWindow.gml @@ -2,10 +2,10 @@ fixed_width: 250 fixed_height: 215 fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::HorizontalSeparator { fixed_height: 2 @@ -22,7 +22,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "label" @@ -60,7 +60,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Button { name: "mem_clear_button" @@ -115,7 +115,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Button { name: "mem_recall_button" @@ -170,7 +170,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Button { name: "mem_save_button" @@ -225,7 +225,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Button { name: "mem_add_button" diff --git a/Userland/Applications/Calendar/CalendarWindow.gml b/Userland/Applications/Calendar/CalendarWindow.gml index b47d8ed320..23825165d0 100644 --- a/Userland/Applications/Calendar/CalendarWindow.gml +++ b/Userland/Applications/Calendar/CalendarWindow.gml @@ -1,9 +1,10 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::ToolbarContainer { name: "toolbar_container" + @GUI::Toolbar { name: "toolbar" } diff --git a/Userland/Applications/CharacterMap/CharacterMapWindow.gml b/Userland/Applications/CharacterMap/CharacterMapWindow.gml index 7b7cc5de44..6b82aeba65 100644 --- a/Userland/Applications/CharacterMap/CharacterMapWindow.gml +++ b/Userland/Applications/CharacterMap/CharacterMapWindow.gml @@ -1,6 +1,6 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::ToolbarContainer { @GUI::Toolbar { @@ -8,8 +8,8 @@ spacing: 4 margins: [0, 0, 0, 4] } - name: "toolbar" + @GUI::Label { text: "Font: " autosize: true @@ -19,7 +19,7 @@ background_role: "Base" fill_with_background_color: true fixed_height: 20 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { name: "font_name" diff --git a/Userland/Applications/CharacterMap/CharacterSearchWindow.gml b/Userland/Applications/CharacterMap/CharacterSearchWindow.gml index e8cb9c6510..70d49c415f 100644 --- a/Userland/Applications/CharacterMap/CharacterSearchWindow.gml +++ b/Userland/Applications/CharacterMap/CharacterSearchWindow.gml @@ -1,7 +1,7 @@ @GUI::Frame { - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} fill_with_background_color: true + @GUI::Toolbar { @GUI::TextBox { name: "search_input" diff --git a/Userland/Applications/CrashReporter/CrashReporterWindow.gml b/Userland/Applications/CrashReporter/CrashReporterWindow.gml index 79844b5fd5..e5597b145e 100644 --- a/Userland/Applications/CrashReporter/CrashReporterWindow.gml +++ b/Userland/Applications/CrashReporter/CrashReporterWindow.gml @@ -22,7 +22,7 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Executable path:" @@ -38,7 +38,7 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Coredump path:" @@ -54,7 +54,7 @@ @GUI::Widget { fixed_height: 18 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Arguments:" @@ -80,7 +80,7 @@ @GUI::Widget { fixed_height: 32 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Button { name: "debug_button" @@ -89,7 +89,7 @@ } // HACK: We need something like Layout::add_spacer() in GML! :^) - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "close_button" diff --git a/Userland/Applications/DisplaySettings/BackgroundSettings.gml b/Userland/Applications/DisplaySettings/BackgroundSettings.gml index f7a179a0ec..df1fbabd3b 100644 --- a/Userland/Applications/DisplaySettings/BackgroundSettings.gml +++ b/Userland/Applications/DisplaySettings/BackgroundSettings.gml @@ -32,7 +32,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Button { name: "wallpaper_open_button" diff --git a/Userland/Applications/DisplaySettings/DesktopSettings.gml b/Userland/Applications/DisplaySettings/DesktopSettings.gml index adc4be09a8..2704145466 100644 --- a/Userland/Applications/DisplaySettings/DesktopSettings.gml +++ b/Userland/Applications/DisplaySettings/DesktopSettings.gml @@ -8,9 +8,9 @@ layout: @GUI::VerticalBoxLayout { margins: [14, 14, 4] } - title: "Workspaces" shrink_to_fit: true + @GUI::Widget { fixed_height: 32 layout: @GUI::HorizontalBoxLayout { @@ -44,7 +44,7 @@ @GUI::Widget { fixed_height: 76 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_height: 32 diff --git a/Userland/Applications/DisplaySettings/FontSettings.gml b/Userland/Applications/DisplaySettings/FontSettings.gml index a78178f2b1..39144af16c 100644 --- a/Userland/Applications/DisplaySettings/FontSettings.gml +++ b/Userland/Applications/DisplaySettings/FontSettings.gml @@ -20,7 +20,7 @@ @GUI::Frame { background_role: "Base" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { name: "default_font_label" @@ -49,7 +49,7 @@ @GUI::Frame { background_role: "Base" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { name: "fixed_width_font_label" @@ -63,5 +63,5 @@ } } - @GUI::Widget + @GUI::Widget {} } diff --git a/Userland/Applications/DisplaySettings/MonitorSettings.gml b/Userland/Applications/DisplaySettings/MonitorSettings.gml index 7fd9fa4fe3..cd39596a69 100644 --- a/Userland/Applications/DisplaySettings/MonitorSettings.gml +++ b/Userland/Applications/DisplaySettings/MonitorSettings.gml @@ -35,11 +35,11 @@ layout: @GUI::VerticalBoxLayout { margins: [14, 14, 4] } - title: "Screen settings" + @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Resolution:" @@ -65,7 +65,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Display scale:" diff --git a/Userland/Applications/FileManager/FileManagerWindow.gml b/Userland/Applications/FileManager/FileManagerWindow.gml index e613767644..f53c704425 100644 --- a/Userland/Applications/FileManager/FileManagerWindow.gml +++ b/Userland/Applications/FileManager/FileManagerWindow.gml @@ -6,6 +6,7 @@ @GUI::ToolbarContainer { name: "toolbar_container" + @GUI::Toolbar { name: "main_toolbar" } @@ -13,6 +14,7 @@ @GUI::Toolbar { name: "location_toolbar" visible: false + @GUI::Label { text: "Location: " autosize: true @@ -26,6 +28,7 @@ @GUI::Toolbar { name: "breadcrumb_toolbar" + @GUI::Label { text: "Location: " autosize: true @@ -40,6 +43,7 @@ @GUI::HorizontalSplitter { name: "splitter" first_resizee_minimum_size: 80 + @GUI::TreeView { name: "tree_view" fixed_width: 175 @@ -48,6 +52,7 @@ @GUI::Statusbar { name: "statusbar" + @GUI::Progressbar { name: "progressbar" text: "Generating thumbnails: " diff --git a/Userland/Applications/FileManager/FileOperationProgress.gml b/Userland/Applications/FileManager/FileOperationProgress.gml index 7a864bd08a..37500d610a 100644 --- a/Userland/Applications/FileManager/FileOperationProgress.gml +++ b/Userland/Applications/FileManager/FileOperationProgress.gml @@ -6,7 +6,7 @@ @GUI::Widget { fixed_height: 32 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::ImageWidget { name: "source_folder_icon" @@ -35,7 +35,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Copying: " @@ -54,7 +54,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Time left: " @@ -82,9 +82,9 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { text: "Cancel" diff --git a/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml b/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml index e10888a620..277dccf719 100644 --- a/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml +++ b/Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml @@ -22,7 +22,7 @@ } } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::Widget { fixed_height: 14 @@ -177,7 +177,7 @@ } } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::Widget { fixed_height: 14 diff --git a/Userland/Applications/FontEditor/FontEditorWindow.gml b/Userland/Applications/FontEditor/FontEditorWindow.gml index fec2379770..1913e375d6 100644 --- a/Userland/Applications/FontEditor/FontEditorWindow.gml +++ b/Userland/Applications/FontEditor/FontEditorWindow.gml @@ -6,27 +6,27 @@ @GUI::ToolbarContainer { name: "toolbar_container" + @GUI::Toolbar { name: "toolbar" } } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Widget { name: "left_column_container" - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { name: "glyph_editor_container" - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} } @GUI::Widget { shrink_to_fit: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::SpinBox { name: "glyph_editor_width_spinbox" @@ -41,6 +41,7 @@ @GUI::ToolbarContainer { name: "glyph_toolbar_container" + @GUI::Toolbar { name: "glyph_mode_toolbar" } @@ -59,8 +60,7 @@ @GUI::Widget { name: "glyph_map_container" - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} } @GUI::GroupBox { @@ -73,7 +73,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "name_label" @@ -89,7 +89,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "family_label" @@ -105,7 +105,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "weight_label" @@ -122,7 +122,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "slope_label" @@ -139,7 +139,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "presentation_label" @@ -157,7 +157,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "mean_line_label" @@ -174,7 +174,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "baseline_label" @@ -191,7 +191,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { name: "spacing_label" diff --git a/Userland/Applications/FontEditor/NewFontDialogPage1.gml b/Userland/Applications/FontEditor/NewFontDialogPage1.gml index 5501dbe2d2..5e24b5e15c 100644 --- a/Userland/Applications/FontEditor/NewFontDialogPage1.gml +++ b/Userland/Applications/FontEditor/NewFontDialogPage1.gml @@ -5,10 +5,10 @@ @GUI::Widget { fixed_height: 160 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 100 @@ -22,7 +22,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 100 @@ -40,7 +40,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Weight:" @@ -56,7 +56,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 100 @@ -72,7 +72,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 100 diff --git a/Userland/Applications/FontEditor/NewFontDialogPage2.gml b/Userland/Applications/FontEditor/NewFontDialogPage2.gml index 5b2b9c0fbb..50d79f540a 100644 --- a/Userland/Applications/FontEditor/NewFontDialogPage2.gml +++ b/Userland/Applications/FontEditor/NewFontDialogPage2.gml @@ -4,7 +4,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::GroupBox { title: "Metadata" @@ -14,7 +14,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 80 @@ -29,7 +29,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 80 @@ -44,7 +44,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 80 @@ -59,7 +59,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 80 @@ -78,7 +78,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { fixed_width: 80 @@ -95,7 +95,7 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Widget { fixed_width: 80 @@ -110,19 +110,18 @@ } @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Widget { name: "glyph_editor_container" layout: @GUI::VerticalBoxLayout { margins: [5, 0, 0] } - } - @GUI::Widget + @GUI::Widget {} } } } diff --git a/Userland/Applications/HexEditor/FindDialog.gml b/Userland/Applications/HexEditor/FindDialog.gml index 5afcea8a24..cd9ca46f69 100644 --- a/Userland/Applications/HexEditor/FindDialog.gml +++ b/Userland/Applications/HexEditor/FindDialog.gml @@ -9,9 +9,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} fixed_height: 22 + @GUI::Label { text: "Value to find" fixed_width: 80 @@ -24,15 +24,14 @@ } @GUI::Widget { - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} name: "radio_container" } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} fixed_height: 22 + @GUI::Button { name: "find_button" text: "Find" diff --git a/Userland/Applications/HexEditor/HexEditorWindow.gml b/Userland/Applications/HexEditor/HexEditorWindow.gml index 467ff0176a..4a7d4e0935 100644 --- a/Userland/Applications/HexEditor/HexEditorWindow.gml +++ b/Userland/Applications/HexEditor/HexEditorWindow.gml @@ -7,6 +7,7 @@ @GUI::ToolbarContainer { name: "toolbar_container" + @GUI::Toolbar { name: "toolbar" } @@ -20,7 +21,7 @@ @GUI::Widget { name: "search_results_container" visible: false - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::TableView { name: "search_results" diff --git a/Userland/Applications/KeyboardSettings/Keyboard.gml b/Userland/Applications/KeyboardSettings/Keyboard.gml index 1437c98666..822378e1a7 100644 --- a/Userland/Applications/KeyboardSettings/Keyboard.gml +++ b/Userland/Applications/KeyboardSettings/Keyboard.gml @@ -15,7 +15,7 @@ @GUI::Widget { fixed_width: 32 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { fixed_width: 32 @@ -62,7 +62,7 @@ @GUI::Widget { fixed_width: 32 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { fixed_width: 32 diff --git a/Userland/Applications/KeyboardSettings/KeymapDialog.gml b/Userland/Applications/KeyboardSettings/KeymapDialog.gml index c1062d0fd2..0fa7ea814a 100644 --- a/Userland/Applications/KeyboardSettings/KeymapDialog.gml +++ b/Userland/Applications/KeyboardSettings/KeymapDialog.gml @@ -10,9 +10,9 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/MouseSettings/Mouse.gml b/Userland/Applications/MouseSettings/Mouse.gml index 7ae4faadef..95f07c918f 100644 --- a/Userland/Applications/MouseSettings/Mouse.gml +++ b/Userland/Applications/MouseSettings/Mouse.gml @@ -101,7 +101,7 @@ fixed_width: 100 } - @GUI::Widget + @GUI::Widget {} } } diff --git a/Userland/Applications/PixelPaint/EditGuideDialog.gml b/Userland/Applications/PixelPaint/EditGuideDialog.gml index 222ef1a51b..ea50130045 100644 --- a/Userland/Applications/PixelPaint/EditGuideDialog.gml +++ b/Userland/Applications/PixelPaint/EditGuideDialog.gml @@ -1,6 +1,6 @@ @GUI::Frame { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { layout: @GUI::VerticalBoxLayout { @@ -30,8 +30,8 @@ layout: @GUI::HorizontalBoxLayout { margins: [4] } - shrink_to_fit: true + @GUI::Label { text: "Offset" text_alignment: "CenterLeft" @@ -48,7 +48,7 @@ margins: [4] } - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/PixelPaint/FilterGallery.gml b/Userland/Applications/PixelPaint/FilterGallery.gml index 93f7607184..470b570617 100644 --- a/Userland/Applications/PixelPaint/FilterGallery.gml +++ b/Userland/Applications/PixelPaint/FilterGallery.gml @@ -1,7 +1,7 @@ @GUI::Frame { - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} fill_with_background_color: true + @GUI::Widget { layout: @GUI::HorizontalBoxLayout { margins: [4] @@ -22,7 +22,6 @@ layout: @GUI::VerticalBoxLayout { margins: [4] } - } @GUI::GroupBox { @@ -44,7 +43,7 @@ margins: [4] } - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "apply_button" diff --git a/Userland/Applications/PixelPaint/PixelPaintWindow.gml b/Userland/Applications/PixelPaint/PixelPaintWindow.gml index b06b31405a..e7d429de9e 100644 --- a/Userland/Applications/PixelPaint/PixelPaintWindow.gml +++ b/Userland/Applications/PixelPaint/PixelPaintWindow.gml @@ -7,6 +7,7 @@ @GUI::ToolbarContainer { name: "toolbar_container" + @GUI::Toolbar { name: "toolbar" } @@ -19,6 +20,7 @@ @GUI::ToolbarContainer { name: "toolbar_container" + @PixelPaint::ToolboxWidget { name: "toolbox" } @@ -41,7 +43,7 @@ @GUI::Widget { fill_with_background_color: true fixed_width: 200 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::GroupBox { title: "Layers" diff --git a/Userland/Applications/Run/Run.gml b/Userland/Applications/Run/Run.gml index 64cd5192d4..5f2fd0ca20 100644 --- a/Userland/Applications/Run/Run.gml +++ b/Userland/Applications/Run/Run.gml @@ -38,11 +38,11 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} fixed_height: 22 + // HACK: using an empty widget as a spacer - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "ok_button" diff --git a/Userland/Applications/Spreadsheet/CondFormatting.gml b/Userland/Applications/Spreadsheet/CondFormatting.gml index 4072874b36..853b39a8eb 100644 --- a/Userland/Applications/Spreadsheet/CondFormatting.gml +++ b/Userland/Applications/Spreadsheet/CondFormatting.gml @@ -16,7 +16,7 @@ spacing: 10 } - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "add_button" @@ -30,6 +30,6 @@ fixed_width: 70 } - @GUI::Widget + @GUI::Widget {} } } diff --git a/Userland/Applications/Spreadsheet/CondView.gml b/Userland/Applications/Spreadsheet/CondView.gml index 737ce4b9ee..f532d406dd 100644 --- a/Userland/Applications/Spreadsheet/CondView.gml +++ b/Userland/Applications/Spreadsheet/CondView.gml @@ -1,9 +1,9 @@ @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "if..." @@ -20,7 +20,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Foreground..." @@ -34,7 +34,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Background..." diff --git a/Userland/Applications/Spreadsheet/csv_export.gml b/Userland/Applications/Spreadsheet/csv_export.gml index 975ce6e846..bea89d5068 100644 --- a/Userland/Applications/Spreadsheet/csv_export.gml +++ b/Userland/Applications/Spreadsheet/csv_export.gml @@ -6,10 +6,10 @@ @GUI::HorizontalSplitter { @GUI::Widget { name: "csv_options" - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::GroupBox { title: "Delimiter" @@ -43,7 +43,7 @@ @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::RadioButton { name: "delimiter_other_radio" @@ -78,7 +78,7 @@ @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::RadioButton { name: "quote_other_radio" @@ -92,11 +92,11 @@ } } - @GUI::Widget + @GUI::Widget {} @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Escape by " @@ -109,13 +109,13 @@ } } - @GUI::Widget + @GUI::Widget {} } } @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::CheckBox { name: "export_header_check_box" diff --git a/Userland/Applications/Spreadsheet/csv_import.gml b/Userland/Applications/Spreadsheet/csv_import.gml index 996f826955..520b79491e 100644 --- a/Userland/Applications/Spreadsheet/csv_import.gml +++ b/Userland/Applications/Spreadsheet/csv_import.gml @@ -6,10 +6,10 @@ @GUI::HorizontalSplitter { @GUI::Widget { name: "csv_options" - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::GroupBox { title: "Delimiter" @@ -43,7 +43,7 @@ @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::RadioButton { name: "delimiter_other_radio" @@ -78,7 +78,7 @@ @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::RadioButton { name: "quote_other_radio" @@ -92,11 +92,11 @@ } } - @GUI::Widget + @GUI::Widget {} @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Escape by " @@ -109,7 +109,7 @@ } } - @GUI::Widget + @GUI::Widget {} } } @@ -121,7 +121,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::CheckBox { name: "trim_leading_field_spaces_check_box" @@ -151,6 +151,7 @@ @GUI::StackWidget { name: "data_preview_widget" + @GUI::TableView { name: "data_preview_table_view" } diff --git a/Userland/Applications/Spreadsheet/select_format_page.gml b/Userland/Applications/Spreadsheet/select_format_page.gml index f1335eaed5..92bcaea08f 100644 --- a/Userland/Applications/Spreadsheet/select_format_page.gml +++ b/Userland/Applications/Spreadsheet/select_format_page.gml @@ -12,7 +12,7 @@ @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Type: " @@ -25,5 +25,5 @@ } } - @GUI::Widget + @GUI::Widget {} } diff --git a/Userland/Applications/TerminalSettings/TerminalSettingsView.gml b/Userland/Applications/TerminalSettings/TerminalSettingsView.gml index a47459d673..540dff6e30 100644 --- a/Userland/Applications/TerminalSettings/TerminalSettingsView.gml +++ b/Userland/Applications/TerminalSettings/TerminalSettingsView.gml @@ -44,7 +44,7 @@ @GUI::Frame { background_role: "Base" fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { name: "terminal_font_label" diff --git a/Userland/Applications/TextEditor/TextEditorWindow.gml b/Userland/Applications/TextEditor/TextEditorWindow.gml index ed700973fb..cd796c43a4 100644 --- a/Userland/Applications/TextEditor/TextEditorWindow.gml +++ b/Userland/Applications/TextEditor/TextEditorWindow.gml @@ -7,6 +7,7 @@ @GUI::ToolbarContainer { name: "toolbar_container" + @GUI::Toolbar { name: "toolbar" } @@ -20,8 +21,7 @@ @GUI::Widget { name: "web_view_container" visible: false - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} } } diff --git a/Userland/Applications/ThemeEditor/ThemeEditor.gml b/Userland/Applications/ThemeEditor/ThemeEditor.gml index 022cced5a5..2bbedb7519 100644 --- a/Userland/Applications/ThemeEditor/ThemeEditor.gml +++ b/Userland/Applications/ThemeEditor/ThemeEditor.gml @@ -1,10 +1,9 @@ @GUI::Widget { - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} fill_with_background_color: true - @GUI::Frame { - layout: @GUI::HorizontalBoxLayout + @GUI::Frame { + layout: @GUI::HorizontalBoxLayout {} name: "preview_frame" } @@ -12,9 +11,9 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } - shrink_to_fit: true title: "Colors" + @GUI::ComboBox { name: "color_combo_box" model_only: true @@ -30,9 +29,9 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } - shrink_to_fit: true title: "Alignments" + @GUI::ComboBox { name: "alignment_combo_box" model_only: true @@ -48,16 +47,16 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } - shrink_to_fit: true title: "Flags" + @GUI::ComboBox { name: "flag_combo_box" model_only: true fixed_width: 230 } - @GUI::Widget + @GUI::Widget {} @GUI::CheckBox { name: "flag_input" @@ -69,9 +68,9 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } - shrink_to_fit: true title: "Metrics" + @GUI::ComboBox { name: "metric_combo_box" model_only: true @@ -87,9 +86,9 @@ layout: @GUI::HorizontalBoxLayout { margins: [4, 4, 4, 4] } - shrink_to_fit: true title: "Paths" + @GUI::ComboBox { name: "path_combo_box" model_only: true diff --git a/Userland/Applications/Welcome/WelcomeWindow.gml b/Userland/Applications/Welcome/WelcomeWindow.gml index 014a2dd413..0de47fe28b 100644 --- a/Userland/Applications/Welcome/WelcomeWindow.gml +++ b/Userland/Applications/Welcome/WelcomeWindow.gml @@ -10,7 +10,7 @@ @GUI::Widget { min_height: 160 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Frame { name: "tip_frame" @@ -22,18 +22,18 @@ @GUI::Widget { fixed_width: 60 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { name: "light_bulb_label" fixed_height: 60 } - @GUI::Widget + @GUI::Widget {} } @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { fixed_height: 60 @@ -68,7 +68,7 @@ name: "navigation_column" fixed_width: 115 min_height: 160 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Button { name: "new_button" @@ -85,7 +85,7 @@ text: "Next Tip" } - @GUI::Widget + @GUI::Widget {} @GUI::HorizontalSeparator { fixed_height: 2 @@ -99,7 +99,7 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::CheckBox { name: "startup_checkbox" @@ -107,7 +107,7 @@ autosize: true } - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "close_button" diff --git a/Userland/Demos/ModelGallery/BasicModelTab.gml b/Userland/Demos/ModelGallery/BasicModelTab.gml index ebb6ef0c26..347d6852e5 100644 --- a/Userland/Demos/ModelGallery/BasicModelTab.gml +++ b/Userland/Demos/ModelGallery/BasicModelTab.gml @@ -16,9 +16,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} fixed_height: 30 + @GUI::TextBox { name: "new_item_name" placeholder: "Enter some text to be added..." diff --git a/Userland/Demos/WidgetGallery/DemoWizardPage1.gml b/Userland/Demos/WidgetGallery/DemoWizardPage1.gml index 644ae32d0e..39509577bb 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardPage1.gml +++ b/Userland/Demos/WidgetGallery/DemoWizardPage1.gml @@ -11,7 +11,7 @@ @GUI::Widget { fixed_height: 25 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Location: " @@ -29,5 +29,5 @@ } // Spacer - @GUI::Widget + @GUI::Widget {} } diff --git a/Userland/Demos/WidgetGallery/DemoWizardPage2.gml b/Userland/Demos/WidgetGallery/DemoWizardPage2.gml index 6f6d6b7f25..fac8a0c278 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardPage2.gml +++ b/Userland/Demos/WidgetGallery/DemoWizardPage2.gml @@ -15,5 +15,5 @@ } // Spacer - @GUI::Widget + @GUI::Widget {} } diff --git a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml index 0a57c38d4c..3dbecab2dd 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml @@ -11,7 +11,7 @@ } @GUI::HorizontalSplitter { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Frame { name: "label_frame" @@ -48,11 +48,11 @@ } } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::ComboBox { name: "frame_shape_combobox" @@ -64,7 +64,7 @@ enabled: false } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::SpinBox { name: "thickness_spinbox" @@ -85,12 +85,12 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "normal_button" @@ -103,15 +103,15 @@ enabled: "false" } - @GUI::Widget + @GUI::Widget {} } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "enabled_coolbar_button" @@ -126,23 +126,23 @@ button_style: "Coolbar" } - @GUI::Widget + @GUI::Widget {} } } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Widget { fixed_width: 60 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::RadioButton { name: "top_radiobutton" @@ -155,16 +155,16 @@ text: "Radio 2" } - @GUI::Widget + @GUI::Widget {} } - @GUI::Widget + @GUI::Widget {} @GUI::Widget { fixed_width: 70 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::CheckBox { name: "top_checkbox" @@ -177,18 +177,18 @@ enabled: false } - @GUI::Widget + @GUI::Widget {} } - @GUI::Widget + @GUI::Widget {} } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "icon_button" @@ -201,7 +201,7 @@ enabled: "false" } - @GUI::Widget + @GUI::Widget {} } } } @@ -213,10 +213,10 @@ @GUI::Widget { fixed_height: 47 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::TextBox { placeholder: "Text box" @@ -229,10 +229,10 @@ } } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::TextBox { text: "Read only" @@ -246,24 +246,24 @@ } } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::TextEditor { name: "text_editor" placeholder: "Text editor" } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::ColorInput { name: "font_colorinput" @@ -276,7 +276,7 @@ } } - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "font_button" @@ -293,18 +293,18 @@ text: "Input dialog..." } - @GUI::Widget + @GUI::Widget {} } } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::ComboBox { name: "msgbox_icon_combobox" @@ -317,10 +317,10 @@ } } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Button { name: "msgbox_button" diff --git a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml index d5d69683ac..790c89b06b 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml @@ -21,7 +21,7 @@ tooltip: "Opacity Slider" } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::ValueSlider { name: "opacity_value_slider" @@ -32,7 +32,7 @@ } } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::Frame { shape: "Panel" @@ -56,7 +56,7 @@ margins: [0, 8] } - @GUI::Widget + @GUI::Widget {} @GUI::Scrollbar { name: "enabled_scrollbar" @@ -67,11 +67,11 @@ value: 50 } - @GUI::Widget + @GUI::Widget {} - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} - @GUI::Widget + @GUI::Widget {} @GUI::Scrollbar { name: "disabled_scrollbar" @@ -79,7 +79,7 @@ fixed_width: -1 } - @GUI::Widget + @GUI::Widget {} } @GUI::GroupBox { @@ -101,7 +101,7 @@ tooltip: "Fixed" } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::VerticalSlider { enabled: false @@ -111,7 +111,7 @@ value: 5 } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::VerticalProgressbar { name: "vertical_progressbar_right" @@ -134,7 +134,7 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::HorizontalSlider { name: "horizontal_slider_left" @@ -144,7 +144,7 @@ value: 0 } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::HorizontalSlider { enabled: false @@ -153,7 +153,7 @@ value: 5 } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::HorizontalSlider { name: "horizontal_slider_right" @@ -164,7 +164,7 @@ } } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::HorizontalProgressbar { name: "horizontal_progressbar" diff --git a/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml index 2de94a28de..1cae22142f 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml @@ -14,7 +14,7 @@ text: "Start wizard" } - @GUI::HorizontalSeparator + @GUI::HorizontalSeparator {} @GUI::TextEditor { name: "wizard_output" diff --git a/Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml b/Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml index e48f060eec..1a07181bc6 100644 --- a/Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml +++ b/Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml @@ -16,9 +16,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} shrink_to_fit: true + @GUI::Label { name: "line_and_col_label" text: "Line: 1, Col: 0" diff --git a/Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml b/Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml index d2f5307654..a7d9d515d6 100644 --- a/Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml +++ b/Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml @@ -11,8 +11,7 @@ } @GUI::Widget { - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} name: "icon_view_container" } @@ -26,9 +25,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} max_height: 24 + @GUI::Label { text: "Name:" text_alignment: "CenterLeft" @@ -41,9 +40,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} max_height: 24 + @GUI::Label { text: "Create in:" text_alignment: "CenterLeft" @@ -63,9 +62,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} max_height: 24 + @GUI::Label { text: "Full path:" text_alignment: "CenterLeft" @@ -84,10 +83,10 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout - + layout: @GUI::HorizontalBoxLayout {} max_height: 24 - @GUI::Widget + + @GUI::Widget {} @GUI::Button { name: "ok_button" diff --git a/Userland/Games/GameOfLife/GameOfLife.gml b/Userland/Games/GameOfLife/GameOfLife.gml index fba7441b28..349ec3180e 100644 --- a/Userland/Games/GameOfLife/GameOfLife.gml +++ b/Userland/Games/GameOfLife/GameOfLife.gml @@ -1,9 +1,10 @@ @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::ToolbarContainer { @GUI::Toolbar { name: "toolbar" + @GUI::Label { text: "Columns: " autosize: true @@ -16,7 +17,7 @@ fixed_width: 40 } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Label { text: "Rows: " @@ -30,7 +31,7 @@ fixed_width: 40 } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Label { text: "Update Speed: " @@ -49,7 +50,7 @@ autosize: true } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} } } diff --git a/Userland/Games/Hearts/Hearts.gml b/Userland/Games/Hearts/Hearts.gml index 995337141b..0922093889 100644 --- a/Userland/Games/Hearts/Hearts.gml +++ b/Userland/Games/Hearts/Hearts.gml @@ -1,6 +1,6 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @Hearts::Game { name: "game" diff --git a/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml b/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml index ce37847dfb..d9b33d5b12 100644 --- a/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml +++ b/Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml @@ -23,7 +23,7 @@ fixed_width: 40 } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Label { text: "Rows: " @@ -37,7 +37,7 @@ fixed_width: 40 } - @GUI::VerticalSeparator + @GUI::VerticalSeparator {} @GUI::Label { text: "Mines: " @@ -54,9 +54,9 @@ @GUI::Widget { max_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "ok_button" diff --git a/Userland/Games/Solitaire/Solitaire.gml b/Userland/Games/Solitaire/Solitaire.gml index 55aae5f751..7dc3180ede 100644 --- a/Userland/Games/Solitaire/Solitaire.gml +++ b/Userland/Games/Solitaire/Solitaire.gml @@ -1,6 +1,6 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @Solitaire::Game { name: "game" diff --git a/Userland/Games/Spider/Spider.gml b/Userland/Games/Spider/Spider.gml index cb15ec2f4f..83ad529034 100644 --- a/Userland/Games/Spider/Spider.gml +++ b/Userland/Games/Spider/Spider.gml @@ -1,6 +1,6 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @Spider::Game { name: "game" diff --git a/Userland/Libraries/LibGUI/FilePickerDialog.gml b/Userland/Libraries/LibGUI/FilePickerDialog.gml index b15307cb51..94d09891bf 100644 --- a/Userland/Libraries/LibGUI/FilePickerDialog.gml +++ b/Userland/Libraries/LibGUI/FilePickerDialog.gml @@ -34,11 +34,11 @@ } @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { shrink_to_fit: true - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::TextBox { name: "location_textbox" @@ -55,11 +55,11 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::TextBox { name: "filename_textbox" @@ -78,9 +78,9 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "cancel_button" diff --git a/Userland/Libraries/LibGUI/FontPickerDialog.gml b/Userland/Libraries/LibGUI/FontPickerDialog.gml index 8f112aee2a..ebd4a1ba56 100644 --- a/Userland/Libraries/LibGUI/FontPickerDialog.gml +++ b/Userland/Libraries/LibGUI/FontPickerDialog.gml @@ -5,10 +5,10 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { text: "Family:" @@ -23,7 +23,7 @@ @GUI::Widget { fixed_width: 100 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { text: "Style:" @@ -38,7 +38,7 @@ @GUI::Widget { fixed_width: 80 - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { text: "Size:" @@ -57,10 +57,10 @@ } @GUI::GroupBox { - layout: @GUI::VerticalBoxLayout - + layout: @GUI::VerticalBoxLayout {} title: "Sample text" fixed_height: 80 + @GUI::Label { name: "sample_text_label" text: "The quick brown fox jumps over the lazy dog." @@ -69,9 +69,9 @@ @GUI::Widget { fixed_height: 22 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "ok_button" diff --git a/Userland/Libraries/LibGUI/PasswordInputDialog.gml b/Userland/Libraries/LibGUI/PasswordInputDialog.gml index d2c7adc998..7d32d977e8 100644 --- a/Userland/Libraries/LibGUI/PasswordInputDialog.gml +++ b/Userland/Libraries/LibGUI/PasswordInputDialog.gml @@ -7,7 +7,7 @@ @GUI::Widget { shrink_to_fit: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Label { name: "key_icon_label" @@ -17,11 +17,11 @@ } @GUI::Widget { - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Server:" @@ -38,7 +38,7 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Username:" @@ -55,7 +55,7 @@ @GUI::Widget { fixed_height: 24 - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} @GUI::Label { text: "Password:" @@ -68,7 +68,7 @@ } } - @GUI::Widget + @GUI::Widget {} @GUI::Widget { shrink_to_fit: true @@ -76,7 +76,7 @@ spacing: 6 } - @GUI::Widget + @GUI::Widget {} @GUI::Button { text: "OK" diff --git a/Userland/Services/LoginServer/LoginWindow.gml b/Userland/Services/LoginServer/LoginWindow.gml index 09b93b9c3f..7ddb731547 100644 --- a/Userland/Services/LoginServer/LoginWindow.gml +++ b/Userland/Services/LoginServer/LoginWindow.gml @@ -1,6 +1,6 @@ @GUI::Widget { fill_with_background_color: true - layout: @GUI::VerticalBoxLayout + layout: @GUI::VerticalBoxLayout {} @GUI::ImageWidget { name: "banner" @@ -23,9 +23,9 @@ } @GUI::Widget { - layout: @GUI::HorizontalBoxLayout + layout: @GUI::HorizontalBoxLayout {} - @GUI::Widget + @GUI::Widget {} @GUI::Button { name: "log_in" |