Enlightenment CVS committal
Author : davemds
Project : e17
Module : proto/edje_editor
Dir : e17/proto/edje_editor/src/bin
Modified Files:
edje_editor_group.c edje_editor_tree.c edje_editor_tree.h
Log Message:
* reflect combobox autoserach api changes
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_group.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- edje_editor_group.c 15 Jul 2008 00:55:42 -0000 1.9
+++ edje_editor_group.c 17 Jul 2008 00:11:51 -0000 1.10
@@ -225,15 +225,15 @@
item =
etk_combobox_entry_active_item_get(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox));
etk_signal_block("active-item-changed", ETK_OBJECT(UI_GroupsComboBox),
ETK_CALLBACK(_tree_combobox_active_item_changed_cb), NULL);
-
etk_combobox_entry_autosearch_enable_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
- ETK_FALSE);
+ etk_combobox_entry_autosearch_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
-1, NULL);
+
etk_combobox_entry_item_fields_set(item, name);
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox))),
name);
etk_signal_unblock("active-item-changed", ETK_OBJECT(UI_GroupsComboBox),
ETK_CALLBACK(_tree_combobox_active_item_changed_cb),
NULL);
-
etk_combobox_entry_autosearch_enable_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
- ETK_TRUE);
+ etk_combobox_entry_autosearch_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
+ GROUP_COMBO_AUTOSEARCH_COL, NULL);
//Update FakeWin title
edje_object_part_text_set(EV_fakewin, "title", name);
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje_editor_tree.c 15 Jul 2008 00:55:42 -0000 1.17
+++ edje_editor_tree.c 17 Jul 2008 00:11:51 -0000 1.18
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
#include <string.h>
#include <Etk.h>
#include <Edje.h>
@@ -12,7 +13,7 @@
//UI_GroupsComboBox
UI_GroupsComboBox = etk_combobox_entry_new_default();
etk_combobox_entry_items_height_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
18);
-
etk_combobox_entry_autosearch_enable_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
ETK_TRUE);
+ etk_combobox_entry_autosearch_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
GROUP_COMBO_AUTOSEARCH_COL, strcasestr);
etk_signal_connect("active-item-changed", ETK_OBJECT(UI_GroupsComboBox),
ETK_CALLBACK(_tree_combobox_active_item_changed_cb),
NULL);
@@ -104,8 +105,7 @@
ETK_CALLBACK(_tree_combobox_active_item_changed_cb), NULL);
etk_signal_block("item-activated",ETK_OBJECT(UI_PartSourceComboBox),
_part_SourceComboBox_item_activated_cb, NULL);
-
etk_combobox_entry_autosearch_enable_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
- ETK_FALSE);
+ etk_combobox_entry_autosearch_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
-1, NULL);
//Clear the combos
etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox));
@@ -132,8 +132,8 @@
etk_combobox_entry_active_item_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
etk_combobox_entry_first_item_get(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox)));
-
etk_combobox_entry_autosearch_enable_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
- ETK_TRUE);
+ etk_combobox_entry_autosearch_set(ETK_COMBOBOX_ENTRY(UI_GroupsComboBox),
+ GROUP_COMBO_AUTOSEARCH_COL, NULL);
}
Etk_Tree_Row *
===================================================================
RCS file: /cvs/e/e17/proto/edje_editor/src/bin/edje_editor_tree.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_editor_tree.h 15 Jul 2008 00:55:43 -0000 1.3
+++ edje_editor_tree.h 17 Jul 2008 00:11:51 -0000 1.4
@@ -12,6 +12,8 @@
#define COL_TYPE etk_tree_nth_col_get(ETK_TREE(UI_PartsTree), TREE_COL_TYPE)
#define COL_PARENT etk_tree_nth_col_get(ETK_TREE(UI_PartsTree),
TREE_COL_PARENT)
+#define GROUP_COMBO_AUTOSEARCH_COL 0
+
Etk_Widget *UI_PartsTree;
Etk_Widget *UI_GroupsComboBox;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs