mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 11:17:35 +00:00
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. :^)
This commit is contained in:
Andreas Kling
parent
86bdfa1edf
commit
a2baab38fd
141 changed files with 518 additions and 518 deletions
|
|
@ -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<GUI::Button>();
|
||||
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);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include <LibGUI/ImageWidget.h>
|
||||
#include <LibGUI/Label.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <LibGUI/ProgressBar.h>
|
||||
#include <LibGUI/Progressbar.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <LibProtocol/Client.h>
|
||||
#include <LibWeb/Loader/ResourceLoader.h>
|
||||
|
|
@ -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<GUI::ProgressBar>();
|
||||
m_progress_bar->set_fixed_height(20);
|
||||
m_progressbar = add<GUI::Progressbar>();
|
||||
m_progressbar->set_fixed_height(20);
|
||||
|
||||
m_progress_label = add<GUI::Label>();
|
||||
m_progress_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
|
@ -127,15 +127,15 @@ DownloadWidget::~DownloadWidget()
|
|||
|
||||
void DownloadWidget::did_progress(Optional<u32> 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;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
#include <AK/URL.h>
|
||||
#include <LibCore/ElapsedTimer.h>
|
||||
#include <LibCore/FileStream.h>
|
||||
#include <LibGUI/ProgressBar.h>
|
||||
#include <LibGUI/Progressbar.h>
|
||||
#include <LibGUI/Widget.h>
|
||||
#include <LibProtocol/Download.h>
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ private:
|
|||
URL m_url;
|
||||
String m_destination_path;
|
||||
RefPtr<Protocol::Download> m_download;
|
||||
RefPtr<GUI::ProgressBar> m_progress_bar;
|
||||
RefPtr<GUI::Progressbar> m_progressbar;
|
||||
RefPtr<GUI::Label> m_progress_label;
|
||||
RefPtr<GUI::Button> m_cancel_button;
|
||||
RefPtr<GUI::Button> m_close_button;
|
||||
|
|
|
|||
|
|
@ -39,12 +39,12 @@
|
|||
#include <LibGUI/Button.h>
|
||||
#include <LibGUI/Clipboard.h>
|
||||
#include <LibGUI/Menu.h>
|
||||
#include <LibGUI/MenuBar.h>
|
||||
#include <LibGUI/StatusBar.h>
|
||||
#include <LibGUI/Menubar.h>
|
||||
#include <LibGUI/Statusbar.h>
|
||||
#include <LibGUI/TabWidget.h>
|
||||
#include <LibGUI/TextBox.h>
|
||||
#include <LibGUI/ToolBar.h>
|
||||
#include <LibGUI/ToolBarContainer.h>
|
||||
#include <LibGUI/Toolbar.h>
|
||||
#include <LibGUI/ToolbarContainer.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <LibJS/Interpreter.h>
|
||||
#include <LibWeb/Dump.h>
|
||||
|
|
@ -99,8 +99,8 @@ Tab::Tab(Type type)
|
|||
{
|
||||
load_from_gml(tab_gml);
|
||||
|
||||
m_toolbar_container = *find_descendant_of_type_named<GUI::ToolBarContainer>("toolbar_container");
|
||||
auto& toolbar = *find_descendant_of_type_named<GUI::ToolBar>("toolbar");
|
||||
m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
|
||||
auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
|
||||
|
||||
auto& webview_container = *find_descendant_of_type_named<GUI::Widget>("webview_container");
|
||||
|
||||
|
|
@ -136,7 +136,7 @@ Tab::Tab(Type type)
|
|||
}));
|
||||
|
||||
m_bookmark_button = toolbar.add<GUI::Button>();
|
||||
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<GUI::StatusBar>("statusbar");
|
||||
m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("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());
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,9 +103,9 @@ private:
|
|||
RefPtr<GUI::Button> m_bookmark_button;
|
||||
RefPtr<GUI::Window> m_dom_inspector_window;
|
||||
RefPtr<GUI::Window> m_console_window;
|
||||
RefPtr<GUI::StatusBar> m_statusbar;
|
||||
RefPtr<GUI::MenuBar> m_menubar;
|
||||
RefPtr<GUI::ToolBarContainer> m_toolbar_container;
|
||||
RefPtr<GUI::Statusbar> m_statusbar;
|
||||
RefPtr<GUI::Menubar> m_menubar;
|
||||
RefPtr<GUI::ToolbarContainer> m_toolbar_container;
|
||||
|
||||
RefPtr<GUI::Menu> m_link_context_menu;
|
||||
RefPtr<GUI::Action> m_link_context_menu_default_action;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue