Skip to content

Commit a2baab3

Browse files
awesomeklingawesomekling
committed
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. :^)
1 parent 86bdfa1 commit a2baab3

File tree

141 files changed

+518
-518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+518
-518
lines changed

‎Base/home/anon/Source/little/test.frm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +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"}]}
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"}]}

‎Userland/Applications/Browser/BookmarksBarWidget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ BookmarksBarWidget::BookmarksBarWidget(const String& bookmarks_file, bool enable
131131
set_visible(false);
132132

133133
m_additional = GUI::Button::construct();
134-
m_additional->set_button_style(Gfx::ButtonStyle::CoolBar);
134+
m_additional->set_button_style(Gfx::ButtonStyle::Coolbar);
135135
m_additional->set_text(">");
136136
m_additional->set_fixed_size(14, 20);
137137
m_additional->set_focus_policy(GUI::FocusPolicy::TabFocus);
@@ -208,7 +208,7 @@ void BookmarksBarWidget::model_did_update(unsigned)
208208
auto& button = add<GUI::Button>();
209209
m_bookmarks.append(button);
210210

211-
button.set_button_style(Gfx::ButtonStyle::CoolBar);
211+
button.set_button_style(Gfx::ButtonStyle::Coolbar);
212212
button.set_text(title);
213213
button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-html.png"));
214214
button.set_fixed_size(font().width(title) + 32, 20);

‎Userland/Applications/Browser/DownloadWidget.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <LibGUI/ImageWidget.h>
3737
#include <LibGUI/Label.h>
3838
#include <LibGUI/MessageBox.h>
39-
#include <LibGUI/ProgressBar.h>
39+
#include <LibGUI/Progressbar.h>
4040
#include <LibGUI/Window.h>
4141
#include <LibProtocol/Client.h>
4242
#include <LibWeb/Loader/ResourceLoader.h>
@@ -91,8 +91,8 @@ DownloadWidget::DownloadWidget(const URL& url)
9191
source_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
9292
source_label.set_fixed_height(16);
9393

94-
m_progress_bar = add<GUI::ProgressBar>();
95-
m_progress_bar->set_fixed_height(20);
94+
m_progressbar = add<GUI::Progressbar>();
95+
m_progressbar->set_fixed_height(20);
9696

9797
m_progress_label = add<GUI::Label>();
9898
m_progress_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
@@ -127,15 +127,15 @@ DownloadWidget::~DownloadWidget()
127127

128128
void DownloadWidget::did_progress(Optional<u32> total_size, u32 downloaded_size)
129129
{
130-
m_progress_bar->set_min(0);
130+
m_progressbar->set_min(0);
131131
if (total_size.has_value()) {
132132
int percent = roundf(((float)downloaded_size / (float)total_size.value()) * 100.0f);
133133
window()->set_progress(percent);
134-
m_progress_bar->set_max(total_size.value());
134+
m_progressbar->set_max(total_size.value());
135135
} else {
136-
m_progress_bar->set_max(0);
136+
m_progressbar->set_max(0);
137137
}
138-
m_progress_bar->set_value(downloaded_size);
138+
m_progressbar->set_value(downloaded_size);
139139

140140
{
141141
StringBuilder builder;

‎Userland/Applications/Browser/DownloadWidget.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <AK/URL.h>
3030
#include <LibCore/ElapsedTimer.h>
3131
#include <LibCore/FileStream.h>
32-
#include <LibGUI/ProgressBar.h>
32+
#include <LibGUI/Progressbar.h>
3333
#include <LibGUI/Widget.h>
3434
#include <LibProtocol/Download.h>
3535

@@ -50,7 +50,7 @@ class DownloadWidget final : public GUI::Widget {
5050
URL m_url;
5151
String m_destination_path;
5252
RefPtr<Protocol::Download> m_download;
53-
RefPtr<GUI::ProgressBar> m_progress_bar;
53+
RefPtr<GUI::Progressbar> m_progressbar;
5454
RefPtr<GUI::Label> m_progress_label;
5555
RefPtr<GUI::Button> m_cancel_button;
5656
RefPtr<GUI::Button> m_close_button;

‎Userland/Applications/Browser/Tab.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
#include <LibGUI/Button.h>
4040
#include <LibGUI/Clipboard.h>
4141
#include <LibGUI/Menu.h>
42-
#include <LibGUI/MenuBar.h>
43-
#include <LibGUI/StatusBar.h>
42+
#include <LibGUI/Menubar.h>
43+
#include <LibGUI/Statusbar.h>
4444
#include <LibGUI/TabWidget.h>
4545
#include <LibGUI/TextBox.h>
46-
#include <LibGUI/ToolBar.h>
47-
#include <LibGUI/ToolBarContainer.h>
46+
#include <LibGUI/Toolbar.h>
47+
#include <LibGUI/ToolbarContainer.h>
4848
#include <LibGUI/Window.h>
4949
#include <LibJS/Interpreter.h>
5050
#include <LibWeb/Dump.h>
@@ -99,8 +99,8 @@ Tab::Tab(Type type)
9999
{
100100
load_from_gml(tab_gml);
101101

102-
m_toolbar_container = *find_descendant_of_type_named<GUI::ToolBarContainer>("toolbar_container");
103-
auto& toolbar = *find_descendant_of_type_named<GUI::ToolBar>("toolbar");
102+
m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
103+
auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
104104

105105
auto& webview_container = *find_descendant_of_type_named<GUI::Widget>("webview_container");
106106

@@ -136,7 +136,7 @@ Tab::Tab(Type type)
136136
}));
137137

138138
m_bookmark_button = toolbar.add<GUI::Button>();
139-
m_bookmark_button->set_button_style(Gfx::ButtonStyle::CoolBar);
139+
m_bookmark_button->set_button_style(Gfx::ButtonStyle::Coolbar);
140140
m_bookmark_button->set_focus_policy(GUI::FocusPolicy::TabFocus);
141141
m_bookmark_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/bookmark-contour.png"));
142142
m_bookmark_button->set_fixed_size(22, 22);
@@ -280,7 +280,7 @@ Tab::Tab(Type type)
280280
},
281281
this);
282282

