E CVS: libs/ewl ningerso

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_filelist_model.c 


Log Message:
Fix warning by including fnmatch.h again.

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_model.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_filelist_model.c9 Dec 2007 06:21:43 -   1.7
+++ ewl_filelist_model.c9 Dec 2007 06:29:03 -   1.8
@@ -6,6 +6,7 @@
 #include "ewl_model.h"
 #include "ewl_filelist.h"
 #include "ewl_io_manager.h"
+#include 
 #include 
 #include 
 



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl jethomas

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : jethomas
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/bin/tests/io_manager


Modified Files:
ewl_io_manager_test.c 


Log Message:
Bunch of small fixes

===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/io_manager/ewl_io_manager_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_io_manager_test.c   9 Dec 2007 04:33:38 -   1.2
+++ ewl_io_manager_test.c   9 Dec 2007 06:21:42 -   1.3
@@ -8,6 +8,8 @@
 
 #include 
 #include 
+#include 
+#include 
 
 static int create_test(Ewl_Container *box);
 
@@ -50,11 +52,16 @@
void *data __UNUSED__)
 {
Ewl_Widget *fd;
+   Ecore_List *filters;
+
+   filters = ecore_list_new();
+   ecore_list_append(filters, strdup("image/jpeg"));
+   ecore_list_append(filters, strdup("image/png"));
+   ecore_list_append(filters, strdup("image/gif"));
 
fd = ewl_filedialog_new();
ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "txt", "*.txt", NULL);
-   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "png", "*.png", NULL);
-   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "jpg", "*.jpg", NULL);
+   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "Images", NULL, filters);
ewl_callback_append(fd, EWL_CALLBACK_DELETE_WINDOW, cb_fd_delete, NULL);
ewl_callback_append(fd, EWL_CALLBACK_VALUE_CHANGED, cb_open, NULL);
ewl_widget_show(fd);



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl jethomas

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : jethomas
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_filedialog.c ewl_filelist_model.c ewl_filelist_view.c 


Log Message:
Bunch of small fixes

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_filedialog.c9 Dec 2007 04:33:39 -   1.41
+++ ewl_filedialog.c9 Dec 2007 06:21:43 -   1.42
@@ -411,7 +411,6 @@
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(fd);
DCHECK_PARAM_PTR(name);
-   DCHECK_PARAM_PTR(filter);
DCHECK_TYPE(fd, EWL_FILEDIALOG_TYPE);
 
ewl_filepicker_filter_add(EWL_FILEPICKER(fd->fp), name, filter, 
mime_types);
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_model.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_filelist_model.c9 Dec 2007 04:33:39 -   1.6
+++ ewl_filelist_model.c9 Dec 2007 06:21:43 -   1.7
@@ -7,6 +7,7 @@
 #include "ewl_filelist.h"
 #include "ewl_io_manager.h"
 #include 
+#include 
 
 static int ewl_filelist_model_data_name_sort(Ewl_Filelist_File *file1,
Ewl_Filelist_File *file2);
@@ -563,7 +564,8 @@
ecore_list_first_goto(filter->mime_list);
while ((mime_given = ecore_list_next(filter->mime_list)))
{
-   if (!strcmp(mime_given, mime_check))
+   if ((mime_check) && (!strcmp(mime_given,
+   mime_check)))
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
}
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist_view.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_filelist_view.c 18 Nov 2007 21:43:35 -  1.2
+++ ewl_filelist_view.c 9 Dec 2007 06:21:43 -   1.3
@@ -13,7 +13,7 @@
unsigned int row __UNUSED__, unsigned int column)
 {
Ewl_Widget *ret;
-   const char *img, *stock, *filename;
+   const char *img = NULL, *stock, *filename;
 
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET(data, NULL);
@@ -28,10 +28,16 @@
/* Get and set data into icon */
if (column == 0)
{
-   stock = ewl_filelist_stock_icon_get(data);
-   img = ewl_icon_theme_icon_path_get(stock, 0);
+   if (!strcmp(data, ".."))
+   img = ewl_icon_theme_icon_path_get
+   (EWL_ICON_GO_UP, 0);
+   else
+   {
+   stock = ewl_filelist_stock_icon_get(data);
+   img = ewl_icon_theme_icon_path_get(stock, 0);
+   }
if (img) ewl_icon_image_set(EWL_ICON(ret), 
-   img, stock);
+   img, NULL);
 
filename = ecore_file_file_get(data);
ewl_icon_label_set(EWL_ICON(ret), filename);



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl jethomas

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : jethomas
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/bin/tests/filepicker


Modified Files:
ewl_filepicker_test.c 


Log Message:
Implement filtering in the file choosing widgets

===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/filepicker/ewl_filepicker_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_filepicker_test.c   8 Dec 2007 06:43:08 -   1.2
+++ ewl_filepicker_test.c   9 Dec 2007 04:33:38 -   1.3
@@ -99,8 +99,8 @@
Ewl_Widget *w;
 
w = ewl_filepicker_new();
-   ewl_filepicker_filter_add(EWL_FILEPICKER(w), "C Files", "*.c");
-   ewl_filepicker_filter_add(EWL_FILEPICKER(w), "D Files", "*.d");
+   ewl_filepicker_filter_add(EWL_FILEPICKER(w), "C Files", "*.c", NULL);
+   ewl_filepicker_filter_add(EWL_FILEPICKER(w), "D Files", "*.d", NULL);
ewl_container_child_append(box, w);
ewl_callback_append(w, EWL_CALLBACK_VALUE_CHANGED,
ewl_filepicker_cb_value_changed, NULL);



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl jethomas

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : jethomas
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/bin/tests/io_manager


Modified Files:
ewl_io_manager_test.c 


Log Message:
Implement filtering in the file choosing widgets

===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/io_manager/ewl_io_manager_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_io_manager_test.c   4 Dec 2007 05:28:00 -   1.1
+++ ewl_io_manager_test.c   9 Dec 2007 04:33:38 -   1.2
@@ -52,9 +52,9 @@
Ewl_Widget *fd;
 
fd = ewl_filedialog_new();
-   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "txt", "*.txt");
-   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "png", "*.png");
-   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "jpg", "*.jpg");
+   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "txt", "*.txt", NULL);
+   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "png", "*.png", NULL);
+   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "jpg", "*.jpg", NULL);
ewl_callback_append(fd, EWL_CALLBACK_DELETE_WINDOW, cb_fd_delete, NULL);
ewl_callback_append(fd, EWL_CALLBACK_VALUE_CHANGED, cb_open, NULL);
ewl_widget_show(fd);



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl jethomas

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : jethomas
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/bin/tests/filedialog


