Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_modules.c
Log Message:
Fix buggers in module config dialog. Configure/About buttons were not in sync
with the modules state
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_config_modules.c 28 Dec 2005 17:28:02 -0000 1.15
+++ e_int_config_modules.c 5 Jan 2006 10:11:00 -0000 1.16
@@ -182,6 +182,9 @@
char *v;
int i;
+ e_widget_disabled_set(cfdata->gui.configure, 1);
+ e_widget_disabled_set(cfdata->gui.about, 1);
+
v = strdup(e_widget_ilist_selected_label_get(cfdata->gui.list));
for (i = 0; i < evas_list_count(cfdata->modules); i++)
{
@@ -193,13 +196,17 @@
if (cm->state != cfdata->state)
{
m = e_module_find(v);
+ if (!m)
+ {
+ m = e_module_new(v);
+ if (!m) break;
+ }
switch (cfdata->state)
{
case MOD_ENABLED:
- if (!m) m = e_module_new(v);
- if (!m->enabled)
- {
- e_module_enable(m);
+ if (!m->enabled) e_module_enable(m);
+ if (m->enabled)
+ {
if (m->func.config)
e_widget_disabled_set(cfdata->gui.configure, 0);
if (m->func.about)
@@ -208,21 +215,14 @@
cm->state = MOD_ENABLED;
break;
case MOD_LOADED:
- if (!m) m = e_module_new(v);
if (m->enabled)
{
e_module_save(m);
e_module_disable(m);
- if (m->func.config)
- e_widget_disabled_set(cfdata->gui.configure, 1);
- }
- else
- {
- if (m->func.config)
- e_widget_disabled_set(cfdata->gui.configure, 0);
- if (m->func.about)
- e_widget_disabled_set(cfdata->gui.about, 0);
}
+ //e_widget_disabled_set(cfdata->gui.configure, 1);
+ if (m->func.about)
+ e_widget_disabled_set(cfdata->gui.about, 0);
cm->state = MOD_LOADED;
break;
@@ -372,29 +372,16 @@
edje_object_signal_emit(wd->o_radio, "toggle_on", "");
break;
}
+ e_widget_disabled_set(cfdata->gui.about, 1);
+ e_widget_disabled_set(cfdata->gui.configure, 1);
m = e_module_find(v);
if (m)
{
- if (m->enabled)
- {
- if (m->func.config)
- e_widget_disabled_set(cfdata->gui.configure, 0);
- else
- e_widget_disabled_set(cfdata->gui.configure, 1);
- }
- else
- {
- e_widget_disabled_set(cfdata->gui.configure, 1);
- }
if (m->func.about)
e_widget_disabled_set(cfdata->gui.about, 0);
- else
- e_widget_disabled_set(cfdata->gui.about, 1);
- }
- else
- {
- e_widget_disabled_set(cfdata->gui.about, 1);
- e_widget_disabled_set(cfdata->gui.configure, 1);
+
+ if (m->enabled && m->func.config)
+ e_widget_disabled_set(cfdata->gui.configure, 0);
}
break;
}
-------------------------------------------------------
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
