shell: add a new settings shell
The new shell provides an implementation of CcShell and also removes the dependency on libslab.
This commit is contained in:
Thomas Wood
parent
b4fdb6db4f
commit
4ea04c81dc
16 changed files with 2212 additions and 182 deletions
|
|
@ -1,197 +1,138 @@
|
|||
/*
|
||||
* This file is part of the Control Center.
|
||||
* Copyright (c) 2009, 2010 Intel, Inc.
|
||||
* Copyright (c) 2010 Red Hat, Inc.
|
||||
*
|
||||
* Copyright (c) 2006 Novell, Inc.
|
||||
* The Control Center is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* The Control Center is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the Free
|
||||
* Software Foundation; either version 2 of the License, or (at your option)
|
||||
* any later version.
|
||||
* The Control Center is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* The Control Center is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
||||
* more details.
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with the Control Center; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* the Control Center; if not, write to the Free Software Foundation, Inc., 51
|
||||
* Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
* Author: Thomas Wood <thos@gnome.org>
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <glib/gi18n.h>
|
||||
#include "gnome-control-center.h"
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <libgnome/gnome-desktop-item.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
#include <unique/unique.h>
|
||||
|
||||
#include <libslab/slab.h>
|
||||
|
||||
void handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data);
|
||||
static GSList *get_actions_list ();
|
||||
|
||||
#define CONTROL_CENTER_PREFIX "/apps/control-center/cc_"
|
||||
#define CONTROL_CENTER_ACTIONS_LIST_KEY (CONTROL_CENTER_PREFIX "actions_list")
|
||||
#define CONTROL_CENTER_ACTIONS_SEPARATOR ";"
|
||||
#define EXIT_SHELL_ON_STATIC_ACTION "exit_shell_on_static_action"
|
||||
|
||||
static GSList *
|
||||
get_actions_list (void)
|
||||
enum
|
||||
{
|
||||
GSList *l;
|
||||
GSList *key_list;
|
||||
GSList *actions_list = NULL;
|
||||
AppAction *action;
|
||||
CC_SHELL_RAISE_COMMAND = 1
|
||||
};
|
||||
|
||||
key_list = get_slab_gconf_slist (CONTROL_CENTER_ACTIONS_LIST_KEY);
|
||||
if (!key_list)
|
||||
{
|
||||
g_warning (_("key not found [%s]\n"), CONTROL_CENTER_ACTIONS_LIST_KEY);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for (l = key_list; l != NULL; l = l->next)
|
||||
{
|
||||
gchar *entry = (gchar *) l->data;
|
||||
gchar **temp;
|
||||
|
||||
action = g_new (AppAction, 1);
|
||||
temp = g_strsplit (entry, CONTROL_CENTER_ACTIONS_SEPARATOR, 2);
|
||||
action->name = g_strdup (temp[0]);
|
||||
if ((action->item = load_desktop_item_from_unknown (temp[1])) == NULL)
|
||||
{
|
||||
g_warning ("get_actions_list() - PROBLEM - Can't load %s\n", temp[1]);
|
||||
}
|
||||
else
|
||||
{
|
||||
actions_list = g_slist_prepend (actions_list, action);
|
||||
}
|
||||
g_strfreev (temp);
|
||||
g_free (entry);
|
||||
}
|
||||
|
||||
g_slist_free (key_list);
|
||||
|
||||
return g_slist_reverse (actions_list);
|
||||
}
|
||||
|
||||
void
|
||||
handle_static_action_clicked (Tile * tile, TileEvent * event, gpointer data)
|
||||
{
|
||||
gchar *temp;
|
||||
AppShellData *app_data = (AppShellData *) data;
|
||||
GnomeDesktopItem *item =
|
||||
(GnomeDesktopItem *) g_object_get_data (G_OBJECT (tile), APP_ACTION_KEY);
|
||||
|
||||
if (event->type == TILE_EVENT_ACTIVATED_DOUBLE_CLICK)
|
||||
return;
|
||||
open_desktop_item_exec (item);
|
||||
|
||||
temp = g_strdup_printf("%s%s", app_data->gconf_prefix, EXIT_SHELL_ON_STATIC_ACTION);
|
||||
if (get_slab_gconf_bool(temp))
|
||||
{
|
||||
if (app_data->exit_on_close)
|
||||
gtk_main_quit ();
|
||||
else
|
||||
hide_shell (app_data);
|
||||
}
|
||||
g_free (temp);
|
||||
}
|
||||
|
||||
static UniqueResponse
|
||||
message_received_cb (UniqueApp *app,
|
||||
UniqueCommand command,
|
||||
UniqueMessageData *message,
|
||||
guint time,
|
||||
gpointer user_data)
|
||||
message_received (UniqueApp *app,
|
||||
gint command,
|
||||
UniqueMessageData *message_data,
|
||||
guint time_,
|
||||
GnomeControlCenter *shell)
|
||||
{
|
||||
UniqueResponse res;
|
||||
AppShellData *app_data = user_data;
|
||||
const gchar *id;
|
||||
gsize len;
|
||||
|
||||
switch (command) {
|
||||
case UNIQUE_ACTIVATE:
|
||||
/* move the main window to the screen that sent us the command */
|
||||
gtk_window_set_screen (GTK_WINDOW (app_data->main_app),
|
||||
unique_message_data_get_screen (message));
|
||||
if (!app_data->main_app_window_shown_once)
|
||||
show_shell (app_data);
|
||||
gnome_control_center_present (shell);
|
||||
|
||||
gtk_window_present_with_time (GTK_WINDOW (app_data->main_app),
|
||||
time);
|
||||
id = (gchar*) unique_message_data_get (message_data, &len);
|
||||
|
||||
gtk_widget_grab_focus (SLAB_SECTION (app_data->filter_section)->contents);
|
||||
if (id)
|
||||
{
|
||||
GError *err = NULL;
|
||||
|
||||
res = UNIQUE_RESPONSE_OK;
|
||||
break;
|
||||
default:
|
||||
res = UNIQUE_RESPONSE_PASSTHROUGH;
|
||||
break;
|
||||
}
|
||||
if (!cc_shell_set_active_panel_from_id (CC_SHELL (shell), id, &err))
|
||||
{
|
||||
if (err)
|
||||
{
|
||||
g_warning ("Could not load setting panel \"%s\": %s", id,
|
||||
err->message);
|
||||
g_error_free (err);
|
||||
err = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return res;
|
||||
return GTK_RESPONSE_OK;
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
gboolean hidden = FALSE;
|
||||
UniqueApp *unique_app;
|
||||
AppShellData *app_data;
|
||||
GSList *actions;
|
||||
GError *error;
|
||||
GOptionEntry options[] = {
|
||||
{ "hide", 0, 0, G_OPTION_ARG_NONE, &hidden, N_("Hide on start (useful to preload the shell)"), NULL },
|
||||
{ NULL }
|
||||
};
|
||||
GnomeControlCenter *shell;
|
||||
UniqueApp *unique;
|
||||
|
||||
#ifdef ENABLE_NLS
|
||||
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
|
||||
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
#endif
|
||||
g_thread_init (NULL);
|
||||
gtk_init (&argc, &argv);
|
||||
|
||||
error = NULL;
|
||||
if (!gtk_init_with_args (&argc, &argv,
|
||||
NULL, options, GETTEXT_PACKAGE, &error)) {
|
||||
g_printerr ("%s\n", error->message);
|
||||
g_error_free (error);
|
||||
return 1;
|
||||
}
|
||||
/* use Unique to enforce single instance of this application */
|
||||
unique = unique_app_new_with_commands ("org.gnome.ControlCenter",
|
||||
NULL,
|
||||
"raise",
|
||||
CC_SHELL_RAISE_COMMAND,
|
||||
NULL);
|
||||
|
||||
unique_app = unique_app_new ("org.gnome.gnome-control-center.shell", NULL);
|
||||
if (unique_app_is_running (unique_app)) {
|
||||
int retval = 0;
|
||||
/* check if the application is already running */
|
||||
if (unique_app_is_running (unique))
|
||||
{
|
||||
UniqueMessageData *data;
|
||||
|
||||
if (!hidden) {
|
||||
UniqueResponse response;
|
||||
response = unique_app_send_message (unique_app,
|
||||
UNIQUE_ACTIVATE,
|
||||
NULL);
|
||||
retval = (response != UNIQUE_RESPONSE_OK);
|
||||
}
|
||||
if (argc == 2)
|
||||
{
|
||||
data = unique_message_data_new ();
|
||||
unique_message_data_set (data, (guchar*) argv[1],
|
||||
strlen(argv[1]) + 1);
|
||||
}
|
||||
else
|
||||
data = NULL;
|
||||
|
||||
g_object_unref (unique_app);
|
||||
return retval;
|
||||
}
|
||||
unique_app_send_message (unique, 1, data);
|
||||
|
||||
app_data = appshelldata_new ("gnomecc.menu", NULL, CONTROL_CENTER_PREFIX,
|
||||
GTK_ICON_SIZE_DND, FALSE, TRUE);
|
||||
generate_categories (app_data);
|
||||
gdk_notify_startup_complete ();
|
||||
return 0;
|
||||
}
|
||||
|
||||
actions = get_actions_list ();
|
||||
layout_shell (app_data, _("Filter"), _("Groups"), _("Common Tasks"), actions,
|
||||
handle_static_action_clicked);
|
||||
|
||||
create_main_window (app_data, "MyControlCenter", _("Control Center"),
|
||||
"gnome-control-center", 975, 600, hidden);
|
||||
shell = gnome_control_center_new ();
|
||||
|
||||
unique_app_watch_window (unique_app, GTK_WINDOW (app_data->main_app));
|
||||
g_signal_connect (unique_app, "message-received",
|
||||
G_CALLBACK (message_received_cb), app_data);
|
||||
g_signal_connect (unique, "message-received", G_CALLBACK (message_received),
|
||||
shell);
|
||||
|
||||
gtk_main ();
|
||||
if (argc == 2)
|
||||
{
|
||||
gchar *start_id;
|
||||
GError *err = NULL;
|
||||
|
||||
g_object_unref (unique_app);
|
||||
start_id = argv[1];
|
||||
|
||||
return 0;
|
||||
};
|
||||
if (!cc_shell_set_active_panel_from_id (CC_SHELL (shell), start_id, &err))
|
||||
{
|
||||
g_warning ("Could not load setting panel \"%s\": %s", start_id,
|
||||
(err) ? err->message : "Unknown error");
|
||||
if (err)
|
||||
{
|
||||
g_error_free (err);
|
||||
err = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
gtk_main ();
|
||||
|
||||
g_object_unref (shell);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue