Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_mime_edit.c
Log Message:
Prep for handling img files. No actual handling code yet.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mime_edit.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_mime_edit.c 11 Nov 2006 13:44:51 -0000 1.7
+++ e_int_config_mime_edit.c 11 Nov 2006 14:28:25 -0000 1.8
@@ -19,6 +19,7 @@
THUMB,
THEME,
EDJ,
+ IMG,
DEFAULT
};
@@ -98,7 +99,7 @@
if ((p) && (!strcmp(p, ".edj")))
cfdata->type = EDJ;
else
- cfdata->type = DEFAULT;
+ cfdata->type = IMG;
}
}
}
@@ -144,10 +145,14 @@
ob = e_widget_radio_add(evas, _("Use Edje File"), 2, rg);
evas_object_smart_callback_add(ob, "changed", _cb_type, cfdata);
e_widget_disabled_set(ob, 1);
- e_widget_frametable_object_append(of, ob, 0, 2, 3, 1, 1, 1, 1, 1);
- ob = e_widget_radio_add(evas, _("Use Default"), 3, rg);
+ e_widget_frametable_object_append(of, ob, 0, 2, 3, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_add(evas, _("Use Image"), 3, rg);
evas_object_smart_callback_add(ob, "changed", _cb_type, cfdata);
+ e_widget_disabled_set(ob, 1);
e_widget_frametable_object_append(of, ob, 0, 3, 3, 1, 1, 1, 1, 1);
+ ob = e_widget_radio_add(evas, _("Use Default"), 4, rg);
+ evas_object_smart_callback_add(ob, "changed", _cb_type, cfdata);
+ e_widget_frametable_object_append(of, ob, 0, 4, 3, 1, 1, 1, 1, 1);
oi = e_widget_button_add(evas, "", NULL, _cb_icon_sel, cfdata, cfd);
cfdata->gui.icon = oi;
@@ -158,12 +163,13 @@
e_widget_button_icon_set(oi, icon);
}
e_widget_min_size_set(oi, 48, 48);
- e_widget_frametable_object_append(of, oi, 1, 4, 1, 1, 1, 1, 1, 1);
+ e_widget_frametable_object_append(of, oi, 1, 5, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, of, 1, 1, 0.5);
switch (cfdata->type)
{
case EDJ:
+ case IMG:
e_widget_disabled_set(cfdata->gui.icon, 0);
break;
default:
@@ -213,6 +219,7 @@
mi->icon = evas_stringshare_add(buf);
break;
case EDJ:
+ case IMG:
break;
case DEFAULT:
if (found)
@@ -245,7 +252,11 @@
dia = e_dialog_new(cfd->con, "E", "_mime_icon_select_dialog");
if (!dia) return;
- e_dialog_title_set(dia, _("Select an Icon"));
+ if (cfdata->type == EDJ)
+ e_dialog_title_set(dia, _("Select an Edj File"));
+ else if (cfdata->type == IMG)
+ e_dialog_title_set(dia, _("Select an Image"));
+
dia->data = cfdata;
o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
_cb_fsel_sel, cfdata, NULL, cfdata, 1);
@@ -291,12 +302,9 @@
e_theme_edje_object_set(icon, "base/theme/fileman",
"e/icons/fileman/file");
break;
case EDJ:
- if (cfdata->icon)
- tmp = e_fm_mime_icon_get(cfdata->icon);
- if (!tmp)
- tmp = strdup("e/icons/fileman/file");
- if (!e_theme_edje_object_set(icon, "base/theme/fileman", tmp))
- e_theme_edje_object_set(icon, "base/theme/fileman",
"e/icons/fileman/file");
+ e_widget_disabled_set(cfdata->gui.icon, 0);
+ break;
+ case IMG:
e_widget_disabled_set(cfdata->gui.icon, 0);
break;
default:
@@ -316,6 +324,7 @@
switch (cfdata->type)
{
case EDJ:
+ case IMG:
e_widget_disabled_set(cfdata->gui.icon, 0);
break;
default:
-------------------------------------------------------------------------
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