Modified Files:
ewl_filedialog_test.c 


Log Message:
Implement filtering in the file choosing widgets

===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/filedialog/ewl_filedialog_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_filedialog_test.c   4 Dec 2007 05:27:59 -   1.1
+++ ewl_filedialog_test.c   9 Dec 2007 04:33:38 -   1.2
@@ -69,8 +69,8 @@
Ewl_Widget *fd;
 
fd = ewl_filedialog_new();
-   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "C Files", "*.c");
-   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "D Files", "*.d");
+   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "C Files", "*.c", NULL);
+   ewl_filedialog_filter_add(EWL_FILEDIALOG(fd), "D Files", "*.d", NULL);
ewl_callback_append(fd, EWL_CALLBACK_DELETE_WINDOW,
fd_cb_delete, NULL);
ewl_callback_append(fd, EWL_CALLBACK_VALUE_CHANGED,



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl jethomas

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : jethomas
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_filedialog.c ewl_filedialog.h ewl_filelist.c 
ewl_filelist.h ewl_filelist_model.c ewl_filelist_model.h 
ewl_filepicker.c ewl_filepicker.h 


Log Message:
Implement filtering in the file choosing widgets

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewl_filedialog.c14 Nov 2007 20:07:58 -  1.40
+++ ewl_filedialog.c9 Dec 2007 04:33:39 -   1.41
@@ -405,7 +405,8 @@
  */
 void
 ewl_filedialog_filter_add(Ewl_Filedialog *fd, const char *name,
-   const char *filter)
+   const char *filter,
+   Ecore_List *mime_types)
 {
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(fd);
@@ -413,7 +414,7 @@
DCHECK_PARAM_PTR(filter);
DCHECK_TYPE(fd, EWL_FILEDIALOG_TYPE);
 
-   ewl_filepicker_filter_add(EWL_FILEPICKER(fd->fp), name, filter);
+   ewl_filepicker_filter_add(EWL_FILEPICKER(fd->fp), name, filter, 
mime_types);
 
DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filedialog.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ewl_filedialog.h14 Nov 2007 20:07:58 -  1.23
+++ ewl_filedialog.h9 Dec 2007 04:33:39 -   1.24
@@ -89,7 +89,8 @@
 
 voidewl_filedialog_filter_add(Ewl_Filedialog *fd,
const char *name,
-   const char *filter);
+   const char *filter,
+   Ecore_List *mime_types);
 
 /*
  * Internally used callbacks, override at your own risk.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ewl_filelist.c  9 Dec 2007 01:00:40 -   1.44
+++ ewl_filelist.c  9 Dec 2007 04:33:39 -   1.45
@@ -77,8 +77,8 @@
fl->multiselect = FALSE;
fl->skip_hidden = TRUE;
 
-   ewl_filelist_filter_set(fl, NULL);
-   ewl_filelist_directory_set(fl, NULL);
+   fl->directory = NULL;
+   fl->filter = NULL;
ewl_filelist_setup(fl);
 
DRETURN_INT(TRUE, DLEVEL_STABLE);
@@ -279,7 +279,7 @@
if (data) ewl_filelist_model_data_unref(data);

data = ewl_filelist_model_directory_new(fl->directory,
-fl->skip_hidden, TRUE);
+fl->skip_hidden, TRUE, 
fl->filter);
ewl_mvc_data_set(EWL_MVC(fl->controller), data);
ewl_mvc_dirty_set(EWL_MVC(fl->controller), TRUE);
 
@@ -313,17 +313,25 @@
  * @brief Sets the given filter into the filelist
  */
 void
-ewl_filelist_filter_set(Ewl_Filelist *fl, const char *filter)
+ewl_filelist_filter_set(Ewl_Filelist *fl, Ewl_Filelist_Filter *filter)
 {
+   Ewl_Filelist_Directory *dir;
+   int ret = 0;
+   
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(fl);
+   DCHECK_PARAM_PTR(filter);
DCHECK_TYPE(fl, EWL_FILELIST_TYPE);
 
-   IF_FREE(fl->filter);
-   fl->filter = (filter ? strdup(filter) : NULL);
+   fl->filter = NULL;
+   fl->filter = filter;
+   dir = ewl_mvc_data_get(EWL_MVC(fl->controller));

-   /* Model does not do filtering yet */
-   DWARNING("Filtering not yet implemented");
+   /* Set the filelist and test if there is any change in data */
+   if (dir)
+   ret = ewl_filelist_model_filter_set(dir, filter);
+   if (ret)
+   ewl_mvc_dirty_set(EWL_MVC(fl->controller), TRUE);
 
DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -333,7 +341,7 @@
  * @return Returns the current filter
  * @brief Retrieves the current filter set on the filelist
  */
-const char *
+Ewl_Filelist_Filter *
 ewl_filelist_filter_get(Ewl_Filelist *fl)
 {
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -406,7 +414,8 @@
 void
 ewl_filelist_show_dot_files_set(Ewl_Filelist *fl, unsigned int dot)
 {
-   Ewl_Filelist_Directory *data;
+   Ewl_Filelist_Directory *dir;
+   int ret = 0;

DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(fl);
@@ -416,13 +425,13 @@
DRETURN(DLEVEL_STABLE);
 
fl->skip_hidden = !!dot;
-   data = ewl_mvc_data_get(EWL_MVC(fl->controller));
-   if (data) ewl_filelist_model_data_unref(data);
- 

E CVS: libs/ewl ningerso

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_widget.c 


Log Message:
Modified realize to not automatically trigger a show. This breaks from the
convention that GTK+ established, but provides a more predictable API.
Updated associated unit tests to correspond to the updated methods.
Fixed a bug in reveal associated with the realize phase.

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -3 -r1.153 -r1.154
--- ewl_widget.c20 Nov 2007 02:30:09 -  1.153
+++ ewl_widget.c9 Dec 2007 01:09:06 -   1.154
@@ -217,7 +217,11 @@
if (w->parent && !REALIZED(w->parent))
ewl_widget_realize(w->parent);
 
-   else if (w->parent || ewl_object_toplevel_get(EWL_OBJECT(w))) {
+   /*
+* The parent should be realized at this point, and we can handle
+* realizing ourselves.
+*/
+   if (w->parent || ewl_object_toplevel_get(EWL_OBJECT(w))) {
ewl_object_queued_add(EWL_OBJECT(w), 
EWL_FLAG_QUEUED_PROCESS_REVEAL);
ewl_callback_call(w, EWL_CALLBACK_REALIZE);
ewl_object_queued_remove(EWL_OBJECT(w),
@@ -228,8 +232,6 @@
ewl_widget_obscure(w);
}
 
-   ewl_widget_show(w);
-
DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
 
@@ -284,7 +286,13 @@
DCHECK_PARAM_PTR(w);
DCHECK_TYPE(w, EWL_WIDGET_TYPE);
 
-   if (REVEALED(w))
+   /*
+* Already revealed widgets can be skipped, as can unrealized widgets,
+* unless the are already queued for reveal, ie. in the realize process.
+*/
+   if (REVEALED(w) || (!REALIZED(w) && !ewl_object_queued_has(
+   EWL_OBJECT(w),
+   EWL_FLAG_QUEUED_SCHEDULED_REVEAL)))
DRETURN(DLEVEL_STABLE);
 
ewl_object_visible_add(EWL_OBJECT(w), EWL_FLAG_VISIBLE_REVEALED);



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl ningerso

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/bin/tests/widget


Modified Files:
ewl_widget_test.c 


Log Message:
Modified realize to not automatically trigger a show. This breaks from the
convention that GTK+ established, but provides a more predictable API.
Updated associated unit tests to correspond to the updated methods.
Fixed a bug in reveal associated with the realize phase.

===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/widget/ewl_widget_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_widget_test.c   4 Dec 2007 05:28:05 -   1.1
+++ ewl_widget_test.c   9 Dec 2007 01:09:06 -   1.2
@@ -301,7 +301,7 @@
 
ewl_widget_appearance_set(w, "my_appearance");
if (strcmp("my_appearance", ewl_widget_appearance_get(w)))
-   snprintf(buf, len, "appearance_get doesn't match 
appearance_set");
+   LOG_FAILURE(buf, len, "appearance_get doesn't match 
appearance_set");
else
ret = 1;
 
@@ -325,10 +325,10 @@
 
ewl_widget_inherit(w, my_class);
if (!ewl_widget_type_is(w, my_class))
-   snprintf(buf, len, "inheritance doesn't contain correct type");
+   LOG_FAILURE(buf, len, "inheritance doesn't contain correct 
type");
else {
if (ewl_widget_type_is(w, unknown_class))
-   snprintf(buf, len,
+   LOG_FAILURE(buf, len,
"inheritance contains incorrect type");
else
ret = 1;
@@ -355,15 +355,15 @@
if (ewl_widget_internal_is(w)) {
ewl_widget_internal_set(w, FALSE);
if (ewl_widget_internal_is(w))
-   snprintf(buf, len, "internal flag not FALSE");
+   LOG_FAILURE(buf, len, "internal flag not 
FALSE");
else
ret = 1;
}
else
-   snprintf(buf, len, "internal flag not TRUE");
+   LOG_FAILURE(buf, len, "internal flag not TRUE");
}
else
-   snprintf(buf, len, "internal set after widget_init");
+   LOG_FAILURE(buf, len, "internal set after widget_init");
 
return ret;
 }
@@ -386,15 +386,15 @@
if (!ewl_widget_clipped_is(w)) {
ewl_widget_clipped_set(w, TRUE);
if (!ewl_widget_clipped_is(w))
-   snprintf(buf, len, "clipped flag not TRUE");
+   LOG_FAILURE(buf, len, "clipped flag not TRUE");
else
ret = 1;
}
else
-   snprintf(buf, len, "clipped flag not FALSE");
+   LOG_FAILURE(buf, len, "clipped flag not FALSE");
}
else
-   snprintf(buf, len, "clipped not set after widget_init");
+   LOG_FAILURE(buf, len, "clipped not set after widget_init");
 
return ret;
 }
@@ -420,9 +420,9 @@
found = ewl_widget_data_get(w, key);
 
if (!found)
-   snprintf(buf, len, "could not find set data");
+   LOG_FAILURE(buf, len, "could not find set data");
else if (found != value)
-   snprintf(buf, len, "found value does not match set data");
+   LOG_FAILURE(buf, len, "found value does not match set data");
else
ret = 1;
 
@@ -449,11 +449,11 @@
found = ewl_widget_data_del(w, key);
 
if (!found)
-   snprintf(buf, len, "could not find set data");
+   LOG_FAILURE(buf, len, "could not find set data");
else if (found != value)
-   snprintf(buf, len, "removed value does not match set data");
+   LOG_FAILURE(buf, len, "removed value does not match set data");
else if (ewl_widget_data_get(w, key))
-   snprintf(buf, len, "data value present after remove");
+   LOG_FAILURE(buf, len, "data value present after remove");
else
ret = 1;
 
@@ -471,7 +471,7 @@
 
w = ewl_widget_new();
if (!w)
-   snprintf(buf, len, "Failed to create widget");
+   LOG_FAILURE(buf, len, "Failed to create widget");
else
{
ewl_widget_destroy(w);
@@ -493,11 +493,11 @@
 
w = ewl_widget_new();
if (VISIBLE(w))
-   snprintf(buf, len, "Widget VISIBLE after _init");
+   LOG_FAILURE(buf, len, "Widget VISIBLE after _init");
else if (REALIZED(w))
-   snprintf(buf, len, "Widget REALIZED after _init");
+   LOG_FAILURE(buf, len, "Widget REALIZED a

E CVS: libs/ewl ningerso

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_calendar.c ewl_config.c ewl_filelist.c ewl_private.h 
ewl_scrollbar.c 


Log Message:
Patch from caro for a improving compilation time by reducing the headers
included in every file.

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_calendar.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ewl_calendar.c  6 Dec 2007 15:19:44 -   1.34
+++ ewl_calendar.c  9 Dec 2007 01:00:40 -   1.35
@@ -1,4 +1,5 @@
 /* vim: set sw=8 ts=8 sts=8 noexpandtab: */
+#include 
 #include "ewl_base.h"
 #include "ewl_calendar.h"
 #include "ewl_icon.h"
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- ewl_config.c3 Dec 2007 04:46:25 -   1.35
+++ ewl_config.c9 Dec 2007 01:00:40 -   1.36
@@ -5,6 +5,7 @@
 #include "ewl_debug.h"
 
 #include 
+#include 
 #if HAVE_FCNTL_H
 # include 
 #endif /* HAVE_FCNTL_H */
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewl_filelist.c  7 Dec 2007 04:54:30 -   1.43
+++ ewl_filelist.c  9 Dec 2007 01:00:40 -   1.44
@@ -12,6 +12,14 @@
 #include "ewl_macros.h"
 #include "ewl_private.h"
 #include "ewl_debug.h"
+#include 
+#if HAVE_PWD_H
+# include 
+#endif /* HAVE_PWD_H */
+#if HAVE_GRP_H
+# include 
+#endif /* HAVE_GRP_H */
+#include 
 
 static void ewl_filelist_setup(Ewl_Filelist *fl);
 static void ewl_filelist_view_setup(Ewl_Filelist *fl);
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_private.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ewl_private.h   16 Nov 2007 18:50:57 -  1.22
+++ ewl_private.h   9 Dec 2007 01:00:40 -   1.23
@@ -9,24 +9,9 @@
 #include "ewl-config.h"
 #endif
 
-#include 
-#include 
-#include 
 #include 
 #include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#if HAVE_PWD_H
-# include 
-#endif /* HAVE_PWD_H */
-#if HAVE_GRP_H
-# include 
-#endif /* HAVE_GRP_H */
 
 #ifdef HAVE_ALLOCA_H
 # include 
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollbar.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_scrollbar.c 12 Nov 2007 22:42:22 -  1.21
+++ ewl_scrollbar.c 9 Dec 2007 01:00:40 -   1.22
@@ -1,4 +1,5 @@
 /* vim: set sw=8 ts=8 sts=8 noexpandtab: */
+#include 
 #include "ewl_base.h"
 #include "ewl_scrollbar.h"
 #include "ewl_button.h"



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl pfritz

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : pfritz
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_expansion.c ewl_mvc.c ewl_tree2.c ewl_tree2.h 


Log Message:
make the the tree2 cable to handle selections in branches

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_expansion.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_expansion.c 12 Nov 2007 22:42:22 -  1.6
+++ ewl_expansion.c 9 Dec 2007 00:27:17 -   1.7
@@ -53,6 +53,7 @@
ewl_widget_inherit(w, EWL_EXPANSION_TYPE);
 
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
+   ewl_object_alignment_set(EWL_OBJECT(w), EWL_FLAG_ALIGN_TOP);
ewl_object_preferred_inner_size_set(EWL_OBJECT(w), 20, 20);
 
ewl_callback_append(w, EWL_CALLBACK_MOUSE_OUT,
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_mvc.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ewl_mvc.c   1 Dec 2007 13:18:54 -   1.37
+++ ewl_mvc.c   9 Dec 2007 00:27:17 -   1.38
@@ -1235,6 +1235,8 @@
k <= idx->end.column; k++)
{
w = widget(mvc, sel->data, i, k);
+   if (!w) continue;
+   
ewl_mvc_highlight_do(mvc, c, sel, w);
}
}
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- ewl_tree2.c 1 Dec 2007 12:44:15 -   1.88
+++ ewl_tree2.c 9 Dec 2007 00:27:17 -   1.89
@@ -7,16 +7,24 @@
 #include "ewl_expansion.h"
 #include "ewl_label.h"
 #include "ewl_paned.h"
-#include "ewl_row.h"
 #include "ewl_tree2_view_scrolled.h"
 #include "ewl_private.h"
 #include "ewl_macros.h"
 #include "ewl_debug.h"
 
+#define EWL_TREE2_EXPANSIONS_LIST(el) ((Ewl_Tree2_Expansions_List *)(el))
+
+typedef struct
+{
+   Ewl_Container *c;
+   unsigned int *expanded;
+   unsigned int size;
+} Ewl_Tree2_Expansions_List;
+
 static void ewl_tree2_build_tree(Ewl_Tree2 *tree);
 static void ewl_tree2_build_tree_rows(Ewl_Tree2 *tree,
Ewl_Model *model, Ewl_View *view, void *data,
-   int colour, Ewl_Widget *parent,
+   int colour, Ewl_Container *parent,
int hidden);
 static void ewl_tree2_cb_header_changed(Ewl_Widget *w, void *ev,
void *data);
@@ -31,6 +39,9 @@
 
 static void ewl_tree2_expansions_hash_create(Ewl_Tree2 *tree);
 
+static Ewl_Tree2_Expansions_List *ewl_tree2_expansions_list_new(void);
+static void ewl_tree2_expansions_list_destroy(Ewl_Tree2_Expansions_List *el);
+
 /**
  * @return Returns NULL on failure, a new tree widget on success.
  * @brief Allocate and initialize a new tree widget
@@ -371,8 +382,8 @@
 void
 ewl_tree2_row_expand(Ewl_Tree2 *tree, void *data, unsigned int row)
 {
-   Ecore_List *exp;
-   int i, created = 0;
+   Ewl_Tree2_Expansions_List *exp;
+   Ewl_Widget *node;
 
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(tree);
@@ -383,27 +394,22 @@
if (ewl_tree2_row_expanded_is(tree, data, row)) DRETURN(DLEVEL_STABLE);
 
if (!tree->expansions)
-   {
ewl_tree2_expansions_hash_create(tree);
-   exp = ecore_list_new();
-   created = 1;
-   }
-   else
-   {
-   exp = ecore_hash_get(tree->expansions, data);
-   if (!exp) exp = ecore_list_new();
-   }
 
-   ecore_list_first_goto(exp);
-   while ((i = (int)ecore_list_next(exp)))
+   exp = ecore_hash_get(tree->expansions, data);
+   if (!exp)
{
-   if (i > (int)row) break;
+   DWARNING("We did not find a expansion list. This should not"
+   " happen, ever.");
+   DRETURN(DLEVEL_STABLE);
}
 
-   ecore_list_insert(exp, (void *)row);
+   exp->expanded = realloc(exp->expanded,
+   (++exp->size) * sizeof(unsigned int));
+   exp->expanded[exp->size - 1] = row;
 
-   if (created)
-   ecore_hash_set(tree->expansions, data, exp);
+   node = ewl_container_child_get(exp->c, row);
+   ewl_tree2_node_expand(EWL_TREE2_NODE(node));
 
DLEAVE_FUNCTION(DLEVEL_STABLE);
 }
@@ -419,13 +425,16 @@
 void
 ewl_tree2_row_collapse(Ewl_Tree2 *tree, void *data, unsigned int row)
 {
-   Ecore_List *exp;
+   Ewl_Tree2_Expansions_List *exp;
+   Ewl_Widget *node;
+   unsigned int i;
 
DENTE

E CVS: apps/e devilhorns

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir : e17/apps/e/src/bin


Modified Files:
e_int_border_menu.c 


Log Message:
Minor fix for Skip Pager menu entry. It wasn't always updating some borders
based on skip_pager property change.

===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- e_int_border_menu.c 27 Nov 2007 05:52:16 -  1.76
+++ e_int_border_menu.c 9 Dec 2007 00:23:50 -   1.77
@@ -655,7 +655,7 @@
bd = data;
if (!bd) return;
 
-   if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus) &&
+   if ((bd->client.icccm.accepts_focus) || (bd->client.icccm.take_focus) &&
(!bd->client.netwm.state.skip_taskbar))
  bd->user_skip_winlist = e_menu_item_toggle_get(mi);
else
@@ -671,13 +671,11 @@
bd = data;
if (!bd) return;
 
-   if ((bd->client.icccm.accepts_focus || bd->client.icccm.take_focus))
- {
-   bd->client.netwm.state.skip_pager = e_menu_item_toggle_get(mi);
-   bd->changed = 1;
- }
+   if ((bd->client.icccm.accepts_focus) || (bd->client.icccm.take_focus))
+ bd->client.netwm.state.skip_pager = e_menu_item_toggle_get(mi);
else
  bd->client.netwm.state.skip_pager = 0;
+   bd->changed = 1;
if (bd->remember) e_remember_update(bd->remember, bd);
 }
 



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: efm_path devilhorns

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : efm_path

Dir : e_modules/efm_path/src


Modified Files:
e_mod_main.c 


Log Message:
Adjust default size of location module.

===
RCS file: /cvs/e/e_modules/efm_path/src/e_mod_main.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.c25 Nov 2007 03:32:24 -  1.4
+++ e_mod_main.c8 Dec 2007 23:51:23 -   1.5
@@ -128,8 +128,7 @@
 static void 
 _gc_orient(E_Gadcon_Client *gcc) 
 {
-   e_gadcon_client_aspect_set(gcc, 16, 16);
-   e_gadcon_client_min_size_set(gcc, 16, 16);
+   e_gadcon_client_min_size_set(gcc, 32, 16);
 }
 
 static char *



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: apps/e devilhorns

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : devilhorns
Project : e17
Module  : apps/e

Dir : e17/apps/e/src/bin


Modified Files:
e_shelf.c 


Log Message:
Some shelf fixes.
- Use -1 during a call to evas_list_sort rather than evas_list_count. -1
will sort the whole list anyway, and we avoid the extra call to list_count.
- Don't sort shelves during every add. They are sorted when e_shelf_list is
called anyway.
- Fix shelf numbering in the shelf list dialog.

===
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- e_shelf.c   2 Dec 2007 20:19:21 -   1.86
+++ e_shelf.c   8 Dec 2007 23:40:57 -   1.87
@@ -72,16 +72,18 @@
cf_es = l->data;
if (cf_es->id <= 0) cf_es->id = id + 1;
zone = e_util_container_zone_id_get(cf_es->container, cf_es->zone);
-   id = cf_es->id;
-   if (zone) e_shelf_config_new(zone, cf_es);
+   if (zone) 
+ {
+id = cf_es->id;
+e_shelf_config_new(zone, cf_es);
+ }
  }
 }
 
 EAPI Evas_List *
 e_shelf_list(void)
 {
-   shelves = evas_list_sort(shelves, evas_list_count(shelves), 
-   _e_shelf_cb_id_sort);
+   shelves = evas_list_sort(shelves, -1, _e_shelf_cb_id_sort);
return shelves;
 }
 
@@ -183,7 +185,6 @@
  _e_shelf_cb_menu_items_append, es);

shelves = evas_list_append(shelves, es);
-   shelves = evas_list_sort(shelves, -1, _e_shelf_cb_id_sort);

es->hidden = 0;
es->hide_step = 0;



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: libs/ewl pfritz

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : pfritz
Project : e17
Module  : libs/ewl

Dir : e17/libs/ewl/src/lib


Modified Files:
ewl_callback.h ewl_container.c ewl_container.h ewl_embed.c 


Log Message:
- add ewl_container_callback_nonotify()
- remove in embed_init() the notify flags set by the cell

===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_callback.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_callback.h  4 Mar 2007 00:52:01 -   1.16
+++ ewl_callback.h  8 Dec 2007 22:07:41 -   1.17
@@ -123,6 +123,13 @@
w->callbacks[EWL_CALLBACK_INDEX(t)].mask |= 
EWL_CALLBACK_NOTIFY_NOTIFY
 
 /**
+ * @def EWL_CALLBACK_FLAG_NONOTIFY(w, t)
+ * Remove the callback notify flag from a widget for a certain event type.
+ */
+#define EWL_CALLBACK_FLAG_NONOTIFY(w, t) \
+   w->callbacks[EWL_CALLBACK_INDEX(t)].mask &= 
~EWL_CALLBACK_NOTIFY_NOTIFY
+
+/**
  * @def EWL_CALLBACK_SET_DIRECT(w, t)
  * Sets the callback direct flag for a centain event type
  */
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- ewl_container.c 12 Nov 2007 22:42:22 -  1.67
+++ ewl_container.c 8 Dec 2007 22:07:41 -   1.68
@@ -980,6 +980,26 @@
 }
 
 /**
+ * @param c: the container to not notify the callback
+ * @param t: the type of callback to not notify
+ * @return Returns no value.
+ * @brief receive a callback of a child
+ *
+ * Removes the notification flag set with ewl_container_callback_notify()
+ */
+void
+ewl_container_callback_nonotify(Ewl_Container *c, unsigned int t)
+{
+   DENTER_FUNCTION(DLEVEL_STABLE);
+   DCHECK_PARAM_PTR(c);
+   DCHECK_TYPE(c, EWL_CONTAINER_TYPE);
+
+   EWL_CALLBACK_FLAG_NONOTIFY(EWL_WIDGET(c), t);
+
+   DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
  * @param c: the container to change preferred size
  * @param o: the orientation/direction to prefer the largest widget
  * @return Returns no value.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ewl_container.h 11 Nov 2007 06:07:46 -  1.34
+++ ewl_container.h 8 Dec 2007 22:07:41 -   1.35
@@ -150,6 +150,8 @@
 voidewl_container_reset(Ewl_Container *c);
 voidewl_container_callback_notify(Ewl_Container *c,
unsigned int t);
+voidewl_container_callback_nonotify(Ewl_Container *c,
+   unsigned int t);
 voidewl_container_callback_intercept(Ewl_Container *c,
unsigned int t);
 voidewl_container_callback_nointercept(Ewl_Container *c,
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -3 -r1.133 -r1.134
--- ewl_embed.c 6 Dec 2007 07:07:12 -   1.133
+++ ewl_embed.c 8 Dec 2007 22:07:41 -   1.134
@@ -100,6 +100,12 @@
 
ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE);
ewl_object_toplevel_set(EWL_OBJECT(w), EWL_FLAG_PROPERTY_TOPLEVEL);
+   
+   /* remove the notify flags set by the cell */
+   ewl_container_callback_nonotify(EWL_CONTAINER(w),
+   EWL_CALLBACK_FOCUS_IN);
+   ewl_container_callback_nonotify(EWL_CONTAINER(w),
+   EWL_CALLBACK_FOCUS_OUT);
 
ewl_callback_append(EWL_WIDGET(w), EWL_CALLBACK_REALIZE,
 ewl_embed_cb_realize, NULL);



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: proto/edje_editor davemds

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : proto/edje_editor

Dir : e17/proto/edje_editor/src/bin


Modified Files:
callbacks.c evas.c interface.c main.c main.h 


Log Message:
Direct-Edje-Version:
 * Color, color2 e color3 management
 * Add ability to deal with text part
   you can modify: text, font, color, size, aligns and effect
 * Add ability to deal with image part
   you can modify the actual image, the borders, the alpha value and view the 
tween list

===
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/callbacks.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- callbacks.c 6 Dec 2007 14:08:37 -   1.41
+++ callbacks.c 8 Dec 2007 20:56:14 -   1.42
@@ -1,8 +1,5 @@
 #include 
 #include 
-#if TEST_DIRECT_EDJE
-   #include 
-#endif
 #include 
 #include 
 #include "callbacks.h"
@@ -11,6 +8,10 @@
 #include "main.h"
 #include "evas.h"
 
+#if TEST_DIRECT_EDJE
+   #include 
+#endif
+
 extern void PROTO_engrave_part_state_remove(Engrave_Part *ep, 
Engrave_Part_State *eps);
 extern void PROTO_engrave_group_part_remove(Engrave_Group *eg, Engrave_Part 
*ep);
 extern void PROTO_engrave_file_group_remove(Engrave_File *ef, Engrave_Group 
*eg);
@@ -69,6 +70,15 @@
   case TOOLBAR_MOVE_DOWN: //Raise
  ShowAlert("Not yet reimplemented ;)");
  break;
+  case TOOLBAR_IMAGE_FILE_ADD:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+  case TOOLBAR_FONT_FILE_ADD:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
+  case IMAGE_TWEEN_DELETE:
+ ShowAlert("Not yet reimplemented ;)");
+ break;
 #else
   case TOOLBAR_SAVE:
  if (Cur.open_file_name)
@@ -156,6 +166,37 @@
  else
 ShowAlert("You must choose a part to raise");
  break;
+  case IMAGE_TWEEN_RADIO:
+UpdateImageFrame();
+
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageTweenRadio), TRUE);
+
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageNormalRadio), FALSE);
+etk_widget_show(UI_ImageTweenList);
+etk_widget_show(UI_MoveUpTweenButton);
+etk_widget_show(UI_MoveDownTweenButton);
+etk_widget_show(UI_DeleteTweenButton);
+etk_combobox_active_item_set (ETK_COMBOBOX(UI_ImageComboBox),
+   etk_combobox_nth_item_get(ETK_COMBOBOX(UI_ImageComboBox),0));
+ break;
+  case IMAGE_NORMAL_RADIO:
+PROTO_engrave_part_state_image_tween_remove_all(Cur.eps);
+UpdateImageFrame();
+ break;
+  case TOOLBAR_IMAGE_FILE_ADD:
+ if (engrave_file_image_dir_get(Cur.ef)) 
ShowFilechooser(FILECHOOSER_IMAGE);
+ else ShowAlert("You have to save the file once for insert image.");
+ break;
+  case TOOLBAR_FONT_FILE_ADD:
+ if (engrave_file_font_dir_get(Cur.ef)) 
ShowFilechooser(FILECHOOSER_FONT);
+ else ShowAlert("You have to save the file once for insert font.");
+ break;
+  case IMAGE_TWEEN_DELETE:
+sel_row = etk_tree_selected_row_get(ETK_TREE(UI_ImageTweenList));
+if ((row_num = (int)etk_tree_row_data_get (sel_row)))
+{
+   
PROTO_engrave_part_state_image_tween_remove_nth(Cur.eps,row_num-1);
+   UpdateImageFrame();
+}
+ break;
 #endif
   case TOOLBAR_OPTIONS:
  etk_menu_popup(ETK_MENU(UI_OptionsMenu));
@@ -193,43 +234,12 @@
   case TOOLBAR_DEBUG:
  DebugInfo(FALSE);
  break;
-  case TOOLBAR_IMAGE_FILE_ADD:
- if (engrave_file_image_dir_get(Cur.ef)) 
ShowFilechooser(FILECHOOSER_IMAGE);
- else ShowAlert("You have to save the file once for insert image.");
- break;
-  case TOOLBAR_FONT_FILE_ADD:
- if (engrave_file_font_dir_get(Cur.ef)) 
ShowFilechooser(FILECHOOSER_FONT);
- else ShowAlert("You have to save the file once for insert font.");
- break;
   case IMAGE_TWEEN_UP:
 ShowAlert("Up not yet implemented.");
  break;
   case IMAGE_TWEEN_DOWN:
 ShowAlert("Down not yet implemented.");
  break;
-  case IMAGE_TWEEN_DELETE:
-sel_row = etk_tree_selected_row_get(ETK_TREE(UI_ImageTweenList));
-if ((row_num = (int)etk_tree_row_data_get (sel_row)))
-{
-   
PROTO_engrave_part_state_image_tween_remove_nth(Cur.eps,row_num-1);
-   UpdateImageFrame();
-}
- break;
-  case IMAGE_TWEEN_RADIO:
-UpdateImageFrame();
-
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageTweenRadio), TRUE);
-
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(UI_ImageNormalRadio), FALSE);
-etk_widget_show(UI_ImageTweenList);
-etk_widget_show(UI_MoveUpTweenButton);
-etk_widget_show(UI_Move

E CVS: e kwo

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/po


Modified Files:
bg.po bs.po da.po de.po en_US.po es.po fr.po hu.po ja.po ko.po 
nl.po no.po pl.po pt.po pt_BR.po ru.po sv.po tr.po 


Log Message:
Update po.




-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: e kwo

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/misc


Modified Files:
Makefile.am 
Added Files:
e16-dbus-cmd 


Log Message:
Play with dbus - implement command interface.

===
RCS file: /cvs/e/e16/e/misc/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 18 Nov 2007 09:54:49 -  1.10
+++ Makefile.am 8 Dec 2007 17:54:38 -   1.11
@@ -17,7 +17,7 @@
 #xclientsdir = $(sysconfdir)/X11/xinit/Xclients.d
 #xclients_SCRIPTS = $(XCLIENTS)
 
-EXTRA_DIST = $(DESKTOPS_IN) $(SCRIPTS) $(ICONS)
+EXTRA_DIST = $(DESKTOPS_IN) $(SCRIPTS) $(ICONS) e16-dbus-cmd
 
 e16.desktop: $(top_srcdir)/misc/e16.desktop.in Makefile
 e16-gnome.desktop: $(top_srcdir)/misc/e16-gnome.desktop.in Makefile



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: e kwo

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e


Modified Files:
configure.in 


Log Message:
Play with dbus - implement command interface.

===
RCS file: /cvs/e/e16/e/configure.in,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -3 -r1.239 -r1.240
--- configure.in28 Nov 2007 19:21:47 -  1.239
+++ configure.in8 Dec 2007 17:54:38 -   1.240
@@ -248,6 +248,14 @@
 fi
 AM_CONDITIONAL(ENABLE_COMPOSITE, test "x$enable_composite" = "xyes")
 
+AC_ARG_ENABLE(dbus,
+  [  --enable-dbus   compile with D-Bus support @<:@default=no@:>@],,
+  enable_dbus=no)
+if test "x$enable_dbus" = "xyes"; then
+  PKG_CHECK_MODULES(DBUS, dbus-1, AC_DEFINE(USE_DBUS, 1, [dbus support]), 
enable_dbus=no)
+fi
+AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes")
+
 AC_CHECK_LIB(Fridge,mass_quantities_of_bass_ale)
 AC_CHECK_LIB(Fridge,mass_quantities_of_any_ale,, [
   echo "Warning: No ales were found in your refrigerator."
@@ -358,6 +366,7 @@
 echo "  Compile with ecore/ecore_x ... $enable_ecore"
 echo "  GLX .. $enable_glx"
 echo "  ScreenSaver .. $enable_xscrnsaver"
+echo "  D-Bus  $enable_dbus"
 echo
 echo "Installation path .. $prefix"
 echo



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: e kwo

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/src


Modified Files:
Makefile.am edebug.h main.c 
Added Files:
edbus.c edbus.h 


Log Message:
Play with dbus - implement command interface.

===
RCS file: /cvs/e/e16/e/src/Makefile.am,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- Makefile.am 28 Nov 2007 19:21:47 -  1.96
+++ Makefile.am 8 Dec 2007 17:54:38 -   1.97
@@ -13,6 +13,9 @@
 if ENABLE_COMPOSITE
 SRCS_ECOMPMGR = ecompmgr.c ecompmgr.h magwin.c
 endif
+if ENABLE_DBUS
+SRCS_DBUS = edbus.c edbus.h
+endif
 if USE_ESNPRINTF
 SRCS_SNPRINTF = snprintf.c
 endif
@@ -108,6 +111,7 @@
$(SRCS_GNOME)   \
$(SRCS_GLX) \
$(SRCS_ECOMPMGR)\
+   $(SRCS_DBUS)\
$(SRCS_SNPRINTF)
 
 e16_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
@@ -115,6 +119,7 @@
$(MODULE_CFLAGS) \
$(IMLIB2_CFLAGS) \
$(X_CFLAGS) \
+   $(DBUS_CFLAGS) \
-D LOCALEDIR=\"$(localedir)\" \
-D ENLIGHTENMENT_BIN=\"$(bindir)\" \
-D ENLIGHTENMENT_LIB=\"$(pkglibdir)\" \
@@ -132,6 +137,7 @@
$(XINERAMA_LIBS)\
$(X_EXTRA_LIBS) \
$(E_X_LIBS) \
+   $(DBUS_LIBS)\
-lX11 -lm
 
 if BUILD_MODULES
===
RCS file: /cvs/e/e16/e/src/edebug.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edebug.h29 Mar 2007 20:54:55 -  1.4
+++ edebug.h8 Dec 2007 17:54:38 -   1.5
@@ -48,6 +48,7 @@
 #define EDBUG_TYPE_PAGER146
 #define EDBUG_TYPE_SELECTION147
 #define EDBUG_TYPE_FONTS148
+#define EDBUG_TYPE_DBUS 149
 
 #define EDBUG_TYPE_COMPMGR  161
 #define EDBUG_TYPE_COMPMGR2 162
===
RCS file: /cvs/e/e16/e/src/main.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -3 -r1.161 -r1.162
--- main.c  3 Nov 2007 11:57:31 -   1.161
+++ main.c  8 Dec 2007 17:54:38 -   1.162
@@ -26,6 +26,7 @@
 #include "cursors.h"
 #include "desktops.h"
 #include "dialog.h"
+#include "edbus.h"
 #include "eimage.h"
 #include "emodule.h"
 #include "events.h"
@@ -252,6 +253,10 @@
CommsInit();
SessionInit();
LoadSnapInfo();
+
+#if USE_DBUS
+   DbusInit();
+#endif
 
ModulesSignal(ESIGNAL_INIT, NULL);
 



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: calendar morlenxus

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : morlenxus
Project : e_modules
Module  : calendar

Dir : e_modules/calendar


Modified Files:
e_mod_main.c e_mod_main.h 


Log Message:
Allow to set the first weekday (Su/Mo).

===
RCS file: /cvs/e/e_modules/calendar/e_mod_main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.c5 Dec 2007 01:30:55 -   1.16
+++ e_mod_main.c8 Dec 2007 15:29:17 -   1.17
@@ -13,6 +13,7 @@
 {
E_Gadcon_Client *gcc;
Calendar*calendar;
+   Config_Item *ci;
 
E_Gadcon_Popup  *popup;
 };
@@ -29,6 +30,7 @@
 static char *_gc_label(void);
 static Evas_Object *_gc_icon(Evas *evas);
 static const char *_gc_id_new(void);
+static Config_Item *_config_item_get(const char *id);
 static int _update_date(void *data);
 static int _update_calendar_sheet(Instance *inst);
 static void _calendar_popup_content_create(Instance *inst);
@@ -39,6 +41,8 @@
 static void _cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void 
*event_info);
 static void _cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void 
*event_info);
 static void _menu_cb_post(void *data, E_Menu *m);
+static void _calendar_firstweekday_su(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _calendar_firstweekday_mo(void *data, E_Menu *m, E_Menu_Item *mi);
 
 static int days_in_month[2][12] =
 {
@@ -68,6 +72,7 @@
char buf[4096];
 
inst = E_NEW(Instance, 1);   
+   inst->ci = _config_item_get(id);
 
calendar = E_NEW(Calendar, 1);
calendar->inst = inst;
@@ -163,6 +168,47 @@
return id;
 }
 
+static Config_Item *
+_config_item_get(const char *id) 
+{
+   Evas_List   *l;
+   Config_Item *ci;
+   char buf[128];
+
+   if (!id)
+ {
+   int  num = 0;
+
+   /* Create id */
+   if (calendar_conf->items)
+ {
+const char *p;
+ci = evas_list_last(calendar_conf->items)->data;
+p = strrchr(ci->id, '.');
+if (p) num = atoi(p + 1) + 1;
+ }
+   snprintf(buf, sizeof(buf), "%s.%d", _gc_class.name, num);
+   id = buf;
+ }
+   else
+ {
+   for (l = calendar_conf->items; l; l = l->next) 
+ {
+ci = l->data;
+if (!ci->id) continue;
+if (!strcmp(ci->id, id))
+  return ci;
+ }
+ }
+
+   ci = E_NEW(Config_Item, 1);
+   ci->id = evas_stringshare_add(id);
+   ci->firstweekday = 0;
+
+   calendar_conf->items = evas_list_append(calendar_conf->items, ci);
+   return ci;
+}
+
 static int
 _update_date(void *data)
 {
@@ -249,7 +295,8 @@
start_time = current_time - ((today-1) * 86400);
local_time2 = localtime (&start_time);
strftime (buf, sizeof(buf), "%w", local_time2);
-   startwd = atoi (buf);
+   startwd = atoi (buf) - inst->ci->firstweekday;
+   if (startwd < 0) startwd = 6;
 
evas = inst->popup->win->evas;
o = e_widget_list_add(evas, 0, 0);
@@ -257,9 +304,10 @@
of = e_widget_frametable_add(evas, buf, 0);
 
/* column titles */
+   day = inst->ci->firstweekday;
for (col = 0; col <= 6; col++)
  {
-   switch (col)
+   switch (day)
  {
 case 0: ob = e_widget_label_add(evas, "Su"); break;
 case 1: ob = e_widget_label_add(evas, "Mo"); break;
@@ -268,8 +316,9 @@
 case 4: ob = e_widget_label_add(evas, "Th"); break;
 case 5: ob = e_widget_label_add(evas, "Fr"); break;
 case 6: ob = e_widget_label_add(evas, "Sa"); break;
- }
+ } 
e_widget_frametable_object_append(of, ob, col, 0, 1, 1, 1, 0, 0, 0);
+   if (day++ >= 6) day = 0;
  }
 
/* output days */
@@ -373,13 +422,35 @@
if ((ev->button == 3) && (!calendar_conf->menu))
  {
E_Menu *mn;
+   E_Menu_Item *mi;
int cx, cy, cw, ch;
 
mn = e_menu_new();
+   calendar_conf->menu_firstweekday = mn;
+   
+   mi = e_menu_item_new(mn);
+   e_menu_item_label_set(mi, D_("Sunday"));
+   e_menu_item_radio_set(mi, 1);
+   e_menu_item_radio_group_set(mi, 1);
+   if (!inst->ci->firstweekday) e_menu_item_toggle_set(mi, 1);
+   e_menu_item_callback_set(mi, _calendar_firstweekday_su, inst);
+
+   mi = e_menu_item_new(mn);
+   e_menu_item_label_set(mi, D_("Monday"));
+   e_menu_item_radio_set(mi, 1);
+   e_menu_item_radio_group_set(mi, 1);
+   if (inst->ci->firstweekday == 1) e_menu_item_toggle_set(mi, 1);
+   e_menu_item_callback_set(mi, _calendar_firstweekday_mo, inst);
+
+   mn = e_menu_new();
calendar_conf->menu = mn;
 
e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst);
 
+   mi = e_menu_item_new(mn);
+   e_menu_item_label_set(mi, D_("First Day of Week"));
+   e_menu_item_submenu_set(mi, calendar_conf->menu_firstweekday);
+
e_gadcon_client_util_menu_items_append(inst->gcc, mn, 0);
e_gad

E CVS: e kwo

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/src


Modified Files:
text.c 


Log Message:
Fix crash if font loading fails.

===
RCS file: /cvs/e/e16/e/src/text.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- text.c  4 Sep 2007 21:15:21 -   1.93
+++ text.c  8 Dec 2007 15:17:42 -   1.94
@@ -754,9 +754,8 @@
goto fallback;
  }
 #endif
-   ts->ops = fhp->ops;
-   ts->ops->Load(ts, name);
-   goto done;
+   if (fhp->ops->Load(ts, name) == 0)
+  goto done;
  }
  fallback:
 #if FONT_TYPE_XFS



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs


E CVS: e kwo

2007-12-08 Thread Enlightenment CVS
Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir : e16/e/src


Modified Files:
extinitwin.c session.c 


Log Message:
Fix trouble with nested exits. Debug stuff tweaks.

===
RCS file: /cvs/e/e16/e/src/extinitwin.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- extinitwin.c6 Apr 2007 22:20:07 -   1.21
+++ extinitwin.c8 Dec 2007 14:01:27 -   1.22
@@ -112,7 +112,7 @@
  i = 1;
 
   Esnprintf(s, sizeof(s), "pix/wait%i.png", i);
-  if (EDebug(EDBUG_TYPE_SESSION))
+  if (EDebug(EDBUG_TYPE_SESSION) > 1)
  Eprintf("ExtInitWinCreate - child %s\n", s);
 
   im = ThemeImageLoad(s);
===
RCS file: /cvs/e/e16/e/src/session.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- session.c   2 Dec 2007 18:39:17 -   1.146
+++ session.c   8 Dec 2007 14:01:27 -   1.147
@@ -542,7 +542,7 @@
  case EEXIT_RESTART:
SoundPlay("SOUND_WAIT");
 #ifdef USE_EXT_INIT_WIN
-   if (disp)
+   if (disp && !Mode.wm.window)
   new_init_win_ext = ExtInitWinCreate();
 #endif
EDisplayClose();
@@ -554,6 +554,8 @@
else if (!Mode.wm.master)
   l +=
  Esnprintf(s + l, sizeof(s) - l, " -m %d", Mode.wm.master_screen);
+   if (Mode.wm.window)
+  l += Esnprintf(s + l, sizeof(s) - l, " -w %dx%d", VRoot.w, VRoot.h);
 #if USE_SM
if (sm_client_id)
   l += Esnprintf(s + l, sizeof(s) - l, " -S %s", sm_client_id);
@@ -674,6 +676,9 @@
if (EDebug(EDBUG_TYPE_SESSION))
   Eprintf("SessionExit: mode=%d(%d) prm=%s\n", mode, Mode.wm.exit_mode,
  param);
+
+   if (Mode.wm.exiting)
+  return;
 
if (Mode.wm.startup || Mode.wm.in_signal_handler)
   goto done;



-
SF.Net email is sponsored by: 
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs