Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_int_config_theme.c e_int_config_wallpaper.c
Log Message:
fix packing of previews so they don't stretch.
dnd fn fixed.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- e_fm.c 22 Sep 2006 19:55:11 -0000 1.75
+++ e_fm.c 24 Sep 2006 00:48:14 -0000 1.76
@@ -278,7 +278,7 @@
{
sd->config = E_NEW(E_Fm2_Config, 1);
if (!sd->config) return;
-// sd->config->view.mode = E_FM2_VIEW_MODE_ICONS;
+// sd->config->view.mode = E_FM2_VIEW_MODE_ICONS;
sd->config->view.mode = E_FM2_VIEW_MODE_LIST;
sd->config->view.open_dirs_in_place = 1;
sd->config->view.selector = 1;
@@ -1857,42 +1857,42 @@
desktop = ecore_desktop_get(buf, NULL);
if (desktop)
- {
- if (desktop->name) ic->info.label =
evas_stringshare_add(desktop->name);
- if (desktop->generic) ic->info.generic =
evas_stringshare_add(desktop->generic);
- if (desktop->comment) ic->info.comment =
evas_stringshare_add(desktop->comment);
-
- if (desktop->icon)
- {
- char *v;
-
- /* FIXME: Use a real icon size. */
- v = (char *)ecore_desktop_icon_find(desktop->icon, NULL,
e_config->icon_theme);
- if (v)
- ic->info.icon = evas_stringshare_add(v);
- }
-
- if (desktop->type)
- {
- if (!strcmp(desktop->type, "Mount"))
- {
- ic->info.mount = 1;
- if (desktop->URL)
- ic->info.link =
_e_fm2_icon_desktop_url_eval(desktop->URL);
- }
- else if (!strcmp(desktop->type, "Link"))
- {
- if (desktop->URL)
- ic->info.link =
_e_fm2_icon_desktop_url_eval(desktop->URL);
- }
- else if (!strcmp(desktop->type, "Application"))
- {
- }
- else
- goto error;
- }
- }
-
+ {
+ if (desktop->name) ic->info.label =
evas_stringshare_add(desktop->name);
+ if (desktop->generic) ic->info.generic =
evas_stringshare_add(desktop->generic);
+ if (desktop->comment) ic->info.comment =
evas_stringshare_add(desktop->comment);
+
+ if (desktop->icon)
+ {
+ char *v;
+
+ /* FIXME: Use a real icon size. */
+ v = (char *)ecore_desktop_icon_find(desktop->icon, NULL,
e_config->icon_theme);
+ if (v)
+ ic->info.icon = evas_stringshare_add(v);
+ }
+
+ if (desktop->type)
+ {
+ if (!strcmp(desktop->type, "Mount"))
+ {
+ ic->info.mount = 1;
+ if (desktop->URL)
+ ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->URL);
+ }
+ else if (!strcmp(desktop->type, "Link"))
+ {
+ if (desktop->URL)
+ ic->info.link = _e_fm2_icon_desktop_url_eval(desktop->URL);
+ }
+ else if (!strcmp(desktop->type, "Application"))
+ {
+ }
+ else
+ goto error;
+ }
+ }
+
return 1;
error:
if (ic->info.label) evas_stringshare_del(ic->info.label);
@@ -2335,7 +2335,7 @@
/* FIXME: prototype + reposition + implement */
static void
-_e_fm2_dnd_drop_into_hide(E_Fm2_Icon *ic)
+_e_fm2_dnd_drop_into_hide(Evas_Object *obj)
{
}
@@ -2478,7 +2478,7 @@
}
else
{
- /* if iconview - drop here */
+ /* FIXME: icon view mode */
}
return;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_int_config_theme.c 22 Sep 2006 19:55:11 -0000 1.38
+++ e_int_config_theme.c 24 Sep 2006 00:48:14 -0000 1.39
@@ -433,7 +433,7 @@
if (cfdata->theme)
f = cfdata->theme;
e_widget_preview_edje_set(o, f, "e/desktop/background");
- e_widget_list_object_append(of, o, 1, 1, 0.5);
+ e_widget_list_object_append(of, o, 0, 0, 0.5);
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_int_config_wallpaper.c 22 Sep 2006 19:55:11 -0000 1.16
+++ e_int_config_wallpaper.c 24 Sep 2006 00:48:14 -0000 1.17
@@ -497,7 +497,7 @@
else
f = e_theme_edje_file_get("base/theme/backgrounds",
"e/desktop/background");
e_widget_preview_edje_set(o, f, "e/desktop/background");
- e_widget_list_object_append(of, o, 1, 1, 0.5);
+ e_widget_list_object_append(of, o, 0, 0, 0.5);
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
@@ -637,7 +637,7 @@
else
f = e_theme_edje_file_get("base/theme/backgrounds",
"e/desktop/background");
e_widget_preview_edje_set(o, f, "e/desktop/background");
- e_widget_list_object_append(of, o, 1, 1, 0.5);
+ e_widget_list_object_append(of, o, 0, 0, 0.5);
ol = e_widget_framelist_add(evas, _("Where to place the Wallpaper"), 0);
e_widget_framelist_content_align_set(ol, 0.0, 0.0);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
