diff options
30 files changed, 83 insertions, 83 deletions
diff --git a/Userland/Applications/Assistant/main.cpp b/Userland/Applications/Assistant/main.cpp index 260ff7e754..9a672c40a2 100644 --- a/Userland/Applications/Assistant/main.cpp +++ b/Userland/Applications/Assistant/main.cpp @@ -57,7 +57,7 @@ class ResultRow final : public GUI::Button { if (!m_context_menu) { m_context_menu = GUI::Menu::construct(); - if (LexicalPath path { text() }; path.is_absolute()) { + if (LexicalPath path { text_deprecated() }; path.is_absolute()) { m_context_menu->add_action(GUI::Action::create("&Show in File Manager", MUST(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-file-manager.png"sv)), [=](auto&) { Desktop::Launcher::open(URL::create_with_file_scheme(path.dirname(), path.basename())); })); @@ -65,7 +65,7 @@ class ResultRow final : public GUI::Button { } m_context_menu->add_action(GUI::Action::create("&Copy as Text", MUST(Gfx::Bitmap::load_from_file("/res/icons/16x16/edit-copy.png"sv)), [&](auto&) { - GUI::Clipboard::the().set_plain_text(text()); + GUI::Clipboard::the().set_plain_text(text_deprecated()); })); } m_context_menu->popup(event.screen_position()); @@ -256,7 +256,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments) auto& result = app_state.results[i]; auto& match = results_container.add<Assistant::ResultRow>(); match.set_icon(result.bitmap()); - match.set_text(move(result.title())); + match.set_text_deprecated(move(result.title())); match.set_tooltip(move(result.tooltip())); match.on_click = [&result](auto) { result.activate(); diff --git a/Userland/Applications/Browser/BookmarksBarWidget.cpp b/Userland/Applications/Browser/BookmarksBarWidget.cpp index e3e02a2bd1..48207ee1e0 100644 --- a/Userland/Applications/Browser/BookmarksBarWidget.cpp +++ b/Userland/Applications/Browser/BookmarksBarWidget.cpp @@ -205,7 +205,7 @@ void BookmarksBarWidget::model_did_update(unsigned) m_bookmarks.append(button); button.set_button_style(Gfx::ButtonStyle::Coolbar); - button.set_text(title); + button.set_text_deprecated(title); button.set_icon(g_icon_bag.filetype_html); button.set_fixed_size(font().width(title) + 32, 20); button.set_relative_rect(rect); @@ -264,7 +264,7 @@ void BookmarksBarWidget::update_content_size() for (size_t i = m_last_visible_index; i < m_bookmarks.size(); ++i) { auto& bookmark = m_bookmarks.at(i); bookmark.set_visible(false); - m_additional_menu->add_action(GUI::Action::create(bookmark.text(), g_icon_bag.filetype_html, [&](auto&) { bookmark.on_click(0); })); + m_additional_menu->add_action(GUI::Action::create(bookmark.text_deprecated(), g_icon_bag.filetype_html, [&](auto&) { bookmark.on_click(0); })); } } } diff --git a/Userland/Applications/Browser/DownloadWidget.cpp b/Userland/Applications/Browser/DownloadWidget.cpp index 9dcdd80322..19a679b148 100644 --- a/Userland/Applications/Browser/DownloadWidget.cpp +++ b/Userland/Applications/Browser/DownloadWidget.cpp @@ -153,7 +153,7 @@ void DownloadWidget::did_finish(bool success) m_browser_image->load_from_file("/res/graphics/download-finished.gif"sv); window()->set_title("Download finished!"); m_close_button->set_enabled(true); - m_cancel_button->set_text("Open in Folder"); + m_cancel_button->set_text_deprecated("Open in Folder"); m_cancel_button->on_click = [this](auto) { Desktop::Launcher::open(URL::create_with_file_scheme(Core::StandardPaths::downloads_directory(), m_url.basename())); window()->close(); diff --git a/Userland/Applications/HexEditor/FindDialog.cpp b/Userland/Applications/HexEditor/FindDialog.cpp index c3204f64b4..739a31dbe2 100644 --- a/Userland/Applications/HexEditor/FindDialog.cpp +++ b/Userland/Applications/HexEditor/FindDialog.cpp @@ -112,7 +112,7 @@ FindDialog::FindDialog() auto action = options[i]; auto& radio = radio_container.add<GUI::RadioButton>(); radio.set_enabled(action.enabled); - radio.set_text(action.title); + radio.set_text_deprecated(action.title); radio.on_checked = [this, i](auto) { m_selected_option = options[i].opt; diff --git a/Userland/Applications/KeyboardMapper/KeyButton.cpp b/Userland/Applications/KeyboardMapper/KeyButton.cpp index d5417d88d5..c444a3df6b 100644 --- a/Userland/Applications/KeyboardMapper/KeyButton.cpp +++ b/Userland/Applications/KeyboardMapper/KeyButton.cpp @@ -38,13 +38,13 @@ void KeyButton::paint_event(GUI::PaintEvent& event) painter.draw_rect(key_cap_face_border_rect, Color::from_rgb(0x8C7272), false); painter.fill_rect(key_cap_face_rect, face_color); - if (text().is_empty() || text().starts_with('\0')) + if (text_deprecated().is_empty() || text_deprecated().starts_with('\0')) return; - Gfx::IntRect text_rect { 0, 0, static_cast<int>(ceilf(font.width(text()))), font.glyph_height() }; + Gfx::IntRect text_rect { 0, 0, static_cast<int>(ceilf(font.width(text_deprecated()))), font.glyph_height() }; text_rect.align_within(key_cap_face_rect, Gfx::TextAlignment::Center); - painter.draw_text(text_rect, text(), font, Gfx::TextAlignment::Center, Color::Black, Gfx::TextElision::Right); + painter.draw_text(text_rect, text_deprecated(), font, Gfx::TextAlignment::Center, Color::Black, Gfx::TextElision::Right); if (is_focused()) painter.draw_rect(text_rect.inflated(6, 4), palette().focus_outline()); } diff --git a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp index 9d97082a3b..85bc04b8ce 100644 --- a/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp +++ b/Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp @@ -52,7 +52,7 @@ void KeyboardMapperWidget::create_frame() auto& tmp_button = main_widget.add<KeyButton>(); tmp_button.set_relative_rect(rect); - tmp_button.set_text(keys[i].name); + tmp_button.set_text_deprecated(keys[i].name); tmp_button.set_enabled(keys[i].enabled); tmp_button.on_click = [this, &tmp_button]() { @@ -64,7 +64,7 @@ void KeyboardMapperWidget::create_frame() auto index = keys[i].map_index; VERIFY(index > 0); - tmp_button.set_text(value); + tmp_button.set_text_deprecated(value); u32* map = map_from_name(m_current_map_name); if (value.length() == 0) @@ -248,7 +248,7 @@ void KeyboardMapperWidget::set_current_map(const DeprecatedString current_map) StringBuilder sb; sb.append_code_point(map[index]); - m_keys.at(k)->set_text(sb.to_deprecated_string()); + m_keys.at(k)->set_text_deprecated(sb.to_deprecated_string()); } this->update(); diff --git a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp index fd4e53b418..a0b72ebbbb 100644 --- a/Userland/Applications/PDFViewer/PDFViewerWidget.cpp +++ b/Userland/Applications/PDFViewer/PDFViewerWidget.cpp @@ -340,11 +340,11 @@ void PDFViewerWidget::initialize_toolbar(GUI::Toolbar& toolbar) toolbar.add_separator(); m_show_clipping_paths = toolbar.add<GUI::CheckBox>(); - m_show_clipping_paths->set_text("Show clipping paths"); + m_show_clipping_paths->set_text_deprecated("Show clipping paths"); m_show_clipping_paths->set_checked(m_viewer->show_clipping_paths(), GUI::AllowCallback::No); m_show_clipping_paths->on_checked = [&](auto checked) { m_viewer->set_show_clipping_paths(checked); }; m_show_images = toolbar.add<GUI::CheckBox>(); - m_show_images->set_text("Show images"); + m_show_images->set_text_deprecated("Show images"); m_show_images->set_checked(m_viewer->show_images(), GUI::AllowCallback::No); m_show_images->on_checked = [&](auto checked) { m_viewer->set_show_images(checked); }; } diff --git a/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp b/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp index ba551d9b08..9fc5d1ae8a 100644 --- a/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp +++ b/Userland/Applications/PixelPaint/CreateNewImageDialog.cpp @@ -111,7 +111,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window) }; auto& set_defaults_checkbox = main_widget->add<GUI::CheckBox>(); - set_defaults_checkbox.set_text("Use these settings as default"); + set_defaults_checkbox.set_text_deprecated("Use these settings as default"); auto& button_container = main_widget->add<GUI::Widget>(); button_container.set_layout<GUI::HorizontalBoxLayout>(); diff --git a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp index e6564abd04..0b83e5dd30 100644 --- a/Userland/Applications/PixelPaint/Tools/EraseTool.cpp +++ b/Userland/Applications/PixelPaint/Tools/EraseTool.cpp @@ -100,7 +100,7 @@ GUI::Widget* EraseTool::get_properties_widget() auto& use_secondary_color_checkbox = secondary_color_container.add<GUI::CheckBox>(); use_secondary_color_checkbox.set_checked(m_use_secondary_color); - use_secondary_color_checkbox.set_text("Use secondary color"); + use_secondary_color_checkbox.set_text_deprecated("Use secondary color"); use_secondary_color_checkbox.on_checked = [&](bool checked) { m_use_secondary_color = checked; }; diff --git a/Userland/Applications/ThemeEditor/MainWidget.cpp b/Userland/Applications/ThemeEditor/MainWidget.cpp index abb662bde3..65702c6b2a 100644 --- a/Userland/Applications/ThemeEditor/MainWidget.cpp +++ b/Userland/Applications/ThemeEditor/MainWidget.cpp @@ -487,7 +487,7 @@ ErrorOr<void> MainWidget::add_property_tab(PropertyTab const& property_tab) TRY(row_widget->load_from_gml(flag_property_gml)); auto& checkbox = *row_widget->find_descendant_of_type_named<GUI::CheckBox>("checkbox"); - checkbox.set_text(to_string(role)); + checkbox.set_text_deprecated(to_string(role)); checkbox.on_checked = [&, role](bool checked) { set_flag(role, checked); }; diff --git a/Userland/Games/Hearts/Game.cpp b/Userland/Games/Hearts/Game.cpp index d349b52d9a..0e052f63ee 100644 --- a/Userland/Games/Hearts/Game.cpp +++ b/Userland/Games/Hearts/Game.cpp @@ -180,13 +180,13 @@ void Game::setup(DeprecatedString player_name, int hand_number) m_human_can_play = true; switch (passing_direction()) { case PassingDirection::Left: - m_passing_button->set_text("Pass Left"); + m_passing_button->set_text_deprecated("Pass Left"); break; case PassingDirection::Across: - m_passing_button->set_text("Pass Across"); + m_passing_button->set_text_deprecated("Pass Across"); break; case PassingDirection::Right: - m_passing_button->set_text("Pass Right"); + m_passing_button->set_text_deprecated("Pass Right"); break; default: VERIFY_NOT_REACHED(); @@ -871,7 +871,7 @@ void Game::pass_cards() } m_state = State::PassingAccept; - m_passing_button->set_text("OK"); + m_passing_button->set_text_deprecated("OK"); m_passing_button->set_enabled(true); } diff --git a/Userland/Libraries/LibGUI/AbstractButton.cpp b/Userland/Libraries/LibGUI/AbstractButton.cpp index c66cd8ee01..9eb76abf2d 100644 --- a/Userland/Libraries/LibGUI/AbstractButton.cpp +++ b/Userland/Libraries/LibGUI/AbstractButton.cpp @@ -17,7 +17,7 @@ namespace GUI { AbstractButton::AbstractButton(DeprecatedString text) { - set_text(move(text)); + set_text_deprecated(move(text)); set_focus_policy(GUI::FocusPolicy::StrongFocus); set_background_role(Gfx::ColorRole::Button); @@ -28,13 +28,13 @@ AbstractButton::AbstractButton(DeprecatedString text) click(); }; - REGISTER_STRING_PROPERTY("text", text, set_text); + REGISTER_STRING_PROPERTY("text", text_deprecated, set_text_deprecated); REGISTER_BOOL_PROPERTY("checked", is_checked, set_checked); REGISTER_BOOL_PROPERTY("checkable", is_checkable, set_checkable); REGISTER_BOOL_PROPERTY("exclusive", is_exclusive, set_exclusive); } -void AbstractButton::set_text(DeprecatedString text) +void AbstractButton::set_text_deprecated(DeprecatedString text) { if (m_text == text) return; @@ -238,14 +238,14 @@ void AbstractButton::paint_text(Painter& painter, Gfx::IntRect const& rect, Gfx: auto clipped_rect = rect.intersected(this->rect()); if (!is_enabled()) { - painter.draw_text(clipped_rect.translated(1, 1), text(), font, text_alignment, palette().disabled_text_back(), Gfx::TextElision::Right, text_wrapping); - painter.draw_text(clipped_rect, text(), font, text_alignment, palette().disabled_text_front(), Gfx::TextElision::Right, text_wrapping); + painter.draw_text(clipped_rect.translated(1, 1), text_deprecated(), font, text_alignment, palette().disabled_text_back(), Gfx::TextElision::Right, text_wrapping); + painter.draw_text(clipped_rect, text_deprecated(), font, text_alignment, palette().disabled_text_front(), Gfx::TextElision::Right, text_wrapping); return; } - if (text().is_empty()) + if (text_deprecated().is_empty()) return; - painter.draw_text(clipped_rect, text(), font, text_alignment, palette().color(foreground_role()), Gfx::TextElision::Right, text_wrapping); + painter.draw_text(clipped_rect, text_deprecated(), font, text_alignment, palette().color(foreground_role()), Gfx::TextElision::Right, text_wrapping); } void AbstractButton::change_event(Event& event) diff --git a/Userland/Libraries/LibGUI/AbstractButton.h b/Userland/Libraries/LibGUI/AbstractButton.h index 890d5f7c62..c24ab8a83b 100644 --- a/Userland/Libraries/LibGUI/AbstractButton.h +++ b/Userland/Libraries/LibGUI/AbstractButton.h @@ -20,8 +20,8 @@ public: Function<void(bool)> on_checked; - virtual void set_text(DeprecatedString); - DeprecatedString const& text() const { return m_text; } + virtual void set_text_deprecated(DeprecatedString); + DeprecatedString const& text_deprecated() const { return m_text; } bool is_exclusive() const { return m_exclusive; } void set_exclusive(bool b) { m_exclusive = b; } diff --git a/Userland/Libraries/LibGUI/Action.cpp b/Userland/Libraries/LibGUI/Action.cpp index a454e9a752..95d56aabba 100644 --- a/Userland/Libraries/LibGUI/Action.cpp +++ b/Userland/Libraries/LibGUI/Action.cpp @@ -289,7 +289,7 @@ void Action::set_text(DeprecatedString text) return; m_text = move(text); for_each_toolbar_button([&](auto& button) { - button.set_text(m_text); + button.set_text_deprecated(m_text); }); for_each_menu_item([&](auto& menu_item) { menu_item.update_from_action({}); diff --git a/Userland/Libraries/LibGUI/Breadcrumbbar.cpp b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp index ad16f33126..bbb274afc3 100644 --- a/Userland/Libraries/LibGUI/Breadcrumbbar.cpp +++ b/Userland/Libraries/LibGUI/Breadcrumbbar.cpp @@ -75,7 +75,7 @@ void Breadcrumbbar::append_segment(DeprecatedString text, Gfx::Bitmap const* ico { auto& button = add<BreadcrumbButton>(); button.set_button_style(Gfx::ButtonStyle::Coolbar); - button.set_text(text); + button.set_text_deprecated(text); button.set_icon(icon); button.set_tooltip(move(tooltip)); button.set_focus_policy(FocusPolicy::TabFocus); diff --git a/Userland/Libraries/LibGUI/Button.cpp b/Userland/Libraries/LibGUI/Button.cpp index 439a28faf4..eccd73cc23 100644 --- a/Userland/Libraries/LibGUI/Button.cpp +++ b/Userland/Libraries/LibGUI/Button.cpp @@ -61,12 +61,12 @@ void Button::paint_event(PaintEvent& event) Gfx::StylePainter::paint_button(painter, rect(), palette(), m_button_style, paint_pressed, is_hovered(), is_checked(), is_enabled(), is_focused(), is_default() && !another_button_has_focus()); - if (text().is_empty() && !m_icon) + if (text_deprecated().is_empty() && !m_icon) return; auto content_rect = rect().shrunken(8, 2); auto icon_location = m_icon ? content_rect.center().translated(-(m_icon->width() / 2), -(m_icon->height() / 2)) : Gfx::IntPoint(); - if (m_icon && !text().is_empty()) + if (m_icon && !text_deprecated().is_empty()) icon_location.set_x(content_rect.x()); if (paint_pressed || is_checked()) { @@ -103,12 +103,12 @@ void Button::paint_event(PaintEvent& event) m_icon->invert(); } auto& font = is_checked() ? this->font().bold_variant() : this->font(); - if (m_icon && !text().is_empty()) { + if (m_icon && !text_deprecated().is_empty()) { content_rect.translate_by(m_icon->width() + icon_spacing(), 0); content_rect.set_width(content_rect.width() - m_icon->width() - icon_spacing()); } - Gfx::IntRect text_rect { 0, 0, static_cast<int>(ceilf(font.width(text()))), font.glyph_height() }; + Gfx::IntRect text_rect { 0, 0, static_cast<int>(ceilf(font.width(text_deprecated()))), font.glyph_height() }; if (text_rect.width() > content_rect.width()) text_rect.set_width(content_rect.width()); text_rect.align_within(content_rect, text_alignment()); @@ -116,7 +116,7 @@ void Button::paint_event(PaintEvent& event) if (is_focused()) { Gfx::IntRect focus_rect; - if (m_icon && !text().is_empty()) + if (m_icon && !text_deprecated().is_empty()) focus_rect = text_rect.inflated(4, 4); else focus_rect = rect().shrunken(8, 8); @@ -274,9 +274,9 @@ Optional<UISize> Button::calculated_min_size() const { int horizontal = 0, vertical = 0; - if (!text().is_empty()) { + if (!text_deprecated().is_empty()) { auto& font = this->font(); - horizontal = font.width(text()) + 2; + horizontal = font.width(text_deprecated()) + 2; vertical = font.glyph_height() + 4; // FIXME: Use actual maximum total height } diff --git a/Userland/Libraries/LibGUI/CheckBox.cpp b/Userland/Libraries/LibGUI/CheckBox.cpp index 64f62d7de9..bc99c52268 100644 --- a/Userland/Libraries/LibGUI/CheckBox.cpp +++ b/Userland/Libraries/LibGUI/CheckBox.cpp @@ -42,7 +42,7 @@ void CheckBox::paint_event(PaintEvent& event) auto text_rect = rect(); if (m_checkbox_position == CheckBoxPosition::Left) text_rect.set_left(s_box_width + s_horizontal_padding); - text_rect.set_width(font().width(text())); + text_rect.set_width(font().width(text_deprecated())); text_rect.set_top(height() / 2 - font().glyph_height() / 2); text_rect.set_height(font().glyph_height()); @@ -85,7 +85,7 @@ void CheckBox::set_autosize(bool autosize) void CheckBox::size_to_fit() { - set_fixed_width(s_box_width + font().width(text()) + s_horizontal_padding * 2); + set_fixed_width(s_box_width + font().width(text_deprecated()) + s_horizontal_padding * 2); } } diff --git a/Userland/Libraries/LibGUI/ColorPicker.cpp b/Userland/Libraries/LibGUI/ColorPicker.cpp index ad1364e7cd..68d1dbe01d 100644 --- a/Userland/Libraries/LibGUI/ColorPicker.cpp +++ b/Userland/Libraries/LibGUI/ColorPicker.cpp @@ -234,14 +234,14 @@ void ColorPicker::build_ui() button_container.layout()->add_spacer(); auto& ok_button = button_container.add<DialogButton>(); - ok_button.set_text("OK"); + ok_button.set_text_deprecated("OK"); ok_button.on_click = [this](auto) { done(ExecResult::OK); }; ok_button.set_default(true); auto& cancel_button = button_container.add<DialogButton>(); - cancel_button.set_text("Cancel"); + cancel_button.set_text_deprecated("Cancel"); cancel_button.on_click = [this](auto) { done(ExecResult::Cancel); }; diff --git a/Userland/Libraries/LibGUI/FilePicker.cpp b/Userland/Libraries/LibGUI/FilePicker.cpp index c69a823bef..ee4203659f 100644 --- a/Userland/Libraries/LibGUI/FilePicker.cpp +++ b/Userland/Libraries/LibGUI/FilePicker.cpp @@ -217,14 +217,14 @@ FilePicker::FilePicker(Window* parent_window, Mode mode, StringView filename, St }; auto& ok_button = *widget->find_descendant_of_type_named<GUI::Button>("ok_button"); - ok_button.set_text(ok_button_name(m_mode)); + ok_button.set_text_deprecated(ok_button_name(m_mode)); ok_button.on_click = [this](auto) { on_file_return(); }; ok_button.set_enabled(m_mode == Mode::OpenFolder || !m_filename_textbox->text().is_empty()); auto& cancel_button = *widget->find_descendant_of_type_named<GUI::Button>("cancel_button"); - cancel_button.set_text("Cancel"); + cancel_button.set_text_deprecated("Cancel"); cancel_button.on_click = [this](auto) { done(ExecResult::Cancel); }; diff --git a/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp b/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp index a1524c2b1f..cbdc5b3d18 100644 --- a/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp +++ b/Userland/Libraries/LibGUI/IncrementalSearchBanner.cpp @@ -37,7 +37,7 @@ IncrementalSearchBanner::IncrementalSearchBanner(TextEditor& editor) }; m_close_button = find_descendant_of_type_named<Button>("incremental_search_banner_close_button"); - m_close_button->set_text("\xE2\x9D\x8C"); + m_close_button->set_text_deprecated("\xE2\x9D\x8C"); m_close_button->on_click = [this](auto) { hide(); }; diff --git a/Userland/Libraries/LibGUI/InputBox.cpp b/Userland/Libraries/LibGUI/InputBox.cpp index dde63448dd..b1948c35ef 100644 --- a/Userland/Libraries/LibGUI/InputBox.cpp +++ b/Userland/Libraries/LibGUI/InputBox.cpp @@ -107,7 +107,7 @@ void InputBox::build() button_container_inner.layout()->add_spacer(); m_ok_button = button_container_inner.add<DialogButton>(); - m_ok_button->set_text("OK"); + m_ok_button->set_text_deprecated("OK"); m_ok_button->on_click = [this](auto) { dbgln("GUI::InputBox: OK button clicked"); done(ExecResult::OK); @@ -115,7 +115,7 @@ void InputBox::build() m_ok_button->set_default(true); m_cancel_button = button_container_inner.add<DialogButton>(); - m_cancel_button->set_text("Cancel"); + m_cancel_button->set_text_deprecated("Cancel"); m_cancel_button->on_click = [this](auto) { dbgln("GUI::InputBox: Cancel button clicked"); done(ExecResult::Cancel); diff --git a/Userland/Libraries/LibGUI/MessageBox.cpp b/Userland/Libraries/LibGUI/MessageBox.cpp index ace4b8fcd9..1017d540da 100644 --- a/Userland/Libraries/LibGUI/MessageBox.cpp +++ b/Userland/Libraries/LibGUI/MessageBox.cpp @@ -49,9 +49,9 @@ Dialog::ExecResult MessageBox::ask_about_unsaved_changes(Window* parent_window, if (parent_window) box->set_icon(parent_window->icon()); - box->m_yes_button->set_text(path.is_empty() ? "Save As..." : "Save"); - box->m_no_button->set_text("Discard"); - box->m_cancel_button->set_text("Cancel"); + box->m_yes_button->set_text_deprecated(path.is_empty() ? "Save As..." : "Save"); + box->m_no_button->set_text_deprecated("Discard"); + box->m_cancel_button->set_text_deprecated("Cancel"); return box->exec(); } @@ -154,7 +154,7 @@ void MessageBox::build() auto add_button = [&](DeprecatedString label, ExecResult result) -> GUI::Button& { auto& button = button_container.add<Button>(); button.set_fixed_width(button_width); - button.set_text(label); + button.set_text_deprecated(label); button.on_click = [this, label, result](auto) { done(result); }; diff --git a/Userland/Libraries/LibGUI/RadioButton.cpp b/Userland/Libraries/LibGUI/RadioButton.cpp index f49ba66591..0c860c9a79 100644 --- a/Userland/Libraries/LibGUI/RadioButton.cpp +++ b/Userland/Libraries/LibGUI/RadioButton.cpp @@ -46,7 +46,7 @@ void RadioButton::paint_event(PaintEvent& event) Gfx::StylePainter::paint_radio_button(painter, circle_rect, palette(), is_checked(), is_being_pressed()); - Gfx::IntRect text_rect { circle_rect.right() + 7, 0, static_cast<int>(ceilf(font().width(text()))), font().glyph_height() }; + Gfx::IntRect text_rect { circle_rect.right() + 7, 0, static_cast<int>(ceilf(font().width(text_deprecated()))), font().glyph_height() }; text_rect.center_vertically_within(rect()); paint_text(painter, text_rect, font(), Gfx::TextAlignment::TopLeft); @@ -66,7 +66,7 @@ Optional<UISize> RadioButton::calculated_min_size() const int horizontal = 2 + 7, vertical = 0; auto& font = this->font(); vertical = max(font.glyph_height(), circle_size().height()); - horizontal += font.width(text()); + horizontal += font.width(text_deprecated()); return UISize(horizontal, vertical); } diff --git a/Userland/Libraries/LibGUI/Statusbar.cpp b/Userland/Libraries/LibGUI/Statusbar.cpp index bcc1f82454..73c2d0450a 100644 --- a/Userland/Libraries/LibGUI/Statusbar.cpp +++ b/Userland/Libraries/LibGUI/Statusbar.cpp @@ -86,7 +86,7 @@ void Statusbar::update_segment(size_t index) if (!text(i).is_empty()) m_segments[i].set_visible(true); } - segment.set_text(segment.restored_text()); + segment.set_text_deprecated(segment.restored_text()); segment.set_frame_shape(Gfx::FrameShape::Panel); if (segment.mode() != Segment::Mode::Proportional) segment.set_fixed_width(segment.restored_width()); @@ -95,7 +95,7 @@ void Statusbar::update_segment(size_t index) if (!m_segments[i].is_clickable()) m_segments[i].set_visible(false); } - segment.set_text(segment.override_text()); + segment.set_text_deprecated(segment.override_text()); segment.set_frame_shape(Gfx::FrameShape::NoFrame); if (segment.mode() != Segment::Mode::Proportional) segment.set_fixed_width(SpecialDimension::Grow); @@ -104,7 +104,7 @@ void Statusbar::update_segment(size_t index) DeprecatedString Statusbar::text(size_t index) const { - return m_segments.at(index).text(); + return m_segments.at(index).text_deprecated(); } void Statusbar::set_text(DeprecatedString text) @@ -157,8 +157,8 @@ void Statusbar::Segment::paint_event(PaintEvent& event) if (is_clickable()) Button::paint_event(event); - else if (!text().is_empty()) - painter.draw_text(rect().shrunken(font().max_glyph_width(), 0), text(), text_alignment(), palette().color(foreground_role()), Gfx::TextElision::Right, Gfx::TextWrapping::DontWrap); + else if (!text_deprecated().is_empty()) + painter.draw_text(rect().shrunken(font().max_glyph_width(), 0), text_deprecated(), text_alignment(), palette().color(foreground_role()), Gfx::TextElision::Right, Gfx::TextWrapping::DontWrap); } void Statusbar::Segment::mousedown_event(MouseEvent& event) diff --git a/Userland/Libraries/LibGUI/Toolbar.cpp b/Userland/Libraries/LibGUI/Toolbar.cpp index 16eaf772d3..360632c756 100644 --- a/Userland/Libraries/LibGUI/Toolbar.cpp +++ b/Userland/Libraries/LibGUI/Toolbar.cpp @@ -56,18 +56,18 @@ private: if (action.icon()) set_icon(action.icon()); else - set_text(action.text()); + set_text_deprecated(action.text()); set_button_style(Gfx::ButtonStyle::Coolbar); } - virtual void set_text(DeprecatedString text) override + virtual void set_text_deprecated(DeprecatedString text) override { auto const* action = this->action(); VERIFY(action); set_tooltip(tooltip(*action)); if (!action->icon()) - Button::set_text(move(text)); + Button::set_text_deprecated(move(text)); } DeprecatedString tooltip(Action const& action) const diff --git a/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp b/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp index 4654af9f4d..bd27698c3b 100644 --- a/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp +++ b/Userland/Libraries/LibGUI/Wizards/WizardDialog.cpp @@ -122,9 +122,9 @@ void WizardDialog::update_navigation() m_back_button->set_enabled(m_page_stack.size() > 1); if (has_pages()) { m_next_button->set_enabled(current_page().is_final_page() || current_page().can_go_next()); - m_next_button->set_text(current_page().is_final_page() ? "Finish" : "Next >"); + m_next_button->set_text_deprecated(current_page().is_final_page() ? "Finish" : "Next >"); } else { - m_next_button->set_text("Next >"); + m_next_button->set_text_deprecated("Next >"); m_next_button->set_enabled(false); } } diff --git a/Userland/Services/Taskbar/ClockWidget.cpp b/Userland/Services/Taskbar/ClockWidget.cpp index 1676328770..033e5d3cea 100644 --- a/Userland/Services/Taskbar/ClockWidget.cpp +++ b/Userland/Services/Taskbar/ClockWidget.cpp @@ -71,9 +71,9 @@ ClockWidget::ClockWidget() } m_calendar->update_tiles(view_year, view_month); if (m_calendar->mode() == GUI::Calendar::Year) - m_selected_calendar_button->set_text(m_calendar->formatted_date(GUI::Calendar::YearOnly)); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date(GUI::Calendar::YearOnly)); else - m_selected_calendar_button->set_text(m_calendar->formatted_date()); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date()); }; m_selected_calendar_button = navigation_container.add<GUI::Button>(); @@ -82,9 +82,9 @@ ClockWidget::ClockWidget() m_selected_calendar_button->on_click = [&](auto) { m_calendar->toggle_mode(); if (m_calendar->mode() == GUI::Calendar::Year) - m_selected_calendar_button->set_text(m_calendar->formatted_date(GUI::Calendar::YearOnly)); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date(GUI::Calendar::YearOnly)); else - m_selected_calendar_button->set_text(m_calendar->formatted_date()); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date()); }; m_next_date = navigation_container.add<GUI::Button>(); @@ -105,9 +105,9 @@ ClockWidget::ClockWidget() } m_calendar->update_tiles(view_year, view_month); if (m_calendar->mode() == GUI::Calendar::Year) - m_selected_calendar_button->set_text(m_calendar->formatted_date(GUI::Calendar::YearOnly)); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date(GUI::Calendar::YearOnly)); else - m_selected_calendar_button->set_text(m_calendar->formatted_date()); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date()); }; auto& separator1 = root_container->add<GUI::HorizontalSeparator>(); @@ -118,14 +118,14 @@ ClockWidget::ClockWidget() calendar_container.layout()->set_margins({ 2 }); m_calendar = calendar_container.add<GUI::Calendar>(); - m_selected_calendar_button->set_text(m_calendar->formatted_date()); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date()); m_calendar->on_tile_click = [&] { - m_selected_calendar_button->set_text(m_calendar->formatted_date()); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date()); }; m_calendar->on_month_click = [&] { - m_selected_calendar_button->set_text(m_calendar->formatted_date()); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date()); }; auto& separator2 = root_container->add<GUI::HorizontalSeparator>(); @@ -238,7 +238,7 @@ void ClockWidget::jump_to_current_date() m_calendar->toggle_mode(); m_calendar->set_selected_date(Core::DateTime::now()); m_calendar->update_tiles(Core::DateTime::now().year(), Core::DateTime::now().month()); - m_selected_calendar_button->set_text(m_calendar->formatted_date()); + m_selected_calendar_button->set_text_deprecated(m_calendar->formatted_date()); } } diff --git a/Userland/Services/Taskbar/ShutdownDialog.cpp b/Userland/Services/Taskbar/ShutdownDialog.cpp index 7fbdf5ede3..9dd87d51ca 100644 --- a/Userland/Services/Taskbar/ShutdownDialog.cpp +++ b/Userland/Services/Taskbar/ShutdownDialog.cpp @@ -78,7 +78,7 @@ ShutdownDialog::ShutdownDialog() auto action = options[i]; auto& radio = right_container.add<GUI::RadioButton>(); radio.set_enabled(action.enabled); - radio.set_text(action.title); + radio.set_text_deprecated(action.title); radio.on_checked = [this, i](auto) { m_selected_option = i; diff --git a/Userland/Services/Taskbar/TaskbarButton.cpp b/Userland/Services/Taskbar/TaskbarButton.cpp index 5b8d748438..a2e01ba172 100644 --- a/Userland/Services/Taskbar/TaskbarButton.cpp +++ b/Userland/Services/Taskbar/TaskbarButton.cpp @@ -93,20 +93,20 @@ void TaskbarButton::paint_event(GUI::PaintEvent& event) Gfx::StylePainter::paint_button(painter, rect(), palette(), button_style(), is_being_pressed(), is_hovered(), is_checked(), is_enabled()); - if (text().is_empty()) + if (text_deprecated().is_empty()) return; auto content_rect = rect().shrunken(8, 2); auto icon_location = content_rect.center().translated(-(icon.width() / 2), -(icon.height() / 2)); - if (!text().is_empty()) + if (!text_deprecated().is_empty()) icon_location.set_x(content_rect.x()); - if (!text().is_empty()) { + if (!text_deprecated().is_empty()) { content_rect.translate_by(icon.width() + 4, 0); content_rect.set_width(content_rect.width() - icon.width() - 4); } - Gfx::IntRect text_rect { 0, 0, static_cast<int>(ceilf(font.width(text()))), font.glyph_height() }; + Gfx::IntRect text_rect { 0, 0, static_cast<int>(ceilf(font.width(text_deprecated()))), font.glyph_height() }; if (text_rect.width() > content_rect.width()) text_rect.set_width(content_rect.width()); text_rect.align_within(content_rect, text_alignment()); @@ -123,7 +123,7 @@ void TaskbarButton::paint_event(GUI::PaintEvent& event) adjusted_rect.set_width(adjusted_rect.width() + 1); adjusted_rect.set_height(adjusted_rect.height() + 1); } - paint_custom_progressbar(painter, adjusted_rect, text_rect, palette(), 0, 100, window.progress().value(), text(), font, text_alignment()); + paint_custom_progressbar(painter, adjusted_rect, text_rect, palette(), 0, 100, window.progress().value(), text_deprecated(), font, text_alignment()); } if (is_enabled()) { diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index 81d0ba45e7..a94fc07d67 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -202,7 +202,7 @@ void TaskbarWindow::update_window_button(::Window& window, bool show_as_active) auto* button = window.button(); if (!button) return; - button->set_text(window.title()); + button->set_text_deprecated(window.title()); button->set_tooltip(window.title()); button->set_checked(show_as_active); button->set_visible(is_window_on_current_workspace(window)); @@ -393,5 +393,5 @@ void TaskbarWindow::workspace_change_event(unsigned current_row, unsigned curren void TaskbarWindow::set_start_button_font(Gfx::Font const& font) { m_start_button->set_font(font); - m_start_button->set_fixed_size(font.width(m_start_button->text()) + 30, 21); + m_start_button->set_fixed_size(font.width(m_start_button->text_deprecated()) + 30, 21); } |