mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 05:27:45 +00:00
Userland: Prefer _string
over _short_string
As `_string` can't fail anymore (since 3434412
), there are no real
benefits to use the short variant in most cases.
This commit is contained in:
parent
a5edc9cdfc
commit
3f35ffb648
198 changed files with 684 additions and 684 deletions
|
@ -32,7 +32,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
|
|||
|
||||
main_widget->set_layout<GUI::VerticalBoxLayout>(4);
|
||||
|
||||
auto& name_label = main_widget->add<GUI::Label>("Name:"_short_string);
|
||||
auto& name_label = main_widget->add<GUI::Label>("Name:"_string);
|
||||
name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
||||
m_name_textbox = main_widget->add<GUI::TextBox>();
|
||||
|
@ -42,12 +42,12 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
|
|||
auto default_name = Config::read_string("PixelPaint"sv, "NewImage"sv, "Name"sv);
|
||||
m_name_textbox->set_text(default_name);
|
||||
|
||||
auto& width_label = main_widget->add<GUI::Label>("Width:"_short_string);
|
||||
auto& width_label = main_widget->add<GUI::Label>("Width:"_string);
|
||||
width_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
||||
auto& width_spinbox = main_widget->add<GUI::SpinBox>();
|
||||
|
||||
auto& height_label = main_widget->add<GUI::Label>("Height:"_short_string);
|
||||
auto& height_label = main_widget->add<GUI::Label>("Height:"_string);
|
||||
height_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
||||
auto& height_spinbox = main_widget->add<GUI::SpinBox>();
|
||||
|
@ -115,7 +115,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
|
|||
auto& button_container = main_widget->add<GUI::Widget>();
|
||||
button_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
|
||||
auto& ok_button = button_container.add<GUI::Button>("OK"_short_string);
|
||||
auto& ok_button = button_container.add<GUI::Button>("OK"_string);
|
||||
ok_button.on_click = [&](auto) {
|
||||
if (set_defaults_checkbox.is_checked()) {
|
||||
Config::write_string("PixelPaint"sv, "NewImage"sv, "Name"sv, m_image_name);
|
||||
|
@ -128,7 +128,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
|
|||
};
|
||||
ok_button.set_default(true);
|
||||
|
||||
auto& cancel_button = button_container.add<GUI::Button>("Cancel"_short_string);
|
||||
auto& cancel_button = button_container.add<GUI::Button>("Cancel"_string);
|
||||
cancel_button.on_click = [this](auto) {
|
||||
done(ExecResult::Cancel);
|
||||
};
|
||||
|
|
|
@ -24,7 +24,7 @@ CreateNewLayerDialog::CreateNewLayerDialog(Gfx::IntSize suggested_size, GUI::Win
|
|||
main_widget->set_fill_with_background_color(true);
|
||||
main_widget->set_layout<GUI::VerticalBoxLayout>(4);
|
||||
|
||||
auto& name_label = main_widget->add<GUI::Label>("Name:"_short_string);
|
||||
auto& name_label = main_widget->add<GUI::Label>("Name:"_string);
|
||||
name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
||||
m_name_textbox = main_widget->add<GUI::TextBox>();
|
||||
|
@ -34,12 +34,12 @@ CreateNewLayerDialog::CreateNewLayerDialog(Gfx::IntSize suggested_size, GUI::Win
|
|||
m_layer_name = m_name_textbox->text();
|
||||
};
|
||||
|
||||
auto& width_label = main_widget->add<GUI::Label>("Width:"_short_string);
|
||||
auto& width_label = main_widget->add<GUI::Label>("Width:"_string);
|
||||
width_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
||||
auto& width_spinbox = main_widget->add<GUI::SpinBox>();
|
||||
|
||||
auto& height_label = main_widget->add<GUI::Label>("Height:"_short_string);
|
||||
auto& height_label = main_widget->add<GUI::Label>("Height:"_string);
|
||||
height_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
||||
auto& height_spinbox = main_widget->add<GUI::SpinBox>();
|
||||
|
@ -47,13 +47,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"_short_string);
|
||||
auto& ok_button = button_container.add<GUI::Button>("OK"_string);
|
||||
ok_button.on_click = [this](auto) {
|
||||
done(ExecResult::OK);
|
||||
};
|
||||
ok_button.set_default(true);
|
||||
|
||||
auto& cancel_button = button_container.add<GUI::Button>("Cancel"_short_string);
|
||||
auto& cancel_button = button_container.add<GUI::Button>("Cancel"_string);
|
||||
cancel_button.on_click = [this](auto) {
|
||||
done(ExecResult::Cancel);
|
||||
};
|
||||
|
|
|
@ -82,10 +82,10 @@ private:
|
|||
auto& norm_checkbox = main_widget->template add<GUI::CheckBox>("Normalize"_string);
|
||||
norm_checkbox.set_checked(false);
|
||||
|
||||
auto& wrap_checkbox = main_widget->template add<GUI::CheckBox>("Wrap"_short_string);
|
||||
auto& wrap_checkbox = main_widget->template add<GUI::CheckBox>("Wrap"_string);
|
||||
wrap_checkbox.set_checked(m_should_wrap);
|
||||
|
||||
auto& button = main_widget->template add<GUI::Button>("Done"_short_string);
|
||||
auto& button = main_widget->template add<GUI::Button>("Done"_string);
|
||||
button.on_click = [&](auto) {
|
||||
m_should_wrap = wrap_checkbox.is_checked();
|
||||
if (norm_checkbox.is_checked())
|
||||
|
|
|
@ -69,7 +69,7 @@ ErrorOr<RefPtr<GUI::Widget>> Bloom::get_settings_widget()
|
|||
radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
radius_label->set_fixed_height(20);
|
||||
|
||||
auto radius_slider = TRY(radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto radius_slider = TRY(radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
radius_slider->set_range(0, 50);
|
||||
radius_slider->set_value(m_blur_radius);
|
||||
radius_slider->on_change = [&](int value) {
|
||||
|
|
|
@ -88,11 +88,11 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
|
|||
m_radius_container->set_fixed_height(20);
|
||||
TRY(m_radius_container->try_set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }));
|
||||
|
||||
auto radius_label = TRY(m_radius_container->try_add<GUI::Label>("Radius:"_short_string));
|
||||
auto radius_label = TRY(m_radius_container->try_add<GUI::Label>("Radius:"_string));
|
||||
radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
radius_label->set_fixed_size(50, 20);
|
||||
|
||||
auto radius_slider = TRY(m_radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto radius_slider = TRY(m_radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
radius_slider->set_range(0, 25);
|
||||
radius_slider->set_value(m_radius);
|
||||
radius_slider->on_change = [&](int value) {
|
||||
|
@ -113,7 +113,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
|
|||
radius_x_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
radius_x_label->set_fixed_size(50, 20);
|
||||
|
||||
m_radius_x_slider = TRY(radius_x_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
m_radius_x_slider = TRY(radius_x_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
m_radius_x_slider->set_range(0, 50);
|
||||
m_radius_x_slider->set_value(m_radius_x);
|
||||
m_radius_x_slider->on_change = [&](int value) {
|
||||
|
@ -129,7 +129,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
|
|||
radius_y_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
radius_y_label->set_fixed_size(50, 20);
|
||||
|
||||
m_radius_y_slider = TRY(radius_y_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
m_radius_y_slider = TRY(radius_y_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
m_radius_y_slider->set_range(0, 50);
|
||||
m_radius_y_slider->set_value(m_radius_y);
|
||||
m_radius_y_slider->on_change = [&](int value) {
|
||||
|
@ -146,11 +146,11 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
|
|||
angle_container->set_fixed_height(20);
|
||||
TRY(angle_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto angle_label = TRY(angle_container->try_add<GUI::Label>("Angle:"_short_string));
|
||||
auto angle_label = TRY(angle_container->try_add<GUI::Label>("Angle:"_string));
|
||||
angle_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
angle_label->set_fixed_size(60, 20);
|
||||
|
||||
m_angle_slider = TRY(angle_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "°"_short_string));
|
||||
m_angle_slider = TRY(angle_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "°"_string));
|
||||
m_angle_slider->set_range(0, 360);
|
||||
m_angle_slider->set_value(m_angle);
|
||||
m_angle_slider->on_change = [&](int value) {
|
||||
|
@ -166,7 +166,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
|
|||
magnitude_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
magnitude_label->set_fixed_size(60, 20);
|
||||
|
||||
m_magnitude_slider = TRY(magnitude_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
m_magnitude_slider = TRY(magnitude_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
m_magnitude_slider->set_range(0, 50);
|
||||
m_magnitude_slider->set_value(m_radius);
|
||||
m_magnitude_slider->on_change = [&](int value) {
|
||||
|
|
|
@ -32,11 +32,11 @@ ErrorOr<RefPtr<GUI::Widget>> Sepia::get_settings_widget()
|
|||
amount_container->set_fixed_height(20);
|
||||
TRY(amount_container->try_set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }));
|
||||
|
||||
auto amount_label = TRY(amount_container->try_add<GUI::Label>("Amount:"_short_string));
|
||||
auto amount_label = TRY(amount_container->try_add<GUI::Label>("Amount:"_string));
|
||||
amount_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
amount_label->set_fixed_size(50, 20);
|
||||
|
||||
auto amount_slider = TRY(amount_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto amount_slider = TRY(amount_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
amount_slider->set_range(0, 100);
|
||||
amount_slider->set_value(m_amount * 100);
|
||||
amount_slider->on_change = [this](int value) {
|
||||
|
|
|
@ -30,7 +30,7 @@ LayerPropertiesWidget::LayerPropertiesWidget()
|
|||
name_container.set_fixed_height(20);
|
||||
name_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
|
||||
auto& name_label = name_container.add<GUI::Label>("Name:"_short_string);
|
||||
auto& name_label = name_container.add<GUI::Label>("Name:"_string);
|
||||
name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
name_label.set_fixed_size(80, 20);
|
||||
|
||||
|
@ -56,7 +56,7 @@ LayerPropertiesWidget::LayerPropertiesWidget()
|
|||
m_layer->set_opacity_percent(value);
|
||||
};
|
||||
|
||||
m_visibility_checkbox = group_box.add<GUI::CheckBox>("Visible"_short_string);
|
||||
m_visibility_checkbox = group_box.add<GUI::CheckBox>("Visible"_string);
|
||||
m_visibility_checkbox->set_fixed_height(20);
|
||||
m_visibility_checkbox->on_checked = [this](bool checked) {
|
||||
if (m_layer)
|
||||
|
|
|
@ -149,7 +149,7 @@ static constexpr int s_zoom_level_fit_image = 10;
|
|||
|
||||
ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
||||
{
|
||||
auto file_menu = TRY(window.try_add_menu("&File"_short_string));
|
||||
auto file_menu = TRY(window.try_add_menu("&File"_string));
|
||||
|
||||
m_new_image_action = GUI::Action::create(
|
||||
"&New Image...", { Mod_Ctrl, Key_N }, g_icon_bag.filetype_pixelpaint, [&](auto&) {
|
||||
|
@ -223,7 +223,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
TRY(file_menu->try_add_action(*m_save_image_action));
|
||||
TRY(file_menu->try_add_action(*m_save_image_as_action));
|
||||
|
||||
m_export_submenu = TRY(file_menu->try_add_submenu("&Export"_short_string));
|
||||
m_export_submenu = TRY(file_menu->try_add_submenu("&Export"_string));
|
||||
|
||||
TRY(m_export_submenu->try_add_action(
|
||||
GUI::Action::create(
|
||||
|
@ -292,7 +292,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
GUI::Application::the()->quit();
|
||||
})));
|
||||
|
||||
m_edit_menu = TRY(window.try_add_menu("&Edit"_short_string));
|
||||
m_edit_menu = TRY(window.try_add_menu("&Edit"_string));
|
||||
|
||||
m_cut_action = GUI::CommonActions::make_cut_action([&](auto&) {
|
||||
auto* editor = current_image_editor();
|
||||
|
@ -488,7 +488,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
GUI::MessageBox::show_error(&window, MUST(String::formatted("Writing color palette failed: {}", result.release_error())));
|
||||
})));
|
||||
|
||||
m_view_menu = TRY(window.try_add_menu("&View"_short_string));
|
||||
m_view_menu = TRY(window.try_add_menu("&View"_string));
|
||||
|
||||
m_zoom_in_action = GUI::CommonActions::make_zoom_in_action(
|
||||
[&](auto&) {
|
||||
|
@ -600,18 +600,18 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
vectorscope_action->set_checked(Config::read_bool("PixelPaint"sv, "Scopes"sv, "ShowVectorscope"sv, false));
|
||||
m_vectorscope_widget->parent_widget()->set_visible(vectorscope_action->is_checked());
|
||||
|
||||
auto scopes_menu = TRY(m_view_menu->try_add_submenu("&Scopes"_short_string));
|
||||
auto scopes_menu = TRY(m_view_menu->try_add_submenu("&Scopes"_string));
|
||||
TRY(scopes_menu->try_add_action(histogram_action));
|
||||
TRY(scopes_menu->try_add_action(vectorscope_action));
|
||||
|
||||
m_tool_menu = TRY(window.try_add_menu("&Tool"_short_string));
|
||||
m_tool_menu = TRY(window.try_add_menu("&Tool"_string));
|
||||
m_toolbox->for_each_tool([&](auto& tool) {
|
||||
if (tool.action())
|
||||
m_tool_menu->add_action(*tool.action());
|
||||
return IterationDecision::Continue;
|
||||
});
|
||||
|
||||
m_image_menu = TRY(window.try_add_menu("&Image"_short_string));
|
||||
m_image_menu = TRY(window.try_add_menu("&Image"_string));
|
||||
TRY(m_image_menu->try_add_action(GUI::Action::create(
|
||||
"Flip Image &Vertically", g_icon_bag.edit_flip_vertical, [&](auto&) {
|
||||
auto* editor = current_image_editor();
|
||||
|
@ -713,7 +713,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
editor->did_complete_action("Crop Image to Content"sv);
|
||||
})));
|
||||
|
||||
m_layer_menu = TRY(window.try_add_menu("&Layer"_short_string));
|
||||
m_layer_menu = TRY(window.try_add_menu("&Layer"_string));
|
||||
|
||||
m_layer_menu->on_visibility_change = [this](bool visible) {
|
||||
if (!visible)
|
||||
|
@ -810,7 +810,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
};
|
||||
};
|
||||
|
||||
auto mask_submenu = TRY(m_layer_menu->try_add_submenu("&Masks"_short_string));
|
||||
auto mask_submenu = TRY(m_layer_menu->try_add_submenu("&Masks"_string));
|
||||
|
||||
m_add_mask_action = GUI::Action::create(
|
||||
"Add M&ask", { Mod_Ctrl | Mod_Shift, Key_M }, g_icon_bag.add_mask, create_layer_mask_callback("Add Mask", [&](Layer* active_layer) {
|
||||
|
@ -1140,7 +1140,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
editor->did_complete_action("Crop Layer to Content"sv);
|
||||
})));
|
||||
|
||||
m_filter_menu = TRY(window.try_add_menu("&Filter"_short_string));
|
||||
m_filter_menu = TRY(window.try_add_menu("&Filter"_string));
|
||||
|
||||
TRY(m_filter_menu->try_add_action(GUI::Action::create("Filter &Gallery", g_icon_bag.filter, [&](auto&) {
|
||||
auto* editor = current_image_editor();
|
||||
|
@ -1164,7 +1164,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
|
|||
}
|
||||
})));
|
||||
|
||||
auto help_menu = TRY(window.try_add_menu("&Help"_short_string));
|
||||
auto help_menu = TRY(window.try_add_menu("&Help"_string));
|
||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window)));
|
||||
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window)));
|
||||
|
||||
|
|
|
@ -147,11 +147,11 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
|
|||
size_container->set_fixed_height(20);
|
||||
(void)TRY(size_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_short_string));
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string));
|
||||
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
size_label->set_fixed_size(80, 20);
|
||||
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
size_slider->set_range(1, 100);
|
||||
size_slider->set_value(m_size);
|
||||
size_slider->set_override_cursor(cursor());
|
||||
|
@ -171,7 +171,7 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
|
|||
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
hardness_label->set_fixed_size(80, 20);
|
||||
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
hardness_slider->set_range(1, 100);
|
||||
hardness_slider->set_value(m_hardness);
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ ErrorOr<GUI::Widget*> BucketTool::get_properties_widget()
|
|||
threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
threshold_label->set_fixed_size(80, 20);
|
||||
|
||||
auto threshold_slider = TRY(threshold_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto threshold_slider = TRY(threshold_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
threshold_slider->set_range(0, 100);
|
||||
threshold_slider->set_value(m_threshold);
|
||||
|
||||
|
|
|
@ -135,11 +135,11 @@ ErrorOr<GUI::Widget*> CloneTool::get_properties_widget()
|
|||
size_container->set_fixed_height(20);
|
||||
(void)TRY(size_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_short_string));
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string));
|
||||
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
size_label->set_fixed_size(80, 20);
|
||||
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
size_slider->set_range(1, 100);
|
||||
size_slider->set_value(size());
|
||||
|
||||
|
@ -158,7 +158,7 @@ ErrorOr<GUI::Widget*> CloneTool::get_properties_widget()
|
|||
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
hardness_label->set_fixed_size(80, 20);
|
||||
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
hardness_slider->set_range(1, 100);
|
||||
hardness_slider->on_change = [&](int value) {
|
||||
set_hardness(value);
|
||||
|
|
|
@ -140,7 +140,7 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
|
|||
thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
thickness_label->set_fixed_size(80, 20);
|
||||
|
||||
auto thickness_slider = TRY(thickness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto thickness_slider = TRY(thickness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
thickness_slider->set_range(1, 10);
|
||||
thickness_slider->set_value(m_thickness);
|
||||
|
||||
|
@ -152,13 +152,13 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
|
|||
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
|
||||
mode_container->set_fixed_height(70);
|
||||
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_short_string));
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string));
|
||||
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
||||
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>());
|
||||
(void)TRY(mode_radio_container->try_set_layout<GUI::VerticalBoxLayout>());
|
||||
auto outline_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Outline"_short_string));
|
||||
auto fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_short_string));
|
||||
auto outline_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Outline"_string));
|
||||
auto fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_string));
|
||||
auto aa_enable_checkbox = TRY(mode_radio_container->try_add<GUI::CheckBox>("Anti-alias"_string));
|
||||
|
||||
aa_enable_checkbox->on_checked = [this](bool checked) {
|
||||
|
@ -197,7 +197,7 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
|
|||
}
|
||||
};
|
||||
|
||||
auto multiply_label = TRY(aspect_container->try_add<GUI::Label>("x"_short_string));
|
||||
auto multiply_label = TRY(aspect_container->try_add<GUI::Label>("x"_string));
|
||||
multiply_label->set_text_alignment(Gfx::TextAlignment::Center);
|
||||
multiply_label->set_fixed_size(10, 20);
|
||||
|
||||
|
|
|
@ -64,11 +64,11 @@ ErrorOr<GUI::Widget*> EraseTool::get_properties_widget()
|
|||
size_container->set_fixed_height(20);
|
||||
(void)TRY(size_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_short_string));
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string));
|
||||
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
size_label->set_fixed_size(80, 20);
|
||||
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
size_slider->set_range(1, 100);
|
||||
size_slider->set_value(size());
|
||||
|
||||
|
@ -86,7 +86,7 @@ ErrorOr<GUI::Widget*> EraseTool::get_properties_widget()
|
|||
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
hardness_label->set_fixed_size(80, 20);
|
||||
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
hardness_slider->set_range(1, 100);
|
||||
hardness_slider->set_value(hardness());
|
||||
|
||||
|
@ -115,8 +115,8 @@ ErrorOr<GUI::Widget*> EraseTool::get_properties_widget()
|
|||
|
||||
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>());
|
||||
(void)TRY(mode_radio_container->try_set_layout<GUI::VerticalBoxLayout>());
|
||||
auto pencil_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Pencil"_short_string));
|
||||
auto brush_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Brush"_short_string));
|
||||
auto pencil_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Pencil"_string));
|
||||
auto brush_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Brush"_string));
|
||||
|
||||
pencil_mode_radio->on_checked = [this, hardness_slider, size_slider](bool) {
|
||||
m_draw_mode = DrawMode::Pencil;
|
||||
|
|
|
@ -275,7 +275,7 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
|
|||
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
hardness_label->set_fixed_size(80, 20);
|
||||
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto hardness_slider = TRY(hardness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
hardness_slider->set_range(1, 99);
|
||||
hardness_slider->set_value(m_hardness);
|
||||
hardness_slider->on_change = [this](int value) {
|
||||
|
@ -297,7 +297,7 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
|
|||
TRY(button_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
button_container->add_spacer().release_value_but_fixme_should_propagate_errors();
|
||||
|
||||
auto apply_button = TRY(button_container->try_add<GUI::DialogButton>("Apply"_short_string));
|
||||
auto apply_button = TRY(button_container->try_add<GUI::DialogButton>("Apply"_string));
|
||||
apply_button->on_click = [this](auto) {
|
||||
rasterize_gradient();
|
||||
};
|
||||
|
|
|
@ -191,7 +191,7 @@ ErrorOr<GUI::Widget*> GuideTool::get_properties_widget()
|
|||
snapping_label->set_fixed_size(80, 20);
|
||||
snapping_label->set_tooltip("Press Shift to snap");
|
||||
|
||||
auto snapping_slider = TRY(snapping_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto snapping_slider = TRY(snapping_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
snapping_slider->set_range(0, 50);
|
||||
snapping_slider->set_value(m_snap_size);
|
||||
|
||||
|
|
|
@ -168,7 +168,7 @@ ErrorOr<GUI::Widget*> LassoSelectTool::get_properties_widget()
|
|||
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>());
|
||||
mode_label->set_text("Mode:"_short_string);
|
||||
mode_label->set_text("Mode:"_string);
|
||||
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
mode_label->set_fixed_size(80, 20);
|
||||
|
||||
|
|
|
@ -133,7 +133,7 @@ ErrorOr<GUI::Widget*> LineTool::get_properties_widget()
|
|||
thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
thickness_label->set_fixed_size(80, 20);
|
||||
|
||||
auto thickness_slider = TRY(thickness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto thickness_slider = TRY(thickness_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
thickness_slider->set_range(1, 10);
|
||||
thickness_slider->set_value(m_thickness);
|
||||
|
||||
|
@ -146,7 +146,7 @@ ErrorOr<GUI::Widget*> LineTool::get_properties_widget()
|
|||
mode_container->set_fixed_height(20);
|
||||
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_short_string));
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string));
|
||||
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
mode_label->set_fixed_size(80, 20);
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ ErrorOr<GUI::Widget*> PenTool::get_properties_widget()
|
|||
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
size_label->set_fixed_size(80, 20);
|
||||
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
size_slider->set_range(1, 20);
|
||||
size_slider->set_value(size());
|
||||
|
||||
|
|
|
@ -197,7 +197,7 @@ ErrorOr<GUI::Widget*> PolygonalSelectTool::get_properties_widget()
|
|||
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>());
|
||||
mode_label->set_text("Mode:"_short_string);
|
||||
mode_label->set_text("Mode:"_string);
|
||||
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
mode_label->set_fixed_size(80, 20);
|
||||
|
||||
|
|
|
@ -170,7 +170,7 @@ ErrorOr<GUI::Widget*> RectangleSelectTool::get_properties_widget()
|
|||
feather_label->set_fixed_size(80, 20);
|
||||
|
||||
int const feather_slider_max = 100;
|
||||
auto feather_slider = TRY(feather_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto feather_slider = TRY(feather_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
feather_slider->set_range(0, feather_slider_max);
|
||||
feather_slider->set_value((int)floorf(m_edge_feathering * (float)feather_slider_max));
|
||||
|
||||
|
@ -184,7 +184,7 @@ ErrorOr<GUI::Widget*> RectangleSelectTool::get_properties_widget()
|
|||
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>());
|
||||
mode_label->set_text("Mode:"_short_string);
|
||||
mode_label->set_text("Mode:"_string);
|
||||
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
mode_label->set_fixed_size(80, 20);
|
||||
|
||||
|
|
|
@ -154,7 +154,7 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
|
|||
thickness_or_radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
thickness_or_radius_label->set_fixed_size(80, 20);
|
||||
|
||||
auto thickness_or_radius_slider = TRY(thickness_or_radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto thickness_or_radius_slider = TRY(thickness_or_radius_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
|
||||
thickness_or_radius_slider->on_change = [&](int value) {
|
||||
if (m_fill_mode == FillMode::RoundedCorners) {
|
||||
|
@ -181,18 +181,18 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
|
|||
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
|
||||
mode_container->set_fixed_height(90);
|
||||
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_short_string));
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>("Mode:"_string));
|
||||
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
mode_label->set_fixed_size(30, 20);
|
||||
|
||||
auto mode_radio_container = TRY(mode_container->try_add<GUI::Widget>());
|
||||
(void)TRY(mode_radio_container->try_set_layout<GUI::VerticalBoxLayout>());
|
||||
auto outline_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Outline"_short_string));
|
||||
auto fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_short_string));
|
||||
auto outline_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Outline"_string));
|
||||
auto fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_string));
|
||||
auto gradient_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Gradient"_string));
|
||||
mode_radio_container->set_fixed_width(70);
|
||||
|
||||
auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Rounded"_short_string));
|
||||
auto rounded_corners_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Rounded"_string));
|
||||
|
||||
outline_mode_radio->on_checked = [this, update_slider](bool) {
|
||||
m_fill_mode = FillMode::Outline;
|
||||
|
@ -246,7 +246,7 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
|
|||
}
|
||||
};
|
||||
|
||||
auto multiply_label = TRY(aspect_fields_container->try_add<GUI::Label>("x"_short_string));
|
||||
auto multiply_label = TRY(aspect_fields_container->try_add<GUI::Label>("x"_string));
|
||||
multiply_label->set_text_alignment(Gfx::TextAlignment::Center);
|
||||
multiply_label->set_fixed_size(10, 20);
|
||||
|
||||
|
|
|
@ -100,11 +100,11 @@ ErrorOr<GUI::Widget*> SprayTool::get_properties_widget()
|
|||
size_container->set_fixed_height(20);
|
||||
(void)TRY(size_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_short_string));
|
||||
auto size_label = TRY(size_container->try_add<GUI::Label>("Size:"_string));
|
||||
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
size_label->set_fixed_size(80, 20);
|
||||
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_short_string));
|
||||
auto size_slider = TRY(size_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "px"_string));
|
||||
size_slider->set_range(1, 20);
|
||||
size_slider->set_value(m_thickness);
|
||||
|
||||
|
@ -121,7 +121,7 @@ ErrorOr<GUI::Widget*> SprayTool::get_properties_widget()
|
|||
density_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
density_label->set_fixed_size(80, 20);
|
||||
|
||||
auto density_slider = TRY(density_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto density_slider = TRY(density_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
density_slider->set_range(1, 100);
|
||||
density_slider->set_value(m_density);
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ ErrorOr<GUI::Widget*> WandSelectTool::get_properties_widget()
|
|||
threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
threshold_label->set_fixed_size(80, 20);
|
||||
|
||||
auto threshold_slider = TRY(threshold_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto threshold_slider = TRY(threshold_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
threshold_slider->set_range(0, 100);
|
||||
threshold_slider->set_value(m_threshold);
|
||||
|
||||
|
@ -97,7 +97,7 @@ ErrorOr<GUI::Widget*> WandSelectTool::get_properties_widget()
|
|||
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
|
||||
|
||||
auto mode_label = TRY(mode_container->try_add<GUI::Label>());
|
||||
mode_label->set_text("Mode:"_short_string);
|
||||
mode_label->set_text("Mode:"_string);
|
||||
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
mode_label->set_fixed_size(80, 20);
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ ErrorOr<GUI::Widget*> ZoomTool::get_properties_widget()
|
|||
sensitivity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
sensitivity_label->set_fixed_size(80, 20);
|
||||
|
||||
auto sensitivity_slider = TRY(sensitivity_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_short_string));
|
||||
auto sensitivity_slider = TRY(sensitivity_container->try_add<GUI::ValueSlider>(Orientation::Horizontal, "%"_string));
|
||||
sensitivity_slider->set_range(1, 100);
|
||||
sensitivity_slider->set_value(100 * m_sensitivity);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue