Home / Browse / Enlightenment / Mail / Archive

Donate

Enlightenment

Email Archive: enlightenment-cvs (read-only)

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-06-30 17:45

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_iconbox.c etk_iconbox.h 


Log Message:
 Add a new function:
Etk_Iconbox_Icon *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox)
The function will return the first selected item in the iconbox

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- etk_iconbox.c	24 Jun 2008 18:03:54 -0000	1.35
+++ etk_iconbox.c	30 Jun 2008 17:45:52 -0000	1.36
@@ -642,6 +642,26 @@
 }
 
 /**
+ * @brief Get the first selected icon. If more than one icon is selected only
+ * the first one is returned.
+ * @param iconbox an iconbox
+ * @return Return the first selected icon, or NULL if none is selected.
+ */
+Etk_Iconbox_Icon *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox)
+{
+   Etk_Iconbox_Icon *icon;
+
+   if (!iconbox)
+      return NULL;
+
+   for (icon = iconbox->first_icon; icon; icon = icon->next)
+      if (icon->selected)
+         return icon;
+
+   return NULL;
+}
+
+/**
  * @brief Sets the file path of the icon's image
  * @param icon an icon
  * @param filename the filename of the icon's image
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_iconbox.h	24 Jun 2008 18:03:55 -0000	1.15
+++ etk_iconbox.h	30 Jun 2008 17:45:52 -0000	1.16
@@ -148,6 +148,7 @@
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_at_xy(Etk_Iconbox *iconbox, int x, int y, Etk_Bool over_cell, Etk_Bool over_icon, Etk_Bool over_label);
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_by_label(Etk_Iconbox *iconbox, const char *label);
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_by_data(Etk_Iconbox *iconbox, void *data);
+Etk_Iconbox_Icon  *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox);
 
 void               etk_iconbox_icon_file_set(Etk_Iconbox_Icon *icon, const char *filename, const char *edje_group);
 void               etk_iconbox_icon_file_get(Etk_Iconbox_Icon *icon, const char **filename, const char **edje_group);

Thread View

Thread	Author	Date
E CVS: libs/etk davemds	Enlightenment CVS <noreply@cv...>

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2007-08-13 00:20

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_filechooser_widget.c etk_filechooser_widget.h 


Log Message:
Etk_Filechooser_Widget improvements, see bug #151 for details

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_filechooser_widget.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- etk_filechooser_widget.c	25 Jul 2007 17:00:58 -0000	1.23
+++ etk_filechooser_widget.c	13 Aug 2007 00:20:16 -0000	1.24
@@ -16,6 +16,8 @@
 #include "etk_tree_model.h"
 #include "etk_paned.h"
 #include "etk_box.h"
+#include "etk_entry.h"
+#include "etk_label.h"
 #include "config.h"
 
 /* OS-specific to list the mount points */
@@ -45,7 +47,8 @@
 {
    ETK_FILECHOOSER_WIDGET_PATH_PROPERTY,
    ETK_FILECHOOSER_WIDGET_SELECT_MULTIPLE_PROPERTY,
-   ETK_FILECHOOSER_WIDGET_SHOW_HIDDEN_PROPERTY
+   ETK_FILECHOOSER_WIDGET_SHOW_HIDDEN_PROPERTY,
+   ETK_FILECHOOSER_WIDGET_IS_SAVE_PROPERTY
 };
 
 typedef struct _Etk_Filechooser_Widget_Icons
@@ -63,6 +66,7 @@
 static void _etk_filechooser_widget_place_activated_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
 static void _etk_filechooser_widget_fav_activated_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
 static void _etk_filechooser_widget_file_activated_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
+static void _etk_filechooser_widget_file_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
 static void _etk_filechooser_widget_places_tree_fill(Etk_Filechooser_Widget *fcw);
 static void _etk_filechooser_widget_favs_tree_fill(Etk_Filechooser_Widget *fcw);
 
@@ -116,6 +120,7 @@
       etk_type_property_add(filechooser_widget_type, "path", ETK_FILECHOOSER_WIDGET_PATH_PROPERTY, ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_string(NULL));
       etk_type_property_add(filechooser_widget_type, "select-multiple", ETK_FILECHOOSER_WIDGET_SELECT_MULTIPLE_PROPERTY, ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_FALSE));
       etk_type_property_add(filechooser_widget_type, "show-hidden", ETK_FILECHOOSER_WIDGET_SHOW_HIDDEN_PROPERTY, ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_FALSE));
+      etk_type_property_add(filechooser_widget_type, "is-save", ETK_FILECHOOSER_WIDGET_IS_SAVE_PROPERTY, ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_FALSE));
 
       filechooser_widget_type->property_set = _etk_filechooser_widget_property_set;
       filechooser_widget_type->property_get = _etk_filechooser_widget_property_get;
@@ -157,6 +162,9 @@
    filechooser_widget->current_folder = strdup(folder);
    etk_tree_clear(ETK_TREE(filechooser_widget->files_tree));
    
+   if (!filechooser_widget->is_save)
+      etk_entry_clear(ETK_ENTRY(filechooser_widget->name_entry));
+   
    /* TODO: Do not walk through the list twice!! */
    ecore_list_first_goto(files);
    while ((filename = ecore_list_next(files)))
@@ -245,8 +253,13 @@
    if (!filechooser_widget && !(filechooser_widget->files_tree))
       return NULL;
 
-   if ((row = etk_tree_selected_row_get(ETK_TREE(filechooser_widget->files_tree))))
-	etk_tree_row_fields_get(row, filechooser_widget->files_name_col, NULL, NULL, &filename, NULL);
+   if (!filechooser_widget->is_save)
+   {
+      if ((row = etk_tree_selected_row_get(ETK_TREE(filechooser_widget->files_tree))))
+         etk_tree_row_fields_get(row, filechooser_widget->files_name_col, NULL, NULL, &filename, NULL);
+   }
+   else
+      filename = etk_entry_text_get(ETK_ENTRY(filechooser_widget->name_entry));
 
    return filename;
 }
@@ -291,7 +304,7 @@
  */
 Etk_Bool etk_filechooser_widget_select_multiple_get(Etk_Filechooser_Widget *filechooser_widget)
 {
-   if (filechooser_widget)
+   if (!filechooser_widget)
       return ETK_FALSE;
    /* TODO: notify */
    return etk_tree_multiple_select_get(ETK_TREE(filechooser_widget->files_tree));
@@ -324,6 +337,34 @@
    return filechooser_widget->show_hidden;
 }
 
+/**
+ * @brief Sets if the file chooser is a save chooser
+ * @param filechooser_widget a filechooser widget
+ * @param is_save ETK_TRUE to enable the file name entry (aka save widget)
+ * If @p is_save is TRUE then the user have the ability to write a custom file name
+ * in the file name entry. Else the file name entry is disabled.
+ */
+void etk_filechooser_widget_is_save_set(Etk_Filechooser_Widget *filechooser_widget, Etk_Bool is_save)
+{
+   if (!filechooser_widget)
+      return;
+
+   filechooser_widget->is_save = is_save;
+   etk_widget_disabled_set(filechooser_widget->name_entry, !is_save);
+
+   //etk_object_notify(ETK_OBJECT(filechooser_widget), "is_save");
+}
+
+/**
+ * @brief Retrieve if the file chooser widget is a save chooser
+ * @return Returns if the file chooser widget is a save chooser
+ */
+Etk_Bool etk_filechooser_widget_is_save_get(Etk_Filechooser_Widget *filechooser_widget)
+{
+   if (!filechooser_widget)
+      return ETK_FALSE;
+   return filechooser_widget->is_save;
+}
 /**************************
  *
  * Etk specific functions
@@ -333,7 +374,10 @@
 /* Initializes the members */
 static void _etk_filechooser_widget_constructor(Etk_Filechooser_Widget *fcw)
 {
+   Etk_Widget *hpaned;
    Etk_Widget *vpaned;
+   Etk_Widget *hbox;
+   Etk_Widget *label;
    
    if (!fcw)
       return;
@@ -343,14 +387,28 @@
    fcw->current_folder = NULL;
    fcw->select_multiple = ETK_FALSE;
    fcw->show_hidden = ETK_FALSE;
+   fcw->is_save = ETK_FALSE;
+   
+   fcw->vbox = etk_vbox_new(ETK_FALSE,0);
+   etk_widget_parent_set(fcw->vbox, ETK_WIDGET(fcw));
+   
+   hbox = etk_hbox_new(ETK_FALSE,10);
+   etk_box_append(ETK_BOX(fcw->vbox),hbox,ETK_BOX_START,ETK_BOX_EXPAND_FILL,3);
+   
+   label = etk_label_new("<b>File name:</b>");
+   etk_box_append(ETK_BOX(hbox),label,ETK_BOX_START,ETK_BOX_NONE,10);
+   
+   fcw->name_entry = etk_entry_new();
+   etk_widget_disabled_set(fcw->name_entry, ETK_TRUE);
+   etk_box_append(ETK_BOX(hbox),fcw->name_entry,ETK_BOX_START,ETK_BOX_EXPAND_FILL,10);
    
-   fcw->hpaned = etk_hpaned_new();
-   etk_widget_parent_set(fcw->hpaned, ETK_WIDGET(fcw));
-   etk_widget_show(fcw->hpaned);
-   etk_widget_internal_set(fcw->hpaned, ETK_TRUE);
+   hpaned = etk_hpaned_new();
+   etk_box_append(ETK_BOX(fcw->vbox),hpaned,ETK_BOX_START,ETK_BOX_EXPAND_FILL,10);
+   etk_widget_show(hpaned);
+   etk_widget_internal_set(hpaned, ETK_TRUE);
    
    vpaned = etk_vpaned_new();
-   etk_paned_child1_set(ETK_PANED(fcw->hpaned), vpaned, ETK_FALSE);
+   etk_paned_child1_set(ETK_PANED(hpaned), vpaned, ETK_FALSE);
    etk_widget_show(vpaned);
    etk_widget_internal_set(vpaned, ETK_TRUE);
    
@@ -363,7 +421,7 @@
    etk_tree_build(ETK_TREE(fcw->places_tree));
    etk_widget_show(fcw->places_tree);
    etk_widget_internal_set(fcw->places_tree, ETK_TRUE);
-   etk_signal_connect("row-activated", ETK_OBJECT(fcw->places_tree), ETK_CALLBACK(_etk_filechooser_widget_place_activated_cb), fcw);
+   etk_signal_connect("row-selected", ETK_OBJECT(fcw->places_tree), ETK_CALLBACK(_etk_filechooser_widget_place_activated_cb), fcw);
    
    fcw->fav_tree = etk_tree_new();
    etk_widget_size_request_set(fcw->fav_tree, 180, 180);
@@ -374,11 +432,11 @@
    etk_tree_build(ETK_TREE(fcw->fav_tree));
    etk_widget_show(fcw->fav_tree);
    etk_widget_internal_set(fcw->fav_tree, ETK_TRUE);
-   etk_signal_connect("row-activated", ETK_OBJECT(fcw->fav_tree), ETK_CALLBACK(_etk_filechooser_widget_fav_activated_cb), fcw);
+   etk_signal_connect("row-selected", ETK_OBJECT(fcw->fav_tree), ETK_CALLBACK(_etk_filechooser_widget_fav_activated_cb), fcw);
    
    fcw->files_tree = etk_tree_new();
    etk_widget_size_request_set(fcw->files_tree, 400, 120);
-   etk_paned_child2_set(ETK_PANED(fcw->hpaned), fcw->files_tree, ETK_TRUE);
+   etk_paned_child2_set(ETK_PANED(hpaned), fcw->files_tree, ETK_TRUE);
    fcw->files_name_col = etk_tree_col_new(ETK_TREE(fcw->files_tree), _("Filename"), 100, 0.0);
    etk_tree_col_model_add(fcw->files_name_col, etk_tree_model_image_new());
    etk_tree_col_model_add(fcw->files_name_col, etk_tree_model_text_new());
@@ -389,6 +447,7 @@
    etk_widget_show(fcw->files_tree);
    etk_widget_internal_set(fcw->files_tree, ETK_TRUE);
    etk_signal_connect("row-activated", ETK_OBJECT(fcw->files_tree), ETK_CALLBACK(_etk_filechooser_widget_file_activated_cb), fcw);
+   etk_signal_connect("row-selected", ETK_OBJECT(fcw->files_tree), ETK_CALLBACK(_etk_filechooser_widget_file_selected_cb), fcw);
    
    _etk_filechooser_widget_places_tree_fill(ETK_FILECHOOSER_WIDGET(fcw));
    _etk_filechooser_widget_favs_tree_fill(ETK_FILECHOOSER_WIDGET(fcw));
@@ -421,6 +480,9 @@
       case ETK_FILECHOOSER_WIDGET_SHOW_HIDDEN_PROPERTY:
          etk_filechooser_widget_show_hidden_set(filechooser_widget, etk_property_value_bool_get(value));
          break;
+      case ETK_FILECHOOSER_WIDGET_IS_SAVE_PROPERTY:
+         etk_filechooser_widget_is_save_set(filechooser_widget, etk_property_value_bool_get(value));
+         break;
       /* TODO: ETK_FILECHOOSER_WIDGET_PATH_PROPERTY */
       default:
          break;
@@ -443,6 +505,9 @@
       case ETK_FILECHOOSER_WIDGET_SHOW_HIDDEN_PROPERTY:
          etk_property_value_bool_set(value, etk_filechooser_widget_show_hidden_get(filechooser_widget));
          break;
+      case ETK_FILECHOOSER_WIDGET_IS_SAVE_PROPERTY:
+         etk_property_value_bool_set(value, etk_filechooser_widget_is_save_get(filechooser_widget));
+         break;
       /* TODO: ETK_FILECHOOSER_WIDGET_PATH_PROPERTY */
       default:
          break;
@@ -456,7 +521,7 @@
    
    if (!(fcw = ETK_FILECHOOSER_WIDGET(widget)) || !size_requisition)
       return;
-   etk_widget_size_request(fcw->hpaned, size_requisition);
+   etk_widget_size_request(fcw->vbox, size_requisition);
 }
 
 /* Renders the filechooser in the allocated geometry */
@@ -466,7 +531,7 @@
    
    if (!(fcw = ETK_FILECHOOSER_WIDGET(widget)))
       return;
-   etk_widget_size_allocate(fcw->hpaned, geometry);
+   etk_widget_size_allocate(fcw->vbox, geometry);
 }
 
 /**************************
@@ -475,7 +540,7 @@
  *
  **************************/
 
-/* Called when a row of the "places" tree is activated (double-click or space) */
+/* Called when a row of the "places" tree is selected (single click) */
 static void _etk_filechooser_widget_place_activated_cb(Etk_Object *object, Etk_Tree_Row *row, void *data)
 {
    Etk_Filechooser_Widget *filechooser_widget;
@@ -493,9 +558,10 @@
    }
    else
       etk_filechooser_widget_current_folder_set(filechooser_widget, selected_dir);
+   etk_tree_unselect_all(ETK_TREE(filechooser_widget->fav_tree));
 }
 
-/* Called when a row of the "favorites" tree is activated (double-click or space) */
+/* Called when a row of the "favorites" tree is selected (single click) */
 static void _etk_filechooser_widget_fav_activated_cb(Etk_Object *object, Etk_Tree_Row *row, void *data)
 {
    Etk_Filechooser_Widget *filechooser_widget;
@@ -503,6 +569,7 @@
    if (!(filechooser_widget = ETK_FILECHOOSER_WIDGET(data)))
      return;
    etk_filechooser_widget_current_folder_set(filechooser_widget, etk_tree_row_data_get(row));
+   etk_tree_unselect_all(ETK_TREE(filechooser_widget->places_tree));
 }
 
 /* Called when a row of the "files" tree is activated (double-click or space) */
@@ -526,7 +593,22 @@
          ;
    }
 }
-
+/* Called when a row of the "files" tree is selected (single click) */
+static void _etk_filechooser_widget_file_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void *data)
+{
+   Etk_Filechooser_Widget *filechooser_widget;
+   char *selected_file;
+   char file_path[PATH_MAX];
+   
+   if (!(filechooser_widget = ETK_FILECHOOSER_WIDGET(data)))
+      return;
+   
+   etk_tree_row_fields_get(row, filechooser_widget->files_name_col, NULL, NULL, &selected_file, NULL);
+   snprintf(file_path, PATH_MAX, "%s/%s", filechooser_widget->current_folder, selected_file);
+   
+   if (ecore_file_exists(file_path) && !ecore_file_is_dir(file_path))
+      etk_entry_text_set(ETK_ENTRY(filechooser_widget->name_entry),selected_file);
+}
 /**************************
  *
  * Private functions
@@ -544,9 +626,9 @@
    
    etk_tree_freeze(ETK_TREE(fcw->places_tree));
    
-   row = etk_tree_row_append(ETK_TREE(fcw->places_tree), NULL,
+  /*  row = etk_tree_row_append(ETK_TREE(fcw->places_tree), NULL,
       fcw->places_col, etk_theme_icon_path_get(), "actions/go-up_16", "..", NULL);
-   etk_tree_row_data_set_full(row, strdup(".."), free);
+   etk_tree_row_data_set_full(row, strdup(".."), free); */
    
    if ((home = getenv("HOME")))
    {
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_filechooser_widget.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_filechooser_widget.h	27 Jul 2007 16:24:14 -0000	1.6
+++ etk_filechooser_widget.h	13 Aug 2007 00:20:16 -0000	1.7
@@ -11,7 +11,7 @@
  * @{
  */
 
-/** Gets the type of a status bar */
+/** Gets the type of a fileschooser widget */
 #define ETK_FILECHOOSER_WIDGET_TYPE       (etk_filechooser_widget_type_get())
 /** Casts the object to an Etk_Filechooser_Widget */
 #define ETK_FILECHOOSER_WIDGET(obj)       (ETK_OBJECT_CAST((obj), ETK_FILECHOOSER_WIDGET_TYPE, Etk_Filechooser_Widget))
@@ -20,7 +20,7 @@
 
 /**
  * @struct Etk_Filechooser_Widget
- * @brief An Etk_Filechooser_Widget is a widget used to select several files
+ * @brief An Etk_Filechooser_Widget is a widget used to select one or more files
  */
 struct Etk_Filechooser_Widget
 {
@@ -28,7 +28,8 @@
    /* Inherit from Etk_Widget */
    Etk_Widget widget;
    
-   Etk_Widget *hpaned;
+   Etk_Widget *vbox;
+   Etk_Widget *name_entry;
    
    Etk_Widget *places_tree;
    Etk_Tree_Col *places_col;
@@ -42,6 +43,7 @@
 
    Etk_Bool select_multiple;
    Etk_Bool show_hidden;
+   Etk_Bool is_save;
    
    char *current_folder;
 };
@@ -54,6 +56,9 @@
 
 void        etk_filechooser_widget_show_hidden_set(Etk_Filechooser_Widget *filechooser_widget, Etk_Bool show_hidden);
 Etk_Bool    etk_filechooser_widget_show_hidden_get(Etk_Filechooser_Widget *filechooser_widget);
+
+void        etk_filechooser_widget_is_save_set(Etk_Filechooser_Widget *filechooser_widget, Etk_Bool is_save);
+Etk_Bool    etk_filechooser_widget_is_save_get(Etk_Filechooser_Widget *filechooser_widget);
 
 void        etk_filechooser_widget_current_folder_set(Etk_Filechooser_Widget *filechooser_widget, const char *folder);
 const char *etk_filechooser_widget_current_folder_get(Etk_Filechooser_Widget *filechooser_widget);

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2007-08-13 00:20

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/bin


Modified Files:
	etk_filechooser_test.c 


Log Message:
Etk_Filechooser_Widget improvements, see bug #151 for details

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_filechooser_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_filechooser_test.c	22 Mar 2007 19:36:50 -0000	1.7
+++ etk_filechooser_test.c	13 Aug 2007 00:20:16 -0000	1.8
@@ -1,10 +1,39 @@
 #include "etk_test.h"
 
+Etk_Widget *filechooser;
+
+enum check_btns
+{
+   IS_SAVE,
+   SELECT_MULTI,
+   SHOW_HIDDEN
+};
+
+void on_checks_clicked(Etk_Button *button, void *data)
+{
+   Etk_Bool btn_status = etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(button));
+   
+   switch ((int)data)
+   {
+      case IS_SAVE:
+         etk_filechooser_widget_is_save_set(ETK_FILECHOOSER_WIDGET(filechooser),btn_status);
+         break;
+      case SELECT_MULTI:
+         etk_filechooser_widget_select_multiple_set(ETK_FILECHOOSER_WIDGET(filechooser),btn_status);
+         break;
+      case SHOW_HIDDEN:
+         etk_filechooser_widget_show_hidden_set(ETK_FILECHOOSER_WIDGET(filechooser),btn_status);
+         break;
+   }
+}
+
 /* Creates the window for the file chooser test */
 void etk_test_filechooser_window_create(void *data)
 {
    static Etk_Widget *dialog = NULL;
-   Etk_Widget *filechooser;
+   Etk_Widget *is_save_toggle;
+   Etk_Widget *select_multiple_toggle;
+   Etk_Widget *show_hidden_toggle;
 
    if (dialog)
    {
@@ -18,9 +47,25 @@
    
    filechooser = etk_filechooser_widget_new();
    etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), filechooser, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+   
+   is_save_toggle = etk_check_button_new_with_label("Is save");
+   etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),
+      is_save_toggle, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
+   etk_signal_connect("toggled", ETK_OBJECT(is_save_toggle), ETK_CALLBACK(on_checks_clicked), (void*)IS_SAVE);
+   
+   select_multiple_toggle = etk_check_button_new_with_label("Select multiple");
+   etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),
+      select_multiple_toggle, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
+   etk_signal_connect("toggled", ETK_OBJECT(select_multiple_toggle), ETK_CALLBACK(on_checks_clicked), (void*)SELECT_MULTI);
+   
+   show_hidden_toggle = etk_check_button_new_with_label("Show hidden");
+   etk_dialog_pack_widget_in_action_area(ETK_DIALOG(dialog),
+      show_hidden_toggle, ETK_BOX_START, ETK_BOX_EXPAND_FILL,0);
+   etk_signal_connect("toggled", ETK_OBJECT(show_hidden_toggle), ETK_CALLBACK(on_checks_clicked), (void*)SHOW_HIDDEN);
+   
    etk_dialog_button_add_from_stock(ETK_DIALOG(dialog), ETK_STOCK_DOCUMENT_OPEN, 1);
    etk_dialog_button_add_from_stock(ETK_DIALOG(dialog), ETK_STOCK_DIALOG_CLOSE, 2);
-   etk_dialog_action_area_alignment_set(ETK_DIALOG(dialog), 1.0);
+   etk_dialog_action_area_alignment_set(ETK_DIALOG(dialog), 0.5);
    
    etk_widget_show_all(dialog);
 }

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2007-08-13 01:55

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_filechooser_widget.c 


Log Message:
Add previous dir button to Etk_Filechooser_Widget

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_filechooser_widget.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- etk_filechooser_widget.c	13 Aug 2007 00:20:16 -0000	1.24
+++ etk_filechooser_widget.c	13 Aug 2007 01:55:21 -0000	1.25
@@ -18,6 +18,8 @@
 #include "etk_box.h"
 #include "etk_entry.h"
 #include "etk_label.h"
+#include "etk_stock.h"
+#include "etk_button.h"
 #include "config.h"
 
 /* OS-specific to list the mount points */
@@ -67,6 +69,7 @@
 static void _etk_filechooser_widget_fav_activated_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
 static void _etk_filechooser_widget_file_activated_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
 static void _etk_filechooser_widget_file_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void *data);
+static void _etk_filechooser_widget_updir_clicked_cb(Etk_Button *button, void *data);
 static void _etk_filechooser_widget_places_tree_fill(Etk_Filechooser_Widget *fcw);
 static void _etk_filechooser_widget_favs_tree_fill(Etk_Filechooser_Widget *fcw);
 
@@ -164,7 +167,7 @@
    
    if (!filechooser_widget->is_save)
       etk_entry_clear(ETK_ENTRY(filechooser_widget->name_entry));
-   
+
    /* TODO: Do not walk through the list twice!! */
    ecore_list_first_goto(files);
    while ((filename = ecore_list_next(files)))
@@ -378,6 +381,7 @@
    Etk_Widget *vpaned;
    Etk_Widget *hbox;
    Etk_Widget *label;
+   Etk_Widget *button;
    
    if (!fcw)
       return;
@@ -402,6 +406,10 @@
    etk_widget_disabled_set(fcw->name_entry, ETK_TRUE);
    etk_box_append(ETK_BOX(hbox),fcw->name_entry,ETK_BOX_START,ETK_BOX_EXPAND_FILL,10);
    
+   button = etk_button_new_from_stock(ETK_STOCK_GO_UP);
+   etk_box_append(ETK_BOX(hbox),button,ETK_BOX_START,ETK_BOX_NONE,10);
+   etk_signal_connect("clicked", ETK_OBJECT(button), ETK_CALLBACK(_etk_filechooser_widget_updir_clicked_cb), fcw);
+   
    hpaned = etk_hpaned_new();
    etk_box_append(ETK_BOX(fcw->vbox),hpaned,ETK_BOX_START,ETK_BOX_EXPAND_FILL,10);
    etk_widget_show(hpaned);
@@ -549,15 +557,7 @@
    if (!(filechooser_widget = ETK_FILECHOOSER_WIDGET(data)) || !(selected_dir = etk_tree_row_data_get(row)))
      return;
    
-   if (strcmp(selected_dir, "..") == 0)
-   {
-      char back[PATH_MAX];
-      
-      snprintf(back, PATH_MAX, "%s/..", filechooser_widget->current_folder);
-      etk_filechooser_widget_current_folder_set(filechooser_widget, back);
-   }
-   else
-      etk_filechooser_widget_current_folder_set(filechooser_widget, selected_dir);
+   etk_filechooser_widget_current_folder_set(filechooser_widget, selected_dir);
    etk_tree_unselect_all(ETK_TREE(filechooser_widget->fav_tree));
 }
 
@@ -608,6 +608,19 @@
    
    if (ecore_file_exists(file_path) && !ecore_file_is_dir(file_path))
       etk_entry_text_set(ETK_ENTRY(filechooser_widget->name_entry),selected_file);
+}
+/* Called when the '..' button is clicked */
+static void _etk_filechooser_widget_updir_clicked_cb(Etk_Button *button, void *data)
+{
+   Etk_Filechooser_Widget *filechooser_widget;
+   char back[PATH_MAX];
+
+   if (!(filechooser_widget = ETK_FILECHOOSER_WIDGET(data)))
+     return;
+   
+   snprintf(back, PATH_MAX, "%s/..", filechooser_widget->current_folder);
+
+   etk_filechooser_widget_current_folder_set(filechooser_widget, ecore_file_realpath(back));
 }
 /**************************
  *

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2007-12-18 15:10

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_filechooser_widget.c etk_filechooser_widget.h 


Log Message:
Apply patch #292. Filechooser selected event.

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_filechooser_widget.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- etk_filechooser_widget.c	30 Sep 2007 02:18:34 -0000	1.33
+++ etk_filechooser_widget.c	18 Dec 2007 15:10:07 -0000	1.34
@@ -46,6 +46,8 @@
 
 #define ETK_FILECHOOSER_FAVS_FILE ".gtk-bookmarks"
 
+int ETK_FILECHOOSER_SELECTED_SIGNAL;
+
 enum _Etk_Filechooser_Widget_Property_Id
 {
    ETK_FILECHOOSER_WIDGET_PATH_PROPERTY,
@@ -116,10 +118,16 @@
 
    if (!filechooser_widget_type)
    {
+      const Etk_Signal_Description signals[] = {
+         ETK_SIGNAL_DESC_HANDLER(ETK_FILECHOOSER_SELECTED_SIGNAL,
+            "selected", Etk_Filechooser_Widget, selected_handler, etk_marshaller_VOID),
+         ETK_SIGNAL_DESCRIPTION_SENTINEL
+      };
+      
       filechooser_widget_type = etk_type_new("Etk_Filechooser_Widget",
          ETK_WIDGET_TYPE, sizeof(Etk_Filechooser_Widget),
          ETK_CONSTRUCTOR(_etk_filechooser_widget_constructor),
-         ETK_DESTRUCTOR(_etk_filechooser_widget_destructor), NULL);
+         ETK_DESTRUCTOR(_etk_filechooser_widget_destructor), signals);
 
       etk_type_property_add(filechooser_widget_type, "path", ETK_FILECHOOSER_WIDGET_PATH_PROPERTY, ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_string(NULL));
       etk_type_property_add(filechooser_widget_type, "select-multiple", ETK_FILECHOOSER_WIDGET_SELECT_MULTIPLE_PROPERTY, ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_bool(ETK_FALSE));
@@ -500,6 +508,8 @@
    etk_signal_connect_by_code(ETK_TREE_ROW_ACTIVATED_SIGNAL, ETK_OBJECT(fcw->files_tree), ETK_CALLBACK(_etk_filechooser_widget_file_activated_cb), fcw);
    etk_signal_connect_by_code(ETK_TREE_ROW_SELECTED_SIGNAL, ETK_OBJECT(fcw->files_tree), ETK_CALLBACK(_etk_filechooser_widget_file_selected_cb), fcw);
 
+   fcw->selected_handler = NULL;
+
    _etk_filechooser_widget_places_tree_fill(ETK_FILECHOOSER_WIDGET(fcw));
    _etk_filechooser_widget_favs_tree_fill(ETK_FILECHOOSER_WIDGET(fcw));
 
@@ -634,8 +644,8 @@
    {
       if (ecore_file_is_dir(file_path))
          etk_filechooser_widget_current_folder_set(filechooser_widget, file_path);
-      else /* TODO */
-         ;
+      else
+         etk_signal_emit(ETK_FILECHOOSER_SELECTED_SIGNAL, ETK_OBJECT(filechooser_widget));
    }
 
    return ETK_TRUE;
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_filechooser_widget.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_filechooser_widget.h	26 Sep 2007 04:58:04 -0000	1.11
+++ etk_filechooser_widget.h	18 Dec 2007 15:10:07 -0000	1.12
@@ -23,6 +23,8 @@
 /** Checks if the object is an Etk_Filechooser_Widget */
 #define ETK_IS_FILECHOOSER_WIDGET(obj)    (ETK_OBJECT_CHECK_TYPE((obj), ETK_FILECHOOSER_WIDGET_TYPE))
 
+extern int ETK_FILECHOOSER_SELECTED_SIGNAL;
+   
 /**
  * @struct Etk_Filechooser_Widget
  * @brief An Etk_Filechooser_Widget is a widget used to select one or more files
@@ -45,6 +47,8 @@
    Etk_Widget *files_tree;
    Etk_Tree_Col *files_name_col;
    Etk_Tree_Col *files_date_col;
+   
+   Etk_Bool (*selected_handler)(Etk_Filechooser_Widget *filechooser);
 
    char *current_folder;

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-06-23 00:45

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_iconbox.c 


Log Message:
Add the ability to load icon images from eet files
example:
etk_iconbox_append(iconbox, "eet_file_name",  "eet_key", "label");

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- etk_iconbox.c	30 Sep 2007 02:22:55 -0000	1.33
+++ etk_iconbox.c	23 Jun 2008 00:45:52 -0000	1.34
@@ -1405,11 +1405,20 @@
       {
          //if (!(icon_object->image = etk_cache_edje_object_find(evas, icon->filename, icon->edje_group)))
          {
-            icon_object->image = edje_object_add(evas);
-            edje_object_file_set(icon_object->image, icon->filename, icon->edje_group);
+            if (edje_file_group_exists(icon->filename, icon->edje_group))
+            {
+               icon_object->image = edje_object_add(evas);
+               edje_object_file_set(icon_object->image, icon->filename, icon->edje_group);
+               icon_object->use_edje = ETK_TRUE;
+               edje_object_size_min_get(icon_object->image, &icon_w, &icon_h);
+            }
+            else
+            {
+               icon_object->image = evas_object_image_add(evas);
+               evas_object_image_file_set(icon_object->image, icon->filename, icon->edje_group);
+               icon_object->use_edje = ETK_FALSE;
+            }
          }
-         edje_object_size_min_get(icon_object->image, &icon_w, &icon_h);
-         icon_object->use_edje = ETK_TRUE;
       }
       if (icon_w <= 0 || icon_h <= 0)
       {
@@ -1451,7 +1460,7 @@
 
       evas_object_move(icon_object->image, icon_geometry.x, icon_geometry.y);
       evas_object_resize(icon_object->image, icon_geometry.w, icon_geometry.h);
-      if (!icon->edje_group)
+      if (!icon_object->use_edje)
          evas_object_image_fill_set(icon_object->image, 0, 0, icon_geometry.w, icon_geometry.h);
       evas_object_show(icon_object->image);
    }

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-06-24 18:03

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_iconbox.c etk_iconbox.h 


Log Message:
 Add 2 functions to etk_iconbox:
Etk_Iconbox_Icon *etk_iconbox_icon_get_by_label(Etk_Iconbox *iconbox, const char *label)
and
Etk_Iconbox_Icon *etk_iconbox_icon_get_by_data(Etk_Iconbox *iconbox, void *data)

You can use this function to get an icon from his label or his attached data.

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- etk_iconbox.c	23 Jun 2008 00:45:52 -0000	1.34
+++ etk_iconbox.c	24 Jun 2008 18:03:54 -0000	1.35
@@ -600,6 +600,48 @@
 }
 
 /**
+ * @brief Get the first icon with the given label. If more than one icon has the
+ * same label only the first is returned.
+ * @param iconbox an iconbox
+ * @param label the label to search for
+ * @return Return the icon with the given label, or NULL if the string is not found.
+ */
+Etk_Iconbox_Icon *etk_iconbox_icon_get_by_label(Etk_Iconbox *iconbox, const char *label)
+{
+   Etk_Iconbox_Icon *icon;
+
+   if (!iconbox || !label)
+      return NULL;
+
+   for (icon = iconbox->first_icon; icon; icon = icon->next)
+      if (!strcmp(icon->label, label))
+         return icon;
+
+   return NULL;
+}
+
+/**
+ * @brief Get the first icon with the given data attached. If more than one icon has the
+ * same data only the first is returned.
+ * @param iconbox an iconbox
+ * @param data the data to search for
+ * @return Return the icon with the given data attached, or NULL if the data is not found.
+ */
+Etk_Iconbox_Icon *etk_iconbox_icon_get_by_data(Etk_Iconbox *iconbox, void *data)
+{
+   Etk_Iconbox_Icon *icon;
+
+   if (!iconbox || !data)
+      return NULL;
+
+   for (icon = iconbox->first_icon; icon; icon = icon->next)
+      if (icon->data == data)
+         return icon;
+
+   return NULL;
+}
+
+/**
  * @brief Sets the file path of the icon's image
  * @param icon an icon
  * @param filename the filename of the icon's image
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_iconbox.h	28 Sep 2007 19:47:51 -0000	1.14
+++ etk_iconbox.h	24 Jun 2008 18:03:55 -0000	1.15
@@ -146,6 +146,8 @@
 void               etk_iconbox_icon_del(Etk_Iconbox_Icon *icon);
 void               etk_iconbox_clear(Etk_Iconbox *iconbox);
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_at_xy(Etk_Iconbox *iconbox, int x, int y, Etk_Bool over_cell, Etk_Bool over_icon, Etk_Bool over_label);
+Etk_Iconbox_Icon  *etk_iconbox_icon_get_by_label(Etk_Iconbox *iconbox, const char *label);
+Etk_Iconbox_Icon  *etk_iconbox_icon_get_by_data(Etk_Iconbox *iconbox, void *data);
 
 void               etk_iconbox_icon_file_set(Etk_Iconbox_Icon *icon, const char *filename, const char *edje_group);
 void               etk_iconbox_icon_file_get(Etk_Iconbox_Icon *icon, const char **filename, const char **edje_group);

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-06-30 17:45

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_iconbox.c etk_iconbox.h 


Log Message:
 Add a new function:
Etk_Iconbox_Icon *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox)
The function will return the first selected item in the iconbox

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- etk_iconbox.c	24 Jun 2008 18:03:54 -0000	1.35
+++ etk_iconbox.c	30 Jun 2008 17:45:52 -0000	1.36
@@ -642,6 +642,26 @@
 }
 
 /**
+ * @brief Get the first selected icon. If more than one icon is selected only
+ * the first one is returned.
+ * @param iconbox an iconbox
+ * @return Return the first selected icon, or NULL if none is selected.
+ */
+Etk_Iconbox_Icon *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox)
+{
+   Etk_Iconbox_Icon *icon;
+
+   if (!iconbox)
+      return NULL;
+
+   for (icon = iconbox->first_icon; icon; icon = icon->next)
+      if (icon->selected)
+         return icon;
+
+   return NULL;
+}
+
+/**
  * @brief Sets the file path of the icon's image
  * @param icon an icon
  * @param filename the filename of the icon's image
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_iconbox.h	24 Jun 2008 18:03:55 -0000	1.15
+++ etk_iconbox.h	30 Jun 2008 17:45:52 -0000	1.16
@@ -148,6 +148,7 @@
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_at_xy(Etk_Iconbox *iconbox, int x, int y, Etk_Bool over_cell, Etk_Bool over_icon, Etk_Bool over_label);
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_by_label(Etk_Iconbox *iconbox, const char *label);
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_by_data(Etk_Iconbox *iconbox, void *data);
+Etk_Iconbox_Icon  *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox);
 
 void               etk_iconbox_icon_file_set(Etk_Iconbox_Icon *icon, const char *filename, const char *edje_group);
 void               etk_iconbox_icon_file_get(Etk_Iconbox_Icon *icon, const char **filename, const char **edje_group);

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-06-30 22:58

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_iconbox.c etk_iconbox.h 


Log Message:
* rename etk_iconbox_icon_get_selected() in etk_iconbox_icon_get_first_selected()
* add etk_iconbox_icon_get_selected() that return a list of all the selected icons

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- etk_iconbox.c	30 Jun 2008 17:45:52 -0000	1.36
+++ etk_iconbox.c	30 Jun 2008 22:58:24 -0000	1.37
@@ -642,12 +642,33 @@
 }
 
 /**
+ * @brief Get all the selected icons.
+ * @param iconbox an iconbox
+ * @return Return an Evas_List of Etk_Iconbox_Icon, or NULL if none is selected.
+ * You must use evas_list_free() to free the list when you don't need anymore.
+ */
+Evas_List *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox)
+{
+   Etk_Iconbox_Icon *icon;
+   Evas_List *l = NULL;
+
+   if (!iconbox)
+      return NULL;
+
+   for (icon = iconbox->first_icon; icon; icon = icon->next)
+      if (icon->selected)
+         l = evas_list_append(l, icon);
+
+   return l;
+}
+
+/**
  * @brief Get the first selected icon. If more than one icon is selected only
  * the first one is returned.
  * @param iconbox an iconbox
  * @return Return the first selected icon, or NULL if none is selected.
  */
-Etk_Iconbox_Icon *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox)
+Etk_Iconbox_Icon *etk_iconbox_icon_get_first_selected(Etk_Iconbox *iconbox)
 {
    Etk_Iconbox_Icon *icon;
 
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_iconbox.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_iconbox.h	30 Jun 2008 17:45:52 -0000	1.16
+++ etk_iconbox.h	30 Jun 2008 22:58:24 -0000	1.17
@@ -148,7 +148,8 @@
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_at_xy(Etk_Iconbox *iconbox, int x, int y, Etk_Bool over_cell, Etk_Bool over_icon, Etk_Bool over_label);
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_by_label(Etk_Iconbox *iconbox, const char *label);
 Etk_Iconbox_Icon  *etk_iconbox_icon_get_by_data(Etk_Iconbox *iconbox, void *data);
-Etk_Iconbox_Icon  *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox);
+Evas_List         *etk_iconbox_icon_get_selected(Etk_Iconbox *iconbox);
+Etk_Iconbox_Icon  *etk_iconbox_icon_get_first_selected(Etk_Iconbox *iconbox);
 
 void               etk_iconbox_icon_file_set(Etk_Iconbox_Icon *icon, const char *filename, const char *edje_group);
 void               etk_iconbox_icon_file_get(Etk_Iconbox_Icon *icon, const char **filename, const char **edje_group);

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-13 19:23

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/doc/pages


Modified Files:
	object_hierarchy.h 


Log Message:
Add missing objects in hierarchy

===================================================================
RCS file: /cvs/e/e17/libs/etk/doc/pages/object_hierarchy.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- object_hierarchy.h	20 Feb 2007 21:55:25 -0000	1.7
+++ object_hierarchy.h	13 Jul 2008 19:23:41 -0000	1.8
@@ -6,16 +6,21 @@
  *   - Etk_Tree_Col
  *   - Etk_Widget
  *     - Etk_Canvas
+ *     - Etk_Evas_Object
  *     - Etk_Colorpicker
  *     - Etk_Combobox
  *     - Etk_Combobox_Item
+ *     - Etk_Combobox_Entry
+ *     - Etk_Combobox_Entry_Item
  *     - Etk_Container
  *       - Etk_Bin
  *         - Etk_Alignment
  *         - Etk_Button
+ *           - Etk_Tool_Button
  *           - Etk_Toggle_Button
  *             - Etk_Check_Button
  *               - Etk_Radio_Button
+ *             - Etk_Tool_Toggle_Button
  *         - Etk_Frame
  *         - Etk_Scrolled_View
  *         - Etk_Toplevel
@@ -25,6 +30,8 @@
  *               - Etk_Message_Dialog
  *             - Etk_Popup_Window
  *         - Etk_Viewport
+ *         - Etk_Mdi_Window
+ *         - Etk_Shadow
  *       - Etk_Box
  *         - Etk_HBox
  *         - Etk_VBox
@@ -33,8 +40,10 @@
  *         - Etk_HPaned
  *         - Etk_VPaned
  *       - Etk_Table
+ *       - Etk_Toolbar
+ *       - Etk_Mdi_Area
  *     - Etk_Entry
- *     - Etk_Filechooser
+ *     - Etk_Filechooser_Widget
  *     - Etk_Iconbox
  *     - Etk_Image
  *     - Etk_Label
@@ -48,6 +57,7 @@
  *       - Etk_Slider
  *         - Etk_HSlider
  *         - Etk_VSlider
+ *       - Etk_Spinner
  *     - Etk_Separator
  *       - Etk_HSeparator
  *       - Etk_VSeparator
@@ -55,4 +65,4 @@
  *     - Etk_Text_View
  *     - Etk_Tree
  */
- 
\ No newline at end of file
+

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-13 19:24

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_tool_button.c 


Log Message:
add missing documentation

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_tool_button.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_tool_button.c	28 Sep 2007 19:47:52 -0000	1.8
+++ etk_tool_button.c	13 Jul 2008 19:24:38 -0000	1.9
@@ -147,3 +147,40 @@
    if (!tool_toggle_button)
       return;
 }
+
+/** @} */
+
+/**************************
+ *
+ * Documentation
+ *
+ **************************/
+
+/**
+ * @addtogroup Etk_Tool_Button
+ *
+ * @image html widgets/tool_button.png
+ *
+ * \par Object Hierarchy:
+ * - Etk_Object
+ *   - Etk_Widget
+ *     - Etk_Container
+ *       - Etk_Bin
+ *         - Etk_Button
+ *           - Etk_Tool_Button
+ */
+
+/**
+ * @addtogroup Etk_Tool_Toggle_Button
+ *
+ * @image html widgets/tool_toggle_button.png
+ *
+ * \par Object Hierarchy:
+ * - Etk_Object
+ *   - Etk_Widget
+ *     - Etk_Container
+ *       - Etk_Bin
+ *         - Etk_Button
+ *           - Etk_Toggle_Button
+ *             - Etk_Tool_Toggle_Button
+ */

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-13 19:24

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_toolbar.c 


Log Message:
add missing documentation

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_toolbar.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- etk_toolbar.c	28 Sep 2007 20:11:29 -0000	1.18
+++ etk_toolbar.c	13 Jul 2008 19:24:55 -0000	1.19
@@ -23,7 +23,7 @@
 #define ETK_IS_TOOL_ITEM(obj) \
    (ETK_IS_TOOL_BUTTON(obj) || ETK_IS_TOOL_TOGGLE_BUTTON(obj))
 
-enum Etk_Window_Property_Id
+enum Etk_Toolbar_Property_Id
 {
    ETK_TOOLBAR_ORIENTATION_PROPERTY,
    ETK_TOOLBAR_STYLE_PROPERTY,
@@ -492,3 +492,38 @@
 }
 
 /** @} */
+
+/**************************
+ *
+ * Documentation
+ *
+ **************************/
+
+/**
+ * @addtogroup Etk_Toolbar
+ *
+ * @image html widgets/toolbar.png
+ * Some toolbar description here
+ *
+ * \par Object Hierarchy:
+ * - Etk_Object
+ *   - Etk_Widget
+ *     - Etk_Container
+ *       - Etk_Toolbar
+ *
+ * \par Properties:
+ * @prop_name "orientation": The orientation of the toolbar, can be ETK_TOOLBAR_HORIZ or ETK_TOOLBAR_VERT.
+ * @prop_type Integer (Etk_Toolbar_Orientation)
+ * @prop_rw
+ * @prop_val ETK_TOOLBAR_HORIZ
+ * \par
+ * @prop_name "style": The buttons look in the toolbar, can be one of ETK_BUTTON_ICON, ETK_BUTTON_TEXT, ETK_BUTTON_BOTH_HORIZ or ETK_BUTTON_BOTH_VERT.
+ * @prop_type Integer (Etk_Button_Style)
+ * @prop_rw
+ * @prop_val ETK_TOOLBAR_BOTH_VERT
+ * \par
+ * @prop_name "stock-size":  The size of the stock-icons used by buttons.
+ * @prop_type Integer (Etk_Stock_Size)
+ * @prop_rw
+ * @prop_val ETK_STOCK_MEDIUM
+ */

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-13 21:08

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_combobox.h 


Log Message:
some doxy

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- etk_combobox.h	8 Oct 2007 13:28:52 -0000	1.28
+++ etk_combobox.h	13 Jul 2008 21:08:32 -0000	1.29
@@ -54,10 +54,10 @@
 /** @brief Indicates how a widget of a combobox-column should fill and expand */
 typedef enum
 {
-   ETK_COMBOBOX_NONE = 0,                       /* TODOC */
-   ETK_COMBOBOX_EXPAND = 1 << 0,
-   ETK_COMBOBOX_FILL = 1 << 1,
-   ETK_COMBOBOX_EXPAND_FILL = ETK_COMBOBOX_EXPAND | ETK_COMBOBOX_FILL
+   ETK_COMBOBOX_NONE = 0,         /**< Don't resize the item */
+   ETK_COMBOBOX_EXPAND = 1 << 0,  /**< Expand the item in it's container*/
+   ETK_COMBOBOX_FILL = 1 << 1,    /**< Expand the item to fill the available space */
+   ETK_COMBOBOX_EXPAND_FILL = ETK_COMBOBOX_EXPAND | ETK_COMBOBOX_FILL /**< Expand the item and fill the available space*/
 } Etk_Combobox_Fill_Policy;

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-15 00:08

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_combobox_entry.c etk_combobox_entry.h 


Log Message:
* moved the search code from etk_test to inside etk_combobox_entry, so that everyone can use it.

* add 2 new field to the Etk_Combobox_Entry struct:
   int autosearch_enable;
   int autosearch_column;

* add 2 new API functions to etk_combobox_entry:
   void etk_combobox_entry_autosearch_enable_set(Etk_Combobox_Entry *combobox_entry, int enable);
   void etk_combobox_entry_autosearch_column_set(Etk_Combobox_Entry *combobox_entry, int col_num);
   The first will enable/disable autosearch and the second tell witch is the combo-column to use for searching.

4. Changed the way the focus is handled between the 2 windows (the combo-entry-win and the combo-popup-win) so that you don't need an etk_window as the base window.

4. The searching code is different from the actual code, the new one don't split up words but simply search the typed string in the entries.

5. Fixed a small bug in the current code that couse the "up" key to not work well

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox_entry.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_combobox_entry.c	10 Apr 2008 16:50:13 -0000	1.13
+++ etk_combobox_entry.c	15 Jul 2008 00:08:15 -0000	1.14
@@ -57,12 +57,14 @@
 static Etk_Bool _etk_combobox_entry_key_down_cb(Etk_Object *object, Etk_Event_Key_Down *event, void *data);
 static Etk_Bool _etk_combobox_entry_hbox_mouse_up_cb(Etk_Object *object, Etk_Event_Mouse_Up *event, void *data);
 static Etk_Bool _etk_combobox_entry_button_toggled_cb(Etk_Object *object, void *data);
+static Etk_Bool _etk_combobox_entry_button_pressed_cb(Etk_Object *object, void *data);
 static Etk_Bool _etk_combobox_entry_entry_key_down_cb(Etk_Object *object, Etk_Event_Key_Down *event, void *data);
 static Etk_Bool _etk_combobox_entry_window_popped_down_cb(Etk_Object *object, void *data);
 static Etk_Bool _etk_combobox_entry_window_key_down_cb(Etk_Object *object, Etk_Event_Key_Down *event, void *data);
 static Etk_Bool _etk_combobox_entry_item_entered_cb(Etk_Object *object, void *data);
 static Etk_Bool _etk_combobox_entry_item_left_cb(Etk_Object *object, void *data);
 static Etk_Bool _etk_combobox_entry_item_mouse_up_cb(Etk_Object *object, Etk_Event_Mouse_Up *event, void *data);
+static Etk_Bool _etk_combobox_entry_entry_text_changed_cb(Etk_Object *object, void *data);
 
 static void _etk_combobox_entry_selected_item_set(Etk_Combobox_Entry *combobox_entry, Etk_Combobox_Entry_Item *item);
 static void _etk_combobox_entry_item_cells_render(Etk_Combobox_Entry *combobox_entry, Etk_Widget **cells, Etk_Geometry geometry, Etk_Bool ignore_other);
@@ -939,6 +941,39 @@
    etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(combobox_entry->button), ETK_FALSE);
 }
 
+/**
+ * @brief Enable or disable autosearch on the combobox entry.
+ * When a combo_Entry is set as searchable typing in the entry will show the popup
+ * window with a filtered set of option.
+ * @param combobox_entry a combobox_entry
+ * @param enable ETK_TRUE = enable, ETK_FALSE = disable
+ */
+void etk_combobox_entry_autosearch_enable_set(Etk_Combobox_Entry *combobox_entry, int enable)
+{
+   if (!combobox_entry)
+      return;
+   
+   if (enable)
+      etk_signal_connect_by_code(ETK_ENTRY_TEXT_CHANGED_SIGNAL, ETK_OBJECT(combobox_entry->entry), ETK_CALLBACK(_etk_combobox_entry_entry_text_changed_cb), combobox_entry);
+   else
+      etk_signal_disconnect_by_code(ETK_ENTRY_TEXT_CHANGED_SIGNAL, ETK_OBJECT(combobox_entry->entry), ETK_CALLBACK(_etk_combobox_entry_entry_text_changed_cb), combobox_entry);      
+   
+   combobox_entry->autosearch_enable = enable ? ETK_TRUE : ETK_FALSE;
+}
+
+/**
+ * @brief Set the colum number to use for the search, must be a string column.
+ * @param combobox_entry a combobox_entry
+ * @param col_num the string column to use for searching
+ */
+void etk_combobox_entry_autosearch_column_set(Etk_Combobox_Entry *combobox_entry, int col_num)
+{
+   if (!combobox_entry)
+      return;
+   
+   combobox_entry->autosearch_column = col_num;
+}
+
 /**************************
  *
  * Etk specific functions
@@ -988,11 +1023,14 @@
    combobox_entry->active_item = NULL;
    combobox_entry->items_height = DEFAULT_ITEM_HEIGHT;
    combobox_entry->built = ETK_FALSE;
+   combobox_entry->autosearch_column = 0;
+   combobox_entry->autosearch_enable = 0;
 
    ETK_WIDGET(combobox_entry)->size_request = _etk_combobox_entry_size_request;
    ETK_WIDGET(combobox_entry)->size_allocate = _etk_combobox_entry_size_allocate;
 
    etk_signal_connect_by_code(ETK_TOGGLE_BUTTON_TOGGLED_SIGNAL, ETK_OBJECT(combobox_entry->button), ETK_CALLBACK(_etk_combobox_entry_button_toggled_cb), combobox_entry);
+   etk_signal_connect_by_code(ETK_BUTTON_PRESSED_SIGNAL, ETK_OBJECT(combobox_entry->button), ETK_CALLBACK(_etk_combobox_entry_button_pressed_cb), combobox_entry);
    etk_signal_connect_by_code(ETK_WIDGET_MOUSE_UP_SIGNAL, ETK_OBJECT(combobox_entry->hbox), ETK_CALLBACK(_etk_combobox_entry_hbox_mouse_up_cb), combobox_entry);
    etk_signal_connect_by_code(ETK_POPUP_WINDOW_POPPED_DOWN_SIGNAL, ETK_OBJECT(combobox_entry->window), ETK_CALLBACK(_etk_combobox_entry_window_popped_down_cb), combobox_entry);
    etk_signal_connect_by_code(ETK_WIDGET_KEY_DOWN_SIGNAL, ETK_OBJECT(combobox_entry->window), ETK_CALLBACK(_etk_combobox_entry_window_key_down_cb), combobox_entry);
@@ -1330,6 +1368,24 @@
    return ETK_TRUE;
 }
 
+/* Called when the combobox_entry button is pressed */
+static Etk_Bool _etk_combobox_entry_button_pressed_cb(Etk_Object *object, void *data)
+{
+   Etk_Combobox_Entry *combobox_entry;
+   Etk_Combobox_Entry_Item *item;
+
+   if (!(combobox_entry = ETK_COMBOBOX_ENTRY(data)))
+      return ETK_TRUE;
+
+   if (!combobox_entry->autosearch_enable)
+      return ETK_TRUE;
+   
+   for (item = combobox_entry->first_item; item; item = item->next)
+      etk_widget_show(ETK_WIDGET(item));
+
+   return ETK_TRUE;
+}
+
 /* Called when a key is pressed on the combobox_entry's entry widget */
 static Etk_Bool _etk_combobox_entry_entry_key_down_cb(Etk_Object *object, Etk_Event_Key_Down *event, void *data)
 {
@@ -1350,6 +1406,10 @@
          _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->first_item);
       else
          _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->selected_item->next);
+
+      while (combobox_entry->selected_item &&
+             !etk_widget_is_visible(ETK_WIDGET(combobox_entry->selected_item)))
+         _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->selected_item->next);
    }
    else if (strcmp(event->keyname, "Up") == 0)
    {
@@ -1363,6 +1423,10 @@
          _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->last_item);
       else
          _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->selected_item->prev);
+
+      while (combobox_entry->selected_item &&
+             !etk_widget_is_visible(ETK_WIDGET(combobox_entry->selected_item)))
+         _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->selected_item->prev);
    }
    else if (strcmp(event->keyname, "Return") == 0 || strcmp(event->keyname, "KP_Enter") == 0)
    {
@@ -1408,16 +1472,24 @@
          _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->first_item);
       else
          _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->selected_item->next);
+
+      while (combobox_entry->selected_item &&
+             !etk_widget_is_visible(ETK_WIDGET(combobox_entry->selected_item)))
+         _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->selected_item->next);
    }
    else if (strcmp(event->keyname, "Up") == 0)
    {
       if (!combobox_entry->first_item)
          return ETK_TRUE;
 
-      if (!combobox_entry->selected_item || !combobox_entry->selected_item->next)
+      if (!combobox_entry->selected_item || !combobox_entry->selected_item->prev)
          _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->last_item);
       else
          _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->selected_item->prev);
+
+      while (combobox_entry->selected_item &&
+             !etk_widget_is_visible(ETK_WIDGET(combobox_entry->selected_item)))
+         _etk_combobox_entry_selected_item_set(combobox_entry, combobox_entry->selected_item->prev);
    }
    else if (strcmp(event->keyname, "Return") == 0 || strcmp(event->keyname, "space") == 0
          || strcmp(event->keyname, "KP_Enter") == 0)
@@ -1431,7 +1503,9 @@
    }
    else if (strcmp(event->keyname, "Escape") == 0)
       etk_popup_window_popdown(combobox_entry->window);
-
+   else
+      etk_signal_emit(ETK_WIDGET_KEY_DOWN_SIGNAL, ETK_OBJECT(combobox_entry->entry), event, data);
+   
    return ETK_TRUE;
 }
 
@@ -1474,6 +1548,44 @@
    if (event->button == 1)
       etk_popup_window_popdown(item->combobox_entry->window);
 
+   return ETK_TRUE;
+}
+
+/* Called when the text in the entry change (used for autosearch) */
+static Etk_Bool _etk_combobox_entry_entry_text_changed_cb(Etk_Object *object, void *data)
+{
+   Etk_Entry *entry;
+   Etk_Combobox_Entry *combobox_entry;
+   Etk_Combobox_Entry_Item *item;
+   const char *entry_text = NULL;
+
+   if (!(entry = ETK_ENTRY(object)))
+      return ETK_TRUE;
+
+   if (!(combobox_entry = ETK_COMBOBOX_ENTRY(data)))
+      return ETK_TRUE;
+
+   if (!etk_combobox_entry_is_popped_up(combobox_entry))
+      etk_combobox_entry_pop_up(combobox_entry);
+
+   entry_text = etk_entry_text_get(entry);
+   if (!entry_text)
+     return ETK_TRUE;
+
+   etk_combobox_entry_pop_down(combobox_entry);
+   
+   for (item = combobox_entry->first_item; item; item = item->next)
+   {
+      const char* item_field;
+
+      item_field = etk_combobox_entry_item_field_get(item, combobox_entry->autosearch_column);
+      if (strcasestr(item_field, entry_text))
+         etk_widget_show(ETK_WIDGET(item));
+      else
+         etk_widget_hide(ETK_WIDGET(item));
+   }
+
+   etk_combobox_entry_pop_up(combobox_entry);
    return ETK_TRUE;
 }
 
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox_entry.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_combobox_entry.h	8 Oct 2007 13:32:42 -0000	1.8
+++ etk_combobox_entry.h	15 Jul 2008 00:08:15 -0000	1.9
@@ -123,6 +123,9 @@
 
    int items_height;
    Etk_Bool built:1;
+   
+   int autosearch_enable;
+   int autosearch_column;
 };
 
 
@@ -174,6 +177,9 @@
 void etk_combobox_entry_pop_up(Etk_Combobox_Entry *combobox_entry);
 void etk_combobox_entry_pop_down(Etk_Combobox_Entry *combobox_entry);
 void etk_combobox_entry_popup_feed(Etk_Combobox_Entry *combobox_entry, Etk_Window *window);
+
+void etk_combobox_entry_autosearch_enable_set(Etk_Combobox_Entry *combobox_entry, int enable);
+void etk_combobox_entry_autosearch_column_set(Etk_Combobox_Entry *combobox_entry, int col_num);
 
 /** @} */

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-15 00:08

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/bin


Modified Files:
	etk_combobox_test.c 


Log Message:
* moved the search code from etk_test to inside etk_combobox_entry, so that everyone can use it.

* add 2 new field to the Etk_Combobox_Entry struct:
   int autosearch_enable;
   int autosearch_column;

* add 2 new API functions to etk_combobox_entry:
   void etk_combobox_entry_autosearch_enable_set(Etk_Combobox_Entry *combobox_entry, int enable);
   void etk_combobox_entry_autosearch_column_set(Etk_Combobox_Entry *combobox_entry, int col_num);
   The first will enable/disable autosearch and the second tell witch is the combo-column to use for searching.

4. Changed the way the focus is handled between the 2 windows (the combo-entry-win and the combo-popup-win) so that you don't need an etk_window as the base window.

4. The searching code is different from the actual code, the new one don't split up words but simply search the typed string in the entries.

5. Fixed a small bug in the current code that couse the "up" key to not work well

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_combobox_test.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- etk_combobox_test.c	2 Oct 2007 15:29:56 -0000	1.22
+++ etk_combobox_test.c	15 Jul 2008 00:08:15 -0000	1.23
@@ -13,6 +13,7 @@
 static Etk_Bool _active_item_changed_cb(Etk_Object *object, void *data);
 static void _etk_combobox_entry_populate(Etk_Combobox_Entry *combobox_entry, char *dir);
 static Etk_Bool _etk_combobox_entry_active_item_changed_cb(Etk_Object *object, void *data);
+static Etk_Bool _etk_combobox_entry_autosearch_active_item_changed_cb(Etk_Object *object, void *data);
 static Etk_Bool _etk_combobox_entry_text_changed_cb(Etk_Object *object, void *data);
 static char **str_split(char **str, char *delim);
 
@@ -101,11 +102,12 @@
    etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
 
    combobox = etk_combobox_entry_new_default();
+   etk_combobox_entry_autosearch_enable_set(ETK_COMBOBOX_ENTRY(combobox), ETK_TRUE);
 
    for (i = 0; _keywords[i]; i++)
      etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(combobox), _keywords[i], NULL);
 
-   etk_signal_connect_by_code(ETK_ENTRY_TEXT_CHANGED_SIGNAL, ETK_OBJECT(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(combobox))), ETK_CALLBACK(_etk_combobox_entry_text_changed_cb), combobox);
+   etk_signal_connect_by_code(ETK_COMBOBOX_ENTRY_ACTIVE_ITEM_CHANGED_SIGNAL, ETK_OBJECT(combobox), ETK_CALLBACK(_etk_combobox_entry_autosearch_active_item_changed_cb), NULL);
    etk_container_add(ETK_CONTAINER(frame), combobox);
 
    /*******************
@@ -277,68 +279,19 @@
    return ETK_TRUE;
 }
 
-static Etk_Bool _etk_combobox_entry_text_changed_cb(Etk_Object *object, void *data)
+static Etk_Bool _etk_combobox_entry_autosearch_active_item_changed_cb(Etk_Object *object, void *data)
 {
-   Etk_Combobox_Entry *combobox;
-   Etk_Entry *entry;
-   char *search_str = NULL;
-   const char *entry_text = NULL;
-   char **words = NULL;
-   int i;
+   Etk_Combobox_Entry *combobox_entry;
+   Etk_Combobox_Entry_Item *active_item = NULL;
+   const char *field;
 
-   if (!(combobox = ETK_COMBOBOX_ENTRY(data)) || !(entry = ETK_ENTRY(object)))
+   if (!(combobox_entry = ETK_COMBOBOX_ENTRY(object)) || !(active_item = etk_combobox_entry_active_item_get(combobox_entry)))
       return ETK_TRUE;
 
-   if (!etk_combobox_entry_is_popped_up(combobox))
-     {
-	etk_combobox_entry_pop_up(combobox);
-	etk_popup_window_focused_window_set(ETK_POPUP_WINDOW(win));
-     }
+   field = etk_combobox_entry_item_field_get(active_item, 0);
+   etk_entry_text_set(ETK_ENTRY(combobox_entry->entry), field);
 
-   entry_text = etk_entry_text_get(entry);
-   if (!entry_text)
-     return ETK_TRUE;
-
-   search_str = strdup(entry_text);
-   words = str_split(&search_str, " ");
-
-   etk_combobox_entry_clear(combobox);
-   etk_combobox_entry_pop_down(combobox);
-   for (i = 0; _keywords[i]; i++)
-     {
-	int j;
-
-	for (j = 0; words[j]; j++)
-	  {
-	     if (!strcasestr(_keywords[i], words[j]))
-	       goto brk;
-	  }
-	etk_combobox_entry_item_append(combobox, _keywords[i], NULL);
-brk:
-	continue;
-     }
-   etk_combobox_entry_pop_up(combobox);
-   etk_popup_window_focused_window_set(ETK_POPUP_WINDOW(win));
-   if (words)
-      free(words);
    return ETK_TRUE;
 }
 
-static char **str_split(char **str, char *delim)
-{
-   char **tok;
-   int  i = 0;
-   char *t;
-
-   tok = calloc(2048, sizeof(char*));
-   tok[i] = strtok(*str, delim);
-   i++;
-   while((t = strtok(NULL, delim)))
-     {
-	tok[i] = t;
-	i++;
-     }
-   tok[i] = NULL;
 
-   return tok;
-}

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-15 01:12

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_combobox_entry.c 


Log Message:
no log message

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox_entry.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_combobox_entry.c	15 Jul 2008 00:08:15 -0000	1.14
+++ etk_combobox_entry.c	15 Jul 2008 01:12:32 -0000	1.15
@@ -1572,6 +1572,8 @@
    if (!entry_text)
      return ETK_TRUE;
 
+   /* TODO FIXME We pop_down / pop_up the window to make it's size
+      recalculate. We MUST find a better way*/
    etk_combobox_entry_pop_down(combobox_entry);
    
    for (item = combobox_entry->first_item; item; item = item->next)

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-17 00:10

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_combobox_entry.c etk_combobox_entry.h 


Log Message:
removed  etk_combobox_entry_autosearch_enable_set() and void etk_combobox_entry_autosearch_column_set()
in favor of
void etk_combobox_entry_autosearch_set(Etk_Combobox_Entry *combobox_entry, int col_num, char* (*search_function)(const char *s1, const char *s2));
Now you can also use your own searching function.

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox_entry.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_combobox_entry.c	15 Jul 2008 01:12:32 -0000	1.15
+++ etk_combobox_entry.c	17 Jul 2008 00:10:53 -0000	1.16
@@ -942,36 +942,54 @@
 }
 
 /**
- * @brief Enable or disable autosearch on the combobox entry.
+ * @brief Set autosearch params on the combobox entry, or disable autosearch.
  * When a combo_Entry is set as searchable typing in the entry will show the popup
- * window with a filtered set of option.
+ * window with a filtered set of options.
+ * Setting col_num to < 0 will disable autosearch.
  * @param combobox_entry a combobox_entry
- * @param enable ETK_TRUE = enable, ETK_FALSE = disable
+ * @param col a column number to use for searching, must be a string column. Or NULL to disable autosearch
  */
-void etk_combobox_entry_autosearch_enable_set(Etk_Combobox_Entry *combobox_entry, int enable)
+void etk_combobox_entry_autosearch_set(Etk_Combobox_Entry *combobox_entry, int col_num, char* (*search_function)(const char *s1, const char *s2))
 {
    if (!combobox_entry)
       return;
-   
-   if (enable)
-      etk_signal_connect_by_code(ETK_ENTRY_TEXT_CHANGED_SIGNAL, ETK_OBJECT(combobox_entry->entry), ETK_CALLBACK(_etk_combobox_entry_entry_text_changed_cb), combobox_entry);
-   else
-      etk_signal_disconnect_by_code(ETK_ENTRY_TEXT_CHANGED_SIGNAL, ETK_OBJECT(combobox_entry->entry), ETK_CALLBACK(_etk_combobox_entry_entry_text_changed_cb), combobox_entry);      
-   
-   combobox_entry->autosearch_enable = enable ? ETK_TRUE : ETK_FALSE;
-}
 
-/**
- * @brief Set the colum number to use for the search, must be a string column.
- * @param combobox_entry a combobox_entry
- * @param col_num the string column to use for searching
- */
-void etk_combobox_entry_autosearch_column_set(Etk_Combobox_Entry *combobox_entry, int col_num)
-{
-   if (!combobox_entry)
+   if (!combobox_entry->built)
+   {
+      ETK_WARNING("Unable to set autosearch to the combobox_entry because the combobox_entry isn't built yet");
       return;
+   }
+
+   if (col_num < 0)
+   {
+      etk_signal_disconnect_by_code(ETK_ENTRY_TEXT_CHANGED_SIGNAL, ETK_OBJECT(combobox_entry->entry), ETK_CALLBACK(_etk_combobox_entry_entry_text_changed_cb), combobox_entry);
+      combobox_entry->autosearch_enable = ETK_FALSE;
+      return;
+   }
+
+   if (col_num > combobox_entry->num_cols - 1)
+   {
+      ETK_WARNING("Unable to set autosearch to the combobox_entry because the given column isn't valid");
+      return;
+   }
+   
+   if (combobox_entry->cols[col_num]->type != ETK_COMBOBOX_ENTRY_LABEL)
+   {
+      ETK_WARNING("Unable to set autosearch to the combobox_entry because the given column isn't a label column");
+      return;
+   }
    
+       
    combobox_entry->autosearch_column = col_num;
+
+   if (!combobox_entry->autosearch_enable)
+   {
+      etk_signal_connect_by_code(ETK_ENTRY_TEXT_CHANGED_SIGNAL, ETK_OBJECT(combobox_entry->entry), ETK_CALLBACK(_etk_combobox_entry_entry_text_changed_cb), combobox_entry);
+      combobox_entry->autosearch_enable = ETK_TRUE;
+   }
+
+   if (search_function)
+      combobox_entry->search_function = search_function;
 }
 
 /**************************
@@ -1025,6 +1043,7 @@
    combobox_entry->built = ETK_FALSE;
    combobox_entry->autosearch_column = 0;
    combobox_entry->autosearch_enable = 0;
+   combobox_entry->search_function = strstr;
 
    ETK_WIDGET(combobox_entry)->size_request = _etk_combobox_entry_size_request;
    ETK_WIDGET(combobox_entry)->size_allocate = _etk_combobox_entry_size_allocate;
@@ -1581,7 +1600,7 @@
       const char* item_field;
 
       item_field = etk_combobox_entry_item_field_get(item, combobox_entry->autosearch_column);
-      if (strcasestr(item_field, entry_text))
+      if (combobox_entry->search_function(item_field, entry_text))
          etk_widget_show(ETK_WIDGET(item));
       else
          etk_widget_hide(ETK_WIDGET(item));
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_combobox_entry.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_combobox_entry.h	15 Jul 2008 00:08:15 -0000	1.9
+++ etk_combobox_entry.h	17 Jul 2008 00:10:53 -0000	1.10
@@ -122,10 +122,12 @@
    Etk_Widget *hbox;
 
    int items_height;
-   Etk_Bool built:1;
-   
-   int autosearch_enable;
+
    int autosearch_column;
+   char* (*search_function)(const char *s1, const char *s2);
+   Etk_Bool autosearch_enable:1;
+
+   Etk_Bool built:1;
 };
 
 
@@ -178,8 +180,7 @@
 void etk_combobox_entry_pop_down(Etk_Combobox_Entry *combobox_entry);
 void etk_combobox_entry_popup_feed(Etk_Combobox_Entry *combobox_entry, Etk_Window *window);
 
-void etk_combobox_entry_autosearch_enable_set(Etk_Combobox_Entry *combobox_entry, int enable);
-void etk_combobox_entry_autosearch_column_set(Etk_Combobox_Entry *combobox_entry, int col_num);
+void etk_combobox_entry_autosearch_set(Etk_Combobox_Entry *combobox_entry, int col_num, char* (*search_function)(const char *s1, const char *s2));
 
 /** @} */

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-07-17 00:11

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/bin


Modified Files:
	etk_combobox_test.c 


Log Message:
removed  etk_combobox_entry_autosearch_enable_set() and void etk_combobox_entry_autosearch_column_set()
in favor of
void etk_combobox_entry_autosearch_set(Etk_Combobox_Entry *combobox_entry, int col_num, char* (*search_function)(const char *s1, const char *s2));
Now you can also use your own searching function.

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_combobox_test.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- etk_combobox_test.c	15 Jul 2008 00:08:15 -0000	1.23
+++ etk_combobox_test.c	17 Jul 2008 00:10:53 -0000	1.24
@@ -14,8 +14,6 @@
 static void _etk_combobox_entry_populate(Etk_Combobox_Entry *combobox_entry, char *dir);
 static Etk_Bool _etk_combobox_entry_active_item_changed_cb(Etk_Object *object, void *data);
 static Etk_Bool _etk_combobox_entry_autosearch_active_item_changed_cb(Etk_Object *object, void *data);
-static Etk_Bool _etk_combobox_entry_text_changed_cb(Etk_Object *object, void *data);
-static char **str_split(char **str, char *delim);
 
 static char *cur_dir = NULL;
 static Etk_Widget *win = NULL;
@@ -102,7 +100,7 @@
    etk_box_append(ETK_BOX(vbox), frame, ETK_BOX_START, ETK_BOX_NONE, 0);
 
    combobox = etk_combobox_entry_new_default();
-   etk_combobox_entry_autosearch_enable_set(ETK_COMBOBOX_ENTRY(combobox), ETK_TRUE);
+   etk_combobox_entry_autosearch_set(ETK_COMBOBOX_ENTRY(combobox), 0, strcasestr);
 
    for (i = 0; _keywords[i]; i++)
      etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(combobox), _keywords[i], NULL);

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-08-05 21:14

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/lib


Modified Files:
	etk_tooltips.c 


Log Message:
* Fix tooltips placement. Also if the main window is not an Etk_Window. 
* Reenable tooltips so that we can find and fix bugs.

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/lib/etk_tooltips.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_tooltips.c	8 Jul 2008 04:47:16 -0000	1.17
+++ etk_tooltips.c	5 Aug 2008 21:14:20 -0000	1.18
@@ -84,7 +84,7 @@
  */
 void etk_tooltips_enable()
 {
-   //_etk_tooltips_enabled = ETK_TRUE;
+   _etk_tooltips_enabled = ETK_TRUE;
 }
 
 /**
@@ -200,7 +200,7 @@
    Etk_Toplevel *toplevel;
    Evas *evas;
    int pt_x, pt_y;
-   int win_x, win_y;
+   int win_x, win_w;
 
    if(!ETK_IS_OBJECT(widget))
      return;
@@ -225,15 +225,10 @@
 
    etk_label_set(ETK_LABEL(_etk_tooltips_label), text);
 
-   evas = etk_widget_toplevel_evas_get(widget);
-   evas_pointer_canvas_xy_get(evas, &pt_x, &pt_y);
-   toplevel = etk_widget_toplevel_parent_get(widget);
-   etk_window_geometry_get(ETK_WINDOW(toplevel), &win_x, &win_y, NULL, NULL);
-   x = pt_x + win_x;
-   y = pt_y + win_y;
+   etk_engine_mouse_position_get(&x, &y);
 
    /* TODO: if tooltip window is outside screen, fix its place */
-   etk_window_move(ETK_WINDOW(_etk_tooltips_window), x + 5, y + 5);
+   etk_window_move(ETK_WINDOW(_etk_tooltips_window), x - 10, y + 20);
    etk_widget_show_all(_etk_tooltips_window);
    free(key);

E CVS: libs/etk davemds

From: Enlightenment CVS <noreply@cv...> - 2008-08-05 21:47

Enlightenment CVS committal

Author  : davemds
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/bin


Modified Files:
	etk_button_test.c etk_test.c 


Log Message:
 * enable tooltips in etk_test (in the button test)

===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_button_test.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etk_button_test.c	28 Sep 2007 19:52:48 -0000	1.20
+++ etk_button_test.c	5 Aug 2008 21:47:32 -0000	1.21
@@ -41,17 +41,21 @@
    etk_container_add(ETK_CONTAINER(frame), vbox);
 
    button = etk_button_new_with_label("Normal button");
+   etk_tooltips_tip_set(button, "A normal button");
    etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
 
    button = etk_button_new_with_label("Button with an image");
+   etk_tooltips_tip_set(button, "A button with an image inside");
    image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/right_arrow.png", NULL);
    etk_button_image_set(ETK_BUTTON(button), ETK_IMAGE(image));
    etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
 
    button = etk_button_new();
+   etk_tooltips_tip_set(button, "A mute button");
    etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
 
    button = etk_button_new_with_label("Disabled button");
+   etk_tooltips_tip_set(button, "A disabled button");
    etk_widget_disabled_set(button, ETK_TRUE);
    etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
 
@@ -65,9 +69,11 @@
    etk_container_add(ETK_CONTAINER(frame), vbox);
 
    button = etk_toggle_button_new_with_label("Toggle button");
+   etk_tooltips_tip_set(button, "An on/off button");
    etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
 
    button = etk_toggle_button_new();
+   etk_tooltips_tip_set(button, "A mute toggle");
    etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
 
    button = etk_toggle_button_new_with_label("Disabled toggle button 1");
@@ -89,6 +95,7 @@
    etk_container_add(ETK_CONTAINER(frame), vbox);
 
    button = etk_check_button_new_with_label("Check button");
+   etk_tooltips_tip_set(button, "A Checkbox button");
    etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(button), ETK_TRUE);
    etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
 
===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_test.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- etk_test.c	17 Apr 2008 03:27:34 -0000	1.41
+++ etk_test.c	5 Aug 2008 21:47:32 -0000	1.42
@@ -161,6 +161,7 @@
       fprintf(stderr, "Could not init Etk. Exiting...\n");
       return 1;
    };
+   etk_tooltips_enable();
    _main_window_create();
    etk_main();
    etk_shutdown();