From 35797b29339cd33c45bba6bfc0431fb52e2415b4 Mon Sep 17 00:00:00 2001 From: Felix Zhang Date: Fri, 13 Jun 2014 15:51:14 +0800 Subject: [PATCH] allow extra tools in shell --- shell/cc-panel-loader.c | 61 ++++++++++++++++++++++++++++++------------------- shell/cc-window.c | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 23 deletions(-) diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c index 26576dc..ec6b675 100644 --- a/shell/cc-panel-loader.c +++ b/shell/cc-panel-loader.c @@ -73,35 +73,40 @@ static struct { GType (*get_type)(void); #endif } all_panels[] = { - PANEL_TYPE("background", cc_background_panel_get_type ), + PANEL_TYPE("background", cc_background_panel_get_type ), #ifdef BUILD_BLUETOOTH - PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), + PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), #endif - PANEL_TYPE("color", cc_color_panel_get_type ), - PANEL_TYPE("datetime", cc_date_time_panel_get_type ), - PANEL_TYPE("display", cc_display_panel_get_type ), - PANEL_TYPE("info", cc_info_panel_get_type ), - PANEL_TYPE("keyboard", cc_keyboard_panel_get_type ), - PANEL_TYPE("mouse", cc_mouse_panel_get_type ), + PANEL_TYPE("color", cc_color_panel_get_type ), + PANEL_TYPE("datetime", cc_date_time_panel_get_type ), + PANEL_TYPE("display", cc_display_panel_get_type ), + PANEL_TYPE("info", cc_info_panel_get_type ), + PANEL_TYPE("keyboard", cc_keyboard_panel_get_type ), + PANEL_TYPE("mouse", cc_mouse_panel_get_type ), #ifdef BUILD_NETWORK - PANEL_TYPE("network", cc_network_panel_get_type ), + PANEL_TYPE("network", cc_network_panel_get_type ), #endif - PANEL_TYPE("notifications", cc_notifications_panel_get_type), - PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), - PANEL_TYPE("power", cc_power_panel_get_type ), + PANEL_TYPE("notifications", cc_notifications_panel_get_type), + PANEL_TYPE("online-a ccounts", cc_goa_panel_get_type ), + PANEL_TYPE("power", cc_power_panel_get_type ), #ifdef BUILD_PRINTERS - PANEL_TYPE("printers", cc_printers_panel_get_type ), + PANEL_TYPE("printers", cc_printers_panel_get_type ), #endif - PANEL_TYPE("privacy", cc_privacy_panel_get_type ), - PANEL_TYPE("region", cc_region_panel_get_type ), - PANEL_TYPE("search", cc_search_panel_get_type ), - PANEL_TYPE("sharing", cc_sharing_panel_get_type ), - PANEL_TYPE("sound", cc_sound_panel_get_type ), - PANEL_TYPE("universal-access", cc_ua_panel_get_type ), - PANEL_TYPE("user-accounts", cc_user_panel_get_type ), + PANEL_TYPE("privacy", cc_privacy_panel_get_type ), + PANEL_TYPE("region", cc_region_panel_get_type ), + PANEL_TYPE("search", cc_search_panel_get_type ), + PANEL_TYPE("sharing", cc_sharing_panel_get_type ), + PANEL_TYPE("sound", cc_sound_panel_get_type ), + PANEL_TYPE("universal-access", cc_ua_panel_get_type ), + PANEL_TYPE("user-accounts", cc_user_panel_get_type ), #ifdef BUILD_WACOM - PANEL_TYPE("wacom", cc_wacom_panel_get_type ), + PANEL_TYPE("wacom", cc_wacom_panel_get_type ), #endif + PANEL_TYPE("dconf-editor", NULL ), + PANEL_TYPE("gpk-prefs", NULL ), + PANEL_TYPE("tracker-preferences", NULL ), + PANEL_TYPE("gnome-tweak-tool", NULL ), + PANEL_TYPE("YaST", NULL ), }; GList * @@ -160,8 +165,16 @@ cc_panel_loader_fill_model (CcShellModel *model) char *desktop_name; int category; - desktop_name = g_strconcat ("gnome-", all_panels[i].name, - "-panel.desktop", NULL); + if (g_strcmp0 (all_panels[i].name, "dconf-editor") == 0 || + g_strcmp0 (all_panels[i].name, "gpk-prefs") == 0 || + g_strcmp0 (all_panels[i].name, "tracker-preferences") == 0 || + g_strcmp0 (all_panels[i].name, "gnome-tweak-tool") == 0 || + g_strcmp0 (all_panels[i].name, "YaST") == 0) + desktop_name = g_strconcat (all_panels[i].name, + ".desktop", NULL); + else + desktop_name = g_strconcat ("gnome-", all_panels[i].name, + "-panel.desktop", NULL); app = g_desktop_app_info_new (desktop_name); g_free (desktop_name); @@ -226,6 +239,8 @@ cc_panel_loader_add_option_groups (GOptionContext *context, { GType (*get_type) (void); get_type = all_panels[i].get_type; + if (get_type == NULL) + continue; GOptionGroup *group = cc_panel_get_option_group (get_type(), builder); if (group == NULL) continue; diff --git a/shell/cc-window.c b/shell/cc-window.c index 29b28e6..8e8f096 100644 --- a/shell/cc-window.c +++ b/shell/cc-window.c @@ -139,6 +139,39 @@ get_icon_name_from_g_icon (GIcon *gicon) return NULL; } +static void +suse_activate_desktop (const gchar *id) +{ + GDesktopAppInfo *appinfo; + const gchar *desktop_file; + GdkScreen *screen; + GdkDisplay *display; + GdkAppLaunchContext *context; + GError *error; + + desktop_file = g_strconcat ("/usr/share/applications/", id, + ".desktop", NULL); + appinfo = g_desktop_app_info_new_from_filename (desktop_file); + + screen = gdk_screen_get_default(); + display = gdk_screen_get_display (screen); + context = gdk_display_get_app_launch_context (display); + gdk_app_launch_context_set_screen (context, screen); + gdk_app_launch_context_set_timestamp (context, gtk_get_current_event_time ()); + + error = NULL; + g_app_info_launch_uris (G_APP_INFO (appinfo), NULL, + (GAppLaunchContext *) context, + &error); + if (error) { + g_printerr ("Could not launch '%s': %s\n", id, error->message); + g_clear_error (&error); + } + + g_object_unref (context); + g_object_unref (appinfo); +} + static gboolean activate_panel (CcWindow *self, const gchar *id, @@ -153,6 +186,16 @@ activate_panel (CcWindow *self, if (!id) return FALSE; + if (g_strcmp0 (id, "dconf-editor") == 0 || + g_strcmp0 (id, "gpk-prefs") == 0 || + g_strcmp0 (id, "tracker-preferences") == 0 || + g_strcmp0 (id, "gnome-tweak-tool") == 0 || + g_strcmp0 (id, "YaST") == 0) + { + suse_activate_desktop (id); + return FALSE; + } + priv->current_panel = GTK_WIDGET (cc_panel_loader_load_by_name (CC_SHELL (self), id, parameters)); cc_shell_set_active_panel (CC_SHELL (self), CC_PANEL (priv->current_panel)); gtk_widget_show (priv->current_panel); -- 1.7.12.4