From cc4bb59a7e551788a6af6ea89ddb9af8391b186e Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Tue, 28 Jun 2022 19:01:38 +0100 Subject: [PATCH] Playground: Rename the application to GMLPlayground Just "Playground" is too generic and doesn't match the general rule of "application name equals display name minus spaces". --- Base/home/anon/.config/LaunchServer.ini | 2 +- Base/res/apps/{Playground.af => GMLPlayground.af} | 2 +- .../{app-playground.png => app-gml-playground.png} | Bin .../{app-playground.png => app-gml-playground.png} | Bin .../man/man1/{Playground.md => GMLPlayground.md} | 10 +++++----- Base/usr/share/man/man5/GML-Introduction.md | 2 +- Documentation/FileFormats.md | 2 +- Documentation/HighDPI.md | 2 +- Userland/DevTools/CMakeLists.txt | 2 +- Userland/DevTools/GMLPlayground/CMakeLists.txt | 12 ++++++++++++ .../DevTools/{Playground => GMLPlayground}/main.cpp | 6 +++--- Userland/DevTools/Playground/CMakeLists.txt | 12 ------------ 12 files changed, 26 insertions(+), 26 deletions(-) rename Base/res/apps/{Playground.af => GMLPlayground.af} (70%) rename Base/res/icons/16x16/{app-playground.png => app-gml-playground.png} (100%) rename Base/res/icons/32x32/{app-playground.png => app-gml-playground.png} (100%) rename Base/usr/share/man/man1/{Playground.md => GMLPlayground.md} (63%) create mode 100644 Userland/DevTools/GMLPlayground/CMakeLists.txt rename Userland/DevTools/{Playground => GMLPlayground}/main.cpp (98%) delete mode 100644 Userland/DevTools/Playground/CMakeLists.txt diff --git a/Base/home/anon/.config/LaunchServer.ini b/Base/home/anon/.config/LaunchServer.ini index 64fb64f7e9e..c3a47576fcd 100644 --- a/Base/home/anon/.config/LaunchServer.ini +++ b/Base/home/anon/.config/LaunchServer.ini @@ -19,7 +19,7 @@ txt=/bin/TextEditor font=/bin/FontEditor sheets=/bin/Spreadsheet csv=/bin/Spreadsheet -gml=/bin/Playground +gml=/bin/GMLPlayground pdf=/bin/PDFViewer profile=/bin/Profiler pp=/bin/PixelPaint diff --git a/Base/res/apps/Playground.af b/Base/res/apps/GMLPlayground.af similarity index 70% rename from Base/res/apps/Playground.af rename to Base/res/apps/GMLPlayground.af index 5440a8c7db7..8791001f8cc 100644 --- a/Base/res/apps/Playground.af +++ b/Base/res/apps/GMLPlayground.af @@ -1,6 +1,6 @@ [App] Name=GML Playground -Executable=/bin/Playground +Executable=/bin/GMLPlayground Category=Development [Launcher] diff --git a/Base/res/icons/16x16/app-playground.png b/Base/res/icons/16x16/app-gml-playground.png similarity index 100% rename from Base/res/icons/16x16/app-playground.png rename to Base/res/icons/16x16/app-gml-playground.png diff --git a/Base/res/icons/32x32/app-playground.png b/Base/res/icons/32x32/app-gml-playground.png similarity index 100% rename from Base/res/icons/32x32/app-playground.png rename to Base/res/icons/32x32/app-gml-playground.png diff --git a/Base/usr/share/man/man1/Playground.md b/Base/usr/share/man/man1/GMLPlayground.md similarity index 63% rename from Base/usr/share/man/man1/Playground.md rename to Base/usr/share/man/man1/GMLPlayground.md index 05d9ff1a45b..ba8310e2a9c 100644 --- a/Base/usr/share/man/man1/Playground.md +++ b/Base/usr/share/man/man1/GMLPlayground.md @@ -1,13 +1,13 @@ ## Name -![Icon](/res/icons/16x16/app-playground.png) Playground - GUI Markup Language (GML) editor +![Icon](/res/icons/16x16/app-gml-playground.png) GML Playground - GUI Markup Language (GML) editor -[Open](file:///bin/Playground) +[Open](file:///bin/GMLPlayground) ## Synopsis ```**sh -$ Playground [file] +$ GMLPlayground [file] ``` ## Arguments @@ -16,7 +16,7 @@ $ Playground [file] ## Description -Playground facilitates development of graphical user interfaces (GUI) +GML Playground facilitates development of graphical user interfaces (GUI) for Serenity applications using GUI Markup Language (GML) to compose a layout for GUI widgets and set widget attributes. @@ -26,7 +26,7 @@ window, allowing rapid prototyping and development of application GUIs. ## Examples ```sh -$ Playground /home/anon/example.gml +$ GMLPlayground /home/anon/example.gml ``` ## See also diff --git a/Base/usr/share/man/man5/GML-Introduction.md b/Base/usr/share/man/man5/GML-Introduction.md index e41d85c16cb..2b2ceaaccad 100644 --- a/Base/usr/share/man/man5/GML-Introduction.md +++ b/Base/usr/share/man/man5/GML-Introduction.md @@ -19,7 +19,7 @@ Or right clicking on a folder in the TreeView and using ## See also - [gml-format(1)](help://man/1/gml-format) formats your GML files. -- [GML Playground(1)](help://man/1/Playground) is an interactive GML creation tool. +- [GML Playground(1)](help://man/1/GMLPlayground) is an interactive GML creation tool. ### List of GML manpages diff --git a/Documentation/FileFormats.md b/Documentation/FileFormats.md index 8158da9b397..c4b253da2a3 100644 --- a/Documentation/FileFormats.md +++ b/Documentation/FileFormats.md @@ -70,7 +70,7 @@ Most prominently, the first four bytes contain the filemagic: `!Fnt`. These files are human-readable, have no easily detectable filemagic, and define GUI designs and layouts. The format is strongly influenced by QML, the Qt Modeling Language. -See the [GML manpage(s)](../Base/usr/share/man/man5/GML.md), [Playground(1)](../Userland/DevTools/Playground/), and the [GML support in LibGUI](../Userland/Libraries/LibGUI/GML/). +See the [GML manpage(s)](../Base/usr/share/man/man5/GML.md), [GML Playground(1)](../Userland/DevTools/GMLPlayground/), and the [GML support in LibGUI](../Userland/Libraries/LibGUI/GML/). ## Inter Process Communication (`*.ipc` files) diff --git a/Documentation/HighDPI.md b/Documentation/HighDPI.md index 435fe8bb2fc..0b31b27335e 100644 --- a/Documentation/HighDPI.md +++ b/Documentation/HighDPI.md @@ -164,7 +164,7 @@ This isn't figured out yet, for now we're doing the first approach in select pla Currently: - auto app_icon = GUI::Icon::default_icon("app-playground"); + auto app_icon = GUI::Icon::default_icon("app-gml-playground"); or diff --git a/Userland/DevTools/CMakeLists.txt b/Userland/DevTools/CMakeLists.txt index 0add5f625d1..60660be6b15 100644 --- a/Userland/DevTools/CMakeLists.txt +++ b/Userland/DevTools/CMakeLists.txt @@ -1,5 +1,5 @@ +add_subdirectory(GMLPlayground) add_subdirectory(Inspector) -add_subdirectory(Playground) add_subdirectory(Profiler) add_subdirectory(HackStudio) add_subdirectory(SQLStudio) diff --git a/Userland/DevTools/GMLPlayground/CMakeLists.txt b/Userland/DevTools/GMLPlayground/CMakeLists.txt new file mode 100644 index 00000000000..816a54b36ed --- /dev/null +++ b/Userland/DevTools/GMLPlayground/CMakeLists.txt @@ -0,0 +1,12 @@ +serenity_component( + GMLPlayground + RECOMMENDED + TARGETS GMLPlayground +) + +set(SOURCES + main.cpp +) + +serenity_app(GMLPlayground ICON app-gml-playground) +target_link_libraries(GMLPlayground LibDesktop LibGUI LibMain) diff --git a/Userland/DevTools/Playground/main.cpp b/Userland/DevTools/GMLPlayground/main.cpp similarity index 98% rename from Userland/DevTools/Playground/main.cpp rename to Userland/DevTools/GMLPlayground/main.cpp index 8ae7395ba94..31e74194c15 100644 --- a/Userland/DevTools/Playground/main.cpp +++ b/Userland/DevTools/GMLPlayground/main.cpp @@ -67,7 +67,7 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(Core::System::pledge("stdio thread recvfd sendfd cpath rpath wpath unix")); auto app = TRY(GUI::Application::try_create(arguments)); - TRY(Desktop::Launcher::add_allowed_handler_with_only_specific_urls("/bin/Help", { URL::create_with_file_protocol("/usr/share/man/man1/Playground.md") })); + TRY(Desktop::Launcher::add_allowed_handler_with_only_specific_urls("/bin/Help", { URL::create_with_file_protocol("/usr/share/man/man1/GMLPlayground.md") })); TRY(Desktop::Launcher::seal_allowlist()); TRY(Core::System::pledge("stdio thread recvfd sendfd rpath cpath wpath")); @@ -77,7 +77,7 @@ ErrorOr serenity_main(Main::Arguments arguments) args_parser.add_positional_argument(path, "GML file to edit", "file", Core::ArgsParser::Required::No); args_parser.parse(arguments); - auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-playground")); + auto app_icon = TRY(GUI::Icon::try_create_default_icon("app-gml-playground")); auto window = TRY(GUI::Window::try_create()); window->set_title("GML Playground"); window->set_icon(app_icon.bitmap_for_size(16)); @@ -248,7 +248,7 @@ ErrorOr serenity_main(Main::Arguments arguments) auto help_menu = TRY(window->try_add_menu("&Help")); TRY(help_menu->try_add_action(GUI::CommonActions::make_help_action([](auto&) { - Desktop::Launcher::open(URL::create_with_file_protocol("/usr/share/man/man1/Playground.md"), "/bin/Help"); + Desktop::Launcher::open(URL::create_with_file_protocol("/usr/share/man/man1/GMLPlayground.md"), "/bin/Help"); }))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("GML Playground", app_icon, window))); diff --git a/Userland/DevTools/Playground/CMakeLists.txt b/Userland/DevTools/Playground/CMakeLists.txt deleted file mode 100644 index 9490122ff35..00000000000 --- a/Userland/DevTools/Playground/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -serenity_component( - Playground - RECOMMENDED - TARGETS Playground -) - -set(SOURCES - main.cpp -) - -serenity_app(Playground ICON app-playground) -target_link_libraries(Playground LibDesktop LibGUI LibMain)