summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2021-03-25 22:56:35 +0100
committerAndreas Kling <kling@serenityos.org>2021-03-25 23:08:29 +0100
commit619a223800e3d61c2f18010e010ff7a939d264eb (patch)
tree1150866a0d6df7f5d6f141823a5b5705a0f5c4bb
parent73a2045c5bc45ad1f815e113b59c4f174c204d08 (diff)
downloadserenity-619a223800e3d61c2f18010e010ff7a939d264eb.zip
SystemMenu: Remove SystemMenu service
This has been replaced by the Taskbar's start menu.
-rw-r--r--Userland/Services/CMakeLists.txt1
-rw-r--r--Userland/Services/SystemMenu/CMakeLists.txt7
-rw-r--r--Userland/Services/SystemMenu/ShutdownDialog.cpp120
-rw-r--r--Userland/Services/SystemMenu/ShutdownDialog.h43
-rw-r--r--Userland/Services/SystemMenu/main.cpp241
5 files changed, 0 insertions, 412 deletions
diff --git a/Userland/Services/CMakeLists.txt b/Userland/Services/CMakeLists.txt
index 0104e22c1a..2a1a478860 100644
--- a/Userland/Services/CMakeLists.txt
+++ b/Userland/Services/CMakeLists.txt
@@ -10,7 +10,6 @@ add_subdirectory(LookupServer)
add_subdirectory(NotificationServer)
add_subdirectory(ProtocolServer)
add_subdirectory(SymbolServer)
-add_subdirectory(SystemMenu)
add_subdirectory(SystemServer)
add_subdirectory(Taskbar)
add_subdirectory(TelnetServer)
diff --git a/Userland/Services/SystemMenu/CMakeLists.txt b/Userland/Services/SystemMenu/CMakeLists.txt
deleted file mode 100644
index 8d6a6adee8..0000000000
--- a/Userland/Services/SystemMenu/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(SOURCES
- main.cpp
- ShutdownDialog.cpp
-)
-
-serenity_bin(SystemMenu)
-target_link_libraries(SystemMenu LibGUI LibDesktop)
diff --git a/Userland/Services/SystemMenu/ShutdownDialog.cpp b/Userland/Services/SystemMenu/ShutdownDialog.cpp
deleted file mode 100644
index 76799dd4e1..0000000000
--- a/Userland/Services/SystemMenu/ShutdownDialog.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2020, the SerenityOS developers.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "ShutdownDialog.h"
-#include <AK/String.h>
-#include <AK/Vector.h>
-#include <LibGUI/BoxLayout.h>
-#include <LibGUI/Button.h>
-#include <LibGUI/Label.h>
-#include <LibGUI/RadioButton.h>
-#include <LibGUI/Widget.h>
-#include <LibGfx/Font.h>
-#include <LibGfx/FontDatabase.h>
-
-struct Option {
- String title;
- Vector<char const*> cmd;
- bool enabled;
- bool default_action;
-};
-
-static const Vector<Option> options = {
- { "Shut down", { "/bin/shutdown", "--now", nullptr }, true, true },
- { "Restart", { "/bin/reboot", nullptr }, true, false },
- { "Log out", {}, false, false },
- { "Sleep", {}, false, false },
-};
-
-Vector<char const*> ShutdownDialog::show()
-{
- auto dialog = ShutdownDialog::construct();
- auto rc = dialog->exec();
- if (rc == ExecResult::ExecOK && dialog->m_selected_option != -1)
- return options[dialog->m_selected_option].cmd;
-
- return {};
-}
-
-ShutdownDialog::ShutdownDialog()
- : Dialog(nullptr)
-{
- resize(180, 180 + ((static_cast<int>(options.size()) - 3) * 16));
- center_on_screen();
- set_resizable(false);
- set_title("SerenityOS");
- set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/power.png"));
-
- // Request WindowServer to re-update us on the current theme as we might've not been alive for the last notification.
- refresh_system_theme();
-
- auto& main = set_main_widget<GUI::Widget>();
- main.set_layout<GUI::VerticalBoxLayout>();
- main.layout()->set_margins({ 8, 8, 8, 8 });
- main.layout()->set_spacing(8);
- main.set_fill_with_background_color(true);
-
- auto& header = main.add<GUI::Label>();
- header.set_text("What would you like to do?");
- header.set_fixed_height(16);
- header.set_font(Gfx::FontDatabase::default_bold_font());
-
- for (size_t i = 0; i < options.size(); i++) {
- auto action = options[i];
- auto& radio = main.add<GUI::RadioButton>();
- radio.set_enabled(action.enabled);
- radio.set_text(action.title);
-
- radio.on_checked = [this, i](auto) {
- m_selected_option = i;
- };
-
- if (action.default_action) {
- radio.set_checked(true);
- m_selected_option = i;
- }
- }
-
- auto& button_box = main.add<GUI::Widget>();
- button_box.set_layout<GUI::HorizontalBoxLayout>();
- button_box.layout()->set_spacing(8);
-
- auto& ok_button = button_box.add<GUI::Button>();
- ok_button.on_click = [this](auto) {
- done(ExecResult::ExecOK);
- };
- ok_button.set_text("OK");
-
- auto& cancel_button = button_box.add<GUI::Button>();
- cancel_button.on_click = [this](auto) {
- done(ExecResult::ExecCancel);
- };
- cancel_button.set_text("Cancel");
-}
-
-ShutdownDialog::~ShutdownDialog()
-{
-}
diff --git a/Userland/Services/SystemMenu/ShutdownDialog.h b/Userland/Services/SystemMenu/ShutdownDialog.h
deleted file mode 100644
index 73f581916c..0000000000
--- a/Userland/Services/SystemMenu/ShutdownDialog.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2020, the SerenityOS developers.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#include <AK/Vector.h>
-#include <LibGUI/Dialog.h>
-
-class ShutdownDialog : public GUI::Dialog {
- C_OBJECT(ShutdownDialog);
-
-public:
- static Vector<char const*> show();
-
-private:
- ShutdownDialog();
- virtual ~ShutdownDialog() override;
-
- int m_selected_option { -1 };
-};
diff --git a/Userland/Services/SystemMenu/main.cpp b/Userland/Services/SystemMenu/main.cpp
deleted file mode 100644
index b65fb6bdab..0000000000
--- a/Userland/Services/SystemMenu/main.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "ShutdownDialog.h"
-#include <AK/Debug.h>
-#include <AK/LexicalPath.h>
-#include <AK/QuickSort.h>
-#include <LibCore/ConfigFile.h>
-#include <LibCore/DirIterator.h>
-#include <LibCore/StandardPaths.h>
-#include <LibDesktop/AppFile.h>
-#include <LibGUI/Action.h>
-#include <LibGUI/ActionGroup.h>
-#include <LibGUI/Application.h>
-#include <LibGUI/FileIconProvider.h>
-#include <LibGUI/Icon.h>
-#include <LibGUI/Menu.h>
-#include <LibGUI/WindowServerConnection.h>
-#include <LibGfx/Bitmap.h>
-#include <serenity.h>
-#include <spawn.h>
-
-struct AppMetadata {
- String executable;
- String name;
- String category;
-};
-Vector<AppMetadata> g_apps;
-
-struct ThemeMetadata {
- String name;
- String path;
-};
-
-Color g_menu_selection_color;
-
-Vector<ThemeMetadata> g_themes;
-RefPtr<GUI::Menu> g_themes_menu;
-GUI::ActionGroup g_themes_group;
-
-static Vector<String> discover_apps_and_categories();
-static NonnullRefPtr<GUI::Menu> build_system_menu();
-
-int main(int argc, char** argv)
-{
- auto app = GUI::Application::construct(argc, argv);
- app->set_quit_when_last_window_deleted(false);
-
- auto menu = build_system_menu();
- menu->realize_menu_if_needed();
-
- GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetSystemMenu>(menu->menu_id());
-
- if (pledge("stdio recvfd sendfd accept rpath proc exec", nullptr) < 0) {
- perror("pledge");
- return 1;
- }
-
- if (chdir(Core::StandardPaths::home_directory().characters()) < 0) {
- perror("chdir");
- return 1;
- }
-
- if (unveil("/bin", "x")) {
- perror("unveil");
- return 1;
- }
-
- if (unveil("/res", "r")) {
- perror("unveil");
- return 1;
- }
-
- unveil(nullptr, nullptr);
-
- return app->exec();
-}
-
-Vector<String> discover_apps_and_categories()
-{
- HashTable<String> seen_app_categories;
- Desktop::AppFile::for_each([&](auto af) {
- g_apps.append({ af->executable(), af->name(), af->category() });
- seen_app_categories.set(af->category());
- });
- quick_sort(g_apps, [](auto& a, auto& b) { return a.name < b.name; });
-
- Vector<String> sorted_app_categories;
- for (auto& category : seen_app_categories) {
- sorted_app_categories.append(category);
- }
- quick_sort(sorted_app_categories);
-
- return sorted_app_categories;
-}
-
-NonnullRefPtr<GUI::Menu> build_system_menu()
-{
- const Vector<String> sorted_app_categories = discover_apps_and_categories();
- auto system_menu = GUI::Menu::construct("\xE2\x9A\xA1"); // HIGH VOLTAGE SIGN
-
- // First we construct all the necessary app category submenus.
- HashMap<String, NonnullRefPtr<GUI::Menu>> app_category_menus;
- auto category_icons = Core::ConfigFile::open("/res/icons/SystemMenu.ini");
- for (const auto& category : sorted_app_categories) {
- if (app_category_menus.contains(category))
- continue;
- auto& category_menu = system_menu->add_submenu(category);
- auto category_icon_path = category_icons->read_entry("16x16", category);
- if (!category_icon_path.is_empty()) {
- auto icon = Gfx::Bitmap::load_from_file(category_icon_path);
- category_menu.set_icon(icon);
- }
- app_category_menus.set(category, category_menu);
- }
-
- // Then we create and insert all the app menu items into the right place.
- int app_identifier = 0;
- for (const auto& app : g_apps) {
- auto icon = GUI::FileIconProvider::icon_for_executable(app.executable).bitmap_for_size(16);
-
- if constexpr (SYSTEM_MENU_DEBUG) {
- if (icon)
- dbgln("App {} has icon with size {}", app.name, icon->size());
- }
-
- auto parent_menu = app_category_menus.get(app.category).value_or(*system_menu);
- parent_menu->add_action(GUI::Action::create(app.name, icon, [app_identifier](auto&) {
- dbgln("Activated app with ID {}", app_identifier);
- const auto& bin = g_apps[app_identifier].executable;
- pid_t child_pid;
- const char* argv[] = { bin.characters(), nullptr };
- if ((errno = posix_spawn(&child_pid, bin.characters(), nullptr, nullptr, const_cast<char**>(argv), environ))) {
- perror("posix_spawn");
- } else {
- if (disown(child_pid) < 0)
- perror("disown");
- }
- }));
- ++app_identifier;
- }
-
- system_menu->add_separator();
-
- g_themes_group.set_exclusive(true);
- g_themes_group.set_unchecking_allowed(false);
-
- g_themes_menu = &system_menu->add_submenu("Themes");
- g_themes_menu->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/themes.png"));
-
- {
- Core::DirIterator dt("/res/themes", Core::DirIterator::SkipDots);
- while (dt.has_next()) {
- auto theme_name = dt.next_path();
- auto theme_path = String::formatted("/res/themes/{}", theme_name);
- g_themes.append({ LexicalPath(theme_name).title(), theme_path });
- }
- quick_sort(g_themes, [](auto& a, auto& b) { return a.name < b.name; });
- }
-
- auto current_theme_name = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::GetSystemTheme>()->theme_name();
-
- {
- int theme_identifier = 0;
- for (auto& theme : g_themes) {
- auto action = GUI::Action::create_checkable(theme.name, [theme_identifier](auto&) {
- auto& theme = g_themes[theme_identifier];
- dbgln("Theme switched to {} at path {}", theme.name, theme.path);
- auto response = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetSystemTheme>(theme.path, theme.name);
- VERIFY(response->success());
- });
- if (theme.name == current_theme_name)
- action->set_checked(true);
- g_themes_group.add_action(action);
- g_themes_menu->add_action(action);
- ++theme_identifier;
- }
- }
-
- system_menu->add_separator();
- system_menu->add_action(GUI::Action::create("Run...", Gfx::Bitmap::load_from_file("/res/icons/16x16/app-run.png"), [](auto&) {
- pid_t child_pid;
- const char* argv[] = { "/bin/Run", nullptr };
- if ((errno = posix_spawn(&child_pid, "/bin/Run", nullptr, nullptr, const_cast<char**>(argv), environ))) {
- perror("posix_spawn");
- } else {
- if (disown(child_pid) < 0)
- perror("disown");
- }
- }));
- system_menu->add_action(GUI::Action::create("About SerenityOS", Gfx::Bitmap::load_from_file("/res/icons/16x16/ladybug.png"), [](auto&) {
- pid_t child_pid;
- const char* argv[] = { "/bin/About", nullptr };
- if ((errno = posix_spawn(&child_pid, "/bin/About", nullptr, nullptr, const_cast<char**>(argv), environ))) {
- perror("posix_spawn");
- } else {
- if (disown(child_pid) < 0)
- perror("disown");
- }
- }));
- system_menu->add_separator();
- system_menu->add_action(GUI::Action::create("Exit...", Gfx::Bitmap::load_from_file("/res/icons/16x16/power.png"), [](auto&) {
- auto command = ShutdownDialog::show();
-
- if (command.size() == 0)
- return;
-
- pid_t child_pid;
- if ((errno = posix_spawn(&child_pid, command[0], nullptr, nullptr, const_cast<char**>(command.data()), environ))) {
- perror("posix_spawn");
- } else {
- if (disown(child_pid) < 0)
- perror("disown");
- }
- }));
-
- return system_menu;
-}