mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 14:57: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:
parent
86bdfa1edf
commit
a2baab38fd
141 changed files with 518 additions and 518 deletions
|
@ -58,7 +58,7 @@ DemoWizardDialog::DemoWizardDialog(GUI::Window* parent_window)
|
|||
"Installation in progress...",
|
||||
"Please wait. Do not turn off your computer.");
|
||||
m_page_2->body_widget().load_from_gml(demo_wizard_page_2_gml);
|
||||
m_page_2_progress_bar = m_page_2->body_widget().find_descendant_of_type_named<GUI::ProgressBar>("page_2_progress_bar");
|
||||
m_page_2_progressbar = m_page_2->body_widget().find_descendant_of_type_named<GUI::Progressbar>("page_2_progressbar");
|
||||
m_page_2_timer = Core::Timer::construct(this);
|
||||
m_page_2->on_page_enter = [&]() {
|
||||
m_page_2_progress_value = 0;
|
||||
|
@ -71,7 +71,7 @@ DemoWizardDialog::DemoWizardDialog(GUI::Window* parent_window)
|
|||
m_page_2_timer->on_timeout = [&]() {
|
||||
if (m_page_2_progress_value < 100)
|
||||
m_page_2_progress_value++;
|
||||
m_page_2_progress_bar->set_value(m_page_2_progress_value);
|
||||
m_page_2_progressbar->set_value(m_page_2_progress_value);
|
||||
|
||||
// Go to final page on progress completion
|
||||
if (m_page_2_progress_value == 100) {
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include <LibGUI/ProgressBar.h>
|
||||
#include <LibGUI/Progressbar.h>
|
||||
#include <LibGUI/TextBox.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <LibGUI/Wizards/CoverWizardPage.h>
|
||||
|
@ -47,7 +47,7 @@ private:
|
|||
RefPtr<GUI::TextBox> m_page_1_location_text_box;
|
||||
|
||||
RefPtr<GUI::WizardPage> m_page_2;
|
||||
RefPtr<GUI::ProgressBar> m_page_2_progress_bar;
|
||||
RefPtr<GUI::Progressbar> m_page_2_progressbar;
|
||||
int m_page_2_progress_value { 0 };
|
||||
RefPtr<Core::Timer> m_page_2_timer;
|
||||
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
fixed_height: 32
|
||||
}
|
||||
|
||||
@GUI::ProgressBar {
|
||||
name: "page_2_progress_bar"
|
||||
@GUI::Progressbar {
|
||||
name: "page_2_progressbar"
|
||||
fixed_height: 28
|
||||
}
|
||||
|
||||
|
|
|
@ -126,15 +126,15 @@
|
|||
|
||||
@GUI::Button {
|
||||
name: "enabled_coolbar_button"
|
||||
text: "CoolBar button"
|
||||
button_style: "CoolBar"
|
||||
text: "Coolbar button"
|
||||
button_style: "Coolbar"
|
||||
}
|
||||
|
||||
@GUI::Button {
|
||||
name: "disabled_coolbar_button"
|
||||
text: "Disabled"
|
||||
enabled: "false"
|
||||
button_style: "CoolBar"
|
||||
button_style: "Coolbar"
|
||||
}
|
||||
|
||||
@GUI::Widget {
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
@GUI::Widget {
|
||||
}
|
||||
|
||||
@GUI::ScrollBar {
|
||||
@GUI::Scrollbar {
|
||||
name: "enabled_scrollbar"
|
||||
fixed_height: 16
|
||||
fixed_width: -1
|
||||
|
@ -60,7 +60,7 @@
|
|||
@GUI::Widget {
|
||||
}
|
||||
|
||||
@GUI::ScrollBar {
|
||||
@GUI::Scrollbar {
|
||||
name: "disabled_scrollbar"
|
||||
fixed_height: 16
|
||||
fixed_width: -1
|
||||
|
@ -75,7 +75,7 @@
|
|||
margins: [8, 8, 8, 8]
|
||||
}
|
||||
|
||||
@GUI::VerticalProgressBar {
|
||||
@GUI::VerticalProgressbar {
|
||||
name: "vertical_progressbar_left"
|
||||
fixed_width: 36
|
||||
}
|
||||
|
@ -103,7 +103,7 @@
|
|||
@GUI::VerticalSeparator {
|
||||
}
|
||||
|
||||
@GUI::VerticalProgressBar {
|
||||
@GUI::VerticalProgressbar {
|
||||
name: "vertical_progressbar_right"
|
||||
fixed_width: 36
|
||||
}
|
||||
|
@ -160,7 +160,7 @@
|
|||
@GUI::HorizontalSeparator {
|
||||
}
|
||||
|
||||
@GUI::HorizontalProgressBar {
|
||||
@GUI::HorizontalProgressbar {
|
||||
name: "horizontal_progressbar"
|
||||
fixed_height: 20
|
||||
}
|
||||
|
|
|
@ -191,10 +191,10 @@ GalleryWidget::GalleryWidget()
|
|||
auto& sliders_tab = tab_widget.add_tab<GUI::Widget>("Sliders");
|
||||
sliders_tab.load_from_gml(sliders_tab_gml);
|
||||
|
||||
m_vertical_progressbar_left = sliders_tab.find_descendant_of_type_named<GUI::VerticalProgressBar>("vertical_progressbar_left");
|
||||
m_vertical_progressbar_left = sliders_tab.find_descendant_of_type_named<GUI::VerticalProgressbar>("vertical_progressbar_left");
|
||||
m_vertical_progressbar_left->set_value(0);
|
||||
|
||||
m_vertical_progressbar_right = sliders_tab.find_descendant_of_type_named<GUI::VerticalProgressBar>("vertical_progressbar_right");
|
||||
m_vertical_progressbar_right = sliders_tab.find_descendant_of_type_named<GUI::VerticalProgressbar>("vertical_progressbar_right");
|
||||
m_vertical_progressbar_right->set_value(100);
|
||||
|
||||
m_vertical_slider_left = sliders_tab.find_descendant_of_type_named<GUI::VerticalSlider>("vertical_slider_left");
|
||||
|
@ -208,7 +208,7 @@ GalleryWidget::GalleryWidget()
|
|||
m_vertical_progressbar_right->set_value((100 / m_vertical_slider_right->max()) * (m_vertical_slider_right->max() - value));
|
||||
};
|
||||
|
||||
m_horizontal_progressbar = sliders_tab.find_descendant_of_type_named<GUI::HorizontalProgressBar>("horizontal_progressbar");
|
||||
m_horizontal_progressbar = sliders_tab.find_descendant_of_type_named<GUI::HorizontalProgressbar>("horizontal_progressbar");
|
||||
m_horizontal_progressbar->set_value(0);
|
||||
|
||||
m_horizontal_slider_left = sliders_tab.find_descendant_of_type_named<GUI::HorizontalSlider>("horizontal_slider_left");
|
||||
|
@ -225,10 +225,10 @@ GalleryWidget::GalleryWidget()
|
|||
m_horizontal_slider_left->set_value((value * 100) / m_horizontal_slider_right->max());
|
||||
};
|
||||
|
||||
m_enabled_scrollbar = sliders_tab.find_descendant_of_type_named<GUI::ScrollBar>("enabled_scrollbar");
|
||||
m_enabled_scrollbar = sliders_tab.find_descendant_of_type_named<GUI::Scrollbar>("enabled_scrollbar");
|
||||
m_enabled_scrollbar->set_orientation(Orientation::Horizontal);
|
||||
|
||||
m_disabled_scrollbar = sliders_tab.find_descendant_of_type_named<GUI::ScrollBar>("disabled_scrollbar");
|
||||
m_disabled_scrollbar = sliders_tab.find_descendant_of_type_named<GUI::Scrollbar>("disabled_scrollbar");
|
||||
m_disabled_scrollbar->set_orientation(Orientation::Horizontal);
|
||||
|
||||
m_opacity_imagewidget = sliders_tab.find_descendant_of_type_named<GUI::ImageWidget>("opacity_imagewidget");
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include <LibGUI/ImageWidget.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <LibGUI/OpacitySlider.h>
|
||||
#include <LibGUI/ProgressBar.h>
|
||||
#include <LibGUI/Progressbar.h>
|
||||
#include <LibGUI/Slider.h>
|
||||
#include <LibGUI/Widget.h>
|
||||
#include <LibGfx/Bitmap.h>
|
||||
|
@ -61,12 +61,12 @@ private:
|
|||
RefPtr<GUI::HorizontalSlider> m_horizontal_slider_left;
|
||||
RefPtr<GUI::HorizontalSlider> m_horizontal_slider_right;
|
||||
|
||||
RefPtr<GUI::VerticalProgressBar> m_vertical_progressbar_left;
|
||||
RefPtr<GUI::VerticalProgressBar> m_vertical_progressbar_right;
|
||||
RefPtr<GUI::HorizontalProgressBar> m_horizontal_progressbar;
|
||||
RefPtr<GUI::VerticalProgressbar> m_vertical_progressbar_left;
|
||||
RefPtr<GUI::VerticalProgressbar> m_vertical_progressbar_right;
|
||||
RefPtr<GUI::HorizontalProgressbar> m_horizontal_progressbar;
|
||||
|
||||
RefPtr<GUI::ScrollBar> m_enabled_scrollbar;
|
||||
RefPtr<GUI::ScrollBar> m_disabled_scrollbar;
|
||||
RefPtr<GUI::Scrollbar> m_enabled_scrollbar;
|
||||
RefPtr<GUI::Scrollbar> m_disabled_scrollbar;
|
||||
|
||||
RefPtr<GUI::TextEditor> m_text_editor;
|
||||
RefPtr<GUI::TextEditor> m_wizard_output;
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <LibGUI/Application.h>
|
||||
#include <LibGUI/Icon.h>
|
||||
#include <LibGUI/Menu.h>
|
||||
#include <LibGUI/MenuBar.h>
|
||||
#include <LibGUI/Menubar.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <unistd.h>
|
||||
|
||||
|
@ -75,7 +75,7 @@ int main(int argc, char** argv)
|
|||
window->set_icon(app_icon.bitmap_for_size(16));
|
||||
window->set_main_widget<GalleryWidget>();
|
||||
|
||||
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(); }));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue