RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 04:57:45 +00:00
Code Issues Activity Actions

Everywhere: It's now "Foobar", not "FooBar", and not "foo bar"

Browse source 
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 2021-04-13 16:18:20 +02:00
parent 86bdfa1edf
commit a2baab38fd
141 changed files with 518 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Applications/Browser/BookmarksBarWidget.cpp
View file

@ -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);

14
Userland/Applications/Browser/DownloadWidget.cpp
View file

@ -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;

4
Userland/Applications/Browser/DownloadWidget.h
View file

@ -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;

18
Userland/Applications/Browser/Tab.cpp
View file

@ -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());

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

@ -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"
}
}

6
Userland/Applications/Browser/Tab.h
View file

@ -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;

4
Userland/Applications/Calculator/main.cpp
View file

@ -30,7 +30,7 @@
#include <LibGUI/Clipboard.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h>
#include <stdio.h>
@ -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&) {

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

@ -3,10 +3,10 @@
layout: @GUI::VerticalBoxLayout {
}
@GUI::ToolBarContainer {
@GUI::ToolbarContainer {
name: "toolbar_container"
@GUI::ToolBar {
@GUI::Toolbar {
name: "toolbar"
}
}

10
Userland/Applications/Calendar/main.cpp
View file

@ -34,9 +34,9 @@
#include <LibGUI/Calendar.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/ToolBar.h>
#include <LibGUI/ToolBarContainer.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/Toolbar.h>
#include <LibGUI/ToolbarContainer.h>
#include <LibGUI/Window.h>
#include <unistd.h>
@ -71,7 +71,7 @@ int main(int argc, char** argv)
auto& main_widget = window->set_main_widget<GUI::Widget>();
main_widget.load_from_gml(calendar_window_gml);
auto toolbar = main_widget.find_descendant_of_type_named<GUI::ToolBar>("toolbar");
auto toolbar = main_widget.find_descendant_of_type_named<GUI::Toolbar>("toolbar");
auto calendar = main_widget.find_descendant_of_type_named<GUI::Calendar>("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&) {

2
Userland/Applications/DisplaySettings/DisplaySettingsWindow.gml
View file

@ -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
}

4
Userland/Applications/DisplaySettings/main.cpp
View file

@ -30,7 +30,7 @@
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/TabWidget.h>
#include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h>
@ -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&) {

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

@ -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

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

@ -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
}

14
Userland/Applications/FileManager/FileOperationProgressWidget.cpp
View file

@ -31,7 +31,7 @@
#include <LibGUI/Button.h>
#include <LibGUI/Label.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/ProgressBar.h>
#include <LibGUI/Progressbar.h>
#include <LibGUI/Window.h>
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<GUI::Label>("current_file_label");
auto& current_file_progress_bar = *find_descendant_of_type_named<GUI::ProgressBar>("current_file_progress_bar");
auto& current_file_progressbar = *find_descendant_of_type_named<GUI::Progressbar>("current_file_progressbar");
auto& overall_progress_label = *find_descendant_of_type_named<GUI::Label>("overall_progress_label");
auto& overall_progress_bar = *find_descendant_of_type_named<GUI::ProgressBar>("overall_progress_bar");
auto& overall_progressbar = *find_descendant_of_type_named<GUI::Progressbar>("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()

64
Userland/Applications/FileManager/main.cpp
View file

@ -42,7 +42,7 @@
#include <LibGUI/ActionGroup.h>
#include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/BreadcrumbBar.h>
#include <LibGUI/Breadcrumbbar.h>
#include <LibGUI/Clipboard.h>
#include <LibGUI/Desktop.h>
#include <LibGUI/FileIconProvider.h>
@ -50,15 +50,15 @@
#include <LibGUI/InputBox.h>
#include <LibGUI/Label.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Painter.h>
#include <LibGUI/ProgressBar.h>
#include <LibGUI/Progressbar.h>
#include <LibGUI/Splitter.h>
#include <LibGUI/StatusBar.h>
#include <LibGUI/Statusbar.h>
#include <LibGUI/TextEditor.h>
#include <LibGUI/ToolBar.h>
#include <LibGUI/ToolBarContainer.h>
#include <LibGUI/Toolbar.h>
#include <LibGUI/ToolbarContainer.h>
#include <LibGUI/TreeView.h>
#include <LibGUI/Widget.h>
#include <LibGUI/Window.h>
@ -411,16 +411,16 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
widget.load_from_gml(file_manager_window_gml);
auto& toolbar_container = *widget.find_descendant_of_type_named<GUI::ToolBarContainer>("toolbar_container");
auto& main_toolbar = *widget.find_descendant_of_type_named<GUI::ToolBar>("main_toolbar");
auto& location_toolbar = *widget.find_descendant_of_type_named<GUI::ToolBar>("location_toolbar");
auto& toolbar_container = *widget.find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
auto& main_toolbar = *widget.find_descendant_of_type_named<GUI::Toolbar>("main_toolbar");
auto& location_toolbar = *widget.find_descendant_of_type_named<GUI::Toolbar>("location_toolbar");
location_toolbar.layout()->set_margins({ 6, 3, 6, 3 });
auto& location_textbox = *widget.find_descendant_of_type_named<GUI::TextBox>("location_textbox");
auto& breadcrumb_toolbar = *widget.find_descendant_of_type_named<GUI::ToolBar>("breadcrumb_toolbar");
auto& breadcrumb_toolbar = *widget.find_descendant_of_type_named<GUI::Toolbar>("breadcrumb_toolbar");
breadcrumb_toolbar.layout()->set_margins({ 6, 0, 6, 0 });
auto& breadcrumb_bar = *widget.find_descendant_of_type_named<GUI::BreadcrumbBar>("breadcrumb_bar");
auto& breadcrumbbar = *widget.find_descendant_of_type_named<GUI::Breadcrumbbar>("breadcrumbbar");
auto& splitter = *widget.find_descendant_of_type_named<GUI::HorizontalSplitter>("splitter");
auto& tree_view = *widget.find_descendant_of_type_named<GUI::TreeView>("tree_view");
@ -446,10 +446,10 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> 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<GUI::StatusBar>("statusbar");
auto& statusbar = *widget.find_descendant_of_type_named<GUI::Statusbar>("statusbar");
auto& progressbar = *widget.find_descendant_of_type_named<GUI::ProgressBar>("progressbar");
progressbar.set_format(GUI::ProgressBar::Format::ValueSlashMax);
auto& progressbar = *widget.find_descendant_of_type_named<GUI::Progressbar>("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<Core::ConfigFile> 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<Core::ConfigFile> 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<Core::ConfigFile> config, String initial_locatio
{
LexicalPath lexical_path(new_path);
auto segment_index_of_new_path_in_breadcrumb_bar = [&]() -> Optional<size_t> {
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<size_t> {
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<Core::ConfigFile> 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<Core::ConfigFile> 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();
};

14
Userland/Applications/FontEditor/FontEditor.cpp
View file

@ -43,13 +43,13 @@
#include <LibGUI/GroupBox.h>
#include <LibGUI/Label.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Painter.h>
#include <LibGUI/SpinBox.h>
#include <LibGUI/StatusBar.h>
#include <LibGUI/Statusbar.h>
#include <LibGUI/TextBox.h>
#include <LibGUI/ToolBarContainer.h>
#include <LibGUI/ToolbarContainer.h>
#include <LibGUI/Window.h>
#include <LibGfx/BitmapFont.h>
#include <LibGfx/Palette.h>
@ -99,8 +99,8 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::BitmapFont>&&
{
load_from_gml(font_editor_window_gml);
auto& toolbar = *find_descendant_of_type_named<GUI::ToolBar>("toolbar");
auto& status_bar = *find_descendant_of_type_named<GUI::StatusBar>("status_bar");
auto& toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
auto& statusbar = *find_descendant_of_type_named<GUI::Statusbar>("statusbar");
auto& glyph_map_container = *find_descendant_of_type_named<GUI::Widget>("glyph_map_container");
m_glyph_editor_container = *find_descendant_of_type_named<GUI::Widget>("glyph_editor_container");
m_left_column_container = *find_descendant_of_type_named<GUI::Widget>("left_column_container");
@ -256,7 +256,7 @@ FontEditorWidget::FontEditorWidget(const String& path, RefPtr<Gfx::BitmapFont>&&
}
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<Gfx::BitmapFont>&&
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);

2
Userland/Applications/FontEditor/FontEditor.h
View file

@ -42,7 +42,7 @@ public:
const String& path() { return m_path; }
const Gfx::BitmapFont& edited_font() { return *m_edited_font; }
void initialize(const String& path, RefPtr<Gfx::BitmapFont>&&);
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);

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

@ -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"
}
}

4
Userland/Applications/FontEditor/main.cpp
View file

@ -30,7 +30,7 @@
#include <LibDesktop/Launcher.h>
#include <LibGUI/Application.h>
#include <LibGUI/Icon.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Window.h>
#include <LibGfx/BitmapFont.h>
@ -98,7 +98,7 @@ int main(int argc, char** argv)
auto& font_editor = window->set_main_widget<FontEditorWidget>(path, move(edited_font));
auto menubar = GUI::MenuBar::construct();
auto menubar = GUI::Menubar::construct();
font_editor.initialize_menubar(menubar);
window->set_menubar(move(menubar));

12
Userland/Applications/Help/main.cpp
View file

@ -36,13 +36,13 @@
#include <LibGUI/FilteringProxyModel.h>
#include <LibGUI/ListView.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Splitter.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/TreeView.h>
#include <LibGUI/Window.h>
#include <LibMarkdown/Document.h>
@ -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<GUI::ToolBarContainer>();
auto& toolbar = toolbar_container.add<GUI::ToolBar>();
auto& toolbar_container = widget.add<GUI::ToolbarContainer>();
auto& toolbar = toolbar_container.add<GUI::Toolbar>();
auto& splitter = widget.add<GUI::HorizontalSplitter>();
@ -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));

2
Userland/Applications/HexEditor/HexEditor.cpp
View file

@ -31,7 +31,7 @@
#include <LibGUI/Clipboard.h>
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>
#include <LibGUI/Scrollbar.h>
#include <LibGUI/TextEditor.h>
#include <LibGUI/Window.h>
#include <LibGfx/FontDatabase.h>

10
Userland/Applications/HexEditor/HexEditorWidget.cpp
View file

@ -35,12 +35,12 @@
#include <LibGUI/FilePicker.h>
#include <LibGUI/InputBox.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/StatusBar.h>
#include <LibGUI/Statusbar.h>
#include <LibGUI/TextBox.h>
#include <LibGUI/TextEditor.h>
#include <LibGUI/ToolBar.h>
#include <LibGUI/Toolbar.h>
#include <stdio.h>
#include <string.h>
@ -67,7 +67,7 @@ HexEditorWidget::HexEditorWidget()
update_title();
};
m_statusbar = add<GUI::StatusBar>(5);
m_statusbar = add<GUI::Statusbar>(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);

