AK: Make "foo"_string infallible

Stop worrying about tiny OOMs.

Work towards #20405.
This commit is contained in:
Andreas Kling 2023-08-07 11:12:38 +02:00
parent db2a8725c6
commit 34344120f2
Notes: sideshowbarker 2024-07-16 20:31:50 +09:00
181 changed files with 626 additions and 630 deletions

View file

@ -280,9 +280,9 @@ struct Formatter<String> : Formatter<StringView> {
} }
[[nodiscard]] ALWAYS_INLINE AK::ErrorOr<AK::String> operator""_string(char const* cstring, size_t length) [[nodiscard]] ALWAYS_INLINE AK::String operator""_string(char const* cstring, size_t length)
{ {
return AK::String::from_utf8(AK::StringView(cstring, length)); return AK::String::from_utf8(AK::StringView(cstring, length)).release_value();
} }
[[nodiscard]] ALWAYS_INLINE AK_SHORT_STRING_CONSTEVAL AK::String operator""_short_string(char const* cstring, size_t length) [[nodiscard]] ALWAYS_INLINE AK_SHORT_STRING_CONSTEVAL AK::String operator""_short_string(char const* cstring, size_t length)

View file

@ -242,10 +242,10 @@ ErrorOr<OwnPtr<CalculationNode>> Parser::parse_math_function(PropertyID property
bool parameter_is_calculation; bool parameter_is_calculation;
if (parameter_type_string == "<rounding-strategy>") { if (parameter_type_string == "<rounding-strategy>") {
parameter_is_calculation = false; parameter_is_calculation = false;
TRY(parameter_generator.set("parameter_type", TRY("RoundingStrategy"_string))); TRY(parameter_generator.set("parameter_type", "RoundingStrategy"_string));
TRY(parameter_generator.set("parse_function", TRY("parse_rounding_strategy(arguments[argument_index])"_string))); TRY(parameter_generator.set("parse_function", "parse_rounding_strategy(arguments[argument_index])"_string));
TRY(parameter_generator.set("check_function", TRY(".has_value()"_string))); TRY(parameter_generator.set("check_function", ".has_value()"_string));
TRY(parameter_generator.set("release_function", TRY(".release_value()"_string))); TRY(parameter_generator.set("release_function", ".release_value()"_string));
if (auto default_value = parameter.get_deprecated_string("default"sv); default_value.has_value()) { if (auto default_value = parameter.get_deprecated_string("default"sv); default_value.has_value()) {
TRY(parameter_generator.set("parameter_default", TRY(String::formatted(" = RoundingStrategy::{}", TRY(title_casify(default_value.value())))))); TRY(parameter_generator.set("parameter_default", TRY(String::formatted(" = RoundingStrategy::{}", TRY(title_casify(default_value.value()))))));
} else { } else {
@ -254,10 +254,10 @@ ErrorOr<OwnPtr<CalculationNode>> Parser::parse_math_function(PropertyID property
} else { } else {
// NOTE: This assumes everything not handled above is a calculation node of some kind. // NOTE: This assumes everything not handled above is a calculation node of some kind.
parameter_is_calculation = true; parameter_is_calculation = true;
TRY(parameter_generator.set("parameter_type", TRY("OwnPtr<CalculationNode>"_string))); TRY(parameter_generator.set("parameter_type", "OwnPtr<CalculationNode>"_string));
TRY(parameter_generator.set("parse_function", TRY("TRY(parse_a_calculation(arguments[argument_index]))"_string))); TRY(parameter_generator.set("parse_function", "TRY(parse_a_calculation(arguments[argument_index]))"_string));
TRY(parameter_generator.set("check_function", TRY(" != nullptr"_string))); TRY(parameter_generator.set("check_function", " != nullptr"_string));
TRY(parameter_generator.set("release_function", TRY(".release_nonnull()"_string))); TRY(parameter_generator.set("release_function", ".release_nonnull()"_string));
// NOTE: We have exactly one default value in the data right now, and it's a `<calc-constant>`, // NOTE: We have exactly one default value in the data right now, and it's a `<calc-constant>`,
// so that's all we handle. // so that's all we handle.
@ -354,7 +354,7 @@ ErrorOr<OwnPtr<CalculationNode>> Parser::parse_math_function(PropertyID property
TRY(parameter_generator.set("release_value"sv, ""_short_string)); TRY(parameter_generator.set("release_value"sv, ""_short_string));
} else { } else {
// NOTE: This assumes everything not handled above is a calculation node of some kind. // NOTE: This assumes everything not handled above is a calculation node of some kind.
TRY(parameter_generator.set("release_value"sv, TRY(".release_nonnull()"_string))); TRY(parameter_generator.set("release_value"sv, ".release_nonnull()"_string));
} }
if (parameter_index == 0) { if (parameter_index == 0) {

View file

@ -22,13 +22,13 @@ TEST_CASE(empty_string)
TEST_CASE(short_string) TEST_CASE(short_string)
{ {
FlyString fly1 { MUST("foo"_string) }; FlyString fly1 { "foo"_string };
EXPECT_EQ(fly1, "foo"sv); EXPECT_EQ(fly1, "foo"sv);
FlyString fly2 { MUST("foo"_string) }; FlyString fly2 { "foo"_string };
EXPECT_EQ(fly2, "foo"sv); EXPECT_EQ(fly2, "foo"sv);
FlyString fly3 { MUST("bar"_string) }; FlyString fly3 { "bar"_string };
EXPECT_EQ(fly3, "bar"sv); EXPECT_EQ(fly3, "bar"sv);
EXPECT_EQ(fly1, fly2); EXPECT_EQ(fly1, fly2);
@ -45,15 +45,15 @@ TEST_CASE(short_string)
TEST_CASE(long_string) TEST_CASE(long_string)
{ {
FlyString fly1 { MUST("thisisdefinitelymorethan7bytes"_string) }; FlyString fly1 { "thisisdefinitelymorethan7bytes"_string };
EXPECT_EQ(fly1, "thisisdefinitelymorethan7bytes"sv); EXPECT_EQ(fly1, "thisisdefinitelymorethan7bytes"sv);
EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
FlyString fly2 { MUST("thisisdefinitelymorethan7bytes"_string) }; FlyString fly2 { "thisisdefinitelymorethan7bytes"_string };
EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv); EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv);
EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
FlyString fly3 { MUST("thisisalsoforsuremorethan7bytes"_string) }; FlyString fly3 { "thisisalsoforsuremorethan7bytes"_string };
EXPECT_EQ(fly3, "thisisalsoforsuremorethan7bytes"sv); EXPECT_EQ(fly3, "thisisalsoforsuremorethan7bytes"sv);
EXPECT_EQ(FlyString::number_of_fly_strings(), 2u); EXPECT_EQ(FlyString::number_of_fly_strings(), 2u);
@ -91,7 +91,7 @@ TEST_CASE(fly_string_keep_string_data_alive)
{ {
FlyString fly {}; FlyString fly {};
{ {
auto string = MUST("thisisdefinitelymorethan7bytes"_string); auto string = "thisisdefinitelymorethan7bytes"_string;
fly = FlyString { string }; fly = FlyString { string };
EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);
} }
@ -108,7 +108,7 @@ TEST_CASE(moved_fly_string_becomes_empty)
FlyString fly1 {}; FlyString fly1 {};
EXPECT(fly1.is_empty()); EXPECT(fly1.is_empty());
FlyString fly2 { MUST("thisisdefinitelymorethan7bytes"_string) }; FlyString fly2 { "thisisdefinitelymorethan7bytes"_string };
EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv); EXPECT_EQ(fly2, "thisisdefinitelymorethan7bytes"sv);
EXPECT_EQ(FlyString::number_of_fly_strings(), 1u); EXPECT_EQ(FlyString::number_of_fly_strings(), 1u);

View file

@ -23,7 +23,7 @@ TEST_CASE(construct_empty)
EXPECT_EQ(empty.bytes().size(), 0u); EXPECT_EQ(empty.bytes().size(), 0u);
EXPECT_EQ(empty, ""sv); EXPECT_EQ(empty, ""sv);
auto empty2 = MUST(""_string); auto empty2 = ""_string;
EXPECT(empty2.is_empty()); EXPECT(empty2.is_empty());
EXPECT_EQ(empty, empty2); EXPECT_EQ(empty, empty2);
@ -34,8 +34,8 @@ TEST_CASE(construct_empty)
TEST_CASE(move_assignment) TEST_CASE(move_assignment)
{ {
String string1 = MUST("hello"_string); String string1 = "hello"_string;
string1 = MUST("friends!"_string); string1 = "friends!"_string;
EXPECT_EQ(string1, "friends!"sv); EXPECT_EQ(string1, "friends!"sv);
} }
@ -52,7 +52,7 @@ TEST_CASE(short_strings)
EXPECT_EQ(string2.bytes().size(), 7u); EXPECT_EQ(string2.bytes().size(), 7u);
EXPECT_EQ(string2, string1); EXPECT_EQ(string2, string1);
auto string3 = MUST("abcdefg"_string); auto string3 = "abcdefg"_string;
EXPECT_EQ(string3.is_short_string(), true); EXPECT_EQ(string3.is_short_string(), true);
EXPECT_EQ(string3.bytes().size(), 7u); EXPECT_EQ(string3.bytes().size(), 7u);
EXPECT_EQ(string3, string1); EXPECT_EQ(string3, string1);
@ -72,7 +72,7 @@ TEST_CASE(short_strings)
EXPECT_EQ(string2.bytes().size(), 3u); EXPECT_EQ(string2.bytes().size(), 3u);
EXPECT_EQ(string2, string1); EXPECT_EQ(string2, string1);
auto string3 = MUST("abc"_string); auto string3 = "abc"_string;
EXPECT_EQ(string3.is_short_string(), true); EXPECT_EQ(string3.is_short_string(), true);
EXPECT_EQ(string3.bytes().size(), 3u); EXPECT_EQ(string3.bytes().size(), 3u);
EXPECT_EQ(string3, string1); EXPECT_EQ(string3, string1);
@ -182,7 +182,7 @@ TEST_CASE(from_code_points)
TEST_CASE(substring) TEST_CASE(substring)
{ {
auto superstring = MUST("Hello I am a long string"_string); auto superstring = "Hello I am a long string"_string;
auto short_substring = MUST(superstring.substring_from_byte_offset(0, 5)); auto short_substring = MUST(superstring.substring_from_byte_offset(0, 5));
EXPECT_EQ(short_substring, "Hello"sv); EXPECT_EQ(short_substring, "Hello"sv);
@ -192,7 +192,7 @@ TEST_CASE(substring)
TEST_CASE(substring_with_shared_superstring) TEST_CASE(substring_with_shared_superstring)
{ {
auto superstring = MUST("Hello I am a long string"_string); auto superstring = "Hello I am a long string"_string;
auto substring1 = MUST(superstring.substring_from_byte_offset_with_shared_superstring(0, 5)); auto substring1 = MUST(superstring.substring_from_byte_offset_with_shared_superstring(0, 5));
EXPECT_EQ(substring1, "Hello"sv); EXPECT_EQ(substring1, "Hello"sv);
@ -203,7 +203,7 @@ TEST_CASE(substring_with_shared_superstring)
TEST_CASE(code_points) TEST_CASE(code_points)
{ {
auto string = MUST("🦬🪒"_string); auto string = "🦬🪒"_string;
Vector<u32> code_points; Vector<u32> code_points;
for (auto code_point : string.code_points()) for (auto code_point : string.code_points())
@ -226,20 +226,20 @@ TEST_CASE(string_builder)
TEST_CASE(ak_format) TEST_CASE(ak_format)
{ {
auto foo = MUST(String::formatted("Hello {}", MUST("friends"_string))); auto foo = MUST(String::formatted("Hello {}", "friends"_string));
EXPECT_EQ(foo, "Hello friends"sv); EXPECT_EQ(foo, "Hello friends"sv);
} }
TEST_CASE(replace) TEST_CASE(replace)
{ {
{ {
auto haystack = MUST("Hello enemies"_string); auto haystack = "Hello enemies"_string;
auto result = MUST(haystack.replace("enemies"sv, "friends"sv, ReplaceMode::All)); auto result = MUST(haystack.replace("enemies"sv, "friends"sv, ReplaceMode::All));
EXPECT_EQ(result, "Hello friends"sv); EXPECT_EQ(result, "Hello friends"sv);
} }
{ {
auto base_title = MUST("anon@courage:~"_string); auto base_title = "anon@courage:~"_string;
auto result = MUST(base_title.replace("[*]"sv, "(*)"sv, ReplaceMode::FirstOnly)); auto result = MUST(base_title.replace("[*]"sv, "(*)"sv, ReplaceMode::FirstOnly));
EXPECT_EQ(result, "anon@courage:~"sv); EXPECT_EQ(result, "anon@courage:~"sv);
} }
@ -265,17 +265,17 @@ TEST_CASE(reverse)
TEST_CASE(to_lowercase) TEST_CASE(to_lowercase)
{ {
{ {
auto string = MUST("Aa"_string); auto string = "Aa"_string;
auto result = MUST(string.to_lowercase()); auto result = MUST(string.to_lowercase());
EXPECT_EQ(result, "aa"sv); EXPECT_EQ(result, "aa"sv);
} }
{ {
auto string = MUST("Ωω"_string); auto string = "Ωω"_string;
auto result = MUST(string.to_lowercase()); auto result = MUST(string.to_lowercase());
EXPECT_EQ(result, "ωω"sv); EXPECT_EQ(result, "ωω"sv);
} }
{ {
auto string = MUST("İi̇"_string); auto string = "İi̇"_string;
auto result = MUST(string.to_lowercase()); auto result = MUST(string.to_lowercase());
EXPECT_EQ(result, "i̇i̇"sv); EXPECT_EQ(result, "i̇i̇"sv);
} }
@ -284,17 +284,17 @@ TEST_CASE(to_lowercase)
TEST_CASE(to_uppercase) TEST_CASE(to_uppercase)
{ {
{ {
auto string = MUST("Aa"_string); auto string = "Aa"_string;
auto result = MUST(string.to_uppercase()); auto result = MUST(string.to_uppercase());
EXPECT_EQ(result, "AA"sv); EXPECT_EQ(result, "AA"sv);
} }
{ {
auto string = MUST("Ωω"_string); auto string = "Ωω"_string;
auto result = MUST(string.to_uppercase()); auto result = MUST(string.to_uppercase());
EXPECT_EQ(result, "ΩΩ"sv); EXPECT_EQ(result, "ΩΩ"sv);
} }
{ {
auto string = MUST("ʼn"_string); auto string = "ʼn"_string;
auto result = MUST(string.to_uppercase()); auto result = MUST(string.to_uppercase());
EXPECT_EQ(result, "ʼN"sv); EXPECT_EQ(result, "ʼN"sv);
} }
@ -303,22 +303,22 @@ TEST_CASE(to_uppercase)
TEST_CASE(to_titlecase) TEST_CASE(to_titlecase)
{ {
{ {
auto string = MUST("foo bar baz"_string); auto string = "foo bar baz"_string;
auto result = MUST(string.to_titlecase()); auto result = MUST(string.to_titlecase());
EXPECT_EQ(result, "Foo Bar Baz"sv); EXPECT_EQ(result, "Foo Bar Baz"sv);
} }
{ {
auto string = MUST("foo \n \r bar \t baz"_string); auto string = "foo \n \r bar \t baz"_string;
auto result = MUST(string.to_titlecase()); auto result = MUST(string.to_titlecase());
EXPECT_EQ(result, "Foo \n \r Bar \t Baz"sv); EXPECT_EQ(result, "Foo \n \r Bar \t Baz"sv);
} }
{ {
auto string = MUST("f\"oo\" b'ar'"_string); auto string = "f\"oo\" b'ar'"_string;
auto result = MUST(string.to_titlecase()); auto result = MUST(string.to_titlecase());
EXPECT_EQ(result, "F\"Oo\" B'ar'"sv); EXPECT_EQ(result, "F\"Oo\" B'ar'"sv);
} }
{ {
auto string = MUST("123dollars"_string); auto string = "123dollars"_string;
auto result = MUST(string.to_titlecase()); auto result = MUST(string.to_titlecase());
EXPECT_EQ(result, "123Dollars"sv); EXPECT_EQ(result, "123Dollars"sv);
} }
@ -333,12 +333,12 @@ TEST_CASE(equals_ignoring_case)
EXPECT(string1.equals_ignoring_case(string2)); EXPECT(string1.equals_ignoring_case(string2));
} }
{ {
auto string1 = MUST("abcd"_string); auto string1 = "abcd"_string;
auto string2 = MUST("ABCD"_string); auto string2 = "ABCD"_string;
auto string3 = MUST("AbCd"_string); auto string3 = "AbCd"_string;
auto string4 = MUST("dcba"_string); auto string4 = "dcba"_string;
auto string5 = MUST("abce"_string); auto string5 = "abce"_string;
auto string6 = MUST("abc"_string); auto string6 = "abc"_string;
EXPECT(string1.equals_ignoring_case(string2)); EXPECT(string1.equals_ignoring_case(string2));
EXPECT(string1.equals_ignoring_case(string3)); EXPECT(string1.equals_ignoring_case(string3));
@ -359,12 +359,12 @@ TEST_CASE(equals_ignoring_case)
EXPECT(!string3.equals_ignoring_case(string6)); EXPECT(!string3.equals_ignoring_case(string6));
} }
{ {
auto string1 = MUST("\u00DF"_string); // LATIN SMALL LETTER SHARP S auto string1 = "\u00DF"_string; // LATIN SMALL LETTER SHARP S
auto string2 = MUST("SS"_string); auto string2 = "SS"_string;
auto string3 = MUST("Ss"_string); auto string3 = "Ss"_string;
auto string4 = MUST("ss"_string); auto string4 = "ss"_string;
auto string5 = MUST("S"_string); auto string5 = "S"_string;
auto string6 = MUST("s"_string); auto string6 = "s"_string;
EXPECT(string1.equals_ignoring_case(string2)); EXPECT(string1.equals_ignoring_case(string2));
EXPECT(string1.equals_ignoring_case(string3)); EXPECT(string1.equals_ignoring_case(string3));
@ -392,12 +392,12 @@ TEST_CASE(equals_ignoring_case)
} }
{ {
auto string1 = MUST("Ab\u00DFCd\u00DFeF"_string); auto string1 = "Ab\u00DFCd\u00DFeF"_string;
auto string2 = MUST("ABSSCDSSEF"_string); auto string2 = "ABSSCDSSEF"_string;
auto string3 = MUST("absscdssef"_string); auto string3 = "absscdssef"_string;
auto string4 = MUST("aBSscDsSEf"_string); auto string4 = "aBSscDsSEf"_string;
auto string5 = MUST("Ab\u00DFCd\u00DFeg"_string); auto string5 = "Ab\u00DFCd\u00DFeg"_string;
auto string6 = MUST("Ab\u00DFCd\u00DFe"_string); auto string6 = "Ab\u00DFCd\u00DFe"_string;
EXPECT(string1.equals_ignoring_case(string1)); EXPECT(string1.equals_ignoring_case(string1));
EXPECT(string1.equals_ignoring_case(string2)); EXPECT(string1.equals_ignoring_case(string2));
@ -431,8 +431,8 @@ TEST_CASE(equals_ignoring_case)
TEST_CASE(is_one_of) TEST_CASE(is_one_of)
{ {
auto foo = MUST("foo"_string); auto foo = "foo"_string;
auto bar = MUST("bar"_string); auto bar = "bar"_string;
EXPECT(foo.is_one_of(foo)); EXPECT(foo.is_one_of(foo));
EXPECT(foo.is_one_of(foo, bar)); EXPECT(foo.is_one_of(foo, bar));
@ -448,7 +448,7 @@ TEST_CASE(is_one_of)
TEST_CASE(split) TEST_CASE(split)
{ {
{ {
auto test = MUST("foo bar baz"_string); auto test = "foo bar baz"_string;
auto parts = MUST(test.split(' ')); auto parts = MUST(test.split(' '));
EXPECT_EQ(parts.size(), 3u); EXPECT_EQ(parts.size(), 3u);
EXPECT_EQ(parts[0], "foo"); EXPECT_EQ(parts[0], "foo");
@ -456,7 +456,7 @@ TEST_CASE(split)
EXPECT_EQ(parts[2], "baz"); EXPECT_EQ(parts[2], "baz");
} }
{ {
auto test = MUST("ωΣ2ωΣω"_string); auto test = "ωΣ2ωΣω"_string;
auto parts = MUST(test.split(0x03A3u)); auto parts = MUST(test.split(0x03A3u));
EXPECT_EQ(parts.size(), 3u); EXPECT_EQ(parts.size(), 3u);
EXPECT_EQ(parts[0], "ω"sv); EXPECT_EQ(parts[0], "ω"sv);
@ -476,7 +476,7 @@ TEST_CASE(find_byte_offset)
EXPECT(!index2.has_value()); EXPECT(!index2.has_value());
} }
{ {
auto string = MUST("foo"_string); auto string = "foo"_string;
auto index1 = string.find_byte_offset('f'); auto index1 = string.find_byte_offset('f');
EXPECT_EQ(index1, 0u); EXPECT_EQ(index1, 0u);
@ -491,7 +491,7 @@ TEST_CASE(find_byte_offset)
EXPECT(!index4.has_value()); EXPECT(!index4.has_value());
} }
{ {
auto string = MUST("foo"_string); auto string = "foo"_string;
auto index1 = string.find_byte_offset("fo"sv); auto index1 = string.find_byte_offset("fo"sv);
EXPECT_EQ(index1, 0u); EXPECT_EQ(index1, 0u);
@ -506,7 +506,7 @@ TEST_CASE(find_byte_offset)
EXPECT(!index4.has_value()); EXPECT(!index4.has_value());
} }
{ {
auto string = MUST("ωΣωΣω"_string); auto string = "ωΣωΣω"_string;
auto index1 = string.find_byte_offset(0x03C9U); auto index1 = string.find_byte_offset(0x03C9U);
EXPECT_EQ(index1, 0u); EXPECT_EQ(index1, 0u);
@ -524,7 +524,7 @@ TEST_CASE(find_byte_offset)
EXPECT_EQ(index5, 8u); EXPECT_EQ(index5, 8u);
} }
{ {
auto string = MUST("ωΣωΣω"_string); auto string = "ωΣωΣω"_string;
auto index1 = string.find_byte_offset("ω"sv); auto index1 = string.find_byte_offset("ω"sv);
EXPECT_EQ(index1, 0u); EXPECT_EQ(index1, 0u);
@ -660,7 +660,7 @@ TEST_CASE(trim)
EXPECT(result.is_empty()); EXPECT(result.is_empty());
} }
{ {
auto string = MUST("word"_string); auto string = "word"_string;
auto result = MUST(string.trim(" "sv, TrimMode::Both)); auto result = MUST(string.trim(" "sv, TrimMode::Both));
EXPECT_EQ(result, "word"sv); EXPECT_EQ(result, "word"sv);
@ -672,7 +672,7 @@ TEST_CASE(trim)
EXPECT_EQ(result, "word"sv); EXPECT_EQ(result, "word"sv);
} }
{ {
auto string = MUST(" word"_string); auto string = " word"_string;
auto result = MUST(string.trim(" "sv, TrimMode::Both)); auto result = MUST(string.trim(" "sv, TrimMode::Both));
EXPECT_EQ(result, "word"sv); EXPECT_EQ(result, "word"sv);
@ -684,7 +684,7 @@ TEST_CASE(trim)
EXPECT_EQ(result, " word"sv); EXPECT_EQ(result, " word"sv);
} }
{ {
auto string = MUST("word "_string); auto string = "word "_string;
auto result = MUST(string.trim(" "sv, TrimMode::Both)); auto result = MUST(string.trim(" "sv, TrimMode::Both));
EXPECT_EQ(result, "word"sv); EXPECT_EQ(result, "word"sv);
@ -696,7 +696,7 @@ TEST_CASE(trim)
EXPECT_EQ(result, "word"sv); EXPECT_EQ(result, "word"sv);
} }
{ {
auto string = MUST(" word "_string); auto string = " word "_string;
auto result = MUST(string.trim(" "sv, TrimMode::Both)); auto result = MUST(string.trim(" "sv, TrimMode::Both));
EXPECT_EQ(result, "word"sv); EXPECT_EQ(result, "word"sv);
@ -708,7 +708,7 @@ TEST_CASE(trim)
EXPECT_EQ(result, " word"sv); EXPECT_EQ(result, " word"sv);
} }
{ {
auto string = MUST(" word "_string); auto string = " word "_string;
auto result = MUST(string.trim("\t"sv, TrimMode::Both)); auto result = MUST(string.trim("\t"sv, TrimMode::Both));
EXPECT_EQ(result, " word "sv); EXPECT_EQ(result, " word "sv);
@ -720,7 +720,7 @@ TEST_CASE(trim)
EXPECT_EQ(result, " word "sv); EXPECT_EQ(result, " word "sv);
} }
{ {
auto string = MUST("ωΣωΣω"_string); auto string = "ωΣωΣω"_string;
auto result = MUST(string.trim("ω"sv, TrimMode::Both)); auto result = MUST(string.trim("ω"sv, TrimMode::Both));
EXPECT_EQ(result, "ΣωΣ"sv); EXPECT_EQ(result, "ΣωΣ"sv);
@ -732,7 +732,7 @@ TEST_CASE(trim)
EXPECT_EQ(result, "ωΣωΣ"sv); EXPECT_EQ(result, "ωΣωΣ"sv);
} }
{ {
auto string = MUST("ωΣωΣω"_string); auto string = "ωΣωΣω"_string;
auto result = MUST(string.trim("ωΣ"sv, TrimMode::Both)); auto result = MUST(string.trim("ωΣ"sv, TrimMode::Both));
EXPECT(result.is_empty()); EXPECT(result.is_empty());
@ -744,7 +744,7 @@ TEST_CASE(trim)
EXPECT(result.is_empty()); EXPECT(result.is_empty());
} }
{ {
auto string = MUST("ωΣωΣω"_string); auto string = "ωΣωΣω"_string;
auto result = MUST(string.trim("Σω"sv, TrimMode::Both)); auto result = MUST(string.trim("Σω"sv, TrimMode::Both));
EXPECT(result.is_empty()); EXPECT(result.is_empty());
@ -786,7 +786,7 @@ TEST_CASE(contains)
EXPECT("abc"_short_string.contains(0x0063)); EXPECT("abc"_short_string.contains(0x0063));
EXPECT(!"abc"_short_string.contains(0x0064)); EXPECT(!"abc"_short_string.contains(0x0064));
auto emoji = MUST("😀"_string); auto emoji = "😀"_string;
EXPECT(emoji.contains("\xF0"sv)); EXPECT(emoji.contains("\xF0"sv));
EXPECT(emoji.contains("\x9F"sv)); EXPECT(emoji.contains("\x9F"sv));
EXPECT(emoji.contains("\x98"sv)); EXPECT(emoji.contains("\x98"sv));
@ -828,7 +828,7 @@ TEST_CASE(starts_with)
EXPECT(!"abc"_short_string.starts_with(0x0062)); EXPECT(!"abc"_short_string.starts_with(0x0062));
EXPECT(!"abc"_short_string.starts_with(0x0063)); EXPECT(!"abc"_short_string.starts_with(0x0063));
auto emoji = MUST("😀🙃"_string); auto emoji = "😀🙃"_string;
EXPECT(emoji.starts_with_bytes("\xF0"sv)); EXPECT(emoji.starts_with_bytes("\xF0"sv));
EXPECT(emoji.starts_with_bytes("\xF0\x9F"sv)); EXPECT(emoji.starts_with_bytes("\xF0\x9F"sv));
EXPECT(emoji.starts_with_bytes("\xF0\x9F\x98"sv)); EXPECT(emoji.starts_with_bytes("\xF0\x9F\x98"sv));
@ -869,7 +869,7 @@ TEST_CASE(ends_with)
EXPECT(!"abc"_short_string.ends_with(0x0062)); EXPECT(!"abc"_short_string.ends_with(0x0062));
EXPECT(!"abc"_short_string.ends_with(0x0061)); EXPECT(!"abc"_short_string.ends_with(0x0061));
auto emoji = MUST("😀🙃"_string); auto emoji = "😀🙃"_string;
EXPECT(emoji.ends_with_bytes("\x83"sv)); EXPECT(emoji.ends_with_bytes("\x83"sv));
EXPECT(emoji.ends_with_bytes("\x99\x83"sv)); EXPECT(emoji.ends_with_bytes("\x99\x83"sv));
EXPECT(emoji.ends_with_bytes("\x9F\x99\x83"sv)); EXPECT(emoji.ends_with_bytes("\x9F\x99\x83"sv));

View file

@ -53,7 +53,7 @@ TEST_CASE(decode_utf8)
TEST_CASE(encode_utf8) TEST_CASE(encode_utf8)
{ {
{ {
auto utf8_string = MUST("Привет, мир! 😀 γειά σου κόσμος こんにちは世界"_string); auto utf8_string = "Привет, мир! 😀 γειά σου κόσμος こんにちは世界"_string;
auto string = MUST(AK::utf8_to_utf16(utf8_string)); auto string = MUST(AK::utf8_to_utf16(utf8_string));
Utf16View view { string }; Utf16View view { string };
EXPECT_EQ(MUST(view.to_utf8(Utf16View::AllowInvalidCodeUnits::Yes)), utf8_string); EXPECT_EQ(MUST(view.to_utf8(Utf16View::AllowInvalidCodeUnits::Yes)), utf8_string);

View file

@ -395,7 +395,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_fullscreen(!window->is_fullscreen()); window->set_fullscreen(!window->is_fullscreen());
})); }));
auto& rotation_axis_menu = view_menu.add_submenu(TRY("Rotation &Axis"_string)); auto& rotation_axis_menu = view_menu.add_submenu("Rotation &Axis"_string);
auto rotation_x_action = GUI::Action::create_checkable("&X", [&widget](auto&) { auto rotation_x_action = GUI::Action::create_checkable("&X", [&widget](auto&) {
widget->toggle_rotate_x(); widget->toggle_rotate_x();
}); });
@ -413,7 +413,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
rotation_x_action->set_checked(true); rotation_x_action->set_checked(true);
rotation_z_action->set_checked(true); rotation_z_action->set_checked(true);
auto& rotation_speed_menu = view_menu.add_submenu(TRY("Rotation &Speed"_string)); auto& rotation_speed_menu = view_menu.add_submenu("Rotation &Speed"_string);
GUI::ActionGroup rotation_speed_actions; GUI::ActionGroup rotation_speed_actions;
rotation_speed_actions.set_exclusive(true); rotation_speed_actions.set_exclusive(true);
@ -448,7 +448,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
view_menu.add_action(*show_frame_rate_action); view_menu.add_action(*show_frame_rate_action);
auto& texture_menu = window->add_menu(TRY("&Texture"_string)); auto& texture_menu = window->add_menu("&Texture"_string);
auto texture_enabled_action = GUI::Action::create_checkable("&Enable Texture", [&widget](auto& action) { auto texture_enabled_action = GUI::Action::create_checkable("&Enable Texture", [&widget](auto& action) {
widget->set_texture_enabled(action.is_checked()); widget->set_texture_enabled(action.is_checked());
@ -542,7 +542,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
texture_scale_1_action->set_checked(true); texture_scale_1_action->set_checked(true);
auto& texture_mag_filter_menu = texture_menu.add_submenu(TRY("Mag Filter"_string)); auto& texture_mag_filter_menu = texture_menu.add_submenu("Mag Filter"_string);
GUI::ActionGroup texture_mag_filter_actions; GUI::ActionGroup texture_mag_filter_actions;
texture_mag_filter_actions.set_exclusive(true); texture_mag_filter_actions.set_exclusive(true);

View file

@ -21,6 +21,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::unveil(nullptr, nullptr)); TRY(Core::System::unveil(nullptr, nullptr));
auto app_icon = TRY(GUI::Icon::try_create_default_icon("ladyball"sv)); auto app_icon = TRY(GUI::Icon::try_create_default_icon("ladyball"sv));
TRY(GUI::AboutDialog::show(TRY("SerenityOS"_string), TRY(Core::Version::read_long_version_string()), app_icon.bitmap_for_size(32), nullptr, app_icon.bitmap_for_size(16))); TRY(GUI::AboutDialog::show("SerenityOS"_string, TRY(Core::Version::read_long_version_string()), app_icon.bitmap_for_size(32), nullptr, app_icon.bitmap_for_size(16)));
return app->exec(); return app->exec();
} }

View file

@ -265,7 +265,7 @@ void BookmarksBarWidget::update_content_size()
} else { } else {
// hide all items > m_last_visible_index and create new bookmarks menu for them // hide all items > m_last_visible_index and create new bookmarks menu for them
m_additional->set_visible(true); m_additional->set_visible(true);
m_additional_menu = GUI::Menu::construct("Additional Bookmarks"_string.release_value_but_fixme_should_propagate_errors()); m_additional_menu = GUI::Menu::construct("Additional Bookmarks"_string);
m_additional->set_menu(m_additional_menu); m_additional->set_menu(m_additional_menu);
for (size_t i = m_last_visible_index; i < m_bookmarks.size(); ++i) { for (size_t i = m_last_visible_index; i < m_bookmarks.size(); ++i) {
auto& bookmark = m_bookmarks.at(i); auto& bookmark = m_bookmarks.at(i);

View file

@ -215,9 +215,9 @@ void BrowserWindow::build_menus()
m_go_back_action = GUI::CommonActions::make_go_back_action([this](auto&) { active_tab().go_back(); }, this); m_go_back_action = GUI::CommonActions::make_go_back_action([this](auto&) { active_tab().go_back(); }, this);
m_go_forward_action = GUI::CommonActions::make_go_forward_action([this](auto&) { active_tab().go_forward(); }, this); m_go_forward_action = GUI::CommonActions::make_go_forward_action([this](auto&) { active_tab().go_forward(); }, this);
m_go_home_action = GUI::CommonActions::make_go_home_action([this](auto&) { active_tab().load(Browser::url_from_user_input(g_home_url)); }, this); m_go_home_action = GUI::CommonActions::make_go_home_action([this](auto&) { active_tab().load(Browser::url_from_user_input(g_home_url)); }, this);
m_go_home_action->set_status_tip("Go to home page"_string.release_value_but_fixme_should_propagate_errors()); m_go_home_action->set_status_tip("Go to home page"_string);
m_reload_action = GUI::CommonActions::make_reload_action([this](auto&) { active_tab().reload(); }, this); m_reload_action = GUI::CommonActions::make_reload_action([this](auto&) { active_tab().reload(); }, this);
m_reload_action->set_status_tip("Reload current page"_string.release_value_but_fixme_should_propagate_errors()); m_reload_action->set_status_tip("Reload current page"_string);
auto& go_menu = add_menu("&Go"_short_string); auto& go_menu = add_menu("&Go"_short_string);
go_menu.add_action(*m_go_back_action); go_menu.add_action(*m_go_back_action);
@ -242,23 +242,23 @@ void BrowserWindow::build_menus()
active_tab().view().get_source(); active_tab().view().get_source();
}, },
this); this);
m_view_source_action->set_status_tip("View source code of the current page"_string.release_value_but_fixme_should_propagate_errors()); m_view_source_action->set_status_tip("View source code of the current page"_string);
m_inspect_dom_tree_action = GUI::Action::create( m_inspect_dom_tree_action = GUI::Action::create(
"Inspect &DOM Tree", { Mod_None, Key_F12 }, g_icon_bag.dom_tree, [this](auto&) { "Inspect &DOM Tree", { Mod_None, Key_F12 }, g_icon_bag.dom_tree, [this](auto&) {
active_tab().show_inspector_window(Tab::InspectorTarget::Document); active_tab().show_inspector_window(Tab::InspectorTarget::Document);
}, },
this); this);
m_inspect_dom_tree_action->set_status_tip("Open inspector window for this page"_string.release_value_but_fixme_should_propagate_errors()); m_inspect_dom_tree_action->set_status_tip("Open inspector window for this page"_string);
m_inspect_dom_node_action = GUI::Action::create( m_inspect_dom_node_action = GUI::Action::create(
"&Inspect Element", g_icon_bag.inspect, [this](auto&) { "&Inspect Element", g_icon_bag.inspect, [this](auto&) {
active_tab().show_inspector_window(Tab::InspectorTarget::HoveredElement); active_tab().show_inspector_window(Tab::InspectorTarget::HoveredElement);
}, },
this); this);
m_inspect_dom_node_action->set_status_tip("Open inspector for this element"_string.release_value_but_fixme_should_propagate_errors()); m_inspect_dom_node_action->set_status_tip("Open inspector for this element"_string);
auto& inspect_menu = add_menu("&Inspect"_string.release_value_but_fixme_should_propagate_errors()); auto& inspect_menu = add_menu("&Inspect"_string);
inspect_menu.add_action(*m_view_source_action); inspect_menu.add_action(*m_view_source_action);
inspect_menu.add_action(*m_inspect_dom_tree_action); inspect_menu.add_action(*m_inspect_dom_tree_action);
@ -267,7 +267,7 @@ void BrowserWindow::build_menus()
active_tab().show_console_window(); active_tab().show_console_window();
}, },
this); this);
js_console_action->set_status_tip("Open JavaScript console for this page"_string.release_value_but_fixme_should_propagate_errors()); js_console_action->set_status_tip("Open JavaScript console for this page"_string);
inspect_menu.add_action(js_console_action); inspect_menu.add_action(js_console_action);
auto storage_window_action = GUI::Action::create( auto storage_window_action = GUI::Action::create(
@ -275,7 +275,7 @@ void BrowserWindow::build_menus()
active_tab().show_storage_inspector(); active_tab().show_storage_inspector();
}, },
this); this);
storage_window_action->set_status_tip("Show Storage inspector for this page"_string.release_value_but_fixme_should_propagate_errors()); storage_window_action->set_status_tip("Show Storage inspector for this page"_string);
inspect_menu.add_action(storage_window_action); inspect_menu.add_action(storage_window_action);
auto history_window_action = GUI::Action::create( auto history_window_action = GUI::Action::create(
@ -283,10 +283,10 @@ void BrowserWindow::build_menus()
active_tab().show_history_inspector(); active_tab().show_history_inspector();
}, },
this); this);
storage_window_action->set_status_tip("Show History inspector for this tab"_string.release_value_but_fixme_should_propagate_errors()); storage_window_action->set_status_tip("Show History inspector for this tab"_string);
inspect_menu.add_action(history_window_action); inspect_menu.add_action(history_window_action);
auto& settings_menu = add_menu("&Settings"_string.release_value_but_fixme_should_propagate_errors()); auto& settings_menu = add_menu("&Settings"_string);
m_change_homepage_action = GUI::Action::create( m_change_homepage_action = GUI::Action::create(
"Set Homepage URL...", g_icon_bag.go_home, [this](auto&) { "Set Homepage URL...", g_icon_bag.go_home, [this](auto&) {
@ -309,7 +309,7 @@ void BrowserWindow::build_menus()
dbgln("Failed to open search-engines file: {}", load_search_engines_result.error()); dbgln("Failed to open search-engines file: {}", load_search_engines_result.error());
} }
auto& color_scheme_menu = settings_menu.add_submenu("&Color Scheme"_string.release_value_but_fixme_should_propagate_errors()); auto& color_scheme_menu = settings_menu.add_submenu("&Color Scheme"_string);
color_scheme_menu.set_icon(g_icon_bag.color_chooser); color_scheme_menu.set_icon(g_icon_bag.color_chooser);
{ {
auto current_setting = Web::CSS::preferred_color_scheme_from_string(Config::read_string("Browser"sv, "Preferences"sv, "ColorScheme"sv, Browser::default_color_scheme)); auto current_setting = Web::CSS::preferred_color_scheme_from_string(Config::read_string("Browser"sv, "Preferences"sv, "ColorScheme"sv, Browser::default_color_scheme));
@ -400,7 +400,7 @@ void BrowserWindow::build_menus()
})); }));
m_user_agent_spoof_actions.set_exclusive(true); m_user_agent_spoof_actions.set_exclusive(true);
auto& spoof_user_agent_menu = debug_menu.add_submenu("Spoof &User Agent"_string.release_value_but_fixme_should_propagate_errors()); auto& spoof_user_agent_menu = debug_menu.add_submenu("Spoof &User Agent"_string);
m_disable_user_agent_spoofing = GUI::Action::create_checkable("Disabled", [this](auto&) { m_disable_user_agent_spoofing = GUI::Action::create_checkable("Disabled", [this](auto&) {
active_tab().view().debug_request("spoof-user-agent", Web::default_user_agent); active_tab().view().debug_request("spoof-user-agent", Web::default_user_agent);
}); });
@ -470,7 +470,7 @@ void BrowserWindow::build_menus()
ErrorOr<void> BrowserWindow::load_search_engines(GUI::Menu& settings_menu) ErrorOr<void> BrowserWindow::load_search_engines(GUI::Menu& settings_menu)
{ {
m_search_engine_actions.set_exclusive(true); m_search_engine_actions.set_exclusive(true);
auto& search_engine_menu = settings_menu.add_submenu("&Search Engine"_string.release_value_but_fixme_should_propagate_errors()); auto& search_engine_menu = settings_menu.add_submenu("&Search Engine"_string);
search_engine_menu.set_icon(g_icon_bag.find); search_engine_menu.set_icon(g_icon_bag.find);
bool search_engine_set = false; bool search_engine_set = false;

View file

@ -46,9 +46,9 @@ ErrorOr<String> CookiesModel::column_name(int column) const
case Column::Value: case Column::Value:
return "Value"_short_string; return "Value"_short_string;
case Column::ExpiryTime: case Column::ExpiryTime:
return TRY("Expiry time"_string); return "Expiry time"_string;
case Column::SameSite: case Column::SameSite:
return TRY("SameSite"_string); return "SameSite"_string;
case Column::__Count: case Column::__Count:
return String {}; return String {};
} }

View file

@ -93,7 +93,7 @@ DownloadWidget::DownloadWidget(const URL& url)
destination_label.set_fixed_height(16); destination_label.set_fixed_height(16);
destination_label.set_text_wrapping(Gfx::TextWrapping::DontWrap); destination_label.set_text_wrapping(Gfx::TextWrapping::DontWrap);
m_close_on_finish_checkbox = add<GUI::CheckBox>("Close when finished"_string.release_value_but_fixme_should_propagate_errors()); m_close_on_finish_checkbox = add<GUI::CheckBox>("Close when finished"_string);
m_close_on_finish_checkbox->set_checked(close_on_finish); m_close_on_finish_checkbox->set_checked(close_on_finish);
m_close_on_finish_checkbox->on_checked = [&](bool checked) { m_close_on_finish_checkbox->on_checked = [&](bool checked) {
@ -156,7 +156,7 @@ void DownloadWidget::did_finish(bool success)
m_browser_image->load_from_file("/res/graphics/download-finished.gif"sv); m_browser_image->load_from_file("/res/graphics/download-finished.gif"sv);
window()->set_title("Download finished!"); window()->set_title("Download finished!");
m_close_button->set_enabled(true); m_close_button->set_enabled(true);
m_cancel_button->set_text("Open in Folder"_string.release_value_but_fixme_should_propagate_errors()); m_cancel_button->set_text("Open in Folder"_string);
m_cancel_button->on_click = [this](auto) { m_cancel_button->on_click = [this](auto) {
Desktop::Launcher::open(URL::create_with_file_scheme(Core::StandardPaths::downloads_directory(), m_url.basename())); Desktop::Launcher::open(URL::create_with_file_scheme(Core::StandardPaths::downloads_directory(), m_url.basename()));
window()->close(); window()->close();

View file

@ -92,7 +92,7 @@ InspectorWidget::InspectorWidget()
set_selection(index); set_selection(index);
}; };
auto& accessibility_tree_container = top_tab_widget.add_tab<GUI::Widget>("Accessibility"_string.release_value_but_fixme_should_propagate_errors()); auto& accessibility_tree_container = top_tab_widget.add_tab<GUI::Widget>("Accessibility"_string);
accessibility_tree_container.set_layout<GUI::VerticalBoxLayout>(4); accessibility_tree_container.set_layout<GUI::VerticalBoxLayout>(4);
m_accessibility_tree_view = accessibility_tree_container.add<GUI::TreeView>(); m_accessibility_tree_view = accessibility_tree_container.add<GUI::TreeView>();
m_accessibility_tree_view->on_selection_change = [this] { m_accessibility_tree_view->on_selection_change = [this] {
@ -102,24 +102,24 @@ InspectorWidget::InspectorWidget()
auto& bottom_tab_widget = splitter.add<GUI::TabWidget>(); auto& bottom_tab_widget = splitter.add<GUI::TabWidget>();
auto& computed_style_table_container = bottom_tab_widget.add_tab<GUI::Widget>("Computed"_string.release_value_but_fixme_should_propagate_errors()); auto& computed_style_table_container = bottom_tab_widget.add_tab<GUI::Widget>("Computed"_string);
computed_style_table_container.set_layout<GUI::VerticalBoxLayout>(4); computed_style_table_container.set_layout<GUI::VerticalBoxLayout>(4);
m_computed_style_table_view = computed_style_table_container.add<GUI::TableView>(); m_computed_style_table_view = computed_style_table_container.add<GUI::TableView>();
auto& resolved_style_table_container = bottom_tab_widget.add_tab<GUI::Widget>("Resolved"_string.release_value_but_fixme_should_propagate_errors()); auto& resolved_style_table_container = bottom_tab_widget.add_tab<GUI::Widget>("Resolved"_string);
resolved_style_table_container.set_layout<GUI::VerticalBoxLayout>(4); resolved_style_table_container.set_layout<GUI::VerticalBoxLayout>(4);
m_resolved_style_table_view = resolved_style_table_container.add<GUI::TableView>(); m_resolved_style_table_view = resolved_style_table_container.add<GUI::TableView>();
auto& custom_properties_table_container = bottom_tab_widget.add_tab<GUI::Widget>("Variables"_string.release_value_but_fixme_should_propagate_errors()); auto& custom_properties_table_container = bottom_tab_widget.add_tab<GUI::Widget>("Variables"_string);
custom_properties_table_container.set_layout<GUI::VerticalBoxLayout>(4); custom_properties_table_container.set_layout<GUI::VerticalBoxLayout>(4);
m_custom_properties_table_view = custom_properties_table_container.add<GUI::TableView>(); m_custom_properties_table_view = custom_properties_table_container.add<GUI::TableView>();
auto& box_model_widget = bottom_tab_widget.add_tab<GUI::Widget>("Box Model"_string.release_value_but_fixme_should_propagate_errors()); auto& box_model_widget = bottom_tab_widget.add_tab<GUI::Widget>("Box Model"_string);
box_model_widget.set_layout<GUI::VerticalBoxLayout>(4); box_model_widget.set_layout<GUI::VerticalBoxLayout>(4);
m_element_size_view = box_model_widget.add<ElementSizePreviewWidget>(); m_element_size_view = box_model_widget.add<ElementSizePreviewWidget>();
m_element_size_view->set_should_hide_unnecessary_scrollbars(true); m_element_size_view->set_should_hide_unnecessary_scrollbars(true);
auto& aria_properties_state_widget = bottom_tab_widget.add_tab<GUI::Widget>("ARIA"_string.release_value_but_fixme_should_propagate_errors()); auto& aria_properties_state_widget = bottom_tab_widget.add_tab<GUI::Widget>("ARIA"_string);
aria_properties_state_widget.set_layout<GUI::VerticalBoxLayout>(4); aria_properties_state_widget.set_layout<GUI::VerticalBoxLayout>(4);
m_aria_properties_state_view = aria_properties_state_widget.add<GUI::TableView>(); m_aria_properties_state_view = aria_properties_state_widget.add<GUI::TableView>();

View file

@ -602,7 +602,7 @@ Tab::Tab(BrowserWindow& window, WebView::UseJavaScriptBytecode use_javascript_by
} }
}, },
this); this);
take_visible_screenshot_action->set_status_tip("Save a screenshot of the visible portion of the current tab to the Downloads directory"_string.release_value_but_fixme_should_propagate_errors()); take_visible_screenshot_action->set_status_tip("Save a screenshot of the visible portion of the current tab to the Downloads directory"_string);
auto take_full_screenshot_action = GUI::Action::create( auto take_full_screenshot_action = GUI::Action::create(
"Take &Full Screenshot"sv, g_icon_bag.filetype_image, [this](auto&) { "Take &Full Screenshot"sv, g_icon_bag.filetype_image, [this](auto&) {
@ -612,7 +612,7 @@ Tab::Tab(BrowserWindow& window, WebView::UseJavaScriptBytecode use_javascript_by
} }
}, },
this); this);
take_full_screenshot_action->set_status_tip("Save a screenshot of the entirety of the current tab to the Downloads directory"_string.release_value_but_fixme_should_propagate_errors()); take_full_screenshot_action->set_status_tip("Save a screenshot of the entirety of the current tab to the Downloads directory"_string);
m_page_context_menu = GUI::Menu::construct(); m_page_context_menu = GUI::Menu::construct();
m_page_context_menu->add_action(window.go_back_action()); m_page_context_menu->add_action(window.go_back_action());

View file

@ -31,7 +31,7 @@ WindowActions::WindowActions(GUI::Window& window)
on_create_new_tab(); on_create_new_tab();
}, },
&window); &window);
m_create_new_tab_action->set_status_tip("Open a new tab"_string.release_value_but_fixme_should_propagate_errors()); m_create_new_tab_action->set_status_tip("Open a new tab"_string);
m_create_new_window_action = GUI::Action::create( m_create_new_window_action = GUI::Action::create(
"&New Window", { Mod_Ctrl, Key_N }, g_icon_bag.new_window, [this](auto&) { "&New Window", { Mod_Ctrl, Key_N }, g_icon_bag.new_window, [this](auto&) {
@ -40,7 +40,7 @@ WindowActions::WindowActions(GUI::Window& window)
} }
}, },
&window); &window);
m_create_new_window_action->set_status_tip("Open a new browser window"_string.release_value_but_fixme_should_propagate_errors()); m_create_new_window_action->set_status_tip("Open a new browser window"_string);
m_next_tab_action = GUI::Action::create( m_next_tab_action = GUI::Action::create(
"&Next Tab", { Mod_Ctrl, Key_PageDown }, [this](auto&) { "&Next Tab", { Mod_Ctrl, Key_PageDown }, [this](auto&) {
@ -48,7 +48,7 @@ WindowActions::WindowActions(GUI::Window& window)
on_next_tab(); on_next_tab();
}, },
&window); &window);
m_next_tab_action->set_status_tip("Switch to the next tab"_string.release_value_but_fixme_should_propagate_errors()); m_next_tab_action->set_status_tip("Switch to the next tab"_string);
m_previous_tab_action = GUI::Action::create( m_previous_tab_action = GUI::Action::create(
"&Previous Tab", { Mod_Ctrl, Key_PageUp }, [this](auto&) { "&Previous Tab", { Mod_Ctrl, Key_PageUp }, [this](auto&) {
@ -56,7 +56,7 @@ WindowActions::WindowActions(GUI::Window& window)
on_previous_tab(); on_previous_tab();
}, },
&window); &window);
m_previous_tab_action->set_status_tip("Switch to the previous tab"_string.release_value_but_fixme_should_propagate_errors()); m_previous_tab_action->set_status_tip("Switch to the previous tab"_string);
for (auto i = 0; i <= 7; ++i) { for (auto i = 0; i <= 7; ++i) {
m_tab_actions.append(GUI::Action::create( m_tab_actions.append(GUI::Action::create(
@ -73,7 +73,7 @@ WindowActions::WindowActions(GUI::Window& window)
on_tabs[8](); on_tabs[8]();
}, },
&window)); &window));
m_tab_actions.last()->set_status_tip("Switch to last tab"_string.release_value_but_fixme_should_propagate_errors()); m_tab_actions.last()->set_status_tip("Switch to last tab"_string);
m_about_action = GUI::CommonActions::make_about_action("Ladybird", GUI::Icon::default_icon("app-browser"sv), &window); m_about_action = GUI::CommonActions::make_about_action("Ladybird", GUI::Icon::default_icon("app-browser"sv), &window);
@ -84,7 +84,7 @@ WindowActions::WindowActions(GUI::Window& window)
on_show_bookmarks_bar(action); on_show_bookmarks_bar(action);
}, },
&window); &window);
m_show_bookmarks_bar_action->set_status_tip("Show/hide the bookmarks bar"_string.release_value_but_fixme_should_propagate_errors()); m_show_bookmarks_bar_action->set_status_tip("Show/hide the bookmarks bar"_string);
m_vertical_tabs_action = GUI::Action::create_checkable( m_vertical_tabs_action = GUI::Action::create_checkable(
"&Vertical Tabs", { Mod_Ctrl, Key_Comma }, "&Vertical Tabs", { Mod_Ctrl, Key_Comma },
@ -93,7 +93,7 @@ WindowActions::WindowActions(GUI::Window& window)
on_vertical_tabs(action); on_vertical_tabs(action);
}, },
&window); &window);
m_vertical_tabs_action->set_status_tip("Enable/Disable vertical tabs"_string.release_value_but_fixme_should_propagate_errors()); m_vertical_tabs_action->set_status_tip("Enable/Disable vertical tabs"_string);
} }
} }

View file

@ -98,7 +98,7 @@ ErrorOr<void> BrowserSettingsWidget::setup()
Vector<GUI::JsonArrayModel::FieldSpec> search_engine_fields; Vector<GUI::JsonArrayModel::FieldSpec> search_engine_fields;
search_engine_fields.empend("title", "Title"_short_string, Gfx::TextAlignment::CenterLeft); search_engine_fields.empend("title", "Title"_short_string, Gfx::TextAlignment::CenterLeft);
search_engine_fields.empend("url_format", TRY("Url format"_string), Gfx::TextAlignment::CenterLeft); search_engine_fields.empend("url_format", "Url format"_string, Gfx::TextAlignment::CenterLeft);
auto search_engines_model = GUI::JsonArrayModel::create(DeprecatedString::formatted("{}/SearchEngines.json", Core::StandardPaths::config_directory()), move(search_engine_fields)); auto search_engines_model = GUI::JsonArrayModel::create(DeprecatedString::formatted("{}/SearchEngines.json", Core::StandardPaths::config_directory()), move(search_engine_fields));
search_engines_model->invalidate(); search_engines_model->invalidate();
Vector<JsonValue> custom_search_engine; Vector<JsonValue> custom_search_engine;

View file

@ -38,8 +38,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
(void)TRY(window->add_tab(TRY(BrowserSettingsWidget::create()), "Browser"_short_string, "browser"sv)); (void)TRY(window->add_tab(TRY(BrowserSettingsWidget::create()), "Browser"_short_string, "browser"sv));
(void)TRY(window->add_tab(TRY(ContentFilterSettingsWidget::create()), TRY("Content Filtering"_string), "content-filtering"sv)); (void)TRY(window->add_tab(TRY(ContentFilterSettingsWidget::create()), "Content Filtering"_string, "content-filtering"sv));
(void)TRY(window->add_tab(TRY(AutoplaySettingsWidget::create()), TRY("Autoplay"_string), "autoplay"sv)); (void)TRY(window->add_tab(TRY(AutoplaySettingsWidget::create()), "Autoplay"_string, "autoplay"sv));
window->set_active_tab(selected_tab); window->set_active_tab(selected_tab);
window->show(); window->show();

View file

@ -58,7 +58,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
} }
})); }));
auto& constants_menu = window->add_menu(TRY("&Constants"_string)); auto& constants_menu = window->add_menu("&Constants"_string);
auto const power = Crypto::NumberTheory::Power("10"_bigint, "10"_bigint); auto const power = Crypto::NumberTheory::Power("10"_bigint, "10"_bigint);
constants_menu.add_action(GUI::Action::create("&Pi", TRY(Gfx::Bitmap::load_from_file("/res/icons/calculator/pi.png"sv)), [&](auto&) { constants_menu.add_action(GUI::Action::create("&Pi", TRY(Gfx::Bitmap::load_from_file("/res/icons/calculator/pi.png"sv)), [&](auto&) {

View file

@ -36,7 +36,7 @@ AddEventDialog::AddEventDialog(Core::DateTime date_time, Window* parent_window)
top_container.set_layout<GUI::VerticalBoxLayout>(4); top_container.set_layout<GUI::VerticalBoxLayout>(4);
top_container.set_fixed_height(45); top_container.set_fixed_height(45);
auto& add_label = top_container.add<GUI::Label>("Add title & date:"_string.release_value_but_fixme_should_propagate_errors()); auto& add_label = top_container.add<GUI::Label>("Add title & date:"_string);
add_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); add_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
add_label.set_fixed_height(14); add_label.set_fixed_height(14);
add_label.set_font(Gfx::FontDatabase::default_font().bold_variant()); add_label.set_font(Gfx::FontDatabase::default_font().bold_variant());
@ -134,7 +134,7 @@ ErrorOr<String> AddEventDialog::MeridiemListModel::column_name(int column) const
{ {
switch (column) { switch (column) {
case Column::Meridiem: case Column::Meridiem:
return TRY("Meridiem"_string); return "Meridiem"_string;
default: default:
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }

View file

@ -33,7 +33,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-calendar"sv); auto app_icon = GUI::Icon::default_icon("app-calendar"sv);
auto window = TRY(GUI::SettingsWindow::create("Calendar Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); auto window = TRY(GUI::SettingsWindow::create("Calendar Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
(void)TRY(window->add_tab<CalendarSettingsWidget>(TRY("Calendar"_string), "Calendar"sv)); (void)TRY(window->add_tab<CalendarSettingsWidget>("Calendar"_string, "Calendar"sv));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->set_active_tab(selected_tab); window->set_active_tab(selected_tab);

View file

@ -38,11 +38,11 @@ ErrorOr<String> CertificateStoreModel::column_name(int column) const
{ {
switch (column) { switch (column) {
case Column::IssuedTo: case Column::IssuedTo:
return TRY("Issued To"_string); return "Issued To"_string;
case Column::IssuedBy: case Column::IssuedBy:
return TRY("Issued By"_string); return "Issued By"_string;
case Column::Expire: case Column::Expire:
return TRY("Expiration Date"_string); return "Expiration Date"_string;
default: default:
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }

View file

@ -28,7 +28,7 @@ ErrorOr<int> serenity_main(Main::Arguments args)
auto app_icon = GUI::Icon::default_icon("certificate"sv); auto app_icon = GUI::Icon::default_icon("certificate"sv);
auto window = TRY(GUI::SettingsWindow::create("Certificate Settings", GUI::SettingsWindow::ShowDefaultsButton::No)); auto window = TRY(GUI::SettingsWindow::create("Certificate Settings", GUI::SettingsWindow::ShowDefaultsButton::No));
auto cert_store_widget = TRY(window->add_tab<CertificateSettings::CertificateStoreWidget>(TRY("Certificate Store"_string), "certificate"sv)); auto cert_store_widget = TRY(window->add_tab<CertificateSettings::CertificateStoreWidget>("Certificate Store"_string, "certificate"sv));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->show(); window->show();

View file

@ -56,17 +56,17 @@ CharacterMapWidget::CharacterMapWidget()
} }
GUI::Clipboard::the().set_plain_text(builder.to_deprecated_string()); GUI::Clipboard::the().set_plain_text(builder.to_deprecated_string());
}); });
m_copy_selection_action->set_status_tip("Copy the highlighted characters to the clipboard"_string.release_value_but_fixme_should_propagate_errors()); m_copy_selection_action->set_status_tip("Copy the highlighted characters to the clipboard"_string);
m_previous_glyph_action = GUI::Action::create("&Previous Glyph", { Mod_Alt, Key_Left }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) { m_previous_glyph_action = GUI::Action::create("&Previous Glyph", { Mod_Alt, Key_Left }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) {
m_glyph_map->select_previous_existing_glyph(); m_glyph_map->select_previous_existing_glyph();
}); });
m_previous_glyph_action->set_status_tip("Seek the previous visible glyph"_string.release_value_but_fixme_should_propagate_errors()); m_previous_glyph_action->set_status_tip("Seek the previous visible glyph"_string);
m_next_glyph_action = GUI::Action::create("&Next Glyph", { Mod_Alt, Key_Right }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) { m_next_glyph_action = GUI::Action::create("&Next Glyph", { Mod_Alt, Key_Right }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) {
m_glyph_map->select_next_existing_glyph(); m_glyph_map->select_next_existing_glyph();
}); });
m_next_glyph_action->set_status_tip("Seek the next visible glyph"_string.release_value_but_fixme_should_propagate_errors()); m_next_glyph_action->set_status_tip("Seek the next visible glyph"_string);
m_go_to_glyph_action = GUI::Action::create("&Go to Glyph...", { Mod_Ctrl, Key_G }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-to.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) { m_go_to_glyph_action = GUI::Action::create("&Go to Glyph...", { Mod_Ctrl, Key_G }, Gfx::Bitmap::load_from_file("/res/icons/16x16/go-to.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) {
String input; String input;
@ -81,7 +81,7 @@ CharacterMapWidget::CharacterMapWidget()
m_glyph_map->scroll_to_glyph(code_point); m_glyph_map->scroll_to_glyph(code_point);
} }
}); });
m_go_to_glyph_action->set_status_tip("Go to the specified code point"_string.release_value_but_fixme_should_propagate_errors()); m_go_to_glyph_action->set_status_tip("Go to the specified code point"_string);
m_find_glyphs_action = GUI::Action::create("&Find Glyphs...", { Mod_Ctrl, Key_F }, Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) { m_find_glyphs_action = GUI::Action::create("&Find Glyphs...", { Mod_Ctrl, Key_F }, Gfx::Bitmap::load_from_file("/res/icons/16x16/find.png"sv).release_value_but_fixme_should_propagate_errors(), [&](auto&) {
if (m_find_window.is_null()) { if (m_find_window.is_null()) {

View file

@ -38,7 +38,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto window = TRY(GUI::SettingsWindow::create("Clock Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); auto window = TRY(GUI::SettingsWindow::create("Clock Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
(void)TRY(window->add_tab<ClockSettingsWidget>("Clock"_short_string, "clock"sv)); (void)TRY(window->add_tab<ClockSettingsWidget>("Clock"_short_string, "clock"sv));
auto timezonesettings_widget = TRY(TimeZoneSettingsWidget::create()); auto timezonesettings_widget = TRY(TimeZoneSettingsWidget::create());
TRY(window->add_tab(timezonesettings_widget, TRY("Time Zone"_string), "time-zone"sv)); TRY(window->add_tab(timezonesettings_widget, "Time Zone"_string, "time-zone"sv));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->resize(540, 570); window->resize(540, 570);

View file

@ -236,27 +236,27 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto& progressbar = *widget->find_descendant_of_type_named<GUI::Progressbar>("progressbar"); auto& progressbar = *widget->find_descendant_of_type_named<GUI::Progressbar>("progressbar");
auto& tab_widget = *widget->find_descendant_of_type_named<GUI::TabWidget>("tab_widget"); auto& tab_widget = *widget->find_descendant_of_type_named<GUI::TabWidget>("tab_widget");
auto backtrace_tab = TRY(tab_widget.try_add_tab<GUI::Widget>(TRY("Backtrace"_string))); auto backtrace_tab = TRY(tab_widget.try_add_tab<GUI::Widget>("Backtrace"_string));
TRY(backtrace_tab->try_set_layout<GUI::VerticalBoxLayout>(4)); TRY(backtrace_tab->try_set_layout<GUI::VerticalBoxLayout>(4));
auto backtrace_label = TRY(backtrace_tab->try_add<GUI::Label>(TRY("A backtrace for each thread alive during the crash is listed below:"_string))); auto backtrace_label = TRY(backtrace_tab->try_add<GUI::Label>("A backtrace for each thread alive during the crash is listed below:"_string));
backtrace_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); backtrace_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
backtrace_label->set_fixed_height(16); backtrace_label->set_fixed_height(16);
auto backtrace_tab_widget = TRY(backtrace_tab->try_add<GUI::TabWidget>()); auto backtrace_tab_widget = TRY(backtrace_tab->try_add<GUI::TabWidget>());
backtrace_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); backtrace_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom);
auto cpu_registers_tab = TRY(tab_widget.try_add_tab<GUI::Widget>(TRY("CPU Registers"_string))); auto cpu_registers_tab = TRY(tab_widget.try_add_tab<GUI::Widget>("CPU Registers"_string));
cpu_registers_tab->set_layout<GUI::VerticalBoxLayout>(4); cpu_registers_tab->set_layout<GUI::VerticalBoxLayout>(4);
auto cpu_registers_label = TRY(cpu_registers_tab->try_add<GUI::Label>(TRY("The CPU register state for each thread alive during the crash is listed below:"_string))); auto cpu_registers_label = TRY(cpu_registers_tab->try_add<GUI::Label>("The CPU register state for each thread alive during the crash is listed below:"_string));
cpu_registers_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); cpu_registers_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
cpu_registers_label->set_fixed_height(16); cpu_registers_label->set_fixed_height(16);
auto cpu_registers_tab_widget = TRY(cpu_registers_tab->try_add<GUI::TabWidget>()); auto cpu_registers_tab_widget = TRY(cpu_registers_tab->try_add<GUI::TabWidget>());
cpu_registers_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom); cpu_registers_tab_widget->set_tab_position(GUI::TabWidget::TabPosition::Bottom);
auto environment_tab = TRY(tab_widget.try_add_tab<GUI::Widget>(TRY("Environment"_string))); auto environment_tab = TRY(tab_widget.try_add_tab<GUI::Widget>("Environment"_string));
TRY(environment_tab->try_set_layout<GUI::VerticalBoxLayout>(4)); TRY(environment_tab->try_set_layout<GUI::VerticalBoxLayout>(4));
auto environment_text_editor = TRY(environment_tab->try_add<GUI::TextEditor>()); auto environment_text_editor = TRY(environment_tab->try_add<GUI::TextEditor>());
@ -265,7 +265,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
environment_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); environment_text_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
environment_text_editor->set_should_hide_unnecessary_scrollbars(true); environment_text_editor->set_should_hide_unnecessary_scrollbars(true);
auto memory_regions_tab = TRY(tab_widget.try_add_tab<GUI::Widget>(TRY("Memory Regions"_string))); auto memory_regions_tab = TRY(tab_widget.try_add_tab<GUI::Widget>("Memory Regions"_string));
TRY(memory_regions_tab->try_set_layout<GUI::VerticalBoxLayout>(4)); TRY(memory_regions_tab->try_set_layout<GUI::VerticalBoxLayout>(4));
auto memory_regions_text_editor = TRY(memory_regions_tab->try_add<GUI::TextEditor>()); auto memory_regions_text_editor = TRY(memory_regions_tab->try_add<GUI::TextEditor>());

View file

@ -37,7 +37,7 @@ ErrorOr<void> DesktopSettingsWidget::create_frame()
}; };
auto& keyboard_shortcuts_label = *find_descendant_of_type_named<GUI::Label>("keyboard_shortcuts_label"); auto& keyboard_shortcuts_label = *find_descendant_of_type_named<GUI::Label>("keyboard_shortcuts_label");
keyboard_shortcuts_label.set_text(TRY("\xE2\x84\xB9\tCtrl+Alt+{Shift}+Arrows moves between workspaces"_string)); keyboard_shortcuts_label.set_text("\xE2\x84\xB9\tCtrl+Alt+{Shift}+Arrows moves between workspaces"_string);
return {}; return {};
} }

View file

@ -37,11 +37,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
bool background_settings_changed = false; bool background_settings_changed = false;
auto window = TRY(GUI::SettingsWindow::create("Display Settings")); auto window = TRY(GUI::SettingsWindow::create("Display Settings"));
(void)TRY(window->add_tab<DisplaySettings::BackgroundSettingsWidget>(TRY("Background"_string), "background"sv, background_settings_changed)); (void)TRY(window->add_tab<DisplaySettings::BackgroundSettingsWidget>("Background"_string, "background"sv, background_settings_changed));
(void)TRY(window->add_tab<DisplaySettings::ThemesSettingsWidget>("Themes"_short_string, "themes"sv, background_settings_changed)); (void)TRY(window->add_tab<DisplaySettings::ThemesSettingsWidget>("Themes"_short_string, "themes"sv, background_settings_changed));
(void)TRY(window->add_tab<DisplaySettings::FontSettingsWidget>("Fonts"_short_string, "fonts"sv)); (void)TRY(window->add_tab<DisplaySettings::FontSettingsWidget>("Fonts"_short_string, "fonts"sv));
(void)TRY(window->add_tab<DisplaySettings::MonitorSettingsWidget>("Monitor"_short_string, "monitor"sv)); (void)TRY(window->add_tab<DisplaySettings::MonitorSettingsWidget>("Monitor"_short_string, "monitor"sv));
(void)TRY(window->add_tab<DisplaySettings::DesktopSettingsWidget>(TRY("Workspaces"_string), "workspaces"sv)); (void)TRY(window->add_tab<DisplaySettings::DesktopSettingsWidget>("Workspaces"_string, "workspaces"sv));
(void)TRY(window->add_tab<GUI::DisplaySettings::EffectsSettingsWidget>("Effects"_short_string, "effects"sv)); (void)TRY(window->add_tab<GUI::DisplaySettings::EffectsSettingsWidget>("Effects"_short_string, "effects"sv));
window->set_active_tab(selected_tab); window->set_active_tab(selected_tab);

View file

@ -54,16 +54,16 @@ FileOperationProgressWidget::FileOperationProgressWidget(FileOperation operation
switch (m_operation) { switch (m_operation) {
case FileOperation::Copy: case FileOperation::Copy:
files_copied_label.set_text("Copying files..."_string.release_value_but_fixme_should_propagate_errors()); files_copied_label.set_text("Copying files..."_string);
current_file_action_label.set_text("Copying: "_string.release_value_but_fixme_should_propagate_errors()); current_file_action_label.set_text("Copying: "_string);
break; break;
case FileOperation::Move: case FileOperation::Move:
files_copied_label.set_text("Moving files..."_string.release_value_but_fixme_should_propagate_errors()); files_copied_label.set_text("Moving files..."_string);
current_file_action_label.set_text("Moving: "_string.release_value_but_fixme_should_propagate_errors()); current_file_action_label.set_text("Moving: "_string);
break; break;
case FileOperation::Delete: case FileOperation::Delete:
files_copied_label.set_text("Deleting files..."_string.release_value_but_fixme_should_propagate_errors()); files_copied_label.set_text("Deleting files..."_string);
current_file_action_label.set_text("Deleting: "_string.release_value_but_fixme_should_propagate_errors()); current_file_action_label.set_text("Deleting: "_string);
break; break;
default: default:
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();

View file

@ -182,7 +182,7 @@ ErrorOr<void> PropertiesWindow::create_general_tab(GUI::TabWidget& tab_widget, b
m_size_label = general_tab->find_descendant_of_type_named<GUI::Label>("size"); m_size_label = general_tab->find_descendant_of_type_named<GUI::Label>("size");
m_size_label->set_text(S_ISDIR(st.st_mode) m_size_label->set_text(S_ISDIR(st.st_mode)
? TRY("Calculating..."_string) ? "Calculating..."_string
: TRY(String::from_deprecated_string(human_readable_size_long(st.st_size, UseThousandsSeparator::Yes)))); : TRY(String::from_deprecated_string(human_readable_size_long(st.st_size, UseThousandsSeparator::Yes))));
auto* owner = general_tab->find_descendant_of_type_named<GUI::Label>("owner"); auto* owner = general_tab->find_descendant_of_type_named<GUI::Label>("owner");
@ -255,7 +255,7 @@ ErrorOr<void> PropertiesWindow::create_archive_tab(GUI::TabWidget& tab_widget, N
} }
auto zip = maybe_zip.release_value(); auto zip = maybe_zip.release_value();
auto tab = TRY(tab_widget.try_add_tab<GUI::Widget>(TRY("Archive"_string))); auto tab = TRY(tab_widget.try_add_tab<GUI::Widget>("Archive"_string));
TRY(tab->load_from_gml(properties_window_archive_tab_gml)); TRY(tab->load_from_gml(properties_window_archive_tab_gml));
auto statistics = TRY(zip.calculate_statistics()); auto statistics = TRY(zip.calculate_statistics());
@ -365,19 +365,19 @@ ErrorOr<void> PropertiesWindow::create_font_tab(GUI::TabWidget& tab_widget, Nonn
String format_name; String format_name;
switch (font_info.format) { switch (font_info.format) {
case FontInfo::Format::BitmapFont: case FontInfo::Format::BitmapFont:
format_name = TRY("Bitmap Font"_string); format_name = "Bitmap Font"_string;
break; break;
case FontInfo::Format::OpenType: case FontInfo::Format::OpenType:
format_name = TRY("OpenType"_string); format_name = "OpenType"_string;
break; break;
case FontInfo::Format::TrueType: case FontInfo::Format::TrueType:
format_name = TRY("TrueType"_string); format_name = "TrueType"_string;
break; break;
case FontInfo::Format::WOFF: case FontInfo::Format::WOFF:
format_name = TRY("WOFF"_string); format_name = "WOFF"_string;
break; break;
case FontInfo::Format::WOFF2: case FontInfo::Format::WOFF2:
format_name = TRY("WOFF2"_string); format_name = "WOFF2"_string;
break; break;
} }
tab->find_descendant_of_type_named<GUI::Label>("font_format")->set_text(format_name); tab->find_descendant_of_type_named<GUI::Label>("font_format")->set_text(format_name);
@ -438,11 +438,11 @@ ErrorOr<void> PropertiesWindow::create_image_tab(GUI::TabWidget& tab_widget, Non
if (auto embedded_icc_bytes = TRY(image_decoder->icc_data()); embedded_icc_bytes.has_value()) { if (auto embedded_icc_bytes = TRY(image_decoder->icc_data()); embedded_icc_bytes.has_value()) {
auto icc_profile_or_error = Gfx::ICC::Profile::try_load_from_externally_owned_memory(embedded_icc_bytes.value()); auto icc_profile_or_error = Gfx::ICC::Profile::try_load_from_externally_owned_memory(embedded_icc_bytes.value());
if (icc_profile_or_error.is_error()) { if (icc_profile_or_error.is_error()) {
hide_icc_group(TRY("Present but invalid"_string)); hide_icc_group("Present but invalid"_string);
} else { } else {
auto icc_profile = icc_profile_or_error.release_value(); auto icc_profile = icc_profile_or_error.release_value();
tab->find_descendant_of_type_named<GUI::Label>("image_has_icc_profile")->set_text(TRY("See below"_string)); tab->find_descendant_of_type_named<GUI::Label>("image_has_icc_profile")->set_text("See below"_string);
tab->find_descendant_of_type_named<GUI::Label>("image_icc_profile")->set_text(icc_profile->tag_string_data(Gfx::ICC::profileDescriptionTag).value_or({})); tab->find_descendant_of_type_named<GUI::Label>("image_icc_profile")->set_text(icc_profile->tag_string_data(Gfx::ICC::profileDescriptionTag).value_or({}));
tab->find_descendant_of_type_named<GUI::Label>("image_icc_copyright")->set_text(icc_profile->tag_string_data(Gfx::ICC::copyrightTag).value_or({})); tab->find_descendant_of_type_named<GUI::Label>("image_icc_copyright")->set_text(icc_profile->tag_string_data(Gfx::ICC::copyrightTag).value_or({}));
tab->find_descendant_of_type_named<GUI::Label>("image_icc_color_space")->set_text(TRY(String::from_utf8(data_color_space_name(icc_profile->data_color_space())))); tab->find_descendant_of_type_named<GUI::Label>("image_icc_color_space")->set_text(TRY(String::from_utf8(data_color_space_name(icc_profile->data_color_space()))));
@ -468,7 +468,7 @@ ErrorOr<void> PropertiesWindow::create_pdf_tab(GUI::TabWidget& tab_widget, Nonnu
if (auto handler = document->security_handler(); handler && !handler->has_user_password()) { if (auto handler = document->security_handler(); handler && !handler->has_user_password()) {
// FIXME: Show a password dialog, once we've switched to lazy-loading // FIXME: Show a password dialog, once we've switched to lazy-loading
auto tab = TRY(tab_widget.try_add_tab<GUI::Label>("PDF"_short_string)); auto tab = TRY(tab_widget.try_add_tab<GUI::Label>("PDF"_short_string));
tab->set_text(TRY("PDF is password-protected."_string)); tab->set_text("PDF is password-protected."_string);
return {}; return {};
} }

View file

@ -362,7 +362,7 @@ bool add_launch_handler_actions_to_menu(RefPtr<GUI::Menu>& menu, DirectoryView c
if (current_file_launch_handlers.size() > 1) { if (current_file_launch_handlers.size() > 1) {
added_open_menu_items = true; added_open_menu_items = true;
auto& file_open_with_menu = menu->add_submenu("Open with"_string.release_value_but_fixme_should_propagate_errors()); auto& file_open_with_menu = menu->add_submenu("Open with"_string);
for (auto& handler : current_file_launch_handlers) { for (auto& handler : current_file_launch_handlers) {
if (handler == default_file_handler) if (handler == default_file_handler)
continue; continue;
@ -476,7 +476,7 @@ ErrorOr<int> run_in_desktop_mode()
paste_action->set_enabled(data_type == "text/uri-list" && access(directory_view->path().characters(), W_OK) == 0); paste_action->set_enabled(data_type == "text/uri-list" && access(directory_view->path().characters(), W_OK) == 0);
}; };
auto desktop_view_context_menu = TRY(GUI::Menu::try_create(TRY("Directory View"_string))); auto desktop_view_context_menu = TRY(GUI::Menu::try_create("Directory View"_string));
auto file_manager_action = GUI::Action::create("Open in File &Manager", {}, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-file-manager.png"sv)), [&](auto&) { auto file_manager_action = GUI::Action::create("Open in File &Manager", {}, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/app-file-manager.png"sv)), [&](auto&) {
auto paths = directory_view->selected_file_paths(); auto paths = directory_view->selected_file_paths();
@ -518,7 +518,7 @@ ErrorOr<int> run_in_desktop_mode()
TRY(desktop_view_context_menu->try_add_separator()); TRY(desktop_view_context_menu->try_add_separator());
TRY(desktop_view_context_menu->try_add_action(display_properties_action)); TRY(desktop_view_context_menu->try_add_action(display_properties_action));
auto desktop_context_menu = TRY(GUI::Menu::try_create(TRY("Directory View Directory"_string))); auto desktop_context_menu = TRY(GUI::Menu::try_create("Directory View Directory"_string));
TRY(desktop_context_menu->try_add_action(file_manager_action)); TRY(desktop_context_menu->try_add_action(file_manager_action));
TRY(desktop_context_menu->try_add_action(open_terminal_action)); TRY(desktop_context_menu->try_add_action(open_terminal_action));
@ -541,7 +541,7 @@ ErrorOr<int> run_in_desktop_mode()
if (node.is_directory()) { if (node.is_directory()) {
desktop_context_menu->popup(event.screen_position(), file_manager_action); desktop_context_menu->popup(event.screen_position(), file_manager_action);
} else { } else {
file_context_menu = GUI::Menu::construct("Directory View File"_string.release_value_but_fixme_should_propagate_errors()); file_context_menu = GUI::Menu::construct("Directory View File"_string);
bool added_open_menu_items = add_launch_handler_actions_to_menu(file_context_menu, directory_view, node.full_path(), file_context_menu_action_default_action, current_file_handlers); bool added_open_menu_items = add_launch_handler_actions_to_menu(file_context_menu, directory_view, node.full_path(), file_context_menu_action_default_action, current_file_handlers);
if (added_open_menu_items) if (added_open_menu_items)
@ -685,9 +685,9 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr
directory_view->refresh(); directory_view->refresh();
}; };
auto directory_context_menu = TRY(GUI::Menu::try_create(TRY("Directory View Directory"_string))); auto directory_context_menu = TRY(GUI::Menu::try_create("Directory View Directory"_string));
auto directory_view_context_menu = TRY(GUI::Menu::try_create(TRY("Directory View"_string))); auto directory_view_context_menu = TRY(GUI::Menu::try_create("Directory View"_string));
auto tree_view_directory_context_menu = TRY(GUI::Menu::try_create(TRY("Tree View Directory"_string))); auto tree_view_directory_context_menu = TRY(GUI::Menu::try_create("Tree View Directory"_string));
auto open_parent_directory_action = GUI::Action::create("Open &Parent Directory", { Mod_Alt, Key_Up }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/open-parent-directory.png"sv)), [&](GUI::Action const&) { auto open_parent_directory_action = GUI::Action::create("Open &Parent Directory", { Mod_Alt, Key_Up }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/open-parent-directory.png"sv)), [&](GUI::Action const&) {
directory_view->open_parent_directory(); directory_view->open_parent_directory();
@ -1205,7 +1205,7 @@ ErrorOr<int> run_in_windowed_mode(DeprecatedString const& initial_location, Depr
folder_specific_paste_action->set_enabled(should_get_enabled); folder_specific_paste_action->set_enabled(should_get_enabled);
directory_context_menu->popup(event.screen_position(), directory_open_action); directory_context_menu->popup(event.screen_position(), directory_open_action);
} else { } else {
file_context_menu = GUI::Menu::construct("Directory View File"_string.release_value_but_fixme_should_propagate_errors()); file_context_menu = GUI::Menu::construct("Directory View File"_string);
bool added_launch_file_handlers = add_launch_handler_actions_to_menu(file_context_menu, directory_view, node.full_path(), file_context_menu_action_default_action, current_file_handlers); bool added_launch_file_handlers = add_launch_handler_actions_to_menu(file_context_menu, directory_view, node.full_path(), file_context_menu_action_default_action, current_file_handlers);
if (added_launch_file_handlers) if (added_launch_file_handlers)

View file

@ -128,7 +128,7 @@ ErrorOr<void> MainWidget::create_actions()
if (auto result = initialize({}, move(maybe_font.value())); result.is_error()) if (auto result = initialize({}, move(maybe_font.value())); result.is_error())
show_error(result.release_error(), "Initializing new font failed"sv); show_error(result.release_error(), "Initializing new font failed"sv);
}); });
m_new_action->set_status_tip(TRY("Create a new font"_string)); m_new_action->set_status_tip("Create a new font"_string);
m_open_action = GUI::CommonActions::make_open_action([this](auto&) { m_open_action = GUI::CommonActions::make_open_action([this](auto&) {
if (!request_close()) if (!request_close())
@ -221,7 +221,7 @@ ErrorOr<void> MainWidget::create_actions()
if (m_font_preview_window) if (m_font_preview_window)
m_font_preview_window->show(); m_font_preview_window->show();
}); });
m_open_preview_action->set_status_tip(TRY("Preview the current font"_string)); m_open_preview_action->set_status_tip("Preview the current font"_string);
bool show_metadata = Config::read_bool("FontEditor"sv, "Layout"sv, "ShowMetadata"sv, true); bool show_metadata = Config::read_bool("FontEditor"sv, "Layout"sv, "ShowMetadata"sv, true);
m_font_metadata_groupbox->set_visible(show_metadata); m_font_metadata_groupbox->set_visible(show_metadata);
@ -230,7 +230,7 @@ ErrorOr<void> MainWidget::create_actions()
Config::write_bool("FontEditor"sv, "Layout"sv, "ShowMetadata"sv, action.is_checked()); Config::write_bool("FontEditor"sv, "Layout"sv, "ShowMetadata"sv, action.is_checked());
}); });
m_show_metadata_action->set_checked(show_metadata); m_show_metadata_action->set_checked(show_metadata);
m_show_metadata_action->set_status_tip(TRY("Show or hide metadata about the current font"_string)); m_show_metadata_action->set_status_tip("Show or hide metadata about the current font"_string);
bool show_unicode_blocks = Config::read_bool("FontEditor"sv, "Layout"sv, "ShowUnicodeBlocks"sv, true); bool show_unicode_blocks = Config::read_bool("FontEditor"sv, "Layout"sv, "ShowUnicodeBlocks"sv, true);
m_unicode_block_container->set_visible(show_unicode_blocks); m_unicode_block_container->set_visible(show_unicode_blocks);
@ -243,7 +243,7 @@ ErrorOr<void> MainWidget::create_actions()
Config::write_bool("FontEditor"sv, "Layout"sv, "ShowUnicodeBlocks"sv, action.is_checked()); Config::write_bool("FontEditor"sv, "Layout"sv, "ShowUnicodeBlocks"sv, action.is_checked());
}); });
m_show_unicode_blocks_action->set_checked(show_unicode_blocks); m_show_unicode_blocks_action->set_checked(show_unicode_blocks);
m_show_unicode_blocks_action->set_status_tip(TRY("Show or hide the Unicode block list"_string)); m_show_unicode_blocks_action->set_status_tip("Show or hide the Unicode block list"_string);
bool show_toolbar = Config::read_bool("FontEditor"sv, "Layout"sv, "ShowToolbar"sv, true); bool show_toolbar = Config::read_bool("FontEditor"sv, "Layout"sv, "ShowToolbar"sv, true);
m_toolbar_container->set_visible(show_toolbar); m_toolbar_container->set_visible(show_toolbar);
@ -252,7 +252,7 @@ ErrorOr<void> MainWidget::create_actions()
Config::write_bool("FontEditor"sv, "Layout"sv, "ShowToolbar"sv, action.is_checked()); Config::write_bool("FontEditor"sv, "Layout"sv, "ShowToolbar"sv, action.is_checked());
}); });
m_show_toolbar_action->set_checked(show_toolbar); m_show_toolbar_action->set_checked(show_toolbar);
m_show_toolbar_action->set_status_tip(TRY("Show or hide the toolbar"_string)); m_show_toolbar_action->set_status_tip("Show or hide the toolbar"_string);
bool show_statusbar = Config::read_bool("FontEditor"sv, "Layout"sv, "ShowStatusbar"sv, true); bool show_statusbar = Config::read_bool("FontEditor"sv, "Layout"sv, "ShowStatusbar"sv, true);
m_statusbar->set_visible(show_statusbar); m_statusbar->set_visible(show_statusbar);
@ -262,7 +262,7 @@ ErrorOr<void> MainWidget::create_actions()
Config::write_bool("FontEditor"sv, "Layout"sv, "ShowStatusbar"sv, action.is_checked()); Config::write_bool("FontEditor"sv, "Layout"sv, "ShowStatusbar"sv, action.is_checked());
}); });
m_show_statusbar_action->set_checked(show_statusbar); m_show_statusbar_action->set_checked(show_statusbar);
m_show_statusbar_action->set_status_tip(TRY("Show or hide the status bar"_string)); m_show_statusbar_action->set_status_tip("Show or hide the status bar"_string);
bool highlight_modifications = Config::read_bool("FontEditor"sv, "GlyphMap"sv, "HighlightModifications"sv, true); bool highlight_modifications = Config::read_bool("FontEditor"sv, "GlyphMap"sv, "HighlightModifications"sv, true);
m_glyph_map_widget->set_highlight_modifications(highlight_modifications); m_glyph_map_widget->set_highlight_modifications(highlight_modifications);
@ -271,7 +271,7 @@ ErrorOr<void> MainWidget::create_actions()
Config::write_bool("FontEditor"sv, "GlyphMap"sv, "HighlightModifications"sv, action.is_checked()); Config::write_bool("FontEditor"sv, "GlyphMap"sv, "HighlightModifications"sv, action.is_checked());
}); });
m_highlight_modifications_action->set_checked(highlight_modifications); m_highlight_modifications_action->set_checked(highlight_modifications);
m_highlight_modifications_action->set_status_tip(TRY("Show or hide highlights on modified glyphs"_string)); m_highlight_modifications_action->set_status_tip("Show or hide highlights on modified glyphs"_string);
bool show_system_emoji = Config::read_bool("FontEditor"sv, "GlyphMap"sv, "ShowSystemEmoji"sv, true); bool show_system_emoji = Config::read_bool("FontEditor"sv, "GlyphMap"sv, "ShowSystemEmoji"sv, true);
m_glyph_map_widget->set_show_system_emoji(show_system_emoji); m_glyph_map_widget->set_show_system_emoji(show_system_emoji);
@ -280,7 +280,7 @@ ErrorOr<void> MainWidget::create_actions()
Config::write_bool("FontEditor"sv, "GlyphMap"sv, "ShowSystemEmoji"sv, action.is_checked()); Config::write_bool("FontEditor"sv, "GlyphMap"sv, "ShowSystemEmoji"sv, action.is_checked());
}); });
m_show_system_emoji_action->set_checked(show_system_emoji); m_show_system_emoji_action->set_checked(show_system_emoji);
m_show_system_emoji_action->set_status_tip(TRY("Show or hide system emoji"_string)); m_show_system_emoji_action->set_status_tip("Show or hide system emoji"_string);
m_go_to_glyph_action = GUI::Action::create("&Go to Glyph...", { Mod_Ctrl, Key_G }, g_resources.go_to_glyph, [this](auto&) { m_go_to_glyph_action = GUI::Action::create("&Go to Glyph...", { Mod_Ctrl, Key_G }, g_resources.go_to_glyph, [this](auto&) {
String input; String input;
@ -296,17 +296,17 @@ ErrorOr<void> MainWidget::create_actions()
m_glyph_map_widget->scroll_to_glyph(code_point); m_glyph_map_widget->scroll_to_glyph(code_point);
} }
}); });
m_go_to_glyph_action->set_status_tip(TRY("Go to the specified code point"_string)); m_go_to_glyph_action->set_status_tip("Go to the specified code point"_string);
m_previous_glyph_action = GUI::Action::create("Pre&vious Glyph", { Mod_Alt, Key_Left }, g_resources.previous_glyph, [this](auto&) { m_previous_glyph_action = GUI::Action::create("Pre&vious Glyph", { Mod_Alt, Key_Left }, g_resources.previous_glyph, [this](auto&) {
m_glyph_map_widget->select_previous_existing_glyph(); m_glyph_map_widget->select_previous_existing_glyph();
}); });
m_previous_glyph_action->set_status_tip(TRY("Seek the previous visible glyph"_string)); m_previous_glyph_action->set_status_tip("Seek the previous visible glyph"_string);
m_next_glyph_action = GUI::Action::create("&Next Glyph", { Mod_Alt, Key_Right }, g_resources.next_glyph, [this](auto&) { m_next_glyph_action = GUI::Action::create("&Next Glyph", { Mod_Alt, Key_Right }, g_resources.next_glyph, [this](auto&) {
m_glyph_map_widget->select_next_existing_glyph(); m_glyph_map_widget->select_next_existing_glyph();
}); });
m_next_glyph_action->set_status_tip(TRY("Seek the next visible glyph"_string)); m_next_glyph_action->set_status_tip("Seek the next visible glyph"_string);
i32 scale = Config::read_i32("FontEditor"sv, "GlyphEditor"sv, "Scale"sv, 10); i32 scale = Config::read_i32("FontEditor"sv, "GlyphEditor"sv, "Scale"sv, 10);
m_glyph_editor_widget->set_scale(scale); m_glyph_editor_widget->set_scale(scale);
@ -314,17 +314,17 @@ ErrorOr<void> MainWidget::create_actions()
set_scale_and_save(5); set_scale_and_save(5);
}); });
m_scale_five_action->set_checked(scale == 5); m_scale_five_action->set_checked(scale == 5);
m_scale_five_action->set_status_tip(TRY("Scale the editor in proportion to the current font"_string)); m_scale_five_action->set_status_tip("Scale the editor in proportion to the current font"_string);
m_scale_ten_action = GUI::Action::create_checkable("1000%", { Mod_Ctrl, Key_2 }, [this](auto&) { m_scale_ten_action = GUI::Action::create_checkable("1000%", { Mod_Ctrl, Key_2 }, [this](auto&) {
set_scale_and_save(10); set_scale_and_save(10);
}); });
m_scale_ten_action->set_checked(scale == 10); m_scale_ten_action->set_checked(scale == 10);
m_scale_ten_action->set_status_tip(TRY("Scale the editor in proportion to the current font"_string)); m_scale_ten_action->set_status_tip("Scale the editor in proportion to the current font"_string);
m_scale_fifteen_action = GUI::Action::create_checkable("1500%", { Mod_Ctrl, Key_3 }, [this](auto&) { m_scale_fifteen_action = GUI::Action::create_checkable("1500%", { Mod_Ctrl, Key_3 }, [this](auto&) {
set_scale_and_save(15); set_scale_and_save(15);
}); });
m_scale_fifteen_action->set_checked(scale == 15); m_scale_fifteen_action->set_checked(scale == 15);
m_scale_fifteen_action->set_status_tip(TRY("Scale the editor in proportion to the current font"_string)); m_scale_fifteen_action->set_status_tip("Scale the editor in proportion to the current font"_string);
m_glyph_editor_scale_actions.add_action(*m_scale_five_action); m_glyph_editor_scale_actions.add_action(*m_scale_five_action);
m_glyph_editor_scale_actions.add_action(*m_scale_ten_action); m_glyph_editor_scale_actions.add_action(*m_scale_ten_action);
@ -370,7 +370,7 @@ ErrorOr<void> MainWidget::create_actions()
} }
GUI::Clipboard::the().set_plain_text(builder.to_deprecated_string()); GUI::Clipboard::the().set_plain_text(builder.to_deprecated_string());
}); });
m_copy_text_action->set_status_tip(TRY("Copy to clipboard as text"_string)); m_copy_text_action->set_status_tip("Copy to clipboard as text"_string);
return {}; return {};
} }

View file

@ -21,7 +21,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Core::System::pledge("stdio recvfd sendfd thread rpath unix cpath wpath")); TRY(Core::System::pledge("stdio recvfd sendfd thread rpath unix cpath wpath"));
auto app = TRY(GUI::Application::create(arguments)); auto app = TRY(GUI::Application::create(arguments));
app->set_config_domain(TRY("FontEditor"_string)); app->set_config_domain("FontEditor"_string);
FontEditor::g_resources = FontEditor::Resources::create(); FontEditor::g_resources = FontEditor::Resources::create();

View file

@ -216,7 +216,7 @@ ErrorOr<void> MainWidget::initialize_fallibles(GUI::Window& window)
TRY(go_menu->try_add_action(*m_go_home_action)); TRY(go_menu->try_add_action(*m_go_home_action));
auto help_menu = TRY(window.try_add_menu("&Help"_short_string)); auto help_menu = TRY(window.try_add_menu("&Help"_short_string));
String help_page_path = TRY(TRY(try_make_ref_counted<Manual::PageNode>(Manual::sections[1 - 1], TRY("Applications/Help"_string)))->path()); String help_page_path = TRY(TRY(try_make_ref_counted<Manual::PageNode>(Manual::sections[1 - 1], "Applications/Help"_string))->path());
TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_command_palette_action(&window)));
TRY(help_menu->try_add_action(GUI::Action::create("&Contents", { Key_F1 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"sv)), [this, help_page_path = move(help_page_path)](auto&) { TRY(help_menu->try_add_action(GUI::Action::create("&Contents", { Key_F1 }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-unknown.png"sv)), [this, help_page_path = move(help_page_path)](auto&) {
open_page(help_page_path); open_page(help_page_path);

View file

@ -502,7 +502,7 @@ ErrorOr<void> HexEditorWidget::initialize_menubar(GUI::Window& window)
m_editor->update(); m_editor->update();
m_bytes_per_row_actions.set_exclusive(true); m_bytes_per_row_actions.set_exclusive(true);
auto bytes_per_row_menu = TRY(view_menu->try_add_submenu(TRY("Bytes per &Row"_string))); auto bytes_per_row_menu = TRY(view_menu->try_add_submenu("Bytes per &Row"_string));
for (int i = 8; i <= 32; i += 8) { for (int i = 8; i <= 32; i += 8) {
auto action = GUI::Action::create_checkable(DeprecatedString::number(i), [this, i](auto&) { auto action = GUI::Action::create_checkable(DeprecatedString::number(i), [this, i](auto&) {
m_editor->set_bytes_per_row(i); m_editor->set_bytes_per_row(i);
@ -516,7 +516,7 @@ ErrorOr<void> HexEditorWidget::initialize_menubar(GUI::Window& window)
} }
m_value_inspector_mode_actions.set_exclusive(true); m_value_inspector_mode_actions.set_exclusive(true);
auto inspector_mode_menu = TRY(view_menu->try_add_submenu(TRY("Value Inspector &Mode"_string))); auto inspector_mode_menu = TRY(view_menu->try_add_submenu("Value Inspector &Mode"_string));
auto little_endian_mode = GUI::Action::create_checkable("&Little Endian", [&](auto& action) { auto little_endian_mode = GUI::Action::create_checkable("&Little Endian", [&](auto& action) {
m_value_inspector_little_endian = action.is_checked(); m_value_inspector_little_endian = action.is_checked();
update_inspector_values(m_editor->selection_start_offset()); update_inspector_values(m_editor->selection_start_offset());

View file

@ -69,7 +69,7 @@ public:
case Column::Type: case Column::Type:
return "Type"_short_string; return "Type"_short_string;
case Column::Value: case Column::Value:
return m_is_little_endian ? TRY("Value (Little Endian)"_string) : TRY("Value (Big Endian)"_string); return m_is_little_endian ? "Value (Little Endian)"_string : "Value (Big Endian)"_string;
} }
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }

View file

@ -28,7 +28,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(Desktop::Launcher::seal_allowlist()); TRY(Desktop::Launcher::seal_allowlist());
Config::pledge_domain("HexEditor"); Config::pledge_domain("HexEditor");
app->set_config_domain(TRY("HexEditor"_string)); app->set_config_domain("HexEditor"_string);
auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-hex-editor"sv)); auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-hex-editor"sv));

View file

@ -45,7 +45,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Config::pledge_domains({ "ImageViewer", "WindowManager" }); Config::pledge_domains({ "ImageViewer", "WindowManager" });
app->set_config_domain(TRY("ImageViewer"_string)); app->set_config_domain("ImageViewer"_string);
TRY(Desktop::Launcher::add_allowed_handler_with_any_url("/bin/ImageViewer")); TRY(Desktop::Launcher::add_allowed_handler_with_any_url("/bin/ImageViewer"));
TRY(Desktop::Launcher::add_allowed_handler_with_only_specific_urls("/bin/Help", { URL::create_with_file_scheme("/usr/share/man/man1/Applications/ImageViewer.md") })); TRY(Desktop::Launcher::add_allowed_handler_with_only_specific_urls("/bin/Help", { URL::create_with_file_scheme("/usr/share/man/man1/Applications/ImageViewer.md") }));
@ -331,7 +331,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(image_menu->try_add_separator()); TRY(image_menu->try_add_separator());
TRY(image_menu->try_add_action(desktop_wallpaper_action)); TRY(image_menu->try_add_action(desktop_wallpaper_action));
auto navigate_menu = TRY(window->try_add_menu(TRY("&Navigate"_string))); auto navigate_menu = TRY(window->try_add_menu("&Navigate"_string));
TRY(navigate_menu->try_add_action(go_first_action)); TRY(navigate_menu->try_add_action(go_first_action));
TRY(navigate_menu->try_add_action(go_back_action)); TRY(navigate_menu->try_add_action(go_back_action));
TRY(navigate_menu->try_add_action(go_forward_action)); TRY(navigate_menu->try_add_action(go_forward_action));
@ -346,7 +346,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(view_menu->try_add_action(zoom_out_action)); TRY(view_menu->try_add_action(zoom_out_action));
TRY(view_menu->try_add_separator()); TRY(view_menu->try_add_separator());
auto scaling_mode_menu = TRY(view_menu->try_add_submenu(TRY("&Scaling Mode"_string))); auto scaling_mode_menu = TRY(view_menu->try_add_submenu("&Scaling Mode"_string));
scaling_mode_menu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/scale.png"sv))); scaling_mode_menu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/scale.png"sv)));
auto scaling_mode_group = make<GUI::ActionGroup>(); auto scaling_mode_group = make<GUI::ActionGroup>();

View file

@ -92,7 +92,7 @@ void KeyboardMapperWidget::create_frame()
add_map_radio_button("shift_map"sv, "Shift"_short_string); add_map_radio_button("shift_map"sv, "Shift"_short_string);
add_map_radio_button("altgr_map"sv, "AltGr"_short_string); add_map_radio_button("altgr_map"sv, "AltGr"_short_string);
add_map_radio_button("alt_map"sv, "Alt"_short_string); add_map_radio_button("alt_map"sv, "Alt"_short_string);
add_map_radio_button("shift_altgr_map"sv, "Shift+AltGr"_string.release_value_but_fixme_should_propagate_errors()); add_map_radio_button("shift_altgr_map"sv, "Shift+AltGr"_string);
bottom_widget.add_spacer().release_value_but_fixme_should_propagate_errors(); bottom_widget.add_spacer().release_value_but_fixme_should_propagate_errors();
} }

View file

@ -79,7 +79,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto auto_modifier_action = GUI::Action::create("Auto-Modifier", [&](auto& act) { auto auto_modifier_action = GUI::Action::create("Auto-Modifier", [&](auto& act) {
keyboard_mapper_widget->set_automatic_modifier(act.is_checked()); keyboard_mapper_widget->set_automatic_modifier(act.is_checked());
}); });
auto_modifier_action->set_status_tip(TRY("Toggle automatic modifier"_string)); auto_modifier_action->set_status_tip("Toggle automatic modifier"_string);
auto_modifier_action->set_checkable(true); auto_modifier_action->set_checkable(true);
auto_modifier_action->set_checked(false); auto_modifier_action->set_checked(false);
@ -90,7 +90,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
file_menu.add_separator(); file_menu.add_separator();
file_menu.add_action(quit_action); file_menu.add_action(quit_action);
auto& settings_menu = window->add_menu(TRY("&Settings"_string)); auto& settings_menu = window->add_menu("&Settings"_string);
settings_menu.add_action(auto_modifier_action); settings_menu.add_action(auto_modifier_action);
auto& help_menu = window->add_menu("&Help"_short_string); auto& help_menu = window->add_menu("&Help"_short_string);

View file

@ -37,7 +37,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto window = TRY(GUI::SettingsWindow::create("Keyboard Settings")); auto window = TRY(GUI::SettingsWindow::create("Keyboard Settings"));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
auto keyboard_settings_widget = TRY(window->add_tab<KeyboardSettingsWidget>(TRY("Keyboard"_string), "keyboard"sv)); auto keyboard_settings_widget = TRY(window->add_tab<KeyboardSettingsWidget>("Keyboard"_string, "keyboard"sv));
window->set_active_tab(selected_tab); window->set_active_tab(selected_tab);
window->on_active_window_change = [&](bool is_active_window) { window->on_active_window_change = [&](bool is_active_window) {

View file

@ -154,7 +154,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(view_menu->try_add_action(show_grid_action)); TRY(view_menu->try_add_action(show_grid_action));
TRY(view_menu->try_add_action(choose_grid_color_action)); TRY(view_menu->try_add_action(choose_grid_color_action));
auto timeline_menu = TRY(window->try_add_menu(TRY("&Timeline"_string))); auto timeline_menu = TRY(window->try_add_menu("&Timeline"_string));
auto previous_frame_action = GUI::Action::create( auto previous_frame_action = GUI::Action::create(
"&Previous frame", { Key_Left }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv)), [&](auto&) { "&Previous frame", { Key_Left }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-back.png"sv)), [&](auto&) {
pause_action->set_checked(true); pause_action->set_checked(true);

View file

@ -35,8 +35,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto window = TRY(GUI::SettingsWindow::create("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes)); auto window = TRY(GUI::SettingsWindow::create("Mouse Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
(void)TRY(window->add_tab<MouseWidget>("Mouse"_short_string, "mouse"sv)); (void)TRY(window->add_tab<MouseWidget>("Mouse"_short_string, "mouse"sv));
(void)TRY(window->add_tab<ThemeWidget>(TRY("Cursor Theme"_string), "cursor-theme"sv)); (void)TRY(window->add_tab<ThemeWidget>("Cursor Theme"_string, "cursor-theme"sv));
(void)TRY(window->add_tab<HighlightWidget>(TRY("Cursor Highlight"_string), "cursor-highlight"sv)); (void)TRY(window->add_tab<HighlightWidget>("Cursor Highlight"_string, "cursor-highlight"sv));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
window->set_active_tab(selected_tab); window->set_active_tab(selected_tab);

View file

@ -233,7 +233,7 @@ ErrorOr<void> PDFViewerWidget::initialize_menubar(GUI::Window& window)
auto view_menu = TRY(window.try_add_menu("&View"_short_string)); auto view_menu = TRY(window.try_add_menu("&View"_short_string));
TRY(view_menu->try_add_action(*m_toggle_sidebar_action)); TRY(view_menu->try_add_action(*m_toggle_sidebar_action));
TRY(view_menu->try_add_separator()); TRY(view_menu->try_add_separator());
auto view_mode_menu = TRY(view_menu->try_add_submenu(TRY("View &Mode"_string))); auto view_mode_menu = TRY(view_menu->try_add_submenu("View &Mode"_string));
TRY(view_mode_menu->try_add_action(*m_page_view_mode_single)); TRY(view_mode_menu->try_add_action(*m_page_view_mode_single));
TRY(view_mode_menu->try_add_action(*m_page_view_mode_multiple)); TRY(view_mode_menu->try_add_action(*m_page_view_mode_multiple));
TRY(view_menu->try_add_separator()); TRY(view_menu->try_add_separator());
@ -323,12 +323,12 @@ void PDFViewerWidget::initialize_toolbar(GUI::Toolbar& toolbar)
m_page_view_mode_single = GUI::Action::create_checkable("Single", [&](auto&) { m_page_view_mode_single = GUI::Action::create_checkable("Single", [&](auto&) {
m_viewer->set_page_view_mode(PDFViewer::PageViewMode::Single); m_viewer->set_page_view_mode(PDFViewer::PageViewMode::Single);
}); });
m_page_view_mode_single->set_status_tip("Show single page at a time"_string.release_value_but_fixme_should_propagate_errors()); m_page_view_mode_single->set_status_tip("Show single page at a time"_string);
m_page_view_mode_multiple = GUI::Action::create_checkable("Multiple", [&](auto&) { m_page_view_mode_multiple = GUI::Action::create_checkable("Multiple", [&](auto&) {
m_viewer->set_page_view_mode(PDFViewer::PageViewMode::Multiple); m_viewer->set_page_view_mode(PDFViewer::PageViewMode::Multiple);
}); });
m_page_view_mode_multiple->set_status_tip("Show multiple pages at a time"_string.release_value_but_fixme_should_propagate_errors()); m_page_view_mode_multiple->set_status_tip("Show multiple pages at a time"_string);
if (m_viewer->page_view_mode() == PDFViewer::PageViewMode::Single) { if (m_viewer->page_view_mode() == PDFViewer::PageViewMode::Single) {
m_page_view_mode_single->set_checked(true); m_page_view_mode_single->set_checked(true);
@ -351,11 +351,11 @@ void PDFViewerWidget::initialize_toolbar(GUI::Toolbar& toolbar)
toolbar.add_separator(); toolbar.add_separator();
m_show_clipping_paths = toolbar.add<GUI::CheckBox>(); m_show_clipping_paths = toolbar.add<GUI::CheckBox>();
m_show_clipping_paths->set_text("Show clipping paths"_string.release_value_but_fixme_should_propagate_errors()); m_show_clipping_paths->set_text("Show clipping paths"_string);
m_show_clipping_paths->set_checked(m_viewer->show_clipping_paths(), GUI::AllowCallback::No); 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_clipping_paths->on_checked = [&](auto checked) { m_viewer->set_show_clipping_paths(checked); };
m_show_images = toolbar.add<GUI::CheckBox>(); m_show_images = toolbar.add<GUI::CheckBox>();
m_show_images->set_text("Show images"_string.release_value_but_fixme_should_propagate_errors()); m_show_images->set_text("Show images"_string);
m_show_images->set_checked(m_viewer->show_images(), GUI::AllowCallback::No); 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); }; m_show_images->on_checked = [&](auto checked) { m_viewer->set_show_images(checked); };
} }

View file

@ -32,7 +32,7 @@ SidebarWidget::SidebarWidget()
on_destination_selected(destination); on_destination_selected(destination);
}; };
auto& thumbnails_container = tab_bar.add_tab<GUI::Widget>("Thumbnails"_string.release_value_but_fixme_should_propagate_errors()); auto& thumbnails_container = tab_bar.add_tab<GUI::Widget>("Thumbnails"_string);
thumbnails_container.set_layout<GUI::VerticalBoxLayout>(4); thumbnails_container.set_layout<GUI::VerticalBoxLayout>(4);
// FIXME: Add thumbnail previews // FIXME: Add thumbnail previews

View file

@ -27,7 +27,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app_icon = GUI::Icon::default_icon("app-pdf-viewer"sv); auto app_icon = GUI::Icon::default_icon("app-pdf-viewer"sv);
Config::pledge_domain("PDFViewer"); Config::pledge_domain("PDFViewer");
app->set_config_domain(TRY("PDFViewer"_string)); app->set_config_domain("PDFViewer"_string);
auto window = TRY(GUI::Window::try_create()); auto window = TRY(GUI::Window::try_create());
window->set_title("PDF Viewer"); window->set_title("PDF Viewer");

View file

@ -21,13 +21,13 @@ ErrorOr<String> PartitionModel::column_name(int column) const
{ {
switch (column) { switch (column) {
case Column::Partition: case Column::Partition:
return TRY("Partition"_string); return "Partition"_string;
case Column::StartBlock: case Column::StartBlock:
return TRY("Start Block"_string); return "Start Block"_string;
case Column::EndBlock: case Column::EndBlock:
return TRY("End Block"_string); return "End Block"_string;
case Column::TotalBlocks: case Column::TotalBlocks:
return TRY("Total Blocks"_string); return "Total Blocks"_string;
case Column::Size: case Column::Size:
return "Size"_short_string; return "Size"_short_string;
default: default:

View file

@ -44,7 +44,7 @@ ErrorOr<void> MainWidget::initialize()
TRY(m_wave_widget->set_sample_size(sample_count)); TRY(m_wave_widget->set_sample_size(sample_count));
m_tab_widget = TRY(try_add<GUI::TabWidget>()); m_tab_widget = TRY(try_add<GUI::TabWidget>());
m_roll_widget = TRY(m_tab_widget->try_add_tab<RollWidget>(TRY("Piano Roll"_string), m_track_manager)); m_roll_widget = TRY(m_tab_widget->try_add_tab<RollWidget>("Piano Roll"_string, m_track_manager));
m_roll_widget->set_fixed_height(300); m_roll_widget->set_fixed_height(300);

View file

@ -60,7 +60,7 @@ SamplerWidget::SamplerWidget(TrackManager& track_manager)
m_wave_editor->update(); m_wave_editor->update();
}; };
m_recorded_sample_name = m_open_button_and_recorded_sample_name_container->add<GUI::Label>("No sample loaded"_string.release_value_but_fixme_should_propagate_errors()); m_recorded_sample_name = m_open_button_and_recorded_sample_name_container->add<GUI::Label>("No sample loaded"_string);
m_recorded_sample_name->set_text_alignment(Gfx::TextAlignment::CenterLeft); m_recorded_sample_name->set_text_alignment(Gfx::TextAlignment::CenterLeft);
m_wave_editor = add<WaveEditor>(m_track_manager); m_wave_editor = add<WaveEditor>(m_track_manager);

View file

@ -80,7 +80,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
return BackgroundIndex::Custom; return BackgroundIndex::Custom;
}(); }();
auto& background_label = main_widget->add<GUI::Label>("Background:"_string.release_value_but_fixme_should_propagate_errors()); auto& background_label = main_widget->add<GUI::Label>("Background:"_string);
background_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); background_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto& background_color_combo = main_widget->add<GUI::ComboBox>(); auto& background_color_combo = main_widget->add<GUI::ComboBox>();
auto& background_color_input = main_widget->add<GUI::ColorInput>(); auto& background_color_input = main_widget->add<GUI::ColorInput>();
@ -110,7 +110,7 @@ CreateNewImageDialog::CreateNewImageDialog(GUI::Window* parent_window)
}; };
auto& set_defaults_checkbox = main_widget->add<GUI::CheckBox>(); auto& set_defaults_checkbox = main_widget->add<GUI::CheckBox>();
set_defaults_checkbox.set_text("Use these settings as default"_string.release_value_but_fixme_should_propagate_errors()); set_defaults_checkbox.set_text("Use these settings as default"_string);
auto& button_container = main_widget->add<GUI::Widget>(); auto& button_container = main_widget->add<GUI::Widget>();
button_container.set_layout<GUI::HorizontalBoxLayout>(); button_container.set_layout<GUI::HorizontalBoxLayout>();

View file

@ -79,7 +79,7 @@ private:
} }
} }
auto& norm_checkbox = main_widget->template add<GUI::CheckBox>("Normalize"_string.release_value_but_fixme_should_propagate_errors()); auto& norm_checkbox = main_widget->template add<GUI::CheckBox>("Normalize"_string);
norm_checkbox.set_checked(false); 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"_short_string);

View file

@ -40,7 +40,7 @@ ErrorOr<RefPtr<GUI::Widget>> Bloom::get_settings_widget()
auto settings_widget = TRY(GUI::Widget::try_create()); auto settings_widget = TRY(GUI::Widget::try_create());
TRY(settings_widget->try_set_layout<GUI::VerticalBoxLayout>()); TRY(settings_widget->try_set_layout<GUI::VerticalBoxLayout>());
auto name_label = TRY(settings_widget->try_add<GUI::Label>(TRY("Bloom Filter"_string))); auto name_label = TRY(settings_widget->try_add<GUI::Label>("Bloom Filter"_string));
name_label->set_font_weight(Gfx::FontWeight::Bold); name_label->set_font_weight(Gfx::FontWeight::Bold);
name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
name_label->set_fixed_height(20); name_label->set_fixed_height(20);
@ -49,7 +49,7 @@ ErrorOr<RefPtr<GUI::Widget>> Bloom::get_settings_widget()
luma_lower_container->set_fixed_height(50); luma_lower_container->set_fixed_height(50);
TRY(luma_lower_container->try_set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 })); TRY(luma_lower_container->try_set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }));
auto luma_lower_label = TRY(luma_lower_container->try_add<GUI::Label>(TRY("Luma lower bound:"_string))); auto luma_lower_label = TRY(luma_lower_container->try_add<GUI::Label>("Luma lower bound:"_string));
luma_lower_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); luma_lower_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
luma_lower_label->set_fixed_height(20); luma_lower_label->set_fixed_height(20);
@ -65,7 +65,7 @@ ErrorOr<RefPtr<GUI::Widget>> Bloom::get_settings_widget()
radius_container->set_fixed_height(50); radius_container->set_fixed_height(50);
TRY(radius_container->try_set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 })); TRY(radius_container->try_set_layout<GUI::VerticalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }));
auto radius_label = TRY(radius_container->try_add<GUI::Label>(TRY("Blur Radius:"_string))); auto radius_label = TRY(radius_container->try_add<GUI::Label>("Blur Radius:"_string));
radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
radius_label->set_fixed_height(20); radius_label->set_fixed_height(20);

View file

@ -42,12 +42,12 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
auto settings_widget = TRY(GUI::Widget::try_create()); auto settings_widget = TRY(GUI::Widget::try_create());
TRY(settings_widget->try_set_layout<GUI::VerticalBoxLayout>()); TRY(settings_widget->try_set_layout<GUI::VerticalBoxLayout>());
auto name_label = TRY(settings_widget->try_add<GUI::Label>(TRY("Fast Box Blur Filter"_string))); auto name_label = TRY(settings_widget->try_add<GUI::Label>("Fast Box Blur Filter"_string));
name_label->set_font_weight(Gfx::FontWeight::Bold); name_label->set_font_weight(Gfx::FontWeight::Bold);
name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
name_label->set_fixed_height(10); name_label->set_fixed_height(10);
auto asymmetric_checkbox = TRY(settings_widget->try_add<GUI::CheckBox>(TRY("Use Asymmetric Radii"_string))); auto asymmetric_checkbox = TRY(settings_widget->try_add<GUI::CheckBox>("Use Asymmetric Radii"_string));
asymmetric_checkbox->set_checked(false); asymmetric_checkbox->set_checked(false);
asymmetric_checkbox->set_fixed_height(15); asymmetric_checkbox->set_fixed_height(15);
asymmetric_checkbox->on_checked = [this](bool checked) { asymmetric_checkbox->on_checked = [this](bool checked) {
@ -68,7 +68,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
update_preview(); update_preview();
}; };
m_vector_checkbox = TRY(settings_widget->try_add<GUI::CheckBox>(TRY("Use Direction and magnitude"_string))); m_vector_checkbox = TRY(settings_widget->try_add<GUI::CheckBox>("Use Direction and magnitude"_string));
m_vector_checkbox->set_checked(false); m_vector_checkbox->set_checked(false);
m_vector_checkbox->set_visible(false); m_vector_checkbox->set_visible(false);
m_vector_checkbox->set_fixed_height(15); m_vector_checkbox->set_fixed_height(15);
@ -109,7 +109,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
radius_x_container->set_fixed_height(20); radius_x_container->set_fixed_height(20);
radius_x_container->set_layout<GUI::HorizontalBoxLayout>(); radius_x_container->set_layout<GUI::HorizontalBoxLayout>();
auto radius_x_label = TRY(radius_x_container->try_add<GUI::Label>(TRY("Radius X:"_string))); auto radius_x_label = TRY(radius_x_container->try_add<GUI::Label>("Radius X:"_string));
radius_x_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_x_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
radius_x_label->set_fixed_size(50, 20); radius_x_label->set_fixed_size(50, 20);
@ -125,7 +125,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
radius_y_container->set_fixed_height(20); radius_y_container->set_fixed_height(20);
TRY(radius_y_container->try_set_layout<GUI::HorizontalBoxLayout>()); TRY(radius_y_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto radius_y_label = TRY(radius_y_container->try_add<GUI::Label>(TRY("Radius Y:"_string))); auto radius_y_label = TRY(radius_y_container->try_add<GUI::Label>("Radius Y:"_string));
radius_y_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); radius_y_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
radius_y_label->set_fixed_size(50, 20); radius_y_label->set_fixed_size(50, 20);
@ -162,7 +162,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
magnitude_container->set_fixed_height(20); magnitude_container->set_fixed_height(20);
TRY(magnitude_container->try_set_layout<GUI::HorizontalBoxLayout>()); TRY(magnitude_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto magnitude_label = TRY(magnitude_container->try_add<GUI::Label>(TRY("Magnitude:"_string))); auto magnitude_label = TRY(magnitude_container->try_add<GUI::Label>("Magnitude:"_string));
magnitude_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); magnitude_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
magnitude_label->set_fixed_size(60, 20); magnitude_label->set_fixed_size(60, 20);
@ -178,7 +178,7 @@ ErrorOr<RefPtr<GUI::Widget>> FastBoxBlur::get_settings_widget()
gaussian_container->set_fixed_height(20); gaussian_container->set_fixed_height(20);
TRY(gaussian_container->try_set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 })); TRY(gaussian_container->try_set_layout<GUI::HorizontalBoxLayout>(GUI::Margins { 4, 0, 4, 0 }));
m_gaussian_checkbox = TRY(gaussian_container->try_add<GUI::CheckBox>(TRY("Approximate Gaussian Blur"_string))); m_gaussian_checkbox = TRY(gaussian_container->try_add<GUI::CheckBox>("Approximate Gaussian Blur"_string));
m_gaussian_checkbox->set_checked(m_approximate_gauss); 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->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) { m_gaussian_checkbox->on_checked = [this](bool checked) {

View file

@ -23,7 +23,7 @@ ErrorOr<RefPtr<GUI::Widget>> Sepia::get_settings_widget()
auto settings_widget = TRY(GUI::Widget::try_create()); auto settings_widget = TRY(GUI::Widget::try_create());
TRY(settings_widget->try_set_layout<GUI::VerticalBoxLayout>()); TRY(settings_widget->try_set_layout<GUI::VerticalBoxLayout>());
auto name_label = TRY(settings_widget->try_add<GUI::Label>(TRY("Sepia Filter"_string))); auto name_label = TRY(settings_widget->try_add<GUI::Label>("Sepia Filter"_string));
name_label->set_font_weight(Gfx::FontWeight::Bold); name_label->set_font_weight(Gfx::FontWeight::Bold);
name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); name_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
name_label->set_fixed_height(20); name_label->set_fixed_height(20);

View file

@ -30,7 +30,7 @@ constexpr int marching_ant_length = 4;
ImageEditor::ImageEditor(NonnullRefPtr<Image> image) ImageEditor::ImageEditor(NonnullRefPtr<Image> image)
: m_image(move(image)) : m_image(move(image))
, m_title("Untitled"_string.release_value_but_fixme_should_propagate_errors()) , m_title("Untitled"_string)
, m_gui_event_loop(Core::EventLoop::current()) , m_gui_event_loop(Core::EventLoop::current())
{ {
set_focus_policy(GUI::FocusPolicy::StrongFocus); set_focus_policy(GUI::FocusPolicy::StrongFocus);

View file

@ -45,7 +45,7 @@ LayerPropertiesWidget::LayerPropertiesWidget()
opacity_container.set_fixed_height(20); opacity_container.set_fixed_height(20);
opacity_container.set_layout<GUI::HorizontalBoxLayout>(); opacity_container.set_layout<GUI::HorizontalBoxLayout>();
auto& opacity_label = opacity_container.add<GUI::Label>("Opacity:"_string.release_value_but_fixme_should_propagate_errors()); auto& opacity_label = opacity_container.add<GUI::Label>("Opacity:"_string);
opacity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); opacity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
opacity_label.set_fixed_size(80, 20); opacity_label.set_fixed_size(80, 20);

View file

@ -1314,7 +1314,7 @@ ErrorOr<void> MainWidget::create_default_image()
m_layer_list_widget->set_image(image); m_layer_list_widget->set_image(image);
auto& editor = create_new_editor(*image); auto& editor = create_new_editor(*image);
editor.set_title(TRY("Untitled"_string)); editor.set_title("Untitled"_string);
editor.set_active_layer(bg_layer); editor.set_active_layer(bg_layer);
editor.set_unmodified(); editor.set_unmodified();
@ -1333,7 +1333,7 @@ ErrorOr<void> MainWidget::create_image_from_clipboard()
image->add_layer(*layer); image->add_layer(*layer);
auto& editor = create_new_editor(*image); auto& editor = create_new_editor(*image);
editor.set_title(TRY("Untitled"_string)); editor.set_title("Untitled"_string);
m_layer_list_widget->set_image(image); m_layer_list_widget->set_image(image);
m_layer_list_widget->set_selected_layer(layer); m_layer_list_widget->set_selected_layer(layer);
@ -1362,7 +1362,7 @@ ImageEditor* MainWidget::current_image_editor()
ImageEditor& MainWidget::create_new_editor(NonnullRefPtr<Image> image) ImageEditor& MainWidget::create_new_editor(NonnullRefPtr<Image> image)
{ {
auto& image_editor = m_tab_widget->add_tab<PixelPaint::ImageEditor>("Untitled"_string.release_value_but_fixme_should_propagate_errors(), image); auto& image_editor = m_tab_widget->add_tab<PixelPaint::ImageEditor>("Untitled"_string, image);
image_editor.on_active_layer_change = [&](auto* layer) { image_editor.on_active_layer_change = [&](auto* layer) {
if (current_image_editor() != &image_editor) if (current_image_editor() != &image_editor)

View file

@ -167,7 +167,7 @@ ErrorOr<GUI::Widget*> BrushTool::get_properties_widget()
hardness_container->set_fixed_height(20); hardness_container->set_fixed_height(20);
(void)TRY(hardness_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(hardness_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>(TRY("Hardness:"_string))); auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string));
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20); hardness_label->set_fixed_size(80, 20);

View file

@ -71,7 +71,7 @@ ErrorOr<GUI::Widget*> BucketTool::get_properties_widget()
threshold_container->set_fixed_height(20); threshold_container->set_fixed_height(20);
(void)TRY(threshold_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(threshold_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto threshold_label = TRY(threshold_container->try_add<GUI::Label>(TRY("Threshold:"_string))); auto threshold_label = TRY(threshold_container->try_add<GUI::Label>("Threshold:"_string));
threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
threshold_label->set_fixed_size(80, 20); threshold_label->set_fixed_size(80, 20);

View file

@ -154,7 +154,7 @@ ErrorOr<GUI::Widget*> CloneTool::get_properties_widget()
hardness_container->set_fixed_height(20); hardness_container->set_fixed_height(20);
(void)TRY(hardness_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(hardness_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>(TRY("Hardness:"_string))); auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string));
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20); hardness_label->set_fixed_size(80, 20);

View file

@ -136,7 +136,7 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
thickness_container->set_fixed_height(20); thickness_container->set_fixed_height(20);
(void)TRY(thickness_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(thickness_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto thickness_label = TRY(thickness_container->try_add<GUI::Label>(TRY("Thickness:"_string))); auto thickness_label = TRY(thickness_container->try_add<GUI::Label>("Thickness:"_string));
thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label->set_fixed_size(80, 20); thickness_label->set_fixed_size(80, 20);
@ -159,7 +159,7 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
(void)TRY(mode_radio_container->try_set_layout<GUI::VerticalBoxLayout>()); (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 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 fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_short_string));
auto aa_enable_checkbox = TRY(mode_radio_container->try_add<GUI::CheckBox>(TRY("Anti-alias"_string))); auto aa_enable_checkbox = TRY(mode_radio_container->try_add<GUI::CheckBox>("Anti-alias"_string));
aa_enable_checkbox->on_checked = [this](bool checked) { aa_enable_checkbox->on_checked = [this](bool checked) {
m_antialias_enabled = checked; m_antialias_enabled = checked;
@ -180,7 +180,7 @@ ErrorOr<GUI::Widget*> EllipseTool::get_properties_widget()
aspect_container->set_fixed_height(20); aspect_container->set_fixed_height(20);
(void)TRY(aspect_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(aspect_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto aspect_label = TRY(aspect_container->try_add<GUI::Label>(TRY("Aspect Ratio:"_string))); auto aspect_label = TRY(aspect_container->try_add<GUI::Label>("Aspect Ratio:"_string));
aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
aspect_label->set_fixed_size(80, 20); aspect_label->set_fixed_size(80, 20);

View file

@ -82,7 +82,7 @@ ErrorOr<GUI::Widget*> EraseTool::get_properties_widget()
hardness_container->set_fixed_height(20); hardness_container->set_fixed_height(20);
(void)TRY(hardness_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(hardness_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>(TRY("Hardness:"_string))); auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string));
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20); hardness_label->set_fixed_size(80, 20);
@ -101,7 +101,7 @@ ErrorOr<GUI::Widget*> EraseTool::get_properties_widget()
auto use_secondary_color_checkbox = TRY(secondary_color_container->try_add<GUI::CheckBox>()); auto use_secondary_color_checkbox = TRY(secondary_color_container->try_add<GUI::CheckBox>());
use_secondary_color_checkbox->set_checked(m_use_secondary_color); use_secondary_color_checkbox->set_checked(m_use_secondary_color);
use_secondary_color_checkbox->set_text(TRY("Use secondary color"_string)); use_secondary_color_checkbox->set_text("Use secondary color"_string);
use_secondary_color_checkbox->on_checked = [this](bool checked) { use_secondary_color_checkbox->on_checked = [this](bool checked) {
m_use_secondary_color = checked; m_use_secondary_color = checked;
}; };
@ -109,7 +109,7 @@ ErrorOr<GUI::Widget*> EraseTool::get_properties_widget()
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(46); mode_container->set_fixed_height(46);
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto mode_label = TRY(mode_container->try_add<GUI::Label>(TRY("Draw Mode:"_string))); auto mode_label = TRY(mode_container->try_add<GUI::Label>("Draw Mode:"_string));
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label->set_fixed_size(80, 20);

View file

@ -207,7 +207,7 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
auto mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto mode_container = TRY(properties_widget->try_add<GUI::Widget>());
mode_container->set_fixed_height(20); mode_container->set_fixed_height(20);
(void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto mode_label = TRY(mode_container->try_add<GUI::Label>(TRY("Gradient Type:"_string))); auto mode_label = TRY(mode_container->try_add<GUI::Label>("Gradient Type:"_string));
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label->set_fixed_size(80, 20);
@ -237,7 +237,7 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
opacity_container->set_fixed_height(20); opacity_container->set_fixed_height(20);
(void)TRY(opacity_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(opacity_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto opacity_label = TRY(opacity_container->try_add<GUI::Label>(TRY("Opacity:"_string))); auto opacity_label = TRY(opacity_container->try_add<GUI::Label>("Opacity:"_string));
opacity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); opacity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
opacity_label->set_fixed_size(80, 20); opacity_label->set_fixed_size(80, 20);
@ -271,7 +271,7 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
hardness_container->set_visible(m_mode == GradientMode::Radial); hardness_container->set_visible(m_mode == GradientMode::Radial);
}; };
auto hardness_label = TRY(hardness_container->try_add<GUI::Label>(TRY("Hardness:"_string))); auto hardness_label = TRY(hardness_container->try_add<GUI::Label>("Hardness:"_string));
hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); hardness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
hardness_label->set_fixed_size(80, 20); hardness_label->set_fixed_size(80, 20);
@ -286,7 +286,7 @@ ErrorOr<GUI::Widget*> GradientTool::get_properties_widget()
}; };
set_secondary_slider(hardness_slider); set_secondary_slider(hardness_slider);
auto use_secondary_color_checkbox = TRY(properties_widget->try_add<GUI::CheckBox>(TRY("Use secondary color"_string))); auto use_secondary_color_checkbox = TRY(properties_widget->try_add<GUI::CheckBox>("Use secondary color"_string));
use_secondary_color_checkbox->on_checked = [this](bool checked) { use_secondary_color_checkbox->on_checked = [this](bool checked) {
m_use_secondary_color = checked; m_use_secondary_color = checked;
m_editor->update(); m_editor->update();

View file

@ -186,7 +186,7 @@ ErrorOr<GUI::Widget*> GuideTool::get_properties_widget()
snapping_container->set_fixed_height(20); snapping_container->set_fixed_height(20);
(void)TRY(snapping_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(snapping_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto snapping_label = TRY(snapping_container->try_add<GUI::Label>(TRY("Snap offset:"_string))); auto snapping_label = TRY(snapping_container->try_add<GUI::Label>("Snap offset:"_string));
snapping_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); snapping_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
snapping_label->set_fixed_size(80, 20); snapping_label->set_fixed_size(80, 20);
snapping_label->set_tooltip("Press Shift to snap"); snapping_label->set_tooltip("Press Shift to snap");

View file

@ -129,7 +129,7 @@ ErrorOr<GUI::Widget*> LineTool::get_properties_widget()
thickness_container->set_fixed_height(20); thickness_container->set_fixed_height(20);
(void)TRY(thickness_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(thickness_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto thickness_label = TRY(thickness_container->try_add<GUI::Label>(TRY("Thickness:"_string))); auto thickness_label = TRY(thickness_container->try_add<GUI::Label>("Thickness:"_string));
thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); thickness_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
thickness_label->set_fixed_size(80, 20); thickness_label->set_fixed_size(80, 20);
@ -150,7 +150,7 @@ ErrorOr<GUI::Widget*> LineTool::get_properties_widget()
mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
mode_label->set_fixed_size(80, 20); mode_label->set_fixed_size(80, 20);
auto aa_enable_checkbox = TRY(mode_container->try_add<GUI::CheckBox>(TRY("Anti-alias"_string))); auto aa_enable_checkbox = TRY(mode_container->try_add<GUI::CheckBox>("Anti-alias"_string));
aa_enable_checkbox->on_checked = [this](bool checked) { aa_enable_checkbox->on_checked = [this](bool checked) {
m_antialias_enabled = checked; m_antialias_enabled = checked;
}; };

View file

@ -298,15 +298,15 @@ ErrorOr<GUI::Widget*> MoveTool::get_properties_widget()
auto selection_mode_container = TRY(properties_widget->try_add<GUI::Widget>()); auto selection_mode_container = TRY(properties_widget->try_add<GUI::Widget>());
(void)TRY(selection_mode_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(selection_mode_container->try_set_layout<GUI::HorizontalBoxLayout>());
selection_mode_container->set_fixed_height(46); selection_mode_container->set_fixed_height(46);
auto selection_mode_label = TRY(selection_mode_container->try_add<GUI::Label>(TRY("Selection Mode:"_string))); auto selection_mode_label = TRY(selection_mode_container->try_add<GUI::Label>("Selection Mode:"_string));
selection_mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); selection_mode_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
selection_mode_label->set_fixed_size(80, 40); selection_mode_label->set_fixed_size(80, 40);
auto mode_radio_container = TRY(selection_mode_container->try_add<GUI::Widget>()); auto mode_radio_container = TRY(selection_mode_container->try_add<GUI::Widget>());
(void)TRY(mode_radio_container->try_set_layout<GUI::VerticalBoxLayout>()); (void)TRY(mode_radio_container->try_set_layout<GUI::VerticalBoxLayout>());
m_selection_mode_foreground = TRY(mode_radio_container->try_add<GUI::RadioButton>(TRY("Foreground"_string))); m_selection_mode_foreground = TRY(mode_radio_container->try_add<GUI::RadioButton>("Foreground"_string));
m_selection_mode_active = TRY(mode_radio_container->try_add<GUI::RadioButton>(TRY("Active Layer"_string))); m_selection_mode_active = TRY(mode_radio_container->try_add<GUI::RadioButton>("Active Layer"_string));
m_selection_mode_foreground->on_checked = [this](bool) { m_selection_mode_foreground->on_checked = [this](bool) {
m_layer_selection_mode = LayerSelectionMode::ForegroundLayer; m_layer_selection_mode = LayerSelectionMode::ForegroundLayer;

View file

@ -45,7 +45,7 @@ ErrorOr<GUI::Widget*> PenTool::get_properties_widget()
size_container->set_fixed_height(20); size_container->set_fixed_height(20);
(void)TRY(size_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(size_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto size_label = TRY(size_container->try_add<GUI::Label>(TRY("Thickness:"_string))); auto size_label = TRY(size_container->try_add<GUI::Label>("Thickness:"_string));
size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); size_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label->set_fixed_size(80, 20); size_label->set_fixed_size(80, 20);

View file

@ -47,7 +47,7 @@ ErrorOr<GUI::Widget*> PickerTool::get_properties_widget()
auto properties_widget = TRY(GUI::Widget::try_create()); auto properties_widget = TRY(GUI::Widget::try_create());
(void)TRY(properties_widget->try_set_layout<GUI::VerticalBoxLayout>()); (void)TRY(properties_widget->try_set_layout<GUI::VerticalBoxLayout>());
auto sample_checkbox = TRY(properties_widget->try_add<GUI::CheckBox>(TRY("Sample all layers"_string))); auto sample_checkbox = TRY(properties_widget->try_add<GUI::CheckBox>("Sample all layers"_string));
sample_checkbox->set_checked(m_sample_all_layers); sample_checkbox->set_checked(m_sample_all_layers);
sample_checkbox->on_checked = [this](bool value) { sample_checkbox->on_checked = [this](bool value) {
m_sample_all_layers = value; m_sample_all_layers = value;

View file

@ -165,7 +165,7 @@ ErrorOr<GUI::Widget*> RectangleSelectTool::get_properties_widget()
(void)TRY(feather_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(feather_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto feather_label = TRY(feather_container->try_add<GUI::Label>()); auto feather_label = TRY(feather_container->try_add<GUI::Label>());
feather_label->set_text(TRY("Feather:"_string)); feather_label->set_text("Feather:"_string);
feather_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); feather_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
feather_label->set_fixed_size(80, 20); feather_label->set_fixed_size(80, 20);

View file

@ -189,7 +189,7 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
(void)TRY(mode_radio_container->try_set_layout<GUI::VerticalBoxLayout>()); (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 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 fill_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Fill"_short_string));
auto gradient_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>(TRY("Gradient"_string))); auto gradient_mode_radio = TRY(mode_radio_container->try_add<GUI::RadioButton>("Gradient"_string));
mode_radio_container->set_fixed_width(70); 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"_short_string));
@ -215,7 +215,7 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
auto mode_extras_container = TRY(mode_container->try_add<GUI::Widget>()); auto mode_extras_container = TRY(mode_container->try_add<GUI::Widget>());
(void)TRY(mode_extras_container->try_set_layout<GUI::VerticalBoxLayout>()); (void)TRY(mode_extras_container->try_set_layout<GUI::VerticalBoxLayout>());
auto aa_enable_checkbox = TRY(mode_extras_container->try_add<GUI::CheckBox>(TRY("Anti-alias"_string))); auto aa_enable_checkbox = TRY(mode_extras_container->try_add<GUI::CheckBox>("Anti-alias"_string));
aa_enable_checkbox->on_checked = [this](bool checked) { aa_enable_checkbox->on_checked = [this](bool checked) {
m_antialias_enabled = checked; m_antialias_enabled = checked;
}; };
@ -225,7 +225,7 @@ ErrorOr<GUI::Widget*> RectangleTool::get_properties_widget()
(void)TRY(aspect_container->try_set_layout<GUI::VerticalBoxLayout>()); (void)TRY(aspect_container->try_set_layout<GUI::VerticalBoxLayout>());
aspect_container->set_fixed_width(75); aspect_container->set_fixed_width(75);
auto aspect_label = TRY(aspect_container->try_add<GUI::Label>(TRY("Aspect Ratio:"_string))); auto aspect_label = TRY(aspect_container->try_add<GUI::Label>("Aspect Ratio:"_string));
aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); aspect_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
aspect_label->set_fixed_size(75, 20); aspect_label->set_fixed_size(75, 20);

View file

@ -117,7 +117,7 @@ ErrorOr<GUI::Widget*> SprayTool::get_properties_widget()
density_container->set_fixed_height(20); density_container->set_fixed_height(20);
(void)TRY(density_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(density_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto density_label = TRY(density_container->try_add<GUI::Label>(TRY("Density:"_string))); auto density_label = TRY(density_container->try_add<GUI::Label>("Density:"_string));
density_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); density_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
density_label->set_fixed_size(80, 20); density_label->set_fixed_size(80, 20);

View file

@ -111,12 +111,12 @@ ErrorOr<GUI::Widget*> TextTool::get_properties_widget()
auto properties_widget = TRY(GUI::Widget::try_create()); auto properties_widget = TRY(GUI::Widget::try_create());
(void)TRY(properties_widget->try_set_layout<GUI::VerticalBoxLayout>()); (void)TRY(properties_widget->try_set_layout<GUI::VerticalBoxLayout>());
auto font_header = TRY(properties_widget->try_add<GUI::Label>(TRY("Current Font:"_string))); auto font_header = TRY(properties_widget->try_add<GUI::Label>("Current Font:"_string));
font_header->set_text_alignment(Gfx::TextAlignment::CenterLeft); font_header->set_text_alignment(Gfx::TextAlignment::CenterLeft);
m_font_label = TRY(properties_widget->try_add<GUI::Label>(TRY(String::from_deprecated_string(m_selected_font->human_readable_name())))); m_font_label = TRY(properties_widget->try_add<GUI::Label>(TRY(String::from_deprecated_string(m_selected_font->human_readable_name()))));
auto change_font_button = TRY(properties_widget->try_add<GUI::Button>(TRY("Change Font..."_string))); auto change_font_button = TRY(properties_widget->try_add<GUI::Button>("Change Font..."_string));
change_font_button->on_click = [this](auto) { change_font_button->on_click = [this](auto) {
auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false); auto picker = GUI::FontPicker::construct(nullptr, m_selected_font, false);
if (picker->exec() == GUI::Dialog::ExecResult::OK) { if (picker->exec() == GUI::Dialog::ExecResult::OK) {

View file

@ -79,7 +79,7 @@ ErrorOr<GUI::Widget*> WandSelectTool::get_properties_widget()
threshold_container->set_fixed_height(20); threshold_container->set_fixed_height(20);
(void)TRY(threshold_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(threshold_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto threshold_label = TRY(threshold_container->try_add<GUI::Label>(TRY("Threshold:"_string))); auto threshold_label = TRY(threshold_container->try_add<GUI::Label>("Threshold:"_string));
threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); threshold_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
threshold_label->set_fixed_size(80, 20); threshold_label->set_fixed_size(80, 20);

View file

@ -33,7 +33,7 @@ ErrorOr<GUI::Widget*> ZoomTool::get_properties_widget()
sensitivity_container->set_fixed_height(20); sensitivity_container->set_fixed_height(20);
(void)TRY(sensitivity_container->try_set_layout<GUI::HorizontalBoxLayout>()); (void)TRY(sensitivity_container->try_set_layout<GUI::HorizontalBoxLayout>());
auto sensitivity_label = TRY(sensitivity_container->try_add<GUI::Label>(TRY("Sensitivity:"_string))); auto sensitivity_label = TRY(sensitivity_container->try_add<GUI::Label>("Sensitivity:"_string));
sensitivity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft); sensitivity_label->set_text_alignment(Gfx::TextAlignment::CenterLeft);
sensitivity_label->set_fixed_size(80, 20); sensitivity_label->set_fixed_size(80, 20);

View file

@ -71,7 +71,7 @@ ErrorOr<void> PresenterWidget::initialize_menubar()
GUI::Application::the()->quit(); GUI::Application::the()->quit();
}))); })));
auto presentation_menu = TRY(window->try_add_menu(TRY("&Presentation"_string))); auto presentation_menu = TRY(window->try_add_menu("&Presentation"_string));
m_next_slide_action = GUI::Action::create("&Next", { KeyCode::Key_Right }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), [this](auto&) { m_next_slide_action = GUI::Action::create("&Next", { KeyCode::Key_Right }, TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/go-forward.png"sv)), [this](auto&) {
if (m_current_presentation) { if (m_current_presentation) {
m_current_presentation->next_frame(); m_current_presentation->next_frame();

View file

@ -63,7 +63,7 @@ ErrorOr<String> PlaylistModel::column_name(int column) const
case Column::Title: case Column::Title:
return "Title"_short_string; return "Title"_short_string;
case Column::Duration: case Column::Duration:
return TRY("Duration"_string); return "Duration"_string;
case Column::Group: case Column::Group:
return "Group"_short_string; return "Group"_short_string;
case Column::Album: case Column::Album:
@ -71,7 +71,7 @@ ErrorOr<String> PlaylistModel::column_name(int column) const
case Column::Artist: case Column::Artist:
return "Artist"_short_string; return "Artist"_short_string;
case Column::Filesize: case Column::Filesize:
return TRY("Filesize"_string); return "Filesize"_string;
} }
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }

View file

@ -41,7 +41,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto decoder_client = TRY(ImageDecoderClient::Client::try_create()); auto decoder_client = TRY(ImageDecoderClient::Client::try_create());
Config::pledge_domains({ "SoundPlayer", "FileManager" }); Config::pledge_domains({ "SoundPlayer", "FileManager" });
app->set_config_domain(TRY("SoundPlayer"_string)); app->set_config_domain("SoundPlayer"_string);
TRY(Core::System::pledge("stdio recvfd sendfd rpath thread proc")); TRY(Core::System::pledge("stdio recvfd sendfd rpath thread proc"));
@ -73,7 +73,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
app->quit(); app->quit();
}))); })));
auto playback_menu = TRY(window->try_add_menu(TRY("&Playback"_string))); auto playback_menu = TRY(window->try_add_menu("&Playback"_string));
GUI::ActionGroup loop_actions; GUI::ActionGroup loop_actions;
loop_actions.set_exclusive(true); loop_actions.set_exclusive(true);
auto loop_none = GUI::Action::create_checkable("&No Loop", { Mod_Ctrl, Key_N }, [&](auto&) { auto loop_none = GUI::Action::create_checkable("&No Loop", { Mod_Ctrl, Key_N }, [&](auto&) {
@ -120,7 +120,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}); });
TRY(playback_menu->try_add_action(shuffle_mode)); TRY(playback_menu->try_add_action(shuffle_mode));
auto visualization_menu = TRY(window->try_add_menu(TRY("&Visualization"_string))); auto visualization_menu = TRY(window->try_add_menu("&Visualization"_string));
GUI::ActionGroup visualization_actions; GUI::ActionGroup visualization_actions;
visualization_actions.set_exclusive(true); visualization_actions.set_exclusive(true);

View file

@ -18,7 +18,7 @@ ErrorOr<NonnullRefPtr<ProgressWindow>> ProgressWindow::try_create(StringView tit
main_widget->set_fill_with_background_color(true); main_widget->set_fill_with_background_color(true);
TRY(main_widget->try_set_layout<GUI::VerticalBoxLayout>()); TRY(main_widget->try_set_layout<GUI::VerticalBoxLayout>());
auto label = TRY(main_widget->try_add<GUI::Label>(TRY("Analyzing storage space..."_string))); auto label = TRY(main_widget->try_add<GUI::Label>("Analyzing storage space..."_string));
label->set_fixed_height(22); label->set_fixed_height(22);
window->m_progress_label = TRY(main_widget->try_add<GUI::Label>()); window->m_progress_label = TRY(main_widget->try_add<GUI::Label>());

View file

@ -433,7 +433,7 @@ ErrorOr<void> TreeMapWidget::analyze(GUI::Statusbar& statusbar)
} }
statusbar.set_text(TRY(builder.to_string())); statusbar.set_text(TRY(builder.to_string()));
} else { } else {
statusbar.set_text(TRY("No errors"_string)); statusbar.set_text("No errors"_string);
} }
m_tree = move(tree); m_tree = move(tree);

