From a2baab38fd58e18f690e2256b0a5081580c05968 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 13 Apr 2021 16:18:20 +0200 Subject: [PATCH] Everywhere: It's now "Foobar", not "FooBar", and not "foo bar" I hereby declare these to be full nouns that we don't split, neither by space, nor by underscore: - Breadcrumbbar - Coolbar - Menubar - Progressbar - Scrollbar - Statusbar - Taskbar - Toolbar This patch makes everything consistent by replacing every other variant of these with the proper one. :^) --- Base/home/anon/Source/little/test.frm | 2 +- .../Browser/BookmarksBarWidget.cpp | 4 +- .../Applications/Browser/DownloadWidget.cpp | 14 ++-- .../Applications/Browser/DownloadWidget.h | 4 +- Userland/Applications/Browser/Tab.cpp | 18 +++--- Userland/Applications/Browser/Tab.gml | 6 +- Userland/Applications/Browser/Tab.h | 6 +- Userland/Applications/Calculator/main.cpp | 4 +- .../Applications/Calendar/CalendarWindow.gml | 4 +- Userland/Applications/Calendar/main.cpp | 10 +-- .../DisplaySettings/DisplaySettingsWindow.gml | 2 +- .../Applications/DisplaySettings/main.cpp | 4 +- .../FileManager/FileManagerWindow.gml | 16 ++--- .../FileManager/FileOperationProgress.gml | 8 +-- .../FileOperationProgressWidget.cpp | 14 ++-- Userland/Applications/FileManager/main.cpp | 64 +++++++++---------- .../Applications/FontEditor/FontEditor.cpp | 14 ++-- Userland/Applications/FontEditor/FontEditor.h | 2 +- .../FontEditor/FontEditorWindow.gml | 8 +-- Userland/Applications/FontEditor/main.cpp | 4 +- Userland/Applications/Help/main.cpp | 12 ++-- Userland/Applications/HexEditor/HexEditor.cpp | 2 +- .../HexEditor/HexEditorWidget.cpp | 10 +-- .../Applications/HexEditor/HexEditorWidget.h | 4 +- Userland/Applications/HexEditor/main.cpp | 4 +- .../Applications/IRCClient/IRCAppWindow.cpp | 12 ++-- Userland/Applications/KeyboardMapper/main.cpp | 4 +- .../Applications/KeyboardSettings/main.cpp | 4 +- Userland/Applications/MouseSettings/main.cpp | 4 +- Userland/Applications/Piano/RollWidget.cpp | 2 +- Userland/Applications/Piano/main.cpp | 4 +- Userland/Applications/PixelPaint/main.cpp | 4 +- Userland/Applications/QuickShow/main.cpp | 12 ++-- .../SoundPlayerWidgetAdvancedView.cpp | 8 +-- Userland/Applications/SoundPlayer/main.cpp | 4 +- .../SpaceAnalyzer/SpaceAnalyzer.gml | 10 +-- Userland/Applications/SpaceAnalyzer/main.cpp | 14 ++-- .../Spreadsheet/SpreadsheetView.cpp | 2 +- Userland/Applications/Spreadsheet/main.cpp | 4 +- Userland/Applications/SystemMonitor/main.cpp | 20 +++--- Userland/Applications/Terminal/main.cpp | 4 +- .../TextEditor/TextEditorWidget.cpp | 20 +++--- .../TextEditor/TextEditorWidget.h | 8 +-- .../TextEditor/TextEditorWindow.gml | 6 +- Userland/Applications/TextEditor/main.cpp | 4 +- .../ThemeEditor/PreviewWidget.cpp | 6 +- Userland/Demos/CatDog/main.cpp | 4 +- Userland/Demos/Cube/Cube.cpp | 4 +- Userland/Demos/Eyes/main.cpp | 4 +- Userland/Demos/Mouse/main.cpp | 4 +- .../Demos/WidgetGallery/DemoWizardDialog.cpp | 4 +- .../Demos/WidgetGallery/DemoWizardDialog.h | 4 +- .../Demos/WidgetGallery/DemoWizardPage2.gml | 4 +- .../WidgetGallery/GalleryGML/BasicsTab.gml | 6 +- .../WidgetGallery/GalleryGML/SlidersTab.gml | 10 +-- .../Demos/WidgetGallery/GalleryWidget.cpp | 10 +-- Userland/Demos/WidgetGallery/GalleryWidget.h | 12 ++-- Userland/Demos/WidgetGallery/main.cpp | 4 +- .../HackStudio/Debugger/DebugInfoWidget.cpp | 4 +- .../HackStudio/Debugger/DebugInfoWidget.h | 6 +- Userland/DevTools/HackStudio/Editor.cpp | 2 +- .../DevTools/HackStudio/Git/DiffViewer.cpp | 2 +- .../DevTools/HackStudio/Git/GitFilesView.cpp | 2 +- .../DevTools/HackStudio/HackStudioWidget.cpp | 26 ++++---- .../DevTools/HackStudio/HackStudioWidget.h | 16 ++--- Userland/DevTools/HackStudio/main.cpp | 4 +- Userland/DevTools/Inspector/main.cpp | 4 +- Userland/DevTools/Playground/main.cpp | 4 +- Userland/DevTools/Profiler/main.cpp | 4 +- Userland/Games/2048/main.cpp | 8 +-- Userland/Games/Breakout/main.cpp | 4 +- Userland/Games/Chess/main.cpp | 4 +- Userland/Games/Conway/main.cpp | 4 +- Userland/Games/Minesweeper/main.cpp | 6 +- Userland/Games/Pong/main.cpp | 4 +- Userland/Games/Snake/main.cpp | 4 +- Userland/Games/Solitaire/main.cpp | 4 +- .../Libraries/LibGUI/AbstractTableView.cpp | 2 +- Userland/Libraries/LibGUI/AbstractView.cpp | 2 +- Userland/Libraries/LibGUI/Application.cpp | 2 +- .../{BreadcrumbBar.cpp => Breadcrumbbar.cpp} | 18 +++--- .../{BreadcrumbBar.h => Breadcrumbbar.h} | 8 +-- Userland/Libraries/LibGUI/Button.cpp | 4 +- Userland/Libraries/LibGUI/CMakeLists.txt | 14 ++-- Userland/Libraries/LibGUI/ColumnsView.cpp | 2 +- Userland/Libraries/LibGUI/ComboBox.cpp | 2 +- .../Libraries/LibGUI/EmojiInputDialog.cpp | 2 +- Userland/Libraries/LibGUI/FilePicker.cpp | 4 +- .../Libraries/LibGUI/FilePickerDialog.gml | 2 +- Userland/Libraries/LibGUI/FontPicker.cpp | 2 +- Userland/Libraries/LibGUI/Forward.h | 10 +-- Userland/Libraries/LibGUI/IconView.cpp | 2 +- Userland/Libraries/LibGUI/ListView.cpp | 2 +- Userland/Libraries/LibGUI/Menu.h | 2 +- .../LibGUI/{MenuBar.cpp => Menubar.cpp} | 16 ++--- .../Libraries/LibGUI/{MenuBar.h => Menubar.h} | 8 +-- .../{ProgressBar.cpp => Progressbar.cpp} | 22 +++---- .../LibGUI/{ProgressBar.h => Progressbar.h} | 28 ++++---- .../Libraries/LibGUI/ScrollableWidget.cpp | 6 +- Userland/Libraries/LibGUI/ScrollableWidget.h | 24 +++---- .../LibGUI/{ScrollBar.cpp => Scrollbar.cpp} | 50 +++++++-------- .../LibGUI/{ScrollBar.h => Scrollbar.h} | 8 +-- .../LibGUI/{StatusBar.cpp => Statusbar.cpp} | 22 +++---- .../LibGUI/{StatusBar.h => Statusbar.h} | 8 +-- Userland/Libraries/LibGUI/TableView.cpp | 2 +- Userland/Libraries/LibGUI/TextEditor.cpp | 2 +- .../LibGUI/{ToolBar.cpp => Toolbar.cpp} | 26 ++++---- .../Libraries/LibGUI/{ToolBar.h => Toolbar.h} | 8 +-- ...lBarContainer.cpp => ToolbarContainer.cpp} | 8 +-- ...{ToolBarContainer.h => ToolbarContainer.h} | 8 +-- Userland/Libraries/LibGUI/TreeView.cpp | 2 +- Userland/Libraries/LibGUI/Window.cpp | 4 +- Userland/Libraries/LibGUI/Window.h | 4 +- .../Libraries/LibGfx/ClassicStylePainter.cpp | 10 +-- .../Libraries/LibGfx/ClassicStylePainter.h | 2 +- Userland/Libraries/LibGfx/Palette.h | 2 +- Userland/Libraries/LibGfx/StylePainter.cpp | 4 +- Userland/Libraries/LibGfx/StylePainter.h | 6 +- Userland/Libraries/LibGfx/SystemTheme.cpp | 2 +- Userland/Libraries/LibGfx/SystemTheme.h | 2 +- Userland/Libraries/LibVT/TerminalWidget.cpp | 4 +- Userland/Libraries/LibVT/TerminalWidget.h | 2 +- .../Libraries/LibWeb/InProcessWebView.cpp | 2 +- .../Libraries/LibWeb/OutOfProcessWebView.cpp | 2 +- Userland/Services/Taskbar/ClockWidget.cpp | 10 +-- Userland/Services/Taskbar/TaskbarButton.cpp | 4 +- Userland/Services/Taskbar/TaskbarWindow.cpp | 2 +- Userland/Services/WindowServer/CMakeLists.txt | 2 +- .../WindowServer/ClientConnection.cpp | 6 +- .../Services/WindowServer/ClientConnection.h | 4 +- Userland/Services/WindowServer/Menu.h | 2 +- Userland/Services/WindowServer/MenuManager.h | 2 +- .../WindowServer/{MenuBar.cpp => Menubar.cpp} | 8 +-- .../WindowServer/{MenuBar.h => Menubar.h} | 12 ++-- Userland/Services/WindowServer/Window.cpp | 2 +- Userland/Services/WindowServer/Window.h | 10 +-- .../Services/WindowServer/WindowFrame.cpp | 10 +-- .../Services/WindowServer/WindowManager.cpp | 2 +- .../Services/WindowServer/WindowManager.h | 2 +- .../Services/WindowServer/WindowSwitcher.cpp | 2 +- Userland/Utilities/html.cpp | 4 +- 141 files changed, 518 insertions(+), 518 deletions(-) rename Userland/Libraries/LibGUI/{BreadcrumbBar.cpp => Breadcrumbbar.cpp} (90%) rename Userland/Libraries/LibGUI/{BreadcrumbBar.h => Breadcrumbbar.h} (94%) rename Userland/Libraries/LibGUI/{MenuBar.cpp => Menubar.cpp} (89%) rename Userland/Libraries/LibGUI/{MenuBar.h => Menubar.h} (95%) rename Userland/Libraries/LibGUI/{ProgressBar.cpp => Progressbar.cpp} (84%) rename Userland/Libraries/LibGUI/{ProgressBar.h => Progressbar.h} (81%) rename Userland/Libraries/LibGUI/{ScrollBar.cpp => Scrollbar.cpp} (91%) rename Userland/Libraries/LibGUI/{ScrollBar.h => Scrollbar.h} (95%) rename Userland/Libraries/LibGUI/{StatusBar.cpp => Statusbar.cpp} (85%) rename Userland/Libraries/LibGUI/{StatusBar.h => Statusbar.h} (93%) rename Userland/Libraries/LibGUI/{ToolBar.cpp => Toolbar.cpp} (86%) rename Userland/Libraries/LibGUI/{ToolBar.h => Toolbar.h} (93%) rename Userland/Libraries/LibGUI/{ToolBarContainer.cpp => ToolbarContainer.cpp} (92%) rename Userland/Libraries/LibGUI/{ToolBarContainer.h => ToolbarContainer.h} (90%) rename Userland/Services/WindowServer/{MenuBar.cpp => Menubar.cpp} (91%) rename Userland/Services/WindowServer/{MenuBar.h => Menubar.h} (88%) diff --git a/Base/home/anon/Source/little/test.frm b/Base/home/anon/Source/little/test.frm index 481eead9e6d7e5..3a0119df7c496b 100644 --- a/Base/home/anon/Source/little/test.frm +++ b/Base/home/anon/Source/little/test.frm @@ -1 +1 @@ -{"name":"Form1","widgets":[{"enabled":true,"forecolor":"#000000ff","ruler_visible":false,"autofill":false,"x":155,"tooltip":null,"height":121,"width":126,"y":10,"class":"GTextEditor","text":"Hi","backcolor":"#c0c0c0ff","visible":true},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","text":"Okydoky","class":"GButton","autofill":false,"enabled":true,"visible":true,"x":10,"height":21,"y":70,"width":81},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","class":"GGroupBox","autofill":true,"enabled":true,"visible":true,"title":"groupie","x":10,"height":71,"y":100,"width":141},{"tooltip":null,"forecolor":"#000000ff","y":10,"max":100,"autofill":false,"x":10,"min":0,"class":"GProgressBar","backcolor":"#c0c0c0ff","height":21,"enabled":true,"visible":true,"width":136,"value":50},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","text":"Looks like success!","class":"GLabel","autofill":true,"enabled":true,"visible":true,"x":10,"height":26,"y":35,"width":136},{"enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":160,"tooltip":null,"height":26,"width":91,"y":140,"class":"GCheckBox","text":"checkbox_1","backcolor":"#c0c0c0ff","visible":true},{"enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":160,"tooltip":null,"height":26,"width":61,"y":160,"class":"GRadioButton","text":"radio_1","backcolor":"#c0c0c0ff","visible":true},{"tooltip":null,"forecolor":"#000000ff","y":125,"max":100,"autofill":false,"x":25,"min":0,"class":"GSlider","backcolor":"#c0c0c0ff","height":26,"enabled":true,"visible":true,"width":116,"value":"60"}]} \ No newline at end of file +{"name":"Form1","widgets":[{"enabled":true,"forecolor":"#000000ff","ruler_visible":false,"autofill":false,"x":155,"tooltip":null,"height":121,"width":126,"y":10,"class":"GTextEditor","text":"Hi","backcolor":"#c0c0c0ff","visible":true},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","text":"Okydoky","class":"GButton","autofill":false,"enabled":true,"visible":true,"x":10,"height":21,"y":70,"width":81},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","class":"GGroupBox","autofill":true,"enabled":true,"visible":true,"title":"groupie","x":10,"height":71,"y":100,"width":141},{"tooltip":null,"forecolor":"#000000ff","y":10,"max":100,"autofill":false,"x":10,"min":0,"class":"GProgressbar","backcolor":"#c0c0c0ff","height":21,"enabled":true,"visible":true,"width":136,"value":50},{"tooltip":null,"backcolor":"#c0c0c0ff","forecolor":"#000000ff","text":"Looks like success!","class":"GLabel","autofill":true,"enabled":true,"visible":true,"x":10,"height":26,"y":35,"width":136},{"enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":160,"tooltip":null,"height":26,"width":91,"y":140,"class":"GCheckBox","text":"checkbox_1","backcolor":"#c0c0c0ff","visible":true},{"enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":160,"tooltip":null,"height":26,"width":61,"y":160,"class":"GRadioButton","text":"radio_1","backcolor":"#c0c0c0ff","visible":true},{"tooltip":null,"forecolor":"#000000ff","y":125,"max":100,"autofill":false,"x":25,"min":0,"class":"GSlider","backcolor":"#c0c0c0ff","height":26,"enabled":true,"visible":true,"width":116,"value":"60"}]} diff --git a/Userland/Applications/Browser/BookmarksBarWidget.cpp b/Userland/Applications/Browser/BookmarksBarWidget.cpp index a84975debe30c9..671530fa44d914 100644 --- a/Userland/Applications/Browser/BookmarksBarWidget.cpp +++ b/Userland/Applications/Browser/BookmarksBarWidget.cpp @@ -131,7 +131,7 @@ BookmarksBarWidget::BookmarksBarWidget(const String& bookmarks_file, bool enable set_visible(false); m_additional = GUI::Button::construct(); - m_additional->set_button_style(Gfx::ButtonStyle::CoolBar); + m_additional->set_button_style(Gfx::ButtonStyle::Coolbar); m_additional->set_text(">"); m_additional->set_fixed_size(14, 20); m_additional->set_focus_policy(GUI::FocusPolicy::TabFocus); @@ -208,7 +208,7 @@ void BookmarksBarWidget::model_did_update(unsigned) auto& button = add(); m_bookmarks.append(button); - button.set_button_style(Gfx::ButtonStyle::CoolBar); + button.set_button_style(Gfx::ButtonStyle::Coolbar); button.set_text(title); button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-html.png")); button.set_fixed_size(font().width(title) + 32, 20); diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp index 54c872eb2cf6df..d9bf01f9f44145 100644 --- a/Userland/Applications/Browser/DownloadWidget.cpp +++ b/Userland/Applications/Browser/DownloadWidget.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -91,8 +91,8 @@ DownloadWidget::DownloadWidget(const URL& url) source_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); source_label.set_fixed_height(16); - m_progress_bar = add(); - m_progress_bar->set_fixed_height(20); + m_progressbar = add(); + m_progressbar->set_fixed_height(20); m_progress_label = add(); m_progress_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); @@ -127,15 +127,15 @@ DownloadWidget::~DownloadWidget() void DownloadWidget::did_progress(Optional total_size, u32 downloaded_size) { - m_progress_bar->set_min(0); + m_progressbar->set_min(0); if (total_size.has_value()) { int percent = roundf(((float)downloaded_size / (float)total_size.value()) * 100.0f); window()->set_progress(percent); - m_progress_bar->set_max(total_size.value()); + m_progressbar->set_max(total_size.value()); } else { - m_progress_bar->set_max(0); + m_progressbar->set_max(0); } - m_progress_bar->set_value(downloaded_size); + m_progressbar->set_value(downloaded_size); { StringBuilder builder; diff --git a/Userland/Applications/Browser/DownloadWidget.h b/Userland/Applications/Browser/DownloadWidget.h index 44fc21c60d56e6..10f839a68c3ba6 100644 --- a/Userland/Applications/Browser/DownloadWidget.h +++ b/Userland/Applications/Browser/DownloadWidget.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -50,7 +50,7 @@ class DownloadWidget final : public GUI::Widget { URL m_url; String m_destination_path; RefPtr m_download; - RefPtr m_progress_bar; + RefPtr m_progressbar; RefPtr m_progress_label; RefPtr m_cancel_button; RefPtr m_close_button; diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp index a24a19a37aabc5..d976378843a809 100644 --- a/Userland/Applications/Browser/Tab.cpp +++ b/Userland/Applications/Browser/Tab.cpp @@ -39,12 +39,12 @@ #include #include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -99,8 +99,8 @@ Tab::Tab(Type type) { load_from_gml(tab_gml); - m_toolbar_container = *find_descendant_of_type_named("toolbar_container"); - auto& toolbar = *find_descendant_of_type_named("toolbar"); + m_toolbar_container = *find_descendant_of_type_named("toolbar_container"); + auto& toolbar = *find_descendant_of_type_named("toolbar"); auto& webview_container = *find_descendant_of_type_named("webview_container"); @@ -136,7 +136,7 @@ Tab::Tab(Type type) })); m_bookmark_button = toolbar.add(); - m_bookmark_button->set_button_style(Gfx::ButtonStyle::CoolBar); + m_bookmark_button->set_button_style(Gfx::ButtonStyle::Coolbar); m_bookmark_button->set_focus_policy(GUI::FocusPolicy::TabFocus); m_bookmark_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/bookmark-contour.png")); m_bookmark_button->set_fixed_size(22, 22); @@ -280,7 +280,7 @@ Tab::Tab(Type type) }, this); - m_statusbar = *find_descendant_of_type_named("statusbar"); + m_statusbar = *find_descendant_of_type_named("statusbar"); hooks().on_link_hover = [this](auto& url) { if (url.is_valid()) @@ -293,7 +293,7 @@ Tab::Tab(Type type) load(url); }; - m_menubar = GUI::MenuBar::construct(); + m_menubar = GUI::Menubar::construct(); auto& app_menu = m_menubar->add_menu("&File"); app_menu.add_action(WindowActions::the().create_new_tab_action()); diff --git a/Userland/Applications/Browser/Tab.gml b/Userland/Applications/Browser/Tab.gml index 24c7456d776576..96dfba65bed114 100644 --- a/Userland/Applications/Browser/Tab.gml +++ b/Userland/Applications/Browser/Tab.gml @@ -2,10 +2,10 @@ layout: @GUI::VerticalBoxLayout { } - @GUI::ToolBarContainer { + @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::ToolBar { + @GUI::Toolbar { name: "toolbar" } } @@ -16,7 +16,7 @@ } } - @GUI::StatusBar { + @GUI::Statusbar { name: "statusbar" } } diff --git a/Userland/Applications/Browser/Tab.h b/Userland/Applications/Browser/Tab.h index 8a2c008686b4c8..8c806dcfb9666b 100644 --- a/Userland/Applications/Browser/Tab.h +++ b/Userland/Applications/Browser/Tab.h @@ -103,9 +103,9 @@ class Tab final : public GUI::Widget { RefPtr m_bookmark_button; RefPtr m_dom_inspector_window; RefPtr m_console_window; - RefPtr m_statusbar; - RefPtr m_menubar; - RefPtr m_toolbar_container; + RefPtr m_statusbar; + RefPtr m_menubar; + RefPtr m_toolbar_container; RefPtr m_link_context_menu; RefPtr m_link_context_menu_default_action; diff --git a/Userland/Applications/Calculator/main.cpp b/Userland/Applications/Calculator/main.cpp index bdcd0362e6b211..e625c10f2a6137 100644 --- a/Userland/Applications/Calculator/main.cpp +++ b/Userland/Applications/Calculator/main.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -69,7 +69,7 @@ int main(int argc, char** argv) window->show(); window->set_icon(app_icon.bitmap_for_size(16)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("&File"); app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { diff --git a/Userland/Applications/Calendar/CalendarWindow.gml b/Userland/Applications/Calendar/CalendarWindow.gml index 9a33d34c8cf999..f8feb0f3b3219f 100644 --- a/Userland/Applications/Calendar/CalendarWindow.gml +++ b/Userland/Applications/Calendar/CalendarWindow.gml @@ -3,10 +3,10 @@ layout: @GUI::VerticalBoxLayout { } - @GUI::ToolBarContainer { + @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::ToolBar { + @GUI::Toolbar { name: "toolbar" } } diff --git a/Userland/Applications/Calendar/main.cpp b/Userland/Applications/Calendar/main.cpp index 08b645288babbf..0c0da931f97e35 100644 --- a/Userland/Applications/Calendar/main.cpp +++ b/Userland/Applications/Calendar/main.cpp @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -71,7 +71,7 @@ int main(int argc, char** argv) auto& main_widget = window->set_main_widget(); main_widget.load_from_gml(calendar_window_gml); - auto toolbar = main_widget.find_descendant_of_type_named("toolbar"); + auto toolbar = main_widget.find_descendant_of_type_named("toolbar"); auto calendar = main_widget.find_descendant_of_type_named("calendar"); auto prev_date_action = GUI::Action::create({}, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"), [&](const GUI::Action&) { @@ -146,7 +146,7 @@ int main(int argc, char** argv) view_month_action->set_checked(true); }; - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("&File"); app_menu.add_action(GUI::Action::create("&Add Event", { Mod_Ctrl | Mod_Shift, Key_E }, Gfx::Bitmap::load_from_file("/res/icons/16x16/add-event.png"), [&](const GUI::Action&) { diff --git a/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml b/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml index 26770c7ad0505b..da5d399bd4b767 100644 --- a/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml +++ b/Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml @@ -28,7 +28,7 @@ @GUI::Button { name: "wallpaper_open_button" tooltip: "Select wallpaper from file system." - button_style: "CoolBar" + button_style: "Coolbar" fixed_width: 22 fixed_height: 22 } diff --git a/Userland/Applications/DisplaySettings/main.cpp b/Userland/Applications/DisplaySettings/main.cpp index 6c51fe42c058a9..12227d65dad8a0 100644 --- a/Userland/Applications/DisplaySettings/main.cpp +++ b/Userland/Applications/DisplaySettings/main.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -66,7 +66,7 @@ int main(int argc, char** argv) window->set_main_widget(tab_widget.ptr()); window->set_icon(app_icon.bitmap_for_size(16)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_quit_action([&](const GUI::Action&) { diff --git a/Userland/Applications/FileManager/FileManagerWindow.gml b/Userland/Applications/FileManager/FileManagerWindow.gml index 9568fabc3ffd24..2c2825e905e819 100644 --- a/Userland/Applications/FileManager/FileManagerWindow.gml +++ b/Userland/Applications/FileManager/FileManagerWindow.gml @@ -4,12 +4,12 @@ spacing: 2 } - @GUI::ToolBarContainer { + @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::ToolBar { + @GUI::Toolbar { name: "main_toolbar" } - @GUI::ToolBar { + @GUI::Toolbar { name: "location_toolbar" visible: false @@ -23,7 +23,7 @@ fixed_height: 22 } } - @GUI::ToolBar { + @GUI::Toolbar { name: "breadcrumb_toolbar" @GUI::Label { @@ -31,8 +31,8 @@ autosize: true } - @GUI::BreadcrumbBar { - name: "breadcrumb_bar" + @GUI::Breadcrumbbar { + name: "breadcrumbbar" } } } @@ -47,10 +47,10 @@ } - @GUI::StatusBar { + @GUI::Statusbar { name: "statusbar" - @GUI::ProgressBar { + @GUI::Progressbar { name: "progressbar" text: "Generating thumbnails: " visible: false diff --git a/Userland/Applications/FileManager/FileOperationProgress.gml b/Userland/Applications/FileManager/FileOperationProgress.gml index 039845a0c42071..2ab7257a3d7f26 100644 --- a/Userland/Applications/FileManager/FileOperationProgress.gml +++ b/Userland/Applications/FileManager/FileOperationProgress.gml @@ -36,9 +36,9 @@ } } - @GUI::ProgressBar { + @GUI::Progressbar { fixed_height: 22 - name: "current_file_progress_bar" + name: "current_file_progressbar" min: 0 } @@ -62,9 +62,9 @@ } } - @GUI::ProgressBar { + @GUI::Progressbar { fixed_height: 22 - name: "overall_progress_bar" + name: "overall_progressbar" min: 0 } diff --git a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp index 534efca7e01921..83821344ea0972 100644 --- a/Userland/Applications/FileManager/FileOperationProgressWidget.cpp +++ b/Userland/Applications/FileManager/FileOperationProgressWidget.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include namespace FileManager { @@ -99,17 +99,17 @@ void FileOperationProgressWidget::did_error() void FileOperationProgressWidget::did_progress([[maybe_unused]] off_t bytes_done, [[maybe_unused]] off_t total_byte_count, size_t files_done, size_t total_file_count, off_t current_file_done, off_t current_file_size, const StringView& current_file_name) { auto& current_file_label = *find_descendant_of_type_named("current_file_label"); - auto& current_file_progress_bar = *find_descendant_of_type_named("current_file_progress_bar"); + auto& current_file_progressbar = *find_descendant_of_type_named("current_file_progressbar"); auto& overall_progress_label = *find_descendant_of_type_named("overall_progress_label"); - auto& overall_progress_bar = *find_descendant_of_type_named("overall_progress_bar"); + auto& overall_progressbar = *find_descendant_of_type_named("overall_progressbar"); current_file_label.set_text(current_file_name); - current_file_progress_bar.set_max(current_file_size); - current_file_progress_bar.set_value(current_file_done); + current_file_progressbar.set_max(current_file_size); + current_file_progressbar.set_value(current_file_done); overall_progress_label.set_text(String::formatted("{} of {}", files_done, total_file_count)); - overall_progress_bar.set_max(total_file_count); - overall_progress_bar.set_value(files_done); + overall_progressbar.set_max(total_file_count); + overall_progressbar.set_value(files_done); } void FileOperationProgressWidget::close_pipe() diff --git a/Userland/Applications/FileManager/main.cpp b/Userland/Applications/FileManager/main.cpp index 944f520557ddf5..1407dde810eeae 100644 --- a/Userland/Applications/FileManager/main.cpp +++ b/Userland/Applications/FileManager/main.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include @@ -50,15 +50,15 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -411,16 +411,16 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio widget.load_from_gml(file_manager_window_gml); - auto& toolbar_container = *widget.find_descendant_of_type_named("toolbar_container"); - auto& main_toolbar = *widget.find_descendant_of_type_named("main_toolbar"); - auto& location_toolbar = *widget.find_descendant_of_type_named("location_toolbar"); + auto& toolbar_container = *widget.find_descendant_of_type_named("toolbar_container"); + auto& main_toolbar = *widget.find_descendant_of_type_named("main_toolbar"); + auto& location_toolbar = *widget.find_descendant_of_type_named("location_toolbar"); location_toolbar.layout()->set_margins({ 6, 3, 6, 3 }); auto& location_textbox = *widget.find_descendant_of_type_named("location_textbox"); - auto& breadcrumb_toolbar = *widget.find_descendant_of_type_named("breadcrumb_toolbar"); + auto& breadcrumb_toolbar = *widget.find_descendant_of_type_named("breadcrumb_toolbar"); breadcrumb_toolbar.layout()->set_margins({ 6, 0, 6, 0 }); - auto& breadcrumb_bar = *widget.find_descendant_of_type_named("breadcrumb_bar"); + auto& breadcrumbbar = *widget.find_descendant_of_type_named("breadcrumbbar"); auto& splitter = *widget.find_descendant_of_type_named("splitter"); auto& tree_view = *widget.find_descendant_of_type_named("tree_view"); @@ -446,10 +446,10 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio // Open the root directory. FIXME: This is awkward. tree_view.toggle_index(directories_model->index(0, 0, {})); - auto& statusbar = *widget.find_descendant_of_type_named("statusbar"); + auto& statusbar = *widget.find_descendant_of_type_named("statusbar"); - auto& progressbar = *widget.find_descendant_of_type_named("progressbar"); - progressbar.set_format(GUI::ProgressBar::Format::ValueSlashMax); + auto& progressbar = *widget.find_descendant_of_type_named("progressbar"); + progressbar.set_format(GUI::Progressbar::Format::ValueSlashMax); progressbar.set_frame_shape(Gfx::FrameShape::Panel); progressbar.set_frame_shadow(Gfx::FrameShadow::Sunken); progressbar.set_frame_thickness(1); @@ -537,11 +537,11 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio layout_statusbar_action = GUI::Action::create_checkable("&Status Bar", [&](auto& action) { action.is_checked() ? statusbar.set_visible(true) : statusbar.set_visible(false); - config->write_bool_entry("Layout", "ShowStatusBar", action.is_checked()); + config->write_bool_entry("Layout", "ShowStatusbar", action.is_checked()); config->sync(); }); - auto show_statusbar = config->read_bool_entry("Layout", "ShowStatusBar", true); + auto show_statusbar = config->read_bool_entry("Layout", "ShowStatusbar", true); layout_statusbar_action->set_checked(show_statusbar); statusbar.set_visible(show_statusbar); @@ -751,7 +751,7 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio refresh_tree_view(); }); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("&File"); app_menu.add_action(mkdir_action); @@ -845,20 +845,20 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio { LexicalPath lexical_path(new_path); - auto segment_index_of_new_path_in_breadcrumb_bar = [&]() -> Optional { - for (size_t i = 0; i < breadcrumb_bar.segment_count(); ++i) { - if (breadcrumb_bar.segment_data(i) == new_path) + auto segment_index_of_new_path_in_breadcrumbbar = [&]() -> Optional { + for (size_t i = 0; i < breadcrumbbar.segment_count(); ++i) { + if (breadcrumbbar.segment_data(i) == new_path) return i; } return {}; }(); - if (segment_index_of_new_path_in_breadcrumb_bar.has_value()) { - breadcrumb_bar.set_selected_segment(segment_index_of_new_path_in_breadcrumb_bar.value()); + if (segment_index_of_new_path_in_breadcrumbbar.has_value()) { + breadcrumbbar.set_selected_segment(segment_index_of_new_path_in_breadcrumbbar.value()); } else { - breadcrumb_bar.clear_segments(); + breadcrumbbar.clear_segments(); - breadcrumb_bar.append_segment("/", GUI::FileIconProvider::icon_for_path("/").bitmap_for_size(16), "/", "/"); + breadcrumbbar.append_segment("/", GUI::FileIconProvider::icon_for_path("/").bitmap_for_size(16), "/", "/"); StringBuilder builder; for (auto& part : lexical_path.parts()) { @@ -866,13 +866,13 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio builder.append('/'); builder.append(part); - breadcrumb_bar.append_segment(part, GUI::FileIconProvider::icon_for_path(builder.string_view()).bitmap_for_size(16), builder.string_view(), builder.string_view()); + breadcrumbbar.append_segment(part, GUI::FileIconProvider::icon_for_path(builder.string_view()).bitmap_for_size(16), builder.string_view(), builder.string_view()); } - breadcrumb_bar.set_selected_segment(breadcrumb_bar.segment_count() - 1); + breadcrumbbar.set_selected_segment(breadcrumbbar.segment_count() - 1); - breadcrumb_bar.on_segment_click = [&](size_t segment_index) { - directory_view.open(breadcrumb_bar.segment_data(segment_index)); + breadcrumbbar.on_segment_click = [&](size_t segment_index) { + directory_view.open(breadcrumbbar.segment_data(segment_index)); }; } } @@ -1045,18 +1045,18 @@ int run_in_windowed_mode(RefPtr config, String initial_locatio refresh_tree_view(); }; - breadcrumb_bar.on_segment_drop = [&](size_t segment_index, const GUI::DropEvent& event) { + breadcrumbbar.on_segment_drop = [&](size_t segment_index, const GUI::DropEvent& event) { if (!event.mime_data().has_urls()) return; - copy_urls_to_directory(event.mime_data().urls(), breadcrumb_bar.segment_data(segment_index)); + copy_urls_to_directory(event.mime_data().urls(), breadcrumbbar.segment_data(segment_index)); }; - breadcrumb_bar.on_segment_drag_enter = [&](size_t, GUI::DragEvent& event) { + breadcrumbbar.on_segment_drag_enter = [&](size_t, GUI::DragEvent& event) { if (event.mime_types().contains_slow("text/uri-list")) event.accept(); }; - breadcrumb_bar.on_doubleclick = [&](const GUI::MouseEvent&) { + breadcrumbbar.on_doubleclick = [&](const GUI::MouseEvent&) { go_to_location_action->activate(); }; diff --git a/Userland/Applications/FontEditor/FontEditor.cpp b/Userland/Applications/FontEditor/FontEditor.cpp index bd123909f92596..cb1f712dfb5e2a 100644 --- a/Userland/Applications/FontEditor/FontEditor.cpp +++ b/Userland/Applications/FontEditor/FontEditor.cpp @@ -43,13 +43,13 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -99,8 +99,8 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& { load_from_gml(font_editor_window_gml); - auto& toolbar = *find_descendant_of_type_named("toolbar"); - auto& status_bar = *find_descendant_of_type_named("status_bar"); + auto& toolbar = *find_descendant_of_type_named("toolbar"); + auto& statusbar = *find_descendant_of_type_named("statusbar"); auto& glyph_map_container = *find_descendant_of_type_named("glyph_map_container"); m_glyph_editor_container = *find_descendant_of_type_named("glyph_editor_container"); m_left_column_container = *find_descendant_of_type_named("left_column_container"); @@ -256,7 +256,7 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr&& } builder.append(") "); builder.appendff("[{}x{}]", m_edited_font->glyph_width(glyph), m_edited_font->glyph_height()); - status_bar.set_text(builder.to_string()); + statusbar.set_text(builder.to_string()); }; m_name_textbox->on_change = [&] { @@ -378,7 +378,7 @@ void FontEditorWidget::initialize(const String& path, RefPtr&& on_initialize(); } -void FontEditorWidget::initialize_menubar(GUI::MenuBar& menubar) +void FontEditorWidget::initialize_menubar(GUI::Menubar& menubar) { auto& app_menu = menubar.add_menu("&File"); app_menu.add_action(*m_new_action); diff --git a/Userland/Applications/FontEditor/FontEditor.h b/Userland/Applications/FontEditor/FontEditor.h index 98131b941264f1..ec3a2cce493c91 100644 --- a/Userland/Applications/FontEditor/FontEditor.h +++ b/Userland/Applications/FontEditor/FontEditor.h @@ -42,7 +42,7 @@ class FontEditorWidget final : public GUI::Widget { const String& path() { return m_path; } const Gfx::BitmapFont& edited_font() { return *m_edited_font; } void initialize(const String& path, RefPtr&&); - void initialize_menubar(GUI::MenuBar&); + void initialize_menubar(GUI::Menubar&); bool is_showing_font_metadata() { return m_font_metadata; } void set_show_font_metadata(bool b); diff --git a/Userland/Applications/FontEditor/FontEditorWindow.gml b/Userland/Applications/FontEditor/FontEditorWindow.gml index 37ce603a574236..37969dc29cb416 100644 --- a/Userland/Applications/FontEditor/FontEditorWindow.gml +++ b/Userland/Applications/FontEditor/FontEditorWindow.gml @@ -3,10 +3,10 @@ layout: @GUI::VerticalBoxLayout { } - @GUI::ToolBarContainer { + @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::ToolBar { + @GUI::Toolbar { name: "toolbar" } } @@ -205,7 +205,7 @@ } } - @GUI::StatusBar { - name: "status_bar" + @GUI::Statusbar { + name: "statusbar" } } diff --git a/Userland/Applications/FontEditor/main.cpp b/Userland/Applications/FontEditor/main.cpp index 0f1dde82f71e49..20fba8be82a321 100644 --- a/Userland/Applications/FontEditor/main.cpp +++ b/Userland/Applications/FontEditor/main.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -98,7 +98,7 @@ int main(int argc, char** argv) auto& font_editor = window->set_main_widget(path, move(edited_font)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); font_editor.initialize_menubar(menubar); window->set_menubar(move(menubar)); diff --git a/Userland/Applications/Help/main.cpp b/Userland/Applications/Help/main.cpp index 22e6f8340792ed..05f5d3c0755310 100644 --- a/Userland/Applications/Help/main.cpp +++ b/Userland/Applications/Help/main.cpp @@ -36,13 +36,13 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -107,8 +107,8 @@ int main(int argc, char* argv[]) widget.set_fill_with_background_color(true); widget.layout()->set_spacing(2); - auto& toolbar_container = widget.add(); - auto& toolbar = toolbar_container.add(); + auto& toolbar_container = widget.add(); + auto& toolbar = toolbar_container.add(); auto& splitter = widget.add(); @@ -272,7 +272,7 @@ int main(int argc, char* argv[]) toolbar.add_action(*go_forward_action); toolbar.add_action(*go_home_action); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_about_action("Help", app_icon, window)); diff --git a/Userland/Applications/HexEditor/HexEditor.cpp b/Userland/Applications/HexEditor/HexEditor.cpp index 392ddb2d4bff8f..f41a2e32598d39 100644 --- a/Userland/Applications/HexEditor/HexEditor.cpp +++ b/Userland/Applications/HexEditor/HexEditor.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Applications/HexEditor/HexEditorWidget.cpp b/Userland/Applications/HexEditor/HexEditorWidget.cpp index 7c7cda71f317d0..7ae043cc5b8074 100644 --- a/Userland/Applications/HexEditor/HexEditorWidget.cpp +++ b/Userland/Applications/HexEditor/HexEditorWidget.cpp @@ -35,12 +35,12 @@ #include #include #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include @@ -67,7 +67,7 @@ HexEditorWidget::HexEditorWidget() update_title(); }; - m_statusbar = add(5); + m_statusbar = add(5); m_new_action = GUI::Action::create("New", { Mod_Ctrl, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/new.png"), [this](const GUI::Action&) { if (m_document_dirty) { @@ -135,7 +135,7 @@ HexEditorWidget::~HexEditorWidget() { } -void HexEditorWidget::initialize_menubar(GUI::MenuBar& menubar) +void HexEditorWidget::initialize_menubar(GUI::Menubar& menubar) { auto& app_menu = menubar.add_menu("File"); app_menu.add_action(*m_new_action); diff --git a/Userland/Applications/HexEditor/HexEditorWidget.h b/Userland/Applications/HexEditor/HexEditorWidget.h index 6aefa4f0e025c1..2a8c5badf945d4 100644 --- a/Userland/Applications/HexEditor/HexEditorWidget.h +++ b/Userland/Applications/HexEditor/HexEditorWidget.h @@ -42,7 +42,7 @@ class HexEditorWidget final : public GUI::Widget { public: virtual ~HexEditorWidget() override; void open_file(const String& path); - void initialize_menubar(GUI::MenuBar&); + void initialize_menubar(GUI::Menubar&); bool request_close(); private: @@ -69,7 +69,7 @@ class HexEditorWidget final : public GUI::Widget { GUI::ActionGroup m_bytes_per_row_actions; - RefPtr m_statusbar; + RefPtr m_statusbar; bool m_document_dirty { false }; }; diff --git a/Userland/Applications/HexEditor/main.cpp b/Userland/Applications/HexEditor/main.cpp index d83c428542839d..285639cd7c9ff7 100644 --- a/Userland/Applications/HexEditor/main.cpp +++ b/Userland/Applications/HexEditor/main.cpp @@ -26,7 +26,7 @@ #include "HexEditorWidget.h" #include -#include +#include #include #include #include @@ -59,7 +59,7 @@ int main(int argc, char** argv) return GUI::Window::CloseRequestDecision::StayOpen; }; - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); hex_editor_widget.initialize_menubar(menubar); window->set_menubar(menubar); window->show(); diff --git a/Userland/Applications/IRCClient/IRCAppWindow.cpp b/Userland/Applications/IRCClient/IRCAppWindow.cpp index 383d3a8789f332..e623a0cec8a026 100644 --- a/Userland/Applications/IRCClient/IRCAppWindow.cpp +++ b/Userland/Applications/IRCClient/IRCAppWindow.cpp @@ -33,12 +33,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include static IRCAppWindow* s_the; @@ -257,7 +257,7 @@ void IRCAppWindow::setup_actions() void IRCAppWindow::setup_menus() { - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { dbgln("Terminal: Quit menu activated!"); @@ -307,8 +307,8 @@ void IRCAppWindow::setup_widgets() widget.set_layout(); widget.layout()->set_spacing(0); - auto& toolbar_container = widget.add(); - auto& toolbar = toolbar_container.add(); + auto& toolbar_container = widget.add(); + auto& toolbar = toolbar_container.add(); toolbar.set_has_frame(false); toolbar.add_action(*m_change_nick_action); toolbar.add_separator(); diff --git a/Userland/Applications/KeyboardMapper/main.cpp b/Userland/Applications/KeyboardMapper/main.cpp index 10a8694c9f372d..2152a7ab7f0a35 100644 --- a/Userland/Applications/KeyboardMapper/main.cpp +++ b/Userland/Applications/KeyboardMapper/main.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include int main(int argc, char** argv) @@ -104,7 +104,7 @@ int main(int argc, char** argv) }); // Menu - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(open_action); diff --git a/Userland/Applications/KeyboardSettings/main.cpp b/Userland/Applications/KeyboardSettings/main.cpp index 9d03249bf87218..958d61049ad060 100644 --- a/Userland/Applications/KeyboardSettings/main.cpp +++ b/Userland/Applications/KeyboardSettings/main.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include @@ -186,7 +186,7 @@ int main(int argc, char** argv) app->quit(); }); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(quit_action); diff --git a/Userland/Applications/MouseSettings/main.cpp b/Userland/Applications/MouseSettings/main.cpp index a9e114daa341fb..fb1c05dfe7f835 100644 --- a/Userland/Applications/MouseSettings/main.cpp +++ b/Userland/Applications/MouseSettings/main.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include int main(int argc, char** argv) @@ -56,7 +56,7 @@ int main(int argc, char** argv) window->set_minimizable(false); window->set_icon(app_icon.bitmap_for_size(16)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); diff --git a/Userland/Applications/Piano/RollWidget.cpp b/Userland/Applications/Piano/RollWidget.cpp index cc63e7ee929c58..ab360b6ec7adbb 100644 --- a/Userland/Applications/Piano/RollWidget.cpp +++ b/Userland/Applications/Piano/RollWidget.cpp @@ -28,7 +28,7 @@ #include "RollWidget.h" #include "TrackManager.h" #include -#include +#include #include #include #include diff --git a/Userland/Applications/Piano/main.cpp b/Userland/Applications/Piano/main.cpp index 7f4d31dfaf4119..f24b4e18fa078b 100644 --- a/Userland/Applications/Piano/main.cpp +++ b/Userland/Applications/Piano/main.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -104,7 +104,7 @@ int main(int argc, char** argv) }); audio_thread->start(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::Action::create("Export", { Mod_Ctrl, Key_E }, [&](const GUI::Action&) { diff --git a/Userland/Applications/PixelPaint/main.cpp b/Userland/Applications/PixelPaint/main.cpp index dd68010e3508ca..eba74da9ce293f 100644 --- a/Userland/Applications/PixelPaint/main.cpp +++ b/Userland/Applications/PixelPaint/main.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include @@ -114,7 +114,7 @@ int main(int argc, char** argv) window->show(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& file_menu = menubar->add_menu("&File"); auto open_image_file = [&](auto& path) { diff --git a/Userland/Applications/QuickShow/main.cpp b/Userland/Applications/QuickShow/main.cpp index 1e8ad3e706da62..1d453bb6f41cac 100644 --- a/Userland/Applications/QuickShow/main.cpp +++ b/Userland/Applications/QuickShow/main.cpp @@ -37,10 +37,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -97,8 +97,8 @@ int main(int argc, char** argv) root_widget.set_layout(); root_widget.layout()->set_spacing(2); - auto& toolbar_container = root_widget.add(); - auto& main_toolbar = toolbar_container.add(); + auto& toolbar_container = root_widget.add(); + auto& main_toolbar = toolbar_container.add(); auto& widget = root_widget.add(); widget.on_scale_change = [&](int scale, Gfx::IntRect rect) { @@ -270,7 +270,7 @@ int main(int argc, char** argv) main_toolbar.add_action(zoom_reset_action); main_toolbar.add_action(zoom_out_action); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("&File"); app_menu.add_action(open_action); diff --git a/Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp b/Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp index bb9d73845b7f58..4b3f56b6c8413e 100644 --- a/Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp +++ b/Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -75,8 +75,8 @@ SoundPlayerWidgetAdvancedView::SoundPlayerWidgetAdvancedView(GUI::Window& window this->manager().seek(value); }; - auto& toolbar_container = m_player_view->add(); - auto& menubar = toolbar_container.add(); + auto& toolbar_container = m_player_view->add(); + auto& menubar = toolbar_container.add(); m_play_button = menubar.add(); m_play_button->set_icon(is_paused() ? (!has_loaded_file() ? *m_play_icon : *m_pause_icon) : *m_pause_icon); diff --git a/Userland/Applications/SoundPlayer/main.cpp b/Userland/Applications/SoundPlayer/main.cpp index 00ccd2bfcbee92..b667939452ec62 100644 --- a/Userland/Applications/SoundPlayer/main.cpp +++ b/Userland/Applications/SoundPlayer/main.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,7 +78,7 @@ int main(int argc, char** argv) window->set_title("Sound Player"); window->set_icon(app_icon.bitmap_for_size(16)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); diff --git a/Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml b/Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml index 5d9153f669b293..79ebf6bdb0f782 100644 --- a/Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml +++ b/Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml @@ -3,10 +3,10 @@ spacing: 0 } - @GUI::ToolBarContainer { - @GUI::BreadcrumbBar { + @GUI::ToolbarContainer { + @GUI::Breadcrumbbar { fixed_height: 25 - name: "breadcrumb_bar" + name: "breadcrumbbar" } } @@ -14,7 +14,7 @@ name: "tree_map" } - @GUI::StatusBar { - name: "status_bar" + @GUI::Statusbar { + name: "statusbar" } } diff --git a/Userland/Applications/SpaceAnalyzer/main.cpp b/Userland/Applications/SpaceAnalyzer/main.cpp index c0ae638bca3809..9d23023d7cb32f 100644 --- a/Userland/Applications/SpaceAnalyzer/main.cpp +++ b/Userland/Applications/SpaceAnalyzer/main.cpp @@ -35,13 +35,13 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include @@ -209,7 +209,7 @@ static void populate_filesize_tree(TreeNode& root, Vector& mounts, Ha update_totals(root); } -static void analyze(RefPtr tree, SpaceAnalyzer::TreeMapWidget& treemapwidget, GUI::StatusBar& statusbar) +static void analyze(RefPtr tree, SpaceAnalyzer::TreeMapWidget& treemapwidget, GUI::Statusbar& statusbar) { // Build an in-memory tree mirroring the filesystem and for each node // calculate the sum of the file size for all its descendants. @@ -285,12 +285,12 @@ int main(int argc, char* argv[]) // Load widgets. auto& mainwidget = window->set_main_widget(); mainwidget.load_from_gml(space_analyzer_gml); - auto& breadcrumbbar = *mainwidget.find_descendant_of_type_named("breadcrumb_bar"); + auto& breadcrumbbar = *mainwidget.find_descendant_of_type_named("breadcrumbbar"); auto& treemapwidget = *mainwidget.find_descendant_of_type_named("tree_map"); - auto& statusbar = *mainwidget.find_descendant_of_type_named("status_bar"); + auto& statusbar = *mainwidget.find_descendant_of_type_named("statusbar"); // Configure the menubar. - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::Action::create("Analyze", [&](auto&) { analyze(tree, treemapwidget, statusbar); diff --git a/Userland/Applications/Spreadsheet/SpreadsheetView.cpp b/Userland/Applications/Spreadsheet/SpreadsheetView.cpp index 377a30b60ac2dc..4d25eee9fd3f91 100644 --- a/Userland/Applications/Spreadsheet/SpreadsheetView.cpp +++ b/Userland/Applications/Spreadsheet/SpreadsheetView.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/Userland/Applications/Spreadsheet/main.cpp b/Userland/Applications/Spreadsheet/main.cpp index c2ecb7c2cdd455..0519f3f465df92 100644 --- a/Userland/Applications/Spreadsheet/main.cpp +++ b/Userland/Applications/Spreadsheet/main.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -110,7 +110,7 @@ int main(int argc, char* argv[]) if (filename) spreadsheet_widget.load(filename); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::Action::create("Add New Sheet", Gfx::Bitmap::load_from_file("/res/icons/16x16/new-tab.png"), [&](auto&) { diff --git a/Userland/Applications/SystemMonitor/main.cpp b/Userland/Applications/SystemMonitor/main.cpp index fab16c06c65c92..18e3fb9fe47916 100644 --- a/Userland/Applications/SystemMonitor/main.cpp +++ b/Userland/Applications/SystemMonitor/main.cpp @@ -49,15 +49,15 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include -#include +#include #include #include #include @@ -76,7 +76,7 @@ static NonnullRefPtr build_devices_tab(); static NonnullRefPtr build_graphs_tab(); static NonnullRefPtr build_processors_tab(); -static RefPtr statusbar; +static RefPtr statusbar; class UnavailableProcessWidget final : public GUI::Frame { C_OBJECT(UnavailableProcessWidget) @@ -192,7 +192,7 @@ int main(int argc, char** argv) tabwidget_container.layout()->set_margins({ 4, 0, 4, 4 }); auto& tabwidget = tabwidget_container.add(); - statusbar = main_widget.add(3); + statusbar = main_widget.add(3); auto process_model = ProcessModel::create(); process_model->on_state_update = [&](int process_count, int thread_count) { @@ -340,7 +340,7 @@ int main(int argc, char** argv) }, &process_table_view); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("&File"); app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { GUI::Application::the()->quit(); @@ -408,9 +408,9 @@ int main(int argc, char** argv) return app->exec(); } -class ProgressBarPaintingDelegate final : public GUI::TableCellPaintingDelegate { +class ProgressbarPaintingDelegate final : public GUI::TableCellPaintingDelegate { public: - virtual ~ProgressBarPaintingDelegate() override { } + virtual ~ProgressbarPaintingDelegate() override { } virtual void paint(GUI::Painter& painter, const Gfx::IntRect& a_rect, const Palette& palette, const GUI::ModelIndex& index) override { @@ -421,7 +421,7 @@ class ProgressBarPaintingDelegate final : public GUI::TableCellPaintingDelegate String text; if (data.is_string()) text = data.as_string(); - Gfx::StylePainter::paint_progress_bar(painter, rect, palette, 0, 100, percentage, text); + Gfx::StylePainter::paint_progressbar(painter, rect, palette, 0, 100, percentage, text); painter.draw_rect(rect, Color::Black); } }; @@ -580,7 +580,7 @@ NonnullRefPtr build_file_systems_tab() df_fields.empend("block_size", "Block size", Gfx::TextAlignment::CenterRight); fs_table_view.set_model(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/proc/df", move(df_fields)))); - fs_table_view.set_column_painting_delegate(3, make()); + fs_table_view.set_column_painting_delegate(3, make()); fs_table_view.model()->update(); }; diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp index ae1a2f78ea191d..33bc94c35db504 100644 --- a/Userland/Applications/Terminal/main.cpp +++ b/Userland/Applications/Terminal/main.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -426,7 +426,7 @@ int main(int argc, char** argv) terminal.context_menu().add_separator(); terminal.context_menu().add_action(open_settings_action); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("&File"); app_menu.add_action(GUI::Action::create("Open New &Terminal", { Mod_Ctrl | Mod_Shift, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/app-terminal.png"), [&](auto&) { diff --git a/Userland/Applications/TextEditor/TextEditorWidget.cpp b/Userland/Applications/TextEditor/TextEditorWidget.cpp index 7a89c99b5955f2..c52e50d0a74a3d 100644 --- a/Userland/Applications/TextEditor/TextEditorWidget.cpp +++ b/Userland/Applications/TextEditor/TextEditorWidget.cpp @@ -47,15 +47,15 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -69,8 +69,8 @@ TextEditorWidget::TextEditorWidget() m_config = Core::ConfigFile::get_for_app("TextEditor"); - m_toolbar = *find_descendant_of_type_named("toolbar"); - m_toolbar_container = *find_descendant_of_type_named("toolbar_container"); + m_toolbar = *find_descendant_of_type_named("toolbar"); + m_toolbar_container = *find_descendant_of_type_named("toolbar_container"); m_editor = *find_descendant_of_type_named("editor"); m_editor->set_ruler_visible(true); @@ -272,7 +272,7 @@ TextEditorWidget::TextEditorWidget() m_editor->add_custom_context_menu_action(*m_find_next_action); m_editor->add_custom_context_menu_action(*m_find_previous_action); - m_statusbar = *find_descendant_of_type_named("statusbar"); + m_statusbar = *find_descendant_of_type_named("statusbar"); m_editor->on_cursor_change = [this] { update_statusbar(); }; m_editor->on_selection_change = [this] { update_statusbar(); }; @@ -359,7 +359,7 @@ TextEditorWidget::~TextEditorWidget() { } -void TextEditorWidget::initialize_menubar(GUI::MenuBar& menubar) +void TextEditorWidget::initialize_menubar(GUI::Menubar& menubar) { auto& app_menu = menubar.add_menu("&File"); app_menu.add_action(*m_new_action); @@ -423,10 +423,10 @@ void TextEditorWidget::initialize_menubar(GUI::MenuBar& menubar) m_layout_statusbar_action = GUI::Action::create_checkable("&Status Bar", [&](auto& action) { action.is_checked() ? m_statusbar->set_visible(true) : m_statusbar->set_visible(false); - m_config->write_bool_entry("Layout", "ShowStatusBar", action.is_checked()); + m_config->write_bool_entry("Layout", "ShowStatusbar", action.is_checked()); m_config->sync(); }); - auto show_statusbar = m_config->read_bool_entry("Layout", "ShowStatusBar", true); + auto show_statusbar = m_config->read_bool_entry("Layout", "ShowStatusbar", true); m_layout_statusbar_action->set_checked(show_statusbar); m_statusbar->set_visible(show_statusbar); diff --git a/Userland/Applications/TextEditor/TextEditorWidget.h b/Userland/Applications/TextEditor/TextEditorWidget.h index 36f519158a27f6..d5164a58428486 100644 --- a/Userland/Applications/TextEditor/TextEditorWidget.h +++ b/Userland/Applications/TextEditor/TextEditorWidget.h @@ -55,7 +55,7 @@ class TextEditorWidget final : public GUI::Widget { void set_auto_detect_preview_mode(bool value) { m_auto_detect_preview_mode = value; } void update_title(); - void initialize_menubar(GUI::MenuBar&); + void initialize_menubar(GUI::Menubar&); private: TextEditorWidget(); @@ -92,9 +92,9 @@ class TextEditorWidget final : public GUI::Widget { RefPtr m_markdown_preview_action; RefPtr m_html_preview_action; - RefPtr m_toolbar; - RefPtr m_toolbar_container; - RefPtr m_statusbar; + RefPtr m_toolbar; + RefPtr m_toolbar_container; + RefPtr m_statusbar; RefPtr m_find_textbox; RefPtr m_replace_textbox; diff --git a/Userland/Applications/TextEditor/TextEditorWindow.gml b/Userland/Applications/TextEditor/TextEditorWindow.gml index 97a50c348e9079..91c2db28d68e6b 100644 --- a/Userland/Applications/TextEditor/TextEditorWindow.gml +++ b/Userland/Applications/TextEditor/TextEditorWindow.gml @@ -6,10 +6,10 @@ spacing: 2 } - @GUI::ToolBarContainer { + @GUI::ToolbarContainer { name: "toolbar_container" - @GUI::ToolBar { + @GUI::Toolbar { name: "toolbar" } } @@ -105,7 +105,7 @@ } } - @GUI::StatusBar { + @GUI::Statusbar { name: "statusbar" } } diff --git a/Userland/Applications/TextEditor/main.cpp b/Userland/Applications/TextEditor/main.cpp index 7aa58a721801a9..9421cc4cab9e02 100644 --- a/Userland/Applications/TextEditor/main.cpp +++ b/Userland/Applications/TextEditor/main.cpp @@ -26,7 +26,7 @@ #include "TextEditorWidget.h" #include -#include +#include #include #include #include @@ -85,7 +85,7 @@ int main(int argc, char** argv) return 1; } - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); text_widget.initialize_menubar(menubar); window->set_menubar(menubar); diff --git a/Userland/Applications/ThemeEditor/PreviewWidget.cpp b/Userland/Applications/ThemeEditor/PreviewWidget.cpp index fe4e74faf453a2..b7e62f6fbdca37 100644 --- a/Userland/Applications/ThemeEditor/PreviewWidget.cpp +++ b/Userland/Applications/ThemeEditor/PreviewWidget.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -65,7 +65,7 @@ class MiniWidgetGallery final : public GUI::Widget { m_checkbox->set_text("Check box"); m_radio = add(); m_radio->set_text("Radio button"); - m_statusbar = add(); + m_statusbar = add(); m_statusbar->set_text("Status bar"); m_editor = add(); m_editor->set_text("Text editor\nwith multiple\nlines."); @@ -84,7 +84,7 @@ class MiniWidgetGallery final : public GUI::Widget { RefPtr m_button; RefPtr m_checkbox; RefPtr m_radio; - RefPtr m_statusbar; + RefPtr m_statusbar; }; PreviewWidget::PreviewWidget(const Gfx::Palette& preview_palette) diff --git a/Userland/Demos/CatDog/main.cpp b/Userland/Demos/CatDog/main.cpp index 6299f6e5c3277e..4f4d4276152c0a 100644 --- a/Userland/Demos/CatDog/main.cpp +++ b/Userland/Demos/CatDog/main.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -233,7 +233,7 @@ int main(int argc, char** argv) root_widget.set_layout(); root_widget.layout()->set_spacing(0); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); auto& help_menu = menubar->add_menu("Help"); diff --git a/Userland/Demos/Cube/Cube.cpp b/Userland/Demos/Cube/Cube.cpp index a5f78c538455ad..807fcf8595b8d1 100644 --- a/Userland/Demos/Cube/Cube.cpp +++ b/Userland/Demos/Cube/Cube.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -263,7 +263,7 @@ int main(int argc, char** argv) auto app_icon = GUI::Icon::default_icon("app-cube"); window->set_icon(app_icon.bitmap_for_size(16)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); auto show_window_frame_action = GUI::Action::create_checkable("Show window frame", [&](auto& action) { cube.set_show_window_frame(action.is_checked()); diff --git a/Userland/Demos/Eyes/main.cpp b/Userland/Demos/Eyes/main.cpp index 1cad75db3b3f25..0a2629d9ed19b2 100644 --- a/Userland/Demos/Eyes/main.cpp +++ b/Userland/Demos/Eyes/main.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -99,7 +99,7 @@ int main(int argc, char* argv[]) auto& eyes = window->set_main_widget(num_eyes, full_rows, extra_columns); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); diff --git a/Userland/Demos/Mouse/main.cpp b/Userland/Demos/Mouse/main.cpp index 9878ae8dbb6130..998e3dbbcff699 100644 --- a/Userland/Demos/Mouse/main.cpp +++ b/Userland/Demos/Mouse/main.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -198,7 +198,7 @@ int main(int argc, char** argv) auto& main_widget = window->set_main_widget(); main_widget.set_fill_with_background_color(true); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); diff --git a/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp b/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp index 96c8bdde564f65..e0e4da5e510259 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp +++ b/Userland/Demos/WidgetGallery/DemoWizardDialog.cpp @@ -58,7 +58,7 @@ DemoWizardDialog::DemoWizardDialog(GUI::Window* parent_window) "Installation in progress...", "Please wait. Do not turn off your computer."); m_page_2->body_widget().load_from_gml(demo_wizard_page_2_gml); - m_page_2_progress_bar = m_page_2->body_widget().find_descendant_of_type_named("page_2_progress_bar"); + m_page_2_progressbar = m_page_2->body_widget().find_descendant_of_type_named("page_2_progressbar"); m_page_2_timer = Core::Timer::construct(this); m_page_2->on_page_enter = [&]() { m_page_2_progress_value = 0; @@ -71,7 +71,7 @@ DemoWizardDialog::DemoWizardDialog(GUI::Window* parent_window) m_page_2_timer->on_timeout = [&]() { if (m_page_2_progress_value < 100) m_page_2_progress_value++; - m_page_2_progress_bar->set_value(m_page_2_progress_value); + m_page_2_progressbar->set_value(m_page_2_progress_value); // Go to final page on progress completion if (m_page_2_progress_value == 100) { diff --git a/Userland/Demos/WidgetGallery/DemoWizardDialog.h b/Userland/Demos/WidgetGallery/DemoWizardDialog.h index 430ec505c65184..6b8ebfbbd48336 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardDialog.h +++ b/Userland/Demos/WidgetGallery/DemoWizardDialog.h @@ -26,7 +26,7 @@ #pragma once -#include +#include #include #include #include @@ -47,7 +47,7 @@ class DemoWizardDialog : public GUI::WizardDialog { RefPtr m_page_1_location_text_box; RefPtr m_page_2; - RefPtr m_page_2_progress_bar; + RefPtr m_page_2_progressbar; int m_page_2_progress_value { 0 }; RefPtr m_page_2_timer; diff --git a/Userland/Demos/WidgetGallery/DemoWizardPage2.gml b/Userland/Demos/WidgetGallery/DemoWizardPage2.gml index 47da912052dc4c..262d25864d11ee 100644 --- a/Userland/Demos/WidgetGallery/DemoWizardPage2.gml +++ b/Userland/Demos/WidgetGallery/DemoWizardPage2.gml @@ -9,8 +9,8 @@ fixed_height: 32 } - @GUI::ProgressBar { - name: "page_2_progress_bar" + @GUI::Progressbar { + name: "page_2_progressbar" fixed_height: 28 } diff --git a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml index dfd3f03ff6f722..0d3bcf245dcfae 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/BasicsTab.gml @@ -126,15 +126,15 @@ @GUI::Button { name: "enabled_coolbar_button" - text: "CoolBar button" - button_style: "CoolBar" + text: "Coolbar button" + button_style: "Coolbar" } @GUI::Button { name: "disabled_coolbar_button" text: "Disabled" enabled: "false" - button_style: "CoolBar" + button_style: "Coolbar" } @GUI::Widget { diff --git a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml index 87943af2898159..982c4ca660b957 100644 --- a/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml +++ b/Userland/Demos/WidgetGallery/GalleryGML/SlidersTab.gml @@ -42,7 +42,7 @@ @GUI::Widget { } - @GUI::ScrollBar { + @GUI::Scrollbar { name: "enabled_scrollbar" fixed_height: 16 fixed_width: -1 @@ -60,7 +60,7 @@ @GUI::Widget { } - @GUI::ScrollBar { + @GUI::Scrollbar { name: "disabled_scrollbar" fixed_height: 16 fixed_width: -1 @@ -75,7 +75,7 @@ margins: [8, 8, 8, 8] } - @GUI::VerticalProgressBar { + @GUI::VerticalProgressbar { name: "vertical_progressbar_left" fixed_width: 36 } @@ -103,7 +103,7 @@ @GUI::VerticalSeparator { } - @GUI::VerticalProgressBar { + @GUI::VerticalProgressbar { name: "vertical_progressbar_right" fixed_width: 36 } @@ -160,7 +160,7 @@ @GUI::HorizontalSeparator { } - @GUI::HorizontalProgressBar { + @GUI::HorizontalProgressbar { name: "horizontal_progressbar" fixed_height: 20 } diff --git a/Userland/Demos/WidgetGallery/GalleryWidget.cpp b/Userland/Demos/WidgetGallery/GalleryWidget.cpp index 1263106ee2f4bb..447befec24d78c 100644 --- a/Userland/Demos/WidgetGallery/GalleryWidget.cpp +++ b/Userland/Demos/WidgetGallery/GalleryWidget.cpp @@ -191,10 +191,10 @@ GalleryWidget::GalleryWidget() auto& sliders_tab = tab_widget.add_tab("Sliders"); sliders_tab.load_from_gml(sliders_tab_gml); - m_vertical_progressbar_left = sliders_tab.find_descendant_of_type_named("vertical_progressbar_left"); + m_vertical_progressbar_left = sliders_tab.find_descendant_of_type_named("vertical_progressbar_left"); m_vertical_progressbar_left->set_value(0); - m_vertical_progressbar_right = sliders_tab.find_descendant_of_type_named("vertical_progressbar_right"); + m_vertical_progressbar_right = sliders_tab.find_descendant_of_type_named("vertical_progressbar_right"); m_vertical_progressbar_right->set_value(100); m_vertical_slider_left = sliders_tab.find_descendant_of_type_named("vertical_slider_left"); @@ -208,7 +208,7 @@ GalleryWidget::GalleryWidget() m_vertical_progressbar_right->set_value((100 / m_vertical_slider_right->max()) * (m_vertical_slider_right->max() - value)); }; - m_horizontal_progressbar = sliders_tab.find_descendant_of_type_named("horizontal_progressbar"); + m_horizontal_progressbar = sliders_tab.find_descendant_of_type_named("horizontal_progressbar"); m_horizontal_progressbar->set_value(0); m_horizontal_slider_left = sliders_tab.find_descendant_of_type_named("horizontal_slider_left"); @@ -225,10 +225,10 @@ GalleryWidget::GalleryWidget() m_horizontal_slider_left->set_value((value * 100) / m_horizontal_slider_right->max()); }; - m_enabled_scrollbar = sliders_tab.find_descendant_of_type_named("enabled_scrollbar"); + m_enabled_scrollbar = sliders_tab.find_descendant_of_type_named("enabled_scrollbar"); m_enabled_scrollbar->set_orientation(Orientation::Horizontal); - m_disabled_scrollbar = sliders_tab.find_descendant_of_type_named("disabled_scrollbar"); + m_disabled_scrollbar = sliders_tab.find_descendant_of_type_named("disabled_scrollbar"); m_disabled_scrollbar->set_orientation(Orientation::Horizontal); m_opacity_imagewidget = sliders_tab.find_descendant_of_type_named("opacity_imagewidget"); diff --git a/Userland/Demos/WidgetGallery/GalleryWidget.h b/Userland/Demos/WidgetGallery/GalleryWidget.h index 8e1a0a3fb58543..8c03f1ea2abdfd 100644 --- a/Userland/Demos/WidgetGallery/GalleryWidget.h +++ b/Userland/Demos/WidgetGallery/GalleryWidget.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -61,12 +61,12 @@ class GalleryWidget final : public GUI::Widget { RefPtr m_horizontal_slider_left; RefPtr m_horizontal_slider_right; - RefPtr m_vertical_progressbar_left; - RefPtr m_vertical_progressbar_right; - RefPtr m_horizontal_progressbar; + RefPtr m_vertical_progressbar_left; + RefPtr m_vertical_progressbar_right; + RefPtr m_horizontal_progressbar; - RefPtr m_enabled_scrollbar; - RefPtr m_disabled_scrollbar; + RefPtr m_enabled_scrollbar; + RefPtr m_disabled_scrollbar; RefPtr m_text_editor; RefPtr m_wizard_output; diff --git a/Userland/Demos/WidgetGallery/main.cpp b/Userland/Demos/WidgetGallery/main.cpp index a63af424e832c4..1a249bab8b17a0 100644 --- a/Userland/Demos/WidgetGallery/main.cpp +++ b/Userland/Demos/WidgetGallery/main.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -75,7 +75,7 @@ int main(int argc, char** argv) window->set_icon(app_icon.bitmap_for_size(16)); window->set_main_widget(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); diff --git a/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp index 9ccaae9bdc5215..c2749f091b57bd 100644 --- a/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp +++ b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp @@ -72,8 +72,8 @@ void DebugInfoWidget::init_toolbar() DebugInfoWidget::DebugInfoWidget() { set_layout(); - auto& toolbar_container = add(); - m_toolbar = toolbar_container.add(); + auto& toolbar_container = add(); + m_toolbar = toolbar_container.add(); init_toolbar(); auto& bottom_box = add(); bottom_box.set_layout(); diff --git a/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h index efc6f4b95889b1..783107e7230b2a 100644 --- a/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h +++ b/Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -61,7 +61,7 @@ class DebugInfoWidget final : public GUI::Widget { RefPtr m_registers_view; RefPtr m_backtrace_view; RefPtr m_variable_context_menu; - RefPtr m_toolbar; + RefPtr m_toolbar; RefPtr m_continue_action; RefPtr m_singlestep_action; RefPtr m_step_in_action; diff --git a/Userland/DevTools/HackStudio/Editor.cpp b/Userland/DevTools/HackStudio/Editor.cpp index 6cdbca9cfaec48..58ed61207f17ce 100644 --- a/Userland/DevTools/HackStudio/Editor.cpp +++ b/Userland/DevTools/HackStudio/Editor.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/DevTools/HackStudio/Git/DiffViewer.cpp b/Userland/DevTools/HackStudio/Git/DiffViewer.cpp index 39785998fcb1f6..c29ce9edbd7b47 100644 --- a/Userland/DevTools/HackStudio/Git/DiffViewer.cpp +++ b/Userland/DevTools/HackStudio/Git/DiffViewer.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/DevTools/HackStudio/Git/GitFilesView.cpp b/Userland/DevTools/HackStudio/Git/GitFilesView.cpp index 0a7afa3c99db1a..2ef856200b9c19 100644 --- a/Userland/DevTools/HackStudio/Git/GitFilesView.cpp +++ b/Userland/DevTools/HackStudio/Git/GitFilesView.cpp @@ -27,7 +27,7 @@ #include "GitFilesView.h" #include #include -#include +#include #include namespace HackStudio { diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.cpp b/Userland/DevTools/HackStudio/HackStudioWidget.cpp index cbb599eca3d066..b8a6deac45dde0 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.cpp +++ b/Userland/DevTools/HackStudio/HackStudioWidget.cpp @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include @@ -75,8 +75,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -103,7 +103,7 @@ HackStudioWidget::HackStudioWidget(const String& path_to_project) open_project(path_to_project); - auto& toolbar_container = add(); + auto& toolbar_container = add(); auto& outer_splitter = add(); @@ -785,7 +785,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent) { m_form_inner_container = parent.add(); m_form_inner_container->set_layout(); - auto& form_widgets_toolbar = m_form_inner_container->add(Orientation::Vertical, 26); + auto& form_widgets_toolbar = m_form_inner_container->add(Orientation::Vertical, 26); form_widgets_toolbar.set_fixed_width(38); GUI::ActionGroup tool_actions; @@ -868,7 +868,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent) void HackStudioWidget::create_toolbar(GUI::Widget& parent) { - auto& toolbar = parent.add(); + auto& toolbar = parent.add(); toolbar.add_action(*m_new_file_action); toolbar.add_action(*m_new_directory_action); toolbar.add_action(*m_save_action); @@ -950,7 +950,7 @@ void HackStudioWidget::create_project_tab(GUI::Widget& parent) }; } -void HackStudioWidget::create_app_menubar(GUI::MenuBar& menubar) +void HackStudioWidget::create_app_menubar(GUI::Menubar& menubar) { auto& file_menu = menubar.add_menu("&File"); file_menu.add_action(*m_new_project_action); @@ -962,7 +962,7 @@ void HackStudioWidget::create_app_menubar(GUI::MenuBar& menubar) })); } -void HackStudioWidget::create_project_menubar(GUI::MenuBar& menubar) +void HackStudioWidget::create_project_menubar(GUI::Menubar& menubar) { auto& project_menu = menubar.add_menu("&Project"); project_menu.add_action(*m_new_file_action); @@ -971,7 +971,7 @@ void HackStudioWidget::create_project_menubar(GUI::MenuBar& menubar) project_menu.add_action(*create_set_autocomplete_mode_action()); } -void HackStudioWidget::create_edit_menubar(GUI::MenuBar& menubar) +void HackStudioWidget::create_edit_menubar(GUI::Menubar& menubar) { auto& edit_menu = menubar.add_menu("&Edit"); edit_menu.add_action(GUI::Action::create("Find in Files...", { Mod_Ctrl | Mod_Shift, Key_F }, Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"), [this](auto&) { @@ -991,7 +991,7 @@ void HackStudioWidget::create_edit_menubar(GUI::MenuBar& menubar) edit_menu.add_action(vim_emulation_setting_action); } -void HackStudioWidget::create_build_menubar(GUI::MenuBar& menubar) +void HackStudioWidget::create_build_menubar(GUI::Menubar& menubar) { auto& build_menu = menubar.add_menu("&Build"); build_menu.add_action(*m_build_action); @@ -1002,7 +1002,7 @@ void HackStudioWidget::create_build_menubar(GUI::MenuBar& menubar) build_menu.add_action(*m_debug_action); } -void HackStudioWidget::create_view_menubar(GUI::MenuBar& menubar) +void HackStudioWidget::create_view_menubar(GUI::Menubar& menubar) { auto hide_action_tabs_action = GUI::Action::create("&Hide Action Tabs", { Mod_Ctrl | Mod_Shift, Key_X }, [this](auto&) { hide_action_tabs(); @@ -1048,7 +1048,7 @@ void HackStudioWidget::create_view_menubar(GUI::MenuBar& menubar) view_menu.add_action(*m_remove_current_terminal_action); } -void HackStudioWidget::create_help_menubar(GUI::MenuBar& menubar) +void HackStudioWidget::create_help_menubar(GUI::Menubar& menubar) { auto& help_menu = menubar.add_menu("Help"); help_menu.add_action(GUI::CommonActions::make_about_action("Hack Studio", GUI::Icon::default_icon("app-hack-studio"), window())); @@ -1073,7 +1073,7 @@ NonnullRefPtr HackStudioWidget::create_set_autocomplete_mode_action return action; } -void HackStudioWidget::initialize_menubar(GUI::MenuBar& menubar) +void HackStudioWidget::initialize_menubar(GUI::Menubar& menubar) { create_app_menubar(menubar); create_project_menubar(menubar); diff --git a/Userland/DevTools/HackStudio/HackStudioWidget.h b/Userland/DevTools/HackStudio/HackStudioWidget.h index 210fc964fb0488..40dd554108db0d 100644 --- a/Userland/DevTools/HackStudio/HackStudioWidget.h +++ b/Userland/DevTools/HackStudio/HackStudioWidget.h @@ -41,7 +41,7 @@ #include "ProjectFile.h" #include "TerminalWrapper.h" #include -#include +#include #include #include #include @@ -62,7 +62,7 @@ class HackStudioWidget : public GUI::Widget { void set_current_editor_wrapper(RefPtr); String currently_open_file() const { return m_currently_open_file; } - void initialize_menubar(GUI::MenuBar&); + void initialize_menubar(GUI::Menubar&); Locator& locator() { @@ -117,12 +117,12 @@ class HackStudioWidget : public GUI::Widget { void create_form_editor(GUI::Widget& parent); void create_toolbar(GUI::Widget& parent); void create_action_tab(GUI::Widget& parent); - void create_app_menubar(GUI::MenuBar&); - void create_project_menubar(GUI::MenuBar&); - void create_edit_menubar(GUI::MenuBar&); - void create_build_menubar(GUI::MenuBar&); - void create_view_menubar(GUI::MenuBar&); - void create_help_menubar(GUI::MenuBar&); + void create_app_menubar(GUI::Menubar&); + void create_project_menubar(GUI::Menubar&); + void create_edit_menubar(GUI::Menubar&); + void create_build_menubar(GUI::Menubar&); + void create_view_menubar(GUI::Menubar&); + void create_help_menubar(GUI::Menubar&); void create_project_tab(GUI::Widget& parent); void configure_project_tree_view(); diff --git a/Userland/DevTools/HackStudio/main.cpp b/Userland/DevTools/HackStudio/main.cpp index fbeba335e3bb10..5db91b3ef8e970 100644 --- a/Userland/DevTools/HackStudio/main.cpp +++ b/Userland/DevTools/HackStudio/main.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -97,7 +97,7 @@ int main(int argc, char** argv) s_window->set_title(String::formatted("{} - Hack Studio", s_hack_studio_widget->project().name())); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); s_hack_studio_widget->initialize_menubar(menubar); s_window->set_menubar(menubar); diff --git a/Userland/DevTools/Inspector/main.cpp b/Userland/DevTools/Inspector/main.cpp index 52c428a4a5883d..791dc498242785 100644 --- a/Userland/DevTools/Inspector/main.cpp +++ b/Userland/DevTools/Inspector/main.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -128,7 +128,7 @@ int main(int argc, char** argv) window->resize(685, 500); window->set_icon(app_icon.bitmap_for_size(16)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); diff --git a/Userland/DevTools/Playground/main.cpp b/Userland/DevTools/Playground/main.cpp index f3c5ac12b0d307..c7c27494780f0a 100644 --- a/Userland/DevTools/Playground/main.cpp +++ b/Userland/DevTools/Playground/main.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -153,7 +153,7 @@ int main(int argc, char** argv) }); }; - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("&File"); app_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) { diff --git a/Userland/DevTools/Profiler/main.cpp b/Userland/DevTools/Profiler/main.cpp index 4666e4ffe56f44..76c8aff332a5cd 100644 --- a/Userland/DevTools/Profiler/main.cpp +++ b/Userland/DevTools/Profiler/main.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -140,7 +140,7 @@ int main(int argc, char** argv) individual_sample_view.set_model(move(model)); }; - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("&File"); app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) { app->quit(); })); diff --git a/Userland/Games/2048/main.cpp b/Userland/Games/2048/main.cpp index 5adbea5132b0ca..e43c751a4cf1db 100644 --- a/Userland/Games/2048/main.cpp +++ b/Userland/Games/2048/main.cpp @@ -34,9 +34,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -98,7 +98,7 @@ int main(int argc, char** argv) auto& board_view = main_widget.add(&game.board()); board_view.set_focus(true); - auto& statusbar = main_widget.add(); + auto& statusbar = main_widget.add(); auto update = [&]() { board_view.set_board(&game.board()); @@ -178,7 +178,7 @@ int main(int argc, char** argv) } }; - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("File"); diff --git a/Userland/Games/Breakout/main.cpp b/Userland/Games/Breakout/main.cpp index af8e4d9a8c4f92..306a228169d58c 100644 --- a/Userland/Games/Breakout/main.cpp +++ b/Userland/Games/Breakout/main.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ int main(int argc, char** argv) auto& game = window->set_main_widget(); window->show(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); app_menu.add_action(GUI::Action::create_checkable("Pause", { {}, Key_P }, [&](auto& action) { diff --git a/Userland/Games/Chess/main.cpp b/Userland/Games/Chess/main.cpp index c2a3a2de78a712..9e817a089baac3 100644 --- a/Userland/Games/Chess/main.cpp +++ b/Userland/Games/Chess/main.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -96,7 +96,7 @@ int main(int argc, char** argv) widget.set_coordinates(config->read_bool_entry("Style", "Coordinates", true)); widget.set_show_available_moves(config->read_bool_entry("Style", "ShowAvailableMoves", true)); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); app_menu.add_action(GUI::Action::create("Resign", { Mod_None, Key_F3 }, [&](auto&) { diff --git a/Userland/Games/Conway/main.cpp b/Userland/Games/Conway/main.cpp index bc7210b86be724..1c2d6a37d293e9 100644 --- a/Userland/Games/Conway/main.cpp +++ b/Userland/Games/Conway/main.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -69,7 +69,7 @@ int main(int argc, char** argv) auto& game = window->set_main_widget(); window->set_minimum_size(game.columns(), game.rows()); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); diff --git a/Userland/Games/Minesweeper/main.cpp b/Userland/Games/Minesweeper/main.cpp index 8c3835b796cd8d..067bf6a57048ca 100644 --- a/Userland/Games/Minesweeper/main.cpp +++ b/Userland/Games/Minesweeper/main.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -92,7 +92,7 @@ int main(int argc, char** argv) auto& flag_label = container.add(); auto& face_button = container.add(); face_button.set_focus_policy(GUI::FocusPolicy::TabFocus); - face_button.set_button_style(Gfx::ButtonStyle::CoolBar); + face_button.set_button_style(Gfx::ButtonStyle::Coolbar); face_button.set_fixed_size(36, 36); auto& time_image = container.add(); @@ -104,7 +104,7 @@ int main(int argc, char** argv) window->resize(size); }); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); diff --git a/Userland/Games/Pong/main.cpp b/Userland/Games/Pong/main.cpp index 24829629ca8f2b..b967245b641cf2 100644 --- a/Userland/Games/Pong/main.cpp +++ b/Userland/Games/Pong/main.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -74,7 +74,7 @@ int main(int argc, char** argv) window->set_main_widget(); window->show(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { diff --git a/Userland/Games/Snake/main.cpp b/Userland/Games/Snake/main.cpp index 9a6e1d87f98675..6c237b233d1277 100644 --- a/Userland/Games/Snake/main.cpp +++ b/Userland/Games/Snake/main.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -78,7 +78,7 @@ int main(int argc, char** argv) auto& game = window->set_main_widget(); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); diff --git a/Userland/Games/Solitaire/main.cpp b/Userland/Games/Solitaire/main.cpp index 7879b9269feb5c..513c206f44bdd8 100644 --- a/Userland/Games/Solitaire/main.cpp +++ b/Userland/Games/Solitaire/main.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -63,7 +63,7 @@ int main(int argc, char** argv) window->set_title(String::formatted("Score: {} - Solitaire", score)); }); - auto menubar = GUI::MenuBar::construct(); + auto menubar = GUI::Menubar::construct(); auto& app_menu = menubar->add_menu("Game"); app_menu.add_action(GUI::Action::create("New game", { Mod_None, Key_F2 }, [&](auto&) { diff --git a/Userland/Libraries/LibGUI/AbstractTableView.cpp b/Userland/Libraries/LibGUI/AbstractTableView.cpp index 8f360acbbaec0c..0713ac5c5f02a3 100644 --- a/Userland/Libraries/LibGUI/AbstractTableView.cpp +++ b/Userland/Libraries/LibGUI/AbstractTableView.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/Userland/Libraries/LibGUI/AbstractView.cpp b/Userland/Libraries/LibGUI/AbstractView.cpp index 6e413421424430..48a4c480bfbb78 100644 --- a/Userland/Libraries/LibGUI/AbstractView.cpp +++ b/Userland/Libraries/LibGUI/AbstractView.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/Userland/Libraries/LibGUI/Application.cpp b/Userland/Libraries/LibGUI/Application.cpp index 8f9b3e92ef1cd2..0d2213768326a7 100644 --- a/Userland/Libraries/LibGUI/Application.cpp +++ b/Userland/Libraries/LibGUI/Application.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibGUI/BreadcrumbBar.cpp b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp similarity index 90% rename from Userland/Libraries/LibGUI/BreadcrumbBar.cpp rename to Userland/Libraries/LibGUI/Breadcrumbbar.cpp index 15fce14f53b5fe..400202b88117bb 100644 --- a/Userland/Libraries/LibGUI/BreadcrumbBar.cpp +++ b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp @@ -25,13 +25,13 @@ */ #include -#include +#include #include #include #include #include -REGISTER_WIDGET(GUI, BreadcrumbBar) +REGISTER_WIDGET(GUI, Breadcrumbbar) namespace GUI { @@ -76,26 +76,26 @@ class BreadcrumbButton : public Button { BreadcrumbButton() { } }; -BreadcrumbBar::BreadcrumbBar() +Breadcrumbbar::Breadcrumbbar() { auto& layout = set_layout(); layout.set_spacing(0); } -BreadcrumbBar::~BreadcrumbBar() +Breadcrumbbar::~Breadcrumbbar() { } -void BreadcrumbBar::clear_segments() +void Breadcrumbbar::clear_segments() { m_segments.clear(); remove_all_children(); } -void BreadcrumbBar::append_segment(String text, const Gfx::Bitmap* icon, String data, String tooltip) +void Breadcrumbbar::append_segment(String text, const Gfx::Bitmap* icon, String data, String tooltip) { auto& button = add(); - button.set_button_style(Gfx::ButtonStyle::CoolBar); + button.set_button_style(Gfx::ButtonStyle::Coolbar); button.set_text(text); button.set_icon(icon); button.set_tooltip(move(tooltip)); @@ -125,7 +125,7 @@ void BreadcrumbBar::append_segment(String text, const Gfx::Bitmap* icon, String m_segments.append(move(segment)); } -void BreadcrumbBar::set_selected_segment(Optional index) +void Breadcrumbbar::set_selected_segment(Optional index) { if (!index.has_value()) { for_each_child_of_type([&](auto& button) { @@ -140,7 +140,7 @@ void BreadcrumbBar::set_selected_segment(Optional index) segment.button->set_checked(true); } -void BreadcrumbBar::doubleclick_event(MouseEvent& event) +void Breadcrumbbar::doubleclick_event(MouseEvent& event) { if (on_doubleclick) on_doubleclick(event); diff --git a/Userland/Libraries/LibGUI/BreadcrumbBar.h b/Userland/Libraries/LibGUI/Breadcrumbbar.h similarity index 94% rename from Userland/Libraries/LibGUI/BreadcrumbBar.h rename to Userland/Libraries/LibGUI/Breadcrumbbar.h index a7fdb3d01d466d..a23d47eb467f61 100644 --- a/Userland/Libraries/LibGUI/BreadcrumbBar.h +++ b/Userland/Libraries/LibGUI/Breadcrumbbar.h @@ -30,11 +30,11 @@ namespace GUI { -class BreadcrumbBar : public GUI::Widget { - C_OBJECT(BreadcrumbBar); +class Breadcrumbbar : public GUI::Widget { + C_OBJECT(Breadcrumbbar); public: - virtual ~BreadcrumbBar() override; + virtual ~Breadcrumbbar() override; void clear_segments(); void append_segment(String text, const Gfx::Bitmap* icon = nullptr, String data = {}, String tooltip = {}); @@ -51,7 +51,7 @@ class BreadcrumbBar : public GUI::Widget { Function on_doubleclick; private: - BreadcrumbBar(); + Breadcrumbbar(); struct Segment { RefPtr icon; diff --git a/Userland/Libraries/LibGUI/Button.cpp b/Userland/Libraries/LibGUI/Button.cpp index a7172ffc7f1e4e..035eddf67fe591 100644 --- a/Userland/Libraries/LibGUI/Button.cpp +++ b/Userland/Libraries/LibGUI/Button.cpp @@ -49,7 +49,7 @@ Button::Button(String text) REGISTER_ENUM_PROPERTY( "button_style", button_style, set_button_style, Gfx::ButtonStyle, { Gfx::ButtonStyle::Normal, "Normal" }, - { Gfx::ButtonStyle::CoolBar, "CoolBar" }); + { Gfx::ButtonStyle::Coolbar, "Coolbar" }); } Button::~Button() @@ -77,7 +77,7 @@ void Button::paint_event(PaintEvent& event) if (paint_pressed || is_checked()) { painter.translate(1, 1); - } else if (m_icon && is_enabled() && is_hovered() && button_style() == Gfx::ButtonStyle::CoolBar) { + } else if (m_icon && is_enabled() && is_hovered() && button_style() == Gfx::ButtonStyle::Coolbar) { auto shadow_color = palette().button().darkened(0.7f); painter.blit_filtered(icon_location.translated(1, 1), *m_icon, m_icon->rect(), [&shadow_color](auto) { return shadow_color; diff --git a/Userland/Libraries/LibGUI/CMakeLists.txt b/Userland/Libraries/LibGUI/CMakeLists.txt index 53580255b55547..1e674b2b43e23e 100644 --- a/Userland/Libraries/LibGUI/CMakeLists.txt +++ b/Userland/Libraries/LibGUI/CMakeLists.txt @@ -12,7 +12,7 @@ set(SOURCES Application.cpp AutocompleteProvider.cpp BoxLayout.cpp - BreadcrumbBar.cpp + Breadcrumbbar.cpp Button.cpp Calendar.cpp CheckBox.cpp @@ -56,7 +56,7 @@ set(SOURCES LinkLabel.cpp ListView.cpp Menu.cpp - MenuBar.cpp + Menubar.cpp MenuItem.cpp MessageBox.cpp Model.cpp @@ -67,12 +67,12 @@ set(SOURCES OpacitySlider.cpp Painter.cpp ProcessChooser.cpp - ProgressBar.cpp + Progressbar.cpp RadioButton.cpp RegularEditingEngine.cpp ResizeCorner.cpp RunningProcessesModel.cpp - ScrollBar.cpp + Scrollbar.cpp ScrollableWidget.cpp SeparatorWidget.cpp Shortcut.cpp @@ -81,14 +81,14 @@ set(SOURCES SpinBox.cpp Splitter.cpp StackWidget.cpp - StatusBar.cpp + Statusbar.cpp TabWidget.cpp TableView.cpp TextBox.cpp TextDocument.cpp TextEditor.cpp - ToolBar.cpp - ToolBarContainer.cpp + Toolbar.cpp + ToolbarContainer.cpp TreeView.cpp UndoStack.cpp Variant.cpp diff --git a/Userland/Libraries/LibGUI/ColumnsView.cpp b/Userland/Libraries/LibGUI/ColumnsView.cpp index c2d2747dcc7cc6..737219ce25611f 100644 --- a/Userland/Libraries/LibGUI/ColumnsView.cpp +++ b/Userland/Libraries/LibGUI/ColumnsView.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/Userland/Libraries/LibGUI/ComboBox.cpp b/Userland/Libraries/LibGUI/ComboBox.cpp index 3563f4621b3ae6..9e3cb8744a1892 100644 --- a/Userland/Libraries/LibGUI/ComboBox.cpp +++ b/Userland/Libraries/LibGUI/ComboBox.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp index 06072d6815ed17..ec64e7ba845802 100644 --- a/Userland/Libraries/LibGUI/EmojiInputDialog.cpp +++ b/Userland/Libraries/LibGUI/EmojiInputDialog.cpp @@ -85,7 +85,7 @@ EmojiInputDialog::EmojiInputDialog(Window* parent_window) auto emoji_text = builder.to_string(); auto& button = horizontal_container.add