mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 18:37:35 +00:00
LibGUI+Userland: Port StatusBar::text() and set_text functions to String
This commit is contained in:
parent
2064f544c6
commit
2029750519
27 changed files with 88 additions and 88 deletions
|
@ -164,7 +164,7 @@ ErrorOr<void> MainWidget::setup()
|
|||
return;
|
||||
|
||||
m_run_script_action->set_enabled(false);
|
||||
m_statusbar->set_text(1, "Disconnected"sv);
|
||||
m_statusbar->set_text(1, "Disconnected"_string.release_value_but_fixme_should_propagate_errors());
|
||||
|
||||
if (m_connection_id.has_value()) {
|
||||
m_sql_client->disconnect(*m_connection_id);
|
||||
|
@ -172,7 +172,7 @@ ErrorOr<void> MainWidget::setup()
|
|||
}
|
||||
|
||||
if (auto connection_id = m_sql_client->connect(database_name); connection_id.has_value()) {
|
||||
m_statusbar->set_text(1, DeprecatedString::formatted("Connected to: {}", database_name));
|
||||
m_statusbar->set_text(1, String::formatted("Connected to: {}", database_name).release_value_but_fixme_should_propagate_errors());
|
||||
m_connection_id = *connection_id;
|
||||
m_run_script_action->set_enabled(true);
|
||||
} else {
|
||||
|
@ -245,7 +245,7 @@ ErrorOr<void> MainWidget::setup()
|
|||
|
||||
m_statusbar = find_descendant_of_type_named<GUI::Statusbar>("statusbar"sv);
|
||||
m_statusbar->segment(1).set_mode(GUI::Statusbar::Segment::Mode::Auto);
|
||||
m_statusbar->set_text(1, "Disconnected"sv);
|
||||
m_statusbar->set_text(1, TRY("Disconnected"_string));
|
||||
m_statusbar->segment(2).set_mode(GUI::Statusbar::Segment::Mode::Fixed);
|
||||
m_statusbar->segment(2).set_fixed_width(font().width("Ln 0,000 Col 000"sv) + font().max_glyph_width());
|
||||
|
||||
|
@ -425,8 +425,8 @@ void MainWidget::on_editor_change()
|
|||
void MainWidget::update_statusbar(ScriptEditor* editor)
|
||||
{
|
||||
if (!editor) {
|
||||
m_statusbar->set_text(0, "");
|
||||
m_statusbar->set_text(2, "");
|
||||
m_statusbar->set_text(0, {});
|
||||
m_statusbar->set_text(2, {});
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -437,8 +437,8 @@ void MainWidget::update_statusbar(ScriptEditor* editor)
|
|||
builder.appendff("Selected: {:'d} {} ({:'d} {})", character_count, character_count == 1 ? "character" : "characters", word_count, word_count != 1 ? "words" : "word");
|
||||
}
|
||||
|
||||
m_statusbar->set_text(0, builder.to_deprecated_string());
|
||||
m_statusbar->set_text(2, DeprecatedString::formatted("Ln {:'d} Col {:'d}", editor->cursor().line() + 1, editor->cursor().column()));
|
||||
m_statusbar->set_text(0, builder.to_string().release_value_but_fixme_should_propagate_errors());
|
||||
m_statusbar->set_text(2, String::formatted("Ln {:'d} Col {:'d}", editor->cursor().line() + 1, editor->cursor().column()).release_value_but_fixme_should_propagate_errors());
|
||||
}
|
||||
|
||||
void MainWidget::update_editor_actions(ScriptEditor* editor)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue