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

LibGUI+Userland: Port Labels to String

Browse source
This commit is contained in:
thankyouverycool 2023-04-29 10:41:48 -04:00 • committed by Andreas Kling
parent 3d53dc8228
commit 91bafc2653
92 changed files with 240 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@ GameSizeDialog::GameSizeDialog(GUI::Window* parent, size_t board_size, size_t ta
board_size_spinbox->set_value(m_board_size);
auto tile_value_label = main_widget->find_descendant_of_type_named<GUI::Label>("tile_value_label");
tile_value_label->set_text(DeprecatedString::number(target_tile()));
tile_value_label->set_text(String::number(target_tile()).release_value_but_fixme_should_propagate_errors());
auto target_spinbox = main_widget->find_descendant_of_type_named<GUI::SpinBox>("target_spinbox");
target_spinbox->set_max(Game::max_power_for_board(m_board_size));
target_spinbox->set_value(m_target_tile_power);
@ -44,7 +44,7 @@ GameSizeDialog::GameSizeDialog(GUI::Window* parent, size_t board_size, size_t ta
target_spinbox->on_change = [this, tile_value_label](auto value) {
m_target_tile_power = value;
tile_value_label->set_text(DeprecatedString::number(target_tile()));
tile_value_label->set_text(String::number(target_tile()).release_value_but_fixme_should_propagate_errors());
};
auto evil_ai_checkbox = main_widget->find_descendant_of_type_named<GUI::CheckBox>("evil_ai_checkbox");

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

@ -27,7 +27,7 @@ SettingsDialog::SettingsDialog(GUI::Window* parent, DeprecatedString player_name
auto& name_box = main_widget->add<GUI::Widget>();
name_box.set_layout<GUI::HorizontalBoxLayout>(GUI::Margins {}, 4);
auto& name_label = name_box.add<GUI::Label>("Name:");
auto& name_label = name_box.add<GUI::Label>("Name:"_short_string);
name_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
auto& textbox = name_box.add<GUI::TextBox>();

10
Userland/Games/Minesweeper/Field.cpp
View file

@ -137,7 +137,7 @@ void Field::initialize()
m_timer = Core::Timer::create_repeating(
1000, [this] {
++m_time_elapsed;
m_time_label.set_text(human_readable_digital_time(m_time_elapsed));
m_time_label.set_text(String::from_deprecated_string(human_readable_digital_time(m_time_elapsed)).release_value_but_fixme_should_propagate_errors());
},
this)
.release_value_but_fixme_should_propagate_errors();
@ -213,9 +213,9 @@ void Field::reset()
m_first_click = true;
set_updates_enabled(false);
m_time_elapsed = 0;
m_time_label.set_text("00:00");
m_time_label.set_text("00:00"_short_string);
m_flags_left = m_mine_count;
m_flag_label.set_text(DeprecatedString::number(m_flags_left));
m_flag_label.set_text(String::number(m_flags_left).release_value_but_fixme_should_propagate_errors());
m_timer->stop();
set_greedy_for_hits(false);
set_face(Face::Default);
@ -461,7 +461,7 @@ void Field::set_flag(Square& square, bool flag)
}
square.has_flag = flag;
m_flag_label.set_text(DeprecatedString::number(m_flags_left));
m_flag_label.set_text(String::number(m_flags_left).release_value_but_fixme_should_propagate_errors());
square.button->set_icon(square.has_flag ? m_flag_bitmap : nullptr);
square.button->update();
}
@ -473,7 +473,7 @@ void Field::on_square_middle_clicked(Square& square)
if (square.has_flag) {
++m_flags_left;
square.has_flag = false;
m_flag_label.set_text(DeprecatedString::number(m_flags_left));
m_flag_label.set_text(String::number(m_flags_left).release_value_but_fixme_should_propagate_errors());
}
square.is_considering = !square.is_considering;
square.button->set_icon(square.is_considering ? m_consider_bitmap : nullptr);