Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_config.c e_config_dialog.c e_config_dialog.h
e_configure.c e_includes.h e_int_menus.c e_module.c e_module.h
Added Files:
e_int_config_modules.c e_int_config_modules.h
Log Message:
module config dialog
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- Makefile.am 17 Dec 2005 02:14:19 -0000 1.87
+++ Makefile.am 17 Dec 2005 11:21:53 -0000 1.88
@@ -123,7 +123,8 @@
e_int_config_background.h \
e_int_config_menus.h \
e_deskpreview.h \
-e_exebuf.h
+e_exebuf.h \
+e_int_config_modules.h
enlightenment_src = \
e_user.c \
@@ -228,6 +229,7 @@
e_int_config_menus.c \
e_deskpreview.c \
e_exebuf.c \
+e_int_config_modules.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- e_config.c 15 Dec 2005 04:29:38 -0000 1.131
+++ e_config.c 17 Dec 2005 11:21:53 -0000 1.132
@@ -526,15 +526,15 @@
{
E_Config_Module *em;
- em = E_NEW(E_Config_Module, 1);
+ /*em = E_NEW(E_Config_Module, 1);
em->name = evas_stringshare_add("start");
em->enabled = 1;
- e_config->modules = evas_list_append(e_config->modules, em);
+ e_config->modules = evas_list_append(e_config->modules, em);*/
em = E_NEW(E_Config_Module, 1);
em->name = evas_stringshare_add("ibar");
em->enabled = 1;
e_config->modules = evas_list_append(e_config->modules, em);
- em = E_NEW(E_Config_Module, 1);
+ /* em = E_NEW(E_Config_Module, 1);
em->name = evas_stringshare_add("ibox");
em->enabled = 0;
e_config->modules = evas_list_append(e_config->modules, em);
@@ -565,7 +565,7 @@
em = E_NEW(E_Config_Module, 1);
em->name = evas_stringshare_add("randr");
em->enabled = 1;
- e_config->modules = evas_list_append(e_config->modules, em);
+ e_config->modules = evas_list_append(e_config->modules, em);*/
}
{
E_Font_Fallback* eff;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_config_dialog.c 4 Dec 2005 12:03:58 -0000 1.11
+++ e_config_dialog.c 17 Dec 2005 11:21:53 -0000 1.12
@@ -32,6 +32,7 @@
cfd->icon_size = icon_size;
}
cfd->data = data;
+ cfd->hide_buttons = 0;
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
@@ -69,6 +70,7 @@
pdia = cfd->dia;
cfd->dia = e_dialog_new(cfd->con);
cfd->dia->data = cfd;
+ cfd->view_dirty=0;
e_object_del_attach_func_set(E_OBJECT(cfd->dia),
_e_config_dialog_cb_dialog_del);
e_dialog_title_set(cfd->dia, cfd->title);
if (cfd->icon) e_dialog_icon_set(cfd->dia, cfd->icon, cfd->icon_size);
@@ -110,11 +112,15 @@
e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd);
e_dialog_content_set(cfd->dia, o, mw, mh);
+ if(!cfd->hide_buttons)
+ {
e_dialog_button_add(cfd->dia, _("OK"), NULL, _e_config_dialog_cb_ok, cfd);
e_dialog_button_add(cfd->dia, _("Apply"), NULL, _e_config_dialog_cb_apply,
cfd);
- e_dialog_button_add(cfd->dia, _("Cancel"), NULL, NULL, NULL);
+ //e_dialog_button_add(cfd->dia, _("Cancel"), NULL, NULL, NULL);
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
+ }
+ e_dialog_button_add(cfd->dia, _("Cancel"), NULL, NULL, NULL);
e_win_centered_set(cfd->dia->win, 1);
e_dialog_show(cfd->dia);
cfd->view_type = type;
@@ -164,8 +170,11 @@
ok = cfd->view.advanced.apply_cfdata(cfd, cfd->cfdata);
if (ok)
{
+ _e_config_dialog_go(cfd, cfd->view_type);
+ /*
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
+ */
}
}
@@ -193,6 +202,14 @@
E_Config_Dialog *cfd;
cfd = data;
+
+ if(cfd->view_dirty)
+ {
+ _e_config_dialog_go(cfd, cfd->view_type);
+ }
+ else if(!cfd->hide_buttons)
+ {
e_dialog_button_disable_num_set(cfd->dia, 0, 0);
e_dialog_button_disable_num_set(cfd->dia, 1, 0);
+ }
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_config_dialog.h 15 Oct 2005 03:09:46 -0000 1.4
+++ e_config_dialog.h 17 Dec 2005 11:21:53 -0000 1.5
@@ -41,6 +41,8 @@
int icon_size;
E_Dialog *dia;
void *data;
+ int view_dirty;
+ int hide_buttons;
};
EAPI E_Config_Dialog *e_config_dialog_new(E_Container *con, char *title, char
*icon, int icon_size, E_Config_Dialog_View *view, void *data);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_configure.c 17 Dec 2005 02:14:19 -0000 1.15
+++ e_configure.c 17 Dec 2005 11:21:53 -0000 1.16
@@ -64,6 +64,7 @@
e_configure_standard_item_add(eco, "enlightenment/e", _("Window
Manipulation"), e_int_config_window_manipulation);
e_configure_standard_item_add(eco, "enlightenment/e", _("Window Display"),
e_int_config_window_display);
//e_configure_standard_item_add(eco, "enlightenment/desktops",
_("Background Settings"), e_int_config_background);
+ e_configure_standard_item_add(eco, "enlightenment/modules", _("Module
Settings"), e_int_config_modules);
/* FIXME: we should have a way for modules to hook in here and add their
* own entries
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- e_includes.h 17 Dec 2005 02:14:19 -0000 1.71
+++ e_includes.h 17 Dec 2005 11:21:53 -0000 1.72
@@ -104,3 +104,4 @@
#include "e_int_config_menus.h"
#include "e_deskpreview.h"
#include "e_exebuf.h"
+#include "e_int_config_modules.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- e_int_menus.c 15 Dec 2005 07:12:00 -0000 1.116
+++ e_int_menus.c 17 Dec 2005 11:21:53 -0000 1.117
@@ -12,7 +12,7 @@
E_Menu *apps;
E_Menu *desktops;
E_Menu *clients;
- E_Menu *modules;
+ //E_Menu *modules;
E_Menu *gadgets;
E_Menu *themes;
E_Menu *config;
@@ -85,13 +85,14 @@
mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
-
+ /*
subm = e_module_menu_new();
dat->modules = subm;
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Modules"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/modules");
e_menu_item_submenu_set(mi, subm);
+ */
subm = e_int_menus_desktops_new();
dat->desktops = subm;
@@ -345,7 +346,7 @@
if (dat)
{
e_object_del(E_OBJECT(dat->apps));
- e_object_del(E_OBJECT(dat->modules));
+/* e_object_del(E_OBJECT(dat->modules));*/
e_object_del(E_OBJECT(dat->desktops));
e_object_del(E_OBJECT(dat->clients));
e_object_del(E_OBJECT(dat->gadgets));
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_module.c 4 Dec 2005 12:03:58 -0000 1.48
+++ e_module.c 17 Dec 2005 11:21:53 -0000 1.49
@@ -135,6 +135,8 @@
m->func.save = dlsym(m->handle, "e_modapi_save");
m->func.info = dlsym(m->handle, "e_modapi_info");
m->func.about = dlsym(m->handle, "e_modapi_about");
+ m->func.config = dlsym(m->handle, "e_modapi_config");
+
if ((!m->func.init) ||
(!m->func.shutdown) ||
(!m->func.save) ||
@@ -156,6 +158,8 @@
m->func.save = NULL;
m->func.info = NULL;
m->func.about = NULL;
+ m->func.config = NULL;
+
dlclose(m->handle);
m->handle = NULL;
m->error = 1;
@@ -177,6 +181,7 @@
m->func.save = NULL;
m->func.info = NULL;
m->func.about = NULL;
+ m->func.config = NULL;
dlclose(m->handle);
m->handle = NULL;
m->error = 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_module.h 24 Sep 2005 13:42:05 -0000 1.8
+++ e_module.h 17 Dec 2005 11:21:53 -0000 1.9
@@ -30,6 +30,7 @@
int (*save) (E_Module *m);
int (*info) (E_Module *m);
int (*about) (E_Module *m);
+ int (*config) (E_Module *m);
} func;
unsigned char enabled : 1;
-------------------------------------------------------
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
