diff options
author | Andreas Kling <kling@serenityos.org> | 2021-05-14 18:34:44 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-05-14 18:34:44 +0200 |
commit | 58d73ea36c84c397d51286df0139c9840639c8cf (patch) | |
tree | c9da5591115485ed72acc57a57016b7d8b30155a /Userland | |
parent | d039542c7c022954ca305a79b379c076900de3d7 (diff) | |
download | serenity-58d73ea36c84c397d51286df0139c9840639c8cf.zip |
Userland: Rename QuickShow => Image Viewer
The old name was a bit too ambiguous. This one is crystal clear. :^)
Diffstat (limited to 'Userland')
-rw-r--r-- | Userland/Applications/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Userland/Applications/ImageViewer/CMakeLists.txt | 7 | ||||
-rw-r--r-- | Userland/Applications/ImageViewer/QSWidget.cpp (renamed from Userland/Applications/QuickShow/QSWidget.cpp) | 0 | ||||
-rw-r--r-- | Userland/Applications/ImageViewer/QSWidget.h (renamed from Userland/Applications/QuickShow/QSWidget.h) | 0 | ||||
-rw-r--r-- | Userland/Applications/ImageViewer/main.cpp (renamed from Userland/Applications/QuickShow/main.cpp) | 16 | ||||
-rw-r--r-- | Userland/Applications/QuickShow/CMakeLists.txt | 7 |
6 files changed, 16 insertions, 16 deletions
diff --git a/Userland/Applications/CMakeLists.txt b/Userland/Applications/CMakeLists.txt index c3c07f5abd..8e4af34454 100644 --- a/Userland/Applications/CMakeLists.txt +++ b/Userland/Applications/CMakeLists.txt @@ -11,13 +11,13 @@ add_subdirectory(FontEditor) add_subdirectory(Help) add_subdirectory(HexEditor) add_subdirectory(IRCClient) +add_subdirectory(ImageViewer) add_subdirectory(KeyboardMapper) add_subdirectory(KeyboardSettings) add_subdirectory(Magnifier) add_subdirectory(MouseSettings) add_subdirectory(Piano) add_subdirectory(PixelPaint) -add_subdirectory(QuickShow) add_subdirectory(Run) add_subdirectory(SoundPlayer) add_subdirectory(SpaceAnalyzer) diff --git a/Userland/Applications/ImageViewer/CMakeLists.txt b/Userland/Applications/ImageViewer/CMakeLists.txt new file mode 100644 index 0000000000..75112aca7d --- /dev/null +++ b/Userland/Applications/ImageViewer/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SOURCES + main.cpp + QSWidget.cpp +) + +serenity_app(ImageViewer ICON filetype-image) +target_link_libraries(ImageViewer LibDesktop LibGUI LibGfx) diff --git a/Userland/Applications/QuickShow/QSWidget.cpp b/Userland/Applications/ImageViewer/QSWidget.cpp index 969a93ed45..969a93ed45 100644 --- a/Userland/Applications/QuickShow/QSWidget.cpp +++ b/Userland/Applications/ImageViewer/QSWidget.cpp diff --git a/Userland/Applications/QuickShow/QSWidget.h b/Userland/Applications/ImageViewer/QSWidget.h index 7c343ae209..7c343ae209 100644 --- a/Userland/Applications/QuickShow/QSWidget.h +++ b/Userland/Applications/ImageViewer/QSWidget.h diff --git a/Userland/Applications/QuickShow/main.cpp b/Userland/Applications/ImageViewer/main.cpp index 0532d2c980..8a30dda706 100644 --- a/Userland/Applications/QuickShow/main.cpp +++ b/Userland/Applications/ImageViewer/main.cpp @@ -38,13 +38,13 @@ int main(int argc, char** argv) auto app = GUI::Application::construct(argc, argv); - if (!Desktop::Launcher::add_allowed_handler_with_any_url("/bin/QuickShow")) { + if (!Desktop::Launcher::add_allowed_handler_with_any_url("/bin/ImageViewer")) { warnln("Failed to set up allowed launch URLs"); return 1; } if (!Desktop::Launcher::add_allowed_handler_with_only_specific_urls( - "/bin/Help", { URL::create_with_file_protocol("/usr/share/man/man1/QuickShow.md") })) { + "/bin/Help", { URL::create_with_file_protocol("/usr/share/man/man1/ImageViewer.md") })) { warnln("Failed to set up allowed launch URLs"); return 1; } @@ -65,7 +65,7 @@ int main(int argc, char** argv) window->set_double_buffering_enabled(true); window->resize(300, 200); window->set_icon(app_icon.bitmap_for_size(16)); - window->set_title("QuickShow"); + window->set_title("Image Viewer"); auto& root_widget = window->set_main_widget<GUI::Widget>(); root_widget.set_fill_with_background_color(true); @@ -78,11 +78,11 @@ int main(int argc, char** argv) auto& widget = root_widget.add<QSWidget>(); widget.on_scale_change = [&](int scale, Gfx::IntRect rect) { if (!widget.bitmap()) { - window->set_title("QuickShow"); + window->set_title("Image Viewer"); return; } - window->set_title(String::formatted("{} {} {}% - QuickShow", widget.path(), widget.bitmap()->size().to_string(), scale)); + window->set_title(String::formatted("{} {} {}% - Image Viewer", widget.path(), widget.bitmap()->size().to_string(), scale)); if (window->is_fullscreen()) return; @@ -108,7 +108,7 @@ int main(int argc, char** argv) widget.load_from_file(urls.first().path()); for (size_t i = 1; i < urls.size(); ++i) { - Desktop::Launcher::open(URL::create_with_file_protocol(urls[i].path().characters()), "/bin/QuickShow"); + Desktop::Launcher::open(URL::create_with_file_protocol(urls[i].path().characters()), "/bin/ImageViewer"); } }; widget.on_doubleclick = [&] { @@ -278,9 +278,9 @@ int main(int argc, char** argv) auto& help_menu = menubar->add_menu("&Help"); help_menu.add_action(GUI::CommonActions::make_help_action([](auto&) { - Desktop::Launcher::open(URL::create_with_file_protocol("/usr/share/man/man1/QuickShow.md"), "/bin/Help"); + Desktop::Launcher::open(URL::create_with_file_protocol("/usr/share/man/man1/ImageViewer.md"), "/bin/Help"); })); - help_menu.add_action(GUI::CommonActions::make_about_action("QuickShow", app_icon, window)); + help_menu.add_action(GUI::CommonActions::make_about_action("Image Viewer", app_icon, window)); window->set_menubar(move(menubar)); diff --git a/Userland/Applications/QuickShow/CMakeLists.txt b/Userland/Applications/QuickShow/CMakeLists.txt deleted file mode 100644 index 7fa51f67d8..0000000000 --- a/Userland/Applications/QuickShow/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -set(SOURCES - main.cpp - QSWidget.cpp -) - -serenity_app(QuickShow ICON filetype-image) -target_link_libraries(QuickShow LibDesktop LibGUI LibGfx) |