From 514cd38938c38c45788f19bfcef4341c5a856833 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 7 May 2023 03:30:44 +0200 Subject: CMakeLists.txt: Move project version to CMake's project() --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1cffc63..8919acd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required (VERSION 3.13) -project (ayatana-indicator-session C CXX) +project (ayatana-indicator-session VERSION 22.9.1 LANGUAGES C CXX) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) @@ -7,7 +7,6 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) -set (PROJECT_VERSION "22.9.1") set (PACKAGE ${CMAKE_PROJECT_NAME}) set (GETTEXT_PACKAGE "ayatana-indicator-session") -- cgit v1.2.3 From cf32ce6be9b43a02d6ef36af877ba59562878ba4 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 7 May 2023 03:32:55 +0200 Subject: Add custom label to admin section --- data/org.ayatana.indicator.session.gschema.xml | 16 +++++++++++++- src/service.c | 29 ++++++++++++++++++++++++- tests/org.ayatana.indicator.session.gschema.xml | 16 +++++++++++++- 3 files changed, 58 insertions(+), 3 deletions(-) diff --git a/data/org.ayatana.indicator.session.gschema.xml b/data/org.ayatana.indicator.session.gschema.xml index dd35390..807c631 100644 --- a/data/org.ayatana.indicator.session.gschema.xml +++ b/data/org.ayatana.indicator.session.gschema.xml @@ -55,6 +55,20 @@ Show bug report item Show the bug report menu item. + + false + Show custom item + Show the custom menu item. + + + "" + Custom item label + The label of the custom menu item. + + + "" + Custom item URI + The location the custom menu item should open. + - diff --git a/src/service.c b/src/service.c index 6f4e294..d05f2cb 100644 --- a/src/service.c +++ b/src/service.c @@ -381,6 +381,22 @@ create_admin_section (IndicatorSessionService * self) priv_t * p = self->priv; menu = g_menu_new (); + gboolean bShowCustom = g_settings_get_boolean (self->priv->indicator_settings, "show-custom-item"); + + if (bShowCustom) + { + gchar *sLabel = g_settings_get_string (self->priv->indicator_settings, "custom-item-label"); + gchar *sUri = g_settings_get_string (self->priv->indicator_settings, "custom-item-uri"); + + if (*sLabel != '\0' && *sUri != '\0') + { + g_menu_append (menu, sLabel, "indicator.custom"); + } + + g_free (sUri); + g_free (sLabel); + } + gboolean bShowDeviceInfo = g_settings_get_boolean (self->priv->indicator_settings, "show-device-info"); if (bShowDeviceInfo) @@ -1039,6 +1055,13 @@ on_user_activated (GSimpleAction * a G_GNUC_UNUSED, username); } +static void on_custom_activated (GSimpleAction *pAction G_GNUC_UNUSED, GVariant *pParam G_GNUC_UNUSED, gpointer pUserData) +{ + IndicatorSessionService *self = INDICATOR_SESSION_SERVICE (pUserData); + gchar *sUri = g_settings_get_string (self->priv->indicator_settings, "custom-item-uri"); + ayatana_common_utils_open_url (sUri); +} + static void init_gactions (IndicatorSessionService * self) { @@ -1059,7 +1082,8 @@ init_gactions (IndicatorSessionService * self) { "switch-to-screensaver", on_screensaver_activated }, { "switch-to-greeter", on_greeter_activated }, { "suspend", on_suspend_activated }, - { "power-off", on_power_off_activated } + { "power-off", on_power_off_activated }, + { "custom", on_custom_activated } }; p->actions = g_simple_action_group_new (); @@ -1422,6 +1446,9 @@ indicator_session_service_init (IndicatorSessionService * self) g_signal_connect_swapped (gp, "changed::show-desktop-help", G_CALLBACK (rebuild_admin_section_soon), self); g_signal_connect_swapped (gp, "changed::show-distro-help", G_CALLBACK (rebuild_admin_section_soon), self); g_signal_connect_swapped (gp, "changed::show-bug-report", G_CALLBACK (rebuild_admin_section_soon), self); + g_signal_connect_swapped (gp, "changed::show-custom-item", G_CALLBACK (rebuild_admin_section_soon), self); + g_signal_connect_swapped (gp, "changed::custom-item-label", G_CALLBACK (rebuild_admin_section_soon), self); + g_signal_connect_swapped (gp, "changed::custom-item-uri", G_CALLBACK (rebuild_admin_section_soon), self); /* watch for changes to the lock keybinding */ gp = p->keybinding_settings; diff --git a/tests/org.ayatana.indicator.session.gschema.xml b/tests/org.ayatana.indicator.session.gschema.xml index b6bacd8..2e1c01f 100644 --- a/tests/org.ayatana.indicator.session.gschema.xml +++ b/tests/org.ayatana.indicator.session.gschema.xml @@ -51,6 +51,20 @@ Show bug report item Show the bug report menu item. + + false + Show custom item + Show the custom menu item. + + + "" + Custom item label + The label of the custom menu item. + + + "" + Custom item URI + The location the custom menu item should open. + - -- cgit v1.2.3