mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 06:17:34 +00:00
Everywhere: Add sv suffix to strings relying on StringView(char const*)
Each of these strings would previously rely on StringView's char const* constructor overload, which would call __builtin_strlen on the string. Since we now have operator ""sv, we can replace these with much simpler versions. This opens the door to being able to remove StringView(char const*). No functional changes.
This commit is contained in:
sin-ack
Andreas Kling
parent
e5f09ea170
commit
3f3f45580a
762 changed files with 8315 additions and 8316 deletions
|
|
@ -34,7 +34,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
|
|||
m_name_textbox->on_change = [this] {
|
||||
m_image_name = m_name_textbox->text();
|
||||
};
|
||||
auto default_name = Config::read_string("PixelPaint", "NewImage", "Name");
|
||||
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:");
|
||||
|
|
@ -72,8 +72,8 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
|
|||
width_spinbox.set_range(1, 16384);
|
||||
height_spinbox.set_range(1, 16384);
|
||||
|
||||
auto default_width = Config::read_i32("PixelPaint", "NewImage", "Width", 510);
|
||||
auto default_height = Config::read_i32("PixelPaint", "NewImage", "Height", 356);
|
||||
auto default_width = Config::read_i32("PixelPaint"sv, "NewImage"sv, "Width"sv, 510);
|
||||
auto default_height = Config::read_i32("PixelPaint"sv, "NewImage"sv, "Height"sv, 356);
|
||||
width_spinbox.set_value(default_width);
|
||||
height_spinbox.set_value(default_height);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ CreateNewLayerDialog::CreateNewLayerDialog(Gfx::IntSize const& suggested_size, G
|
|||
name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
|
||||
m_name_textbox = main_widget.add<GUI::TextBox>();
|
||||
m_name_textbox->set_text("Layer");
|
||||
m_name_textbox->set_text("Layer"sv);
|
||||
m_name_textbox->select_all();
|
||||
m_name_textbox->on_change = [this] {
|
||||
m_layer_name = m_name_textbox->text();
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ private:
|
|||
// FIXME: Help! Make this GUI less ugly.
|
||||
StringBuilder builder;
|
||||
builder.appendff("{}x{}", N, N);
|
||||
builder.append(" Convolution");
|
||||
builder.append(" Convolution"sv);
|
||||
set_title(builder.string_view());
|
||||
|
||||
resize(200, 250);
|
||||
|
|
@ -73,7 +73,7 @@ private:
|
|||
if (endptr != nullptr)
|
||||
element = value;
|
||||
else
|
||||
textbox.set_text("");
|
||||
textbox.set_text(""sv);
|
||||
};
|
||||
} else {
|
||||
horizontal_container.template add<GUI::Widget>();
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ namespace PixelPaint {
|
|||
ErrorOr<NonnullRefPtr<GUI::TreeViewModel>> create_filter_tree_model(ImageEditor* editor)
|
||||
{
|
||||
auto directory_icon = GUI::FileIconProvider::directory_icon();
|
||||
auto filter_icon = GUI::Icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/filter.png")));
|
||||
auto filter_icon = GUI::Icon(TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/filter.png"sv)));
|
||||
|
||||
auto filter_tree_model = GUI::TreeViewModel::create();
|
||||
|
||||
|
|
|
|||
|
|
@ -12,35 +12,35 @@ ErrorOr<IconBag> IconBag::try_create()
|
|||
{
|
||||
IconBag icon_bag;
|
||||
|
||||
icon_bag.filetype_pixelpaint = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/filetype-pixelpaint.png"));
|
||||
icon_bag.new_clipboard = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/new-clipboard.png"));
|
||||
icon_bag.file_export = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/file-export.png"));
|
||||
icon_bag.close_image = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/close-tab.png"));
|
||||
icon_bag.edit_copy = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-copy.png"));
|
||||
icon_bag.clear_selection = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/clear-selection.png"));
|
||||
icon_bag.swap_colors = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/swap-colors.png"));
|
||||
icon_bag.default_colors = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/default-colors.png"));
|
||||
icon_bag.load_color_palette = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/load-color-palette.png"));
|
||||
icon_bag.save_color_palette = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/save-color-palette.png"));
|
||||
icon_bag.add_guide = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/add-guide.png"));
|
||||
icon_bag.clear_guides = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/clear-guides.png"));
|
||||
icon_bag.edit_flip_vertical = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-vertical.png"));
|
||||
icon_bag.edit_flip_horizontal = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-horizontal.png"));
|
||||
icon_bag.resize_image = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/selection-move.png"));
|
||||
icon_bag.crop = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/crop.png"));
|
||||
icon_bag.new_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/new-layer.png"));
|
||||
icon_bag.previous_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/previous-layer.png"));
|
||||
icon_bag.next_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/next-layer.png"));
|
||||
icon_bag.top_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/top-layer.png"));
|
||||
icon_bag.bottom_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/bottom-layer.png"));
|
||||
icon_bag.active_layer_up = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/active-layer-up.png"));
|
||||
icon_bag.active_layer_down = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/active-layer-down.png"));
|
||||
icon_bag.delete_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png"));
|
||||
icon_bag.merge_visible = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-visible.png"));
|
||||
icon_bag.merge_active_layer_up = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-active-layer-up.png"));
|
||||
icon_bag.merge_active_layer_down = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-active-layer-down.png"));
|
||||
icon_bag.filter = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/filter.png"));
|
||||
icon_bag.levels = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/levels.png"));
|
||||
icon_bag.filetype_pixelpaint = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/filetype-pixelpaint.png"sv));
|
||||
icon_bag.new_clipboard = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/new-clipboard.png"sv));
|
||||
icon_bag.file_export = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/file-export.png"sv));
|
||||
icon_bag.close_image = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/close-tab.png"sv));
|
||||
icon_bag.edit_copy = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-copy.png"sv));
|
||||
icon_bag.clear_selection = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/clear-selection.png"sv));
|
||||
icon_bag.swap_colors = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/swap-colors.png"sv));
|
||||
icon_bag.default_colors = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/default-colors.png"sv));
|
||||
icon_bag.load_color_palette = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/load-color-palette.png"sv));
|
||||
icon_bag.save_color_palette = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/save-color-palette.png"sv));
|
||||
icon_bag.add_guide = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/add-guide.png"sv));
|
||||
icon_bag.clear_guides = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/clear-guides.png"sv));
|
||||
icon_bag.edit_flip_vertical = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-vertical.png"sv));
|
||||
icon_bag.edit_flip_horizontal = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/edit-flip-horizontal.png"sv));
|
||||
icon_bag.resize_image = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/selection-move.png"sv));
|
||||
icon_bag.crop = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/crop.png"sv));
|
||||
icon_bag.new_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/new-layer.png"sv));
|
||||
icon_bag.previous_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/previous-layer.png"sv));
|
||||
icon_bag.next_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/next-layer.png"sv));
|
||||
icon_bag.top_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/top-layer.png"sv));
|
||||
icon_bag.bottom_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/bottom-layer.png"sv));
|
||||
icon_bag.active_layer_up = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/active-layer-up.png"sv));
|
||||
icon_bag.active_layer_down = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/active-layer-down.png"sv));
|
||||
icon_bag.delete_layer = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png"sv));
|
||||
icon_bag.merge_visible = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-visible.png"sv));
|
||||
icon_bag.merge_active_layer_up = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-active-layer-up.png"sv));
|
||||
icon_bag.merge_active_layer_down = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/merge-active-layer-down.png"sv));
|
||||
icon_bag.filter = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/filter.png"sv));
|
||||
icon_bag.levels = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/levels.png"sv));
|
||||
|
||||
return icon_bag;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,37 +85,37 @@ ErrorOr<NonnullRefPtr<Image>> Image::try_create_from_bitmap(NonnullRefPtr<Gfx::B
|
|||
|
||||
ErrorOr<NonnullRefPtr<Image>> Image::try_create_from_pixel_paint_json(JsonObject const& json)
|
||||
{
|
||||
auto image = TRY(try_create_with_size({ json.get("width").to_i32(), json.get("height").to_i32() }));
|
||||
auto image = TRY(try_create_with_size({ json.get("width"sv).to_i32(), json.get("height"sv).to_i32() }));
|
||||
|
||||
auto layers_value = json.get("layers");
|
||||
auto layers_value = json.get("layers"sv);
|
||||
for (auto& layer_value : layers_value.as_array().values()) {
|
||||
auto& layer_object = layer_value.as_object();
|
||||
auto name = layer_object.get("name").as_string();
|
||||
auto name = layer_object.get("name"sv).as_string();
|
||||
|
||||
auto bitmap_base64_encoded = layer_object.get("bitmap").as_string();
|
||||
auto bitmap_base64_encoded = layer_object.get("bitmap"sv).as_string();
|
||||
auto bitmap_data = TRY(decode_base64(bitmap_base64_encoded));
|
||||
auto bitmap = TRY(try_decode_bitmap(bitmap_data));
|
||||
auto layer = TRY(Layer::try_create_with_bitmap(*image, move(bitmap), name));
|
||||
|
||||
if (auto mask_object = layer_object.get("mask"); !mask_object.is_null()) {
|
||||
if (auto mask_object = layer_object.get("mask"sv); !mask_object.is_null()) {
|
||||
auto mask_base64_encoded = mask_object.as_string();
|
||||
auto mask_data = TRY(decode_base64(mask_base64_encoded));
|
||||
auto mask = TRY(try_decode_bitmap(mask_data));
|
||||
TRY(layer->try_set_bitmaps(layer->content_bitmap(), mask));
|
||||
}
|
||||
|
||||
auto width = layer_object.get("width").to_i32();
|
||||
auto height = layer_object.get("height").to_i32();
|
||||
auto width = layer_object.get("width"sv).to_i32();
|
||||
auto height = layer_object.get("height"sv).to_i32();
|
||||
|
||||
if (width != layer->size().width() || height != layer->size().height())
|
||||
return Error::from_string_literal("Decoded layer bitmap has wrong size");
|
||||
|
||||
image->add_layer(*layer);
|
||||
|
||||
layer->set_location({ layer_object.get("locationx").to_i32(), layer_object.get("locationy").to_i32() });
|
||||
layer->set_opacity_percent(layer_object.get("opacity_percent").to_i32());
|
||||
layer->set_visible(layer_object.get("visible").as_bool());
|
||||
layer->set_selected(layer_object.get("selected").as_bool());
|
||||
layer->set_location({ layer_object.get("locationx"sv).to_i32(), layer_object.get("locationy"sv).to_i32() });
|
||||
layer->set_opacity_percent(layer_object.get("opacity_percent"sv).to_i32());
|
||||
layer->set_visible(layer_object.get("visible"sv).as_bool());
|
||||
layer->set_selected(layer_object.get("selected"sv).as_bool());
|
||||
}
|
||||
|
||||
return image;
|
||||
|
|
@ -123,24 +123,24 @@ ErrorOr<NonnullRefPtr<Image>> Image::try_create_from_pixel_paint_json(JsonObject
|
|||
|
||||
void Image::serialize_as_json(JsonObjectSerializer<StringBuilder>& json) const
|
||||
{
|
||||
MUST(json.add("width", m_size.width()));
|
||||
MUST(json.add("height", m_size.height()));
|
||||
MUST(json.add("width"sv, m_size.width()));
|
||||
MUST(json.add("height"sv, m_size.height()));
|
||||
{
|
||||
auto json_layers = MUST(json.add_array("layers"));
|
||||
auto json_layers = MUST(json.add_array("layers"sv));
|
||||
for (auto const& layer : m_layers) {
|
||||
Gfx::BMPWriter bmp_writer;
|
||||
auto json_layer = MUST(json_layers.add_object());
|
||||
MUST(json_layer.add("width", layer.size().width()));
|
||||
MUST(json_layer.add("height", layer.size().height()));
|
||||
MUST(json_layer.add("name", layer.name()));
|
||||
MUST(json_layer.add("locationx", layer.location().x()));
|
||||
MUST(json_layer.add("locationy", layer.location().y()));
|
||||
MUST(json_layer.add("opacity_percent", layer.opacity_percent()));
|
||||
MUST(json_layer.add("visible", layer.is_visible()));
|
||||
MUST(json_layer.add("selected", layer.is_selected()));
|
||||
MUST(json_layer.add("bitmap", encode_base64(bmp_writer.dump(layer.content_bitmap()))));
|
||||
MUST(json_layer.add("width"sv, layer.size().width()));
|
||||
MUST(json_layer.add("height"sv, layer.size().height()));
|
||||
MUST(json_layer.add("name"sv, layer.name()));
|
||||
MUST(json_layer.add("locationx"sv, layer.location().x()));
|
||||
MUST(json_layer.add("locationy"sv, layer.location().y()));
|
||||
MUST(json_layer.add("opacity_percent"sv, layer.opacity_percent()));
|
||||
MUST(json_layer.add("visible"sv, layer.is_visible()));
|
||||
MUST(json_layer.add("selected"sv, layer.is_selected()));
|
||||
MUST(json_layer.add("bitmap"sv, encode_base64(bmp_writer.dump(layer.content_bitmap()))));
|
||||
if (layer.is_masked())
|
||||
MUST(json_layer.add("mask", encode_base64(bmp_writer.dump(*layer.mask_bitmap()))));
|
||||
MUST(json_layer.add("mask"sv, encode_base64(bmp_writer.dump(*layer.mask_bitmap()))));
|
||||
MUST(json_layer.finish());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ ImageEditor::ImageEditor(NonnullRefPtr<Image> image)
|
|||
set_original_rect(m_image->rect());
|
||||
set_scale_bounds(0.1f, 100.0f);
|
||||
|
||||
m_pixel_grid_threshold = (float)Config::read_i32("PixelPaint", "PixelGrid", "Threshold", 15);
|
||||
m_show_pixel_grid = Config::read_bool("PixelPaint", "PixelGrid", "Show", true);
|
||||
m_pixel_grid_threshold = (float)Config::read_i32("PixelPaint"sv, "PixelGrid"sv, "Threshold"sv, 15);
|
||||
m_show_pixel_grid = Config::read_bool("PixelPaint"sv, "PixelGrid"sv, "Show"sv, true);
|
||||
|
||||
m_show_rulers = Config::read_bool("PixelPaint", "Rulers", "Show", true);
|
||||
m_show_guides = Config::read_bool("PixelPaint", "Guides", "Show", true);
|
||||
m_show_rulers = Config::read_bool("PixelPaint"sv, "Rulers"sv, "Show"sv, true);
|
||||
m_show_guides = Config::read_bool("PixelPaint"sv, "Guides"sv, "Show"sv, true);
|
||||
}
|
||||
|
||||
ImageEditor::~ImageEditor()
|
||||
|
|
@ -618,14 +618,14 @@ Result<void, String> ImageEditor::save_project_to_file(Core::File& file) const
|
|||
StringBuilder builder;
|
||||
auto json = MUST(JsonObjectSerializer<>::try_create(builder));
|
||||
m_image->serialize_as_json(json);
|
||||
auto json_guides = MUST(json.add_array("guides"));
|
||||
auto json_guides = MUST(json.add_array("guides"sv));
|
||||
for (auto const& guide : m_guides) {
|
||||
auto json_guide = MUST(json_guides.add_object());
|
||||
MUST(json_guide.add("offset"sv, (double)guide.offset()));
|
||||
if (guide.orientation() == Guide::Orientation::Vertical)
|
||||
MUST(json_guide.add("orientation", "vertical"));
|
||||
MUST(json_guide.add("orientation"sv, "vertical"));
|
||||
else if (guide.orientation() == Guide::Orientation::Horizontal)
|
||||
MUST(json_guide.add("orientation", "horizontal"));
|
||||
MUST(json_guide.add("orientation"sv, "horizontal"));
|
||||
MUST(json_guide.finish());
|
||||
}
|
||||
MUST(json_guides.finish());
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ LayerPropertiesWidget::LayerPropertiesWidget()
|
|||
{
|
||||
set_layout<GUI::VerticalBoxLayout>();
|
||||
|
||||
auto& group_box = add<GUI::GroupBox>("Layer properties");
|
||||
auto& group_box = add<GUI::GroupBox>("Layer properties"sv);
|
||||
auto& layout = group_box.set_layout<GUI::VerticalBoxLayout>();
|
||||
|
||||
layout.set_margins({ 8 });
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
|
|||
auto response = FileSystemAccessClient::Client::the().try_save_file(&window, "untitled", "bmp");
|
||||
if (response.is_error())
|
||||
return;
|
||||
auto preserve_alpha_channel = GUI::MessageBox::show(&window, "Do you wish to preserve transparency?", "Preserve transparency?", GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo);
|
||||
auto preserve_alpha_channel = GUI::MessageBox::show(&window, "Do you wish to preserve transparency?"sv, "Preserve transparency?"sv, GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo);
|
||||
auto result = editor->image().export_bmp_to_file(response.value(), preserve_alpha_channel == GUI::MessageBox::ExecResult::Yes);
|
||||
if (result.is_error())
|
||||
GUI::MessageBox::show_error(&window, String::formatted("Export to BMP failed: {}", result.error()));
|
||||
|
|
@ -189,7 +189,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
|
|||
auto response = FileSystemAccessClient::Client::the().try_save_file(&window, "untitled", "png");
|
||||
if (response.is_error())
|
||||
return;
|
||||
auto preserve_alpha_channel = GUI::MessageBox::show(&window, "Do you wish to preserve transparency?", "Preserve transparency?", GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo);
|
||||
auto preserve_alpha_channel = GUI::MessageBox::show(&window, "Do you wish to preserve transparency?"sv, "Preserve transparency?"sv, GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo);
|
||||
auto result = editor->image().export_png_to_file(response.value(), preserve_alpha_channel == GUI::MessageBox::ExecResult::Yes);
|
||||
if (result.is_error())
|
||||
GUI::MessageBox::show_error(&window, String::formatted("Export to PNG failed: {}", result.error()));
|
||||
|
|
@ -407,12 +407,12 @@ void MainWidget::initialize_menubar(GUI::Window& window)
|
|||
// Save this so other methods can use it
|
||||
m_show_guides_action = GUI::Action::create_checkable(
|
||||
"Show &Guides", [&](auto& action) {
|
||||
Config::write_bool("PixelPaint", "Guides", "Show", action.is_checked());
|
||||
Config::write_bool("PixelPaint"sv, "Guides"sv, "Show"sv, action.is_checked());
|
||||
auto* editor = current_image_editor();
|
||||
VERIFY(editor);
|
||||
editor->set_guide_visibility(action.is_checked());
|
||||
});
|
||||
m_show_guides_action->set_checked(Config::read_bool("PixelPaint", "Guides", "Show", true));
|
||||
m_show_guides_action->set_checked(Config::read_bool("PixelPaint"sv, "Guides"sv, "Show"sv, true));
|
||||
|
||||
m_view_menu->add_action(*m_zoom_in_action);
|
||||
m_view_menu->add_action(*m_zoom_out_action);
|
||||
|
|
@ -437,32 +437,32 @@ void MainWidget::initialize_menubar(GUI::Window& window)
|
|||
|
||||
auto show_pixel_grid_action = GUI::Action::create_checkable(
|
||||
"Show &Pixel Grid", [&](auto& action) {
|
||||
Config::write_bool("PixelPaint", "PixelGrid", "Show", action.is_checked());
|
||||
Config::write_bool("PixelPaint"sv, "PixelGrid"sv, "Show"sv, action.is_checked());
|
||||
auto* editor = current_image_editor();
|
||||
VERIFY(editor);
|
||||
editor->set_pixel_grid_visibility(action.is_checked());
|
||||
});
|
||||
show_pixel_grid_action->set_checked(Config::read_bool("PixelPaint", "PixelGrid", "Show", true));
|
||||
show_pixel_grid_action->set_checked(Config::read_bool("PixelPaint"sv, "PixelGrid"sv, "Show"sv, true));
|
||||
m_view_menu->add_action(*show_pixel_grid_action);
|
||||
|
||||
m_show_rulers_action = GUI::Action::create_checkable(
|
||||
"Show R&ulers", { Mod_Ctrl, Key_R }, [&](auto& action) {
|
||||
Config::write_bool("PixelPaint", "Rulers", "Show", action.is_checked());
|
||||
Config::write_bool("PixelPaint"sv, "Rulers"sv, "Show"sv, action.is_checked());
|
||||
auto* editor = current_image_editor();
|
||||
VERIFY(editor);
|
||||
editor->set_ruler_visibility(action.is_checked());
|
||||
});
|
||||
m_show_rulers_action->set_checked(Config::read_bool("PixelPaint", "Rulers", "Show", true));
|
||||
m_show_rulers_action->set_checked(Config::read_bool("PixelPaint"sv, "Rulers"sv, "Show"sv, true));
|
||||
m_view_menu->add_action(*m_show_rulers_action);
|
||||
|
||||
m_show_active_layer_boundary_action = GUI::Action::create_checkable(
|
||||
"Show Active Layer &Boundary", [&](auto& action) {
|
||||
Config::write_bool("PixelPaint", "ImageEditor", "ShowActiveLayerBoundary", action.is_checked());
|
||||
Config::write_bool("PixelPaint"sv, "ImageEditor"sv, "ShowActiveLayerBoundary"sv, action.is_checked());
|
||||
auto* editor = current_image_editor();
|
||||
VERIFY(editor);
|
||||
editor->set_show_active_layer_boundary(action.is_checked());
|
||||
});
|
||||
m_show_active_layer_boundary_action->set_checked(Config::read_bool("PixelPaint", "ImageEditor", "ShowActiveLayerBoundary", true));
|
||||
m_show_active_layer_boundary_action->set_checked(Config::read_bool("PixelPaint"sv, "ImageEditor"sv, "ShowActiveLayerBoundary"sv, true));
|
||||
m_view_menu->add_action(*m_show_active_layer_boundary_action);
|
||||
|
||||
m_tool_menu = window.add_menu("&Tool");
|
||||
|
|
@ -700,7 +700,7 @@ void MainWidget::initialize_menubar(GUI::Window& window)
|
|||
}));
|
||||
|
||||
auto& help_menu = window.add_menu("&Help");
|
||||
help_menu.add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"), &window));
|
||||
help_menu.add_action(GUI::CommonActions::make_about_action("Pixel Paint", GUI::Icon::default_icon("app-pixel-paint"sv), &window));
|
||||
|
||||
m_levels_dialog_action = GUI::Action::create(
|
||||
"Change &Levels...", { Mod_Ctrl, Key_L }, g_icon_bag.levels, [&](auto&) {
|
||||
|
|
@ -825,7 +825,7 @@ void MainWidget::create_image_from_clipboard()
|
|||
{
|
||||
auto bitmap = GUI::Clipboard::the().fetch_data_and_type().as_bitmap();
|
||||
if (!bitmap) {
|
||||
GUI::MessageBox::show(window(), "There is no image in a clipboard to paste.", "PixelPaint", GUI::MessageBox::Type::Warning);
|
||||
GUI::MessageBox::show(window(), "There is no image in a clipboard to paste."sv, "PixelPaint"sv, GUI::MessageBox::Type::Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ Result<void, String> PaletteWidget::save_palette_file(Vector<Color> palette, Cor
|
|||
{
|
||||
for (auto& color : palette) {
|
||||
file.write(color.to_string_without_alpha());
|
||||
file.write("\n");
|
||||
file.write("\n"sv);
|
||||
}
|
||||
return {};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@ ErrorOr<void> ProjectLoader::try_load_from_file(Core::File& file)
|
|||
auto& json = json_or_error.value().as_object();
|
||||
auto image = TRY(Image::try_create_from_pixel_paint_json(json));
|
||||
|
||||
if (json.has("guides"))
|
||||
m_json_metadata = json.get("guides").as_array();
|
||||
if (json.has("guides"sv))
|
||||
m_json_metadata = json.get("guides"sv).as_array();
|
||||
|
||||
m_image = image;
|
||||
return {};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ ToolPropertiesWidget::ToolPropertiesWidget()
|
|||
{
|
||||
set_layout<GUI::VerticalBoxLayout>();
|
||||
|
||||
m_group_box = add<GUI::GroupBox>("Tool properties");
|
||||
m_group_box = add<GUI::GroupBox>("Tool properties"sv);
|
||||
auto& layout = m_group_box->set_layout<GUI::VerticalBoxLayout>();
|
||||
layout.set_margins({ 8 });
|
||||
m_tool_widget_stack = m_group_box->add<GUI::StackWidget>();
|
||||
|
|
|
|||
|
|
@ -68,20 +68,20 @@ void ToolboxWidget::setup_tools()
|
|||
m_tools.append(move(tool));
|
||||
};
|
||||
|
||||
add_tool("Move", "move", { 0, Key_M }, make<MoveTool>());
|
||||
add_tool("Pen", "pen", { 0, Key_N }, make<PenTool>());
|
||||
add_tool("Brush", "brush", { 0, Key_P }, make<BrushTool>());
|
||||
add_tool("Bucket Fill", "bucket", { Mod_Shift, Key_B }, make<BucketTool>());
|
||||
add_tool("Spray", "spray", { Mod_Shift, Key_S }, make<SprayTool>());
|
||||
add_tool("Color Picker", "picker", { 0, Key_O }, make<PickerTool>());
|
||||
add_tool("Erase", "eraser", { Mod_Shift, Key_E }, make<EraseTool>());
|
||||
add_tool("Line", "line", { Mod_Ctrl | Mod_Shift, Key_L }, make<LineTool>());
|
||||
add_tool("Rectangle", "rectangle", { Mod_Ctrl | Mod_Shift, Key_R }, make<RectangleTool>());
|
||||
add_tool("Ellipse", "circle", { Mod_Ctrl | Mod_Shift, Key_E }, make<EllipseTool>());
|
||||
add_tool("Zoom", "zoom", { 0, Key_Z }, make<ZoomTool>());
|
||||
add_tool("Rectangle Select", "rectangle-select", { 0, Key_R }, make<RectangleSelectTool>());
|
||||
add_tool("Guides", "guides", { 0, Key_G }, make<GuideTool>());
|
||||
add_tool("Clone Tool", "clone", { 0, Key_C }, make<CloneTool>());
|
||||
add_tool("Move", "move"sv, { 0, Key_M }, make<MoveTool>());
|
||||
add_tool("Pen", "pen"sv, { 0, Key_N }, make<PenTool>());
|
||||
add_tool("Brush", "brush"sv, { 0, Key_P }, make<BrushTool>());
|
||||
add_tool("Bucket Fill", "bucket"sv, { Mod_Shift, Key_B }, make<BucketTool>());
|
||||
add_tool("Spray", "spray"sv, { Mod_Shift, Key_S }, make<SprayTool>());
|
||||
add_tool("Color Picker", "picker"sv, { 0, Key_O }, make<PickerTool>());
|
||||
add_tool("Erase", "eraser"sv, { Mod_Shift, Key_E }, make<EraseTool>());
|
||||
add_tool("Line", "line"sv, { Mod_Ctrl | Mod_Shift, Key_L }, make<LineTool>());
|
||||
add_tool("Rectangle", "rectangle"sv, { Mod_Ctrl | Mod_Shift, Key_R }, make<RectangleTool>());
|
||||
add_tool("Ellipse", "circle"sv, { Mod_Ctrl | Mod_Shift, Key_E }, make<EllipseTool>());
|
||||
add_tool("Zoom", "zoom"sv, { 0, Key_Z }, make<ZoomTool>());
|
||||
add_tool("Rectangle Select", "rectangle-select"sv, { 0, Key_R }, make<RectangleSelectTool>());
|
||||
add_tool("Guides", "guides"sv, { 0, Key_G }, make<GuideTool>());
|
||||
add_tool("Clone Tool", "clone"sv, { 0, Key_C }, make<CloneTool>());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ namespace PixelPaint {
|
|||
|
||||
BucketTool::BucketTool()
|
||||
{
|
||||
m_cursor = Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/bucket.png").release_value_but_fixme_should_propagate_errors();
|
||||
m_cursor = Gfx::Bitmap::try_load_from_file("/res/icons/pixelpaint/bucket.png"sv).release_value_but_fixme_should_propagate_errors();
|
||||
}
|
||||
|
||||
static float color_distance_squared(Gfx::Color const& lhs, Gfx::Color const& rhs)
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ void GuideTool::on_context_menu(Layer*, GUI::ContextMenuEvent& event)
|
|||
if (!m_context_menu) {
|
||||
m_context_menu = GUI::Menu::construct();
|
||||
m_context_menu->add_action(GUI::Action::create(
|
||||
"Set &Offset", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/gear.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) {
|
||||
"Set &Offset", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/gear.png"sv).release_value_but_fixme_should_propagate_errors(), [this](auto&) {
|
||||
if (!m_context_menu_guide)
|
||||
return;
|
||||
auto dialog = EditGuideDialog::construct(
|
||||
|
|
@ -153,7 +153,7 @@ void GuideTool::on_context_menu(Layer*, GUI::ContextMenuEvent& event)
|
|||
},
|
||||
editor()));
|
||||
m_context_menu->add_action(GUI::Action::create(
|
||||
"&Delete Guide", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png").release_value_but_fixme_should_propagate_errors(), [this](auto&) {
|
||||
"&Delete Guide", Gfx::Bitmap::try_load_from_file("/res/icons/16x16/delete.png"sv).release_value_but_fixme_should_propagate_errors(), [this](auto&) {
|
||||
if (!m_context_menu_guide)
|
||||
return;
|
||||
editor()->remove_guide(*m_context_menu_guide);
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
TRY(Core::System::unveil("/etc/FileIconProvider.ini", "r"));
|
||||
TRY(Core::System::unveil(nullptr, nullptr));
|
||||
|
||||
auto app_icon = GUI::Icon::default_icon("app-pixel-paint");
|
||||
auto app_icon = GUI::Icon::default_icon("app-pixel-paint"sv);
|
||||
|
||||
PixelPaint::g_icon_bag = TRY(PixelPaint::IconBag::try_create());
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue