E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_shelf.edc
Log Message:
Fix swallow colors for alternate & invisible shelves.
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_shelf.edc,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- default_shelf.edc 7 Jul 2007 02:04:19 - 1.23
+++ default_shelf.edc 7 Jul 2007 05:20:39 - 1.24
@@ -1127,7 +1127,6 @@
rel2 {
offset: -1-1;
}
- color: 0 0 0 0;
}
}
}
@@ -1397,7 +1396,6 @@
rel2 {
offset: -5-5;
}
- color: 0 0 0 0;
}
}
part {
@@ -1448,7 +1446,6 @@
rel2 {
offset: -1-1;
}
- color: 0 0 0 0;
}
}
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit_favorites.c exhibit_menus.c
Log Message:
Fix exhibit favorites. Get correct selected image from the tree.
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_favorites.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- exhibit_favorites.c 2 Aug 2006 19:23:22 - 1.3
+++ exhibit_favorites.c 7 Jul 2007 03:55:29 - 1.4
@@ -19,7 +19,7 @@
realpath = ecore_file_realpath(path);
snprintf(new_path, sizeof(new_path), "%s/%s", e->options->fav_path, path);
-
+
ecore_file_symlink(realpath, new_path);
if(realpath)
E_FREE(realpath);
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- exhibit_menus.c 6 Jul 2007 20:29:50 - 1.48
+++ exhibit_menus.c 7 Jul 2007 03:55:29 - 1.49
@@ -36,7 +36,6 @@
e->app3_menu = _ex_menu_item_new(EX_MENU_ITEM_NORMAL,
_(e->options->app3), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(w),
ETK_CALLBACK(_ex_menu_run_in_cb), e->options->app3_cmd);
if (e->options->app4 && e->options->app4_cmd)
e->app4_menu = _ex_menu_item_new(EX_MENU_ITEM_NORMAL,
_(e->options->app4), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(w),
ETK_CALLBACK(_ex_menu_run_in_cb), e->options->app4_cmd);
-
}
Etk_Widget *
@@ -224,7 +223,6 @@
_ex_image_undo(ETK_IMAGE(e->cur_tab->image));
}
-
void
_ex_menu_rot_clockwise_cb(Etk_Object *obj, void *data)
{
@@ -447,11 +445,13 @@
Etk_Tree_Row *r;
char *icol_string;
EX_MENU_ITEM_GET_RETURN(obj);
-
+
r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
- if(!r) return;
+ if(!r) return;
- etk_tree_row_fields_get(r,
etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 0), NULL, &icol_string,
etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 1),NULL);
+ etk_tree_row_fields_get(r,
etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 0),
+ NULL, NULL, &icol_string, NULL);
+
_ex_favorites_add(e, icol_string);
//free(icol_string);
}
@@ -465,8 +465,9 @@
r = etk_tree_selected_row_get(ETK_TREE(e->cur_tab->itree));
if(!r) return;
-
- etk_tree_row_fields_get(r,
etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 0), NULL, &icol_string,
etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 1),NULL);
+
+ etk_tree_row_fields_get(r,
etk_tree_nth_col_get(ETK_TREE(e->cur_tab->itree), 0),
+ NULL, NULL, &icol_string, NULL);
_ex_favorites_del(e, icol_string);
//free(icol_string);
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_border.edc default_button.edc default_color_well.edc
default_configure.edc default_cslider.edc
default_deskpreview.edc default_dialog.edc default_exebuf.edc
default_fileman.edc default_filesel.edc default_frame.edc
default_ibar.edc default_ibox.edc default_menu.edc
default_pager.edc default_preview.edc default_scrollframe.edc
default_shelf.edc default_spectrum.edc default_winlist.edc
Log Message:
lots of things vanished in e17 - swallows happened to be color 0 0 0 0...
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_border.edc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- default_border.edc 23 Jun 2007 10:41:57 - 1.34
+++ default_border.edc 7 Jul 2007 02:04:18 - 1.35
@@ -1041,7 +1041,6 @@
offset: -2 -3;
to: "t1";
}
- color: 0 0 0 0;
}
}
part {
@@ -2177,7 +2176,6 @@
offset: -2 -3;
to: "t1";
}
- color: 0 0 0 0;
}
}
part {
@@ -3366,7 +3364,6 @@
offset: -2 -3;
to: "t1";
}
- color: 0 0 0 0;
}
}
part {
@@ -4516,7 +4513,6 @@
offset: -2 -3;
to: "t1";
}
- color: 0 0 0 0;
}
}
part {
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_button.edc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- default_button.edc 28 Feb 2007 02:59:11 - 1.11
+++ default_button.edc 7 Jul 2007 02:04:19 - 1.12
@@ -66,7 +66,6 @@
description {
state: "default" 0.0;
align: 0.0 0.5;
- color: 0 0 0 0;
rel1 {
relative: 0.0 0.0;
offset: 4 8;
@@ -84,7 +83,6 @@
aspect: 1.0 1.0;
aspect_preference: VERTICAL;
align: 0.0 0.5;
- color: 0 0 0 0;
rel1 {
relative: 0.0 0.0;
offset: 8 8;
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_color_well.edc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- default_color_well.edc 4 Apr 2007 12:51:51 - 1.8
+++ default_color_well.edc 7 Jul 2007 02:04:19 - 1.9
@@ -55,7 +55,6 @@
rel2 {
offset: -5-5;
}
- color: 0 0 0 0;
}
}
part {
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_configure.edc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- default_configure.edc 4 Apr 2007 12:51:51 - 1.21
+++ default_configure.edc 7 Jul 2007 02:04:19 - 1.22
@@ -126,7 +126,6 @@
description {
state: "default" 0.0;
align: 0.5 0.5;
- color: 0 0 0 0;
min: 320 200;
rel1 {
to_y: "logo";
@@ -144,7 +143,6 @@
type: SWALLOW;
description {
state: "default" 0.0;
- color: 0 0 0 0;
align: 0.5 1.0;
fixed: 1 1;
rel1 {
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_cslider.edc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- default_cslider.edc 4 Apr 2007 12:51:51 - 1.5
+++ default_cslider.edc 7 Jul 2007 02:04:19 - 1.6
@@ -56,7 +56,6 @@
rel2 {
offset: -5-5;
}
- color: 0 0 0 0;
}
}
part {
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_deskpreview.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- default_deskpreview.edc 4 Apr 2007 12:51:51 - 1.4
+++ default_deskpreview.edc 7 Jul 2007 02:04:19 - 1.5
@@ -50,7 +50,6 @@
rel2 {
offset: -3-3;
}
- color: 0 0 0 0;
}
}
part {
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_dialog.edc,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- default_dialog.edc 23 Aug 2006 03:39:01 - 1.16
+++ default_dialog.edc 7 Jul 2007 02:04:19 - 1.17
@@ -86,7 +86,6 @@
description {
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-edje/edje Modified Files: edje.c_edje.pxd edje.c_edje_object.pxi Log Message: Implement edje messages. === RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje.pxd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edje.c_edje.pxd 6 May 2007 17:48:00 - 1.2 +++ edje.c_edje.pxd 7 Jul 2007 00:42:01 - 1.3 @@ -238,3 +238,14 @@ cdef object _message_handler_cb cdef object _signal_callbacks +cdef void message_send_int(self, int id, int data) +cdef void message_send_float(self, int id, float data) +cdef void message_send_str(self, int id, char *data) +cdef void message_send_str_set(self, int id, data) +cdef void message_send_str_int(self, int id, char *s, int i) +cdef void message_send_str_float(self, int id, char *s, float f) +cdef void message_send_str_int_set(self, int id, char *s, data) +cdef void message_send_str_float_set(self, int id, char *s, data) +cdef void message_send_int_set(self, int id, data) +cdef void message_send_float_set(self, int id, data) +cdef message_send_set(self, int id, data) === RCS file: /cvs/e/e17/proto/python-efl/python-edje/edje/edje.c_edje_object.pxi,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- edje.c_edje_object.pxi 8 May 2007 19:03:38 - 1.6 +++ edje.c_edje_object.pxi 7 Jul 2007 00:42:01 - 1.7 @@ -273,8 +273,176 @@ def part_drag_page(self, char *part, double dx, double dy): edje_object_part_drag_page(self.obj, part, dx, dy) -#def message_send(self, int type, int id, **kargs): -#edje_object_message_send(self.obj, type, id, msg) +cdef void message_send_int(self, int id, int data): +cdef Edje_Message_Int m +m.val = data +edje_object_message_send(self.obj, EDJE_MESSAGE_INT, id, &m) + +cdef void message_send_float(self, int id, float data): +cdef Edje_Message_Float m +m.val = data +edje_object_message_send(self.obj, EDJE_MESSAGE_FLOAT, id, &m) + +cdef void message_send_str(self, int id, char *data): +cdef Edje_Message_String m +m.str = data +edje_object_message_send(self.obj, EDJE_MESSAGE_STRING, id, &m) + +cdef void message_send_str_set(self, int id, data): +cdef int count, i +cdef Edje_Message_String_Set *m + +count = len(data) +m = python.PyMem_Malloc( +sizeof(Edje_Message_String_Set) + (count - 1) * sizeof(char *)) + +m.count = count +i = 0 +for s in data: +m.str[i] = s +i = i + 1 + +edje_object_message_send(self.obj, EDJE_MESSAGE_STRING_SET, id, + m) +python.PyMem_Free(m) + +cdef void message_send_str_int(self, int id, char *s, int i): +cdef Edje_Message_String_Int m +m.str = s +m.val = i +edje_object_message_send(self.obj, EDJE_MESSAGE_STRING_INT, id, + &m) + +cdef void message_send_str_float(self, int id, char *s, float f): +cdef Edje_Message_String_Float m +m.str = s +m.val = f +edje_object_message_send(self.obj, EDJE_MESSAGE_STRING_FLOAT, id, + &m) + +cdef void message_send_str_int_set(self, int id, char *s, data): +cdef int count, i +cdef Edje_Message_String_Int_Set *m + +count = len(data) +m = python.PyMem_Malloc( +sizeof(Edje_Message_String_Int_Set) + (count - 1) * sizeof(int)) + +m.str = s +m.count = count +i = 0 +for f in data: +m.val[i] = f +i = i + 1 + +edje_object_message_send(self.obj, EDJE_MESSAGE_STRING_INT_SET, id, + m) +python.PyMem_Free(m) + +cdef void message_send_str_float_set(self, int id, char *s, data): +cdef int count, i +cdef Edje_Message_String_Float_Set *m + +count = len(data) +m = python.PyMem_Malloc( +sizeof(Edje_Message_String_Float_Set) + +(count - 1) * sizeof(double)) + +m.str = s +m.count = count +i = 0 +for f in data: +m.val[i] = f +i = i + 1 + +edje_object_message_send(self.obj, EDJE_MESSAGE_STRING_FLOAT_SET, id, + m) +python.PyMem_Free(m) + +cdef void message_send_int_set(self, int id, data): +cdef int count, i +cdef Edje_Message_Int_Set *m + +count = len(data) +m = python.PyMem_Malloc( +sizeof(Edje_Message_Int_Set) + (count - 1) * sizeof(int)) + +m.count = cou
E CVS: apps/elitaire pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : apps/elitaire
Dir : e17/apps/elitaire/data/themes/e17
Modified Files:
e17.edc e17_macros.edc main.grp
Log Message:
some theme improvements (glow font);
some minor things
===
RCS file: /cvs/e/e17/apps/elitaire/data/themes/e17/e17.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e17.edc 16 Jun 2007 09:01:25 - 1.3
+++ e17.edc 6 Jul 2007 23:58:32 - 1.4
@@ -238,7 +238,7 @@
SCROLL_UP_PART( _rel, 0.5, 0.6, _rel"_scroll_up_box")\
TOOLTIP( _rel"_bg_top", _name)
-#define BAR_PROGS( _sig, _flag, _rel , _var) \
+#define BAR_PROGS( _sig, _flag, _rel , _var, _event) \
program {\
name: _sig"_clicked";\
signal: "mouse,clicked,1";\
@@ -254,7 +254,34 @@
}\
}\
}\
+program {\
+ name: _event"_selected";\
+ signal: _event",selected";\
+ source: "elitaire";\
+ script {\
+ if(get_int(_var) == 1) {\
+ set_int(_var, 0);\
+ emit(_sig",off", "");\
+ }\
+ }\
+}\
\
+program {\
+ name: _sig"_on";\
+ signal: _sig",on";\
+ source: "";\
+ action: STATE_SET "visible" 0.0;\
+ target: _rel;\
+ transition: SINUSOIDAL 0.5;\
+}\
+program {\
+ name: _sig"_off";\
+ signal: _sig",off";\
+ source: "";\
+ action: STATE_SET "default" 0.0;\
+ target: _rel;\
+ transition: SINUSOIDAL 0.5;\
+}\
program {\
name: _rel"_mouse_wheel_up";\
signal: "mouse,wheel,0,-1";\
===
RCS file: /cvs/e/e17/apps/elitaire/data/themes/e17/e17_macros.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e17_macros.edc 16 Jun 2007 09:01:25 - 1.2
+++ e17_macros.edc 6 Jul 2007 23:58:32 - 1.3
@@ -158,9 +158,12 @@
clip_to: _rel"_label_clip";\
mouse_events: 0;\
type: TEXT;\
+ effect: GLOW;\
description {\
state: "default" 0.0;\
color:0 0 0 0;\
+ color2: 255 170 17 68;\
+ color3: 255 238 136 119;\
align: 0.0 0.0;\
visible: 0;\
rel1 {\
@@ -183,7 +186,9 @@
description {\
state: "on" 0.0;\
inherit: "default" 0.0;\
- color: 123 0 0 255;\
+ color: 255 255 255 255;\
+ color2: 255 170 17 170;\
+ color3: 255 238 136 119;\
visible: 1;\
}\
}\
===
RCS file: /cvs/e/e17/apps/elitaire/data/themes/e17/main.grp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- main.grp16 Jun 2007 09:01:25 - 1.2
+++ main.grp6 Jul 2007 23:58:32 - 1.3
@@ -145,12 +145,14 @@
part {
name: "elitaire_win_text";
type: TEXT;
- effect: SHADOW;
+ effect: GLOW;
repeat_events: 1;
description {
state: "default" 0.0;
color: 0 0 0 0;
+ color2: 255 170 17 255;
+ color3: 255 238 136 119;
rel1 { relative: 0.5 0.5; offset: -2 -2; to:
"elitaire_card_field";}
rel2 { relative: 0.5 0.5; offset: 2 2; to:
"elitaire_card_field";}
text {
@@ -163,7 +165,10 @@
}
description {
state: "on" 0.0;
- color: 255 219 103 200;
+ color: 255 255 255 255;
+ color2: 255 170 17 255;
+ color3: 255 238 136 119;
+
rel1 { relative: 0.0 0.3; offset: 25 0; to:
"elitaire_card_field";}
rel2 { relative: 1.0 0.7; offset: -25 0; to:
"elitaire_card_field";}
text {
@@ -229,54 +234,6 @@
}
programs {
program {
- name: "menubar_on";
- signal: "menubar,on";
- source: "";
- action: STATE_SET "visible" 0.0;
- target: "menu_bar";
- transition: SINUSOIDAL 0.5;
- }
- program {
- name: "menubar_off";
- signal: "menubar,off";
- source: "";
- action:
E CVS: apps/elitaire pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : apps/elitaire
Dir : e17/apps/elitaire/src
Modified Files:
edje_frontend_game.cpp edje_frontend_gui.cpp
Log Message:
some theme improvements (glow font);
some minor things
===
RCS file: /cvs/e/e17/apps/elitaire/src/edje_frontend_game.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_frontend_game.cpp 9 Jun 2007 23:20:09 - 1.2
+++ edje_frontend_game.cpp 6 Jul 2007 23:58:32 - 1.3
@@ -173,7 +173,6 @@
Eli_Edje_Frontend * eef;
eef = eli_app_edje_frontend_get(eap);
-
elitaire_object_giveup(eef->elitaire);
}
@@ -283,8 +282,10 @@
const char * source)
{
Eli_App * eap;
+Eli_Edje_Frontend * eef;
eap = (Eli_App *) data;
+eef = eli_app_edje_frontend_get(eap);
if (!strcmp(source, "")) {
if (eap->current.game) {
@@ -297,7 +298,10 @@
const char * game;
game = edje_object_part_text_get(o, "elitaire_element_value");
-eli_app_game_new(eap, game);
+if (game) {
+edje_object_signal_emit(eef->gui, "game,selected", "elitaire");
+eli_app_game_new(eap, game);
+}
}
}
@@ -313,24 +317,33 @@
else {
char * theme;
-theme = ecore_config_theme_get("/theme/gui");
-//eli_app_theme_change(eap, theme);
+if ((theme = ecore_config_theme_get("/theme/gui"))) {
+/* FIXME: shouldn't we do here some thing? */
+//eli_app_theme_change(eap, theme);
+edje_object_signal_emit(eef->gui, "theme,selected",
"elitaire");
+free(theme);
+}
}
break;
case CARDS:
-if (!eef->elitaire) break;
-else {
-char * cards;
+{
+char * cards;
-cards = ecore_config_theme_get("/theme/cards");
+if ((cards = ecore_config_theme_get("/theme/cards"))) {
if (eap->theme.cards.current) free(eap->theme.cards.current);
eap->theme.cards.current = cards;
-cards = ecore_config_theme_with_path_from_name_get(
- eap->theme.cards.current);
+}
+
+edje_object_signal_emit(eef->gui, "cards,selected", "elitaire");
+
+if (eap->theme.cards.current && eef->elitaire
+&& (cards = ecore_config_theme_with_path_from_name_get(
+eap->theme.cards.current))) {
elitaire_object_file_set(eef->elitaire, cards);
+free(cards);
}
break;
-
+}
case VELOCITY:
{
int v;
===
RCS file: /cvs/e/e17/apps/elitaire/src/edje_frontend_gui.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_frontend_gui.cpp 28 Jun 2007 23:43:21 - 1.6
+++ edje_frontend_gui.cpp 6 Jul 2007 23:58:32 - 1.7
@@ -620,15 +620,19 @@
static void _theme_item_selected_cb(void * data, Evas_Object * o,
const char * emission, const char * source)
{
-ecore_config_theme_set("/theme/gui",
- edje_object_part_text_get(o, "elitaire_element_value"));
+const char * theme;
+
+if ((theme = edje_object_part_text_get(o, "elitaire_element_value")))
+ecore_config_theme_set("/theme/gui", theme);
}
static void _cards_item_selected_cb(void * data, Evas_Object * o,
const char * emission, const char * source)
{
-ecore_config_theme_set("/theme/cards",
- edje_object_part_text_get(o, "elitaire_element_value"));
+const char * theme;
+
+if ((theme = edje_object_part_text_get(o, "elitaire_element_value")))
+ecore_config_theme_set("/theme/cards", theme);
}
/* Fill the theme container for selecting the theme */
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/elitaire pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : apps/elitaire Dir : e17/apps/elitaire/po Modified Files: de.po Log Message: some theme improvements (glow font); some minor things - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_private.h edje_text.c
Log Message:
add support for glow, far shadow and far soft shadow for text parts
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -3 -r1.104 -r1.105
--- edje_calc.c 6 Jul 2007 23:27:33 - 1.104
+++ edje_calc.c 6 Jul 2007 23:33:42 - 1.105
@@ -735,6 +735,12 @@
style = EVAS_TEXT_STYLE_OUTLINE_SHADOW;
else if (ep->part->effect == EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW)
style = EVAS_TEXT_STYLE_OUTLINE_SOFT_SHADOW;
+else if (ep->part->effect == EDJE_TEXT_EFFECT_FAR_SHADOW)
+ style = EVAS_TEXT_STYLE_FAR_SHADOW;
+else if (ep->part->effect == EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW)
+ style = EVAS_TEXT_STYLE_FAR_SOFT_SHADOW;
+else if (ep->part->effect == EDJE_TEXT_EFFECT_GLOW)
+ style = EVAS_TEXT_STYLE_GLOW;
evas_object_text_style_set(ep->object, style);
evas_object_text_text_set(ep->object, text);
evas_object_geometry_get(ep->object, NULL, NULL, &tw, &th);
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -3 -r1.127 -r1.128
--- edje_private.h 6 Jul 2007 22:36:40 - 1.127
+++ edje_private.h 6 Jul 2007 23:33:42 - 1.128
@@ -143,7 +143,10 @@
#define EDJE_TEXT_EFFECT_SOFT_SHADOW 5
#define EDJE_TEXT_EFFECT_OUTLINE_SHADOW 6
#define EDJE_TEXT_EFFECT_OUTLINE_SOFT_SHADOW 7
-#define EDJE_TEXT_EFFECT_LAST8
+#define EDJE_TEXT_EFFECT_FAR_SHADOW 8
+#define EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW 9
+#define EDJE_TEXT_EFFECT_GLOW 10
+#define EDJE_TEXT_EFFECT_LAST 11
#define EDJE_ACTION_TYPE_NONE 0
#define EDJE_ACTION_TYPE_STATE_SET 1
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_text.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- edje_text.c 18 Jun 2007 16:49:11 - 1.63
+++ edje_text.c 6 Jul 2007 23:33:42 - 1.64
@@ -579,6 +579,38 @@
(params->color3.b *
params->color3.a) / 255,
params->color3.a);
}
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_FAR_SHADOW)
+ {
+style = EVAS_TEXT_STYLE_FAR_SHADOW;
+evas_object_text_shadow_color_set(ep->object,
+ (params->color3.r *
params->color3.a) / 255,
+ (params->color3.g *
params->color3.a) / 255,
+ (params->color3.b *
params->color3.a) / 255,
+ params->color3.a);
+ }
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_FAR_SOFT_SHADOW)
+ {
+style = EVAS_TEXT_STYLE_FAR_SOFT_SHADOW;
+evas_object_text_shadow_color_set(ep->object,
+ (params->color3.r *
params->color3.a) / 255,
+ (params->color3.g *
params->color3.a) / 255,
+ (params->color3.b *
params->color3.a) / 255,
+ params->color3.a);
+ }
+ else if (ep->part->effect == EDJE_TEXT_EFFECT_GLOW)
+ {
+style = EVAS_TEXT_STYLE_GLOW;
+evas_object_text_glow_color_set(ep->object,
+ (params->color2.r *
params->color2.a) / 255,
+ (params->color2.g *
params->color2.a) / 255,
+ (params->color2.b *
params->color2.a) / 255,
+ params->color2.a);
+evas_object_text_glow2_color_set(ep->object,
+ (params->color3.r *
params->color3.a) / 255,
+ (params->color3.g *
params->color3.a) / 255,
+ (params->color3.b *
params->color3.a) / 255,
+ params->color3.a);
+ }
evas_object_text_style_set(ep->object, style);
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it
E CVS: libs/edje barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c
Log Message:
If object is swallow, apply color changes to swallowed object. Ack by rephorm.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- edje_calc.c 6 Jul 2007 22:36:40 - 1.103
+++ edje_calc.c 6 Jul 2007 23:27:33 - 1.104
@@ -1377,6 +1377,12 @@
if (ep->swallowed_object)
{
+evas_object_color_set(ep->swallowed_object,
+ (p3.color.r * p3.color.a) / 255,
+ (p3.color.g * p3.color.a) / 255,
+ (p3.color.b * p3.color.a) / 255,
+ p3.color.a);
+
evas_object_move(ep->swallowed_object, ed->x + p3.x, ed->y + p3.y);
evas_object_resize(ep->swallowed_object, p3.w, p3.h);
if (p3.visible) evas_object_show(ep->swallowed_object);
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-evas/evas Modified Files: .cvsignore Log Message: ++.cvsignore === RCS file: /cvs/e/e17/proto/python-efl/python-evas/evas/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 6 Jul 2007 20:44:06 - 1.1 +++ .cvsignore 6 Jul 2007 23:09:41 - 1.2 @@ -1,3 +1,5 @@ *.pyc *.pyo evas.c_evas.c +evas.c_evas.h +evas.c_evas.pxi - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/data
Modified Files:
gui.edc
Log Message:
add hourglass icon while a thumb load, courtesy of lucho, idea from morlenxus
===
RCS file: /cvs/e/e17/apps/exhibit/data/gui.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- gui.edc 5 Jul 2007 10:23:54 - 1.2
+++ gui.edc 6 Jul 2007 23:05:17 - 1.3
@@ -34,6 +34,7 @@
image: "tiles.png" COMP;
image: "e17_fileman_thumb_bg.png" COMP;
image: "e17_mini_button_shadow2.png" COMP;
+ image: "exhibit_thumb_loading.png" COMP;
}
collections {
@@ -41,7 +42,35 @@
ICON("one_to_one");
ICON("zoom_in");
ICON("zoom_out");
-
+
+ group {
+ min: 32 32;
+ max: 64 64;
+ name: "thumb_loading";
+ parts {
+part {
+ name: "icon";
+ description {
+ state: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+ }
+ image {
+ normal: "exhibit_thumb_loading.png";
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+}
+ }
+ }
+
group {
name: "image_bg";
parts {
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/exhibit Dir : e17/apps/exhibit/data/images Added Files: exhibit_thumb_loading.png Log Message: add hourglass icon while a thumb load, courtesy of lucho, idea from morlenxus - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/exhibit Dir : e17/apps/exhibit/src/bin Modified Files: exhibit_main.c Log Message: add hourglass icon while a thumb load, courtesy of lucho, idea from morlenxus === RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- exhibit_main.c 6 Jul 2007 20:29:50 - 1.111 +++ exhibit_main.c 6 Jul 2007 23:05:17 - 1.112 @@ -434,7 +434,7 @@ row = etk_tree_row_append(ETK_TREE(e->cur_tab->itree), NULL, e->cur_tab->icol, - NULL, NULL, + PACKAGE_DATA_DIR"/gui.edj", "thumb_loading", basename((char *) file), NULL); if(pid == -1) _ex_thumb_generate(); - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_message_queue.c
Log Message:
Messages are now passed to children groups (part.type=GROUP)
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- edje_message_queue.c27 May 2007 05:28:07 - 1.27
+++ edje_message_queue.c6 Jul 2007 23:03:05 - 1.28
@@ -8,15 +8,22 @@
static Evas_List *msgq = NULL;
static Evas_List *tmp_msgq = NULL;
-/* FIXME pass messages on to children? */
EAPI void
edje_object_message_send(Evas_Object *obj, Edje_Message_Type type, int id,
void *msg)
{
Edje *ed;
+ int i;
ed = _edje_fetch(obj);
if (!ed) return;
_edje_message_send(ed, EDJE_QUEUE_SCRIPT, type, id, msg);
+
+ for (i = 0; i < ed->table_parts_size; i++)
+ {
+ Edje_Real_Part *rp = ed->table_parts[i];
+ if ((rp->part->type == EDJE_PART_TYPE_GROUP) && (rp->swallowed_object))
+ edje_object_message_send(rp->swallowed_object, type, id, msg);
+ }
}
EAPI void
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c
Log Message:
add cedric bail's fill.type patch.
you can now include "type: TILE;" in the fill block to tile an image part at
the size of its image data
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- edje_cc_handlers.c 27 May 2007 05:28:07 - 1.73
+++ edje_cc_handlers.c 6 Jul 2007 22:36:40 - 1.74
@@ -83,6 +83,7 @@
static void st_collections_group_parts_part_description_fill_size_offset(void);
static void st_collections_group_parts_part_description_fill_angle(void);
static void st_collections_group_parts_part_description_fill_spread(void);
+static void st_collections_group_parts_part_description_fill_type(void);
static void st_collections_group_parts_part_description_color_class(void);
static void st_collections_group_parts_part_description_color(void);
static void st_collections_group_parts_part_description_color2(void);
@@ -229,6 +230,7 @@
{"collections.group.parts.part.description.fill.size.offset",
st_collections_group_parts_part_description_fill_size_offset},
{"collections.group.parts.part.description.fill.angle",
st_collections_group_parts_part_description_fill_angle},
{"collections.group.parts.part.description.fill.spread",
st_collections_group_parts_part_description_fill_spread},
+ {"collections.group.parts.part.description.fill.type",
st_collections_group_parts_part_description_fill_type},
{"collections.group.parts.part.description.color_class",
st_collections_group_parts_part_description_color_class},
{"collections.group.parts.part.description.color",
st_collections_group_parts_part_description_color},
{"collections.group.parts.part.description.color2",
st_collections_group_parts_part_description_color2},
@@ -1151,6 +1153,7 @@
ed->fill.abs_y = 0;
ed->fill.angle = 0;
ed->fill.spread = 0;
+ ed->fill.type = EDJE_FILL_TYPE_SCALE;
ed->color_class = NULL;
ed->color.r = 255;
ed->color.g = 255;
@@ -1801,7 +1804,7 @@
if (ep->type != EDJE_PART_TYPE_IMAGE)
{
fprintf(stderr, "%s: Error. parse error %s:%i. "
- "fill attributes in non-IMAGE part.\n",
+ "fill.type attribute in non-IMAGE part.\n",
progname, file_in, line - 1);
exit(-1);
}
@@ -2656,6 +2659,34 @@
ep = evas_list_data(evas_list_last(pc->programs));
ep->in.from = parse_float_range(0, 0.0, 9.0);
ep->in.range = parse_float_range(1, 0.0, 9.0);
+}
+
+static void
+st_collections_group_parts_part_description_fill_type(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(1);
+
+ pc = evas_list_data(evas_list_last(edje_collections));
+ ep = evas_list_data(evas_list_last(pc->parts));
+ ed = ep->default_desc;
+ if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
+
+ if (ep->type != EDJE_PART_TYPE_IMAGE)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "fill attributes in non-IMAGE part.\n",
+ progname, file_in, line - 1);
+ exit(-1);
+ }
+
+ ed->fill.type = parse_enum(0,
+ "SCALE", EDJE_FILL_TYPE_SCALE,
+ "TILE", EDJE_FILL_TYPE_TILE,
+ NULL);
}
static void
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_data.c edje_private.h
Log Message:
add cedric bail's fill.type patch.
you can now include "type: TILE;" in the fill block to tile an image part at
the size of its image data
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- edje_calc.c 27 May 2007 05:28:07 - 1.102
+++ edje_calc.c 6 Jul 2007 22:36:40 - 1.103
@@ -974,13 +974,26 @@
params->smooth = desc->fill.smooth;
if (flags & FLAG_X)
{
-params->fill.x = desc->fill.pos_abs_x + (params->w *
desc->fill.pos_rel_x);
-params->fill.w = desc->fill.abs_x + (params->w * desc->fill.rel_x);
+int fw;
+
+ if (desc->fill.type == EDJE_FILL_TYPE_TILE)
+ evas_object_image_size_get(ep->object, &fw, NULL);
+else
+ fw = params->w;
+
+params->fill.x = desc->fill.pos_abs_x + (fw *
desc->fill.pos_rel_x);
+params->fill.w = desc->fill.abs_x + (fw * desc->fill.rel_x);
}
if (flags & FLAG_Y)
{
-params->fill.y = desc->fill.pos_abs_y + (params->h *
desc->fill.pos_rel_y);
-params->fill.h = desc->fill.abs_y + (params->h * desc->fill.rel_y);
+int fh;
+ if (desc->fill.type == EDJE_FILL_TYPE_TILE)
+ evas_object_image_size_get(ep->object, NULL, &fh);
+else
+ fh = params->h;
+
+params->fill.y = desc->fill.pos_abs_y + (fh *
desc->fill.pos_rel_y);
+params->fill.h = desc->fill.abs_y + (fh * desc->fill.rel_y);
}
params->fill.angle = desc->fill.angle;
params->fill.spread = desc->fill.spread;
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- edje_data.c 27 May 2007 05:28:07 - 1.36
+++ edje_data.c 6 Jul 2007 22:36:40 - 1.37
@@ -293,6 +293,7 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "fill.abs_y", fill.abs_y, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "fill.angle", fill.angle, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "fill.spread", fill.spread, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "fill.type", fill.type, EET_T_CHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color_class", color_class, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color.r", color.r, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "color.g", color.g, EET_T_UCHAR);
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- edje_private.h 28 Jun 2007 23:22:20 - 1.126
+++ edje_private.h 6 Jul 2007 22:36:40 - 1.127
@@ -504,6 +504,7 @@
intangle; /* angle of fill -- currently only used by grads */
intspread; /* spread of fill -- currently only used by grads
*/
char smooth; /* fill with smooth scaling or not */
+ unsigned char type; /* fill coordinate from container (SCALE) or from
source image (TILE) */
} fill;
char *color_class; /* how to modify the color */
@@ -883,6 +884,12 @@
intid;
unsigned char *msg;
};
+
+typedef enum _Edje_Fill
+{
+ EDJE_FILL_TYPE_SCALE = 0,
+ EDJE_FILL_TYPE_TILE
+} Edje_Fill;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_file;
EAPI extern Eet_Data_Descriptor *_edje_edd_edje_style;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto andreas
Enlightenment CVS committal Author : andreas Project : e17 Module : proto Dir : e17/proto/eflpp/src Modified Files: Makefile.am Log Message: fixed libtool linking === RCS file: /cvs/e/e17/proto/eflpp/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 4 Jul 2007 21:04:38 - 1.2 +++ Makefile.am 6 Jul 2007 22:25:27 - 1.3 @@ -11,7 +11,8 @@ libeflpp_la_SOURCES = -libeflpp_la_LDFLAGS = common/libeflpp_common.la\ +libeflpp_la_LDFLAGS = @[EMAIL PROTECTED] + common/libeflpp_common.la\ ecore/libeflpp_ecore.la\ edb/libeflpp_edb.la\ edje/libeflpp_edje.la\ @@ -24,4 +25,4 @@ misc/libeflpp_misc.la -libeflpp_la_LIBADD = @PACKAGE_LIBS@ +libeflpp_la_LIBADD = - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk lok
Enlightenment CVS committal Author : lok Project : e17 Module : libs/etk Dir : e17/libs/etk/src/lib Modified Files: etk_tree_model.c Log Message: Progress Bar model fixed === RCS file: /cvs/e/e17/libs/etk/src/lib/etk_tree_model.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- etk_tree_model.c3 May 2007 12:24:28 - 1.18 +++ etk_tree_model.c6 Jul 2007 21:51:37 - 1.19 @@ -893,17 +893,18 @@ if (!(pbar_data = cell_data) || !cell_objects[0]) return ETK_FALSE; - edje_object_part_drag_value_set(cell_objects[0], "etk.dragable.filler", 0.0, 0.0); - edje_object_part_drag_size_set(cell_objects[0], "etk.dragable.filler", pbar_data->fraction, 0.0); - - edje_object_part_text_set(cell_objects[0], "etk.text.label", pbar_data->text ? pbar_data->text : ""); + edje_object_part_text_set(cell_objects[0], "etk.text.text", pbar_data->text ? pbar_data->text : ""); evas_object_data_set(cell_objects[0], "_Etk_Tree_Model_Progressbar::Row", row); edje_object_size_min_get(cell_objects[0], &w, &h); evas_object_move(cell_objects[0], geometry.x, geometry.y + ((geometry.h - h) / 2)); - evas_object_resize(cell_objects[0], w, h); - evas_object_show(cell_objects[0]); + evas_object_resize(cell_objects[0], w > geometry.w ? w : geometry.w, h); + + edje_object_part_drag_value_set(cell_objects[0], "etk.dragable.filler", 0.0, 0.0); + edje_object_part_drag_size_set(cell_objects[0], "etk.dragable.filler", pbar_data->fraction, 0.0); + evas_object_show(cell_objects[0]); + return ETK_FALSE; } - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : libs/etk
Dir : e17/libs/etk/data/themes/default/widgets
Modified Files:
tree.edc
Log Message:
Progress Bar model fixed
===
RCS file: /cvs/e/e17/libs/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- tree.edc2 Apr 2007 10:03:32 - 1.34
+++ tree.edc6 Jul 2007 21:51:37 - 1.35
@@ -704,5 +704,125 @@
}
}
-/* TODO: we should be able to theme the progress-bar model... */
+
+group {
+ name: "etk/tree/progress_bar";
+ min: 120 18;
+ data {
+ item: "filler_pulse_width" "0.3";
+ }
+ parts {
+ part {
+ name: "progress_bar";
+ description {
+state: "default" 0.0;
+rel1 {
+ relative: 0.0 0.5;
+ offset: 0 -9;
+}
+rel2 {
+ relative: 1.0 0.5;
+ offset: -1 8;
+}
+image {
+ normal: "entry.png";
+ border: 8 8 8 8;
+}
+fill {
+ smooth: 0;
+}
+ }
+ }
+ part {
+ name: "clip";
+ type: RECT;
+ description {
+state: "default" 0.0;
+rel1 {
+ relative: 0.0 0.5;
+ offset: 0 -9;
+}
+rel2 {
+ relative: 1.0 0.5;
+ offset: -1 8;
+}
+ }
+ }
+ part {
+ name: "confine";
+ type: RECT;
+ description {
+state: "default" 0.0;
+visible: 0;
+rel1 {
+ relative: 0.0 0.0;
+ offset: 2 0;
+ to: "progress_bar";
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -3 0;
+ to: "progress_bar";
+}
+ }
+ }
+ part {
+ name: "etk.dragable.filler";
+ mouse_events: 0;
+ dragable {
+confine: "confine";
+x: 1 1 1;
+y: 0 0 0;
+ }
+ description {
+state: "default" 0.0;
+min: 0 14;
+fixed: 1 1;
+rel1 {
+ relative: 0.5 0.5;
+ offset: 0 0;
+ to: "progress_bar";
+}
+rel2 {
+ relative: 0.5 0.5;
+ offset: 0 0;
+ to: "progress_bar";
+}
+image {
+ normal: "scrollbar_hdrag1.png";
+ border: 5 5 5 5;
+}
+fill {
+ smooth: 0;
+}
+ }
+ }
+ part {
+ name: "etk.text.text";
+ type: TEXT;
+ clip_to: "clip";
+ mouse_events: 0;
+ description {
+state: "default" 0.0;
+color: 0 0 0 255;
+rel1 {
+ relative: 0.0 0.0;
+ offset: 4 3;
+ to: "progress_bar";
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -5 -3;
+ to: "progress_bar";
+}
+text {
+ text: "Text";
+ font: "Vera";
+ size: 10;
+ align: 0.5 0.5;
+}
+ }
+ }
+ }
+}
/* TODO: document "etk/tree/grid" */
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/etk lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : libs/etk
Dir : e17/libs/etk/src/bin
Modified Files:
etk_tree_test.c
Log Message:
Progress Bar model fixed
===
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- etk_tree_test.c 10 Apr 2007 22:42:32 - 1.44
+++ etk_tree_test.c 6 Jul 2007 21:51:37 - 1.45
@@ -14,7 +14,7 @@
static Etk_Widget *win = NULL;
Etk_Widget *vbox;
Etk_Widget *tree;
- Etk_Tree_Col *col1, *col2, *col3, *col4, *col5;
+ Etk_Tree_Col *col1, *col2, *col3, *col4, *col5, *col6;
Etk_Tree_Row *row;
Etk_Widget *statusbar;
Etk_Color c_warn;
@@ -31,7 +31,7 @@
/* Create the window and the vbox where the widgets will be packed into */
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Etk Tree Test");
- etk_window_resize(ETK_WINDOW(win), 440, 500);
+ etk_window_resize(ETK_WINDOW(win), 640, 500);
etk_signal_connect("delete-event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(ETK_FALSE, 0);
@@ -61,6 +61,9 @@
col5 = etk_tree_col_new(ETK_TREE(tree), "Column 5", 60, 0.5);
etk_tree_col_model_add(col5, etk_tree_model_checkbox_new());
+ col6 = etk_tree_col_new(ETK_TREE(tree), "Column 6", 60, 0.0);
+ etk_tree_col_model_add(col6, etk_tree_model_progress_bar_new());
+
etk_tree_build(ETK_TREE(tree));
/* Then we add the rows to the tree. etk_tree_freeze/thaw() is used to
improve
@@ -78,6 +81,7 @@
col3, 7,
col4, PACKAGE_DATA_DIR "/images/1star.png", NULL,
col5, ETK_FALSE,
+ col6, 0.57, "57 %",
NULL);
sprintf(row_name, "Row %d", (i * 3) + 2);
@@ -88,6 +92,7 @@
col3, 19,
col4, PACKAGE_DATA_DIR "/images/2stars.png", NULL,
col5, ETK_TRUE,
+ col6, 0.20, "20 %",
NULL);
sprintf(row_name, "Row %d",
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje barbieri
Enlightenment CVS committal
Author : barbieri
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_cache.c
Log Message:
Use a more appropriate message for files not found than 'Unknown Format'
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_cache.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- edje_cache.c5 Apr 2007 15:54:16 - 1.12
+++ edje_cache.c6 Jul 2007 20:46:32 - 1.13
@@ -100,6 +100,13 @@
Edje_Part_Collection *edc;
Eet_File *ef;
Evas_List *l;
+ struct stat st;
+
+ if (stat(file, &st) != 0)
+ {
+ *error_ret = EDJE_LOAD_ERROR_DOES_NOT_EXIST;
+ return NULL;
+ }
ef = eet_open(file, EET_FILE_MODE_READ);
if (!ef)
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-ecore/ecore/evas Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-evas Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-edje/examples/evas-demo Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-evas/evas Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-emotion Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-edje/edje Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-ecore Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-ecore/ecore Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto barbieri
Enlightenment CVS committal Author : barbieri Project : e17 Module : proto Dir : e17/proto/python-efl/python-edje Added Files: .cvsignore Log Message: cvsignore for python-efl - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit.h exhibit_file.c exhibit_image.c exhibit_image.h
exhibit_main.c exhibit_menus.c exhibit_menus.h
exhibit_options.c exhibit_slideshow.c
Log Message:
* Added a moved to dialog (requested by Sara)
* cleanups.
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- exhibit.h 6 Jul 2007 11:11:49 - 1.45
+++ exhibit.h 6 Jul 2007 20:29:50 - 1.46
@@ -259,6 +259,7 @@
Etk_Widget *filechooser;
Etk_Widget *entry;
Etk_Image *im;
+ Etk_Widget *hbox;
Exhibit *e;
};
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_file.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- exhibit_file.c 6 Jul 2007 11:49:46 - 1.19
+++ exhibit_file.c 6 Jul 2007 20:29:50 - 1.20
@@ -26,7 +26,6 @@
static Etk_Widget *dialog;
static Etk_Widget *progressbar;
-
static void
_ex_file_download_dialog_response(Etk_Object *obj, int response_id, void *data)
{
@@ -48,7 +47,7 @@
{
char string[PATH_MAX + 16];
- sprintf(string, "Downloading %s", url);
+ snprintf(string, sizeof(string), "Downloading %s", url);
dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_INFO,
ETK_MESSAGE_DIALOG_CANCEL,
@@ -113,7 +112,6 @@
etk_object_destroy(ETK_OBJECT(dialog));
E_FREE(data);
D(("Download of file %s is done\n", file));
-
}
int
@@ -121,7 +119,7 @@
{
char *ext;
int i = 0;
- char *mime = NULL;
+ const char *mime = NULL;
if (!(mime = efreet_mime_type_get(file)))
{
@@ -178,15 +176,15 @@
int
_ex_file_is_jpg(char *file)
{
- char*ext;
+ const char *mime;
- ext = strrchr(file, '.');
- if (!ext) return 0;
+ if (!(mime = efreet_mime_type_get(file)))
+ return 0;
- if (strcasecmp(ext, ".jpg") && strcasecmp(ext, ".jpeg"))
- return 0;
+ if (!strcasecmp(mime, "image/jpeg"))
+ return 1;
- return 1;
+ return 0;
}
char *
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- exhibit_image.c 22 Jun 2007 20:33:32 - 1.50
+++ exhibit_image.c 6 Jul 2007 20:29:50 - 1.51
@@ -599,15 +599,37 @@
}
void
-_ex_image_save_as_entry_cb(Etk_Object *object, void *event, void *data)
+_ex_image_move_entry_cb(Etk_Object *object, Etk_Event_Key_Down *ev, void *data)
{
- Etk_Event_Key_Down *ev = event;
-
if (!strcmp(ev->key, "Return") || !strcmp(ev->key, "KP_Enter"))
- _ex_image_save_as_cb(data);
+ _ex_image_move_cb(data);
+}
+
+void
+_ex_image_move_cb(void *data)
+{
+ Ex_Filedialog *fd = data;
+ char *basename;
+ int ret;
+
+ basename = strdup(etk_entry_text_get(ETK_ENTRY(fd->entry)));
+ ret = _ex_image_save_as_cb(data);
+ if (basename)
+ {
+ if (ret)
+ ecore_file_unlink(basename);
+ free(basename);
+ }
}
void
+_ex_image_save_as_entry_cb(Etk_Object *object, Etk_Event_Key_Down *ev, void
*data)
+{
+ if (!strcmp(ev->key, "Return") || !strcmp(ev->key, "KP_Enter"))
+ _ex_image_save_as_cb(data);
+}
+
+int
_ex_image_save_as_cb(void *data)
{
Ex_Filedialog *fd = data;
@@ -615,52 +637,55 @@
const char *basename;
const char *dir;
Etk_Image *im = ETK_IMAGE(fd->e->cur_tab->image);
+ int res = 0;
basename = etk_entry_text_get(ETK_ENTRY(fd->entry));
dir = etk_filechooser_widget_current_folder_get
(ETK_FILECHOOSER_WIDGET(fd->filechooser));
-
+
if (!dir || !basename)
-return;
-
- sprintf(file, "%s/%s", dir, basename);
- D(("Saving: %s\n", file));
+goto destroy;
- /* Dont fork for the tree polulating to work */
- evas_object_image_save(etk_image_evas_object_get(im), file, NULL, NULL);
+{
+ char *r1, *r2;
+ int ret;
+
+ r1 = ecore_file_realpath(dir);
+ r2 = ecore_file_realpath(e->cur_tab->cur_path);
+
+ ret = strcmp(r1, r2);
+ free(r1);
+ free(r2);
+
+ if (!ret)
+goto destroy;;
+}
+
+ snprintf(file, sizeof(file), "%s/%s", dir, basename);
+ D(("Saving: %s\n", file));
- etk_widget_hide(fd->win);
+ /* Dont fork for the tree polulating to work */
+ evas_object_image_save(etk_image_evas_object_get(im), file, NULL, NULL);
+ res = 1;
+
+destroy:
+ _ex_image_file_dialog_destroy(fd);
+ return res;
}
-void
-_ex_image_save_as(Exhibit *e)
+Ex_Filedialog *
+_ex_image_file_dialog_new()
{
- static Ex_Filedialog *fd = NULL;
+ Ex_Filedialog *fd;
Etk_Widget *vbox;
- Etk_Widget *hbox;
- Etk_Widget *btn;
Etk_Widget *label
E CVS: libs/ewl pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_icon.c ewl_icon.h
Log Message:
those functions weren't implemented and aren't needed, since we have the
context menu
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- ewl_icon.c 3 Jul 2007 02:47:43 - 1.38
+++ ewl_icon.c 6 Jul 2007 20:15:27 - 1.39
@@ -363,43 +363,6 @@
}
/**
- * @param icon: The icon to set the menu into
- * @param menu: The mneu to set on the icon
- * @return Returns no value
- * @brief Set the menu for the icon
- */
-void
-ewl_icon_menu_set(Ewl_Icon *icon, Ewl_Widget *menu)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR("icon", icon);
- DCHECK_PARAM_PTR("menu", menu);
- DCHECK_TYPE("icon", icon, EWL_ICON_TYPE);
- DCHECK_TYPE("menu", menu, EWL_MENU_TYPE);
-
- printf("FIXME: MENUS NOT HOOKED INTO ICONS YET\n");
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-/**
- * @param icon: The icon to get the menu from
- * @return Returns the menu set on this icon, or NULL if none set
- * @brief Retrieve the menu from the icon
- */
-Ewl_Widget *
-ewl_icon_menu_get(Ewl_Icon *icon)
-{
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR_RET("icon", icon, NULL);
- DCHECK_TYPE_RET("icon", icon, EWL_ICON_TYPE, NULL);
-
- printf("FIXME: MENUS NOT HOOKED INTO ICONS YET\n");
-
- DRETURN_PTR(NULL, DLEVEL_STABLE);
-}
-
-/**
* @param icon: The icon to set the extended data into
* @param ext: The extended data to set in the icon
* @return Returns no value
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_icon.h 3 Jul 2007 02:47:43 - 1.17
+++ ewl_icon.h 6 Jul 2007 20:15:27 - 1.18
@@ -46,7 +46,6 @@
Ewl_Widget *label; /**< The icons label */
Ewl_Widget *image; /**< The icons image */
Ewl_Widget *alt;/**< The icons alt text */
- Ewl_Widget *menu; /**< The icons menu */
Ewl_Widget *extended; /**< The icons extended information */
char *label_text; /**< The label text */
@@ -99,9 +98,6 @@
voidewl_icon_extended_data_set(Ewl_Icon *icon, Ewl_Widget *ext);
Ewl_Widget *ewl_icon_extended_data_get(Ewl_Icon *icon);
-
-voidewl_icon_menu_set(Ewl_Icon *icon, Ewl_Widget *menu);
-Ewl_Widget *ewl_icon_menu_get(Ewl_Icon *icon);
/*
* Internal stuff
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit_main.c
Log Message:
big dirs load much faster now. tested on a dir with 3000 images without any gui
blocks. note: sorting is done after everything is loaded for now, this needs
fixing
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- exhibit_main.c 6 Jul 2007 11:11:49 - 1.109
+++ exhibit_main.c 6 Jul 2007 18:58:10 - 1.110
@@ -3,9 +3,23 @@
*/
#include "exhibit.h"
+/* defines the max number of additions to the tree per timer tick */
+#define MAX_INSERTS_PER_ITERATION 200
+
+/* defines the timer tick interval for tree inserts */
+#define INSERTS_INTERVAL 0.15
+
extern pid_t pid;
extern Evas_List *thumb_list;
+typedef struct _Ex_Populate_Data Ex_Populate_Data;
+
+struct _Ex_Populate_Data
+{
+ char *selected_file;
+ Ex_Tree_Update update;
+};
+
Exhibit *e;
Evas_List *event_handlers;
@@ -202,44 +216,31 @@
return strcasecmp(dir1, dir2);
}
-void
-_ex_main_populate_files(const char *selected_file, Ex_Tree_Update update)
+int
+_ex_main_populate_files_timer_cb(void *fdata)
{
- char back[PATH_MAX];
- DIR *dir;
+ Ex_Populate_Data *data;
+ int i = 0;
+ static DIR *dir = NULL;
struct dirent *dir_entry;
-
- _ex_main_image_unset();
- chdir(e->cur_tab->dir);
-
- if (update == EX_TREE_UPDATE_ALL || update == EX_TREE_UPDATE_DIRS)
- {
- snprintf(back, PATH_MAX, "..");
- etk_tree_row_append(ETK_TREE(e->cur_tab->dtree), NULL, e->cur_tab->dcol,
- etk_theme_icon_path_get(), "actions/go-up_16", back,
NULL);
- }
-
- if (e->cur_tab->monitor)
+
+ data = fdata;
+ if (!dir)
{
- D(("Removing old monitoring\n"));
- ecore_file_monitor_del(e->cur_tab->monitor);
- e->cur_tab->monitor = NULL;
+ if ((dir = opendir(".")) == NULL)
+ {
+if (data)
+ {
+ if (data->selected_file)
+ free(data->selected_file);
+ free(data);
+ }
+return 0;
+ }
}
- if ((dir = opendir(".")) == NULL)
- return;
-
etk_tree_freeze(ETK_TREE(e->cur_tab->itree));
- etk_tree_freeze(ETK_TREE(e->cur_tab->dtree));
-
- getcwd(e->cur_tab->cur_path, PATH_MAX);
- if (strlen(e->cur_tab->cur_path) < PATH_MAX - 2)
- {
- int len = strlen(e->cur_tab->cur_path);
- e->cur_tab->cur_path[len] = '/';
- e->cur_tab->cur_path[len + 1] = '\0';
- }
-
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry))),
e->cur_tab->cur_path);
+ etk_tree_freeze(ETK_TREE(e->cur_tab->dtree));
while ((dir_entry = readdir(dir)) != NULL)
{
@@ -247,6 +248,7 @@
char imagereal[PATH_MAX];
struct stat st;
+ ++i;
/* Do not include current dir/above dir */
if ((!strcmp (dir_entry->d_name, ".")) || (!strcmp (dir_entry->d_name,
"..")))
continue;
@@ -254,10 +256,10 @@
/* Show hidden files and directories? */
if ((!e->options->list_hidden) && (dir_entry->d_name[0] == '.'))
continue;
-
+
snprintf(image, PATH_MAX, "%s", dir_entry->d_name);
- if (update == EX_TREE_UPDATE_ALL || update == EX_TREE_UPDATE_DIRS)
+ if (data->update == EX_TREE_UPDATE_ALL || data->update ==
EX_TREE_UPDATE_DIRS)
{
if(stat(image, &st) == -1) continue;
if(S_ISDIR(st.st_mode))
@@ -273,7 +275,7 @@
}
/* If we don't want to do the rtree updating */
- if (update == EX_TREE_UPDATE_DIRS)
+ if (data->update == EX_TREE_UPDATE_DIRS)
continue;
if ((!e->options->show_all_filetypes) &&
(!_ex_file_is_viewable(dir_entry->d_name)))
@@ -282,13 +284,19 @@
if(!realpath(image, imagereal))
snprintf(imagereal, PATH_MAX, "%s", image);
- _ex_main_itree_add(imagereal, selected_file);
+ _ex_main_itree_add(imagereal, data->selected_file);
+
+ if (i == MAX_INSERTS_PER_ITERATION)
+ {
+etk_tree_thaw(ETK_TREE(e->cur_tab->itree));
+etk_tree_thaw(ETK_TREE(e->cur_tab->dtree));
+
+ecore_timer_add(INSERTS_INTERVAL,
_ex_main_populate_files_timer_cb, data);
+return 0;
+ }
}
- etk_tree_thaw(ETK_TREE(e->cur_tab->itree));
- etk_tree_thaw(ETK_TREE(e->cur_tab->dtree));
-
- if (update == EX_TREE_UPDATE_FILES || update == EX_TREE_UPDATE_ALL)
+ if (data->update == EX_TREE_UPDATE_FILES || data->update ==
EX_TREE_UPDATE_ALL)
{
if (e->options->default_sort == EX_SORT_BY_DATE)
_ex_sort_date_cb(NULL, NULL);
@@ -300,9 +308,12 @@
_ex_sort
E CVS: apps/e codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: ++TODO === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.547 retrieving revision 1.548 diff -u -3 -r1.547 -r1.548 --- TODO17 Jun 2007 01:11:11 - 1.547 +++ TODO6 Jul 2007 11:52:10 - 1.548 @@ -42,6 +42,8 @@ ESSENTIAL FEATURES --- +* after creating a background with the bg config dialog, we need to be able + to change its properties (stretch, tile, center, etc...) * fm2 removable devices seem to be mounted as root, not user, thus no write * fm2 theme needs to not suck * fwin initial placement needs to be near icon that spawned the fwin - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : apps/exhibit Dir : e17/apps/exhibit/src/bin Modified Files: exhibit_file.c Log Message: small fix, if not a valid mime and not in the table, cant be visible === RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_file.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- exhibit_file.c 6 Jul 2007 11:11:49 - 1.18 +++ exhibit_file.c 6 Jul 2007 11:49:46 - 1.19 @@ -133,6 +133,7 @@ if(!strcasecmp(ext, viewables[i])) return 1; } + return 0; } for (i = 0; mimes[i]; i++) - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit
Modified Files:
configure.in
Log Message:
use efreet for checking mime types, dont use string compares extension (unless
efreet cant determine it, in which case its either invalid or something like an
edje file)
===
RCS file: /cvs/e/e17/apps/exhibit/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- configure.in28 Apr 2007 10:40:58 - 1.11
+++ configure.in6 Jul 2007 11:11:48 - 1.12
@@ -85,95 +85,18 @@
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code
Directory])
-#check for EET
-PKG_CHECK_MODULES(EET, [eet >= 0.9.10.030],
- [
- AC_DEFINE(HAVE_EET, 1, have EET)
- eet="EET "
- AM_CONDITIONAL(HAVE_EET, true)
- have_eet="yes"
- eet_libs=$EET_LIBS
- eet_cflags=$EET_CFLAGS
- ],
- [
- AC_MSG_ERROR([No Eet, can't build.])
- ]
-)
-
-#check for ECORE
-PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9.022],
- [
- AC_DEFINE(HAVE_ECORE, 1, have ECORE)
- ecore="ECORE "
- AM_CONDITIONAL(HAVE_ECORE, true)
- have_ecore="yes"
- ecore_libs=$ECORE_LIBS
- ecore_cflags=$ECORE_CFLAGS
- ],
- [
- AC_MSG_ERROR([No Ecore, can't build.])
- ]
-)
-
-#check for EVAS
-PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9.022],
- [
- AC_DEFINE(HAVE_EVAS, 1, have EVAS)
- evas="EVAS "
- AM_CONDITIONAL(HAVE_EVAS, true)
- have_evas="yes"
- evas_libs=$EVAS_LIBS
- evas_cflags=$EVAS_CFLAGS
- ],
- [
- AC_MSG_ERROR([No Evas, can't build.])
- ]
-)
-
-#check for EDJE
-PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0.022],
- [
- AC_DEFINE(HAVE_EDJE, 1, have EDJE)
- edje="EDJE "
- AM_CONDITIONAL(HAVE_EDJE, true)
- have_edje="yes"
- edje_libs=$EDJE_LIBS
- edje_cflags=$EDJE_CFLAGS
- ],
- [
- AC_MSG_ERROR([No Edje, can't build.])
- ]
-)
-
-#check for ETK
-PKG_CHECK_MODULES(ETK, [etk >= 0.1.0.001],
- [
- AC_DEFINE(HAVE_ETK, 1, have ETK)
- etk="ETK "
- AM_CONDITIONAL(HAVE_ETK, true)
- have_etk="yes"
- etk_libs=$ETK_LIBS
- etk_cflags=$ETK_CFLAGS
- ],
- [
- AC_MSG_ERROR([No Etk, can't build.])
- ]
-)
-
-#check for EPSILON
-PKG_CHECK_MODULES(EPSILON, [epsilon >= 0.3.0.004],
- [
- AC_DEFINE(HAVE_EPSILON, 1, have EPSILON)
- epsilon="EPSILON "
- AM_CONDITIONAL(HAVE_EPSILON, true)
- have_epsilon="yes"
- epsilon_libs=$EPSILON_LIBS
- epsilon_cflags=$EPSILON_CFLAGS
- ],
- [
- AC_MSG_ERROR([No Epsilon, can't build.])
- ]
-)
+PKG_CHECK_MODULES(EXHIBIT, [
+ evas
+ ecore
+ ecore-evas
+ ecore-file
+ edje
+ eet
+ etk
+ efreet
+ efreet-mime
+ epsilon
+])
#check for E
AC_PATH_EFL(
@@ -213,17 +136,21 @@
]
)
-
dnl Set ETK_PACKAGE_DATA_DIR in config.h.
etk_prefix="\"$(pkg-config --variable=prefix etk)/share/etk\""
AC_DEFINE_UNQUOTED(ETK_PACKAGE_DATA_DIR, $etk_prefix, [Data dir for etk lib.])
-
-# add your required libs / include here
-my_includes="$eet_cflags $ecore_cflags $evas_cflags $edje_cflags $etk_cflags
$epsilon_cflags $engrave_cflags"
-my_libs="$eet_libs $ecore_libs $evas_libs $edje_libs $etk_libs $epsilon_libs
$engrave_libs"
-AC_SUBST(my_includes)
-AC_SUBST(my_libs)
+# required libs / cflags
+exhibit_libs=$EXHIBIT_LIBS
+exhibit_cflags=$EXHIBIT_CFLAGS
+AC_SUBST(exhibit_libs)
+AC_SUBST(exhibit_cflags)
+
+#optional libs / cflags
+optional_cflags="$engrave_cflags"
+optional_libs="$engrave_libs"
+AC_SUBST(optional_cflags)
+AC_SUBST(optional_libs)
AC_OUTPUT([
Makefile
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
Makefile.am exhibit.h exhibit_file.c exhibit_main.c
Log Message:
use efreet for checking mime types, dont use string compares extension (unless
efreet cant determine it, in which case its either invalid or something like an
edje file)
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 15 Sep 2006 11:30:10 - 1.10
+++ Makefile.am 6 Jul 2007 11:11:49 - 1.11
@@ -4,7 +4,8 @@
-Wall -g \
-I/usr/local/include \
-I$(top_srcdir)/lib \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
bin_PROGRAMS = exhibit
@@ -31,7 +32,7 @@
exhibit_menus.c \
exhibit_sort.c \
exhibit_thumb.c \
-exhibit_tab.c \
+exhibit_tab.c \
exhibit_slideshow.c \
exhibit_favorites.c \
exhibit_options.c \
@@ -40,4 +41,4 @@
exhibit_model_wobbly.c \
$(exhibit_INCLUDES)
-exhibit_LDADD = @my_libs@
+exhibit_LDADD = @exhibit_libs@ @optional_libs@
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- exhibit.h 6 Jul 2007 10:17:54 - 1.44
+++ exhibit.h 6 Jul 2007 11:11:49 - 1.45
@@ -13,6 +13,7 @@
#include
#include
#include
+#include
#include
#include
#include
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_file.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- exhibit_file.c 1 Jun 2007 10:19:06 - 1.17
+++ exhibit_file.c 6 Jul 2007 11:11:49 - 1.18
@@ -6,17 +6,20 @@
static void _ex_file_download_dialog_response(Etk_Object *obj, int
response_id, void *data);
-char *viewables[] =
+char *viewables[] =
{
- ".jpg",
- ".jpeg",
- ".png",
- ".gif",
- ".tiff",
".edj",
- ".svg",
- ".svgz",
- ".xpm",
+ NULL
+};
+
+char *mimes[] =
+{
+ "image/jpeg",
+ "image/png",
+ "image/gif",
+ "image/tiff",
+ "image/svg+xml",
+ "image/xpm",
NULL
};
@@ -118,13 +121,23 @@
{
char *ext;
int i = 0;
+ char *mime = NULL;
- ext = strrchr(file, '.');
- if(!ext) return 0;
+ if (!(mime = efreet_mime_type_get(file)))
+ {
+ ext = strrchr(file, '.');
+ if(!ext) return 0;
+
+ for(i = 0; viewables[i]; i++)
+ {
+if(!strcasecmp(ext, viewables[i]))
+ return 1;
+ }
+ }
- for(i = 0; viewables[i]; i++)
+ for (i = 0; mimes[i]; i++)
{
- if(!strcasecmp(ext, viewables[i]))
+ if (!strcasecmp(mime, mimes[i]))
return 1;
}
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- exhibit_main.c 6 Jul 2007 10:17:54 - 1.108
+++ exhibit_main.c 6 Jul 2007 11:11:49 - 1.109
@@ -1165,7 +1165,13 @@
fprintf(stderr, "Could not init etk. Exiting...\n");
return 0;
};
-
+
+ if (!efreet_mime_init())
+ {
+ fprintf(stderr, "Could not init Efreet. Exiting...\n");
+ return 0;
+ }
+
ecore_file_init();
if(!_ex_options_init())
fprintf(stderr, "WARNING: Exhibit could not set up its options files!\n"
@@ -1184,6 +1190,7 @@
_ex_options_save(e);
_ex_options_shutdown();
ecore_file_shutdown();
+ efreet_mime_shutdown();
etk_shutdown();
return 0;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/exhibit codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit.h exhibit_main.c exhibit_thumb.c
Log Message:
As per morlenxus' request, populate the image tree first with filenames, then
display thumbs as they are loaded. This makes browsing large dirs faster and
you instantly get a list of files.
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- exhibit.h 4 Jul 2007 15:27:44 - 1.43
+++ exhibit.h 6 Jul 2007 10:17:54 - 1.44
@@ -250,7 +250,6 @@
Etk_Bool selected;
Epsilon *ep;
Ex_Tab *tab;
- Etk_Bool is_update;
};
struct _Ex_Filedialog
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- exhibit_main.c 4 Jul 2007 15:27:44 - 1.107
+++ exhibit_main.c 6 Jul 2007 10:17:54 - 1.108
@@ -367,7 +367,6 @@
thumb->e = e;
thumb->name = strdup(basename((char *) file));
thumb->tab = e->cur_tab;
- thumb->is_update = ETK_FALSE;
thumb_list = evas_list_append(thumb_list, thumb);
if(selected_file)
{
@@ -376,6 +375,11 @@
}
else
thumb->selected = ETK_FALSE;
+
+ row = etk_tree_row_append(ETK_TREE(e->cur_tab->itree), NULL,
+ e->cur_tab->icol,
+ NULL, NULL,
+ basename((char *) file), NULL);
if(pid == -1) _ex_thumb_generate();
}
===
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_thumb.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- exhibit_thumb.c 1 Jun 2007 10:19:06 - 1.15
+++ exhibit_thumb.c 6 Jul 2007 10:17:54 - 1.16
@@ -28,23 +28,13 @@
Etk_Tree_Row *row;
thumb->image = (char*)epsilon_thumb_file_get(thumb->ep);
- if (thumb->is_update)
- {
-row = _ex_image_find_row_from_file(thumb->tab, thumb->name);
-etk_tree_row_fields_set(row,
-ETK_FALSE,
-thumb->tab->icol,
-thumb->image, NULL,
-thumb->name, NULL);
- }
- else
- {
-row = etk_tree_row_append(ETK_TREE(thumb->tab->itree),
- NULL,
- thumb->tab->icol,
- thumb->image, NULL,
- thumb->name, NULL);
- }
+ row = _ex_image_find_row_from_file(thumb->tab, thumb->name);
+ etk_tree_row_fields_set(row,
+ ETK_FALSE,
+ thumb->tab->icol,
+ thumb->image, NULL,
+ thumb->name, NULL);
+
if(thumb->selected)
{
etk_tree_row_select(row);
@@ -174,7 +164,6 @@
thumb->tab = e->cur_tab;
thumb_list = evas_list_append(thumb_list, thumb);
thumb->selected = ETK_FALSE;
- thumb->is_update = ETK_TRUE;
etk_tree_model_cache_remove(thumb->tab->imodel, old_thumb, NULL);
if(pid == -1) _ex_thumb_generate();
}
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
