RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 15:37:46 +00:00
Code Issues Activity Actions

Base+Userland: Apply Human Interface Guidelines to Object text

Browse source 
Corrects a slew of titles, buttons, labels, menu items and status bars
for capitalization, ellipses and punctuation.

Rewords a few actions and dialogs to use uniform language and
punctuation.
This commit is contained in:
thankyouverycool 2023-05-22 13:07:09 -04:00 • committed by Andreas Kling
parent 024360e604
commit 02d94a303c
77 changed files with 195 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Games/2048/GameSizeDialog.gml
View file

@ -10,7 +10,7 @@
}
@GUI::Label {
text: "Board size"
text: "Board size:"
text_alignment: "CenterLeft"
}
@ -27,7 +27,7 @@
}
@GUI::Label {
text: "Target tile"
text: "Target tile:"
text_alignment: "CenterLeft"
}

4
Userland/Games/Flood/SettingsDialog.gml
View file

@ -10,7 +10,7 @@
}
@GUI::Label {
text: "Board rows"
text: "Board rows:"
text_alignment: "CenterLeft"
}
@ -27,7 +27,7 @@
}
@GUI::Label {
text: "Board columns"
text: "Board columns:"
text_alignment: "CenterLeft"
}

2
Userland/Games/GameOfLife/GameOfLife.gml
View file

@ -34,7 +34,7 @@
@GUI::VerticalSeparator {}
@GUI::Label {
text: "Update Speed: "
text: "Speed: "
autosize: true
}

4
Userland/Games/GameOfLife/main.cpp
View file

@ -50,7 +50,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
size_t board_rows = 35;
window->set_double_buffering_enabled(false);
window->set_title("Game Of Life");
window->set_title("Game of Life");
auto main_widget = TRY(window->set_main_widget<GUI::Widget>());
TRY(main_widget->load_from_gml(game_of_life_gml));
@ -143,7 +143,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) {
Desktop::Launcher::open(URL::create_with_file_scheme("/usr/share/man/man6/GameOfLife.md"), "/bin/Help");
})));
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Game Of Life", app_icon, window)));
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Game of Life", app_icon, window)));
board_widget->on_running_state_change = [&]() {
if (board_widget->is_running()) {

2
Userland/Games/Hearts/main.cpp
View file

@ -95,7 +95,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
})));
TRY(game_menu->try_add_separator());
TRY(game_menu->try_add_action(TRY(Cards::make_cards_settings_action(window))));
TRY(game_menu->try_add_action(GUI::Action::create("Hearts &Settings", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/settings.png"sv)), [&](auto&) {
TRY(game_menu->try_add_action(GUI::Action::create("&Settings", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/settings.png"sv)), [&](auto&) {
change_settings();
})));
TRY(game_menu->try_add_separator());

6
Userland/Games/MasterWord/main.cpp
View file

@ -75,7 +75,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(settings_menu->try_add_action(GUI::Action::create("Set &Word Length...", [&](auto&) {
auto word_length = Config::read_i32("MasterWord"sv, ""sv, "word_length"sv, 5);
auto result = GUI::InputBox::show_numeric(window, word_length, shortest_word, longest_word, "Word length"sv);
auto result = GUI::InputBox::show_numeric(window, word_length, shortest_word, longest_word, "Word Length"sv);
if (!result.is_error() && result.value() == GUI::InputBox::ExecResult::OK) {
Config::write_i32("MasterWord"sv, ""sv, "word_length"sv, word_length);
game.set_word_length(word_length);
@ -83,14 +83,14 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
})));
TRY(settings_menu->try_add_action(GUI::Action::create("Set &Number of Guesses...", [&](auto&) {
auto max_guesses = Config::read_i32("MasterWord"sv, ""sv, "max_guesses"sv, 5);
auto result = GUI::InputBox::show_numeric(window, max_guesses, 1, 20, "Number of guesses"sv);
auto result = GUI::InputBox::show_numeric(window, max_guesses, 1, 20, "Number of Guesses"sv);
if (!result.is_error() && result.value() == GUI::InputBox::ExecResult::OK) {
Config::write_i32("MasterWord"sv, ""sv, "max_guesses"sv, max_guesses);
game.set_max_guesses(max_guesses);
}
})));
auto toggle_check_guesses = GUI::Action::create_checkable("Check &Guesses in dictionary", [&](auto& action) {
auto toggle_check_guesses = GUI::Action::create_checkable("Check &Guesses in Dictionary", [&](auto& action) {
auto checked = action.is_checked();
game.set_check_guesses_in_dictionary(checked);
Config::write_bool("MasterWord"sv, ""sv, "check_guesses_in_dictionary"sv, checked);

2
Userland/Games/Minesweeper/CustomGameDialog.cpp
View file

@ -43,7 +43,7 @@ CustomGameDialog::CustomGameDialog(Window* parent_window)
{
resize(300, 82);
set_resizable(false);
set_title("Custom game");
set_title("Custom Game");
auto main_widget = set_main_widget<GUI::Widget>().release_value_but_fixme_should_propagate_errors();
main_widget->load_from_gml(minesweeper_custom_game_window_gml).release_value_but_fixme_should_propagate_errors();

4
Userland/Games/Minesweeper/main.cpp
View file

@ -66,7 +66,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(game_menu->try_add_separator());
auto chord_toggler_action = GUI::Action::create_checkable("Single-click chording", [&](auto& action) {
auto chord_toggler_action = GUI::Action::create_checkable("&Single-click Chording", [&](auto& action) {
field->set_single_chording(action.is_checked());
});
chord_toggler_action->set_checked(field->is_single_chording());
@ -111,7 +111,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
difficulty_actions.add_action(action);
TRY(difficulty_menu->try_add_separator());
action = GUI::Action::create_checkable("&Custom game...", { Mod_Ctrl, Key_C }, [&](auto&) {
action = GUI::Action::create_checkable("&Custom Game...", { Mod_Ctrl, Key_C }, [&](auto&) {
CustomGameDialog::show(window, field);
});
action->set_checked(field->difficulty() == Field::Difficulty::Custom);

2
Userland/Games/Snake/main.cpp
View file

@ -98,7 +98,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
}
})));
auto change_snake_color = GUI::Action::create("&Change snake color", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/color-chooser.png"sv)), [&](auto&) {
auto change_snake_color = GUI::Action::create("&Change Snake Color", TRY(Gfx::Bitmap::load_from_file("/res/icons/16x16/color-chooser.png"sv)), [&](auto&) {
auto was_paused = game.is_paused();
if (!was_paused)
game.pause();