Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c e_int_shelf_config.c e_toolbar.c
e_int_gadcon_config.h e_int_gadcon_config.c
Log Message:
Provide gadcon_config wrapper functions for toolbar & shelf. For now, just
used so we can have Toolbar Contents vs Shelf Contents in title.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- e_shelf.c 18 Oct 2007 09:06:30 -0000 1.74
+++ e_shelf.c 9 Nov 2007 23:53:38 -0000 1.75
@@ -1100,7 +1100,7 @@
es = data;
if (!es->gadcon->config_dialog)
- e_int_gadcon_config(es->gadcon);
+ e_int_gadcon_config_shelf(es->gadcon);
}
static void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_int_shelf_config.c 5 Oct 2007 06:05:16 -0000 1.33
+++ e_int_shelf_config.c 9 Nov 2007 23:53:38 -0000 1.34
@@ -481,7 +481,7 @@
cfdata = data;
if (!cfdata->es->gadcon->config_dialog)
- e_int_gadcon_config(cfdata->es->gadcon);
+ e_int_gadcon_config_shelf(cfdata->es->gadcon);
}
/**--GUI--**/
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_toolbar.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_toolbar.c 9 Nov 2007 23:12:13 -0000 1.5
+++ e_toolbar.c 9 Nov 2007 23:53:38 -0000 1.6
@@ -362,7 +362,8 @@
E_Toolbar *tbar;
tbar = data;
- if (!tbar->gadcon->config_dialog) e_int_gadcon_config(tbar->gadcon);
+ if (!tbar->gadcon->config_dialog)
+ e_int_gadcon_config_toolbar(tbar->gadcon);
}
static void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_gadcon_config.h 5 May 2006 12:20:14 -0000 1.1
+++ e_int_gadcon_config.h 9 Nov 2007 23:53:38 -0000 1.2
@@ -6,7 +6,8 @@
#ifndef E_INT_GADCON_CONFIG_H
#define E_INT_GADCON_CONFIG_H
-EAPI void e_int_gadcon_config(E_Gadcon *gc);
+EAPI void e_int_gadcon_config_shelf (E_Gadcon *gc);
+EAPI void e_int_gadcon_config_toolbar (E_Gadcon *gc);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_gadcon_config.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_int_gadcon_config.c 1 Nov 2007 21:39:55 -0000 1.42
+++ e_int_gadcon_config.c 9 Nov 2007 23:53:38 -0000 1.43
@@ -10,6 +10,7 @@
static void _load_available_gadgets(void *data);
static void _load_selected_gadgets(void *data);
static int _cb_mod_update(void *data, int type, void *event);
+static void _e_int_gadcon_config(E_Gadcon *gc, const char *title);
/* Actual config data we will be playing with while the dialog is active */
struct _E_Config_Dialog_Data
@@ -25,9 +26,21 @@
Ecore_Event_Handler *hdl;
};
-/* a nice easy setup function that does the dirty work */
EAPI void
-e_int_gadcon_config(E_Gadcon *gc)
+e_int_gadcon_config_shelf(E_Gadcon *gc)
+{
+ _e_int_gadcon_config(gc, _("Shelf Contents"));
+}
+
+EAPI void
+e_int_gadcon_config_toolbar(E_Gadcon *gc)
+{
+ _e_int_gadcon_config(gc, _("Toolbar Contents"));
+}
+
+/* a nice easy setup function that does the dirty work */
+static void
+_e_int_gadcon_config(E_Gadcon *gc, const char *title)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
@@ -41,8 +54,7 @@
v->override_auto_apply = 1;
cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()),
- _("Shelf Contents"),
- "E", "_gadcon_config_dialog",
+ title, "E", "_gadcon_config_dialog",
"enlightenment/shelf", 0, v, gc);
gc->config_dialog = cfd;
e_dialog_resizable_set(cfd->dia, 1);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
