beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Meta+Userland: Run the GML formatter on CI and pre-commit

Browse source 
Now that the GML formatter is both perserving comments and also mostly
agrees to the existing GML style, it can be used to auto-format all the
GML files in the system. This commit does not only contain the scripts
for running the formatting on CI and the pre-commit hook, but also
initially formats all the existing GML files so that the hook is
successfull.
This commit is contained in:
kleines Filmröllchen 2022-02-05 14:31:48 +01:00 committed by Andreas Kling
parent 32de6dde4c
commit 6ee597369d
Notes: sideshowbarker 2024-07-18 04:38:32 +09:00 
Author: https://github.com/kleinesfilmroellchen
Commit: https://github.com/SerenityOS/serenity/commit/6ee597369d9
Pull-request: https://github.com/SerenityOS/serenity/pull/12281
Reviewed-by: https://github.com/ADKaster ✅
Reviewed-by: https://github.com/awesomekling
Reviewed-by: https://github.com/linusg
60 changed files with 221 additions and 552 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Meta/lint-ci.sh
View file

@ -28,6 +28,7 @@ for cmd in \
Meta/lint-executable-resources.sh \
Meta/lint-keymaps.py \
Meta/lint-shell-scripts.sh \
Meta/lint-gml-format.sh \
Meta/lint-prettier.sh \
Meta/lint-python.sh; do
echo "Running ${cmd}... "

21
Meta/lint-gml-format.sh Executable file
View file

@ -0,0 +1,21 @@
#!/usr/bin/env bash
set -e
script_path=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
cd "${script_path}/.." || exit 1
if [ -z "${GML_FORMAT:-}" ] ; then
if ! [ -d Build/lagom/ ] ; then
echo "Directory Build/lagom/ does not exist. Skipping GML formatting."
exit 0
fi
if ! [ -r Build/lagom/gml-format ] ; then
echo "Lagom executable gml-format was not built. Skipping GML formatting."
echo "To enable this check, you may need to run './Meta/serenity.sh build lagom' first."
exit 0
fi
GML_FORMAT="Build/lagom/gml-format"
fi
find AK Base Documentation Kernel Meta Ports Tests Userland -type f -name '*.gml' -print0 | xargs -0 "${GML_FORMAT}" -i

1
Userland/Applications/Browser/BrowserWindow.gml
View file

@ -1,7 +1,6 @@
@GUI::Widget {
name: "browser"
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout
@GUI::HorizontalSeparator {

18
Userland/Applications/Browser/EditBookmark.gml
View file

@ -2,17 +2,13 @@
fixed_width: 260
fixed_height: 85
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [4]
}
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Title:"
@ -27,9 +23,7 @@
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "URL:"
@ -42,15 +36,11 @@
}
}
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout
layout: @GUI::HorizontalBoxLayout {
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
name: "ok_button"

5
Userland/Applications/Browser/Tab.gml
View file

@ -5,7 +5,6 @@
@GUI::ToolbarContainer {
name: "toolbar_container"
@GUI::Toolbar {
name: "toolbar"
}
@ -13,8 +12,8 @@
@GUI::Widget {
name: "webview_container"
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
}
@GUI::Statusbar {

7
Userland/Applications/BrowserSettings/BrowserSettingsWidget.gml
View file

@ -1,6 +1,5 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [10]
spacing: 5
@ -9,7 +8,6 @@
@GUI::GroupBox {
title: "Homepage"
fixed_height: 70
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 2
@ -42,7 +40,6 @@
@GUI::GroupBox {
title: "Appearance"
fixed_height: 104
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 2
@ -89,7 +86,6 @@
@GUI::GroupBox {
title: "Search Engine"
fixed_height: 140
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 2
@ -118,7 +114,6 @@
}
name: "search_engine_combobox_group"
@GUI::Widget {
fixed_width: 32
}
@ -140,7 +135,6 @@
}
name: "custom_search_engine_group"
@GUI::Widget {
fixed_width: 32
}
@ -161,7 +155,6 @@
@GUI::GroupBox {
title: "Downloads"
fixed_height: 70
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 2

4
Userland/Applications/Calendar/CalendarWindow.gml
View file

@ -1,11 +1,9 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::ToolbarContainer {
name: "toolbar_container"
@GUI::Toolbar {
name: "toolbar"
}

10
Userland/Applications/CharacterMap/CharacterMapWindow.gml
View file

@ -1,8 +1,6 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::ToolbarContainer {
@GUI::Toolbar {
@ -12,7 +10,6 @@
}
name: "toolbar"
@GUI::Label {
text: "Font: "
autosize: true
@ -22,9 +19,7 @@
background_role: "Base"
fill_with_background_color: true
fixed_height: 20
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
name: "font_name"
@ -40,7 +35,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
spacing: 4
margins: [0, 2, 0, 2]

5
Userland/Applications/CharacterMap/CharacterSearchWindow.gml
View file

@ -1,13 +1,12 @@
@GUI::Frame {
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
fill_with_background_color: true
@GUI::Toolbar {
@GUI::TextBox {
name: "search_input"
}
@GUI::Button {
name: "search_button"
icon: "/res/icons/16x16/find.png"

2
Userland/Applications/ClockSettings/ClockSettingsWidget.gml
View file

@ -1,6 +1,5 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [10]
spacing: 5
@ -8,7 +7,6 @@
@GUI::GroupBox {
title: "Time Zone Settings"
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 16

6
Userland/Applications/CrashReporter/CrashReporterWindow.gml
View file

@ -1,13 +1,11 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [5]
}
@GUI::Widget {
fixed_height: 44
layout: @GUI::HorizontalBoxLayout {
spacing: 10
}
@ -24,7 +22,6 @@
@GUI::Widget {
fixed_height: 18
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
@ -41,7 +38,6 @@
@GUI::Widget {
fixed_height: 18
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
@ -58,7 +54,6 @@
@GUI::Widget {
fixed_height: 18
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
@ -85,7 +80,6 @@
@GUI::Widget {
fixed_height: 32
layout: @GUI::HorizontalBoxLayout
@GUI::Button {

5
Userland/Applications/DisplaySettings/BackgroundSettings.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [8]
}
@ -33,9 +32,7 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Button {
name: "wallpaper_open_button"

7
Userland/Applications/DisplaySettings/DesktopSettings.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [8]
}
@ -12,10 +11,8 @@
title: "Workspaces"
shrink_to_fit: true
@GUI::Widget {
fixed_height: 32
layout: @GUI::HorizontalBoxLayout {
margins: [6]
}
@ -47,9 +44,7 @@
@GUI::Widget {
fixed_height: 76
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_height: 32

14
Userland/Applications/DisplaySettings/FontSettings.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [8]
spacing: 8
@ -8,7 +7,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
spacing: 6
}
@ -22,9 +20,7 @@
@GUI::Frame {
background_role: "Base"
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
name: "default_font_label"
@ -40,7 +36,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
spacing: 6
}
@ -54,9 +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"
@ -70,6 +63,5 @@
}
}
@GUI::Widget {
}
@GUI::Widget
}

10
Userland/Applications/DisplaySettings/MonitorSettings.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [8]
}
@ -38,12 +37,9 @@
}
title: "Screen settings"
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Resolution:"
@ -69,9 +65,7 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Display scale:"

7
Userland/Applications/FileManager/FileManagerWindow.gml
View file

@ -9,10 +9,10 @@
@GUI::Toolbar {
name: "main_toolbar"
}
@GUI::Toolbar {
name: "location_toolbar"
visible: false
@GUI::Label {
text: "Location: "
autosize: true
@ -23,9 +23,9 @@
fixed_height: 22
}
}
@GUI::Toolbar {
name: "breadcrumb_toolbar"
@GUI::Label {
text: "Location: "
autosize: true
@ -40,17 +40,14 @@
@GUI::HorizontalSplitter {
name: "splitter"
first_resizee_minimum_size: 80
@GUI::TreeView {
name: "tree_view"
fixed_width: 175
}
}
@GUI::Statusbar {
name: "statusbar"
@GUI::Progressbar {
name: "progressbar"
text: "Generating thumbnails: "

19
Userland/Applications/FileManager/FileOperationProgress.gml
View file

@ -1,15 +1,12 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [4]
}
@GUI::Widget {
fixed_height: 32
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::ImageWidget {
name: "source_folder_icon"
@ -38,9 +35,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Copying: "
@ -59,9 +54,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Time left: "
@ -89,11 +82,9 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
text: "Cancel"

18
Userland/Applications/FileManager/PropertiesWindowGeneralTab.gml
View file

@ -6,7 +6,6 @@
@GUI::Widget {
fixed_height: 34
layout: @GUI::HorizontalBoxLayout {
spacing: 20
}
@ -23,12 +22,10 @@
}
}
@GUI::HorizontalSeparator {
}
@GUI::HorizontalSeparator
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -48,7 +45,6 @@
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -69,7 +65,6 @@
@GUI::Widget {
name: "link_location_widget"
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -89,7 +84,6 @@
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -109,7 +103,6 @@
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -129,7 +122,6 @@
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -149,7 +141,6 @@
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -169,7 +160,6 @@
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -187,12 +177,10 @@
}
}
@GUI::HorizontalSeparator {
}
@GUI::HorizontalSeparator
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -221,7 +209,6 @@
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}
@ -250,7 +237,6 @@
@GUI::Widget {
fixed_height: 14
layout: @GUI::HorizontalBoxLayout {
spacing: 12
}

54
Userland/Applications/FontEditor/FontEditorWindow.gml
View file

@ -1,40 +1,32 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
spacing: 2
}
@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"
@ -49,7 +41,6 @@
@GUI::ToolbarContainer {
name: "glyph_toolbar_container"
@GUI::Toolbar {
name: "glyph_mode_toolbar"
}
@ -62,32 +53,27 @@
@GUI::Widget {
name: "right_column_container"
layout: @GUI::VerticalBoxLayout {
spacing: 6
}
@GUI::Widget {
name: "glyph_map_container"
layout: @GUI::VerticalBoxLayout
layout: @GUI::VerticalBoxLayout {
}
}
@GUI::GroupBox {
name: "font_metadata_groupbox"
title: "Metadata"
shrink_to_fit: true
layout: @GUI::VerticalBoxLayout {
margins: [6, 6, 6, 6]
}
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
name: "name_label"
@ -103,9 +89,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
name: "family_label"
@ -121,9 +105,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
name: "weight_label"
@ -140,9 +122,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
name: "slope_label"
@ -159,9 +139,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
name: "presentation_label"
@ -179,9 +157,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
name: "mean_line_label"
@ -198,9 +174,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
name: "baseline_label"
@ -217,9 +191,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
name: "spacing_label"

18
Userland/Applications/FontEditor/NewFontDialogPage1.gml
View file

@ -5,12 +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
@ -24,8 +22,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_width: 100
@ -43,8 +40,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Weight:"
@ -60,8 +56,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_width: 100
@ -77,8 +72,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_width: 100

31
Userland/Applications/FontEditor/NewFontDialogPage2.gml
View file

@ -4,8 +4,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::GroupBox {
title: "Metadata"
@ -15,8 +14,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_width: 80
@ -31,8 +29,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_width: 80
@ -47,8 +44,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_width: 80
@ -63,8 +59,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_width: 80
@ -83,8 +78,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
fixed_width: 80
@ -101,8 +95,7 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Widget {
fixed_width: 80
@ -117,21 +110,19 @@
}
@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
}
}
}

5
Userland/Applications/HexEditor/FindDialog.gml
View file

@ -3,7 +3,6 @@
fixed_width: 280
fixed_height: 146
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
spacing: 2
margins: [4]
@ -11,8 +10,8 @@
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout
fixed_height: 22
fixed_height: 22
@GUI::Label {
text: "Value to find"
fixed_width: 80
@ -32,8 +31,8 @@
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout
fixed_height: 22
fixed_height: 22
@GUI::Button {
name: "find_button"
text: "Find"

1
Userland/Applications/HexEditor/GoToOffsetDialog.gml
View file

@ -3,7 +3,6 @@
fixed_width: 300
fixed_height: 80
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
spacing: 2
margins: [0]

6
Userland/Applications/HexEditor/HexEditorWindow.gml
View file

@ -1,14 +1,12 @@
@GUI::Widget {
name: "main"
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
spacing: 2
}
@GUI::ToolbarContainer {
name: "toolbar_container"
@GUI::Toolbar {
name: "toolbar"
}
@ -22,9 +20,7 @@
@GUI::Widget {
name: "search_results_container"
visible: false
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::TableView {
name: "search_results"

12
Userland/Applications/KeyboardSettings/Keyboard.gml
View file

@ -1,6 +1,5 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [10]
spacing: 5
@ -9,7 +8,6 @@
@GUI::GroupBox {
title: "Mapping"
fixed_height: 150
layout: @GUI::HorizontalBoxLayout {
margins: [16, 8, 8]
spacing: 16
@ -17,8 +15,7 @@
@GUI::Widget {
fixed_width: 32
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
fixed_width: 32
@ -38,7 +35,6 @@
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout {
spacing: 4
}
@ -59,7 +55,6 @@
@GUI::GroupBox {
title: "Test input"
layout: @GUI::HorizontalBoxLayout {
margins: [16, 8, 8]
spacing: 16
@ -67,8 +62,7 @@
@GUI::Widget {
fixed_width: 32
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
fixed_width: 32
@ -84,7 +78,6 @@
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout {
spacing: 16
}
@ -110,7 +103,6 @@
@GUI::GroupBox {
title: "Num Lock"
fixed_height: 60
layout: @GUI::HorizontalBoxLayout {
margins: [16, 8, 8]
spacing: 16

8
Userland/Applications/KeyboardSettings/KeymapDialog.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [4]
}
@ -11,12 +10,9 @@
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout
layout: @GUI::HorizontalBoxLayout {
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
name: "ok_button"

1
Userland/Applications/Mail/MailWindow.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
spacing: 2
}

3
Userland/Applications/MailSettings/MailSettingsWidget.gml
View file

@ -1,6 +1,5 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [10]
spacing: 5
@ -9,7 +8,6 @@
@GUI::GroupBox {
title: "Server Settings"
fixed_height: 170
layout: @GUI::VerticalBoxLayout {
margins: [6]
spacing: 2
@ -93,7 +91,6 @@
@GUI::GroupBox {
title: "User Settings"
fixed_height: 110
layout: @GUI::VerticalBoxLayout {
margins: [6]
spacing: 2

8
Userland/Applications/MouseSettings/Mouse.gml
View file

@ -1,6 +1,5 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [10]
spacing: 5
@ -9,7 +8,6 @@
@GUI::GroupBox {
title: "Cursor speed"
fixed_height: 106
layout: @GUI::VerticalBoxLayout {
margins: [6]
spacing: 2
@ -58,7 +56,6 @@
@GUI::GroupBox {
title: "Scroll wheel step size"
fixed_height: 106
layout: @GUI::VerticalBoxLayout {
margins: [6]
spacing: 2
@ -104,15 +101,13 @@
fixed_width: 100
}
@GUI::Widget {
}
@GUI::Widget
}
}
@GUI::GroupBox {
title: "Double-click speed"
fixed_height: 106
layout: @GUI::VerticalBoxLayout {
margins: [6]
spacing: 2
@ -162,7 +157,6 @@
@GUI::GroupBox {
title: "Button configuration"
fixed_height: 68
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 2

3
Userland/Applications/MouseSettings/Theme.gml
View file

@ -1,13 +1,11 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [10]
}
@GUI::GroupBox {
title: "Available Cursor Themes"
layout: @GUI::VerticalBoxLayout {
margins: [6]
spacing: 4
@ -15,7 +13,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
spacing: 8
}

12
Userland/Applications/PixelPaint/EditGuideDialog.gml
View file

@ -1,8 +1,6 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Widget {
layout: @GUI::VerticalBoxLayout {
@ -12,7 +10,6 @@
@GUI::GroupBox {
title: "Orientation"
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
margins: [10, 8, 8]
}
@ -33,8 +30,8 @@
layout: @GUI::HorizontalBoxLayout {
margins: [4]
}
shrink_to_fit: true
shrink_to_fit: true
@GUI::Label {
text: "Offset"
text_alignment: "CenterLeft"
@ -45,16 +42,13 @@
}
}
@GUI::Widget {
max_height: 24
layout: @GUI::HorizontalBoxLayout {
margins: [4]
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
name: "ok_button"

19
Userland/Applications/PixelPaint/FilterGallery.gml
View file

@ -1,15 +1,12 @@
@GUI::Frame {
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
fill_with_background_color: true
@GUI::Widget {
layout:@GUI::HorizontalBoxLayout {
layout: @GUI::HorizontalBoxLayout {
margins: [4]
}
@GUI::TreeView {
name: "tree_view"
fixed_width: 200
@ -17,22 +14,20 @@
@GUI::Widget {
name: "config_widget"
layout:@GUI::VerticalBoxLayout {
layout: @GUI::VerticalBoxLayout {
margins: [4]
}
}
}
}
@GUI::Widget {
max_height: 24
layout:@GUI::HorizontalBoxLayout {
layout: @GUI::HorizontalBoxLayout {
margins: [4]
}
@GUI::Widget {}
@GUI::Widget
@GUI::Button {
name: "apply_button"

7
Userland/Applications/PixelPaint/PixelPaintWindow.gml
View file

@ -1,14 +1,12 @@
@GUI::Widget {
name: "main"
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
spacing: 2
}
@GUI::ToolbarContainer {
name: "toolbar_container"
@GUI::Toolbar {
name: "toolbar"
}
@ -21,7 +19,6 @@
@GUI::ToolbarContainer {
name: "toolbar_container"
@PixelPaint::ToolboxWidget {
name: "toolbox"
}
@ -44,9 +41,7 @@
@GUI::Widget {
fill_with_background_color: true
fixed_width: 200
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::GroupBox {
title: "Layers"

3
Userland/Applications/Run/Run.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [4]
}
@ -40,8 +39,8 @@
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout
fixed_height: 22
fixed_height: 22
// HACK: using an empty widget as a spacer
@GUI::Widget

2
Userland/Applications/Spreadsheet/CondFormatting.gml
View file

@ -1,7 +1,6 @@
@GUI::Widget {
name: "main"
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [4]
spacing: 4
@ -13,7 +12,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout {
spacing: 10
}

3
Userland/Applications/Spreadsheet/CondView.gml
View file

@ -3,7 +3,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
@ -21,7 +20,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
@ -36,7 +34,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::HorizontalBoxLayout
@GUI::Label {

32
Userland/Applications/Spreadsheet/csv_export.gml
View file

@ -6,17 +6,13 @@
@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"
layout: @GUI::VerticalBoxLayout {
margins: [10, 8, 8]
}
@ -47,9 +43,7 @@
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::RadioButton {
name: "delimiter_other_radio"
@ -66,7 +60,6 @@
@GUI::GroupBox {
title: "Quote"
layout: @GUI::VerticalBoxLayout {
margins: [10, 8, 8]
}
@ -85,9 +78,7 @@
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::RadioButton {
name: "quote_other_radio"
@ -101,14 +92,11 @@
}
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Escape by "
@ -121,16 +109,13 @@
}
}
@GUI::Widget {
}
@GUI::Widget
}
}
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::CheckBox {
name: "export_header_check_box"
@ -147,7 +132,6 @@
@GUI::GroupBox {
title: "Data Preview"
fixed_width: 150
layout: @GUI::VerticalBoxLayout {
margins: [10, 8, 8]
}

34
Userland/Applications/Spreadsheet/csv_import.gml
View file

@ -6,17 +6,13 @@
@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"
layout: @GUI::VerticalBoxLayout {
margins: [10, 8, 8]
}
@ -47,9 +43,7 @@
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::RadioButton {
name: "delimiter_other_radio"
@ -66,7 +60,6 @@
@GUI::GroupBox {
title: "Quote"
layout: @GUI::VerticalBoxLayout {
margins: [10, 8, 8]
}
@ -85,9 +78,7 @@
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::RadioButton {
name: "quote_other_radio"
@ -101,14 +92,11 @@
}
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Escape by "
@ -121,22 +109,19 @@
}
}
@GUI::Widget {
}
@GUI::Widget
}
}
@GUI::GroupBox {
title: "Trim Field Spaces"
fixed_height: 40
layout: @GUI::VerticalBoxLayout {
margins: [4, 4, 0]
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::CheckBox {
name: "trim_leading_field_spaces_check_box"
@ -160,17 +145,16 @@
@GUI::GroupBox {
title: "Data Preview"
fixed_width: 150
layout: @GUI::VerticalBoxLayout {
margins: [10, 8, 8]
}
@GUI::StackWidget {
name: "data_preview_widget"
@GUI::TableView {
name: "data_preview_table_view"
}
@GUI::Label {
name: "data_preview_error_label"
word_wrap: true

8
Userland/Applications/Spreadsheet/select_format_page.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
name: "select_format"
layout: @GUI::VerticalBoxLayout {
margins: [20]
}
@ -13,9 +12,7 @@
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Type: "
@ -28,6 +25,5 @@
}
}
@GUI::Widget {
}
@GUI::Widget
}

6
Userland/Applications/TerminalSettings/TerminalSettingsMain.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [10]
spacing: 5
@ -10,7 +9,6 @@
title: "Bell Mode"
shrink_to_fit: false
fixed_height: 160
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 16
@ -23,7 +21,6 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::VerticalBoxLayout {
spacing: 4
}
@ -48,12 +45,11 @@
@GUI::GroupBox {
title: "Scrollback Size (Lines)"
shrink_to_fit: true
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
}
@GUI::CheckBox {
@GUI::CheckBox {
name: "terminal_show_scrollbar"
text: "Show scrollbar"
}

9
Userland/Applications/TerminalSettings/TerminalSettingsView.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [10]
spacing: 5
@ -9,7 +8,6 @@
@GUI::GroupBox {
title: "Background Opacity"
fixed_height: 70
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 16
@ -26,7 +24,6 @@
@GUI::GroupBox {
title: "Terminal Font"
fixed_height: 100
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 16
@ -40,7 +37,6 @@
@GUI::Widget {
shrink_to_fit: true
name: "terminal_font_selection"
layout: @GUI::HorizontalBoxLayout {
spacing: 6
}
@ -48,9 +44,7 @@
@GUI::Frame {
background_role: "Base"
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
name: "terminal_font_label"
@ -68,7 +62,6 @@
@GUI::GroupBox {
title: "Color Scheme"
fixed_height: 70
layout: @GUI::VerticalBoxLayout {
margins: [16, 8, 8]
spacing: 16

8
Userland/Applications/TextEditor/TextEditorWindow.gml
View file

@ -1,14 +1,12 @@
@GUI::Widget {
name: "main"
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
spacing: 2
}
@GUI::ToolbarContainer {
name: "toolbar_container"
@GUI::Toolbar {
name: "toolbar"
}
@ -22,9 +20,8 @@
@GUI::Widget {
name: "web_view_container"
visible: false
layout: @GUI::VerticalBoxLayout
layout: @GUI::VerticalBoxLayout {
}
}
}
@ -33,7 +30,6 @@
visible: false
fill_with_background_color: true
fixed_height: 56
layout: @GUI::VerticalBoxLayout {
spacing: 2
margins: [3]
@ -43,7 +39,6 @@
name: "find_widget"
fill_with_background_color: true
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
spacing: 4
}
@ -79,7 +74,6 @@
name: "replace_widget"
fill_with_background_color: true
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
spacing: 4
}

16
Userland/Applications/ThemeEditor/ThemeEditor.gml
View file

@ -1,9 +1,10 @@
@GUI::Widget {
layout: @GUI::VerticalBoxLayout
fill_with_background_color: true
fill_with_background_color: true
@GUI::Frame {
layout: @GUI::HorizontalBoxLayout
name: "preview_frame"
}
@ -11,9 +12,9 @@
layout: @GUI::HorizontalBoxLayout {
margins: [4, 4, 4, 4]
}
shrink_to_fit: true
title: "Colors"
@GUI::ComboBox {
name: "color_combo_box"
model_only: true
@ -29,9 +30,9 @@
layout: @GUI::HorizontalBoxLayout {
margins: [4, 4, 4, 4]
}
shrink_to_fit: true
title: "Alignments"
@GUI::ComboBox {
name: "alignment_combo_box"
model_only: true
@ -47,17 +48,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 +69,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 +87,9 @@
layout: @GUI::HorizontalBoxLayout {
margins: [4, 4, 4, 4]
}
shrink_to_fit: true
title: "Paths"
@GUI::ComboBox {
name: "path_combo_box"
model_only: true

5
Userland/Applications/Welcome/WelcomeWindow.gml
View file

@ -99,10 +99,9 @@
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::CheckBox{
@GUI::CheckBox {
name: "startup_checkbox"
text: "Show Welcome the next time SerenityOS starts"
autosize: true

5
Userland/Demos/ModelGallery/BasicModelTab.gml
View file

@ -7,7 +7,6 @@
@GUI::Label {
text: "Here is a basic model, displayed on a table widget. Its clients are updated via granular updates. You can add or remove items with the widgets below."
text_alignment: "CenterLeft"
thickness: 2
fixed_height: 34
}
@ -17,11 +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..."

1
Userland/Demos/WidgetGallery/DemoWizardPage1.gml
View file

@ -11,7 +11,6 @@
@GUI::Widget {
fixed_height: 25
layout: @GUI::HorizontalBoxLayout
@GUI::Label {

131
Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml
View file

@ -11,8 +11,7 @@
}
@GUI::HorizontalSplitter {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Frame {
name: "label_frame"
@ -49,13 +48,11 @@
}
}
@GUI::HorizontalSeparator {
}
@GUI::HorizontalSeparator
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::ComboBox {
name: "frame_shape_combobox"
@ -67,8 +64,7 @@
enabled: false
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::SpinBox {
name: "thickness_spinbox"
@ -89,15 +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"
@ -110,19 +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"
@ -137,29 +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"
@ -172,20 +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"
@ -198,39 +177,31 @@
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"
text: "Icon button"
}
@GUI::Button {
name: "disabled_icon_button"
text: "Disabled"
enabled: "false"
}
@GUI::Widget {
}
@GUI::Widget
}
}
}
@ -242,12 +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"
@ -260,12 +229,10 @@
}
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::Widget {
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::TextBox {
text: "Read only"
@ -279,29 +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"
@ -314,8 +276,7 @@
}
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
name: "font_button"
@ -332,22 +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"
@ -360,12 +317,10 @@
}
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Button {
name: "msgbox_button"

40
Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml
View file

@ -12,7 +12,6 @@
@GUI::GroupBox {
max_height: 30
layout: @GUI::HorizontalBoxLayout {
margins: [8]
}
@ -22,8 +21,7 @@
tooltip: "Opacity Slider"
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::ValueSlider {
name: "opacity_value_slider"
@ -34,8 +32,7 @@
}
}
@GUI::HorizontalSeparator {
}
@GUI::HorizontalSeparator
@GUI::Frame {
shape: "Panel"
@ -59,8 +56,7 @@
margins: [0, 8]
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Scrollbar {
name: "enabled_scrollbar"
@ -71,14 +67,11 @@
value: 50
}
@GUI::Widget {
}
@GUI::Widget
@GUI::HorizontalSeparator {
}
@GUI::HorizontalSeparator
@GUI::Widget {
}
@GUI::Widget
@GUI::Scrollbar {
name: "disabled_scrollbar"
@ -86,8 +79,7 @@
fixed_width: -1
}
@GUI::Widget {
}
@GUI::Widget
}
@GUI::GroupBox {
@ -109,8 +101,7 @@
tooltip: "Fixed"
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::VerticalSlider {
enabled: false
@ -120,8 +111,7 @@
value: 5
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::VerticalProgressbar {
name: "vertical_progressbar_right"
@ -144,8 +134,7 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::HorizontalSlider {
name: "horizontal_slider_left"
@ -155,8 +144,7 @@
value: 0
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::HorizontalSlider {
enabled: false
@ -165,8 +153,7 @@
value: 5
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::HorizontalSlider {
name: "horizontal_slider_right"
@ -177,8 +164,7 @@
}
}
@GUI::HorizontalSeparator {
}
@GUI::HorizontalSeparator
@GUI::HorizontalProgressbar {
name: "horizontal_progressbar"

3
Userland/Demos/WidgetGallery/GalleryGML/WizardsTab.gml
View file

@ -14,8 +14,7 @@
text: "Start wizard"
}
@GUI::HorizontalSeparator {
}
@GUI::HorizontalSeparator
@GUI::TextEditor {
name: "wizard_output"

3
Userland/DevTools/HackStudio/Dialogs/Git/GitCommitDialog.gml
View file

@ -1,6 +1,5 @@
@GUI::Frame {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
spacing: 4
margins: [4, 4, 4, 4]
@ -18,8 +17,8 @@
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout
shrink_to_fit: true
shrink_to_fit: true
@GUI::Label {
name: "line_and_col_label"
text: "Line: 1, Col: 0"

23
Userland/DevTools/HackStudio/Dialogs/NewProjectDialog.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [4]
}
@ -12,8 +11,7 @@
}
@GUI::Widget {
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
name: "icon_view_container"
}
@ -28,11 +26,9 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
max_height: 24
@GUI::Label {
text: "Name:"
text_alignment: "CenterLeft"
@ -45,11 +41,9 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
max_height: 24
@GUI::Label {
text: "Create in:"
text_alignment: "CenterLeft"
@ -69,11 +63,9 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
max_height: 24
@GUI::Label {
text: "Full path:"
text_alignment: "CenterLeft"
@ -92,13 +84,10 @@
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
max_height: 24
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
name: "ok_button"

14
Userland/Games/GameOfLife/GameOfLife.gml
View file

@ -1,12 +1,9 @@
@GUI::Widget {
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::ToolbarContainer {
@GUI::Toolbar {
name: "toolbar"
@GUI::Label {
text: "Columns: "
autosize: true
@ -19,8 +16,7 @@
fixed_width: 40
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::Label {
text: "Rows: "
@ -34,8 +30,7 @@
fixed_width: 40
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::Label {
text: "Update Speed: "
@ -54,8 +49,7 @@
autosize: true
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
}
}

4
Userland/Games/Hearts/Hearts.gml
View file

@ -1,8 +1,6 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@Hearts::Game {
name: "game"

17
Userland/Games/Minesweeper/MinesweeperCustomGameWindow.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [4]
}
@ -8,7 +7,6 @@
@GUI::GroupBox {
title: "Field"
autosize: true
layout: @GUI::HorizontalBoxLayout {
margins: [16, 6, 6]
}
@ -25,9 +23,8 @@
fixed_width: 40
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::Label {
text: "Rows: "
autosize: true
@ -40,8 +37,7 @@
fixed_width: 40
}
@GUI::VerticalSeparator {
}
@GUI::VerticalSeparator
@GUI::Label {
text: "Mines: "
@ -58,12 +54,9 @@
@GUI::Widget {
max_height: 24
layout: @GUI::HorizontalBoxLayout
layout: @GUI::HorizontalBoxLayout {
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
name: "ok_button"

4
Userland/Games/Solitaire/Solitaire.gml
View file

@ -1,8 +1,6 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@Solitaire::Game {
name: "game"

4
Userland/Games/Spider/Spider.gml
View file

@ -1,8 +1,6 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@Spider::Game {
name: "game"

1
Userland/Libraries/LibGUI/FilePickerDialog.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::HorizontalBoxLayout {
margins: [4]
spacing: 3

25
Userland/Libraries/LibGUI/FontPickerDialog.gml
View file

@ -1,17 +1,14 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [4, 4, 4, 4]
}
@GUI::Widget {
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Widget {
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
text: "Family:"
@ -26,9 +23,7 @@
@GUI::Widget {
fixed_width: 100
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
text: "Style:"
@ -43,9 +38,7 @@
@GUI::Widget {
fixed_width: 80
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
text: "Size:"
@ -64,12 +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."
@ -78,11 +69,9 @@
@GUI::Widget {
fixed_height: 22
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
name: "ok_button"

23
Userland/Libraries/LibGUI/PasswordInputDialog.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::HorizontalBoxLayout {
margins: [8]
spacing: 8
@ -8,9 +7,7 @@
@GUI::Widget {
shrink_to_fit: true
layout: @GUI::VerticalBoxLayout {
}
layout: @GUI::VerticalBoxLayout
@GUI::Label {
name: "key_icon_label"
@ -20,14 +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:"
@ -44,9 +38,7 @@
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Username:"
@ -63,9 +55,7 @@
@GUI::Widget {
fixed_height: 24
layout: @GUI::HorizontalBoxLayout {
}
layout: @GUI::HorizontalBoxLayout
@GUI::Label {
text: "Password:"
@ -86,8 +76,7 @@
spacing: 6
}
@GUI::Widget {
}
@GUI::Widget
@GUI::Button {
text: "OK"

1
Userland/Services/LoginServer/LoginWindow.gml
View file

@ -1,6 +1,5 @@
@GUI::Widget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout
@GUI::ImageWidget {