aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--data/org.ayatana.indicator.session.gschema.xml23
-rw-r--r--src/service.c83
-rw-r--r--tests/org.ayatana.indicator.session.gschema.xml25
4 files changed, 105 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9669a28..1cffc63 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
-project (ayatana-indicator-session C CXX)
cmake_minimum_required (VERSION 3.13)
+project (ayatana-indicator-session C CXX)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE)
diff --git a/data/org.ayatana.indicator.session.gschema.xml b/data/org.ayatana.indicator.session.gschema.xml
index 9b1864e..dd35390 100644
--- a/data/org.ayatana.indicator.session.gschema.xml
+++ b/data/org.ayatana.indicator.session.gschema.xml
@@ -35,7 +35,26 @@
<summary>Show the list of users</summary>
<description>Allow for the user list to be hidden by the user.</description>
</key>
-
+ <key name="show-device-info" type="b">
+ <default>true</default>
+ <summary>Show device info item</summary>
+ <description>Show the device information menu item.</description>
+ </key>
+ <key name="show-desktop-help" type="b">
+ <default>true</default>
+ <summary>Show desktop help item</summary>
+ <description>Show the desktop environment help menu item.</description>
+ </key>
+ <key name="show-distro-help" type="b">
+ <default>true</default>
+ <summary>Show distro help item</summary>
+ <description>Show the distribution help menu item.</description>
+ </key>
+ <key name="show-bug-report" type="b">
+ <default>true</default>
+ <summary>Show bug report item</summary>
+ <description>Show the bug report menu item.</description>
+ </key>
</schema>
-
+
</schemalist>
diff --git a/src/service.c b/src/service.c
index 760c64b..6f4e294 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1,6 +1,6 @@
/*
* Copyright 2013 Canonical Ltd.
- * Copyright 2021-2022 Robert Tari
+ * Copyright 2021-2023 Robert Tari
*
* Authors:
* Charles Kerr <charles.kerr@canonical.com>
@@ -379,30 +379,59 @@ create_admin_section (IndicatorSessionService * self)
{
GMenu * menu;
priv_t * p = self->priv;
- gchar * desktop_help_label = NULL;
- gchar * distro_help_label = NULL;
- if (g_strcmp0(get_desktop_session(), "ubuntu-touch") == 0)
- {
- desktop_help_label = g_strdup(_("About Ubuntu Touch…"));
- distro_help_label = g_strdup(_("About UBports Foundation…"));
- }
- else
- {
- desktop_help_label = g_strdup_printf(_("%s Help…"), get_desktop_name());
- distro_help_label = g_strdup_printf(_("%s Help…"), get_distro_name());
- }
menu = g_menu_new ();
- if (ayatana_common_utils_is_lomiri()) {
- g_menu_append (menu, _("About This Device…"), "indicator.about");
- } else {
- g_menu_append (menu, _("About This Computer"), "indicator.about");
+ gboolean bShowDeviceInfo = g_settings_get_boolean (self->priv->indicator_settings, "show-device-info");
+
+ if (bShowDeviceInfo)
+ {
+ if (ayatana_common_utils_is_lomiri())
+ {
+ g_menu_append (menu, _("About This Device…"), "indicator.about");
+ }
+ else
+ {
+ g_menu_append (menu, _("About This Computer"), "indicator.about");
+ }
+ }
+
+ gboolean bShowDesktopHelp = g_settings_get_boolean (self->priv->indicator_settings, "show-desktop-help");
+
+ if (bShowDesktopHelp)
+ {
+ gchar *desktop_help_label = NULL;
+
+ if (g_strcmp0(get_desktop_session(), "ubuntu-touch") == 0)
+ {
+ desktop_help_label = g_strdup(_("About Ubuntu Touch…"));
+ }
+ else
+ {
+ desktop_help_label = g_strdup_printf(_("%s Help…"), get_desktop_name());
+ }
+
+ g_menu_append (menu, desktop_help_label, "indicator.desktop_help");
+ g_free (desktop_help_label);
}
- g_menu_append (menu, desktop_help_label, "indicator.desktop_help");
- g_menu_append (menu, distro_help_label, "indicator.distro_help");
- g_free (desktop_help_label);
- g_free (distro_help_label);
+ gboolean bShowDistroHelp = g_settings_get_boolean (self->priv->indicator_settings, "show-distro-help");
+
+ if (bShowDistroHelp)
+ {
+ gchar *distro_help_label = NULL;
+
+ if (g_strcmp0(get_desktop_session(), "ubuntu-touch") == 0)
+ {
+ distro_help_label = g_strdup(_("About UBports Foundation…"));
+ }
+ else
+ {
+ distro_help_label = g_strdup_printf(_("%s Help…"), get_distro_name());
+ }
+
+ g_menu_append (menu, distro_help_label, "indicator.distro_help");
+ g_free (distro_help_label);
+ }
if (p->usage_mode_action && ayatana_common_utils_is_lomiri())
{
@@ -413,7 +442,13 @@ create_admin_section (IndicatorSessionService * self)
g_object_unref(menu_item);
}
- g_menu_append (menu, _("Report a Bug…"), "indicator.bug");
+ gboolean bShowBugReport = g_settings_get_boolean (self->priv->indicator_settings, "show-bug-report");
+
+ if (bShowBugReport)
+ {
+ g_menu_append (menu, _("Report a Bug…"), "indicator.bug");
+ }
+
return G_MENU_MODEL (menu);
}
@@ -1383,6 +1418,10 @@ indicator_session_service_init (IndicatorSessionService * self)
G_CALLBACK(rebuild_header_soon), self);
g_signal_connect_swapped (gp, "changed::user-show-menu",
G_CALLBACK(user_show_menu_changed), self);
+ g_signal_connect_swapped (gp, "changed::show-device-info", G_CALLBACK (rebuild_admin_section_soon), 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);
/* 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 c81fe60..b6bacd8 100644
--- a/tests/org.ayatana.indicator.session.gschema.xml
+++ b/tests/org.ayatana.indicator.session.gschema.xml
@@ -31,7 +31,26 @@
<summary>Show the list of users</summary>
<description>Allow for the user list to be hidden by the user.</description>
</key>
-
+ <key name="show-device-info" type="b">
+ <default>true</default>
+ <summary>Show device info item</summary>
+ <description>Show the device information menu item.</description>
+ </key>
+ <key name="show-desktop-help" type="b">
+ <default>true</default>
+ <summary>Show desktop help item</summary>
+ <description>Show the desktop environment help menu item.</description>
+ </key>
+ <key name="show-distro-help" type="b">
+ <default>true</default>
+ <summary>Show distro help item</summary>
+ <description>Show the distribution help menu item.</description>
+ </key>
+ <key name="show-bug-report" type="b">
+ <default>true</default>
+ <summary>Show bug report item</summary>
+ <description>Show the bug report menu item.</description>
+ </key>
</schema>
-
-</schemalist> \ No newline at end of file
+
+</schemalist>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 10:56:29 +0000