RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 12:57:35 +00:00
Code Issues Activity Actions

Userland: Set Button text using the new String class

Browse source
This commit is contained in:
Karol Kosek 2023-02-11 20:51:04 +01:00 • committed by Linus Groh
parent b5cb9a9ebb
commit e39adc4772
49 changed files with 134 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/Assistant/main.cpp
View file

@ -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_deprecated(move(result.title()));
match.set_text(String::from_deprecated_string(result.title()).release_value_but_fixme_should_propagate_errors());
match.set_tooltip(move(result.tooltip()));
match.on_click = [&result](auto) {
result.activate();

2
Userland/Applications/Browser/BookmarksBarWidget.cpp
View file

@ -205,7 +205,7 @@ void BookmarksBarWidget::model_did_update(unsigned)
m_bookmarks.append(button);
button.set_button_style(Gfx::ButtonStyle::Coolbar);
button.set_text_deprecated(title);
button.set_text(String::from_deprecated_string(title).release_value_but_fixme_should_propagate_errors());
button.set_icon(g_icon_bag.filetype_html);
button.set_fixed_size(font().width(title) + 32, 20);
button.set_relative_rect(rect);

8
Userland/Applications/Browser/DownloadWidget.cpp
View file

@ -86,7 +86,7 @@ DownloadWidget::DownloadWidget(const URL& url)
destination_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
destination_label.set_fixed_height(16);
m_close_on_finish_checkbox = add<GUI::CheckBox>("Close when finished");
m_close_on_finish_checkbox = add<GUI::CheckBox>(String::from_utf8("Close when finished"sv).release_value_but_fixme_should_propagate_errors());
m_close_on_finish_checkbox->set_checked(close_on_finish);
m_close_on_finish_checkbox->on_checked = [&](bool checked) {
@ -96,7 +96,7 @@ DownloadWidget::DownloadWidget(const URL& url)
auto& button_container = add<GUI::Widget>();
auto& button_container_layout = button_container.set_layout<GUI::HorizontalBoxLayout>();
button_container_layout.add_spacer();
m_cancel_button = button_container.add<GUI::Button>("Cancel");
m_cancel_button = button_container.add<GUI::Button>(String::from_utf8_short_string("Cancel"sv));
m_cancel_button->set_fixed_size(100, 22);
m_cancel_button->on_click = [this](auto) {
bool success = m_download->stop();
@ -104,7 +104,7 @@ DownloadWidget::DownloadWidget(const URL& url)
window()->close();
};
m_close_button = button_container.add<GUI::Button>("OK");
m_close_button = button_container.add<GUI::Button>(String::from_utf8_short_string("OK"sv));
m_close_button->set_enabled(false);
m_close_button->set_fixed_size(100, 22);
m_close_button->on_click = [this](auto) {
@ -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_deprecated("Open in Folder");
m_cancel_button->set_text(String::from_utf8("Open in Folder"sv).release_value_but_fixme_should_propagate_errors());
m_cancel_button->on_click = [this](auto) {
Desktop::Launcher::open(URL::create_with_file_scheme(Core::StandardPaths::downloads_directory(), m_url.basename()));
window()->close();

4
Userland/Applications/Calculator/RoundingDialog.cpp
View file

@ -46,8 +46,8 @@ RoundingDialog::RoundingDialog(GUI::Window* parent_window, StringView title)
m_rounding_spinbox = GUI::SpinBox::construct();
m_buttons_container = GUI::Widget::construct();
m_ok_button = GUI::DialogButton::construct("OK");
m_cancel_button = GUI::DialogButton::construct("Cancel");
m_ok_button = GUI::DialogButton::construct(String::from_utf8_short_string("OK"sv));
m_cancel_button = GUI::DialogButton::construct(String::from_utf8_short_string("Cancel"sv));
main_widget->add_child(*m_rounding_spinbox);
main_widget->add_child(*m_buttons_container);

2
Userland/Applications/Calendar/AddEventDialog.cpp
View file

@ -93,7 +93,7 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, Window* parent_window)
button_container.set_fixed_height(20);
button_container.set_layout<GUI::HorizontalBoxLayout>();
button_container.layout()->add_spacer();
auto& ok_button = button_container.add<GUI::Button>("OK");
auto& ok_button = button_container.add<GUI::Button>(String::from_utf8_short_string("OK"sv));
ok_button.set_fixed_size(80, 20);
ok_button.on_click = [this](auto) {
dbgln("TODO: Add event icon on specific tile");

8
Userland/Applications/FileManager/PropertiesWindow.cpp
View file

@ -156,17 +156,17 @@ ErrorOr<void> PropertiesWindow::create_widgets(bool disable_rename)
button_widget->layout()->add_spacer();
auto ok_button = TRY(make_button("OK", button_widget));
auto ok_button = TRY(make_button(String::from_utf8_short_string("OK"sv), button_widget));
ok_button->on_click = [this](auto) {
if (apply_changes())
close();
};
auto cancel_button = TRY(make_button("Cancel", button_widget));
auto cancel_button = TRY(make_button(String::from_utf8_short_string("Cancel"sv), button_widget));
cancel_button->on_click = [this](auto) {
close();
};
m_apply_button = TRY(make_button("Apply", button_widget));
m_apply_button = TRY(make_button(String::from_utf8_short_string("Apply"sv), button_widget));
m_apply_button->on_click = [this](auto) { apply_changes(); };
m_apply_button->set_enabled(false);
@ -268,7 +268,7 @@ ErrorOr<void> PropertiesWindow::setup_permission_checkboxes(GUI::CheckBox& box_r
return {};
}
ErrorOr<NonnullRefPtr<GUI::Button>> PropertiesWindow::make_button(DeprecatedString text, GUI::Widget& parent)
ErrorOr<NonnullRefPtr<GUI::Button>> PropertiesWindow::make_button(String text, GUI::Widget& parent)
{
auto button = TRY(parent.try_add<GUI::Button>(text));
button->set_fixed_size(70, 22);

2
Userland/Applications/FileManager/PropertiesWindow.h
View file

@ -79,7 +79,7 @@ private:
return "Unknown";
}
static ErrorOr<NonnullRefPtr<GUI::Button>> make_button(DeprecatedString, GUI::Widget& parent);
static ErrorOr<NonnullRefPtr<GUI::Button>> make_button(String, GUI::Widget& parent);
ErrorOr<void> setup_permission_checkboxes(GUI::CheckBox& box_read, GUI::CheckBox& box_write, GUI::CheckBox& box_execute, PermissionMasks masks, mode_t mode);
void permission_changed(mode_t mask, bool set);
bool apply_changes();

2
Userland/Applications/HexEditor/FindDialog.cpp
View file

@ -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_deprecated(action.title);
radio.set_text(String::from_deprecated_string(action.title).release_value_but_fixme_should_propagate_errors());
radio.on_checked = [this, i](auto) {
m_selected_option = options[i].opt;

18
Userland/Applications/KeyboardMapper/KeyboardMapperWidget.cpp
View file

@ -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_deprecated(keys[i].name);
tmp_button.set_text(String::from_deprecated_string(keys[i].name).release_value_but_fixme_should_propagate_errors());
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_deprecated(value);
tmp_button.set_text(String::from_deprecated_string(value).release_value_but_fixme_should_propagate_errors());
u32* map = map_from_name(m_current_map_name);
if (value.length() == 0)
@ -89,16 +89,16 @@ void KeyboardMapperWidget::create_frame()
m_map_group->set_layout<GUI::HorizontalBoxLayout>();
m_map_group->set_fixed_width(450);
add_map_radio_button("map"sv, "Default"sv);
add_map_radio_button("shift_map"sv, "Shift"sv);
add_map_radio_button("altgr_map"sv, "AltGr"sv);
add_map_radio_button("alt_map"sv, "Alt"sv);
add_map_radio_button("shift_altgr_map"sv, "Shift+AltGr"sv);
add_map_radio_button("map"sv, String::from_utf8_short_string("Default"sv));
add_map_radio_button("shift_map"sv, String::from_utf8_short_string("Shift"sv));
add_map_radio_button("altgr_map"sv, String::from_utf8_short_string("AltGr"sv));
add_map_radio_button("alt_map"sv, String::from_utf8_short_string("Alt"sv));
add_map_radio_button("shift_altgr_map"sv, String::from_utf8("Shift+AltGr"sv).release_value_but_fixme_should_propagate_errors());
bottom_widget.layout()->add_spacer();
}
void KeyboardMapperWidget::add_map_radio_button(const StringView map_name, const StringView button_text)
void KeyboardMapperWidget::add_map_radio_button(const StringView map_name, String button_text)
{
auto& map_radio_button = m_map_group->add<GUI::RadioButton>(button_text);
map_radio_button.set_name(map_name);
@ -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_deprecated(sb.to_deprecated_string());
m_keys.at(k)->set_text(sb.to_string().release_value_but_fixme_should_propagate_errors());
}
this->update();

2
Userland/Applications/KeyboardMapper/KeyboardMapperWidget.h
View file

@ -39,7 +39,7 @@ private:
Vector<KeyButton*> m_keys;
RefPtr<GUI::Widget> m_map_group;
void add_map_radio_button(const StringView map_name, const StringView button_text);
void add_map_radio_button(const StringView map_name, String button_text);
u32* map_from_name(const StringView map_name);
void update_modifier_radio_buttons(GUI::KeyEvent&);

4
Userland/Applications/PDFViewer/PDFViewerWidget.cpp
View file

@ -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_deprecated("Show clipping paths");
m_show_clipping_paths->set_text(String::from_utf8("Show clipping paths"sv).release_value_but_fixme_should_propagate_errors());
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_deprecated("Show images");
m_show_images->set_text(String::from_utf8("Show images"sv).release_value_but_fixme_should_propagate_errors());
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); };
}

6
Userland/Applications/PixelPaint/CreateNewImageDialog.cpp
View file

@ -111,12 +111,12 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
};
auto& set_defaults_checkbox = main_widget->add<GUI::CheckBox>();
set_defaults_checkbox.set_text_deprecated("Use these settings as default");
set_defaults_checkbox.set_text(String::from_utf8("Use these settings as default"sv).release_value_but_fixme_should_propagate_errors());
auto& button_container = main_widget->add<GUI::Widget>();
button_container.set_layout<GUI::HorizontalBoxLayout>();
auto& ok_button = button_container.add<GUI::Button>("OK");
auto& ok_button = button_container.add<GUI::Button>(String::from_utf8_short_string("OK"sv));
ok_button.on_click = [&](auto) {
if (set_defaults_checkbox.is_checked()) {
Config::write_string("PixelPaint"sv, "NewImage"sv, "Name"sv, m_image_name);
@ -129,7 +129,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
};
ok_button.set_default(true);
auto& cancel_button = button_container.add<GUI::Button>("Cancel");
auto& cancel_button = button_container.add<GUI::Button>(String::from_utf8_short_string("Cancel"sv));
cancel_button.on_click = [this](auto) {
done(ExecResult::Cancel);
};

4
Userland/Applications/PixelPaint/CreateNewLayerDialog.cpp
View file

@ -49,13 +49,13 @@ CreateNewLayerDialog::CreateNewLayerDialog(Gfx::IntSize suggested_size, GUI::Win
auto& button_container = main_widget->add<GUI::Widget>();
button_container.set_layout<GUI::HorizontalBoxLayout>();
auto& ok_button = button_container.add<GUI::Button>("OK");
auto& ok_button = button_container.add<GUI::Button>(String::from_utf8_short_string("OK"sv));
ok_button.on_click = [this](auto) {
done(ExecResult::OK);
};
ok_button.set_default(true);
auto& cancel_button = button_container.add<GUI::Button>("Cancel");
auto& cancel_button = button_container.add<GUI::Button>(String::from_utf8_short_string("Cancel"sv));
cancel_button.on_click = [this](auto) {
done(ExecResult::Cancel);
};

6
Userland/Applications/PixelPaint/FilterParams.h
View file

@ -81,13 +81,13 @@ private:
}
}
auto& norm_checkbox = main_widget->template add<GUI::CheckBox>("Normalize");
auto& norm_checkbox = main_widget->template add<GUI::CheckBox>(String::from_utf8("Normalize"sv).release_value_but_fixme_should_propagate_errors());
norm_checkbox.set_checked(false);
auto& wrap_checkbox = main_widget->template add<GUI::CheckBox>("Wrap");
auto& wrap_checkbox = main_widget->template add<GUI::CheckBox>(String::from_utf8_short_string("Wrap"sv));
wrap_checkbox.set_checked(m_should_wrap);
auto& button = main_widget->template add<GUI::Button>("Done");
auto& button = main_widget->template add<GUI::Button>(String::from_utf8_short_string("Done"sv));
button.on_click = [&](auto) {
m_should_wrap = wrap_checkbox.is_checked();
if (norm_checkbox.is_checked())

6
Userland/Applications/PixelPaint/Filters/FastBoxBlur.cpp
View file

@ -47,7 +47,7 @@ RefPtr<GUI::Widget> FastBoxBlur::get_settings_widget()
name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
name_label.set_fixed_height(10);
auto& asymmetric_checkbox = m_settings_widget->add<GUI::CheckBox>("Use Asymmetric Radii");
auto& asymmetric_checkbox = m_settings_widget->add<GUI::CheckBox>(String::from_utf8("Use Asymmetric Radii"sv).release_value_but_fixme_should_propagate_errors());
asymmetric_checkbox.set_checked(false);
asymmetric_checkbox.set_fixed_height(15);
asymmetric_checkbox.on_checked = [&](bool checked) {
@ -68,7 +68,7 @@ RefPtr<GUI::Widget> FastBoxBlur::get_settings_widget()
update_preview();
};
m_vector_checkbox = m_settings_widget->add<GUI::CheckBox>("Use Direction and magnitude");
m_vector_checkbox = m_settings_widget->add<GUI::CheckBox>(String::from_utf8("Use Direction and magnitude"sv).release_value_but_fixme_should_propagate_errors());
m_vector_checkbox->set_checked(false);
m_vector_checkbox->set_visible(false);
m_vector_checkbox->set_fixed_height(15);
@ -182,7 +182,7 @@ RefPtr<GUI::Widget> FastBoxBlur::get_settings_widget()
gaussian_container.set_layout<GUI::HorizontalBoxLayout>();
gaussian_container.layout()->set_margins({ 4, 0, 4, 0 });
m_gaussian_checkbox = gaussian_container.add<GUI::CheckBox>("Approximate Gaussian Blur");
m_gaussian_checkbox = gaussian_container.add<GUI::CheckBox>(String::from_utf8("Approximate Gaussian Blur"sv).release_value_but_fixme_should_propagate_errors());
m_gaussian_checkbox->set_checked(m_approximate_gauss);
m_gaussian_checkbox->set_tooltip("A real gaussian blur can be approximated by running the box blur multiple times with different weights.");
m_gaussian_checkbox->on_checked = [this](bool checked) {

2
Userland/Applications/PixelPaint/LayerPropertiesWidget.cpp
View file

@ -58,7 +58,7 @@ LayerPropertiesWidget::LayerPropertiesWidget()
m_layer->set_opacity_percent(value);
};
m_visibility_checkbox = group_box.add<GUI::CheckBox>("Visible");
m_visibility_checkbox = group_box.add<GUI::CheckBox>(String::from_utf8_short_string("Visible"sv));
m_visibility_checkbox->set_fixed_height(20);
m_visibility_checkbox->on_checked = [this](bool checked) {
if (m_layer)

6
Userland/Applications/PixelPaint/Tools/EllipseTool.cpp
View file

@ -157,9 +157,9 @@ GUI::Widget* EllipseTool::get_properties_widget()
auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline");
auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill");
auto& aa_enable_checkbox = mode_radio_container.add<GUI::CheckBox>("Anti-alias");
auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>(String::from_utf8_short_string("Outline"sv));
auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>(String::from_utf8_short_string("Fill"sv));
auto& aa_enable_checkbox = mode_radio_container.add<GUI::CheckBox>(String::from_utf8("Anti-alias"sv).release_value_but_fixme_should_propagate_errors());
aa_enable_checkbox.on_checked = [&](bool checked) {
m_antialias_enabled = checked;

6
Userland/Applications/PixelPaint/Tools/EraseTool.cpp
View file

@ -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_deprecated("Use secondary color");
use_secondary_color_checkbox.set_text(String::from_utf8("Use secondary color"sv).release_value_but_fixme_should_propagate_errors());
use_secondary_color_checkbox.on_checked = [&](bool checked) {
m_use_secondary_color = checked;
};
@ -114,8 +114,8 @@ GUI::Widget* EraseTool::get_properties_widget()
auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto& pencil_mode_radio = mode_radio_container.add<GUI::RadioButton>("Pencil");
auto& brush_mode_radio = mode_radio_container.add<GUI::RadioButton>("Brush");
auto& pencil_mode_radio = mode_radio_container.add<GUI::RadioButton>(String::from_utf8_short_string("Pencil"sv));
auto& brush_mode_radio = mode_radio_container.add<GUI::RadioButton>(String::from_utf8_short_string("Brush"sv));
pencil_mode_radio.on_checked = [&](bool) {
m_draw_mode = DrawMode::Pencil;

2
Userland/Applications/PixelPaint/Tools/GradientTool.cpp
View file

@ -203,7 +203,7 @@ GUI::Widget* GradientTool::get_properties_widget()
auto& button_container_layout = button_container.set_layout<GUI::HorizontalBoxLayout>();
button_container_layout.add_spacer();
auto& apply_button = button_container.add<GUI::DialogButton>("Apply");
auto& apply_button = button_container.add<GUI::DialogButton>(String::from_utf8_short_string("Apply"sv));
apply_button.on_click = [this](auto) {
rasterize_gradient();
};

2
Userland/Applications/PixelPaint/Tools/LineTool.cpp
View file

@ -150,7 +150,7 @@ GUI::Widget* LineTool::get_properties_widget()
mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label.set_fixed_size(80, 20);
auto& aa_enable_checkbox = mode_container.add<GUI::CheckBox>("Anti-alias");
auto& aa_enable_checkbox = mode_container.add<GUI::CheckBox>(String::from_utf8("Anti-alias"sv).release_value_but_fixme_should_propagate_errors());
aa_enable_checkbox.on_checked = [&](bool checked) {
m_antialias_enabled = checked;
};

4
Userland/Applications/PixelPaint/Tools/MoveTool.cpp
View file

@ -304,9 +304,9 @@ GUI::Widget* MoveTool::get_properties_widget()
auto& mode_radio_container = selection_mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
m_selection_mode_foreground = mode_radio_container.add<GUI::RadioButton>("Foreground");
m_selection_mode_foreground = mode_radio_container.add<GUI::RadioButton>(String::from_utf8("Foreground"sv).release_value_but_fixme_should_propagate_errors());
m_selection_mode_active = mode_radio_container.add<GUI::RadioButton>("Active Layer");
m_selection_mode_active = mode_radio_container.add<GUI::RadioButton>(String::from_utf8("Active Layer"sv).release_value_but_fixme_should_propagate_errors());
m_selection_mode_foreground->on_checked = [&](bool) {
m_layer_selection_mode = LayerSelectionMode::ForegroundLayer;

2
Userland/Applications/PixelPaint/Tools/PickerTool.cpp
View file

@ -46,7 +46,7 @@ GUI::Widget* PickerTool::get_properties_widget()
m_properties_widget = GUI::Widget::construct();
m_properties_widget->set_layout<GUI::VerticalBoxLayout>();
auto& sample_checkbox = m_properties_widget->add<GUI::CheckBox>("Sample all layers");
auto& sample_checkbox = m_properties_widget->add<GUI::CheckBox>(String::from_utf8("Sample all layers"sv).release_value_but_fixme_should_propagate_errors());
sample_checkbox.set_checked(m_sample_all_layers);
sample_checkbox.on_checked = [&](bool value) {
m_sample_all_layers = value;

10
Userland/Applications/PixelPaint/Tools/RectangleTool.cpp
View file

@ -187,12 +187,12 @@ GUI::Widget* RectangleTool::get_properties_widget()
auto& mode_radio_container = mode_container.add<GUI::Widget>();
mode_radio_container.set_layout<GUI::VerticalBoxLayout>();
auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>("Outline");
auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>("Fill");
auto& gradient_mode_radio = mode_radio_container.add<GUI::RadioButton>("Gradient");
auto& outline_mode_radio = mode_radio_container.add<GUI::RadioButton>(String::from_utf8_short_string("Outline"sv));
auto& fill_mode_radio = mode_radio_container.add<GUI::RadioButton>(String::from_utf8_short_string("Fill"sv));
auto& gradient_mode_radio = mode_radio_container.add<GUI::RadioButton>(String::from_utf8("Gradient"sv).release_value_but_fixme_should_propagate_errors());
mode_radio_container.set_fixed_width(70);
auto& rounded_corners_mode_radio = mode_radio_container.add<GUI::RadioButton>("Rounded");
auto& rounded_corners_mode_radio = mode_radio_container.add<GUI::RadioButton>(String::from_utf8_short_string("Rounded"sv));
outline_mode_radio.on_checked = [&, update_slider](bool) {
m_fill_mode = FillMode::Outline;
@ -215,7 +215,7 @@ GUI::Widget* RectangleTool::get_properties_widget()
auto& mode_extras_container = mode_container.add<GUI::Widget>();
mode_extras_container.set_layout<GUI::VerticalBoxLayout>();
auto& aa_enable_checkbox = mode_extras_container.add<GUI::CheckBox>("Anti-alias");
auto& aa_enable_checkbox = mode_extras_container.add<GUI::CheckBox>(String::from_utf8("Anti-alias"sv).release_value_but_fixme_should_propagate_errors());
aa_enable_checkbox.on_checked = [&](bool checked) {
m_antialias_enabled = checked;
};

2
Userland/Applications/PixelPaint/Tools/TextTool.cpp
View file

@ -112,7 +112,7 @@ GUI::Widget* TextTool::get_properties_widget()
m_font_label = m_properties_widget->add<GUI::Label>(m_selected_font->human_readable_name());
auto& change_font_button = m_properties_widget->add<GUI::Button>("Change Font...");
auto& change_font_button = m_properties_widget->add<GUI::Button>(String::from_utf8("Change Font..."sv).release_value_but_fixme_should_propagate_errors());
change_font_button.on_click = [&](auto) {
auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false);
if (picker->exec() == GUI::Dialog::ExecResult::OK) {

6
Userland/Applications/Spreadsheet/CellTypeDialog.cpp
View file

@ -57,7 +57,7 @@ CellTypeDialog::CellTypeDialog(Vector<Position> const& positions, Sheet& sheet,
auto& button_layout = buttonbox.set_layout<GUI::HorizontalBoxLayout>();
button_layout.set_spacing(10);
button_layout.add_spacer();
auto& ok_button = buttonbox.add<GUI::Button>("OK");
auto& ok_button = buttonbox.add<GUI::Button>(String::from_utf8_short_string("OK"sv));
ok_button.set_fixed_width(80);
ok_button.on_click = [&](auto) { done(ExecResult::OK); };
}
@ -158,7 +158,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
};
{
auto& checkbox = right_side.add<GUI::CheckBox>("Override max length");
auto& checkbox = right_side.add<GUI::CheckBox>(String::from_utf8("Override max length"sv).release_value_but_fixme_should_propagate_errors());
auto& spinbox = right_side.add<GUI::SpinBox>();
checkbox.set_checked(m_length != -1);
spinbox.set_min(0);
@ -178,7 +178,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
};
}
{
auto& checkbox = right_side.add<GUI::CheckBox>("Override display format");
auto& checkbox = right_side.add<GUI::CheckBox>(String::from_utf8("Override display format"sv).release_value_but_fixme_should_propagate_errors());
auto& editor = right_side.add<GUI::TextEditor>();
checkbox.set_checked(!m_format.is_empty());
editor.set_name("format_editor");

4
Userland/Applications/Terminal/main.cpp
View file

@ -203,8 +203,8 @@ static ErrorOr<NonnullRefPtr<GUI::Window>> create_find_window(VT::TerminalWidget
find_forwards->click();
};
auto match_case = TRY(main_widget->try_add<GUI::CheckBox>("Case sensitive"));
auto wrap_around = TRY(main_widget->try_add<GUI::CheckBox>("Wrap around"));
auto match_case = TRY(main_widget->try_add<GUI::CheckBox>(TRY(String::from_utf8("Case sensitive"sv))));
auto wrap_around = TRY(main_widget->try_add<GUI::CheckBox>(TRY(String::from_utf8("Wrap around"sv))));
find_backwards->on_click = [&terminal, find_textbox, match_case, wrap_around](auto) {
auto needle = find_textbox->text();

2
Userland/Applications/ThemeEditor/MainWidget.cpp
View file

@ -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_deprecated(to_string(role));
checkbox.set_text(String::from_deprecated_string(DeprecatedString(to_string(role))).release_value_but_fixme_should_propagate_errors());
checkbox.on_checked = [&, role](bool checked) {
set_flag(role, checked);
};