4
Userland/Applications/HexEditor/HexEditorWidget.h
View file

@ -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 @@ private:
GUI::ActionGroup m_bytes_per_row_actions;
RefPtr<GUI::StatusBar> m_statusbar;
RefPtr<GUI::Statusbar> m_statusbar;
bool m_document_dirty { false };
};

4
Userland/Applications/HexEditor/main.cpp
View file

@ -26,7 +26,7 @@
#include "HexEditorWidget.h"
#include <LibGUI/Icon.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGfx/Bitmap.h>
#include <stdio.h>
#include <unistd.h>
@ -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();

12
Userland/Applications/IRCClient/IRCAppWindow.cpp
View file

@ -33,12 +33,12 @@
#include <LibGUI/BoxLayout.h>
#include <LibGUI/InputBox.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/Splitter.h>
#include <LibGUI/StackWidget.h>
#include <LibGUI/TableView.h>
#include <LibGUI/ToolBar.h>
#include <LibGUI/ToolBarContainer.h>
#include <LibGUI/Toolbar.h>
#include <LibGUI/ToolbarContainer.h>
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<GUI::VerticalBoxLayout>();
widget.layout()->set_spacing(0);
auto& toolbar_container = widget.add<GUI::ToolBarContainer>();
auto& toolbar = toolbar_container.add<GUI::ToolBar>();
auto& toolbar_container = widget.add<GUI::ToolbarContainer>();
auto& toolbar = toolbar_container.add<GUI::Toolbar>();
toolbar.set_has_frame(false);
toolbar.add_action(*m_change_nick_action);
toolbar.add_separator();

4
Userland/Applications/KeyboardMapper/main.cpp
View file

@ -31,7 +31,7 @@
#include <LibGUI/FilePicker.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <unistd.h>
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);

4
Userland/Applications/KeyboardSettings/main.cpp
View file

@ -37,7 +37,7 @@
#include <LibGUI/ComboBox.h>
#include <LibGUI/Label.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/WindowServerConnection.h>
#include <LibKeyboard/CharacterMap.h>
@ -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);

4
Userland/Applications/MouseSettings/main.cpp
View file

@ -30,7 +30,7 @@
#include <LibGUI/Application.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <unistd.h>
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();

2
Userland/Applications/Piano/RollWidget.cpp
View file

@ -28,7 +28,7 @@
#include "RollWidget.h"
#include "TrackManager.h"
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>
#include <LibGUI/Scrollbar.h>
#include <LibGfx/Font.h>
#include <LibGfx/FontDatabase.h>
#include <math.h>

4
Userland/Applications/Piano/main.cpp
View file

@ -36,7 +36,7 @@
#include <LibGUI/Application.h>
#include <LibGUI/FilePicker.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h>
@ -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&) {

4
Userland/Applications/PixelPaint/main.cpp
View file

@ -44,7 +44,7 @@
#include <LibGUI/Clipboard.h>
#include <LibGUI/FilePicker.h>
#include <LibGUI/Icon.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h>
@ -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) {

12
Userland/Applications/QuickShow/main.cpp
View file

@ -37,10 +37,10 @@
#include <LibGUI/FilePicker.h>
#include <LibGUI/Label.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/ToolBar.h>
#include <LibGUI/ToolBarContainer.h>
#include <LibGUI/Toolbar.h>
#include <LibGUI/ToolbarContainer.h>
#include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/Palette.h>
@ -97,8 +97,8 @@ int main(int argc, char** argv)
root_widget.set_layout<GUI::VerticalBoxLayout>();
root_widget.layout()->set_spacing(2);
auto& toolbar_container = root_widget.add<GUI::ToolBarContainer>();
auto& main_toolbar = toolbar_container.add<GUI::ToolBar>();
auto& toolbar_container = root_widget.add<GUI::ToolbarContainer>();
auto& main_toolbar = toolbar_container.add<GUI::Toolbar>();
auto& widget = root_widget.add<QSWidget>();
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);

8
Userland/Applications/SoundPlayer/SoundPlayerWidgetAdvancedView.cpp
View file

@ -38,8 +38,8 @@
#include <LibGUI/MessageBox.h>
#include <LibGUI/Slider.h>
#include <LibGUI/Splitter.h>
#include <LibGUI/ToolBar.h>
#include <LibGUI/ToolBarContainer.h>
#include <LibGUI/Toolbar.h>
#include <LibGUI/ToolbarContainer.h>
#include <LibGUI/Window.h>
#include <LibGfx/Bitmap.h>
@ -75,8 +75,8 @@ SoundPlayerWidgetAdvancedView::SoundPlayerWidgetAdvancedView(GUI::Window& window
this->manager().seek(value);
};
auto& toolbar_container = m_player_view->add<GUI::ToolBarContainer>();
auto& menubar = toolbar_container.add<GUI::ToolBar>();
auto& toolbar_container = m_player_view->add<GUI::ToolbarContainer>();
auto& menubar = toolbar_container.add<GUI::Toolbar>();
m_play_button = menubar.add<GUI::Button>();
m_play_button->set_icon(is_paused() ? (!has_loaded_file() ? *m_play_icon : *m_pause_icon) : *m_pause_icon);

4
Userland/Applications/SoundPlayer/main.cpp
View file

@ -33,7 +33,7 @@
#include <LibGUI/Application.h>
#include <LibGUI/FilePicker.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/Window.h>
#include <LibGfx/CharacterBitmap.h>
#include <stdio.h>
@ -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");

10
Userland/Applications/SpaceAnalyzer/SpaceAnalyzer.gml
View file

@ -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"
}
}

14
Userland/Applications/SpaceAnalyzer/main.cpp
View file

@ -35,13 +35,13 @@
#include <LibDesktop/Launcher.h>
#include <LibGUI/AboutDialog.h>
#include <LibGUI/Application.h>
#include <LibGUI/BreadcrumbBar.h>
#include <LibGUI/Breadcrumbbar.h>
#include <LibGUI/Clipboard.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/StatusBar.h>
#include <LibGUI/Statusbar.h>
#include <sys/stat.h>
#include <unistd.h>
@ -209,7 +209,7 @@ static void populate_filesize_tree(TreeNode& root, Vector<MountInfo>& mounts, Ha
update_totals(root);
}
static void analyze(RefPtr<Tree> tree, SpaceAnalyzer::TreeMapWidget& treemapwidget, GUI::StatusBar& statusbar)
static void analyze(RefPtr<Tree> 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<GUI::Widget>();
mainwidget.load_from_gml(space_analyzer_gml);
auto& breadcrumbbar = *mainwidget.find_descendant_of_type_named<GUI::BreadcrumbBar>("breadcrumb_bar");
auto& breadcrumbbar = *mainwidget.find_descendant_of_type_named<GUI::Breadcrumbbar>("breadcrumbbar");
auto& treemapwidget = *mainwidget.find_descendant_of_type_named<SpaceAnalyzer::TreeMapWidget>("tree_map");
auto& statusbar = *mainwidget.find_descendant_of_type_named<GUI::StatusBar>("status_bar");
auto& statusbar = *mainwidget.find_descendant_of_type_named<GUI::Statusbar>("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);

2
Userland/Applications/Spreadsheet/SpreadsheetView.cpp
View file

@ -35,7 +35,7 @@
#include <LibGUI/Menu.h>
#include <LibGUI/ModelEditingDelegate.h>
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>
#include <LibGUI/Scrollbar.h>
#include <LibGUI/TableView.h>
#include <LibGfx/Palette.h>

4
Userland/Applications/Spreadsheet/main.cpp
View file

@ -35,7 +35,7 @@
#include <LibGUI/FilePicker.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Window.h>
#include <unistd.h>
@ -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&) {

20
Userland/Applications/SystemMonitor/main.cpp
View file

@ -49,15 +49,15 @@
#include <LibGUI/Label.h>
#include <LibGUI/LazyWidget.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/Painter.h>
#include <LibGUI/SeparatorWidget.h>
#include <LibGUI/SortingProxyModel.h>
#include <LibGUI/StackWidget.h>
#include <LibGUI/StatusBar.h>
#include <LibGUI/Statusbar.h>
#include <LibGUI/TabWidget.h>
#include <LibGUI/TableView.h>
#include <LibGUI/ToolBar.h>
#include <LibGUI/Toolbar.h>
#include <LibGUI/Widget.h>
#include <LibGUI/Window.h>
#include <LibGfx/FontDatabase.h>
@ -76,7 +76,7 @@ static NonnullRefPtr<GUI::Widget> build_devices_tab();
static NonnullRefPtr<GUI::Widget> build_graphs_tab();
static NonnullRefPtr<GUI::Widget> build_processors_tab();
static RefPtr<GUI::StatusBar> statusbar;
static RefPtr<GUI::Statusbar> 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<GUI::TabWidget>();
statusbar = main_widget.add<GUI::StatusBar>(3);
statusbar = main_widget.add<GUI::Statusbar>(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 @@ public:
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<GUI::Widget> 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<ProgressBarPaintingDelegate>());
fs_table_view.set_column_painting_delegate(3, make<ProgressbarPaintingDelegate>());
fs_table_view.model()->update();
};

4
Userland/Applications/Terminal/main.cpp
View file

@ -41,7 +41,7 @@
#include <LibGUI/GroupBox.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/OpacitySlider.h>
#include <LibGUI/RadioButton.h>
#include <LibGUI/SpinBox.h>
@ -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&) {

20
Userland/Applications/TextEditor/TextEditorWidget.cpp
View file

@ -47,15 +47,15 @@
#include <LibGUI/GroupBox.h>
#include <LibGUI/INISyntaxHighlighter.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/RegularEditingEngine.h>
#include <LibGUI/Splitter.h>
#include <LibGUI/StatusBar.h>
#include <LibGUI/Statusbar.h>
#include <LibGUI/TextBox.h>
#include <LibGUI/TextEditor.h>
#include <LibGUI/ToolBar.h>
#include <LibGUI/ToolBarContainer.h>
#include <LibGUI/Toolbar.h>
#include <LibGUI/ToolbarContainer.h>
#include <LibGUI/VimEditingEngine.h>
#include <LibGfx/Font.h>
#include <LibJS/SyntaxHighlighter.h>
@ -69,8 +69,8 @@ TextEditorWidget::TextEditorWidget()
m_config = Core::ConfigFile::get_for_app("TextEditor");
m_toolbar = *find_descendant_of_type_named<GUI::ToolBar>("toolbar");
m_toolbar_container = *find_descendant_of_type_named<GUI::ToolBarContainer>("toolbar_container");
m_toolbar = *find_descendant_of_type_named<GUI::Toolbar>("toolbar");
m_toolbar_container = *find_descendant_of_type_named<GUI::ToolbarContainer>("toolbar_container");
m_editor = *find_descendant_of_type_named<GUI::TextEditor>("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<GUI::StatusBar>("statusbar");
m_statusbar = *find_descendant_of_type_named<GUI::Statusbar>("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);

8
Userland/Applications/TextEditor/TextEditorWidget.h
View file

@ -55,7 +55,7 @@ public:
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 @@ private:
RefPtr<GUI::Action> m_markdown_preview_action;
RefPtr<GUI::Action> m_html_preview_action;
RefPtr<GUI::ToolBar> m_toolbar;
RefPtr<GUI::ToolBarContainer> m_toolbar_container;
RefPtr<GUI::StatusBar> m_statusbar;
RefPtr<GUI::Toolbar> m_toolbar;
RefPtr<GUI::ToolbarContainer> m_toolbar_container;
RefPtr<GUI::Statusbar> m_statusbar;
RefPtr<GUI::TextBox> m_find_textbox;
RefPtr<GUI::TextBox> m_replace_textbox;

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

@ -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"
}
}

4
Userland/Applications/TextEditor/main.cpp
View file

@ -26,7 +26,7 @@
#include "TextEditorWidget.h"
#include <LibCore/ArgsParser.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGfx/Bitmap.h>
#include <stdio.h>
#include <unistd.h>
@ -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);

