Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : flame
Dir : e_modules/flame
Modified Files:
Makefile.am e_mod_main.c e_mod_main.h
Added Files:
e_mod_config.c e_mod_config.h
Log Message:
Adding Config Dialog for flame module
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/flame/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 12 Dec 2005 05:06:19 -0000 1.1
+++ Makefile.am 12 Dec 2005 15:48:55 -0000 1.2
@@ -16,7 +16,9 @@
pkg_LTLIBRARIES = module.la
module_la_SOURCES = e_mod_main.c \
- e_mod_main.h
+ e_mod_main.h \
+ e_mod_config.c \
+ e_mod_config.h
module_la_LIBADD = @e_libs@
module_la_LDFLAGS = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/flame/e_mod_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.c 12 Dec 2005 05:06:19 -0000 1.1
+++ e_mod_main.c 12 Dec 2005 15:48:55 -0000 1.2
@@ -1,7 +1,6 @@
#include "e.h"
#include "config.h"
#include "e_mod_main.h"
-
#include <time.h>
/* TODO List:
@@ -16,10 +15,8 @@
static Flame *_flame_init (E_Module *m);
static void _flame_shutdown (Flame *f);
static E_Menu *_flame_config_menu_new (Flame *f);
-static void _flame_menu_gold_palette (void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _flame_menu_fire_palette (void *data, E_Menu *m, E_Menu_Item
*mi);
-static void _flame_menu_plasma_palette (void *data, E_Menu *m, E_Menu_Item
*mi);
static void _flame_config_palette_set (Flame *f, Flame_Palette_Type type);
+static void _flame_menu_cb_configure (void *data, E_Menu *m, E_Menu_Item
*mi);
static int _flame_face_init (Flame_Face *ff);
static void _flame_face_free (Flame_Face *ff);
@@ -37,8 +34,6 @@
static int powerof (unsigned int n);
-char *_flame_module_dir;
-
/* public module routines. all modules must have these */
E_Module_Api e_modapi =
{
@@ -52,8 +47,7 @@
Flame *f;
f = _flame_init (m);
- m->config_menu = _flame_config_menu_new (f);
-
+ m->config_menu = _flame_config_menu_new (f);
return f;
}
@@ -192,63 +186,16 @@
E_Menu *mn;
E_Menu_Item *mi;
- /* FIXME: hook callbacks to each menu item */
mn = e_menu_new ();
-
- mi = e_menu_item_new (mn);
- e_menu_item_label_set (mi, "Gold Palette");
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (f->conf->palette_type == GOLD_PALETTE) e_menu_item_toggle_set (mi, 1);
- e_menu_item_callback_set (mi, _flame_menu_gold_palette, f);
-
- mi = e_menu_item_new (mn);
- e_menu_item_label_set (mi, "Fire Palette");
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (f->conf->palette_type == FIRE_PALETTE) e_menu_item_toggle_set (mi, 1);
- e_menu_item_callback_set (mi, _flame_menu_fire_palette, f);
-
mi = e_menu_item_new(mn);
- e_menu_item_label_set(mi, "Plasma Palette");
- e_menu_item_radio_set(mi, 1);
- e_menu_item_radio_group_set(mi, 2);
- if (f->conf->palette_type == PLASMA_PALETTE) e_menu_item_toggle_set (mi, 1);
- e_menu_item_callback_set (mi, _flame_menu_plasma_palette, f);
-
+ e_menu_item_label_set(mi, "Config Dialog");
+ e_menu_item_callback_set(mi, _flame_menu_cb_configure, f);
f->config_menu = mn;
return mn;
}
static void
-_flame_menu_gold_palette (void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Flame *f;
-
- f = (Flame *)data;
- _flame_config_palette_set (f, GOLD_PALETTE);
-}
-
-static void
-_flame_menu_fire_palette (void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Flame *f;
-
- f = (Flame *)data;
- _flame_config_palette_set (f, FIRE_PALETTE);
-}
-
-static void
-_flame_menu_plasma_palette (void *data, E_Menu *m, E_Menu_Item *mi)
-{
- Flame *f;
-
- f = (Flame *)data;
- _flame_config_palette_set (f, PLASMA_PALETTE);
-}
-
-static void
_flame_config_palette_set (Flame *f, Flame_Palette_Type type)
{
switch (type)
@@ -742,3 +689,25 @@
if (n<=0x00000001) p=0;
return p;
}
+
+void
+_flame_cb_config_updated(void *data)
+{
+ Flame *f;
+
+ f = (Flame *)data;
+ if (!f) return;
+ /* Update The Palette */
+ _flame_config_palette_set(f, f->conf->palette_type);
+}
+
+static void
+_flame_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ Flame *f;
+
+ f = (Flame *)data;
+ if (!f) return;
+ /* Call The Config Dialog */
+ e_int_config_flame(f->face->con, f);
+}
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/flame/e_mod_main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.h 12 Dec 2005 05:06:19 -0000 1.1
+++ e_mod_main.h 12 Dec 2005 15:48:55 -0000 1.2
@@ -65,4 +65,6 @@
EAPI int e_modapi_info (E_Module *m);
EAPI int e_modapi_about (E_Module *m);
+EAPI void _flame_cb_config_updated(void *data);
+
#endif /* E_MOD_MAIN_H */
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
