Enlightenment CVS committal
Author : shorne
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_int_config_fonts.c e_widget_label.c
e_widget_label.h
Added Files:
e_widget_config_list.c e_widget_config_list.h
Log Message:
Add and Use the config list widget
* Config list widget is used to have an editable ilist
* Config list widget will be reused in the paths configuration dialog
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- Makefile.am 1 Apr 2006 09:24:56 -0000 1.115
+++ Makefile.am 6 Apr 2006 12:07:45 -0000 1.116
@@ -119,6 +119,7 @@
e_int_border_border.h \
e_widget_ilist.h \
e_widget_tlist.h \
+e_widget_config_list.h \
e_slider.h \
e_widget_slider.h \
e_int_config_window_manipulation.h \
@@ -249,6 +250,7 @@
e_int_border_border.c \
e_widget_ilist.c \
e_widget_tlist.c \
+e_widget_config_list.c \
e_slider.c \
e_widget_slider.c \
e_int_config_window_manipulation.c \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- e_includes.h 1 Apr 2006 09:24:56 -0000 1.96
+++ e_includes.h 6 Apr 2006 12:07:45 -0000 1.97
@@ -97,6 +97,7 @@
#include "e_livethumb.h"
#include "e_int_border_border.h"
#include "e_widget_ilist.h"
+#include "e_widget_config_list.h"
#include "e_slider.h"
#include "e_widget_slider.h"
#include "e_int_config_window_manipulation.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_fonts.c 4 Apr 2006 14:00:19 -0000 1.3
+++ e_int_config_fonts.c 6 Apr 2006 12:07:45 -0000 1.4
@@ -14,13 +14,7 @@
static void _ilist_font_cb_change(void *data, Evas_Object *obj);
static void _enabled_font_cb_change(void *data, Evas_Object *obj);
-static void _ilist_fallback_cb_change(void *data, Evas_Object *obj);
static void _enabled_fallback_cb_change(void *data, Evas_Object *obj);
-static void _button_fallback_cb_add(void *data, void *obj);
-static void _button_fallback_cb_remove(void *data, void *obj);
-static void _button_fallback_cb_up(void *data, void *obj);
-static void _button_fallback_cb_down(void *data, void *obj);
-static void _list_select_num(E_Config_Dialog_Data *cfdata, int indx);
struct _E_Text_Class_Pair
{
@@ -80,7 +74,6 @@
int cur_index;
/* Font Fallbacks */
- char *cur_fallback;
int cur_fallbacks_enabled;
/* Font Hinting */
@@ -97,12 +90,6 @@
/* Font Fallbacks */
Evas_Object *fallback_list; /* Selecting a list entry starts edit*/
-
- Evas_Object *fallback; /* Text Entry */
- Evas_Object *fallback_up; /* Move selected list entry up */
- Evas_Object *fallback_down; /* Move selected list entry down */
- Evas_Object *fallback_add; /* create and select a new list entry */
- Evas_Object *fallback_remove; /* remove the selected entry */
}
gui;
};
@@ -249,10 +236,10 @@
if (cfdata->cur_fallbacks_enabled)
{
- for (i = 0; i < e_widget_ilist_count(cfdata->gui.fallback_list); i++)
+ for (i = 0; i < e_widget_config_list_count(cfdata->gui.fallback_list);
i++)
{
const char *fallback;
- fallback = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list,
i);
+ fallback = e_widget_config_list_nth_get(cfdata->gui.fallback_list,
i);
if (fallback != NULL && strlen(fallback) > 0)
e_font_fallback_append(fallback);
}
@@ -369,88 +356,35 @@
e_widget_list_object_append(o, of, 1, 1, 0.5);
/* Create Fallbacks Widgets */
- option_enable = (e_font_fallback_list() != NULL);
- of = e_widget_frametable_add(evas, _("Font Fallbacks"), 1);
+ of = e_widget_framelist_add(evas, _("Font Fallbacks"), 0);
+ e_widget_framelist_content_align_set(of, 0.5, 0.5);
- ob = e_widget_button_add(evas, _("Move Up"), "widget/up_arrow",
_button_fallback_cb_up, cfdata, NULL);
- cfdata->gui.fallback_up = ob;
- e_widget_disabled_set(ob, 1);
- e_widget_frametable_object_append( of,
- ob,
- 1, 0, 1, 1,
- 1, 1, 1, 1);
-
-
- ob = e_widget_button_add(evas, _("Move Down"), "widget/down_arrow",
_button_fallback_cb_down, cfdata, NULL);
- cfdata->gui.fallback_down = ob;
- e_widget_disabled_set(ob, 1);
- e_widget_frametable_object_append( of,
- ob,
- 1, 3, 1, 1,
- 1, 1, 1, 1);
-
+ ob = e_widget_config_list_add(evas, e_widget_entry_add, _("Fallback Name"));
+ cfdata->gui.fallback_list = ob;
+ e_widget_framelist_object_append(of, ob);
- cfdata->gui.fallback_list = e_widget_ilist_add(evas, 16, 16, NULL);
- e_widget_disabled_set(cfdata->gui.fallback_list, !option_enable);
- e_widget_min_size_set(cfdata->gui.fallback_list, 100, 100);
- e_widget_on_change_hook_set(cfdata->gui.fallback_list,
_ilist_fallback_cb_change, cfdata);
/* Fill In Ilist */
+ option_enable = 0;
for (i = 0; i < evas_list_count(e_font_fallback_list()); i++)
{
E_Font_Fallback *eff;
eff = evas_list_nth(e_font_fallback_list(), i);
- e_widget_ilist_append(cfdata->gui.fallback_list, NULL, eff->name, NULL,
NULL, NULL);
+ e_widget_config_list_append(ob, eff->name);
+ option_enable = 1;
}
- e_widget_ilist_go(cfdata->gui.fallback_list);
- e_widget_frametable_object_append( of,
- cfdata->gui.fallback_list,
- 2, /* Col Start*/
- 0, /* Row Start */
- 1, /* Col Span*/
- 4, /* Row Span*/
- 1, 1, 1, 1);
-
- ob = e_widget_label_add(evas, _("Fallback Name"));
- e_widget_frametable_object_append( of,
- ob,
- 0, 0, 1, 1,
- 1, 1, 1, 1);
-
- cfdata->gui.fallback = e_widget_entry_add(evas, &(cfdata->cur_fallback));
- e_widget_disabled_set(cfdata->gui.fallback, !option_enable);
- e_widget_min_size_set(cfdata->gui.fallback, 100, 25);
- e_widget_frametable_object_append(of, cfdata->gui.fallback,
- 0, 1, 1, 1,
- 1, 1, 1, 1);
-
- cfdata->gui.fallback_add = e_widget_button_add(evas, _("Add"), NULL,
_button_fallback_cb_add, cfdata, NULL);
- e_widget_disabled_set(cfdata->gui.fallback_add, !option_enable);
- e_widget_frametable_object_append( of,
- cfdata->gui.fallback_add,
- 1, 1, 1, 1,
- 1, 1, 1, 1);
- cfdata->gui.fallback_remove = e_widget_button_add(evas, _("Remove"), NULL,
_button_fallback_cb_remove, cfdata, NULL);
- e_widget_disabled_set(cfdata->gui.fallback_remove, !option_enable);
- e_widget_frametable_object_append( of,
- cfdata->gui.fallback_remove ,
- 1, 2, 1, 1,
- 1, 1, 1, 1);
-
ob = e_widget_check_add(evas, _("Enable Fallbacks"),
&(cfdata->cur_fallbacks_enabled));
- e_widget_frametable_object_append(of, ob,
+ e_widget_config_list_object_append( cfdata->gui.fallback_list,
+ ob,
0, 3, 1, 1,
1, 1, 1, 1);
+ e_widget_on_change_hook_set(ob, _enabled_fallback_cb_change, cfdata);
e_widget_check_checked_set(ob, option_enable);
- e_widget_on_change_hook_set(ob, _enabled_fallback_cb_change, cfdata);
-
- if (e_widget_ilist_count(cfdata->gui.fallback_list) > 0)
- {
- e_widget_ilist_selected_set(cfdata->gui.fallback_list, 0);
- }
+ e_widget_change(ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
+
return o;
}
@@ -511,171 +445,13 @@
}
/* Private Font Fallback Functions */
-static void _ilist_fallback_cb_change(void *data, Evas_Object *obj)
-{
- int indx;
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data;
- if (!cfdata) return;
-
- indx = e_widget_ilist_selected_get(cfdata->gui.fallback_list);
- _list_select_num(cfdata, indx);
-}
static void _enabled_fallback_cb_change(void *data, Evas_Object *obj)
{
E_Config_Dialog_Data *cfdata;
cfdata = data;
if (!cfdata) return;
-
- if (cfdata->cur_fallbacks_enabled)
- {
- e_widget_disabled_set(cfdata->gui.fallback_list, 0);
- e_widget_disabled_set(cfdata->gui.fallback_add, 0);
- e_widget_disabled_set(cfdata->gui.fallback, 0);
- }
- else
- {
- _list_select_num(cfdata, -1);
- e_widget_disabled_set(cfdata->gui.fallback_list, 1);
- e_widget_disabled_set(cfdata->gui.fallback, 1);
- e_widget_disabled_set(cfdata->gui.fallback_add, 1);
- }
-}
-static void _button_fallback_cb_add(void *data, void *obj)
-{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data;
- if (!cfdata) return;
-
- if (cfdata->cur_fallback && strlen(cfdata->cur_fallback) > 0)
- {
- int count;
- int i;
-
- /* If it already esists just select the existing one */
- for (i = 0; i < e_widget_ilist_count(cfdata->gui.fallback_list); i++)
- {
- const char *fallback;
- fallback = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list,
i);
- if ( fallback != NULL &&
- strlen(fallback) > 0 &&
- !strcmp(fallback, cfdata->cur_fallback) )
- {
- e_widget_ilist_selected_set(cfdata->gui.fallback_list, i);
- return;
- }
- }
-
- e_widget_ilist_append(cfdata->gui.fallback_list, NULL,
cfdata->cur_fallback, NULL, NULL, NULL);
- e_widget_ilist_go(cfdata->gui.fallback_list);
- count = e_widget_ilist_count(cfdata->gui.fallback_list);
- e_widget_ilist_selected_set(cfdata->gui.fallback_list, count - 1);
-
- e_widget_entry_text_set(cfdata->gui.fallback, "");
- }
-}
-
-static void _button_fallback_cb_remove(void *data, void *obj)
-{
- int indx;
- int count;
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data;
- if (!cfdata) return;
-
- indx = e_widget_ilist_selected_get(cfdata->gui.fallback_list);
- count = e_widget_ilist_count(cfdata->gui.fallback_list);
-
- e_widget_ilist_remove_num(cfdata->gui.fallback_list, indx);
-
- e_widget_ilist_go(cfdata->gui.fallback_list);
- e_widget_ilist_selected_set(cfdata->gui.fallback_list, indx);
- if (count == 1)
- {
- _list_select_num(cfdata, -1);
- }
-}
-static void _button_fallback_cb_up(void *data, void *obj)
-{
- E_Config_Dialog_Data *cfdata;
- int idx_sel;
- const char *label_sel;
- const char *label_rep;
-
- cfdata = data;
- if (!cfdata) return;
-
- idx_sel = e_widget_ilist_selected_get(cfdata->gui.fallback_list);
-
- label_sel = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list,
idx_sel);
- label_rep = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel
- 1);
-
- e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel - 1,
label_sel);
- e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel, label_rep);
-
- e_widget_ilist_selected_set(cfdata->gui.fallback_list, idx_sel - 1);
-}
-static void _button_fallback_cb_down(void *data, void *obj)
-{
- E_Config_Dialog_Data *cfdata;
- int idx_sel;
- const char *label_sel;
- const char *label_rep;
-
- cfdata = data;
- if (!cfdata) return;
-
- idx_sel = e_widget_ilist_selected_get(cfdata->gui.fallback_list);
-
- label_sel = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list,
idx_sel);
- label_rep = e_widget_ilist_nth_label_get(cfdata->gui.fallback_list, idx_sel
+ 1);
-
- e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel + 1,
label_sel);
- e_widget_ilist_nth_label_set(cfdata->gui.fallback_list, idx_sel, label_rep);
-
- e_widget_ilist_selected_set(cfdata->gui.fallback_list, idx_sel + 1);
+
+ e_widget_disabled_set(cfdata->gui.fallback_list,
!cfdata->cur_fallbacks_enabled);
}
-static void _list_select_num(E_Config_Dialog_Data *cfdata, int indx)
-{
- int count;
-
- /* Disable selecting the list while we are disabled */
- if (indx >= 0 && !cfdata->cur_fallbacks_enabled) return;
-
- count = e_widget_ilist_count(cfdata->gui.fallback_list);
-
- if (count == 0 || indx < 0)
- {
- e_widget_disabled_set(cfdata->gui.fallback_remove, 1);
- }
- else
- {
- e_widget_disabled_set(cfdata->gui.fallback_remove, 0);
- }
-
- if (count == 1 || indx < 0)
- {
- e_widget_disabled_set(cfdata->gui.fallback_up, 1);
- e_widget_disabled_set(cfdata->gui.fallback_down, 1);
- }
- else if (indx == 0)
- {
- e_widget_disabled_set(cfdata->gui.fallback_up, 1);
- e_widget_disabled_set(cfdata->gui.fallback_down, 0);
- }
- else if (indx + 1 == count)
- {
- e_widget_disabled_set(cfdata->gui.fallback_up, 0);
- e_widget_disabled_set(cfdata->gui.fallback_down, 1);
- }
- else
- {
- e_widget_disabled_set(cfdata->gui.fallback_up, 0);
- e_widget_disabled_set(cfdata->gui.fallback_down, 0);
- }
-}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_label.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_widget_label.c 7 Jan 2006 10:39:45 -0000 1.3
+++ e_widget_label.c 6 Apr 2006 12:07:45 -0000 1.4
@@ -7,7 +7,7 @@
/* externally accessible functions */
EAPI Evas_Object *
-e_widget_label_add(Evas *evas, char *label)
+e_widget_label_add(Evas *evas, const char *label)
{
Evas_Object *obj, *o;
Evas_Coord mw, mh;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_label.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_label.h 12 Oct 2005 23:00:45 -0000 1.2
+++ e_widget_label.h 6 Apr 2006 12:07:45 -0000 1.3
@@ -6,7 +6,7 @@
#ifndef E_WIDGET_LABEL_H
#define E_WIDGET_LABEL_H
-EAPI Evas_Object *e_widget_label_add(Evas *evas, char *label);
+EAPI Evas_Object *e_widget_label_add(Evas *evas, const char *label);
#endif
#endif
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