View file

@ -157,7 +157,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
}; };
{ {
auto& checkbox = right_side.add<GUI::CheckBox>("Override max length"_string.release_value_but_fixme_should_propagate_errors()); auto& checkbox = right_side.add<GUI::CheckBox>("Override max length"_string);
auto& spinbox = right_side.add<GUI::SpinBox>(); auto& spinbox = right_side.add<GUI::SpinBox>();
checkbox.set_checked(m_length != -1); checkbox.set_checked(m_length != -1);
spinbox.set_min(0); spinbox.set_min(0);
@ -177,7 +177,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
}; };
} }
{ {
auto& checkbox = right_side.add<GUI::CheckBox>("Override display format"_string.release_value_but_fixme_should_propagate_errors()); auto& checkbox = right_side.add<GUI::CheckBox>("Override display format"_string);
auto& editor = right_side.add<GUI::TextEditor>(); auto& editor = right_side.add<GUI::TextEditor>();
checkbox.set_checked(!m_format.is_empty()); checkbox.set_checked(!m_format.is_empty());
editor.set_name("format_editor"); editor.set_name("format_editor");
@ -197,7 +197,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
} }
} }
auto& alignment_tab = tabs.add_tab<GUI::Widget>("Alignment"_string.release_value_but_fixme_should_propagate_errors()); auto& alignment_tab = tabs.add_tab<GUI::Widget>("Alignment"_string);
alignment_tab.set_layout<GUI::VerticalBoxLayout>(4); alignment_tab.set_layout<GUI::VerticalBoxLayout>(4);
{ {
// FIXME: Frame? // FIXME: Frame?
@ -209,7 +209,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
auto& horizontal_alignment_label = horizontal_alignment_selection_container.add<GUI::Label>(); auto& horizontal_alignment_label = horizontal_alignment_selection_container.add<GUI::Label>();
horizontal_alignment_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); horizontal_alignment_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
horizontal_alignment_label.set_text("Horizontal text alignment"_string.release_value_but_fixme_should_propagate_errors()); horizontal_alignment_label.set_text("Horizontal text alignment"_string);
auto& horizontal_combobox = alignment_tab.add<GUI::ComboBox>(); auto& horizontal_combobox = alignment_tab.add<GUI::ComboBox>();
horizontal_combobox.set_only_allow_values_from_model(true); horizontal_combobox.set_only_allow_values_from_model(true);
@ -240,7 +240,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
auto& vertical_alignment_label = vertical_alignment_container.add<GUI::Label>(); auto& vertical_alignment_label = vertical_alignment_container.add<GUI::Label>();
vertical_alignment_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); vertical_alignment_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
vertical_alignment_label.set_text("Vertical text alignment"_string.release_value_but_fixme_should_propagate_errors()); vertical_alignment_label.set_text("Vertical text alignment"_string);
auto& vertical_combobox = alignment_tab.add<GUI::ComboBox>(); auto& vertical_combobox = alignment_tab.add<GUI::ComboBox>();
vertical_combobox.set_only_allow_values_from_model(true); vertical_combobox.set_only_allow_values_from_model(true);
@ -281,7 +281,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
auto& foreground_label = foreground_container.add<GUI::Label>(); auto& foreground_label = foreground_container.add<GUI::Label>();
foreground_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); foreground_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
foreground_label.set_text("Static foreground color"_string.release_value_but_fixme_should_propagate_errors()); foreground_label.set_text("Static foreground color"_string);
auto& foreground_selector = foreground_container.add<GUI::ColorInput>(); auto& foreground_selector = foreground_container.add<GUI::ColorInput>();
if (m_static_format.foreground_color.has_value()) if (m_static_format.foreground_color.has_value())
@ -300,7 +300,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
auto& background_label = background_container.add<GUI::Label>(); auto& background_label = background_container.add<GUI::Label>();
background_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); background_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
background_label.set_text("Static background color"_string.release_value_but_fixme_should_propagate_errors()); background_label.set_text("Static background color"_string);
auto& background_selector = background_container.add<GUI::ColorInput>(); auto& background_selector = background_container.add<GUI::ColorInput>();
if (m_static_format.background_color.has_value()) if (m_static_format.background_color.has_value())
@ -312,7 +312,7 @@ void CellTypeDialog::setup_tabs(GUI::TabWidget& tabs, Vector<Position> const& po
} }
} }
auto& conditional_fmt_tab = tabs.add_tab<GUI::Widget>("Conditional format"_string.release_value_but_fixme_should_propagate_errors()); auto& conditional_fmt_tab = tabs.add_tab<GUI::Widget>("Conditional format"_string);
conditional_fmt_tab.load_from_gml(cond_fmt_gml).release_value_but_fixme_should_propagate_errors(); conditional_fmt_tab.load_from_gml(cond_fmt_gml).release_value_but_fixme_should_propagate_errors();
{ {
auto& view = *conditional_fmt_tab.find_descendant_of_type_named<Spreadsheet::ConditionsView>("conditions_view"); auto& view = *conditional_fmt_tab.find_descendant_of_type_named<Spreadsheet::ConditionsView>("conditions_view");

View file

@ -154,7 +154,7 @@ void CSVImportDialogPage::update_preview()
m_previously_made_reader = make_reader(); m_previously_made_reader = make_reader();
if (!m_previously_made_reader.has_value()) { if (!m_previously_made_reader.has_value()) {
m_data_preview_table_view->set_model(nullptr); m_data_preview_table_view->set_model(nullptr);
m_data_preview_error_label->set_text("Could not read the given file"_string.release_value_but_fixme_should_propagate_errors()); m_data_preview_error_label->set_text("Could not read the given file"_string);
m_data_preview_widget->set_active_widget(m_data_preview_error_label); m_data_preview_widget->set_active_widget(m_data_preview_error_label);
return; return;
} }

View file

@ -42,7 +42,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
} }
Config::pledge_domain("Spreadsheet"); Config::pledge_domain("Spreadsheet");
app->set_config_domain(TRY("Spreadsheet"_string)); app->set_config_domain("Spreadsheet"_string);
TRY(Core::System::unveil("/tmp/session/%sid/portal/filesystemaccess", "rw")); TRY(Core::System::unveil("/tmp/session/%sid/portal/filesystemaccess", "rw"));
TRY(Core::System::unveil("/tmp/session/%sid/portal/webcontent", "rw")); TRY(Core::System::unveil("/tmp/session/%sid/portal/webcontent", "rw"));

View file

@ -56,12 +56,12 @@ MemoryStatsWidget::MemoryStatsWidget(GraphWidget* graph)
return label; return label;
}; };
m_physical_pages_label = build_widgets_for_label("Physical memory:"_string.release_value_but_fixme_should_propagate_errors()); m_physical_pages_label = build_widgets_for_label("Physical memory:"_string);
m_physical_pages_committed_label = build_widgets_for_label("Committed memory:"_string.release_value_but_fixme_should_propagate_errors()); m_physical_pages_committed_label = build_widgets_for_label("Committed memory:"_string);
m_kmalloc_space_label = build_widgets_for_label("Kernel heap:"_string.release_value_but_fixme_should_propagate_errors()); m_kmalloc_space_label = build_widgets_for_label("Kernel heap:"_string);
m_kmalloc_count_label = build_widgets_for_label("Calls kmalloc:"_string.release_value_but_fixme_should_propagate_errors()); m_kmalloc_count_label = build_widgets_for_label("Calls kmalloc:"_string);
m_kfree_count_label = build_widgets_for_label("Calls kfree:"_string.release_value_but_fixme_should_propagate_errors()); m_kfree_count_label = build_widgets_for_label("Calls kfree:"_string);
m_kmalloc_difference_label = build_widgets_for_label("Difference:"_string.release_value_but_fixme_should_propagate_errors()); m_kmalloc_difference_label = build_widgets_for_label("Difference:"_string);
refresh(); refresh();
} }

View file

@ -53,7 +53,7 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
net_adapters_fields.empend("name", "Name"_short_string, Gfx::TextAlignment::CenterLeft); net_adapters_fields.empend("name", "Name"_short_string, Gfx::TextAlignment::CenterLeft);
net_adapters_fields.empend("class_name", "Class"_short_string, Gfx::TextAlignment::CenterLeft); net_adapters_fields.empend("class_name", "Class"_short_string, Gfx::TextAlignment::CenterLeft);
net_adapters_fields.empend("mac_address", "MAC"_short_string, Gfx::TextAlignment::CenterLeft); net_adapters_fields.empend("mac_address", "MAC"_short_string, Gfx::TextAlignment::CenterLeft);
net_adapters_fields.empend("Link status"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterLeft, net_adapters_fields.empend("Link status"_string, Gfx::TextAlignment::CenterLeft,
[](JsonObject const& object) -> DeprecatedString { [](JsonObject const& object) -> DeprecatedString {
if (!object.get_bool("link_up"sv).value_or(false)) if (!object.get_bool("link_up"sv).value_or(false))
return "Down"; return "Down";
@ -67,8 +67,8 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
}); });
net_adapters_fields.empend("packets_in", "Pkt In"_short_string, Gfx::TextAlignment::CenterRight); net_adapters_fields.empend("packets_in", "Pkt In"_short_string, Gfx::TextAlignment::CenterRight);
net_adapters_fields.empend("packets_out", "Pkt Out"_short_string, Gfx::TextAlignment::CenterRight); net_adapters_fields.empend("packets_out", "Pkt Out"_short_string, Gfx::TextAlignment::CenterRight);
net_adapters_fields.empend("bytes_in", "Bytes In"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); net_adapters_fields.empend("bytes_in", "Bytes In"_string, Gfx::TextAlignment::CenterRight);
net_adapters_fields.empend("bytes_out", "Bytes Out"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); net_adapters_fields.empend("bytes_out", "Bytes Out"_string, Gfx::TextAlignment::CenterRight);
m_adapter_model = GUI::JsonArrayModel::create("/sys/kernel/net/adapters", move(net_adapters_fields)); m_adapter_model = GUI::JsonArrayModel::create("/sys/kernel/net/adapters", move(net_adapters_fields));
m_adapter_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_adapter_model))); m_adapter_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_adapter_model)));
m_adapter_context_menu = MUST(GUI::Menu::try_create()); m_adapter_context_menu = MUST(GUI::Menu::try_create());
@ -106,8 +106,8 @@ NetworkStatisticsWidget::NetworkStatisticsWidget()
net_tcp_fields.empend("sequence_number", "Seq#"_short_string, Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("sequence_number", "Seq#"_short_string, Gfx::TextAlignment::CenterRight);
net_tcp_fields.empend("packets_in", "Pkt In"_short_string, Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("packets_in", "Pkt In"_short_string, Gfx::TextAlignment::CenterRight);
net_tcp_fields.empend("packets_out", "Pkt Out"_short_string, Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("packets_out", "Pkt Out"_short_string, Gfx::TextAlignment::CenterRight);
net_tcp_fields.empend("bytes_in", "Bytes In"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("bytes_in", "Bytes In"_string, Gfx::TextAlignment::CenterRight);
net_tcp_fields.empend("bytes_out", "Bytes Out"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); net_tcp_fields.empend("bytes_out", "Bytes Out"_string, Gfx::TextAlignment::CenterRight);
m_tcp_socket_model = GUI::JsonArrayModel::create("/sys/kernel/net/tcp", move(net_tcp_fields)); m_tcp_socket_model = GUI::JsonArrayModel::create("/sys/kernel/net/tcp", move(net_tcp_fields));
m_tcp_socket_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_tcp_socket_model))); m_tcp_socket_table_view->set_model(MUST(GUI::SortingProxyModel::create(*m_tcp_socket_model)));

View file

@ -29,16 +29,16 @@ ErrorOr<NonnullRefPtr<ProcessFileDescriptorMapWidget>> ProcessFileDescriptorMapW
TRY(pid_fds_fields.try_empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { TRY(pid_fds_fields.try_empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
return object.get_bool("seekable"sv).value_or(false) ? "Seekable" : "Sequential"; return object.get_bool("seekable"sv).value_or(false) ? "Seekable" : "Sequential";
})); }));
TRY(pid_fds_fields.try_empend(TRY("Blocking"_string), Gfx::TextAlignment::CenterLeft, [](auto& object) { TRY(pid_fds_fields.try_empend("Blocking"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
return object.get_bool("blocking"sv).value_or(false) ? "Blocking" : "Nonblocking"; return object.get_bool("blocking"sv).value_or(false) ? "Blocking" : "Nonblocking";
})); }));
TRY(pid_fds_fields.try_empend("On exec"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { TRY(pid_fds_fields.try_empend("On exec"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
return object.get_bool("cloexec"sv).value_or(false) ? "Close" : "Keep"; return object.get_bool("cloexec"sv).value_or(false) ? "Close" : "Keep";
})); }));
TRY(pid_fds_fields.try_empend(TRY("Can read"_string), Gfx::TextAlignment::CenterLeft, [](auto& object) { TRY(pid_fds_fields.try_empend("Can read"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
return object.get_bool("can_read"sv).value_or(false) ? "Yes" : "No"; return object.get_bool("can_read"sv).value_or(false) ? "Yes" : "No";
})); }));
TRY(pid_fds_fields.try_empend(TRY("Can write"_string), Gfx::TextAlignment::CenterLeft, [](auto& object) { TRY(pid_fds_fields.try_empend("Can write"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
return object.get_bool("can_write"sv).value_or(false) ? "Yes" : "No"; return object.get_bool("can_write"sv).value_or(false) ? "Yes" : "No";
})); }));

View file

@ -61,7 +61,7 @@ ErrorOr<NonnullRefPtr<ProcessMemoryMapWidget>> ProcessMemoryMapWidget::try_creat
[](auto& object) { return DeprecatedString::formatted("{:p}", object.get_u64("address"sv).value_or(0)); }, [](auto& object) { return DeprecatedString::formatted("{:p}", object.get_u64("address"sv).value_or(0)); },
[](auto& object) { return object.get_u64("address"sv).value_or(0); })); [](auto& object) { return object.get_u64("address"sv).value_or(0); }));
TRY(pid_vm_fields.try_empend("size", "Size"_short_string, Gfx::TextAlignment::CenterRight)); TRY(pid_vm_fields.try_empend("size", "Size"_short_string, Gfx::TextAlignment::CenterRight));
TRY(pid_vm_fields.try_empend("amount_resident", TRY("Resident"_string), Gfx::TextAlignment::CenterRight)); TRY(pid_vm_fields.try_empend("amount_resident", "Resident"_string, Gfx::TextAlignment::CenterRight));
TRY(pid_vm_fields.try_empend("amount_dirty", "Dirty"_short_string, Gfx::TextAlignment::CenterRight)); TRY(pid_vm_fields.try_empend("amount_dirty", "Dirty"_short_string, Gfx::TextAlignment::CenterRight));
TRY(pid_vm_fields.try_empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) { TRY(pid_vm_fields.try_empend("Access"_short_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
StringBuilder builder; StringBuilder builder;
@ -79,19 +79,19 @@ ErrorOr<NonnullRefPtr<ProcessMemoryMapWidget>> ProcessMemoryMapWidget::try_creat
builder.append('T'); builder.append('T');
return builder.to_deprecated_string(); return builder.to_deprecated_string();
})); }));
TRY(pid_vm_fields.try_empend(TRY("VMObject type"_string), Gfx::TextAlignment::CenterLeft, [](auto& object) { TRY(pid_vm_fields.try_empend("VMObject type"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
auto type = object.get_deprecated_string("vmobject"sv).value_or({}); auto type = object.get_deprecated_string("vmobject"sv).value_or({});
if (type.ends_with("VMObject"sv)) if (type.ends_with("VMObject"sv))
type = type.substring(0, type.length() - 8); type = type.substring(0, type.length() - 8);
return type; return type;
})); }));
TRY(pid_vm_fields.try_empend(TRY("Purgeable"_string), Gfx::TextAlignment::CenterLeft, [](auto& object) { TRY(pid_vm_fields.try_empend("Purgeable"_string, Gfx::TextAlignment::CenterLeft, [](auto& object) {
if (object.get_bool("volatile"sv).value_or(false)) if (object.get_bool("volatile"sv).value_or(false))
return "Volatile"; return "Volatile";
return "Non-volatile"; return "Non-volatile";
})); }));
TRY(pid_vm_fields.try_empend( TRY(pid_vm_fields.try_empend(
TRY("Page map"_string), Gfx::TextAlignment::CenterLeft, "Page map"_string, Gfx::TextAlignment::CenterLeft,
[](auto&) { [](auto&) {
return GUI::Variant(); return GUI::Variant();
}, },

View file

@ -95,7 +95,7 @@ ErrorOr<String> ProcessModel::column_name(int column) const
case Column::Virtual: case Column::Virtual:
return "Virtual"_short_string; return "Virtual"_short_string;
case Column::Physical: case Column::Physical:
return TRY("Physical"_string); return "Physical"_string;
case Column::DirtyPrivate: case Column::DirtyPrivate:
return "Private"_short_string; return "Private"_short_string;
case Column::CleanInode: case Column::CleanInode:
@ -107,11 +107,11 @@ ErrorOr<String> ProcessModel::column_name(int column) const
case Column::CPU: case Column::CPU:
return "CPU"_short_string; return "CPU"_short_string;
case Column::Processor: case Column::Processor:
return TRY("Processor"_string); return "Processor"_string;
case Column::Name: case Column::Name:
return "Name"_short_string; return "Name"_short_string;
case Column::Syscalls: case Column::Syscalls:
return TRY("Syscalls"_string); return "Syscalls"_string;
case Column::InodeFaults: case Column::InodeFaults:
return "F:Inode"_short_string; return "F:Inode"_short_string;
case Column::ZeroFaults: case Column::ZeroFaults:
@ -121,15 +121,15 @@ ErrorOr<String> ProcessModel::column_name(int column) const
case Column::IPv4SocketReadBytes: case Column::IPv4SocketReadBytes:
return "IPv4 In"_short_string; return "IPv4 In"_short_string;
case Column::IPv4SocketWriteBytes: case Column::IPv4SocketWriteBytes:
return TRY("IPv4 Out"_string); return "IPv4 Out"_string;
case Column::UnixSocketReadBytes: case Column::UnixSocketReadBytes:
return "Unix In"_short_string; return "Unix In"_short_string;
case Column::UnixSocketWriteBytes: case Column::UnixSocketWriteBytes:
return TRY("Unix Out"_string); return "Unix Out"_string;
case Column::FileReadBytes: case Column::FileReadBytes:
return "File In"_short_string; return "File In"_short_string;
case Column::FileWriteBytes: case Column::FileWriteBytes:
return TRY("File Out"_string); return "File Out"_string;
case Column::Pledge: case Column::Pledge:
return "Pledge"_short_string; return "Pledge"_short_string;
case Column::Veil: case Column::Veil:

View file

@ -24,7 +24,7 @@ ErrorOr<NonnullRefPtr<ProcessUnveiledPathsWidget>> ProcessUnveiledPathsWidget::t
Vector<GUI::JsonArrayModel::FieldSpec> pid_unveil_fields; Vector<GUI::JsonArrayModel::FieldSpec> pid_unveil_fields;
TRY(pid_unveil_fields.try_empend("path", "Path"_short_string, Gfx::TextAlignment::CenterLeft)); TRY(pid_unveil_fields.try_empend("path", "Path"_short_string, Gfx::TextAlignment::CenterLeft));
TRY(pid_unveil_fields.try_empend("permissions", TRY("Permissions"_string), Gfx::TextAlignment::CenterLeft)); TRY(pid_unveil_fields.try_empend("permissions", "Permissions"_string, Gfx::TextAlignment::CenterLeft));
widget->m_model = GUI::JsonArrayModel::create({}, move(pid_unveil_fields)); widget->m_model = GUI::JsonArrayModel::create({}, move(pid_unveil_fields));
widget->m_table_view->set_model(TRY(GUI::SortingProxyModel::create(*widget->m_model))); widget->m_table_view->set_model(TRY(GUI::SortingProxyModel::create(*widget->m_model)));

View file

@ -123,7 +123,7 @@ public:
auto& fs_table_view = *self.find_child_of_type_named<GUI::TableView>("storage_table"); auto& fs_table_view = *self.find_child_of_type_named<GUI::TableView>("storage_table");
Vector<GUI::JsonArrayModel::FieldSpec> df_fields; Vector<GUI::JsonArrayModel::FieldSpec> df_fields;
df_fields.empend("mount_point", "Mount point"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterLeft); df_fields.empend("mount_point", "Mount point"_string, Gfx::TextAlignment::CenterLeft);
df_fields.empend("class_name", "Class"_short_string, Gfx::TextAlignment::CenterLeft); df_fields.empend("class_name", "Class"_short_string, Gfx::TextAlignment::CenterLeft);
df_fields.empend("source", "Source"_short_string, Gfx::TextAlignment::CenterLeft); df_fields.empend("source", "Source"_short_string, Gfx::TextAlignment::CenterLeft);
df_fields.empend( df_fields.empend(
@ -161,7 +161,7 @@ public:
return used_blocks * object.get_u64("block_size"sv).value_or(0); return used_blocks * object.get_u64("block_size"sv).value_or(0);
}); });
df_fields.empend( df_fields.empend(
"Available"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight, "Available"_string, Gfx::TextAlignment::CenterRight,
[](JsonObject const& object) { [](JsonObject const& object) {
return human_readable_size(object.get_u64("free_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0)); return human_readable_size(object.get_u64("free_block_count"sv).value_or(0) * object.get_u64("block_size"sv).value_or(0));
}, },
@ -173,7 +173,7 @@ public:
int mount_flags = object.get_i32("mount_flags"sv).value_or(0); int mount_flags = object.get_i32("mount_flags"sv).value_or(0);
return readonly || (mount_flags & MS_RDONLY) ? "Read-only" : "Read/Write"; return readonly || (mount_flags & MS_RDONLY) ? "Read-only" : "Read/Write";
}); });
df_fields.empend("Mount flags"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) { df_fields.empend("Mount flags"_string, Gfx::TextAlignment::CenterLeft, [](JsonObject const& object) {
int mount_flags = object.get_i32("mount_flags"sv).value_or(0); int mount_flags = object.get_i32("mount_flags"sv).value_or(0);
StringBuilder builder; StringBuilder builder;
bool first = true; bool first = true;
@ -197,11 +197,11 @@ public:
return DeprecatedString("defaults"); return DeprecatedString("defaults");
return builder.to_deprecated_string(); return builder.to_deprecated_string();
}); });
df_fields.empend("free_block_count", "Free blocks"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); df_fields.empend("free_block_count", "Free blocks"_string, Gfx::TextAlignment::CenterRight);
df_fields.empend("total_block_count", "Total blocks"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); df_fields.empend("total_block_count", "Total blocks"_string, Gfx::TextAlignment::CenterRight);
df_fields.empend("free_inode_count", "Free inodes"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); df_fields.empend("free_inode_count", "Free inodes"_string, Gfx::TextAlignment::CenterRight);
df_fields.empend("total_inode_count", "Total inodes"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); df_fields.empend("total_inode_count", "Total inodes"_string, Gfx::TextAlignment::CenterRight);
df_fields.empend("block_size", "Block size"_string.release_value_but_fixme_should_propagate_errors(), Gfx::TextAlignment::CenterRight); df_fields.empend("block_size", "Block size"_string, Gfx::TextAlignment::CenterRight);
fs_table_view.set_model(MUST(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/sys/kernel/df", move(df_fields))))); fs_table_view.set_model(MUST(GUI::SortingProxyModel::create(GUI::JsonArrayModel::create("/sys/kernel/df", move(df_fields)))));
@ -446,7 +446,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
process_context_menu->popup(event.screen_position(), process_properties_action); process_context_menu->popup(event.screen_position(), process_properties_action);
}; };
auto frequency_menu = TRY(window->try_add_menu(TRY("F&requency"_string))); auto frequency_menu = TRY(window->try_add_menu("F&requency"_string));
GUI::ActionGroup frequency_action_group; GUI::ActionGroup frequency_action_group;
frequency_action_group.set_exclusive(true); frequency_action_group.set_exclusive(true);

View file

@ -141,7 +141,7 @@ static ErrorOr<void> run_command(StringView command, bool keep_open)
{ {
auto shell = TRY(String::from_deprecated_string(TRY(Core::Account::self(Core::Account::Read::PasswdOnly)).shell())); auto shell = TRY(String::from_deprecated_string(TRY(Core::Account::self(Core::Account::Read::PasswdOnly)).shell()));
if (shell.is_empty()) if (shell.is_empty())
shell = TRY("/bin/Shell"_string); shell = "/bin/Shell"_string;
Vector<StringView> arguments; Vector<StringView> arguments;
arguments.append(shell); arguments.append(shell);
@ -193,8 +193,8 @@ static ErrorOr<NonnullRefPtr<GUI::Window>> create_find_window(VT::TerminalWidget
find_forwards->click(); find_forwards->click();
}; };
auto match_case = TRY(main_widget->try_add<GUI::CheckBox>(TRY("Case sensitive"_string))); auto match_case = TRY(main_widget->try_add<GUI::CheckBox>("Case sensitive"_string));
auto wrap_around = TRY(main_widget->try_add<GUI::CheckBox>(TRY("Wrap around"_string))); auto wrap_around = TRY(main_widget->try_add<GUI::CheckBox>("Wrap around"_string));
find_backwards->on_click = [&terminal, find_textbox, match_case, wrap_around](auto) { find_backwards->on_click = [&terminal, find_textbox, match_case, wrap_around](auto) {
auto needle = find_textbox->text(); auto needle = find_textbox->text();
@ -363,14 +363,14 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Optional<String> close_message; Optional<String> close_message;
auto title = "Running Process"sv; auto title = "Running Process"sv;
if (tty_has_foreground_process()) { if (tty_has_foreground_process()) {
close_message = "Close Terminal and kill its foreground process?"_string.release_value_but_fixme_should_propagate_errors(); close_message = "Close Terminal and kill its foreground process?"_string;
} else { } else {
auto child_process_count = shell_child_process_count(); auto child_process_count = shell_child_process_count();
if (child_process_count > 1) { if (child_process_count > 1) {
title = "Running Processes"sv; title = "Running Processes"sv;
close_message = String::formatted("Close Terminal and kill its {} background processes?", child_process_count).release_value_but_fixme_should_propagate_errors(); close_message = String::formatted("Close Terminal and kill its {} background processes?", child_process_count).release_value_but_fixme_should_propagate_errors();
} else if (child_process_count == 1) { } else if (child_process_count == 1) {
close_message = "Close Terminal and kill its background process?"_string.release_value_but_fixme_should_propagate_errors(); close_message = "Close Terminal and kill its background process?"_string;
} }
} }
if (close_message.has_value()) if (close_message.has_value())

View file

@ -33,7 +33,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto window = TRY(GUI::SettingsWindow::create("Terminal Settings")); auto window = TRY(GUI::SettingsWindow::create("Terminal Settings"));
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
(void)TRY(window->add_tab<TerminalSettingsViewWidget>("View"_short_string, "view"sv)); (void)TRY(window->add_tab<TerminalSettingsViewWidget>("View"_short_string, "view"sv));
(void)TRY(window->add_tab<TerminalSettingsMainWidget>(TRY("Terminal"_string), "terminal"sv)); (void)TRY(window->add_tab<TerminalSettingsMainWidget>("Terminal"_string, "terminal"sv));
window->set_active_tab(selected_tab); window->set_active_tab(selected_tab);
window->show(); window->show();

View file

@ -317,7 +317,7 @@ MainWidget::MainWidget()
Desktop::Launcher::open(URL::create_with_file_scheme(lexical_path.dirname(), lexical_path.basename())); Desktop::Launcher::open(URL::create_with_file_scheme(lexical_path.dirname(), lexical_path.basename()));
}); });
m_open_folder_action->set_enabled(!m_path.is_empty()); m_open_folder_action->set_enabled(!m_path.is_empty());
m_open_folder_action->set_status_tip("Open the current file location in File Manager"_string.release_value_but_fixme_should_propagate_errors()); m_open_folder_action->set_status_tip("Open the current file location in File Manager"_string);
m_toolbar->add_action(*m_new_action); m_toolbar->add_action(*m_new_action);
m_toolbar->add_action(*m_open_action); m_toolbar->add_action(*m_open_action);
@ -481,7 +481,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
TRY(view_menu->try_add_separator()); TRY(view_menu->try_add_separator());
m_wrapping_mode_actions.set_exclusive(true); m_wrapping_mode_actions.set_exclusive(true);
auto wrapping_mode_menu = TRY(view_menu->try_add_submenu(TRY("&Wrapping Mode"_string))); auto wrapping_mode_menu = TRY(view_menu->try_add_submenu("&Wrapping Mode"_string));
m_no_wrapping_action = GUI::Action::create_checkable("&No Wrapping", [&](auto&) { m_no_wrapping_action = GUI::Action::create_checkable("&No Wrapping", [&](auto&) {
m_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap); m_editor->set_wrapping_mode(GUI::TextEditor::WrappingMode::NoWrap);
Config::write_string("TextEditor"sv, "View"sv, "WrappingMode"sv, "None"sv); Config::write_string("TextEditor"sv, "View"sv, "WrappingMode"sv, "None"sv);
@ -516,7 +516,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
} }
m_soft_tab_width_actions.set_exclusive(true); m_soft_tab_width_actions.set_exclusive(true);
auto soft_tab_width_menu = TRY(view_menu->try_add_submenu(TRY("&Tab Width"_string))); auto soft_tab_width_menu = TRY(view_menu->try_add_submenu("&Tab Width"_string));
m_soft_tab_1_width_action = GUI::Action::create_checkable("1", [&](auto&) { m_soft_tab_1_width_action = GUI::Action::create_checkable("1", [&](auto&) {
m_editor->set_soft_tab_width(1); m_editor->set_soft_tab_width(1);
}); });
@ -557,8 +557,8 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}); });
m_visualize_trailing_whitespace_action->set_checked(true); m_visualize_trailing_whitespace_action->set_checked(true);
m_visualize_trailing_whitespace_action->set_status_tip(TRY("Visualize trailing whitespace"_string)); m_visualize_trailing_whitespace_action->set_status_tip("Visualize trailing whitespace"_string);
m_visualize_leading_whitespace_action->set_status_tip(TRY("Visualize leading whitespace"_string)); m_visualize_leading_whitespace_action->set_status_tip("Visualize leading whitespace"_string);
TRY(view_menu->try_add_action(*m_visualize_trailing_whitespace_action)); TRY(view_menu->try_add_action(*m_visualize_trailing_whitespace_action));
TRY(view_menu->try_add_action(*m_visualize_leading_whitespace_action)); TRY(view_menu->try_add_action(*m_visualize_leading_whitespace_action));
@ -568,7 +568,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}); });
m_cursor_line_highlighting_action->set_checked(true); m_cursor_line_highlighting_action->set_checked(true);
m_cursor_line_highlighting_action->set_status_tip(TRY("Highlight the current line"_string)); m_cursor_line_highlighting_action->set_status_tip("Highlight the current line"_string);
TRY(view_menu->try_add_action(*m_cursor_line_highlighting_action)); TRY(view_menu->try_add_action(*m_cursor_line_highlighting_action));
@ -581,7 +581,7 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
m_relative_line_number_action->set_checked(show_relative_line_number); m_relative_line_number_action->set_checked(show_relative_line_number);
m_editor->set_relative_line_number(show_relative_line_number); m_editor->set_relative_line_number(show_relative_line_number);
m_relative_line_number_action->set_status_tip(TRY("Set relative line number"_string)); m_relative_line_number_action->set_status_tip("Set relative line number"_string);
TRY(view_menu->try_add_action(*m_relative_line_number_action)); TRY(view_menu->try_add_action(*m_relative_line_number_action));
@ -596,12 +596,12 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
auto syntax_menu = TRY(view_menu->try_add_submenu("&Syntax"_short_string)); auto syntax_menu = TRY(view_menu->try_add_submenu("&Syntax"_short_string));
m_plain_text_highlight = GUI::Action::create_checkable("&Plain Text", [&](auto&) { m_plain_text_highlight = GUI::Action::create_checkable("&Plain Text", [&](auto&) {
m_statusbar->set_text(1, "Plain Text"_string.release_value_but_fixme_should_propagate_errors()); m_statusbar->set_text(1, "Plain Text"_string);
m_editor->set_syntax_highlighter({}); m_editor->set_syntax_highlighter({});
m_editor->update(); m_editor->update();
}); });
m_plain_text_highlight->set_checked(true); m_plain_text_highlight->set_checked(true);
m_statusbar->set_text(1, TRY("Plain Text"_string)); m_statusbar->set_text(1, "Plain Text"_string);
syntax_actions.add_action(*m_plain_text_highlight); syntax_actions.add_action(*m_plain_text_highlight);
TRY(syntax_menu->try_add_action(*m_plain_text_highlight)); TRY(syntax_menu->try_add_action(*m_plain_text_highlight));
@ -696,12 +696,12 @@ ErrorOr<void> MainWidget::initialize_menubar(GUI::Window& window)
}))); })));
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Text Editor", GUI::Icon::default_icon("app-text-editor"sv), &window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Text Editor", GUI::Icon::default_icon("app-text-editor"sv), &window)));
auto wrapping_statusbar_menu = TRY(m_line_column_statusbar_menu->try_add_submenu(TRY("&Wrapping Mode"_string))); auto wrapping_statusbar_menu = TRY(m_line_column_statusbar_menu->try_add_submenu("&Wrapping Mode"_string));
TRY(wrapping_statusbar_menu->try_add_action(*m_no_wrapping_action)); TRY(wrapping_statusbar_menu->try_add_action(*m_no_wrapping_action));
TRY(wrapping_statusbar_menu->try_add_action(*m_wrap_anywhere_action)); TRY(wrapping_statusbar_menu->try_add_action(*m_wrap_anywhere_action));
TRY(wrapping_statusbar_menu->try_add_action(*m_wrap_at_words_action)); TRY(wrapping_statusbar_menu->try_add_action(*m_wrap_at_words_action));
auto tab_width_statusbar_menu = TRY(m_line_column_statusbar_menu->try_add_submenu(TRY("&Tab Width"_string))); auto tab_width_statusbar_menu = TRY(m_line_column_statusbar_menu->try_add_submenu("&Tab Width"_string));
TRY(tab_width_statusbar_menu->try_add_action(*m_soft_tab_1_width_action)); TRY(tab_width_statusbar_menu->try_add_action(*m_soft_tab_1_width_action));
TRY(tab_width_statusbar_menu->try_add_action(*m_soft_tab_2_width_action)); TRY(tab_width_statusbar_menu->try_add_action(*m_soft_tab_2_width_action));
TRY(tab_width_statusbar_menu->try_add_action(*m_soft_tab_4_width_action)); TRY(tab_width_statusbar_menu->try_add_action(*m_soft_tab_4_width_action));

View file

@ -24,7 +24,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Config::pledge_domain("TextEditor"); Config::pledge_domain("TextEditor");
app->set_config_domain(TRY("TextEditor"_string)); app->set_config_domain("TextEditor"_string);
auto preview_mode = "auto"sv; auto preview_mode = "auto"sv;
StringView file_to_edit; StringView file_to_edit;

View file

@ -29,7 +29,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app = TRY(GUI::Application::create(arguments)); auto app = TRY(GUI::Application::create(arguments));
Config::pledge_domain("ThemeEditor"); Config::pledge_domain("ThemeEditor");
app->set_config_domain(TRY("ThemeEditor"_string)); app->set_config_domain("ThemeEditor"_string);
StringView file_to_edit; StringView file_to_edit;

View file

@ -399,7 +399,7 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
}))); })));
// Playback menu // Playback menu
auto playback_menu = TRY(window.try_add_menu(TRY("&Playback"_string))); auto playback_menu = TRY(window.try_add_menu("&Playback"_string));
// FIXME: Maybe seek mode should be in an options dialog instead. The playback menu may get crowded. // FIXME: Maybe seek mode should be in an options dialog instead. The playback menu may get crowded.
// For now, leave it here for convenience. // For now, leave it here for convenience.
@ -411,7 +411,7 @@ ErrorOr<void> VideoPlayerWidget::initialize_menubar(GUI::Window& window)
auto view_menu = TRY(window.try_add_menu("&View"_short_string)); auto view_menu = TRY(window.try_add_menu("&View"_short_string));
TRY(view_menu->try_add_action(*m_toggle_fullscreen_action)); TRY(view_menu->try_add_action(*m_toggle_fullscreen_action));
auto sizing_mode_menu = TRY(view_menu->try_add_submenu(TRY("&Sizing Mode"_string))); auto sizing_mode_menu = TRY(view_menu->try_add_submenu("&Sizing Mode"_string));
sizing_mode_menu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/fit-image-to-view.png"sv))); sizing_mode_menu->set_icon(TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/fit-image-to-view.png"sv)));
m_sizing_mode_group = make<GUI::ActionGroup>(); m_sizing_mode_group = make<GUI::ActionGroup>();

View file

@ -24,7 +24,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Config::pledge_domain("VideoPlayer"); Config::pledge_domain("VideoPlayer");
auto app = TRY(GUI::Application::create(arguments)); auto app = TRY(GUI::Application::create(arguments));
app->set_config_domain(TRY("VideoPlayer"_string)); app->set_config_domain("VideoPlayer"_string);
auto window = TRY(GUI::Window::try_create()); auto window = TRY(GUI::Window::try_create());
window->resize(640, 480); window->resize(640, 480);

View file

@ -24,7 +24,7 @@ GalleryWidget::GalleryWidget()
ErrorOr<void> GalleryWidget::load_basic_model_tab() ErrorOr<void> GalleryWidget::load_basic_model_tab()
{ {
auto tab = TRY(m_tab_widget->try_add_tab<GUI::Widget>(TRY("Basic Model"_string))); auto tab = TRY(m_tab_widget->try_add_tab<GUI::Widget>("Basic Model"_string));
TRY(tab->load_from_gml(basic_model_tab_gml)); TRY(tab->load_from_gml(basic_model_tab_gml));
m_basic_model = BasicModel::create(); m_basic_model = BasicModel::create();

View file

@ -24,7 +24,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto app = TRY(GUI::Application::create(arguments)); auto app = TRY(GUI::Application::create(arguments));
Config::pledge_domains({ "GMLPlayground", "Calendar" }); Config::pledge_domains({ "GMLPlayground", "Calendar" });
app->set_config_domain(TRY("GMLPlayground"_string)); app->set_config_domain("GMLPlayground"_string);
TRY(Core::System::unveil("/res", "r")); TRY(Core::System::unveil("/res", "r"));
TRY(Core::System::unveil("/tmp/session/%sid/portal/launch", "rw")); TRY(Core::System::unveil("/tmp/session/%sid/portal/launch", "rw"));

View file

@ -148,7 +148,7 @@ RefPtr<GUI::Menu> DebugInfoWidget::get_context_menu_for_variable(const GUI::Mode
NonnullRefPtr<GUI::Widget> DebugInfoWidget::build_variables_tab() NonnullRefPtr<GUI::Widget> DebugInfoWidget::build_variables_tab()
{ {
auto variables_widget = GUI::Widget::construct(); auto variables_widget = GUI::Widget::construct();
variables_widget->set_title("Variables"_string.release_value_but_fixme_should_propagate_errors()); variables_widget->set_title("Variables"_string);
variables_widget->set_layout<GUI::HorizontalBoxLayout>(); variables_widget->set_layout<GUI::HorizontalBoxLayout>();
m_variables_view = variables_widget->add<GUI::TreeView>(); m_variables_view = variables_widget->add<GUI::TreeView>();
@ -165,7 +165,7 @@ NonnullRefPtr<GUI::Widget> DebugInfoWidget::build_variables_tab()
NonnullRefPtr<GUI::Widget> DebugInfoWidget::build_registers_tab() NonnullRefPtr<GUI::Widget> DebugInfoWidget::build_registers_tab()
{ {
auto registers_widget = GUI::Widget::construct(); auto registers_widget = GUI::Widget::construct();
registers_widget->set_title("Registers"_string.release_value_but_fixme_should_propagate_errors()); registers_widget->set_title("Registers"_string);
registers_widget->set_layout<GUI::HorizontalBoxLayout>(); registers_widget->set_layout<GUI::HorizontalBoxLayout>();
m_registers_view = registers_widget->add<GUI::TableView>(); m_registers_view = registers_widget->add<GUI::TableView>();

View file

@ -79,9 +79,9 @@ ErrorOr<String> DisassemblyModel::column_name(int column) const
case Column::Address: case Column::Address:
return "Address"_short_string; return "Address"_short_string;
case Column::InstructionBytes: case Column::InstructionBytes:
return TRY("Insn Bytes"_string); return "Insn Bytes"_string;
case Column::Disassembly: case Column::Disassembly:
return TRY("Disassembly"_string); return "Disassembly"_string;
default: default:
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }

View file

@ -51,7 +51,7 @@ void DisassemblyWidget::update_state(Debug::DebugSession const& debug_session, P
if (containing_function.has_value()) if (containing_function.has_value())
m_function_name_label->set_text(String::from_deprecated_string(containing_function.value().name).release_value_but_fixme_should_propagate_errors()); m_function_name_label->set_text(String::from_deprecated_string(containing_function.value().name).release_value_but_fixme_should_propagate_errors());
else else
m_function_name_label->set_text("<missing>"_string.release_value_but_fixme_should_propagate_errors()); m_function_name_label->set_text("<missing>"_string);
show_disassembly(); show_disassembly();
} else { } else {
hide_disassembly("No disassembly to show for this function"); hide_disassembly("No disassembly to show for this function");

View file

@ -90,7 +90,7 @@ ErrorOr<String> RegistersModel::column_name(int column) const
{ {
switch (column) { switch (column) {
case Column::Register: case Column::Register:
return TRY("Register"_string); return "Register"_string;
case Column::Value: case Column::Value:
return "Value"_short_string; return "Value"_short_string;
default: default:

Some files were not shown because too many files have changed in this diff Show more