DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allowing plug-ins to propose configuration dialogs

Browse Source
This commit is contained in:
Pierre Pronchery 2010-08-11 23:00:17 +00:00
parent 288bab41db
commit 0d4d6285e6
21 changed files with 164 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/Panel.h
View File

@ -33,6 +33,8 @@ typedef struct _PanelAppletHelper
GtkIconSize icon_size;
char const * (*config_get)(Panel * panel, char const * section,
char const * variable);
int (*config_set)(Panel * panel, char const * section,
char const * variable, char const * value);
int (*error)(Panel * panel, char const * message, int ret);
int (*logout_dialog)(void);
void (*position_menu)(GtkMenu * menu, gint * x, gint * y,
@ -41,9 +43,6 @@ typedef struct _PanelAppletHelper
int (*shutdown_dialog)(void);
} PanelAppletHelper;
typedef GtkWidget * (*PanelAppletInitFunc)(PanelApplet * applet);
typedef void (*PanelAppletDestroyFunc)(PanelApplet * applet);
typedef enum _PanelAppletPosition
{
PANEL_APPLET_POSITION_START = 0,
@ -55,8 +54,12 @@ typedef enum _PanelAppletPosition
struct _PanelApplet
{
PanelAppletHelper * helper;
PanelAppletInitFunc init;
PanelAppletDestroyFunc destroy;
char const * name;
char const * icon;
GtkWidget * (*init)(PanelApplet * applet);
void (*destroy)(PanelApplet * applet);
GtkWidget * (*settings)(PanelApplet * applet, gboolean apply,
gboolean reset);
PanelAppletPosition position;
gboolean expand;
gboolean fill;

3
src/applets/battery.c
View File

@ -88,9 +88,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Battery",
NULL,
_battery_init,
_battery_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

3
src/applets/bluetooth.c
View File

@ -63,9 +63,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Bluetooth",
NULL,
_bluetooth_init,
_bluetooth_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

3
src/applets/clock.c
View File

@ -51,9 +51,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Clock",
NULL,
_clock_init,
_clock_destroy,
NULL,
PANEL_APPLET_POSITION_LAST,
FALSE,
TRUE,

3
src/applets/cpu.c
View File

@ -58,9 +58,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"CPU",
NULL,
_cpu_init,
_cpu_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

3
src/applets/cpufreq.c
View File

@ -59,9 +59,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"CPU frequency",
NULL,
_cpufreq_init,
_cpufreq_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

3
src/applets/desktop.c
View File

@ -36,9 +36,12 @@ static void _on_clicked(GtkWidget * widget);
/* variables */
PanelApplet applet =
{
NULL,
"Desktop switch",
NULL,
_desktop_init,
NULL,
NULL,
PANEL_APPLET_POSITION_FIRST,
FALSE,
TRUE,

3
src/applets/gps.c
View File

@ -55,9 +55,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"GPS",
NULL,
_gps_init,
_gps_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

3
src/applets/gsm.c
View File

@ -60,9 +60,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"GSM",
NULL,
_gsm_init,
_gsm_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

50
src/applets/keyboard.c
View File

@ -21,6 +21,9 @@
#include <unistd.h>
#include <stdlib.h>
#ifdef DEBUG
# include <stdio.h>
#endif
#include <string.h>
#include <errno.h>
#include <libintl.h>
@ -37,12 +40,17 @@ typedef struct _Keyboard
PanelAppletHelper * helper;
GPid pid;
GtkWidget * window;
/* preferences */
GtkWidget * pr_box;
GtkWidget * pr_command;
} Keyboard;
/* prototypes */
static GtkWidget * _keyboard_init(PanelApplet * applet);
static void _keyboard_destroy(PanelApplet * applet);
static GtkWidget * _keyboard_settings(PanelApplet * applet, gboolean apply,
gboolean reset);
/* callbacks */
static void _on_keyboard_toggled(GtkWidget * widget, gpointer data);
@ -52,9 +60,12 @@ static void _on_keyboard_toggled(GtkWidget * widget, gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Keyboard",
NULL,
_keyboard_init,
_keyboard_destroy,
_keyboard_settings,
PANEL_APPLET_POSITION_START,
FALSE,
TRUE,
@ -75,9 +86,11 @@ static GtkWidget * _keyboard_init(PanelApplet * applet)
if((keyboard = malloc(sizeof(*keyboard))) == NULL)
return NULL;
applet->priv = keyboard;
keyboard->helper = applet->helper;
keyboard->pid = -1;
keyboard->window = NULL;
keyboard->pr_box = NULL;
ret = gtk_toggle_button_new();
gtk_button_set_relief(GTK_BUTTON(ret), GTK_RELIEF_NONE);
g_signal_connect(G_OBJECT(ret), "toggled", G_CALLBACK(
@ -139,6 +152,43 @@ static void _keyboard_destroy(PanelApplet * applet)
}
/* keyboard_settings */
static GtkWidget * _keyboard_settings(PanelApplet * applet, gboolean apply,
gboolean reset)
{
Keyboard * keyboard = applet->priv;
char const * p;
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s(%p, %s, %s)\n", __func__, (void*)applet,
apply ? "TRUE" : "FALSE", reset ? "TRUE" : "FALSE");
#endif
if(keyboard->pr_box == NULL)
{
keyboard->pr_box = gtk_vbox_new(FALSE, 0);
keyboard->pr_command = gtk_entry_new();
gtk_box_pack_start(GTK_BOX(keyboard->pr_box),
keyboard->pr_command, FALSE, TRUE, 4);
gtk_widget_show_all(keyboard->pr_box);
reset = TRUE;
}
if(reset == TRUE)
{
p = applet->helper->config_get(applet->helper->panel,
"keyboard", "command");
if(p != NULL)
gtk_entry_set_text(GTK_ENTRY(keyboard->pr_command), p);
}
if(apply == TRUE)
{
p = gtk_entry_get_text(GTK_ENTRY(keyboard->pr_command));
applet->helper->config_set(applet->helper->panel, "keyboard",
"command", p);
}
return keyboard->pr_box;
}
/* callbacks */
/* on_keyboard_toggled */
static void _on_keyboard_toggled(GtkWidget * widget, gpointer data)

3
src/applets/lock.c
View File

@ -33,9 +33,12 @@ static void _on_clicked(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Lock screen",
NULL,
_lock_init,
NULL,
NULL,
PANEL_APPLET_POSITION_START,
FALSE,
TRUE,

3
src/applets/logout.c
View File

@ -34,9 +34,12 @@ static void _on_clicked(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Logout",
NULL,
_logout_init,
NULL,
NULL,
PANEL_APPLET_POSITION_START,
FALSE,
TRUE,

3
src/applets/main.c
View File

@ -96,9 +96,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Main menu",
NULL,
_main_init,
_main_destroy,
NULL,
PANEL_APPLET_POSITION_FIRST,
FALSE,
TRUE,

3
src/applets/memory.c
View File

@ -54,9 +54,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Memory",
NULL,
_memory_init,
_memory_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

3
src/applets/pager.c
View File

@ -85,9 +85,12 @@ static void _on_screen_changed(GtkWidget * widget, GdkScreen * previous,
/* variables */
PanelApplet applet =
{
NULL,
"Pager",
NULL,
_pager_init,
_pager_destroy,
NULL,
PANEL_APPLET_POSITION_START,
FALSE,
TRUE,

3
src/applets/phone.c
View File

@ -44,9 +44,12 @@ static void _on_screen_changed(GtkWidget * widget);
/* variables */
PanelApplet applet =
{
NULL,
"Phone",
NULL,
_phone_init,
NULL,
NULL,
PANEL_APPLET_POSITION_START,
FALSE,
TRUE,

3
src/applets/swap.c
View File

@ -54,9 +54,12 @@ static gboolean _on_timeout(gpointer data);
/* variables */
PanelApplet applet =
{
NULL,
"Swap",
NULL,
_swap_init,
_swap_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

3
src/applets/systray.c
View File

@ -59,9 +59,12 @@ static void _on_screen_changed(GtkWidget * widget, GdkScreen * previous,
/* variables */
PanelApplet applet =
{
NULL,
"System tray",
NULL,
_systray_init,
_systray_destroy,
NULL,
PANEL_APPLET_POSITION_LAST,
FALSE,
TRUE,

3
src/applets/tasks.c
View File

@ -135,9 +135,12 @@ static void _on_screen_changed(GtkWidget * widget, GdkScreen * previous,
/* variables */
PanelApplet applet =
{
NULL,
"Tasks",
NULL,
_tasks_init,
_tasks_destroy,
NULL,
PANEL_APPLET_POSITION_START,
#ifndef EMBEDDED
TRUE,

3
src/applets/volume.c
View File

@ -43,9 +43,12 @@ static void _volume_destroy(PanelApplet * applet);
/* variables */
PanelApplet applet =
{
NULL,
"Volume",
NULL,
_volume_init,
_volume_destroy,
NULL,
PANEL_APPLET_POSITION_END,
FALSE,
TRUE,

59
src/panel.c
View File

@ -52,6 +52,7 @@ struct _Panel
/* preferences */
GtkWidget * pr_window;
GtkWidget * pr_notebook;
};
@ -69,6 +70,8 @@ struct _Panel
/* helpers */
static char const * _panel_helper_config_get(Panel * panel,
char const * section, char const * variable);
static int _panel_helper_config_set(Panel * panel, char const * section,
char const * variable, char const * value);
static int _panel_helper_error(Panel * panel, char const * message, int ret);
#ifndef EMBEDDED
static int _panel_helper_logout_dialog(void);
@ -115,6 +118,7 @@ Panel * panel_new(PanelPrefs * prefs)
error_set_print(PACKAGE, 0, _("Invalid panel size"));
panel->helper.panel = panel;
panel->helper.config_get = _panel_helper_config_get;
panel->helper.config_set = _panel_helper_config_set;
panel->helper.error = _panel_helper_error;
panel->helper.icon_size = prefs->iconsize;
#ifndef EMBEDDED
@ -140,8 +144,9 @@ Panel * panel_new(PanelPrefs * prefs)
panel->root_width, panel->root_height);
#endif
/* panel */
g_idle_add(_on_idle, panel);
panel->pr_window = NULL;
panel->pr_notebook = gtk_notebook_new();
g_idle_add(_on_idle, panel);
panel->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
panel->height = panel->icon_height + (PANEL_BORDER_WIDTH * 4);
#ifdef DEBUG
@ -348,12 +353,19 @@ int panel_load(Panel * panel, char const * applet)
fill, 0);
break;
}
if(pa->settings != NULL
&& (widget = pa->settings(pa, FALSE, FALSE)) != NULL)
/* FIXME doesn't seem to work (needs a container first?) */
gtk_notebook_append_page(GTK_NOTEBOOK(panel->pr_notebook),
widget, gtk_label_new(pa->name));
return 0;
}
/* panel_show_preferences */
static void _on_preferences_cancel(gpointer data);
static gboolean _on_preferences_delete_event(gpointer data);
static void _on_preferences_ok(gpointer data);
void panel_show_preferences(Panel * panel, gboolean show)
{
@ -379,29 +391,49 @@ void panel_show_preferences(Panel * panel, gboolean show)
g_signal_connect_swapped(G_OBJECT(panel->pr_window), "delete-event",
G_CALLBACK(_on_preferences_delete_event), panel);
vbox = gtk_vbox_new(FALSE, 0);
/* FIXME implement */
gtk_box_pack_start(GTK_BOX(vbox), panel->pr_notebook, TRUE, TRUE, 0);
/* FIXME implement a way to enable plug-ins per panel (and in order) */
bbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
/* FIXME connect callback */
g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK(
_on_preferences_cancel), panel);
gtk_container_add(GTK_CONTAINER(bbox), widget);
widget = gtk_button_new_from_stock(GTK_STOCK_OK);
/* FIXME connect callback */
g_signal_connect_swapped(G_OBJECT(widget), "clicked", G_CALLBACK(
_on_preferences_ok), panel);
gtk_container_add(GTK_CONTAINER(bbox), widget);
gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
gtk_container_add(GTK_CONTAINER(panel->pr_window), vbox);
_on_preferences_cancel(panel);
gtk_widget_show_all(panel->pr_window);
}
static void _on_preferences_cancel(gpointer data)
{
Panel * panel = data;
gtk_widget_hide(panel->pr_window);
/* FIXME reset configuration */
}
static gboolean _on_preferences_delete_event(gpointer data)
{
Panel * panel = data;
gtk_widget_hide(panel->pr_window);
_on_preferences_cancel(panel);
return TRUE;
}
static void _on_preferences_ok(gpointer data)
{
Panel * panel = data;
gtk_widget_hide(panel->pr_window);
/* FIXME apply configuration */
}
/* private */
/* functions */
@ -414,6 +446,15 @@ static char const * _panel_helper_config_get(Panel * panel,
}
/* panel_helper_config_set */
static int _panel_helper_config_set(Panel * panel, char const * section,
char const * variable, char const * value)
{
/* FIXME also save the configuration */
return config_set(panel->config, section, variable, value);
}
/* panel_helper_error */
static int _error_text(char const * message, int ret);
@ -445,9 +486,13 @@ static int _panel_helper_logout_dialog(void)
int res;
dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO,
GTK_BUTTONS_NONE, "%s", _("Logout"));
GTK_BUTTONS_NONE, "%s",
#if GTK_CHECK_VERSION(2, 6, 0)
_("Logout"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
"%s", message);
"%s",
#endif
message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, NULL);
widget = gtk_button_new_with_label(_("Logout"));