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

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