Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_transitions.c
Log Message:
allow you to remove transitions too...
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_transitions.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_transitions.c 4 Sep 2006 02:07:46 -0000 1.1
+++ e_int_config_transitions.c 4 Sep 2006 14:15:34 -0000 1.2
@@ -69,27 +69,29 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
+ if (e_config->transition_start)
+ evas_stringshare_del(e_config->transition_start);
+ e_config->transition_start = NULL;
if (cfdata->transition_start)
{
- if (e_config->transition_start)
- evas_stringshare_del(e_config->transition_start);
if (e_theme_transition_find(cfdata->transition_start))
e_config->transition_start =
evas_stringshare_add(cfdata->transition_start);
}
+ if (e_config->transition_desk)
+ evas_stringshare_del(e_config->transition_desk);
+ e_config->transition_desk = NULL;
if (cfdata->transition_desk)
{
-
- if (e_config->transition_desk)
- evas_stringshare_del(e_config->transition_desk);
if (e_theme_transition_find(cfdata->transition_desk))
e_config->transition_desk =
evas_stringshare_add(cfdata->transition_desk);
}
+ if (e_config->transition_change)
+ evas_stringshare_del(e_config->transition_change);
+ e_config->transition_change = NULL;
if (cfdata->transition_change)
{
- if (e_config->transition_change)
- evas_stringshare_del(e_config->transition_change);
if (e_theme_transition_find(cfdata->transition_change))
e_config->transition_change =
evas_stringshare_add(cfdata->transition_change);
}
@@ -124,6 +126,7 @@
cfdata->trans_list = il;
e_widget_min_size_set(il, 160, 200);
+ e_widget_ilist_append(il, NULL, _("None"), _trans_cb_changed, cfdata, NULL);
l = e_theme_transition_list();
for (l = e_theme_transition_list(); l; l = l->next)
{
@@ -163,20 +166,25 @@
break;
}
- if (!trans)
- {
- e_widget_ilist_unselect(cfdata->trans_list);
- return;
- }
-
for (i = 0; i < e_widget_ilist_count(cfdata->trans_list); i++)
{
list = e_widget_ilist_nth_label_get(cfdata->trans_list, i);
if (!list) continue;
- if (!strcmp(trans, list))
+ if (!trans)
{
- e_widget_ilist_selected_set(cfdata->trans_list, i);
- return;
+ if (!strcmp(_("None"), list))
+ {
+ e_widget_ilist_selected_set(cfdata->trans_list, i);
+ return;
+ }
+ }
+ else
+ {
+ if (!strcmp(trans, list))
+ {
+ e_widget_ilist_selected_set(cfdata->trans_list, i);
+ return;
+ }
}
}
@@ -196,17 +204,23 @@
t = e_widget_ilist_selected_label_get(cfdata->trans_list);
if (!t) return;
-
+
+ if (!strcmp(t, _("None"))) t = NULL;
switch (sel)
{
case 0:
- cfdata->transition_start = strdup(t);
+ E_FREE(cfdata->transition_start);
+ if (t) cfdata->transition_start = strdup(t);
break;
case 1:
- cfdata->transition_desk = strdup(t);
+ E_FREE(cfdata->transition_desk);
+ if (t) cfdata->transition_desk = strdup(t);
break;
case 2:
- cfdata->transition_change = strdup(t);
+ E_FREE(cfdata->transition_change);
+ if (t) cfdata->transition_change = strdup(t);
+ break;
+ default:
break;
}
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
