RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-30 23:48:11 +00:00
Code Issues Activity Actions

QuickShow: Use new format functions.

Browse source
This commit is contained in:
asynts 2020-10-06 14:32:29 +02:00 • committed by Andreas Kling
parent 0b29c5e41d
commit 97660ad46c
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Applications/QuickShow/QSWidget.cpp
View file

@ -98,14 +98,14 @@ void QSWidget::navigate(Directions direction)
size_t index = current_index.value(); size_t index = current_index.value();
if (direction == Directions::Back) { if (direction == Directions::Back) {
if (index == 0) { if (index == 0) {
GUI::MessageBox::show(window(), String::format("This is the first file.", index), "Cannot open image", GUI::MessageBox::Type::Error); GUI::MessageBox::show(window(), "This is the first file.", "Cannot open image", GUI::MessageBox::Type::Error);
return; return;
} }
index--; index--;
} else if (direction == Directions::Forward) { } else if (direction == Directions::Forward) {
if (index == m_files_in_same_dir.size() - 1) { if (index == m_files_in_same_dir.size() - 1) {
GUI::MessageBox::show(window(), String::format("This is the last file.", index), "Cannot open image", GUI::MessageBox::Type::Error); GUI::MessageBox::show(window(), "This is the last file.", "Cannot open image", GUI::MessageBox::Type::Error);
return; return;
} }
@ -249,7 +249,7 @@ void QSWidget::load_from_file(const String& path)
{ {
auto bitmap = Gfx::Bitmap::load_from_file(path); auto bitmap = Gfx::Bitmap::load_from_file(path);
if (!bitmap) { if (!bitmap) {
GUI::MessageBox::show(window(), String::format("Failed to open %s", path.characters()), "Cannot open image", GUI::MessageBox::Type::Error); GUI::MessageBox::show(window(), String::formatted("Failed to open {}", path), "Cannot open image", GUI::MessageBox::Type::Error);
return; return;
} }

8
Applications/QuickShow/main.cpp
View file

@ -90,7 +90,7 @@ int main(int argc, char** argv)
return; return;
} }
window->set_title(String::format("%s %s %d%% - QuickShow", widget.path().characters(), widget.bitmap()->size().to_string().characters(), scale)); window->set_title(String::formatted("{} {} {}% - QuickShow", widget.path(), widget.bitmap()->size().to_string(), scale));
if (window->is_fullscreen()) if (window->is_fullscreen())
return; return;
@ -146,7 +146,7 @@ int main(int argc, char** argv)
return; return;
auto msgbox_result = GUI::MessageBox::show(window, auto msgbox_result = GUI::MessageBox::show(window,
String::format("Really delete %s?", path.characters()), String::formatted("Really delete {}?", path),
"Confirm deletion", "Confirm deletion",
GUI::MessageBox::Type::Warning, GUI::MessageBox::Type::Warning,
GUI::MessageBox::InputType::OKCancel); GUI::MessageBox::InputType::OKCancel);
@ -155,12 +155,12 @@ int main(int argc, char** argv)
return; return;
auto unlink_result = unlink(widget.path().characters()); auto unlink_result = unlink(widget.path().characters());
dbg() << "unlink_result::" << unlink_result; dbgln("unlink_result::{}", unlink_result);
if (unlink_result < 0) { if (unlink_result < 0) {
int saved_errno = errno; int saved_errno = errno;
GUI::MessageBox::show(window, GUI::MessageBox::show(window,
String::format("unlink(%s) failed: %s", path.characters(), strerror(saved_errno)), String::formatted("unlink({}) failed: {}", path, strerror(saved_errno)),
"Delete failed", "Delete failed",
GUI::MessageBox::Type::Error); GUI::MessageBox::Type::Error);