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

4
Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.cpp
View file

@ -72,8 +72,8 @@ void DebugInfoWidget::init_toolbar()
DebugInfoWidget::DebugInfoWidget()
{
set_layout<GUI::VerticalBoxLayout>();
auto& toolbar_container = add<GUI::ToolBarContainer>();
m_toolbar = toolbar_container.add<GUI::ToolBar>();
auto& toolbar_container = add<GUI::ToolbarContainer>();
m_toolbar = toolbar_container.add<GUI::Toolbar>();
init_toolbar();
auto& bottom_box = add<GUI::Widget>();
bottom_box.set_layout<GUI::HorizontalBoxLayout>();

6
Userland/DevTools/HackStudio/Debugger/DebugInfoWidget.h
View file

@ -33,8 +33,8 @@
#include <LibGUI/Menu.h>
#include <LibGUI/Model.h>
#include <LibGUI/TableView.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 <sys/arch/i386/regs.h>
@ -61,7 +61,7 @@ private:
RefPtr<GUI::TableView> m_registers_view;
RefPtr<GUI::ListView> m_backtrace_view;
RefPtr<GUI::Menu> m_variable_context_menu;
RefPtr<GUI::ToolBar> m_toolbar;
RefPtr<GUI::Toolbar> m_toolbar;
RefPtr<GUI::Action> m_continue_action;
RefPtr<GUI::Action> m_singlestep_action;
RefPtr<GUI::Action> m_step_in_action;

2
Userland/DevTools/HackStudio/Editor.cpp
View file

@ -42,7 +42,7 @@
#include <LibGUI/Label.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>
#include <LibGUI/Scrollbar.h>
#include <LibGUI/Window.h>
#include <LibJS/SyntaxHighlighter.h>
#include <LibMarkdown/Document.h>

2
Userland/DevTools/HackStudio/Git/DiffViewer.cpp
View file

@ -29,7 +29,7 @@
#include <LibDiff/Hunks.h>
#include <LibGUI/AbstractView.h>
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>
#include <LibGUI/Scrollbar.h>
#include <LibGfx/Color.h>
#include <LibGfx/Font.h>
#include <LibGfx/FontDatabase.h>

2
Userland/DevTools/HackStudio/Git/GitFilesView.cpp
View file

@ -27,7 +27,7 @@
#include "GitFilesView.h"
#include <LibGUI/Model.h>
#include <LibGUI/Painter.h>
#include <LibGUI/ScrollBar.h>
#include <LibGUI/Scrollbar.h>
#include <LibGfx/Palette.h>
namespace HackStudio {

26
Userland/DevTools/HackStudio/HackStudioWidget.cpp
View file

@ -66,7 +66,7 @@
#include <LibGUI/ItemListModel.h>
#include <LibGUI/Label.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>
@ -75,8 +75,8 @@
#include <LibGUI/TableView.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/TreeView.h>
#include <LibGUI/VimEditingEngine.h>
#include <LibGUI/Widget.h>
@ -103,7 +103,7 @@ HackStudioWidget::HackStudioWidget(const String& path_to_project)
open_project(path_to_project);
auto& toolbar_container = add<GUI::ToolBarContainer>();
auto& toolbar_container = add<GUI::ToolbarContainer>();
auto& outer_splitter = add<GUI::HorizontalSplitter>();
@ -785,7 +785,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent)
{
m_form_inner_container = parent.add<GUI::Widget>();
m_form_inner_container->set_layout<GUI::HorizontalBoxLayout>();
auto& form_widgets_toolbar = m_form_inner_container->add<GUI::ToolBar>(Orientation::Vertical, 26);
auto& form_widgets_toolbar = m_form_inner_container->add<GUI::Toolbar>(Orientation::Vertical, 26);
form_widgets_toolbar.set_fixed_width(38);
GUI::ActionGroup tool_actions;
@ -868,7 +868,7 @@ void HackStudioWidget::create_form_editor(GUI::Widget& parent)
void HackStudioWidget::create_toolbar(GUI::Widget& parent)
{
auto& toolbar = parent.add<GUI::ToolBar>();
auto& toolbar = parent.add<GUI::Toolbar>();
toolbar.add_action(*m_new_file_action);
toolbar.add_action(*m_new_directory_action);
toolbar.add_action(*m_save_action);
@ -950,7 +950,7 @@ void HackStudioWidget::create_project_tab(GUI::Widget& parent)
};
}
void HackStudioWidget::create_app_menubar(GUI::MenuBar& menubar)
void HackStudioWidget::create_app_menubar(GUI::Menubar& menubar)
{
auto& file_menu = menubar.add_menu("&File");
file_menu.add_action(*m_new_project_action);
@ -962,7 +962,7 @@ void HackStudioWidget::create_app_menubar(GUI::MenuBar& menubar)
}));
}
void HackStudioWidget::create_project_menubar(GUI::MenuBar& menubar)
void HackStudioWidget::create_project_menubar(GUI::Menubar& menubar)
{
auto& project_menu = menubar.add_menu("&Project");
project_menu.add_action(*m_new_file_action);
@ -971,7 +971,7 @@ void HackStudioWidget::create_project_menubar(GUI::MenuBar& menubar)
project_menu.add_action(*create_set_autocomplete_mode_action());
}
void HackStudioWidget::create_edit_menubar(GUI::MenuBar& menubar)
void HackStudioWidget::create_edit_menubar(GUI::Menubar& menubar)
{
auto& edit_menu = menubar.add_menu("&Edit");
edit_menu.add_action(GUI::Action::create("Find in Files...", { Mod_Ctrl | Mod_Shift, Key_F }, Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"), [this](auto&) {
@ -991,7 +991,7 @@ void HackStudioWidget::create_edit_menubar(GUI::MenuBar& menubar)
edit_menu.add_action(vim_emulation_setting_action);
}
void HackStudioWidget::create_build_menubar(GUI::MenuBar& menubar)
void HackStudioWidget::create_build_menubar(GUI::Menubar& menubar)
{
auto& build_menu = menubar.add_menu("&Build");
build_menu.add_action(*m_build_action);
@ -1002,7 +1002,7 @@ void HackStudioWidget::create_build_menubar(GUI::MenuBar& menubar)
build_menu.add_action(*m_debug_action);
}
void HackStudioWidget::create_view_menubar(GUI::MenuBar& menubar)
void HackStudioWidget::create_view_menubar(GUI::Menubar& menubar)
{
auto hide_action_tabs_action = GUI::Action::create("&Hide Action Tabs", { Mod_Ctrl | Mod_Shift, Key_X }, [this](auto&) {
hide_action_tabs();
@ -1048,7 +1048,7 @@ void HackStudioWidget::create_view_menubar(GUI::MenuBar& menubar)
view_menu.add_action(*m_remove_current_terminal_action);
}
void HackStudioWidget::create_help_menubar(GUI::MenuBar& menubar)
void HackStudioWidget::create_help_menubar(GUI::Menubar& menubar)
{
auto& help_menu = menubar.add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Hack Studio", GUI::Icon::default_icon("app-hack-studio"), window()));
@ -1073,7 +1073,7 @@ NonnullRefPtr<GUI::Action> HackStudioWidget::create_set_autocomplete_mode_action
return action;
}
void HackStudioWidget::initialize_menubar(GUI::MenuBar& menubar)
void HackStudioWidget::initialize_menubar(GUI::Menubar& menubar)
{
create_app_menubar(menubar);
create_project_menubar(menubar);

16
Userland/DevTools/HackStudio/HackStudioWidget.h
View file

@ -41,7 +41,7 @@
#include "ProjectFile.h"
#include "TerminalWrapper.h"
#include <LibGUI/ActionGroup.h>
#include <LibGUI/ScrollBar.h>
#include <LibGUI/Scrollbar.h>
#include <LibGUI/Splitter.h>
#include <LibGUI/Widget.h>
#include <LibThread/Thread.h>
@ -62,7 +62,7 @@ public:
void set_current_editor_wrapper(RefPtr<EditorWrapper>);
String currently_open_file() const { return m_currently_open_file; }
void initialize_menubar(GUI::MenuBar&);
void initialize_menubar(GUI::Menubar&);
Locator& locator()
{
@ -117,12 +117,12 @@ private:
void create_form_editor(GUI::Widget& parent);
void create_toolbar(GUI::Widget& parent);
void create_action_tab(GUI::Widget& parent);
void create_app_menubar(GUI::MenuBar&);
void create_project_menubar(GUI::MenuBar&);
void create_edit_menubar(GUI::MenuBar&);
void create_build_menubar(GUI::MenuBar&);
void create_view_menubar(GUI::MenuBar&);
void create_help_menubar(GUI::MenuBar&);
void create_app_menubar(GUI::Menubar&);
void create_project_menubar(GUI::Menubar&);
void create_edit_menubar(GUI::Menubar&);
void create_build_menubar(GUI::Menubar&);
void create_view_menubar(GUI::Menubar&);
void create_help_menubar(GUI::Menubar&);
void create_project_tab(GUI::Widget& parent);
void configure_project_tree_view();

4
Userland/DevTools/HackStudio/main.cpp
View file

@ -34,7 +34,7 @@
#include <LibCore/EventLoop.h>
#include <LibCore/File.h>
#include <LibGUI/Application.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Notification.h>
#include <LibGUI/Widget.h>
@ -97,7 +97,7 @@ int main(int argc, char** argv)
s_window->set_title(String::formatted("{} - Hack Studio", s_hack_studio_widget->project().name()));
auto menubar = GUI::MenuBar::construct();
auto menubar = GUI::Menubar::construct();
s_hack_studio_widget->initialize_menubar(menubar);
s_window->set_menubar(menubar);

4
Userland/DevTools/Inspector/main.cpp
View file

@ -34,7 +34,7 @@
#include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/ModelEditingDelegate.h>
#include <LibGUI/ProcessChooser.h>
@ -128,7 +128,7 @@ int main(int argc, char** argv)
window->resize(685, 500);
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(); }));

4
Userland/DevTools/Playground/main.cpp
View file

@ -36,7 +36,7 @@
#include <LibGUI/GMLSyntaxHighlighter.h>
#include <LibGUI/Icon.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Painter.h>
#include <LibGUI/Splitter.h>
@ -153,7 +153,7 @@ int main(int argc, char** argv)
});
};
auto menubar = GUI::MenuBar::construct();
auto menubar = GUI::Menubar::construct();
auto& app_menu = menubar->add_menu("&File");
app_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {

4
Userland/DevTools/Profiler/main.cpp
View file

@ -39,7 +39,7 @@
#include <LibGUI/Button.h>
#include <LibGUI/Label.h>
#include <LibGUI/Menu.h>
#include <LibGUI/MenuBar.h>
#include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h>
#include <LibGUI/Model.h>
#include <LibGUI/ProcessChooser.h>
@ -140,7 +140,7 @@ int main(int argc, char** argv)
individual_sample_view.set_model(move(model));
};
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(); }));