fix packing of previews so they don't stretch.

dnd fn fixed.


SVN revision: 26079
This commit is contained in:
Carsten Haitzler 2006-09-24 00:48:14 +00:00
parent 36eeab925b
commit 1b75f85187
3 changed files with 42 additions and 42 deletions

View File

@ -278,7 +278,7 @@ e_fm2_path_set(Evas_Object *obj, const char *dev, const char *path)
{
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 @@ _e_fm2_icon_desktop_load(E_Fm2_Icon *ic)
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 @@ _e_fm2_dnd_drop_into_show(E_Fm2_Icon *ic)
/* 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 @@ _e_fm2_cb_dnd_move(void *data, const char *type, void *event)
}
else
{
/* if iconview - drop here */
/* FIXME: icon view mode */
}
return;
}

View File

@ -433,7 +433,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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);

View File

@ -497,7 +497,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
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);