mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 20:17:44 +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
|
@ -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