Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_int_config_background.c e_int_config_desklock.c
e_remote_main.c
Log Message:
some illogict patches :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -3 -r1.168 -r1.169
--- e_config.c 12 May 2006 15:07:39 -0000 1.168
+++ e_config.c 13 May 2006 03:04:35 -0000 1.169
@@ -509,7 +509,7 @@
IFCFG(0x008d);
e_config->show_splash = 1;
e_config->desktop_default_background = NULL;
- e_config->desktop_default_name = evas_stringshare_add("Desktop %i, %i");
+ e_config->desktop_default_name = evas_stringshare_add(_("Desktop %i, %i"));
e_config->menus_scroll_speed = 1000.0;
e_config->menus_fast_mouse_move_threshhold = 300.0;
e_config->menus_click_drag_timeout = DEF_MENUCLICK;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_int_config_background.c 2 May 2006 06:23:55 -0000 1.48
+++ e_int_config_background.c 13 May 2006 03:04:35 -0000 1.49
@@ -306,7 +306,7 @@
else
ic = e_thumb_evas_object_get(c, cfd->dia->win->evas, 48, 48, 1);
- e_widget_ilist_append(il, ic, "Theme Background",
_ilist_cb_bg_selected, cfd, "");
+ e_widget_ilist_append(il, ic, _("Theme Background"),
_ilist_cb_bg_selected, cfd, "");
if (!e_config->desktop_default_background) selnum = i;
i++;
}
@@ -316,8 +316,6 @@
e_zone_current_get(cfd->dia->win->container)->w);
e_widget_preview_edje_set(im, f, "desktop/background");
evas_object_del(bg_obj);
-// im = e_widget_preview_add_from_object(cfd->dia->win->evas, bg_obj, 320,
240);
-// e_widget_preview_object_set(im, e_thumb_evas_object_get(c,
cfd->dia->win->evas, 320, 240, 1));
evas_object_del(o);
ecore_evas_free(eebuf);
@@ -384,10 +382,10 @@
selnum = i;
evas_object_del(im);
- im = e_widget_preview_add(cfd->dia->win->evas, 320, 240);
+ im = e_widget_preview_add(cfd->dia->win->evas, 320,
+ (320 *
e_zone_current_get(cfd->dia->win->container)->h) /
+
e_zone_current_get(cfd->dia->win->container)->w);
e_widget_preview_edje_set(im,
e_config->desktop_default_background, "desktop/background");
- // im = e_widget_preview_add_from_object(cfd->dia->win->evas,
o, 320, 240);
- // e_widget_preview_object_set(im,
e_thumb_evas_object_get(full_path, cfd->dia->win->evas, 320, 240, 1));
}
i++;
}
@@ -420,12 +418,10 @@
theme = e_theme_edje_file_get("base/theme/backgrounds",
"desktop/background");
e_widget_preview_edje_set(cfd->data, theme, "desktop/background");
-// e_widget_preview_object_set(cfd->data,
e_thumb_evas_object_get(strdup(theme), evas, 320, 240, 1));
}
else
{
e_widget_preview_edje_set(cfd->data, cfdata->bg, "desktop/background");
-// e_widget_preview_object_set(cfd->data,
e_thumb_evas_object_get(cfdata->bg, evas, 320, 240, 1));
}
if (cfdata->current_bg)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_config_desklock.c 30 Apr 2006 04:31:42 -0000 1.14
+++ e_int_config_desklock.c 13 May 2006 03:04:35 -0000 1.15
@@ -8,7 +8,8 @@
#define BG_LIST_ICON_SIZE_H 32
#define BG_PREVIEW_W 280
-#define BG_PREVIEW_H 200
+#define BG_PREVIEW_H ((BG_PREVIEW_W *
e_zone_current_get(cfd->dia->win->container)->h) / \
+ e_zone_current_get(cfd->dia->win->container)->w)
#define DEF_DESKLOCK_BACKGROUND "theme_desklock_background"
#define DEF_THEME_BACKGROUND "theme_background"
@@ -53,6 +54,8 @@
struct _E_Config_Dialog_Data
{
+ E_Config_Dialog *cfd;
+
char *desklock_passwd;
char *desklock_passwd_cp;
int show_password; // local
@@ -203,6 +206,7 @@
cfdata = E_NEW(E_Config_Dialog_Data, 1);
cfdata->desklock_passwd = strdup("");
cfdata->desklock_passwd_cp = strdup("");
+ cfdata->cfd = cfd;
_fill_desklock_data(cfdata);
@@ -654,6 +658,7 @@
static void
_load_bgs(E_Config_Dialog_Data *cfdata)
{
+ E_Config_Dialog *cfd;
Evas_Object *o, *ic, *im;
Ecore_Evas *eebuf;
Evas *evasbuf;
@@ -664,6 +669,7 @@
if (!cfdata || !cfdata->gui.bg_list)
return;
+ cfd = cfdata->cfd;
eebuf = ecore_evas_buffer_new(1, 1);
evasbuf = ecore_evas_get(eebuf);
@@ -680,7 +686,7 @@
else
ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H, 1);
- e_widget_ilist_append(cfdata->gui.bg_list, ic, "Theme DeskLock
Background",
+ e_widget_ilist_append(cfdata->gui.bg_list, ic, _("Theme DeskLock
Background"),
_ibg_list_cb_bg_selected, cfdata,
DEF_DESKLOCK_BACKGROUND);
}
@@ -690,9 +696,6 @@
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H);
e_widget_preview_edje_set(im, c, "desktop/background");
-// im = e_widget_image_add_from_object(cfdata->evas, bg_obj, BG_PREVIEW_W,
BG_PREVIEW_H);
-// e_widget_image_object_set(im, e_thumb_evas_object_get(c, cfdata->evas,
BG_PREVIEW_W,
-// BG_PREVIEW_H, 1));
evas_object_del(o);
ecore_evas_free(eebuf);
@@ -716,7 +719,7 @@
else
ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H, 1);
- e_widget_ilist_append(cfdata->gui.bg_list, ic, "Theme Background",
_ibg_list_cb_bg_selected,
+ e_widget_ilist_append(cfdata->gui.bg_list, ic, _("Theme Background"),
_ibg_list_cb_bg_selected,
cfdata, DEF_THEME_BACKGROUND);
}
@@ -726,9 +729,6 @@
e_widget_ilist_selected_set(cfdata->gui.bg_list, 1);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H);
e_widget_preview_edje_set(im, c, "desktop/background");
-// im = e_widget_image_add_from_object(cfdata->evas, bg_obj,
BG_PREVIEW_W, BG_PREVIEW_H);
-// e_widget_image_object_set(im, e_thumb_evas_object_get(c, cfdata->evas,
BG_PREVIEW_W,
-// BG_PREVIEW_H, 1));
}
evas_object_del(o);
@@ -774,10 +774,6 @@
evas_object_del(im);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W,
BG_PREVIEW_H);
e_widget_preview_edje_set(im, full_path,
"desktop/background");
-// im = e_widget_image_add_from_object(cfdata->evas, o,
BG_PREVIEW_W, BG_PREVIEW_H);
-// e_widget_image_object_set(im,
e_thumb_evas_object_get(full_path, cfdata->evas,
-//
BG_PREVIEW_W, BG_PREVIEW_H,
-// 1));
}
i++;
}
@@ -807,9 +803,6 @@
theme = e_theme_edje_file_get("base/theme/desklock",
"desklock/background");
e_widget_preview_edje_set(cfdata->preview_image, theme,
"desktop/background");
-// e_widget_image_object_set(cfdata->preview_image,
-// e_thumb_evas_object_get(strdup(theme),
cfdata->evas,
-// BG_PREVIEW_W,
BG_PREVIEW_H, 1));
}
else if (strcmp(cfdata->cur_bg, DEF_THEME_BACKGROUND) == 0)
{
@@ -817,16 +810,10 @@
theme = e_theme_edje_file_get("base/theme/backgrounds",
"desktop/background");
e_widget_preview_edje_set(cfdata->preview_image, theme,
"desktop/background");
-// e_widget_image_object_set(cfdata->preview_image,
-// e_thumb_evas_object_get(strdup(theme),
cfdata->evas,
-// BG_PREVIEW_W,
BG_PREVIEW_H, 1));
}
else
{
e_widget_preview_edje_set(cfdata->preview_image, cfdata->cur_bg,
"desktop/background");
-// e_widget_image_object_set(cfdata->preview_image,
-// e_thumb_evas_object_get(cfdata->cur_bg,
cfdata->evas,
-// BG_PREVIEW_W,
BG_PREVIEW_H, 1));
}
}
else
@@ -835,9 +822,6 @@
theme = e_theme_edje_file_get("base/theme/desklock",
"desklock/background");
e_widget_preview_edje_set(cfdata->preview_image, theme,
"desktop/background");
-// e_widget_image_object_set(cfdata->preview_image,
-// e_thumb_evas_object_get(strdup(theme),
cfdata->evas,
-// BG_PREVIEW_W,
BG_PREVIEW_H, 1));
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_remote_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_remote_main.c 10 Mar 2006 05:48:46 -0000 1.53
+++ e_remote_main.c 13 May 2006 03:04:35 -0000 1.54
@@ -272,4 +272,4 @@
printf("%s\n", opt->desc);
}
}
-#endif
\ No newline at end of file
+#endif
-------------------------------------------------------
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
