E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e Modified Files: configure.in ChangeLog timestamp.h Log Message: Sun Aug 13 14:46:37 CEST 2006 (Kim) --- 0.16.8.3 0.02 --- Add usual keybindings to about dialog. Some more dialog creation refactoring bits. Rename some macros (_Ewin...) for consistency. Eliminate redundant macro (Xwin). Add override redirect flag to map event debug info. Fix some segv's in obscure situations. Still more dialog creation refactoring bits. Fix clients resizing while having bogus max size hint (KDE info windows). Fix incorrect menu placement near left screen edge. Fix config parameter type. Avoid dangling buffer. Eliminate some redundant code. Fix shape on pager zoom window (when composite is enabled). Defer tooltip realization. Add note about ARGB window borders. === RCS file: /cvs/e/e16/e/configure.in,v retrieving revision 1.160 retrieving revision 1.161 diff -u -3 -r1.160 -r1.161 --- configure.in25 Jul 2006 00:07:03 - 1.160 +++ configure.in13 Aug 2006 12:48:13 - 1.161 @@ -3,7 +3,7 @@ ENLIGHTENMENT_MAJOR=0 ENLIGHTENMENT_MINOR=16 ENLIGHTENMENT_MICRO=8.3 -ENLIGHTENMENT_REVISION=0.01 +ENLIGHTENMENT_REVISION=0.02 ENLIGHTENMENT_VERSION=$ENLIGHTENMENT_MAJOR.$ENLIGHTENMENT_MINOR.$ENLIGHTENMENT_MICRO if test x$ENLIGHTENMENT_REVISION != x; then ENLIGHTENMENT_REVNAME=$ENLIGHTENMENT_VERSION-$ENLIGHTENMENT_REVISION === RCS file: /cvs/e/e16/e/ChangeLog,v retrieving revision 1.211 retrieving revision 1.212 diff -u -3 -r1.211 -r1.212 --- ChangeLog 25 Jul 2006 00:07:04 - 1.211 +++ ChangeLog 13 Aug 2006 12:48:13 - 1.212 @@ -3965,3 +3965,24 @@ Split up, shuffle around file.c (no real changes). Eliminate a lot of stat's during configuration file parsing. + +--- + +Sun Aug 13 14:46:37 CEST 2006 +(Kim) + +--- 0.16.8.3 0.02 --- +Add usual keybindings to about dialog. +Some more dialog creation refactoring bits. +Rename some macros (_Ewin...) for consistency. +Eliminate redundant macro (Xwin). +Add override redirect flag to map event debug info. +Fix some segv's in obscure situations. +Still more dialog creation refactoring bits. +Fix clients resizing while having bogus max size hint (KDE info windows). +Fix incorrect menu placement near left screen edge. +Fix config parameter type. +Avoid dangling buffer. Eliminate some redundant code. +Fix shape on pager zoom window (when composite is enabled). +Defer tooltip realization. +Add note about ARGB window borders. === RCS file: /cvs/e/e16/e/timestamp.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- timestamp.h 25 Jul 2006 00:07:04 - 1.7 +++ timestamp.h 13 Aug 2006 12:48:13 - 1.8 @@ -1 +1 @@ -#define E_CHECKOUT_DATE $Date: 2006/07/25 00:07:04 $ +#define E_CHECKOUT_DATE $Date: 2006/08/13 12:48:13 $ - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: configure.in Log Message: Meh! Missed out a -I for entrance_cflags - Thnx to Jonathan Protzenko for catching that. === RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- configure.in13 Aug 2006 04:38:58 - 1.7 +++ configure.in13 Aug 2006 13:46:45 - 1.8 @@ -120,7 +120,7 @@ ) entrance_libs=-lentrance_edit -entrance_cflags=/usr/include/ +entrance_cflags=-I/usr/include/ AC_SUBST(entrance_libs) AC_SUBST(entrance_cflags) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
_ew_list.c _ew_list.h
Log Message:
- Theme dialog works now.
- I have a problem selecting the first row adding to the list. This should be
done in the widget such that after adding to a list, the first row is always
selected
will make our lives easier. Anyone wanting to do this *hint* *hint* should look
in src/widgets/ew_txtlist.c/ew_txtlist_add() and
src/widgets/ew_edjelist.c/ew_edjelist_add()
- I've cleaned up theme.c a bit more... it *looks* better. It still leaks like
a basket though. *hint* *hint*
- i need to sleep now :)
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- _ew_list.c 13 Aug 2006 00:54:58 - 1.3
+++ _ew_list.c 13 Aug 2006 06:17:27 - 1.4
@@ -74,10 +74,21 @@
return ewld;
}
+void
+ew_list_first_row_select(Entrance_List el)
+{
+ Etk_Tree_Row *row = etk_tree_first_row_get(ETK_TREE(el-owner));
+ etk_tree_row_select(row);
+}
+
void*
ew_list_selected_data_get(Entrance_List el)
{
Etk_Tree_Row *row = etk_tree_selected_row_get(ETK_TREE(el-owner));
+ if(!row) {
+ return NULL;
+ }
+
Entrance_List_Data ewld = etk_tree_row_data_get(row);
return ewld-data;
}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- _ew_list.h 13 Aug 2006 00:54:58 - 1.2
+++ _ew_list.h 13 Aug 2006 06:17:27 - 1.3
@@ -53,5 +53,6 @@
Entrance_List _ew_list_buildtree(Entrance_List);
Entrance_List_Data ew_listdata_new(void);
void* ew_list_selected_data_get(Entrance_List);
+void ew_list_first_row_select(Entrance_List);
#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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
main.c theme.c
Log Message:
- Theme dialog works now.
- I have a problem selecting the first row adding to the list. This should be
done in the widget such that after adding to a list, the first row is always
selected
will make our lives easier. Anyone wanting to do this *hint* *hint* should look
in src/widgets/ew_txtlist.c/ew_txtlist_add() and
src/widgets/ew_edjelist.c/ew_edjelist_add()
- I've cleaned up theme.c a bit more... it *looks* better. It still leaks like
a basket though. *hint* *hint*
- i need to sleep now :)
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- main.c 13 Aug 2006 04:38:58 - 1.5
+++ main.c 13 Aug 2006 06:17:27 - 1.6
@@ -1,4 +1,5 @@
#include Entrance_Widgets.h
+#include Entrance_Edit.h
#include Egui.h
#include config.h
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/theme.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- theme.c 13 Aug 2006 01:00:33 - 1.4
+++ theme.c 13 Aug 2006 06:17:27 - 1.5
@@ -2,11 +2,16 @@
#include Ecore_File.h
#include Ecore_Data.h
#include Entrance_Widgets.h
+#include Entrance_Edit.h
-static void _egui_theme_cb_selected(void);
-static void _egui_theme_cb_ok(void *object, void *data);
-static void _egui_theme_cb_apply(void *object, void *data);
-static void _egui_theme_cb_close(void *object, void *data);
+static void _theme_cb_selected(void);
+static void _theme_cb_ok(void *, void *);
+static void _theme_cb_apply(void *, void *);
+static void _theme_cb_close(void *, void *);
+
+static char* _theme_get_path(const char *);
+static void _theme_close(void);
+static void _theme_apply(void);
static Entrance_Dialog win;
static Entrance_Widget img_preview;
@@ -20,31 +25,35 @@
{
Ecore_List *themes;
char *theme;
- char theme_file[PATH_MAX];
win = ew_dialog_new(_(Entrance - Theme Chooser), EW_FALSE);
group_preview = ew_dialog_group_add(win, _(Preview));
+
img_preview = ew_image_new(320, 240);
- /* ew_image_edje_load(img_preview, /usr/share/entrance/themes/default.edj,
Preview);*/
ew_group_add(group_preview, img_preview);
group_themes = ew_dialog_group_add(win, _(Themes));
-
+
list_thumbs = ew_textlist_new(NULL, 320, 140, 20, 90);
/* scan for themes and add them to the list */
themes = ecore_file_ls(/usr/share/entrance/themes);
if(!themes || ecore_list_is_empty(themes))
return;
+
+ theme = ecore_list_first(themes);
+ char *theme_file = _theme_get_path(theme);
+ ew_image_edje_load(img_preview, theme_file, Preview);
+ free(theme_file);
+ /*FIXME: selecting the first row doesn't work - maybe we select first row
while adding elements to the list:(*/
+ ew_list_first_row_select(list_thumbs);
+
ecore_list_goto_first(themes);
while((theme = ecore_list_next(themes)))
{
-char *theme_no_ext;
-
-theme_no_ext = ecore_file_strip_ext(theme);
-snprintf(theme_file, sizeof(theme_file),
/usr/share/entrance/themes/%s, theme);
- ew_textlist_add(list_thumbs, theme_no_ext, theme_file,
strlen(theme_file) + 1, _egui_theme_cb_selected);
+char *theme_no_ext = ecore_file_strip_ext(theme);
+ ew_textlist_add(list_thumbs, theme_no_ext, theme, strlen(theme)
+ 1, _theme_cb_selected);
free(theme_no_ext);
}
@@ -54,37 +63,71 @@
/*Entrance_Widget group_options = ew_dialog_group_add(win, _(Options));*/
- ew_dialog_close_button_add(win, _egui_theme_cb_close, NULL);
- ew_dialog_apply_button_add(win, _egui_theme_cb_apply, NULL);
- ew_dialog_ok_button_add(win, _egui_theme_cb_ok, NULL);
+ ew_dialog_close_button_add(win, _theme_cb_close, NULL);
+ ew_dialog_apply_button_add(win, _theme_cb_apply, NULL);
+ ew_dialog_ok_button_add(win, _theme_cb_ok, NULL);
ew_dialog_show(win);
}
static void
-_egui_theme_cb_selected()
+_theme_cb_selected()
{
- char* themefile = ew_list_selected_data_get(list_thumbs);
- ew_image_edje_load(img_preview, themefile, Preview);
+ char* theme = ew_list_selected_data_get(list_thumbs);
+ char* theme_path = _theme_get_path(theme);
+ ew_image_edje_load(img_preview, theme_path, Preview);
+
+ free(theme_path);
}
static void
-_egui_theme_cb_ok(void *object, void *data)
+_theme_cb_ok(void *object, void *data)
{
- printf(ok pressed!\n);
- ew_dialog_destroy(win);
+ _theme_apply();
+ _theme_close();
}
static void
-_egui_theme_cb_apply(void *object, void *data)
+_theme_cb_apply(void *object, void *data)
+{
+ _theme_apply();
+}
+
+static void
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
Fix the Modified time to be logical.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_widget_fsel.c 13 Aug 2006 05:00:16 - 1.8
+++ e_widget_fsel.c 13 Aug 2006 06:51:33 - 1.9
@@ -437,7 +437,7 @@
size = _e_wid_file_size_get(st.st_size);
owner = _e_wid_file_user_get(st.st_uid);
perms = _e_wid_file_perms_get(st.st_mode, st.st_uid, st.st_gid);
- time = _e_wid_file_time_get(st.st_mtime);
+ time = _e_wid_file_time_get(st.st_mtime);
e_widget_entry_text_set(wd-o_preview_size_entry, size);
e_widget_entry_text_set(wd-o_preview_owner_entry, owner);
@@ -591,11 +591,27 @@
static char *
_e_wid_file_time_get(time_t st_modtime)
{
- char *time;
- time = ctime(st_modtime);
- if (time) time = strdup(time);
- else time = strdup(unknown);
- return time;
+ float diff;
+ time_t ltime;
+ char modtime[PATH_MAX];
+ char *motime;
+
+ ltime = time(NULL);
+ diff = difftime(ltime, st_modtime);
+ if (diff = 60) snprintf(modtime, PATH_MAX, Under a minute ago);
+ if (diff 60) snprintf(modtime, PATH_MAX, %d minutes ago,
((int)diff/60));
+ if (diff = 3600) snprintf(modtime, PATH_MAX, %d hours ago,
((int)diff/3600));
+ if (diff = 86400) snprintf(modtime, PATH_MAX, %d days ago,
((int)diff/86400));
+ if (diff = 604800) snprintf(modtime, PATH_MAX, %d weeks ago,
+ ((int)diff/604800));
+ if (diff = 2592000) snprintf(modtime, PATH_MAX, %d months ago,
+ ((int)diff/2592000));
+ if (diff = 31526000) snprintf(modtime, PATH_MAX, %d years ago,
+ ((int)diff/31526000));
+
+ if (modtime) motime = strdup(modtime);
+ else motime = strdup(unknown);
+ return motime;
}
static void
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_button.c etk_types.h
Added Files:
etk_tool_button.c etk_tool_button.h etk_toolbar.c
etk_toolbar.h
Log Message:
add toolbar and a tool_button. ***THIS IS NOT READY YET***
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- Etk.h 27 Jul 2006 01:04:52 - 1.35
+++ Etk.h 13 Aug 2006 15:33:17 - 1.36
@@ -26,6 +26,7 @@
#include etk_stock.h
#include etk_bin.h
#include etk_box.h
+#include etk_toolbar.h
#include etk_table.h
#include etk_alignment.h
#include etk_frame.h
@@ -41,6 +42,7 @@
#include etk_toggle_button.h
#include etk_check_button.h
#include etk_radio_button.h
+#include etk_tool_button.h
#include etk_editable_text_object.h
#include etk_textblock.h
#include etk_entry.h
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- Makefile.am 27 Jul 2006 01:04:52 - 1.40
+++ Makefile.am 13 Aug 2006 15:33:17 - 1.41
@@ -80,7 +80,9 @@
etk_viewport.h \
etk_widget.h \
etk_window.h \
-etk_engine.h
+etk_engine.h \
+etk_toolbar.h \
+etk_tool_button.h
libetk_la_SOURCES = \
etk_alignment.c \
@@ -146,6 +148,8 @@
etk_widget.c \
etk_window.c \
etk_engine.c \
+etk_toolbar.c \
+etk_tool_button.c \
$(ETKHEADERS)
installed_headersdir = $(prefix)/include/etk
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- etk_button.c13 Aug 2006 10:41:15 - 1.21
+++ etk_button.c13 Aug 2006 15:33:17 - 1.22
@@ -378,6 +378,7 @@
button-is_pressed = ETK_FALSE;
button-xalign = 0.5;
button-yalign = 0.5;
+ button-tool = ETK_FALSE;
etk_signal_connect(realize, ETK_OBJECT(button),
ETK_CALLBACK(_etk_button_realize_cb), NULL);
etk_signal_connect(key_down, ETK_OBJECT(button),
ETK_CALLBACK(_etk_button_key_down_cb), NULL);
@@ -603,7 +604,7 @@
if (!button-box)
{
if (button-tool)
- button-box = etk_vbox_new(ETK_FALSE, 8);
+ button-box = etk_vbox_new(ETK_FALSE, 1);
else
button-box = etk_hbox_new(ETK_FALSE, 8);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_types.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- etk_types.h 27 Jul 2006 16:49:35 - 1.49
+++ etk_types.h 13 Aug 2006 15:33:17 - 1.50
@@ -101,6 +101,8 @@
typedef struct Etk_Textblock_Node Etk_Textblock_Node;
typedef struct _Etk_Toggle_Button Etk_Toggle_Button;
typedef struct _Etk_Toplevel_Widget Etk_Toplevel_Widget;
+typedef struct _Etk_Toolbar Etk_Toolbar;
+typedef struct _Etk_Tool_Button Etk_Tool_Button;
typedef struct _Etk_Tree Etk_Tree;
typedef struct _Etk_Tree_Col Etk_Tree_Col;
typedef struct _Etk_Tree_Model Etk_Tree_Model;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Added Files: tool_button.edc toolbar.edc Log Message: add toolbar and a tool_button. ***THIS IS NOT READY YET*** - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: images.edc Added Files: toolbar.png Log Message: add toolbar and a tool_button. ***THIS IS NOT READY YET*** === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/images.edc,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- images.edc 7 Aug 2006 20:01:21 - 1.29 +++ images.edc 13 Aug 2006 15:33:17 - 1.30 @@ -95,4 +95,5 @@ image: wm_bg_overlay.png COMP; image: wm_border.png COMP; image: wm_shadow.png COMP; + image: toolbar.png COMP; } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_menu_test.c
Log Message:
add toolbar and a tool_button. ***THIS IS NOT READY YET***
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_menu_test.c 24 Jun 2006 17:54:06 - 1.13
+++ etk_menu_test.c 13 Aug 2006 15:33:17 - 1.14
@@ -22,7 +22,9 @@
Etk_Widget *menu_item;
Etk_Widget *radio_item;
Etk_Widget *label;
-
+ Etk_Widget *toolbar;
+ Etk_Widget *button;
+
if (win)
{
etk_widget_show_all(ETK_WIDGET(win));
@@ -42,7 +44,28 @@
menu_bar = etk_menu_bar_new();
etk_box_pack_start(ETK_BOX(vbox), menu_bar, ETK_FALSE, ETK_FALSE, 0);
+
+ toolbar = etk_toolbar_new();
+ etk_box_pack_start(ETK_BOX(vbox), toolbar, ETK_FALSE, ETK_FALSE, 0);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_COPY);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_CUT);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_PASTE);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_FIND);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_UNDO);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_REDO);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
label = etk_label_new(Click me! :));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
etk_widget_pass_mouse_events_set(label, ETK_TRUE);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default Modified Files: default.edc Log Message: add toolbar and a tool_button. ***THIS IS NOT READY YET*** === RCS file: /cvs/e/e17/proto/etk/data/themes/default/default.edc,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- default.edc 30 Jul 2006 21:09:31 - 1.21 +++ default.edc 13 Aug 2006 15:33:16 - 1.22 @@ -31,6 +31,7 @@ #include widgets/tooltips.edc #include widgets/iconbox.edc #include widgets/colorpicker.edc + #include widgets/toolbar.edc #include wm/background.edc #include wm/borders.edc - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
Ecore_Desktop.h ecore_desktop.c
Log Message:
* Make ecore_desktop handle trash files (same fdo format)
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/Ecore_Desktop.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Ecore_Desktop.h 11 Aug 2006 13:45:39 - 1.1
+++ Ecore_Desktop.h 13 Aug 2006 08:36:15 - 1.2
@@ -33,6 +33,8 @@
char *exec;
char *icon;
char *icon_path;
+ char* path;
+ char* deletiondate;
char *startup;
char *window_class;
int allocated; /* FIXME: NoDisplay, Hidden */
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecore_desktop.c 11 Aug 2006 13:45:39 - 1.1
+++ ecore_desktop.c 13 Aug 2006 08:36:15 - 1.2
@@ -147,7 +147,14 @@
value = (char *)ecore_hash_get(result-group,
StartupNotify);
if (value)
result-startup = (!strcmp(value, true)) ? 1 :
0;
-}
+} else {
+ /*Maybe it's a 'trash' file - which also follows
the Desktop FDO spec*/
+ result-group = (Ecore_Hash *)
ecore_hash_get(result-data, Trash Info);
+ if (result-group) {
+ result-path = (char
*)ecore_hash_get(result-group, Path);
+ result-deletiondate = (char
*)ecore_hash_get(result-group, DeletionDate);
+ }
+ }
ecore_hash_set(desktop_cache, strdup(file), result);
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
ecompmgr.c eobj.c
Log Message:
Wrap.
===
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- ecompmgr.c 12 Aug 2006 19:42:47 - 1.122
+++ ecompmgr.c 13 Aug 2006 09:17:02 - 1.123
@@ -935,25 +935,25 @@
bw = cw-bw;
if (Mode_compmgr.use_pixmap)
{
- cw-rcx = eo-x;
- cw-rcy = eo-y;
- cw-rcw = eo-w + 2 * bw;
- cw-rch = eo-h + 2 * bw;
+ cw-rcx = EobjGetX(eo);
+ cw-rcy = EobjGetY(eo);
+ cw-rcw = EobjGetW(eo) + 2 * bw;
+ cw-rch = EobjGetH(eo) + 2 * bw;
}
else
{
- cw-rcx = eo-x + bw;
- cw-rcy = eo-y + bw;
- cw-rcw = eo-w;
- cw-rch = eo-h;
+ cw-rcx = EobjGetX(eo) + bw;
+ cw-rcy = EobjGetY(eo) + bw;
+ cw-rcw = EobjGetW(eo);
+ cw-rch = EobjGetH(eo);
}
if (eo-noredir bw)
{
- r.x = eo-x;
- r.y = eo-y;
- r.width = eo-w + 2 * bw;
- r.height = eo-h + 2 * bw;
+ r.x = EobjGetX(eo);
+ r.y = EobjGetY(eo);
+ r.width = EobjGetW(eo) + 2 * bw;
+ r.height = EobjGetH(eo) + 2 * bw;
}
else
{
@@ -1062,14 +1062,14 @@
XserverRegion rgn;
/* Intersect with window size to get effective bounding region */
- rgn = ERegionCreateRect(0, 0, eo-w, eo-h);
+ rgn = ERegionCreateRect(0, 0, EobjGetW(eo), EobjGetH(eo));
ERegionIntersect(border, rgn);
ERegionDestroy(rgn);
}
/* translate this */
- x = eo-x + cw-bw;
- y = eo-y + cw-bw;
+ x = EobjGetX(eo) + cw-bw;
+ y = EobjGetY(eo) + cw-bw;
ERegionTranslate(border, x, y);
D2printf(shape %#lx: %d %d\n, EobjGetXwin(eo), x, y);
@@ -1559,8 +1559,8 @@
h = ev-xconfigure.height;
bw = ev-xconfigure.border_width;
- change_xy = eo-x != x || eo-y != y;
- change_wh = eo-w != w || eo-h != h;
+ change_xy = EobjGetX(eo) != x || EobjGetY(eo) != y;
+ change_wh = EobjGetW(eo) != w || EobjGetH(eo) != h;
change_bw = cw-bw != bw;
eo-x = x;
@@ -1578,8 +1578,8 @@
ECmWinInfo *cw = eo-cmhook;
D1printf(ECompMgrWinReparent %#lx %#lx d=%d-%d x,y=%d,%d %d\n,
- EobjGetXwin(eo), cw-extents, eo-desk-num, dsk-num, eo-x, eo-y,
- change_xy);
+ EobjGetXwin(eo), cw-extents, eo-desk-num, dsk-num,
+ EobjGetX(eo), EobjGetY(eo), change_xy);
/* Invalidate old window region */
if (EventDebug(EDBUG_TYPE_COMPMGR3))
@@ -1696,7 +1696,7 @@
{
parts = ERegionCreate();
XDamageSubtract(dpy, cw-damage, None, parts);
- ERegionTranslate(parts, eo-x + cw-bw, eo-y + cw-bw);
+ ERegionTranslate(parts, EobjGetX(eo) + cw-bw, EobjGetY(eo) + cw-bw);
#if 0 /* ENABLE_SHADOWS - FIXME - This is not right,
remove? */
if (Mode_compmgr.shadow_mode == ECM_SHADOWS_SHARP)
{
@@ -1717,8 +1717,8 @@
{
ECmWinInfo *cw = eo-cmhook;
- Eprintf(%s %#lx: %d,%d %dx%d: %s\n, txt, EobjGetXwin(eo), eo-x, eo-y,
- eo-w, eo-h, eo-name);
+ Eprintf(%s %#lx: %d,%d %dx%d: %s\n, txt, EobjGetXwin(eo),
+ EobjGetX(eo), EobjGetY(eo), EobjGetW(eo), EobjGetH(eo), eo-name);
if (!cw)
{
Eprintf(Not managed\n);
@@ -1834,7 +1834,7 @@
#if USE_BG_WIN_ON_ALL_DESKS/* Only if using per desk bg overlay */
/* FIXME - We should break when the clip region becomes empty */
-if (eo-x == 0 eo-y == 0)
+if (EobjGetX(eo) == 0 EobjGetY(eo) == 0)
stop = 1;
if (stop)
break;
@@ -1872,7 +1872,8 @@
case WINDOW_UNREDIR:
case WINDOW_SOLID:
D4printf(- clip %#lx %#lx %d,%d %dx%d: %s\n, EobjGetXwin(eo),
- cw-clip, eo-x, eo-y, eo-w, eo-h, eo-name);
+ cw-clip, EobjGetX(eo), EobjGetY(eo), EobjGetW(eo),
+ EobjGetH(eo), eo-name);
#if USE_CLIP_RELATIVE_TO_DESK
ERegionUnionOffset(clip, 0, 0, cw-shape);
#else
@@ -1882,13 +1883,15 @@
default:
D4printf(- noclip %#lx %#lx %d,%d %dx%d: %s\n, EobjGetXwin(eo),
- cw-clip, eo-x, eo-y, eo-w, eo-h, eo-name);
+ cw-clip, EobjGetX(eo), EobjGetY(eo), EobjGetW(eo),
+ EobjGetH(eo), eo-name);
break;
}
#if !USE_BG_WIN_ON_ALL_DESKS /* Not if using per desk bg overlay */
/* FIXME - We should break when the clip region becomes empty */
- if (eo-type == EOBJ_TYPE_DESK eo-x == 0 eo-y == 0)
+ if (eo-type == EOBJ_TYPE_DESK
+ EobjGetX(eo) == 0 EobjGetY(eo) == 0)
stop = 1;
if (stop)
break;
===
RCS file:
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
tooltips.c
Log Message:
Defer tooltip realization.
===
RCS file: /cvs/e/e16/e/src/tooltips.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- tooltips.c 12 Aug 2006 15:40:57 - 1.108
+++ tooltips.c 13 Aug 2006 09:24:14 - 1.109
@@ -66,19 +66,42 @@
#define TTWIN win[4]
#define TTICL iclass[4]
+static void
+TooltipRealize(ToolTip * tt)
+{
+ int i, wh;
+ EImage *im;
+ EObj *eo;
+
+ for (i = 0; i 5; i++)
+ {
+ if (!tt-iclass[i])
+ continue;
+
+ im = ImageclassGetImage(tt-iclass[i], 0, 0, STATE_NORMAL);
+
+ wh = (i + 1) * 8;
+ eo = EobjWindowCreate(EOBJ_TYPE_MISC, -50, -100, wh, wh, 1, tt-name);
+ EobjChangeOpacity(eo, OpacityFromPercent(Conf.opacity.tooltips));
+ tt-win[i] = eo;
+ }
+ tt-iwin = ECreateWindow(tt-TTWIN-win, 0, 0, 1, 1, 0);
+}
+
static ToolTip *
TooltipCreate(const char *name, ImageClass * ic0, ImageClass * ic1,
ImageClass * ic2, ImageClass * ic3, ImageClass * ic4,
TextClass * tclass, int dist, ImageClass * tooltippic)
{
- int i, wh;
+ int i;
ToolTip*tt;
- EObj *eo;
if (ic0 == NULL || tclass == NULL)
return NULL;
tt = Ecalloc(1, sizeof(ToolTip));
+ if (!tt)
+ return NULL;
tt-name = Estrdup(name);
tt-iclass[0] = ic1;
@@ -96,20 +119,8 @@
tt-dist = dist;
for (i = 0; i 5; i++)
- {
- if (!tt-iclass[i])
- continue;
-
- wh = (i + 1) * 8;
-
- eo = EobjWindowCreate(EOBJ_TYPE_MISC, -50, -100, wh, wh, 1, name);
- ImageclassIncRefcount(tt-iclass[i]);
- EobjChangeOpacity(eo, OpacityFromPercent(Conf.opacity.tooltips));
- tt-win[i] = eo;
- }
- tt-iwin = ECreateWindow(tt-TTWIN-win, 0, 0, 1, 1, 0);
-
- tt-ref_count = 0;
+ if (tt-iclass[i])
+ImageclassIncRefcount(tt-iclass[i]);
ecore_list_prepend(tt_list, tt);
@@ -290,6 +301,13 @@
if (!tt || Mode.mode != MODE_NONE)
return;
+ if (!tt-TTWIN)
+ {
+ TooltipRealize(tt);
+ if (!tt-TTWIN)
+ return;
+ }
+
/* if we get an actionclass, look for tooltip action texts */
h = 0;
if (ac)
@@ -686,7 +704,7 @@
{
int i;
- if (!tt || !tt-TTWIN-shown)
+ if (!tt || !tt-TTWIN || !tt-TTWIN-shown)
return;
for (i = 4; i = 0; i--)
-
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=lnkkid=120709bid=263057dat=121642
___
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/src/bin
Modified Files:
e_int_config_wallpaper_import.c
Log Message:
fix centered import
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_wallpaper_import.c 13 Aug 2006 03:17:34 - 1.8
+++ e_int_config_wallpaper_import.c 13 Aug 2006 10:00:49 - 1.9
@@ -357,7 +357,7 @@
} }\n
part { name: \bg\; mouse_events: 0;\n
description { state: \default\ 0.0;\n
- min: %i %i; max: %i %i\n
+ min: %i %i; max: %i %i;\n
image { normal: \%s\; }\n
} } } } }\n
, fstrip, enc, w, h, cr, cg, cb, ca, w, h, w, h, fstrip);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_parse.c
Log Message:
fix escape handling in quotes! :)
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- edje_cc_parse.c 27 Dec 2005 17:17:31 - 1.40
+++ edje_cc_parse.c 13 Aug 2006 10:37:04 - 1.41
@@ -339,12 +339,11 @@
while (*p)
{
-if (*p == '')
- memmove(p, p + 1, strlen(p));
-else if ((*p == '\\') (*(p + 1) == ''))
- memmove(p, p + 1, strlen(p));
-else if ((*p == '\\') (*(p + 1) == '\\'))
- memmove(p, p + 1, strlen(p));
+if ((*p == '\')
+((p == tok) || ((p tok) (*(p - 1) != '\\'
+ {
+ memmove(p, p + 1, strlen(p));
+ }
else if ((*p == '\\') (*(p + 1) == 'n'))
{
memmove(p, p + 1, strlen(p));
@@ -354,6 +353,12 @@
{
memmove(p, p + 1, strlen(p));
*p = '\t';
+ }
+else if (*p == '\\')
+ {
+ memmove(p, p + 1, strlen(p));
+ p++;
+ if (*p == '\\') p++;
}
else
p++;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c etk_button.h
Log Message:
give Etk_Button a new property, tool, that will change it to use a vertical
layout instead of a horizontal one and will grow the stock icon (if used) from
SMALL to MEDIUM.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etk_button.c8 Aug 2006 18:51:22 - 1.20
+++ etk_button.c13 Aug 2006 10:41:15 - 1.21
@@ -28,7 +28,8 @@
ETK_BUTTON_LABEL_PROPERTY,
ETK_BUTTON_IMAGE_PROPERTY,
ETK_BUTTON_XALIGN_PROPERTY,
- ETK_BUTTON_YALIGN_PROPERTY
+ ETK_BUTTON_YALIGN_PROPERTY,
+ ETK_BUTTON_TOOL_PROPERTY
};
static void _etk_button_constructor(Etk_Button *button);
@@ -82,6 +83,8 @@
ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_float(0.5));
etk_type_property_add(button_type, yalign, ETK_BUTTON_YALIGN_PROPERTY,
ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_float(0.5));
+ etk_type_property_add(button_type, tool, ETK_BUTTON_TOOL_PROPERTY,
+ ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
button_type-property_set = _etk_button_property_set;
button_type-property_get = _etk_button_property_get;
@@ -206,8 +209,8 @@
if (button-image)
{
- etk_signal_disconnect(child_removed, ETK_OBJECT(button-hbox),
ETK_CALLBACK(_etk_button_image_removed_cb));
- etk_container_remove(ETK_CONTAINER(button-hbox),
ETK_WIDGET(button-image));
+ etk_signal_disconnect(child_removed, ETK_OBJECT(button-box),
ETK_CALLBACK(_etk_button_image_removed_cb));
+ etk_container_remove(ETK_CONTAINER(button-box),
ETK_WIDGET(button-image));
}
button-image = image;
@@ -239,8 +242,11 @@
if (!button)
return;
-
- image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
+
+ if (button-tool)
+ image = etk_image_new_from_stock(stock_id, ETK_STOCK_MEDIUM);
+ else
+ image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
etk_widget_show(image);
etk_widget_visibility_locked_set(image, ETK_TRUE);
label = etk_stock_label_get(stock_id);
@@ -303,6 +309,46 @@
*yalign = button ? button-yalign : 0;
}
+/**
+ * @brief Sets wether the button is a toolbar button or not
+ * @param button a button
+ * @param tool ETK_TRUE for a toolbar button, ETK_FALSE otherwise
+ */
+void etk_button_tool_set(Etk_Button *button, Etk_Bool tool)
+{
+ if (!button)
+ return;
+
+ if (button-tool == tool)
+ return;
+
+ button-tool = tool;
+ if (button-box)
+ {
+ if (button-image)
+etk_container_remove(ETK_CONTAINER(button-box),
ETK_WIDGET(button-image));
+ if (button-label)
+etk_container_remove(ETK_CONTAINER(button-box),
ETK_WIDGET(button-label));
+ etk_object_destroy(ETK_OBJECT(button-box));
+ button-box = NULL;
+ }
+ _etk_button_children_create(button);
+ etk_object_notify(ETK_OBJECT(button), tool);
+}
+
+/**
+ * @brief Gets wether the button is a toolbar button or not
+ * @param button a button
+ * @return Returns a boolean indication of its a toolbar button or not
+ */
+Etk_Bool etk_button_tool_get(Etk_Button *button)
+{
+ if (!button)
+ return ETK_FALSE;
+
+ return button-tool;
+}
+
/**
*
* Etk specific functions
@@ -315,7 +361,7 @@
if (!button)
return;
- button-hbox = NULL;
+ button-box = NULL;
button-image = NULL;
button-alignment = NULL;
@@ -362,6 +408,8 @@
break;
case ETK_BUTTON_YALIGN_PROPERTY:
etk_button_alignment_set(button, button-xalign,
etk_property_value_float_get(value));
+ case ETK_BUTTON_TOOL_PROPERTY:
+ etk_button_tool_set(button, etk_property_value_bool_get(value));
default:
break;
}
@@ -389,6 +437,9 @@
case ETK_BUTTON_YALIGN_PROPERTY:
etk_property_value_float_set(value, button-yalign);
break;
+ case ETK_BUTTON_TOOL_PROPERTY:
+ etk_property_value_bool_set(value, button-tool);
+ break;
default:
break;
}
@@ -412,7 +463,7 @@
etk_widget_theme_signal_emit(ETK_WIDGET(button), pressed);
}
-/* Called when the image is removed from the hbox */
+/* Called when the image is removed from the box */
static void _etk_button_image_removed_cb(Etk_Object *object, Etk_Widget
*child, void *data)
{
Etk_Button *button;
@@ -528,8 +579,20 @@
if (button-image)
{
- if (!button-alignment)
+ Etk_Stock_Id stock_id;
+ Etk_Stock_Size stock_size;
+
+ etk_image_stock_get(button-image, stock_id, stock_size);
+ if (stock_id != ETK_STOCK_NO_STOCK)
{
+
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/docs Modified Files: README-0.16.8 Log Message: Add note about ARGB window borders. === RCS file: /cvs/e/e16/e/docs/README-0.16.8,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- README-0.16.8 18 Mar 2006 23:31:27 - 1.8 +++ README-0.16.8 13 Aug 2006 12:15:33 - 1.9 @@ -210,6 +210,15 @@ For reasonable performance it is also required that hardware acceleration of the RENDER extension is enabled. +As of version 0.16.8.2 it may happen that the borders on application windows +using ARGB visuals (for transparency) are ugly. Applications may use ARGB +visuals intentionally (e.g. fdclock) or not (e.g. xv on 16 bit root depth). +Applications unintentionally using an ARGB visual will normally not be +rendered properly at all and should be started with the environment variable +XLIB_SKIP_ARGB_VISUALS set. +To fix border rendering on real ARGB windows it is required to use imlib2 +with version 1.2.2 (i.e. CVS, atm.). + Tweaks: If window resize/shading with composite enabled is ugly, try: - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_options.c
Log Message:
- Save the custom setting from run in...
You might want to rm ~/.e/exhibit/config.eet on this change.
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- exhibit.h 11 Aug 2006 17:06:03 - 1.28
+++ exhibit.h 13 Aug 2006 16:51:13 - 1.29
@@ -76,6 +76,10 @@
char *app2;
char *app3;
char *app4;
+ char *app1_cmd;
+ char *app2_cmd;
+ char *app3_cmd;
+ char *app4_cmd;
char *fav_path;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_options.c 11 Aug 2006 17:06:03 - 1.10
+++ exhibit_options.c 13 Aug 2006 16:51:13 - 1.11
@@ -20,6 +20,13 @@
(eed) = NULL; \
}
+#define APP_NEW(d, e) \
+ if (etk_entry_text_get(ETK_ENTRY(d))) \
+ { \
+ E_FREE(e); \
+ e = strdup(etk_entry_text_get(ETK_ENTRY(d))); \
+ }
+
#define CFG_OPTIONS_NEWI(str, it, type)
EET_DATA_DESCRIPTOR_ADD_BASIC(_ex_config_options_edd, Ex_Options, str, it, type)
#define VER_NEWI(str, it, type)
EET_DATA_DESCRIPTOR_ADD_BASIC(_ex_config_version_edd, Ex_Config_Version, str,
it, type)
@@ -88,6 +95,10 @@
CFG_OPTIONS_NEWI(a2, app2, EET_T_STRING);
CFG_OPTIONS_NEWI(a3, app3, EET_T_STRING);
CFG_OPTIONS_NEWI(a4, app4, EET_T_STRING);
+ CFG_OPTIONS_NEWI(a1_cmd, app1_cmd, EET_T_STRING);
+ CFG_OPTIONS_NEWI(a2_cmd, app2_cmd, EET_T_STRING);
+ CFG_OPTIONS_NEWI(a3_cmd, app3_cmd, EET_T_STRING);
+ CFG_OPTIONS_NEWI(a4_cmd, app4_cmd, EET_T_STRING);
CFG_OPTIONS_NEWI(fp, fav_path, EET_T_STRING);
CFG_OPTIONS_NEWI(bt, blur_thresh, EET_T_DOUBLE);
CFG_OPTIONS_NEWI(st, sharpen_thresh, EET_T_DOUBLE);
@@ -176,10 +187,14 @@
/* TODO: free values before allocating if e-options != NULL */
- e-options-app1 = NULL;
- e-options-app2 = NULL;
- e-options-app3 = NULL;
+ e-options-app1 = strdup(The Gimp);
+ e-options-app1_cmd = strdup(gimp %s);
+ e-options-app2 = strdup(Xv);
+ e-options-app2_cmd = strdup(xv %s);
+ e-options-app3 = strdup(Xpaint);
+ e-options-app3_cmd = strdup(xpaint %s);
e-options-app4 = NULL;
+ e-options-app4_cmd = NULL;
e-options-fav_path = NULL;
e-options-blur_thresh = EX_DEFAULT_BLUR_THRESH;
e-options-sharpen_thresh = EX_DEFAULT_SHARPEN_THRESH;
@@ -201,6 +216,10 @@
E_FREE(e-options-app2);
E_FREE(e-options-app3);
E_FREE(e-options-app4);
+ E_FREE(e-options-app1_cmd);
+ E_FREE(e-options-app2_cmd);
+ E_FREE(e-options-app3_cmd);
+ E_FREE(e-options-app4_cmd);
E_FREE(e-options-fav_path);
E_FREE(e-options);
}
@@ -456,6 +475,18 @@
etk_tree_clear(ETK_TREE(e-cur_tab-itree));
_ex_main_populate_files(e, NULL);
+ /* RUN IN */
+ APP_NEW(dialog-app1, e-options-app1);
+ APP_NEW(dialog-app1_cmd, e-options-app1_cmd);
+ APP_NEW(dialog-app2, e-options-app2);
+ APP_NEW(dialog-app2_cmd, e-options-app2_cmd);
+ APP_NEW(dialog-app3, e-options-app3);
+ APP_NEW(dialog-app3_cmd, e-options-app3_cmd);
+ APP_NEW(dialog-app4, e-options-app4);
+ APP_NEW(dialog-app4_cmd, e-options-app4_cmd);
+
+ /* - Rebuild menus with settings */
+
}
static Etk_Widget *
@@ -675,7 +706,7 @@
vbox = etk_vbox_new(ETK_FALSE, 3);
- frame = etk_frame_new(Open in ...);
+ frame = etk_frame_new(Run in ...);
etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 5);
vbox2 = etk_vbox_new(ETK_FALSE, 0);
etk_container_add(ETK_CONTAINER(frame), vbox2);
@@ -733,7 +764,27 @@
dialog-app4_cmd = etk_entry_new();
etk_table_attach(ETK_TABLE(table), dialog-app4_cmd, 2, 2, 4, 4, 0, 0,
ETK_FILL_POLICY_NONE);
-
+
+ if (e-options-app1)
+ etk_entry_text_set(ETK_ENTRY(dialog-app1), e-options-app1);
+ if (e-options-app1_cmd)
+ etk_entry_text_set(ETK_ENTRY(dialog-app1_cmd), e-options-app1_cmd);
+
+ if (e-options-app2)
+ etk_entry_text_set(ETK_ENTRY(dialog-app2), e-options-app2);
+ if (e-options-app2_cmd)
+ etk_entry_text_set(ETK_ENTRY(dialog-app2_cmd), e-options-app2_cmd);
+
+ if (e-options-app3)
+ etk_entry_text_set(ETK_ENTRY(dialog-app3), e-options-app3);
+ if (e-options-app3_cmd)
+ etk_entry_text_set(ETK_ENTRY(dialog-app3_cmd), e-options-app3_cmd);
+
+ if (e-options-app4)
+ etk_entry_text_set(ETK_ENTRY(dialog-app4), e-options-app4);
+ if (e-options-app4_cmd)
+ etk_entry_text_set(ETK_ENTRY(dialog-app4_cmd), e-options-app4_cmd);
+
return vbox;
}
-
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: Entrance_Widgets.h Makefile.am Added Files: ew_notice.c ew_notice.h Log Message: Notice dialogs added... === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/Entrance_Widgets.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Entrance_Widgets.h 12 Aug 2006 15:23:53 - 1.2 +++ Entrance_Widgets.h 13 Aug 2006 17:00:15 - 1.3 @@ -10,6 +10,7 @@ #include ew_textlist.h #include ew_edjelist.h #include ew_image.h +#include ew_notice.h === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 13 Aug 2006 02:17:14 - 1.3 +++ Makefile.am 13 Aug 2006 17:00:15 - 1.4 @@ -10,7 +10,8 @@ _ew_list.h \ ew_textlist.h \ ew_edjelist.h \ - ew_image.h + ew_image.h \ + ew_notice.h libentrance_widgets_ladir = $(prefix)/include @@ -23,6 +24,7 @@ ew_textlist.c \ ew_edjelist.c \ ew_image.c \ + ew_notice.c \ $(libentrance_widgets_la_HEADERS) libentrance_widgets_la_LIBADD = @etk_libs@ - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
Makefile.am background.c layout.c
Log Message:
Notice dialogs added...
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 13 Aug 2006 04:38:58 - 1.6
+++ Makefile.am 13 Aug 2006 17:00:15 - 1.7
@@ -13,8 +13,8 @@
entrance_edit_gui_CFLAGS = \
-I$(top_srcdir)/src/widgets \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@ this line broke the build for me
entrance_edit_gui_LDFLAGS = \
-L$(top_srcdir)/src/widgets
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- background.c13 Aug 2006 02:48:19 - 1.2
+++ background.c13 Aug 2006 17:00:15 - 1.3
@@ -1,7 +1,133 @@
+#include limits.h
+#include Ecore_File.h
+#include Ecore_Data.h
#include Entrance_Widgets.h
-#include stdio.h
+#include Entrance_Edit.h
+
+static void _background_cb_selected(void);
+static void _background_cb_ok(void *, void *);
+static void _background_cb_apply(void *, void *);
+static void _background_cb_close(void *, void *);
+
+static char* _background_get_path(const char *);
+static void _background_close(void);
+static void _background_apply(void);
+
+static Entrance_Dialog win;
+static Entrance_Widget img_preview;
+static Entrance_List list_thumbs;
+static Entrance_Widget group_backgrounds;
+static Entrance_Widget group_preview;
+static Entrance_Widget group_options;
void
-egui_background_dialog_show() {
-printf(Background clicked\n);
+egui_background_dialog_show()
+{
+ Ecore_List *backgrounds;
+ char *background;
+
+ win = ew_dialog_new(_(Entrance - Background Chooser), EW_FALSE);
+
+ group_preview = ew_dialog_group_add(win, _(Preview));
+
+ img_preview = ew_image_new(320, 240);
+ ew_group_add(group_preview, img_preview);
+
+ group_backgrounds = ew_dialog_group_add(win, _(Backgrounds));
+
+ list_thumbs = ew_textlist_new(NULL, 320, 140, 20, 90);
+
+ /* scan for backgrounds and add them to the list */
+ backgrounds = ecore_file_ls(/usr/share/entrance/backgrounds);
+ if(!backgrounds || ecore_list_is_empty(backgrounds))
+ return;
+
+ background = ecore_list_first(backgrounds);
+ char *background_file = _background_get_path(background);
+ ew_image_edje_load(img_preview, background_file, Preview);
+ free(background_file);
+ /*FIXME: selecting the first row doesn't work - maybe we select first row
while adding elements to the list:(*/
+ ew_list_first_row_select(list_thumbs);
+
+ ecore_list_goto_first(backgrounds);
+ while((background = ecore_list_next(backgrounds)))
+ {
+char *background_no_ext = ecore_file_strip_ext(background);
+ ew_textlist_add(list_thumbs, background_no_ext, background,
strlen(background) + 1, _background_cb_selected);
+
+free(background_no_ext);
+ }
+ ecore_list_destroy(backgrounds);
+
+ ew_group_add(group_backgrounds, list_thumbs);
+
+ /*Entrance_Widget group_options = ew_dialog_group_add(win, _(Options));*/
+
+ ew_dialog_close_button_add(win, _background_cb_close, NULL);
+ ew_dialog_apply_button_add(win, _background_cb_apply, NULL);
+ ew_dialog_ok_button_add(win, _background_cb_ok, NULL);
+
+ ew_dialog_show(win);
+}
+
+static void
+_background_cb_selected()
+{
+ char* background = ew_list_selected_data_get(list_thumbs);
+ char* background_path = _background_get_path(background);
+ ew_image_edje_load(img_preview, background_path, Preview);
+
+ free(background_path);
+}
+
+
+static void
+_background_cb_ok(void *object, void *data)
+{
+ _background_apply();
+ _background_close();
+}
+
+static void
+_background_cb_apply(void *object, void *data)
+{
+ _background_apply();
+}
+
+static void
+_background_cb_close(void *object, void *data)
+{
+ _background_close();
+}
+
+static char*
+_background_get_path(const char *t)
+{
+ char *path = calloc(PATH_MAX, sizeof(*path));
+ snprintf(path, PATH_MAX, /usr/share/entrance/backgrounds/%s, t);
+
+ return path;
+}
+
+static void
+_background_apply(void)
+{
+char *background = ew_list_selected_data_get(list_thumbs);
+ if(!background)
+ {
+ printf(Error. Please select a background first\n);
+ return;
+ }
+
+ entrance_edit_string_set(ENTRANCE_EDIT_KEY_CLIENT_THEME_STR,
background);
+ if(!entrance_edit_save())
+ {
+ printf(Error setting background - %s. Please check your
permissions\n, background);
+ }
+}
+
+static void
+_background_close(void)
+{
+
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_combobox.c etk_main.c etk_object.c etk_object.h
etk_widget.c
Log Message:
* Now etk_object_destroy() doesn't frees the object directly, but queues
it for freeing. It solves all sort of problems
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- etk_combobox.c 8 Aug 2006 18:51:22 - 1.23
+++ etk_combobox.c 13 Aug 2006 19:20:28 - 1.24
@@ -693,6 +693,7 @@
/* Destroys the combobox */
static void _etk_combobox_destructor(Etk_Combobox *combobox)
{
+ Etk_Combobox_Item *item;
int i;
if (!combobox)
@@ -701,7 +702,13 @@
combobox-selected_item = NULL;
combobox-active_item = NULL;
while (combobox-items)
- etk_object_destroy(ETK_OBJECT(combobox-items-data));
+ {
+ item = ETK_COMBOBOX_ITEM(combobox-items-data);
+
+ item-combobox = NULL;
+ etk_object_destroy(ETK_OBJECT(item));
+ combobox-items = evas_list_remove_list(combobox-items,
combobox-items);
+ }
free(combobox-active_item_children);
for (i = 0; i combobox-num_cols; i++)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- etk_main.c 5 Aug 2006 02:37:25 - 1.29
+++ etk_main.c 13 Aug 2006 19:20:28 - 1.30
@@ -44,12 +44,12 @@
/**
* @brief Initializes Etk. This function needs to be called before any other
call to an etk_* function. @n
- * You can call safely etk_init() several times, it will have an effect only
the first time you call it. The other times,
+ * You can call safely etk_init() several times, it will only have an effect
the first time you call it. The other times,
* it will just increment a counter. etk_shutdown() will decrement this
counter and will effectively shutdown Etk when
* the counter reaches 0. So you need to call etk_shutdown() the same number
of times as etk_init().
- * @param argc the location of the argc paramater passed to main(). It is
used to parse the arguments specific to Etk.
+ * @param argc the location of the argc parameter passed to main(). It is
used to parse the arguments specific to Etk.
* It can be set to NULL.
- * @param argv the location of the argv paramater passed to main(). It is
used to parse the arguments specific to Etk.
+ * @param argv the location of the argv parameter passed to main(). It is
used to parse the arguments specific to Etk.
* It can be set to NULL.
* @return Returns the number of times Etk has been initialized, or 0 on
failure
* @note It initializes Evas, Ecore and Edje so you don't need to initialize
them after an etk_init()
@@ -132,8 +132,8 @@
_etk_main_init_count--;
if (_etk_main_init_count == 0)
{
- /* Shutdown the subsystem of Etk */
- etk_object_destroy_all_objects();
+ /* Shutdown the subsystems of Etk */
+ etk_object_shutdown();
etk_signal_shutdown();
etk_type_shutdown();
@@ -143,7 +143,8 @@
etk_engine_shutdown();
etk_theme_shutdown();
- _etk_main_toplevel_widgets = evas_list_free(_etk_main_toplevel_widgets);
+ evas_list_free(_etk_main_toplevel_widgets);
+ _etk_main_toplevel_widgets = NULL;
/* Shutdown the EFL*/
edje_shutdown();
@@ -195,6 +196,8 @@
if (_etk_main_init_count = 0)
return;
+
+ etk_object_purge();
/* TODO: only update the toplevel widgets that need to be updated */
for (l = _etk_main_toplevel_widgets; l; l = l-next)
@@ -240,7 +243,7 @@
}
/**
- * @brief Gets the list of the created toplevel widgets (windows, ...)
+ * @brief Gets the list of the created toplevel widgets (windows, embed
widgets, ...)
* @return Returns the list of the created toplevel widgets
*/
Evas_List *etk_main_toplevel_widgets_get()
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_object.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- etk_object.c8 Aug 2006 18:03:01 - 1.25
+++ etk_object.c13 Aug 2006 19:20:28 - 1.26
@@ -27,10 +27,12 @@
static void _etk_object_constructor(Etk_Object *object);
static void _etk_object_destructor(Etk_Object *object);
+static void _etk_object_free(Etk_Object *object);
static Evas_Bool _etk_object_notification_callbacks_free_cb(Evas_Hash *hash,
const char *key, void *data, void *fdata);
static Evas_Bool _etk_object_data_free_cb(Evas_Hash *hash, const char *key,
void *data, void *fdata);
-static Evas_List *_etk_object_created_objects = NULL;
+static Etk_Object *_etk_object_objects = NULL;
+static Etk_Object
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk Modified Files: Doxyfile Log Message: * Doxygen tag++ === RCS file: /cvs/e/e17/proto/etk/Doxyfile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Doxyfile4 Aug 2006 18:46:26 - 1.6 +++ Doxyfile13 Aug 2006 19:23:20 - 1.7 @@ -54,6 +54,7 @@ ALIASES= widget=b[Widget]/b ALIASES += object=b[Object]/b ALIASES += [EMAIL PROTECTED] For more informations, see the documention page of the corresponding module (link above or in the i\Widgets\/i page) +ALIASES += [EMAIL PROTECTED] This function is mainly used in object implementations, you usually don't have to call it yourself\/i page) ALIASES += [EMAIL PROTECTED] This function is mainly used in widget implementations, you usually don't have to call it yourself ALIASES += prop_name=- @b ALIASES += prop_type= - ttType:/tt - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk Modified Files: Makefile.am Log Message: I hate autotools.. === RCS file: /cvs/e/e17/proto/etk/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 27 Jul 2006 01:26:17 - 1.10 +++ Makefile.am 13 Aug 2006 20:33:15 - 1.11 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src data po +SUBDIRS = src data po intl MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_image.c exhibit_image.h exhibit_main.c
exhibit_menus.c exhibit_menus.h exhibit_options.c
Log Message:
- run in menu is not generated and usable from options.
- rename function implemented
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- exhibit.h 13 Aug 2006 16:51:13 - 1.29
+++ exhibit.h 13 Aug 2006 20:04:43 - 1.30
@@ -191,7 +191,12 @@
Etk_Widget*resbar;
Etk_Widget*zoombar;
Etk_Widget*menu;
- Etk_Widget*win;
+ Etk_Widget*win;
+ Etk_Widget*app1_menu;
+ Etk_Widget*app2_menu;
+ Etk_Widget*app3_menu;
+ Etk_Widget*app4_menu;
+ Etk_Widget*submenu;
intzoom;
intbrightness;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- exhibit_image.c 11 Aug 2006 02:30:57 - 1.30
+++ exhibit_image.c 13 Aug 2006 20:04:43 - 1.31
@@ -739,13 +739,94 @@
*/
}
+
+static void
+_ex_image_rename_dialog_response(Etk_Object *obj, int response_id, void *data)
+{
+ const char *string;
+ char *newpath;
+ char *oldpath;
+ int ret;
+ Ex_Tab *tab = e-cur_tab;
+
+ switch(response_id)
+ {
+ case ETK_RESPONSE_OK:
+string = etk_entry_text_get(ETK_ENTRY(data));
+newpath = malloc(PATH_MAX);
+oldpath = malloc(PATH_MAX);
+sprintf(newpath, %s%s, tab-set_img_path, string);
+sprintf(oldpath, %s%s, tab-set_img_path, tab-cur_file);
+D((Renaming from %s - %s\n, oldpath, newpath));
+
+ret = rename(oldpath, newpath);
+if (ret == -1)
+ _ex_main_dialog_show(Error renaming file!,
ETK_MESSAGE_DIALOG_ERROR);
+else
+ {
+ _ex_main_image_unset();
+ etk_tree_clear(ETK_TREE(tab-itree));
+ etk_tree_clear(ETK_TREE(tab-dtree));
+ _ex_main_populate_files(e, NULL);
+ }
+
+E_FREE(newpath);
+E_FREE(oldpath);
+break;
+ default:
+break;
+ }
+
+ etk_object_destroy(ETK_OBJECT(obj));
+}
+
+void
+_ex_image_rename()
+{
+ Ex_Tab *tab = e-cur_tab;
+ Etk_Widget *dialog;
+ Etk_Widget *entry;
+ Etk_Widget *label;
+ char string[PATH_MAX];
+ char labeltext[PATH_MAX + 100];
+
+ sprintf(string, %s%s, tab-set_img_path, tab-cur_file);
+ dialog = etk_dialog_new();
+
+ sprintf(labeltext, Rename file '%s', string);
+
+ label = etk_label_new(labeltext);
+
+ etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), ETK_WIDGET(label),
+ETK_FALSE, ETK_FALSE, 5, ETK_FALSE);
+
+ label = etk_label_new(New filename);
+ etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), ETK_WIDGET(label),
+ETK_FALSE, ETK_FALSE, 2, ETK_FALSE);
+
+ entry = etk_entry_new();
+
+ etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), ETK_WIDGET(entry),
+ETK_FALSE, ETK_FALSE, 0, ETK_FALSE);
+
+ etk_dialog_button_add_from_stock(ETK_DIALOG(dialog), ETK_STOCK_DIALOG_OK,
ETK_RESPONSE_OK);
+ etk_dialog_button_add_from_stock(ETK_DIALOG(dialog),
ETK_STOCK_DIALOG_CANCEL, ETK_RESPONSE_CANCEL);
+ etk_signal_connect(response, ETK_OBJECT(dialog),
+ETK_CALLBACK(_ex_image_rename_dialog_response), entry);
+
+ etk_container_border_width_set(ETK_CONTAINER(dialog), 15);
+ etk_window_title_set(ETK_WINDOW(dialog),
+_(Exhibit - rename));
+
+ etk_widget_show_all(dialog);
+}
+
void
_ex_image_run(const char *app)
{
Ecore_Exe *exe = NULL;
char *tmp = NULL;
-
- D((Application from menu: %s\n, app));
+ char str[PATH_MAX];
tmp = malloc(PATH_MAX + 10);
memset(tmp, 0, PATH_MAX + 10);
@@ -753,12 +834,8 @@
if (!tmp)
return;
- if (!strcasecmp(app, The Gimp))
- sprintf(tmp, gimp %s%s, e-cur_tab-set_img_path,
e-cur_tab-cur_file);
- else if (!strcasecmp(app, XV))
- sprintf(tmp, xv %s%s, e-cur_tab-set_img_path, e-cur_tab-cur_file);
- else if (!strcasecmp(app, Xpaint))
- sprintf(tmp, xpaint %s%s, e-cur_tab-set_img_path,
e-cur_tab-cur_file);
+ sprintf(str, %s%s, e-cur_tab-set_img_path, e-cur_tab-cur_file);
+ sprintf(tmp, app, str);
if (strlen(tmp) = 0)
return;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- exhibit_image.h 3 Aug 2006 13:12:17 - 1.10
+++ exhibit_image.h 13 Aug 2006 20:04:43 - 1.11
@@ -19,6 +19,7 @@
void_ex_image_save_as_cb(void *data);
void
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
background.c
Log Message:
Use the proper libentrance_edit key for setting the background value.
Previously, it was still setting the theme instead :)
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- background.c13 Aug 2006 17:00:15 - 1.3
+++ background.c13 Aug 2006 19:58:45 - 1.4
@@ -119,7 +119,7 @@
return;
}
- entrance_edit_string_set(ENTRANCE_EDIT_KEY_CLIENT_THEME_STR,
background);
+ entrance_edit_string_set(ENTRANCE_EDIT_KEY_CLIENT_BACKGROUND_STR,
background);
if(!entrance_edit_save())
{
printf(Error setting background - %s. Please check your
permissions\n, background);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto balony
Enlightenment CVS committal Author : balony Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: - run in menu is not generated and usable from options. - rename function implemented === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- TODO10 Aug 2006 17:05:48 - 1.12 +++ TODO13 Aug 2006 20:04:42 - 1.13 @@ -6,17 +6,15 @@ o TODO: -- - menus - * rename - * open in should be generated from options * refresh * release notes * about -- options - * provide tab for open in applications o DONE: -- ++ open in should be generated from options ++ rename + andy's comments feature + sorting + wheel changing / zooming @@ -33,6 +31,7 @@ + dialog (common options) + slide show speed + comments visibile / hidden by default (with remembering last state) + + provide tab for open in applications + key shotcuts + x - fit / unfit to window + s (slideshow) @@ -46,6 +45,7 @@ -- - integrate with evfs for file tagging and categories - integrate with libgphoto for digicam interaction +- mass scaling for resizing for example pictures from your cam. - menus * search - image operations: @@ -63,6 +63,7 @@ * BUGS: === +- When typing 's' in the comment field you start slideshow. - fix autocomplete (combobox?) - if we're looking at a LOT of images and change dir before they have finished loading, then the images will thumbnail and load in the current dir - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: Makefile.am Log Message: I hate autotools.. === RCS file: /cvs/e/e17/proto/etk/src/lib/Makefile.am,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- Makefile.am 13 Aug 2006 15:33:17 - 1.41 +++ Makefile.am 13 Aug 2006 20:33:15 - 1.42 @@ -34,6 +34,7 @@ etk_drag.h \ etk_editable_text_object.h \ etk_embed.h \ +etk_engine.h \ etk_entry.h \ etk_filechooser_widget.h \ etk_frame.h \ @@ -70,6 +71,8 @@ etk_textblock.h \ etk_theme.h \ etk_toggle_button.h \ +etk_tool_button.h \ +etk_toolbar.h \ etk_tooltips.h \ etk_toplevel_widget.h \ etk_tree_model.h \ @@ -79,10 +82,7 @@ etk_utils.h \ etk_viewport.h \ etk_widget.h \ -etk_window.h \ -etk_engine.h \ -etk_toolbar.h \ -etk_tool_button.h +etk_window.h libetk_la_SOURCES = \ etk_alignment.c \ @@ -102,6 +102,7 @@ etk_drag.c \ etk_editable_text_object.c \ etk_embed.c \ +etk_engine.c \ etk_entry.c \ etk_filechooser_widget.c \ etk_frame.c \ @@ -138,6 +139,8 @@ etk_textblock.c \ etk_theme.c \ etk_toggle_button.c \ +etk_tool_button.c \ +etk_toolbar.c \ etk_tooltips.c \ etk_toplevel_widget.c \ etk_tree_model.c \ @@ -147,9 +150,6 @@ etk_viewport.c \ etk_widget.c \ etk_window.c \ -etk_engine.c \ -etk_toolbar.c \ -etk_tool_button.c \ $(ETKHEADERS) installed_headersdir = $(prefix)/include/etk - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: Makefile.am Log Message: I hate autotools.. === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Makefile.am 7 Aug 2006 20:01:21 - 1.8 +++ Makefile.am 13 Aug 2006 20:33:15 - 1.9 @@ -98,4 +98,5 @@ wm_bg_brushed.png \ wm_bg_overlay.png \ wm_border.png \ - wm_shadow.png + wm_shadow.png \ + toolbar.png - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Modified Files: Makefile.am Removed Files: tool_button.edc Log Message: I hate autotools.. === RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 17 May 2006 15:15:08 - 1.3 +++ Makefile.am 13 Aug 2006 20:33:15 - 1.4 @@ -20,4 +20,5 @@ scrollbar.edc \ toggle_button.edc \ iconbox.edc \ - colorpicker.edc + colorpicker.edc \ + toolbar.edc - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
background.c theme.c
Log Message:
Refactorings in theme.c, That main dialog construction function looks clean
now. I'm happy.
Also made background.c use enlightenment backgrounds currently. THIS IS
TEMPORARY so we at least see it work, while laying things in place. As an aside
though, it *may* be usefull to have standardized edje part names. For instance,
in Entrance the theme contains a Background part that is loaded as a
background, while in E, the background part is called desktop/background. Maybe
there should be a standar somewhere. I'm just thinking out loud though.
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- background.c13 Aug 2006 19:58:45 - 1.4
+++ background.c13 Aug 2006 21:33:45 - 1.5
@@ -38,13 +38,13 @@
list_thumbs = ew_textlist_new(NULL, 320, 140, 20, 90);
/* scan for backgrounds and add them to the list */
- backgrounds = ecore_file_ls(/usr/share/entrance/backgrounds);
+ backgrounds = ecore_file_ls(/usr/share/enlightenment/data/backgrounds);
if(!backgrounds || ecore_list_is_empty(backgrounds))
return;
background = ecore_list_first(backgrounds);
char *background_file = _background_get_path(background);
- ew_image_edje_load(img_preview, background_file, Preview);
+ ew_image_edje_load(img_preview, background_file, desktop/background);
free(background_file);
/*FIXME: selecting the first row doesn't work - maybe we select first row
while adding elements to the list:(*/
ew_list_first_row_select(list_thumbs);
@@ -75,7 +75,7 @@
{
char* background = ew_list_selected_data_get(list_thumbs);
char* background_path = _background_get_path(background);
- ew_image_edje_load(img_preview, background_path, Preview);
+ ew_image_edje_load(img_preview, background_path, desktop/background);
free(background_path);
}
@@ -104,7 +104,7 @@
_background_get_path(const char *t)
{
char *path = calloc(PATH_MAX, sizeof(*path));
- snprintf(path, PATH_MAX, /usr/share/entrance/backgrounds/%s, t);
+ snprintf(path, PATH_MAX,
/usr/share/enlightenment/data/backgrounds/%s, t);
return path;
}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/theme.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- theme.c 13 Aug 2006 06:17:27 - 1.5
+++ theme.c 13 Aug 2006 21:33:45 - 1.6
@@ -4,6 +4,10 @@
#include Entrance_Widgets.h
#include Entrance_Edit.h
+#define THEME_PATH /usr/share/entrance/themes
+#define THEME_PREVIEW_EDJE_PART Preview
+#define THEME_LIST_TITLE Themes
+
static void _theme_cb_selected(void);
static void _theme_cb_ok(void *, void *);
static void _theme_cb_apply(void *, void *);
@@ -12,6 +16,8 @@
static char* _theme_get_path(const char *);
static void _theme_close(void);
static void _theme_apply(void);
+static char* _theme_populate_list(void);
+static void _theme_load_preview(const char *);
static Entrance_Dialog win;
static Entrance_Widget img_preview;
@@ -20,11 +26,13 @@
static Entrance_Widget group_preview;
static Entrance_Widget group_options;
+/*static char* theme_path;
+static char* theme_preview_edje_part;
+static char* theme_list_title;*/
+
void
egui_theme_dialog_show()
{
- Ecore_List *themes;
- char *theme;
win = ew_dialog_new(_(Entrance - Theme Chooser), EW_FALSE);
@@ -33,31 +41,12 @@
img_preview = ew_image_new(320, 240);
ew_group_add(group_preview, img_preview);
- group_themes = ew_dialog_group_add(win, _(Themes));
+ group_themes = ew_dialog_group_add(win, _(THEME_LIST_TITLE));
list_thumbs = ew_textlist_new(NULL, 320, 140, 20, 90);
- /* scan for themes and add them to the list */
- themes = ecore_file_ls(/usr/share/entrance/themes);
- if(!themes || ecore_list_is_empty(themes))
- return;
-
- theme = ecore_list_first(themes);
- char *theme_file = _theme_get_path(theme);
- ew_image_edje_load(img_preview, theme_file, Preview);
- free(theme_file);
- /*FIXME: selecting the first row doesn't work - maybe we select first row
while adding elements to the list:(*/
- ew_list_first_row_select(list_thumbs);
-
- ecore_list_goto_first(themes);
- while((theme = ecore_list_next(themes)))
- {
-char *theme_no_ext = ecore_file_strip_ext(theme);
- ew_textlist_add(list_thumbs, theme_no_ext, theme, strlen(theme)
+ 1, _theme_cb_selected);
-
-free(theme_no_ext);
- }
- ecore_list_destroy(themes);
+ char *first_theme = _theme_populate_list();
+ _theme_load_preview(first_theme);
ew_group_add(group_themes,
E CVS: screenshot titan
Enlightenment CVS committal Author : titan Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: e_mod_main.c Log Message: Whoops need an extra null. === RCS file: /cvs/e/e_modules/screenshot/e_mod_main.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -3 -r1.60 -r1.61 --- e_mod_main.c9 Aug 2006 07:47:28 - 1.60 +++ e_mod_main.c13 Aug 2006 21:53:41 - 1.61 @@ -695,7 +695,7 @@ e_entry_dialog_show (_(Enlightenment Screenshot Module), enlightenment/e, _(Enter a new filename to use for this screenshot), - NULL, NULL, _cb_entry_ok, NULL, data); + NULL, NULL, NULL, _cb_entry_ok, NULL, data); } static void - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
Formatting
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_widget_fsel.c 13 Aug 2006 06:51:33 - 1.9
+++ e_widget_fsel.c 13 Aug 2006 21:58:55 - 1.10
@@ -385,13 +385,17 @@
if (preview)
{
- e_widget_frametable_object_append(wd-o_preview_frame,
wd-o_preview_preview_table,
-0, 0, 1, 1, 1, 1, 1, 1);
-e_widget_frametable_object_append(wd-o_preview_frame,
wd-o_preview_table,
-0, 1, 1, 1, 1, 1, 1, 1);
-e_widget_table_object_append(wd-o_table2, wd-o_preview_frame,
-2, 1, 1, 1, 1, 1, 1, 1);
+ e_widget_frametable_object_append(wd-o_preview_frame,
+ wd-o_preview_preview_table,
+ 0, 0, 1, 1, 1, 1, 1, 1);
+e_widget_frametable_object_append(wd-o_preview_frame,
+ wd-o_preview_table,
+ 0, 1, 1, 1, 1, 1, 1, 1);
+e_widget_table_object_append(wd-o_table2,
+wd-o_preview_frame,
+ 2, 1, 1, 1, 1, 1, 1, 1);
}
+
e_widget_table_object_append(wd-o_table, wd-o_table2,
0, 0, 1, 1, 1, 1, 1, 1);
e_widget_table_object_append(wd-o_table, wd-o_entry,
@@ -467,15 +471,18 @@
char size[1024];
dsize = (double)st_size;
- if (dsize 1024) snprintf(size, 1024, %'.0f B, dsize);
+ if (dsize 1024)
+ snprintf(size, 1024, %'.0f B, dsize);
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(size, 1024, %'.0f KB, dsize);
+ if (dsize 1024)
+ snprintf(size, 1024, %'.0f KB, dsize);
else
{
dsize /= 1024.0;
- if (dsize 1024) snprintf(size, 1024, %'.0f MB, dsize);
+ if (dsize 1024)
+ snprintf(size, 1024, %'.0f MB, dsize);
else
{
dsize /= 1024.0;
@@ -492,12 +499,15 @@
char name[PATH_MAX];
struct passwd *pwd;
- if (getuid() == st_uid) snprintf(name, PATH_MAX, You);
+ if (getuid() == st_uid)
+ snprintf(name, PATH_MAX, You);
else
{
pwd = getpwuid(st_uid);
- if (pwd) snprintf(name, PATH_MAX, %s, pwd-pw_name);
- else snprintf(name, PATH_MAX, %-8d, (int)st_uid);
+ if (pwd)
+ snprintf(name, PATH_MAX, %s, pwd-pw_name);
+ else
+ snprintf(name, PATH_MAX, %-8d, (int)st_uid);
}
return strdup(name);
}
@@ -518,12 +528,17 @@
int other_write = 0;
int i;
- if (getuid() == st_uid) owner = 1;
- if (getgid() == st_gid) group = 1;
+ if (getuid() == st_uid)
+ owner = 1;
+ if (getgid() == st_gid)
+ group = 1;
perm = (char *)malloc(sizeof(char) * 10);
- for (i = 0; i 9; i++) perm[i] = '-';
+
+ for (i = 0; i 9; i++)
+ perm[i] = '-';
perm[9] = '\0';
+
if ((S_IRUSR st_mode) == S_IRUSR)
{
perm[0] = 'r';
@@ -534,7 +549,8 @@
perm[1] = 'w';
user_write = 1;
}
- if ((S_IXUSR st_mode) == S_IXUSR) perm[2] = 'x';
+ if ((S_IXUSR st_mode) == S_IXUSR)
+ perm[2] = 'x';
if ((S_IRGRP st_mode) == S_IRGRP)
{
@@ -546,7 +562,8 @@
perm[4] = 'w';
group_write = 1;
}
- if ((S_IXGRP st_mode) == S_IXGRP) perm[5] = 'x';
+ if ((S_IXGRP st_mode) == S_IXGRP)
+ perm[5] = 'x';
if ((S_IROTH st_mode) == S_IROTH)
{
@@ -558,34 +575,40 @@
perm[6] = 'w';
other_write = 1;
}
- if ((S_IXOTH st_mode) == S_IXOTH) perm[8] = 'x';
+ if ((S_IXOTH st_mode) == S_IXOTH)
+ perm[8] = 'x';
if (owner)
{
-if ((!user_read) (!user_write)) snprintf(perms, PATH_MAX,
- Protected);
-else if ((user_read) (!user_write)) snprintf(perms, PATH_MAX,
- Read Only);
-else if ((user_read) (user_write)) access = 1;
+if ((!user_read) (!user_write))
+ snprintf(perms, PATH_MAX, Protected);
+else if ((user_read) (!user_write))
+ snprintf(perms, PATH_MAX, Read Only);
+else if ((user_read) (user_write))
+ access = 1;
}
else if (group)
{
-if ((!group_read) (!group_write)) snprintf(perms, PATH_MAX,
-Forbidden);
-else if ((group_read) (!group_write)) snprintf(perms, PATH_MAX,
-Read Only);
-else if ((group_read) (group_write)) access = 1;
+
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
Egui.h Makefile.am background.c theme.c
Added Files:
egui_graphics_selector.c
Log Message:
Done one badass-refactoring(tm).
The core code in theme.c has been made generic and moved to
egui_graphics_selector.c and is now being used by both the theme.c and the
background.c config. And both work properly. For all who say OOP is the only
way to reuse code, i say... be very afraid ;-)
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Egui.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Egui.h 12 Aug 2006 14:54:42 - 1.2
+++ Egui.h 13 Aug 2006 22:41:44 - 1.3
@@ -1,6 +1,16 @@
#ifndef _EGUI_H
#define _EGUI_H
+typedef struct _Egui_Graphics_Selector {
+ char *name;
+ char *files_path;
+ char *preview_edje_part;
+ char *dialog_title;
+ char *list_title;
+ char *entrance_edit_key;
+} Egui_Graphics_Selector;
+
+
void egui_theme_dialog_show(void);
void egui_background_dialog_show(void);
void egui_layout_dialog_show(void);
@@ -8,5 +18,7 @@
void egui_behavior_dialog_show(void);
void egui_sessions_dialog_show(void);
void egui_x_settings_dialog_show(void);
+
+void egui_gs_dialog_show(Egui_Graphics_Selector);
#endif
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 13 Aug 2006 17:00:15 - 1.7
+++ Makefile.am 13 Aug 2006 22:41:44 - 1.8
@@ -9,12 +9,13 @@
sessions.c \
theme.c \
x_settings.c \
+ egui_graphics_selector.c \
Egui.h
entrance_edit_gui_CFLAGS = \
-I$(top_srcdir)/src/widgets \
@etk_cflags@
[EMAIL PROTECTED]@ this line broke the build for me
[EMAIL PROTECTED]@
entrance_edit_gui_LDFLAGS = \
-L$(top_srcdir)/src/widgets
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- background.c13 Aug 2006 21:33:45 - 1.5
+++ background.c13 Aug 2006 22:41:44 - 1.6
@@ -3,131 +3,21 @@
#include Ecore_Data.h
#include Entrance_Widgets.h
#include Entrance_Edit.h
+#include Egui.h
-static void _background_cb_selected(void);
-static void _background_cb_ok(void *, void *);
-static void _background_cb_apply(void *, void *);
-static void _background_cb_close(void *, void *);
-
-static char* _background_get_path(const char *);
-static void _background_close(void);
-static void _background_apply(void);
-
-static Entrance_Dialog win;
-static Entrance_Widget img_preview;
-static Entrance_List list_thumbs;
-static Entrance_Widget group_backgrounds;
-static Entrance_Widget group_preview;
-static Entrance_Widget group_options;
void
egui_background_dialog_show()
{
- Ecore_List *backgrounds;
- char *background;
-
- win = ew_dialog_new(_(Entrance - Background Chooser), EW_FALSE);
-
- group_preview = ew_dialog_group_add(win, _(Preview));
-
- img_preview = ew_image_new(320, 240);
- ew_group_add(group_preview, img_preview);
-
- group_backgrounds = ew_dialog_group_add(win, _(Backgrounds));
-
- list_thumbs = ew_textlist_new(NULL, 320, 140, 20, 90);
-
- /* scan for backgrounds and add them to the list */
- backgrounds = ecore_file_ls(/usr/share/enlightenment/data/backgrounds);
- if(!backgrounds || ecore_list_is_empty(backgrounds))
- return;
-
- background = ecore_list_first(backgrounds);
- char *background_file = _background_get_path(background);
- ew_image_edje_load(img_preview, background_file, desktop/background);
- free(background_file);
- /*FIXME: selecting the first row doesn't work - maybe we select first row
while adding elements to the list:(*/
- ew_list_first_row_select(list_thumbs);
-
- ecore_list_goto_first(backgrounds);
- while((background = ecore_list_next(backgrounds)))
- {
-char *background_no_ext = ecore_file_strip_ext(background);
- ew_textlist_add(list_thumbs, background_no_ext, background,
strlen(background) + 1, _background_cb_selected);
-
-free(background_no_ext);
- }
- ecore_list_destroy(backgrounds);
-
- ew_group_add(group_backgrounds, list_thumbs);
-
- /*Entrance_Widget group_options = ew_dialog_group_add(win, _(Options));*/
-
- ew_dialog_close_button_add(win, _background_cb_close, NULL);
- ew_dialog_apply_button_add(win, _background_cb_apply, NULL);
-
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_alignment.c etk_bin.c etk_button.c etk_colorpicker.c
etk_combobox.c etk_frame.c etk_image.c etk_label.c etk_menu.c
etk_menu_item.c etk_radio_button.c etk_range.c
etk_scrolled_view.c etk_signal.c etk_signal.h etk_string.c
etk_table.c etk_toggle_button.c etk_tree.c etk_widget.c
etk_window.c
Log Message:
Reverts recent changes on etk_object_notify() and etk_signal_emit()
since we do not need them anymore with the etk_object_destroy() queue
thing.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_alignment.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_alignment.c 8 Aug 2006 18:03:01 - 1.7
+++ etk_alignment.c 13 Aug 2006 22:42:23 - 1.8
@@ -88,32 +88,28 @@
{
alignment-xalign = xalign;
etk_widget_redraw_queue(ETK_WIDGET(alignment));
- if (!etk_object_notify(ETK_OBJECT(alignment), xalign))
- return;
+ etk_object_notify(ETK_OBJECT(alignment), xalign);
}
yalign = ETK_CLAMP(yalign, 0.0, 1.0);
if (yalign != alignment-yalign)
{
alignment-yalign = yalign;
etk_widget_redraw_queue(ETK_WIDGET(alignment));
- if (!etk_object_notify(ETK_OBJECT(alignment), yalign))
- return;
+ etk_object_notify(ETK_OBJECT(alignment), yalign);
}
xscale = ETK_CLAMP(xscale, 0.0, 1.0);
if (xscale != alignment-xscale)
{
alignment-xscale = xscale;
etk_widget_redraw_queue(ETK_WIDGET(alignment));
- if (!etk_object_notify(ETK_OBJECT(alignment), xscale))
- return;
+ etk_object_notify(ETK_OBJECT(alignment), xscale);
}
yscale = ETK_CLAMP(yscale, 0.0, 1.0);
if (yscale != alignment-yscale)
{
alignment-yscale = yscale;
etk_widget_redraw_queue(ETK_WIDGET(alignment));
- if (!etk_object_notify(ETK_OBJECT(alignment), yscale))
- return;
+ etk_object_notify(ETK_OBJECT(alignment), yscale);
}
}
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_bin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_bin.c 8 Aug 2006 18:03:01 - 1.12
+++ etk_bin.c 13 Aug 2006 22:42:23 - 1.13
@@ -85,8 +85,7 @@
etk_widget_swallow_widget(ETK_WIDGET(bin), swallow_area, bin-child);
bin-child = child;
- if (!etk_signal_emit_by_name(child_added, ETK_OBJECT(bin), NULL,
child))
- return;
+ etk_signal_emit_by_name(child_added, ETK_OBJECT(bin), NULL, child);
etk_object_notify(ETK_OBJECT(bin), child);
}
}
@@ -212,8 +211,7 @@
etk_widget_parent_set_full(widget, NULL, ETK_FALSE);
bin-child = NULL;
- if (!etk_signal_emit_by_name(child_removed, ETK_OBJECT(bin), NULL,
widget))
- return;
+ etk_signal_emit_by_name(child_removed, ETK_OBJECT(bin), NULL, widget);
etk_object_notify(ETK_OBJECT(bin), child);
}
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- etk_button.c13 Aug 2006 15:33:17 - 1.22
+++ etk_button.c13 Aug 2006 22:42:23 - 1.23
@@ -284,14 +284,12 @@
if (button-xalign != xalign)
{
button-xalign = xalign;
- if (!etk_object_notify(ETK_OBJECT(button), xalign))
- return;
+ etk_object_notify(ETK_OBJECT(button), xalign);
}
if (button-yalign != yalign)
{
button-yalign = yalign;
- if (!etk_object_notify(ETK_OBJECT(button), yalign))
- return;
+ etk_object_notify(ETK_OBJECT(button), yalign);
}
}
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_colorpicker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- etk_colorpicker.c 8 Aug 2006 00:57:33 - 1.18
+++ etk_colorpicker.c 13 Aug 2006 22:42:23 - 1.19
@@ -739,10 +739,7 @@
cp-current_color.b = color.b;
evas_object_color_set(cp-current_color_rect, color.r, color.g,
color.b, 255);
if (cp-emit_signal)
-{
- if
(!etk_signal_emit(_etk_colorpicker_signals[ETK_CP_COLOR_CHANGED_SIGNAL],
ETK_OBJECT(cp), NULL))
- return;
-}
+
etk_signal_emit(_etk_colorpicker_signals[ETK_CP_COLOR_CHANGED_SIGNAL],
ETK_OBJECT(cp), NULL);
}
update_sp_image = !((i != cp-mode) ((i / 3) == (cp-mode / 3)));
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_image.h exhibit_main.c exhibit_menus.c
exhibit_menus.h exhibit_options.c
Log Message:
- Implemented refresh
- Added the about dialog
- Some other small fixes
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- exhibit_image.c 13 Aug 2006 20:04:43 - 1.31
+++ exhibit_image.c 13 Aug 2006 22:59:01 - 1.32
@@ -108,9 +108,8 @@
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Run in ...),
ETK_STOCK_APPLICATION_X_EXECUTABLE, ETK_MENU_SHELL(e-menu),
ETK_CALLBACK(_ex_menu_run_in_cb), e);
submenu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu));
-_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(The Gimp),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
-_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(XV), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_run_in_cb), e);
-_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Xpaint),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
+_ex_menu_build_run_menu(submenu);
+
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Favorites),
ETK_STOCK_EMBLEM_FAVORITE, ETK_MENU_SHELL(e-menu),
ETK_CALLBACK(_ex_menu_run_in_cb), e);
submenu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu));
@@ -819,6 +818,15 @@
_(Exhibit - rename));
etk_widget_show_all(dialog);
+}
+
+void
+_ex_image_refresh()
+{
+ char file[PATH_MAX];
+
+ sprintf(file, %s%s, e-cur_tab-set_img_path, e-cur_tab-cur_file);
+ _ex_main_image_set(e, file);
}
void
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- exhibit_image.h 13 Aug 2006 20:04:43 - 1.11
+++ exhibit_image.h 13 Aug 2006 22:59:01 - 1.12
@@ -20,6 +20,7 @@
void _ex_image_save_as(Exhibit *e);
void_ex_image_delete(Exhibit *e);
void_ex_image_rename();
+void_ex_image_refresh();
void _ex_image_run(const char *app);
void _ex_image_zoom(Etk_Image *im, int zoom);
void _ex_image_brightness(Etk_Image *im, int brightness);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- exhibit_main.c 13 Aug 2006 20:04:43 - 1.64
+++ exhibit_main.c 13 Aug 2006 22:59:01 - 1.65
@@ -433,18 +433,18 @@
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);
_ex_favorites_add(e, icol_string);
}
+ else if(!strcmp(ev-key, x))
+ {
+if(!e-cur_tab-fit_window)
+ _ex_tab_current_fit_to_window(e);
+else
+ _ex_tab_current_zoom_one_to_one(e);
+ }
+ else if(!strcmp(ev-key, s))
+ {
+_ex_main_window_slideshow_toggle(e);
+ }
}
- else if(!strcmp(ev-key, x))
- {
- if(!e-cur_tab-fit_window)
- _ex_tab_current_fit_to_window(e);
- else
- _ex_tab_current_zoom_one_to_one(e);
- }
- else if(!strcmp(ev-key, s))
- {
- _ex_main_window_slideshow_toggle(e);
- }
}
static void
@@ -690,8 +690,6 @@
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Save image),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Save image as),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_as_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), NULL, NULL);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Search),
ETK_STOCK_SYSTEM_SEARCH, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_search_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Rename), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_rename_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Delete),
ETK_STOCK_X_DIRECTORY_TRASH, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_delete_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), NULL,
E CVS: proto balony
Enlightenment CVS committal Author : balony Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: - Implemented refresh - Added the about dialog - Some other small fixes === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- TODO13 Aug 2006 20:04:42 - 1.13 +++ TODO13 Aug 2006 22:59:01 - 1.14 @@ -5,16 +5,17 @@ o TODO: -- +- Close tab +- Create window +- Close window + - menus - * refresh * release notes - * about o DONE: -- + open in should be generated from options -+ rename + andy's comments feature + sorting + wheel changing / zooming @@ -24,8 +25,11 @@ + make slideshow display its status in the statusbar(s) + save window geometry between sessions + menus + + about + save image as + delete (needs message dialog) + + refresh + + rename + new window + options + dialog (common options) @@ -63,7 +67,6 @@ * BUGS: === -- When typing 's' in the comment field you start slideshow. - fix autocomplete (combobox?) - if we're looking at a LOT of images and change dir before they have finished loading, then the images will thumbnail and load in the current dir - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
Egui.h background.c egui_graphics_selector.c theme.c
Log Message:
Add use_full_path field to the Egui_Graphics_Selector struct and use it in
egui_graphics_selector.c's apply function, this tell us to either set a full
file path, or just the basename. This fixes a bug stopping backgrounds
selection from showing up after being selected. Actually, for backgrounds, we
need the FULL path, since there is no special entrance backgrounds path _YET_
(unlike for themes)
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Egui.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Egui.h 13 Aug 2006 22:41:44 - 1.3
+++ Egui.h 13 Aug 2006 23:11:47 - 1.4
@@ -8,6 +8,8 @@
char *dialog_title;
char *list_title;
char *entrance_edit_key;
+
+ int use_full_path;
} Egui_Graphics_Selector;
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- background.c13 Aug 2006 22:41:44 - 1.6
+++ background.c13 Aug 2006 23:11:47 - 1.7
@@ -15,7 +15,8 @@
desktop/background,
Entrance Configuration - Background,
Backgrounds,
- ENTRANCE_EDIT_KEY_CLIENT_BACKGROUND_STR
+ ENTRANCE_EDIT_KEY_CLIENT_BACKGROUND_STR,
+ 1
};
egui_gs_dialog_show(background_egs);
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/egui_graphics_selector.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- egui_graphics_selector.c13 Aug 2006 22:41:44 - 1.1
+++ egui_graphics_selector.c13 Aug 2006 23:11:47 - 1.2
@@ -101,10 +101,18 @@
return;
}
- entrance_edit_string_set(egs.entrance_edit_key, graphic);
+ if(egs.use_full_path)
+ {
+ char *full_path = _gs_get_path(graphic);
+ entrance_edit_string_set(egs.entrance_edit_key, full_path);
+ free(full_path);
+ }
+ else
+ entrance_edit_string_set(egs.entrance_edit_key, graphic);
+
if(!entrance_edit_save())
{
- printf(Error setting %s - %s. Please check your
permissions\n, egs.name, graphic);
+ printf(Error setting %s. Please check your permissions\n,
egs.name);
}
}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/theme.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- theme.c 13 Aug 2006 22:41:44 - 1.7
+++ theme.c 13 Aug 2006 23:11:47 - 1.8
@@ -15,7 +15,8 @@
Preview,
Entrance Configuration - Themes,
Themes,
- ENTRANCE_EDIT_KEY_CLIENT_THEME_STR
+ ENTRANCE_EDIT_KEY_CLIENT_THEME_STR,
+ 0
};
egui_gs_dialog_show(theme_egs);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: configure.in Log Message: Added entrance_edit-config. Now other parts of e can call this properly, like entrance_edit_gui, too many build problems have occured already. I guess autofoo really has its uses afterall. === RCS file: /cvs/e/e17/apps/entrance/configure.in,v retrieving revision 1.63 retrieving revision 1.64 diff -u -3 -r1.63 -r1.64 --- configure.in11 Aug 2006 22:51:08 - 1.63 +++ configure.in13 Aug 2006 23:46:40 - 1.64 @@ -231,6 +231,7 @@ Makefile src/Makefile src/lib/Makefile +src/lib/entrance_edit-config src/client/Makefile src/daemon/Makefile src/daemon/entrance_wrapper @@ -255,6 +256,9 @@ data/themes/darkrock/img/Makefile entrance.spec debian/changelog +], +[ + chmod +x src/lib/entrance_edit-config ]) echo - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/entrance essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/lib Modified Files: Makefile.am Added Files: entrance_edit-config.in Log Message: Added entrance_edit-config. Now other parts of e can call this properly, like entrance_edit_gui, too many build problems have occured already. I guess autofoo really has its uses afterall. === RCS file: /cvs/e/e17/apps/entrance/src/lib/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 13 Aug 2006 04:18:28 - 1.3 +++ Makefile.am 13 Aug 2006 23:46:40 - 1.4 @@ -12,3 +12,5 @@ libentrance_edit_ladir=$(prefix)/include [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ + +bin_SCRIPTS = entrance_edit-config - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: Makefile.am Log Message: We now make use of the spanking new entrance_edit-config script in entrance. Booya! Bye-bye build problems. === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Makefile.am 13 Aug 2006 22:41:44 - 1.8 +++ Makefile.am 13 Aug 2006 23:55:55 - 1.9 @@ -14,12 +14,12 @@ entrance_edit_gui_CFLAGS = \ -I$(top_srcdir)/src/widgets \ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ entrance_edit_gui_LDFLAGS = \ -L$(top_srcdir)/src/widgets entrance_edit_gui_LDADD = \ -lentrance_widgets \ - @entrance_libs@ + @entrance_edit_libs@ - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui
Modified Files:
configure.in
Log Message:
We now make use of the spanking new entrance_edit-config script in entrance.
Booya! Bye-bye build problems.
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- configure.in13 Aug 2006 13:46:45 - 1.8
+++ configure.in13 Aug 2006 23:55:55 - 1.9
@@ -85,22 +85,22 @@
#packagesrcdir=`cd $srcdir pwd`
#AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, ${packagesrcdir}, [Source Code
Directory])
-#check for ENTRANCE which contains libentrance_edit
-#AC_PATH_EFL(
-# entrance,
-# 0.1.0.001,
-# [
-# AC_DEFINE(HAVE_ENTRANCE, 1, have ENTRANCE)
-# entrance=ENTRANCE
-# AM_CONDITIONAL(HAVE_ENTRANCE, true)
-# have_entrance=yes
-# entrance_libs=-lentrance_edit
-# entrance_cflags=/usr/include/
-# ],
-# [
-# AC_MSG_ERROR([No Entrance, entrance_edit_gui is an entrance utility.
Install entrance first])
-# ]
-#)
+#check for ENTRANCE_EDIT which contains libentrance_edit
+AC_PATH_EFL(
+ entrance_edit,
+ 0.1.0.001,
+ [
+ AC_DEFINE(HAVE_ENTRANCE_EDIT, 1, have ENTRANCE_EDIT)
+ entrance_edit=ENTRANCE_EDIT
+ AM_CONDITIONAL(HAVE_ENTRANCE_EDIT, true)
+ have_entrance_edit=yes
+ entrance_edit_libs=`entrance_edit-config --libs`
+ entrance_edit_cflags=`entrance_edit-config --cflags`
+ ],
+ [
+ AC_MSG_ERROR([No Entrance, entrance_edit_gui is an entrance utility.
Install entrance first])
+ ]
+)
#check for ETK
AC_PATH_EFL(
@@ -119,11 +119,8 @@
]
)
-entrance_libs=-lentrance_edit
-entrance_cflags=-I/usr/include/
-
-AC_SUBST(entrance_libs)
-AC_SUBST(entrance_cflags)
+AC_SUBST(entrance_edit_libs)
+AC_SUBST(entrance_edit_cflags)
AC_SUBST(etk_libs)
AC_SUBST(etk_cflags)
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Added Files: TODO Log Message: How did we make it this far without a TODO file? - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: TODO Log Message: TODO++ === RCS file: /cvs/e/e17/proto/entrance_edit_gui/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- TODO14 Aug 2006 01:02:49 - 1.1 +++ TODO14 Aug 2006 01:08:51 - 1.2 @@ -18,7 +18,9 @@ GUI == -implement layout screen -implement sessions screen -implement behavior screen -implement x-settings screen +- implement layout screen +- implement sessions screen +- implement behavior screen +- implement x-settings screen +- theme and background dialogs need a way to browse filesystem to grab from arbitrary locations. +- The PREVIEW window is just CRAP! We actually should be loading Entrance itself with the config changes into a canvas and displaying that canvas or something. Basically, entrance -T shows us a preview of entrance without running the code, we should be able to kidnap and enslave that functionality in the gui config panel, i'm smelling a libentrance here. no? - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_tree2.c
Log Message:
- some work on tree2. start populating rows and having them show up
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_tree2.c 26 May 2006 19:01:56 - 1.19
+++ ewl_tree2.c 14 Aug 2006 04:12:39 - 1.20
@@ -482,7 +482,7 @@
{
Ewl_Tree2 *tree;
Ewl_Tree2_Column *col;
- int column = 0;
+ int column = 0, rows = 0, i, size;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(w, w);
@@ -495,6 +495,14 @@
CURRENT_Y(tree), CURRENT_W(tree),
CURRENT_H(tree));
+ /* place the rows */
+ size = ewl_object_current_h_get(EWL_OBJECT(tree-header));
+ ewl_object_place(EWL_OBJECT(tree-rows), CURRENT_X(tree),
+ CURRENT_Y(tree) + size,
+ CURRENT_W(tree),
+ CURRENT_H(tree) - size);
+
+
/* if the tree isn't dirty we're done */
if (!ewl_tree2_dirty_get(tree))
DRETURN(DLEVEL_STABLE);
@@ -504,9 +512,49 @@
ecore_list_goto_first(tree-columns);
while ((col = ecore_list_next(tree-columns)))
{
+ int r;
+
ewl_container_child_append(EWL_CONTAINER(tree-header),
col-view-header_fetch(tree-data, column));
column ++;
+
+ r = col-model-count(tree-data);
+ if (r rows) rows = r;
+ }
+
+ ewl_container_reset(EWL_CONTAINER(tree-rows));
+ for (i = 0; i rows; i++)
+ {
+ Ewl_Widget *row;
+
+ row = ewl_row_new();
+ ewl_row_header_set(EWL_ROW(row), EWL_ROW(tree-header));
+ ewl_container_child_append(EWL_CONTAINER(tree-rows), row);
+ ewl_widget_show(row);
+
+ column = 0;
+ ecore_list_goto_first(tree-columns);
+ while((col = ecore_list_next(tree-columns)))
+ {
+ Ewl_Widget *child;
+ void *val;
+
+ val = col-model-fetch(tree-data, i, column);
+ if (!val)
+ {
+ child = ewl_label_new();
+ ewl_label_text_set(EWL_LABEL(child), );
+ }
+ else
+ {
+ child = col-view-construct();
+ col-view-assign(child, val);
+ }
+ ewl_container_child_append(EWL_CONTAINER(row), child);
+ ewl_widget_show(child);
+
+ column ++;
+ }
}
ewl_tree2_dirty_set(tree, FALSE);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_row.c
Log Message:
- formatting
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_row.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_row.c 26 May 2006 18:17:19 - 1.19
+++ ewl_row.c 14 Aug 2006 04:24:15 - 1.20
@@ -164,9 +164,8 @@
* Get the first child of the header.
*/
align =
EWL_OBJECT(ewl_container_child_next(EWL_CONTAINER(hdr)));
- if (align) {
+ if (align)
x = MAX(ewl_object_current_x_get(align), CURRENT_X(w));
- }
else
x = CURRENT_X(w);
@@ -177,7 +176,8 @@
while ((child = EWL_OBJECT(ewl_container_child_next(c {
align =
EWL_OBJECT(ewl_container_child_next(EWL_CONTAINER(hdr)));
if (align VISIBLE(align))
- width = ewl_object_current_x_get(align) +
ewl_object_current_w_get(align) - x;
+ width = ewl_object_current_x_get(align) +
+ ewl_object_current_w_get(align)
- x;
else if (nodes)
width = remains / nodes;
else
@@ -188,7 +188,7 @@
* accepted to calculate remaining steps.
*/
ewl_object_place(child, x, CURRENT_Y(w), width,
-CURRENT_H(w));
+CURRENT_H(w));
width = ewl_object_current_w_get(child);
x += width;
remains -= width;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_tree.c Log Message: - make ewl_tree use 'tree_header' as the appearance for it's header so it matches tree2. - update theme file to match - fix formatting of theme file === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- ewl_tree.c 9 Jun 2006 19:33:14 - 1.38 +++ ewl_tree.c 14 Aug 2006 04:33:13 - 1.39 @@ -90,6 +90,7 @@ } ewl_container_child_append(EWL_CONTAINER(tree), header); + ewl_widget_appearance_set(EWL_WIDGET(header), tree_header); ewl_widget_show(header); tree-header = header; - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes
Modified Files:
e17.edc
Log Message:
- make ewl_tree use 'tree_header' as the appearance for it's header so it
matches tree2.
- update theme file to match
- fix formatting of theme file
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17.edc,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e17.edc 11 Aug 2006 17:31:46 - 1.46
+++ e17.edc 14 Aug 2006 04:33:13 - 1.47
@@ -1,7 +1,7 @@
#include e17/macros/button-macros.edc
fonts {
-font, e17/fonts/Vera.ttf Vera;
+ font, e17/fonts/Vera.ttf Vera;
}
images {
@@ -37,126 +37,127 @@
}
data {
-item, /label/group label;
-item, /label/textpart text;
+ item, /label/group label;
+ item, /label/textpart text;
-item, /border/group border;
-item, /border/label/group border/label;
+ item, /border/group border;
+ item, /border/label/group border/label;
-item, /button/group button;
+ item, /button/group button;
-item, /radio/group radio;
-item, /radiobutton/group checkbutton;
-
-item, /check/group checkbox;
-item, /checkbutton/group checkbutton;
-
-item, /entry/group entry;
-item, /entry/color/a 255;
-item, /entry/font Vera;
-item, /entry/font_size 10;
-
-item, /cursor/group cursor;
-
-item, /text/color/a 255;
-item, /text/font Vera;
-item, /text/font_size 10;
-item, /text/style none;
-
-item, /hseparator/group hline;
-item, /vseparator/group vline;
-
-item, /grabber/vertical/group vgrabber;
-item, /grabber/horizontal/group hgrabber;
-
-item, /icon/group icon;
-
-item, /freebox/auto/padding 5;
-
-item, /tree/group tree_background;
-item, /tree2/group tree_background;
-item, /row/group row_background;
-item, /row/cell/label/group row_text;
-item, /tree/paned/group tree_header;
-item, /tree/paned/button/group tree_header_label;
-item, /tree/paned/grabber/vertical/group vline;
-item, /node/check/group treenode;
-item, /row/group row_background;
-item, /row/cell/label/group row_text;
-
-item, /progressbar_bar/group progressbar_bar;
-item, /progressbar/group progressbar;
-
-item, /stock/apply stock/apply;
-item, /stock/arrow/down stock/arrow/down;
-item, /stock/arrow/left stock/arrow/left;
-item, /stock/arrow/right stock/arrow/right;
-item, /stock/arrow/up stock/arrow/up;
-item, /stock/cancel stock/cancel;
-item, /stock/ff stock/ff;
-item, /stock/home stock/home;
-item, /stock/ok stock/ok;
-item, /stock/open stock/open;
-item, /stock/pause stock/pause;
-item, /stock/play stock/play;
-item, /stock/quit stock/quit;
-item, /stock/rewind stock/rewind;
-item, /stock/save stock/save;
-item, /stock/stop stock/stop;
-
-item, /combo/decrement/group spinner-down;
-item, /combo/decrement/body/group spinnerdown;
-item, /combo/increment/group spinner-up;
-item, /combo/increment/body/group spinnerup;
-
-item, /selection_area/group selection_area;
-
-item, /spinner/controls/decrement/group spinner-down;
-item, /spinner/controls/increment/group spinner-up;
-item, /spinner/controls/increment/body/group spinnerup;
-item, /spinner/controls/decrement/body/group spinnerdown;
-item, /spinner/acceleration 5;
-item, /spinner/velocity 5;
-
-item, /spacer/group spacer;
-
-item, /notebook/group notebook;
-item, /tabbar/tab/group tab;
-item, /tabbar/tab/label/group tab/label;
-
-item, /vscrollbar/group vscrollbar;
-item, /hscrollbar/group hscrollbar;
-item, /vscrollbar/vseeker/group transparent;
-item, /hscrollbar/hseeker/group transparent;
-item, /vscrollbar/decrement/group vscrollbar_bottom;
-item, /vscrollbar/increment/group vscrollbar_top;
-item, /hscrollbar/decrement/group hscrollbar_left;
-item, /hscrollbar/increment/group hscrollbar_right;
-
-item, /vseeker/group vseeker_track;
-item, /hseeker/group hseeker_track;
-item, /vseeker/vbutton/group vscrollbar_drag;
-item, /hseeker/hbutton/group hscrollbar_drag;
-
-item, /menubar/group menubar;
-item, /imenu/group menu;
-item, /menu/group menu;
-item, /menu/vbox/menu_container/body/label/group submenuitem;
-item, /menu_item/body/label/group menuitem;
-
-item, /scrollpane/group scrollpane/background;
-
-item, /statusbar/group statusbar;
-
-item, /tooltip/offset 15;
-item, /tooltip/delay 1.0;
-item, /tooltip/group window;
-
-item, /window/group window;
-
-item, /theme/name e17;
-item, /theme/authors Original Author:dj2 (www.everburning.com) Current
Authors: dj2(www.everburning.com) and LinuxTitan (www.ecoding.org);
-item, /theme/font_path fonts;
-item, /theme/license Creative
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_test.c
Added Files:
e_color.c e_color.h e_spectrum.c e_spectrum.h e_widget_csel.c
e_widget_csel.h e_widget_cslider.c e_widget_cslider.h
e_widget_spectrum.c e_widget_spectrum.h
Log Message:
Start of a color selector.
Change the last test in e_test.c to #if 1 to play.
Issues:
Redrawing the H,S and V spectra is a bit slow. Needs to be optimized.
Spacing / Sizing of the various pieces of the csel widget needs to be cleaned
up a bit.
I haven't actually themed anything yet. Just some fairly basic place holders
to get it working. We should wrap each piece in shadowed cutout graphic, and
make fancier cursors.
A color well widget
- show the currently selected color
- allows dnd of colors (this probably requires some reworking of ecore
selection code)
For anyone wanting to play with this, a single E_Color struct is used by all
parts of the selector, preventing the need to copy values around. This includes
RGB *and* HSV values since the two spaces aren't 1:1.
===
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- Makefile.am 11 Aug 2006 21:48:18 - 1.134
+++ Makefile.am 14 Aug 2006 04:38:49 - 1.135
@@ -167,6 +167,11 @@
e_sha1.h \
e_widget_fsel.h \
e_fm_mime.h \
+e_color.h \
+e_spectrum.h \
+e_widget_spectrum.h \
+e_widget_cslider.h \
+e_widget_csel.h \
e_int_config_wallpaper.h \
e_int_config_wallpaper_import.h
@@ -311,6 +316,11 @@
e_sha1.c \
e_widget_fsel.c \
e_fm_mime.c \
+e_color.c \
+e_spectrum.c \
+e_widget_spectrum.c \
+e_widget_cslider.c \
+e_widget_csel.c \
e_int_config_wallpaper.c \
e_int_config_wallpaper_import.c \
$(ENLIGHTENMENTHEADERS)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- e_includes.h11 Aug 2006 21:48:18 - 1.113
+++ e_includes.h14 Aug 2006 04:38:49 - 1.114
@@ -145,3 +145,8 @@
#include e_fm_mime.h
#include e_int_config_wallpaper.h
#include e_int_config_wallpaper_import.h
+#include e_color.h
+#include e_spectrum.h
+#include e_widget_spectrum.h
+#include e_widget_cslider.h
+#include e_widget_csel.h
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- e_test.c13 Aug 2006 02:51:34 - 1.62
+++ e_test.c14 Aug 2006 04:38:49 - 1.63
@@ -331,7 +331,7 @@
e_dialog_title_set(dia, A Test Dialog);
o = e_icon_add(dia-win-evas);
- e_icon_file_set(o, /home/raster/t.png);
+ e_icon_file_set(o, /home/rephorm/scroll.png);
evas_object_resize(o, 1024, 768);
evas_object_focus_set(o, 1);
evas_object_show(o);
@@ -793,6 +793,29 @@
e_win_resize(dia-win, 400, 300);
}
+#elif 0
+static void
+_e_test_internal(E_Container *con)
+{
+ E_Dialog *dia;
+ Evas_Object *o;
+ Evas_Coord mw, mh;
+
+ dia = e_dialog_new(con);
+ e_dialog_title_set(dia, Test Color Selector);
+ o = e_widget_csel_add(dia-win-evas);
+ evas_object_show(o);
+ e_widget_min_size_get(o, mw, mh);
+ e_dialog_content_set(dia, o, mw, mh);
+
+ /* buttons at the bottom */
+ e_dialog_button_add(dia, OK, NULL, NULL, NULL);
+ e_dialog_resizable_set(dia, 1);
+ e_win_centered_set(dia-win, 1);
+ e_dialog_show(dia);
+ e_win_resize(dia-win, 460, 230);
+}
+
#else
static void
_e_test_internal(E_Container *con)
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: Makefile.am default.edc Added Files: default_cslider.edc default_spectrum.edc Log Message: Start of a color selector. Change the last test in e_test.c to #if 1 to play. Issues: Redrawing the H,S and V spectra is a bit slow. Needs to be optimized. Spacing / Sizing of the various pieces of the csel widget needs to be cleaned up a bit. I haven't actually themed anything yet. Just some fairly basic place holders to get it working. We should wrap each piece in shadowed cutout graphic, and make fancier cursors. A color well widget - show the currently selected color - allows dnd of colors (this probably requires some reworking of ecore selection code) For anyone wanting to play with this, a single E_Color struct is used by all parts of the selector, preventing the need to copy values around. This includes RGB *and* HSV values since the two spaces aren't 1:1. === RCS file: /cvs/e/e17/apps/e/data/themes/Makefile.am,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- Makefile.am 9 Apr 2006 03:48:39 - 1.43 +++ Makefile.am 14 Aug 2006 04:38:49 - 1.44 @@ -53,7 +53,9 @@ default_desklock.edc \ default_textblock.edc \ default_shelf.edc \ -default_preview.edc +default_preview.edc \ +default_cslider.edc \ +default_spectrum.edc default.edj: Makefile $(EXTRA_DIST) $(EDJE_CC) $(EDJE_FLAGS) \ === RCS file: /cvs/e/e17/apps/e/data/themes/default.edc,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- default.edc 9 Apr 2006 03:48:39 - 1.64 +++ default.edc 14 Aug 2006 04:38:49 - 1.65 @@ -62,5 +62,7 @@ #include default_textblock.edc #include default_shelf.edc #include default_preview.edc +#include default_cslider.edc +#include default_spectrum.edc } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_spectrum.c
Log Message:
move spectrum redraw to an idler so it gets called at most once per render.
no more performance issue there... :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_spectrum.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_spectrum.c14 Aug 2006 04:38:49 - 1.1
+++ e_spectrum.c14 Aug 2006 05:21:16 - 1.2
@@ -14,8 +14,11 @@
E_Color_Component mode;
E_Color *cv;
+ int draw_queued;
};
+static int _e_spectrum_redraw(void *d);
+
static void
_e_spectrum_smart_add(Evas_Object *o)
{
@@ -33,6 +36,8 @@
evas_object_image_size_set(sp-o_spectrum, sp-iw, sp-ih);
evas_object_image_alpha_set(sp-o_spectrum, 1);
+ ecore_idler_add(_e_spectrum_redraw, sp);
+
evas_object_smart_member_add(sp-o_spectrum, o);
}
@@ -243,16 +248,16 @@
if (b) *b = bb;
}
-void
-_e_spectrum_update(E_Spectrum *sp)
+static int
+_e_spectrum_redraw(void *d)
{
+ E_Spectrum *sp = d;
+ int *data;
int i, j;
int r, g, b;
- int *data;
float vx, vy, vz;
- if (!sp || !sp-cv) return;
- //printf(UPDATE SPECTRUM\n);
+ if (!sp-draw_queued) return 1;
data = evas_object_image_data_get(sp-o_spectrum, 1);
if (!data) return;
@@ -292,8 +297,17 @@
evas_object_image_data_set(sp-o_spectrum, data);
evas_object_image_data_update_add(sp-o_spectrum, 0, 0, sp-iw, sp-ih);
+ sp-draw_queued = 0;
+ return 1;
}
+static void
+_e_spectrum_update(E_Spectrum *sp)
+{
+ if (!sp || !sp-cv) return;
+
+ sp-draw_queued = 1;
+}
Evas_Object *
e_spectrum_add(Evas *e)
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
Ecore_Desktop.h ecore_desktop.c ecore_desktop_icon.c
ecore_desktop_menu.c ecore_desktop_paths.c
Log Message:
Changed the externally visible names to be more like the rest of ecore.
I don't think anybody is using it yet, but I'm compiling everything now
to make sure.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/Ecore_Desktop.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Ecore_Desktop.h 14 Aug 2006 04:41:44 - 1.3
+++ Ecore_Desktop.h 14 Aug 2006 05:44:04 - 1.4
@@ -74,14 +74,14 @@
/* Function Prototypes */
voidecore_desktop_paths_init(void);
- char *ecore_desktop_paths_search_for_file(Ecore_List * paths,
- char *file, int sub,
- int (*func) (const
- void
- *data,
- char
- *path),
- const void *data);
+ char *ecore_desktop_paths_file_find(Ecore_List * paths,
+ char *file, int sub,
+ int (*func) (const
+ void
+ *data,
+ char
+ *path),
+ const void *data);
char *ecore_desktop_paths_recursive_search(char *path, char
*d,
int (*dir_func)
(const void *data,
@@ -94,19 +94,19 @@
const void *data);
voidecore_desktop_paths_shutdown(void);
- Ecore_Hash *ecore_desktop_hash_from_paths(char *paths);
- Ecore_List *ecore_desktop_list_from_paths(char *paths);
+ Ecore_Hash *ecore_desktop_paths_to_hash(char *paths);
+ Ecore_List *ecore_desktop_paths_to_list(char *paths);
voidecore_desktop_init(void);
voidecore_desktop_shutdown(void);
- Ecore_Hash *ecore_desktop_parse_ini_file(char *file);
- Ecore_Desktop *ecore_desktop_parse_file(char *file);
+ Ecore_Hash *ecore_desktop_ini_get(char *file);
+ Ecore_Desktop *ecore_desktop_get(char *file);
voidecore_desktop_destroy(Ecore_Desktop * desktop);
- char *ecore_desktop_find_icon(char *icon, char *icon_size,
+ char *ecore_desktop_icon_find(char *icon, char *icon_size,
char *icon_theme);
- Ecore_Desktop_Tree *ecore_desktop_menus_get(char *file,
+ Ecore_Desktop_Tree *ecore_desktop_menu_get(char *file,
Ecore_Desktop_Tree * merge_stack,
int level);
@@ -148,7 +148,7 @@
Ecore_Desktop_Tree *ecore_desktop_xmlame_new(char *buffer);
Ecore_Desktop_Tree *ecore_desktop_xmlame_get(char *file);
- char *ecore_desktop_get_home(void);
+ char *ecore_desktop_home_get(void);
# ifdef __cplusplus
}
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_desktop.c 14 Aug 2006 04:41:44 - 1.3
+++ ecore_desktop.c 14 Aug 2006 05:44:04 - 1.4
@@ -7,7 +7,7 @@
static Ecore_Hash *desktop_cache;
Ecore_Hash *
-ecore_desktop_parse_ini_file(char *file)
+ecore_desktop_ini_get(char *file)
{
Ecore_Hash *result;
@@ -106,7 +106,7 @@
}
Ecore_Desktop *
-ecore_desktop_parse_file(char *file)
+ecore_desktop_get(char *file)
{
Ecore_Desktop *result;
@@ -116,7 +116,7 @@
result = calloc(1, sizeof(Ecore_Desktop));
if (result)
{
-result-data = ecore_desktop_parse_ini_file(file);
+result-data = ecore_desktop_ini_get(file);
if (result-data)
{
result-group =
@@ -149,17 +149,17 @@
(char *)ecore_hash_get(result-group,
E CVS: apps/e_utils onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu
Modified Files:
global.c main.c menus.c parse.c sort.c
Log Message:
Updated to match ecore_desktop name changes.
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/global.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- global.c11 Aug 2006 13:50:04 - 1.4
+++ global.c14 Aug 2006 05:45:06 - 1.5
@@ -156,7 +156,7 @@
Ecore_List *eaps = NULL;
/* Check That Dir All Exists */
- snprintf(path, sizeof(path), %s EAPPDIR, ecore_desktop_get_home());
+ snprintf(path, sizeof(path), %s EAPPDIR, ecore_desktop_home_get());
if (!ecore_file_exists(path))
{
fprintf(stderr, ERROR: %s doesn't exist. Where are the eapps ?\n,
path);
@@ -179,7 +179,7 @@
#ifdef DEBUG
fprintf(stderr, Backing Up %s\n, tmp);
#endif
- snprintf(dest, sizeof(dest), %s/EapBackup,
ecore_desktop_get_home());
+ snprintf(dest, sizeof(dest), %s/EapBackup,
ecore_desktop_home_get());
if (!ecore_file_exists(dest))
{
if (!ecore_file_mkdir(dest))
@@ -187,7 +187,7 @@
}
/* Copy The File */
- snprintf(dest, sizeof(dest), %s/EapBackup/%s,
ecore_desktop_get_home(), file);
+ snprintf(dest, sizeof(dest), %s/EapBackup/%s,
ecore_desktop_home_get(), file);
result = ecore_file_cp(tmp, dest);
if (!result)
break;
@@ -206,7 +206,7 @@
if ((!eap-icon) || (!eap-name) || (!eap-exec) || (!eap-window_class))
return;
- snprintf(path, sizeof(path), %s/MAPPING, ecore_desktop_get_home());
+ snprintf(path, sizeof(path), %s/MAPPING, ecore_desktop_home_get());
f = fopen(path, a+);
if (!f)
{
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- main.c 11 Aug 2006 13:50:04 - 1.9
+++ main.c 14 Aug 2006 05:45:06 - 1.10
@@ -92,7 +92,7 @@
}
/* Check That Dir All Exists */
- snprintf(path, sizeof(path), %s EAPPDIR, ecore_desktop_get_home());
+ snprintf(path, sizeof(path), %s EAPPDIR, ecore_desktop_home_get());
if (!ecore_file_exists(path))
{
fprintf(stderr, ERROR: %s doesn't exist. Where are the eapps?\n,
path);
@@ -164,9 +164,9 @@
/* Just being paranoid, and cause people have removed these during testing.
*/
- snprintf(path, sizeof(path), %s/.e/e/applications/all,
ecore_desktop_get_home());
+ snprintf(path, sizeof(path), %s/.e/e/applications/all,
ecore_desktop_home_get());
ecore_file_mkpath(path);
- snprintf(path, sizeof(path), %s/.e/e/applications/favorite,
ecore_desktop_get_home());
+ snprintf(path, sizeof(path), %s/.e/e/applications/favorite,
ecore_desktop_home_get());
ecore_file_mkpath(path);
begin = ecore_time_get();
@@ -181,7 +181,7 @@
*
* Currently I do this instead, it seems to work -
*/
- snprintf(path, sizeof(path),
%s/.e/e/applications/favorite/.eap.cache.cfg, ecore_desktop_get_home());
+ snprintf(path, sizeof(path),
%s/.e/e/applications/favorite/.eap.cache.cfg, ecore_desktop_home_get());
ecore_file_unlink(path);
/* Update E Cache */
@@ -189,9 +189,9 @@
#ifdef DEBUG
fprintf(stderr, Regenerating Eapp Caches...\n);
#endif
- snprintf(path, sizeof(path), enlightenment_eapp_cache_gen %s EAPPDIR
-r, ecore_desktop_get_home());
+ snprintf(path, sizeof(path), enlightenment_eapp_cache_gen %s EAPPDIR
-r, ecore_desktop_home_get());
system(path);
- snprintf(path, sizeof(path), enlightenment_eapp_cache_gen
%s/.e/e/applications/favorite -r, ecore_desktop_get_home());
+ snprintf(path, sizeof(path), enlightenment_eapp_cache_gen
%s/.e/e/applications/favorite -r, ecore_desktop_home_get());
system(path);
cache_time += ecore_time_get() - begin;
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/menus.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- menus.c 11 Aug 2006 13:50:04 - 1.6
+++ menus.c 14 Aug 2006 05:45:06 - 1.7
@@ -47,7 +47,7 @@
printf(Converting freedesktop.org (fdo) menus.\n);
/* Find the main menu file. */
-menu_file =
ecore_desktop_paths_search_for_file(ecore_desktop_paths_menus, menu, 1, NULL,
NULL);
+menu_file = ecore_desktop_paths_file_find(ecore_desktop_paths_menus,
menu, 1, NULL, NULL);
if (menu_file)
{
char *path;
@@ -58,7 +58,7 @@
Ecore_Desktop_Tree *menus = NULL;
/* convert the xml into menus */
- menus =
