enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Fix resizing of config_list widget. 

Some formatting fixes.


SVN revision: 32986
This commit is contained in:
Christopher Michael 2007-12-04 22:43:53 +00:00
parent 9335742e16
commit 68d332ad0d
1 changed files with 41 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/bin/e_widget_config_list.c
View File

@ -12,7 +12,6 @@ static void _button_cb_remove(void *data, void *obj);
static void _button_cb_up(void *data, void *obj); static void _button_cb_up(void *data, void *obj);
static void _button_cb_down(void *data, void *obj); static void _button_cb_down(void *data, void *obj);
static void _list_select_num(E_Widget_Data *wd, int indx); static void _list_select_num(E_Widget_Data *wd, int indx);
static void _e_wid_disable_hook(Evas_Object *obj); static void _e_wid_disable_hook(Evas_Object *obj);
static void _e_wid_del_hook(Evas_Object *obj); static void _e_wid_del_hook(Evas_Object *obj);
@ -26,14 +25,12 @@ struct _E_Widget_Data
{ {
Evas_Object *list; /* Selecting a list entry starts edit*/ Evas_Object *list; /* Selecting a list entry starts edit*/
Evas_Object *table; Evas_Object *table;
Evas_Object *entry; /* Generic Entry */ Evas_Object *entry; /* Generic Entry */
Evas_Object *up; /* Move selected list entry up */ Evas_Object *up; /* Move selected list entry up */
Evas_Object *down; /* Move selected list entry down */ Evas_Object *down; /* Move selected list entry down */
Evas_Object *add; /* create and select a new list entry */ Evas_Object *add; /* create and select a new list entry */
Evas_Object *remove; /* remove the selected entry */ Evas_Object *remove; /* remove the selected entry */
} } gui;
gui;
}; };
/* Externally accessible functions */ /* Externally accessible functions */
@ -57,34 +54,33 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
o = e_widget_button_add(evas, _("Add"), NULL, _button_cb_add, wd, obj); o = e_widget_button_add(evas, _("Add"), NULL, _button_cb_add, wd, obj);
wd->gui.add = o; wd->gui.add = o;
e_widget_disabled_set(o, 1); e_widget_disabled_set(o, 1);
e_widget_table_object_append(wd->gui.table, o, 0, 1, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(wd->gui.table, o, 0, 1, 1, 1, 1, 0, 1, 0);
o = e_widget_button_add(evas, _("Remove"), NULL, _button_cb_remove, wd, obj); o = e_widget_button_add(evas, _("Remove"), NULL, _button_cb_remove, wd, obj);
wd->gui.remove = o; wd->gui.remove = o;
e_widget_disabled_set(o, 1); e_widget_disabled_set(o, 1);
e_widget_table_object_append(wd->gui.table, o, 1, 1, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(wd->gui.table, o, 1, 1, 1, 1, 1, 0, 1, 0);
o = e_widget_label_add(evas, label); o = e_widget_label_add(evas, label);
e_widget_table_object_append(wd->gui.table, o, 0, 2, 2, 1, 1, 1, 1, 1); e_widget_table_object_append(wd->gui.table, o, 0, 2, 2, 1, 1, 0, 1, 0);
o = func_entry_add(evas, &(wd->cur_entry), NULL, NULL, NULL); o = func_entry_add(evas, &(wd->cur_entry), NULL, NULL, NULL);
wd->gui.entry = o; wd->gui.entry = o;
e_widget_disabled_set(o, 1); e_widget_disabled_set(o, 1);
e_widget_min_size_set(o, 100, 25); e_widget_min_size_set(o, 100, 25);
e_widget_table_object_append(wd->gui.table, o, 0, 3, 2, 1, 1, 1, 1, 1); e_widget_table_object_append(wd->gui.table, o, 0, 3, 2, 1, 1, 0, 1, 0);
o = e_widget_button_add(evas, _("Up"), "widget/up_arrow", o = e_widget_button_add(evas, _("Up"), "widget/up_arrow",
_button_cb_up, wd, NULL); _button_cb_up, wd, NULL);
wd->gui.up = o; wd->gui.up = o;
e_widget_disabled_set(o, 1); e_widget_disabled_set(o, 1);
e_widget_table_object_append(wd->gui.table, o, 0, 4, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(wd->gui.table, o, 0, 4, 1, 1, 1, 0, 1, 0);
o = e_widget_button_add(evas, _("Down"), "widget/down_arrow", o = e_widget_button_add(evas, _("Down"), "widget/down_arrow",
_button_cb_down, wd, NULL); _button_cb_down, wd, NULL);
wd->gui.down = o; wd->gui.down = o;
e_widget_disabled_set(o, 1); e_widget_disabled_set(o, 1);
e_widget_table_object_append(wd->gui.table, o, 1, 4, 1, 1, 1, 1, 1, 1); e_widget_table_object_append(wd->gui.table, o, 1, 4, 1, 1, 1, 0, 1, 0);
o = e_widget_ilist_add(evas, 0, 0, NULL); o = e_widget_ilist_add(evas, 0, 0, NULL);
wd->gui.list = o; wd->gui.list = o;
@ -157,11 +153,10 @@ e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
static void static void
_list_cb_change(void *data, Evas_Object *obj) _list_cb_change(void *data, Evas_Object *obj)
{ {
int indx;
E_Widget_Data *wd; E_Widget_Data *wd;
int indx;
wd = data; if (!(wd = data)) return;
if (!wd) return;
indx = e_widget_ilist_selected_get(wd->gui.list); indx = e_widget_ilist_selected_get(wd->gui.list);
_list_select_num(wd, indx); _list_select_num(wd, indx);
@ -174,10 +169,8 @@ _button_cb_add(void *data, void *obj)
Evas_Object *o; Evas_Object *o;
o = obj; o = obj;
wd = data;
if (!o) return; if (!o) return;
if (!wd) return; if (!(wd = data)) return;
if ((wd->cur_entry) && (wd->cur_entry[0])) if ((wd->cur_entry) && (wd->cur_entry[0]))
{ {
int i; int i;
@ -202,12 +195,11 @@ _button_cb_add(void *data, void *obj)
static void static void
_button_cb_remove(void *data, void *obj) _button_cb_remove(void *data, void *obj)
{ {
E_Widget_Data *wd;
int indx; int indx;
int count; int count;
E_Widget_Data *wd;
wd = data; if (!(wd = data)) return;
if (!wd) return;
indx = e_widget_ilist_selected_get(wd->gui.list); indx = e_widget_ilist_selected_get(wd->gui.list);
count = e_widget_ilist_count(wd->gui.list); count = e_widget_ilist_count(wd->gui.list);
@ -216,8 +208,7 @@ _button_cb_remove(void *data, void *obj)
e_widget_ilist_go(wd->gui.list); e_widget_ilist_go(wd->gui.list);
e_widget_ilist_selected_set(wd->gui.list, indx); e_widget_ilist_selected_set(wd->gui.list, indx);
if (count == 1) if (count == 1) _list_select_num(wd, -1);
_list_select_num(wd, -1);
} }
static void static void
@ -228,8 +219,7 @@ _button_cb_up(void *data, void *obj)
const char *label_sel; const char *label_sel;
const char *label_rep; const char *label_rep;
wd = data; if (!(wd = data)) return;
if (!wd) return;
idx_sel = e_widget_ilist_selected_get(wd->gui.list); idx_sel = e_widget_ilist_selected_get(wd->gui.list);
@ -250,8 +240,7 @@ _button_cb_down(void *data, void *obj)
const char *label_sel; const char *label_sel;
const char *label_rep; const char *label_rep;
wd = data; if (!(wd = data)) return;
if (!wd) return;
idx_sel = e_widget_ilist_selected_get(wd->gui.list); idx_sel = e_widget_ilist_selected_get(wd->gui.list);
@ -274,12 +263,12 @@ _list_select_num(E_Widget_Data *wd, int indx)
count = e_widget_ilist_count(wd->gui.list); count = e_widget_ilist_count(wd->gui.list);
if (count == 0 || indx < 0) if ((count == 0) || (indx < 0))
e_widget_disabled_set(wd->gui.remove, 1); e_widget_disabled_set(wd->gui.remove, 1);
else else
e_widget_disabled_set(wd->gui.remove, 0); e_widget_disabled_set(wd->gui.remove, 0);
if (count == 1 || indx < 0) if ((count == 1) || (indx < 0))
{ {
e_widget_disabled_set(wd->gui.up, 1); e_widget_disabled_set(wd->gui.up, 1);
e_widget_disabled_set(wd->gui.down, 1); e_widget_disabled_set(wd->gui.down, 1);
@ -289,7 +278,7 @@ _list_select_num(E_Widget_Data *wd, int indx)
e_widget_disabled_set(wd->gui.up, 1); e_widget_disabled_set(wd->gui.up, 1);
e_widget_disabled_set(wd->gui.down, 0); e_widget_disabled_set(wd->gui.down, 0);
} }
else if (indx + 1 == count) else if ((indx + 1) == count)
{ {
e_widget_disabled_set(wd->gui.up, 0); e_widget_disabled_set(wd->gui.up, 0);
e_widget_disabled_set(wd->gui.down, 1); e_widget_disabled_set(wd->gui.down, 1);
@ -309,7 +298,7 @@ _e_wid_del_hook(Evas_Object *obj)
wd = e_widget_data_get(obj); wd = e_widget_data_get(obj);
E_FREE(wd->cur_entry); E_FREE(wd->cur_entry);
free(wd); E_FREE(wd);
} }
static void static void