283-
m_statusbar = *find_descendant_of_type_named<GUI::StatusBar>("statusbar");
283+
m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar");
284284

285285
hooks().on_link_hover = [this](auto& url) {
286286
if (url.is_valid())
@@ -293,7 +293,7 @@ Tab::Tab(Type type)
293293
load(url);
294294
};
295295

296-
m_menubar = GUI::MenuBar::construct();
296+
m_menubar = GUI::Menubar::construct();
297297

298298
auto& app_menu = m_menubar->add_menu("&File");
299299
app_menu.add_action(WindowActions::the().create_new_tab_action());

‎Userland/Applications/Browser/Tab.gml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
layout: @GUI::VerticalBoxLayout {
33
}
44

5-
@GUI::ToolBarContainer {
5+
@GUI::ToolbarContainer {
66
name: "toolbar_container"
77

8-
@GUI::ToolBar {
8+
@GUI::Toolbar {
99
name: "toolbar"
1010
}
1111
}
@@ -16,7 +16,7 @@
1616
}
1717
}
1818

19-
@GUI::StatusBar {
19+
@GUI::Statusbar {
2020
name: "statusbar"
2121
}
2222
}

‎Userland/Applications/Browser/Tab.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ class Tab final : public GUI::Widget {
103103
RefPtr<GUI::Button> m_bookmark_button;
104104
RefPtr<GUI::Window> m_dom_inspector_window;
105105
RefPtr<GUI::Window> m_console_window;
106-
RefPtr<GUI::StatusBar> m_statusbar;
107-
RefPtr<GUI::MenuBar> m_menubar;
108-
RefPtr<GUI::ToolBarContainer> m_toolbar_container;
106+
RefPtr<GUI::Statusbar> m_statusbar;
107+
RefPtr<GUI::Menubar> m_menubar;
108+
RefPtr<GUI::ToolbarContainer> m_toolbar_container;
109109

110110
RefPtr<GUI::Menu> m_link_context_menu;
111111
RefPtr<GUI::Action> m_link_context_menu_default_action;

‎Userland/Applications/Calculator/main.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <LibGUI/Clipboard.h>
3131
#include <LibGUI/Icon.h>
3232
#include <LibGUI/Menu.h>
33-
#include <LibGUI/MenuBar.h>
33+
#include <LibGUI/Menubar.h>
3434
#include <LibGUI/Window.h>
3535
#include <LibGfx/Bitmap.h>
3636
#include <stdio.h>
@@ -69,7 +69,7 @@ int main(int argc, char** argv)
6969
window->show();
7070
window->set_icon(app_icon.bitmap_for_size(16));
7171

72-
auto menubar = GUI::MenuBar::construct();
72+
auto menubar = GUI::Menubar::construct();
7373

7474
auto& app_menu = menubar->add_menu("&File");
7575
app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {

‎Userland/Applications/Calendar/CalendarWindow.gml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
layout: @GUI::VerticalBoxLayout {
44
}
55

6-
@GUI::ToolBarContainer {
6+
@GUI::ToolbarContainer {
77
name: "toolbar_container"
88

9-
@GUI::ToolBar {
9+
@GUI::Toolbar {
1010
name: "toolbar"
1111
}
1212
}

‎Userland/Applications/Calendar/main.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#include <LibGUI/Calendar.h>
3535
#include <LibGUI/Icon.h>
3636
#include <LibGUI/Menu.h>
37-
#include <LibGUI/MenuBar.h>
38-
#include <LibGUI/ToolBar.h>
39-
#include <LibGUI/ToolBarContainer.h>
37+
#include <LibGUI/Menubar.h>
38+
#include <LibGUI/Toolbar.h>
39+
#include <LibGUI/ToolbarContainer.h>
4040
#include <LibGUI/Window.h>
4141
#include <unistd.h>
4242

@@ -71,7 +71,7 @@ int main(int argc, char** argv)
7171
auto& main_widget = window->set_main_widget<GUI::Widget>();
7272
main_widget.load_from_gml(calendar_window_gml);
7373

74-
auto toolbar = main_widget.find_descendant_of_type_named<GUI::ToolBar>("toolbar");
74+
auto toolbar = main_widget.find_descendant_of_type_named<GUI::Toolbar>("toolbar");
7575
auto calendar = main_widget.find_descendant_of_type_named<GUI::Calendar>("calendar");
7676

7777
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)
146146
view_month_action->set_checked(true);
147147
};
148148

149-
auto menubar = GUI::MenuBar::construct();
149+
auto menubar = GUI::Menubar::construct();
150150
auto& app_menu = menubar->add_menu("&File");
151151
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"),
152152
[&](const GUI::Action&) {

0 commit comments

Comments
 (0)