mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 20:07:34 +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
|
@ -80,7 +80,7 @@ ClockWidget::ClockWidget()
|
|||
navigation_container.layout()->set_margins({ 2, 2, 3, 2 });
|
||||
|
||||
m_prev_date = navigation_container.add<GUI::Button>();
|
||||
m_prev_date->set_button_style(Gfx::ButtonStyle::CoolBar);
|
||||
m_prev_date->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_prev_date->set_fixed_size(24, 24);
|
||||
m_prev_date->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"));
|
||||
m_prev_date->on_click = [&](auto) {
|
||||
|
@ -103,7 +103,7 @@ ClockWidget::ClockWidget()
|
|||
};
|
||||
|
||||
m_selected_calendar_button = navigation_container.add<GUI::Button>();
|
||||
m_selected_calendar_button->set_button_style(Gfx::ButtonStyle::CoolBar);
|
||||
m_selected_calendar_button->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_selected_calendar_button->set_fixed_height(24);
|
||||
m_selected_calendar_button->on_click = [&](auto) {
|
||||
m_calendar->toggle_mode();
|
||||
|
@ -114,7 +114,7 @@ ClockWidget::ClockWidget()
|
|||
};
|
||||
|
||||
m_next_date = navigation_container.add<GUI::Button>();
|
||||
m_next_date->set_button_style(Gfx::ButtonStyle::CoolBar);
|
||||
m_next_date->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_next_date->set_fixed_size(24, 24);
|
||||
m_next_date->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"));
|
||||
m_next_date->on_click = [&](auto) {
|
||||
|
@ -164,7 +164,7 @@ ClockWidget::ClockWidget()
|
|||
settings_container.layout()->add_spacer();
|
||||
|
||||
m_jump_to_button = settings_container.add<GUI::Button>();
|
||||
m_jump_to_button->set_button_style(Gfx::ButtonStyle::CoolBar);
|
||||
m_jump_to_button->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_jump_to_button->set_fixed_size(24, 24);
|
||||
m_jump_to_button->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/calendar-date.png"));
|
||||
m_jump_to_button->set_tooltip("Jump to today");
|
||||
|
@ -173,7 +173,7 @@ ClockWidget::ClockWidget()
|
|||
};
|
||||
|
||||
m_calendar_launcher = settings_container.add<GUI::Button>();
|
||||
m_calendar_launcher->set_button_style(Gfx::ButtonStyle::CoolBar);
|
||||
m_calendar_launcher->set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
m_calendar_launcher->set_fixed_size(24, 24);
|
||||
m_calendar_launcher->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-calendar.png"));
|
||||
m_calendar_launcher->set_tooltip("Calendar");
|
||||
|
|
|
@ -72,7 +72,7 @@ void TaskbarButton::resize_event(GUI::ResizeEvent& event)
|
|||
return GUI::Button::resize_event(event);
|
||||
}
|
||||
|
||||
static void paint_custom_progress_bar(GUI::Painter& painter, const Gfx::IntRect& rect, const Gfx::IntRect& text_rect, const Palette& palette, int min, int max, int value, const StringView& text, const Gfx::Font& font, Gfx::TextAlignment text_alignment)
|
||||
static void paint_custom_progressbar(GUI::Painter& painter, const Gfx::IntRect& rect, const Gfx::IntRect& text_rect, const Palette& palette, int min, int max, int value, const StringView& text, const Gfx::Font& font, Gfx::TextAlignment text_alignment)
|
||||
{
|
||||
float range_size = max - min;
|
||||
float progress = (value - min) / range_size;
|
||||
|
@ -145,7 +145,7 @@ void TaskbarButton::paint_event(GUI::PaintEvent& event)
|
|||
if (is_being_pressed() || is_checked()) {
|
||||
adjusted_rect.set_height(adjusted_rect.height() + 1);
|
||||
}
|
||||
paint_custom_progress_bar(painter, adjusted_rect, text_rect, palette(), 0, 100, window.progress(), text(), font, text_alignment());
|
||||
paint_custom_progressbar(painter, adjusted_rect, text_rect, palette(), 0, 100, window.progress(), text(), font, text_alignment());
|
||||
}
|
||||
|
||||
if (is_enabled()) {
|
||||
|
|
|
@ -136,7 +136,7 @@ void TaskbarWindow::create_quick_launch_bar()
|
|||
const int button_size = 24;
|
||||
auto& button = quick_launch_bar.add<GUI::Button>();
|
||||
button.set_fixed_size(button_size, button_size);
|
||||
button.set_button_style(Gfx::ButtonStyle::CoolBar);
|
||||
button.set_button_style(Gfx::ButtonStyle::Coolbar);
|
||||
button.set_icon(af->icon().bitmap_for_size(16));
|
||||
button.set_tooltip(af->name());
|
||||
button.on_click = [app_executable](auto) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue