Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/exhibit
Dir : e17/apps/exhibit/src/bin
Modified Files:
exhibit.h exhibit_main.c exhibit_menus.c exhibit_options.c
exhibit_tab.c
Log Message:
forgot to commit this a while ago. remove entry, use combo
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- exhibit.h 1 Jun 2007 10:19:06 -0000 1.42
+++ exhibit.h 4 Jul 2007 15:27:44 -0000 1.43
@@ -201,7 +201,7 @@
Etk_Widget *hpaned;
Etk_Widget *vpaned;
Etk_Widget *hpaned_shadow;
- Etk_Widget *entry[2];
+ Etk_Widget *combobox_entry;
Etk_Widget *zoom_in[2];
Etk_Widget *zoom_out[2];
Etk_Widget *fit[2];
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- exhibit_main.c 27 Jun 2007 17:48:28 -0000 1.106
+++ exhibit_main.c 4 Jul 2007 15:27:44 -0000 1.107
@@ -13,6 +13,7 @@
static int _ex_main_dtree_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, void *data);
static void _ex_main_goto_dir_clicked_cb(Etk_Object *object, void *data);
static void _ex_main_entry_dir_key_down_cb(Etk_Object *object, void *event,
void *data);
+static void _ex_main_combobox_entry_changed_cb(Etk_Object *object, void *data);
static Etk_Bool _ex_main_window_deleted_cb(void *data);
static void _ex_main_window_key_down_cb(Etk_Object *object, void *event, void
*data);
static void _ex_main_window_resize_cb(Etk_Object *object, void *data);
@@ -238,7 +239,7 @@
e->cur_tab->cur_path[len] = '/';
e->cur_tab->cur_path[len + 1] = '\0';
}
- etk_entry_text_set(ETK_ENTRY(e->entry[0]), e->cur_tab->cur_path);
+
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry))),
e->cur_tab->cur_path);
while ((dir_entry = readdir(dir)) != NULL)
{
@@ -265,6 +266,7 @@
etk_theme_icon_path_get(),
"places/folder_16",
dir_entry->d_name, NULL);
+
etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(e->combobox_entry),
dir_entry->d_name, NULL);
e->cur_tab->dirs = evas_list_append(e->cur_tab->dirs,
dir_entry->d_name);
continue;
}
@@ -401,15 +403,18 @@
{
case ECORE_FILE_EVENT_CREATED_DIRECTORY:
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_DIRS);
break;
case ECORE_FILE_EVENT_DELETED_DIRECTORY:
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_DIRS);
break;
case ECORE_FILE_EVENT_DELETED_SELF:
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
break;
case ECORE_FILE_EVENT_MODIFIED:
@@ -454,7 +459,7 @@
/* Stop the propagation of the signal so the focus won't be passed to
the next widget */
etk_signal_stop();
- path = etk_entry_text_get(ETK_ENTRY(e->entry[0]));
+ path =
etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry))));
dir = ecore_file_get_dir((char*)path);
file = ecore_file_get_file(path);
@@ -503,7 +508,7 @@
{
char fullpath[PATH_MAX];
snprintf(fullpath, PATH_MAX, "%s/%s/", dir, (char*)l->data);
- etk_entry_text_set(ETK_ENTRY(e->entry[0]), fullpath);
+
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry))),
fullpath);
break;
}
}
@@ -512,21 +517,42 @@
if (!strcmp(ev->key, "Return") || !strcmp(ev->key, "KP_Enter"))
{
+ Etk_Widget *entry;
+
+ entry =
etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry));
+
_ex_slideshow_stop(e);
_ex_thumb_abort();
- e->cur_tab->dir =
strdup((char*)etk_entry_text_get(ETK_ENTRY(e->entry[0])));
+ e->cur_tab->dir = strdup((char*)etk_entry_text_get(ETK_ENTRY(entry)));
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
}
+static void _ex_main_combobox_entry_changed_cb(Etk_Object *object, void *data)
+{
+ char *dir;
+
+
etk_combobox_entry_item_fields_get(etk_combobox_entry_active_item_get(ETK_COMBOBOX_ENTRY(e->combobox_entry)),
+ &dir, NULL);
+ _ex_slideshow_stop(e);
+ _ex_thumb_abort();
+ e->cur_tab->dir = strdup(dir);
+ etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
+ _ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
+}
+
static void
_ex_main_goto_dir_clicked_cb(Etk_Object *object, void *data)
{
- e->cur_tab->dir = strdup((char*)etk_entry_text_get(ETK_ENTRY(e->entry[0])));
+ e->cur_tab->dir =
strdup((char*)etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry)))));
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
@@ -679,7 +705,7 @@
D(("Selecting tab %d\n", e->cur_tab->num));
_ex_tab_select(tab);
- etk_entry_text_set(ETK_ENTRY(e->entry[0]), e->cur_tab->cur_path);
+
etk_entry_text_set(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry))),
e->cur_tab->cur_path);
}
void
@@ -731,6 +757,7 @@
e->cur_tab->dir = strdup(dir);
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(ecore_file_get_file(file), EX_TREE_UPDATE_ALL);
if (ecore_file_exists(file) && !ecore_file_is_dir(file))
_ex_main_image_set(e, file);
@@ -968,14 +995,10 @@
entry_hbox = etk_hbox_new(ETK_FALSE, 0);
etk_table_attach(ETK_TABLE(e->table), entry_hbox, 0, 3, 2, 2,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL, 0, 0);
- e->entry[0] = etk_entry_new();
- etk_box_append(ETK_BOX(entry_hbox), e->entry[0], ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
- etk_signal_connect("key-down", ETK_OBJECT(e->entry[0]),
ETK_CALLBACK(_ex_main_entry_dir_key_down_cb), e);
-
- e->entry[1] = etk_button_new_from_stock(ETK_STOCK_GO_NEXT);
- etk_button_label_set(ETK_BUTTON(e->entry[1]), NULL);
- etk_box_append(ETK_BOX(entry_hbox), e->entry[1], ETK_BOX_START,
ETK_BOX_FILL, 0);
- etk_signal_connect("clicked", ETK_OBJECT(e->entry[1]),
ETK_CALLBACK(_ex_main_goto_dir_clicked_cb), e);
+ e->combobox_entry = etk_combobox_entry_new_default();
+ etk_box_append(ETK_BOX(entry_hbox), e->combobox_entry, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_signal_connect("key-down", ETK_OBJECT(e->combobox_entry),
ETK_CALLBACK(_ex_main_entry_dir_key_down_cb), e);
+ etk_signal_connect("active-item-changed", ETK_OBJECT(e->combobox_entry),
ETK_CALLBACK(_ex_main_combobox_entry_changed_cb), e);
/* create first tab but dont place it in notebook */
if (dir)
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- exhibit_menus.c 1 Jun 2007 10:19:06 -0000 1.46
+++ exhibit_menus.c 4 Jul 2007 15:27:44 -0000 1.47
@@ -489,6 +489,7 @@
e->cur_tab->dir = strdup(e->options->fav_path);
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- exhibit_options.c 1 Jun 2007 10:19:06 -0000 1.24
+++ exhibit_options.c 4 Jul 2007 15:27:44 -0000 1.25
@@ -483,6 +483,7 @@
e->options->default_sort = e->options->default_sort_tmp;
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
/* MONITOR FOCUS */
if (IS_SELECTED(dialog->monitor_focus))
===================================================================
RCS file: /cvs/e/e17/apps/exhibit/src/bin/exhibit_tab.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- exhibit_tab.c 3 May 2007 10:30:41 -0000 1.39
+++ exhibit_tab.c 4 Jul 2007 15:27:44 -0000 1.40
@@ -388,6 +388,7 @@
e->cur_tab->dir = strdup(dcol_string);
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
etk_notebook_page_tab_label_set(ETK_NOTEBOOK(e->notebook),
etk_notebook_current_page_get(ETK_NOTEBOOK(e->notebook)),
_ex_file_get(e->cur_tab->cur_path));
}
@@ -422,9 +423,10 @@
if (!strcmp(ev->key, "Return") || !strcmp(ev->key, "KP_Enter"))
{
- e->cur_tab->dir =
strdup((char*)etk_entry_text_get(ETK_ENTRY(e->entry[0])));
+ e->cur_tab->dir =
strdup((char*)etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(e->combobox_entry)))));
etk_tree_clear(ETK_TREE(e->cur_tab->itree));
etk_tree_clear(ETK_TREE(e->cur_tab->dtree));
+ etk_combobox_entry_clear(ETK_COMBOBOX_ENTRY(e->combobox_entry));
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
