RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:17:35 +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

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