6
Userland/Applications/ThemeEditor/PreviewWidget.cpp
View file

@ -31,7 +31,7 @@
#include <LibGUI/CheckBox.h>
#include <LibGUI/Painter.h>
#include <LibGUI/RadioButton.h>
#include <LibGUI/StatusBar.h>
#include <LibGUI/Statusbar.h>
#include <LibGUI/TextEditor.h>
#include <LibGfx/Bitmap.h>
#include <LibGfx/WindowTheme.h>
@ -65,7 +65,7 @@ private:
m_checkbox->set_text("Check box");
m_radio = add<GUI::RadioButton>();
m_radio->set_text("Radio button");
m_statusbar = add<GUI::StatusBar>();
m_statusbar = add<GUI::Statusbar>();
m_statusbar->set_text("Status bar");
m_editor = add<GUI::TextEditor>();
m_editor->set_text("Text editor\nwith multiple\nlines.");
@ -84,7 +84,7 @@ private:
RefPtr<GUI::Button> m_button;
RefPtr<GUI::CheckBox> m_checkbox;
RefPtr<GUI::RadioButton> m_radio;
RefPtr<GUI::StatusBar> m_statusbar;
RefPtr<GUI::Statusbar> m_statusbar;
};
PreviewWidget::PreviewWidget(const Gfx::Palette& preview_palette)