formatting

SVN revision: 72860
This commit is contained in:
Mike Blumenkrantz 2012-06-26 08:58:14 +00:00
parent fc4433e82f
commit 217255af09
1 changed files with 85 additions and 72 deletions

View File

@ -1,54 +1,54 @@
#include "e.h" #include "e.h"
static void *_create_data(E_Config_Dialog *cfd); static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static void _ilist_fill(E_Config_Dialog_Data *cfdata); static void _ilist_fill(E_Config_Dialog_Data *cfdata);
static void _ilist_cb_selected(void *data); static void _ilist_cb_selected(void *data);
static void _cb_add(void *data, void *data2); static void _cb_add(void *data, void *data2);
static void _cb_delete(void *data, void *data2); static void _cb_delete(void *data, void *data2);
static void _cb_dialog_yes(void *data); static void _cb_dialog_yes(void *data);
static void _cb_dialog_destroy(void *data); static void _cb_dialog_destroy(void *data);
static void _cb_config(void *data, void *data2); static void _cb_config(void *data, void *data2);
static void _cb_contents(void *data, void *data2); static void _cb_contents(void *data, void *data2);
struct _E_Config_Dialog_Data struct _E_Config_Dialog_Data
{ {
Evas_Object *o_list; Evas_Object *o_list;
Evas_Object *o_delete; Evas_Object *o_delete;
Evas_Object *o_config; Evas_Object *o_config;
const char *cur_shelf; const char *cur_shelf;
}; };
typedef struct _Shelf_Del_Confirm_Data Shelf_Del_Confirm_Data; typedef struct _Shelf_Del_Confirm_Data Shelf_Del_Confirm_Data;
struct _Shelf_Del_Confirm_Data struct _Shelf_Del_Confirm_Data
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Shelf *es; E_Shelf *es;
}; };
E_Config_Dialog * E_Config_Dialog *
e_int_config_shelf(E_Container *con, const char *params __UNUSED__) e_int_config_shelf(E_Container *con, const char *params __UNUSED__)
{ {
E_Config_Dialog *cfd; E_Config_Dialog *cfd;
E_Config_Dialog_View *v; E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "extensions/shelves")) return NULL; if (e_config_dialog_find("E", "extensions/shelves")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1); v = E_NEW(E_Config_Dialog_View, 1);
if (!v) return NULL; if (!v) return NULL;
v->create_cfdata = _create_data; v->create_cfdata = _create_data;
v->free_cfdata = _free_data; v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create; v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, _("Shelf Settings"), "E", cfd = e_config_dialog_new(con, _("Shelf Settings"), "E",
"extensions/shelves", "extensions/shelves",
"preferences-desktop-shelf", 0, v, NULL); "preferences-desktop-shelf", 0, v, NULL);
return cfd; return cfd;
} }
static void * static void *
_create_data(E_Config_Dialog *cfd __UNUSED__) _create_data(E_Config_Dialog *cfd __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
@ -57,13 +57,13 @@ _create_data(E_Config_Dialog *cfd __UNUSED__)
} }
static void static void
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{ {
E_FREE(cfdata); E_FREE(cfdata);
} }
static Evas_Object * static Evas_Object *
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{ {
Evas_Object *ol, *ow, *ot, *of; Evas_Object *ol, *ow, *ot, *of;
char buf[64]; char buf[64];
@ -80,16 +80,16 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
ot = e_widget_table_add(evas, 0); ot = e_widget_table_add(evas, 0);
ow = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL); ow = e_widget_button_add(evas, _("Add"), "list-add", _cb_add, cfdata, NULL);
e_widget_table_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 0, 0); e_widget_table_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 0, 0);
cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "list-remove", cfdata->o_delete = e_widget_button_add(evas, _("Delete"), "list-remove",
_cb_delete, cfdata, NULL); _cb_delete, cfdata, NULL);
e_widget_table_object_append(ot, cfdata->o_delete, 1, 0, 1, 1, 1, 1, 0, 0); e_widget_table_object_append(ot, cfdata->o_delete, 1, 0, 1, 1, 1, 1, 0, 0);
cfdata->o_config = e_widget_button_add(evas, _("Contents"), "preferences-desktop-shelf", cfdata->o_config = e_widget_button_add(evas, _("Contents"), "preferences-desktop-shelf",
_cb_contents, cfdata, NULL); _cb_contents, cfdata, NULL);
e_widget_table_object_align_append(ot, cfdata->o_config, e_widget_table_object_align_append(ot, cfdata->o_config,
2, 0, 1, 1, 0, 1, 1, 1, 1.0, 0.5); 2, 0, 1, 1, 0, 1, 1, 1, 1.0, 0.5);
cfdata->o_config = e_widget_button_add(evas, _("Setup"), "configure", cfdata->o_config = e_widget_button_add(evas, _("Setup"), "configure",
_cb_config, cfdata, NULL); _cb_config, cfdata, NULL);
e_widget_table_object_align_append(ot, cfdata->o_config, e_widget_table_object_align_append(ot, cfdata->o_config,
3, 0, 1, 1, 0, 1, 1, 1, 1.0, 0.5); 3, 0, 1, 1, 0, 1, 1, 1, 1.0, 0.5);
e_widget_list_object_append(ol, ot, 1, 0, 0.0); e_widget_list_object_append(ol, ot, 1, 0, 0.0);
@ -104,8 +104,8 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
} }
/* private functions */ /* private functions */
static void static void
_ilist_fill(E_Config_Dialog_Data *cfdata) _ilist_fill(E_Config_Dialog_Data *cfdata)
{ {
Evas *evas; Evas *evas;
Eina_List *l; Eina_List *l;
@ -117,7 +117,7 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
evas = evas_object_evas_get(cfdata->o_list); evas = evas_object_evas_get(cfdata->o_list);
if (e_widget_ilist_count(cfdata->o_list) > 0) if (e_widget_ilist_count(cfdata->o_list) > 0)
n = e_widget_ilist_selected_get(cfdata->o_list); n = e_widget_ilist_selected_get(cfdata->o_list);
evas_event_freeze(evas); evas_event_freeze(evas);
@ -126,60 +126,72 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
e_widget_ilist_clear(cfdata->o_list); e_widget_ilist_clear(cfdata->o_list);
e_widget_ilist_go(cfdata->o_list); e_widget_ilist_go(cfdata->o_list);
for (l = e_shelf_list(); l; l = l->next) for (l = e_shelf_list(); l; l = l->next)
{ {
E_Shelf *es; E_Shelf *es;
Evas_Object *ob; Evas_Object *ob;
if (!(es = l->data)) continue; if (!(es = l->data)) continue;
snprintf(buf, sizeof(buf), "Shelf %s", e_shelf_orient_string_get(es)); snprintf(buf, sizeof(buf), "Shelf %s", e_shelf_orient_string_get(es));
ob = e_icon_add(evas); ob = e_icon_add(evas);
switch (es->cfg->orient) switch (es->cfg->orient)
{ {
case E_GADCON_ORIENT_LEFT: case E_GADCON_ORIENT_LEFT:
e_util_icon_theme_set(ob, "preferences-position-left"); e_util_icon_theme_set(ob, "preferences-position-left");
break; break;
case E_GADCON_ORIENT_RIGHT: case E_GADCON_ORIENT_RIGHT:
e_util_icon_theme_set(ob, "preferences-position-right"); e_util_icon_theme_set(ob, "preferences-position-right");
break; break;
case E_GADCON_ORIENT_TOP: case E_GADCON_ORIENT_TOP:
e_util_icon_theme_set(ob, "preferences-position-top"); e_util_icon_theme_set(ob, "preferences-position-top");
break; break;
case E_GADCON_ORIENT_BOTTOM: case E_GADCON_ORIENT_BOTTOM:
e_util_icon_theme_set(ob, "preferences-position-bottom"); e_util_icon_theme_set(ob, "preferences-position-bottom");
break; break;
case E_GADCON_ORIENT_CORNER_TL: case E_GADCON_ORIENT_CORNER_TL:
e_util_icon_theme_set(ob, "preferences-position-top-left"); e_util_icon_theme_set(ob, "preferences-position-top-left");
break; break;
case E_GADCON_ORIENT_CORNER_TR: case E_GADCON_ORIENT_CORNER_TR:
e_util_icon_theme_set(ob, "preferences-position-top-right"); e_util_icon_theme_set(ob, "preferences-position-top-right");
break; break;
case E_GADCON_ORIENT_CORNER_BL: case E_GADCON_ORIENT_CORNER_BL:
e_util_icon_theme_set(ob, "preferences-position-bottom-left"); e_util_icon_theme_set(ob, "preferences-position-bottom-left");
break; break;
case E_GADCON_ORIENT_CORNER_BR: case E_GADCON_ORIENT_CORNER_BR:
e_util_icon_theme_set(ob, "preferences-position-bottom-right"); e_util_icon_theme_set(ob, "preferences-position-bottom-right");
break; break;
case E_GADCON_ORIENT_CORNER_LT: case E_GADCON_ORIENT_CORNER_LT:
e_util_icon_theme_set(ob, "preferences-position-left-top"); e_util_icon_theme_set(ob, "preferences-position-left-top");
break; break;
case E_GADCON_ORIENT_CORNER_RT: case E_GADCON_ORIENT_CORNER_RT:
e_util_icon_theme_set(ob, "preferences-position-right-top"); e_util_icon_theme_set(ob, "preferences-position-right-top");
break; break;
case E_GADCON_ORIENT_CORNER_LB: case E_GADCON_ORIENT_CORNER_LB:
e_util_icon_theme_set(ob, "preferences-position-left-bottom"); e_util_icon_theme_set(ob, "preferences-position-left-bottom");
break; break;
case E_GADCON_ORIENT_CORNER_RB: case E_GADCON_ORIENT_CORNER_RB:
e_util_icon_theme_set(ob, "preferences-position-right-bottom"); e_util_icon_theme_set(ob, "preferences-position-right-bottom");
break; break;
default: default:
e_util_icon_theme_set(ob, "enlightenment"); e_util_icon_theme_set(ob, "enlightenment");
break; break;
} }
e_widget_ilist_append(cfdata->o_list, ob, buf, e_widget_ilist_append(cfdata->o_list, ob, buf,
_ilist_cb_selected, cfdata, buf); _ilist_cb_selected, cfdata, buf);
} }
e_widget_size_min_set(cfdata->o_list, 155, 250); e_widget_size_min_set(cfdata->o_list, 155, 250);
@ -188,21 +200,21 @@ _ilist_fill(E_Config_Dialog_Data *cfdata)
edje_thaw(); edje_thaw();
evas_event_thaw(evas); evas_event_thaw(evas);
if (n > -1) if (n > -1)
{ {
e_widget_disabled_set(cfdata->o_delete, 0); e_widget_disabled_set(cfdata->o_delete, 0);
e_widget_disabled_set(cfdata->o_config, 0); e_widget_disabled_set(cfdata->o_config, 0);
e_widget_ilist_selected_set(cfdata->o_list, n); e_widget_ilist_selected_set(cfdata->o_list, n);
} }
else else
{ {
e_widget_disabled_set(cfdata->o_delete, 1); e_widget_disabled_set(cfdata->o_delete, 1);
e_widget_disabled_set(cfdata->o_config, 1); e_widget_disabled_set(cfdata->o_config, 1);
} }
} }
static void static void
_ilist_cb_selected(void *data) _ilist_cb_selected(void *data)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
@ -211,8 +223,8 @@ _ilist_cb_selected(void *data)
e_widget_disabled_set(cfdata->o_config, 0); e_widget_disabled_set(cfdata->o_config, 0);
} }
static void static void
_cb_add(void *data, void *data2 __UNUSED__) _cb_add(void *data, void *data2 __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Config_Shelf *cfg; E_Config_Shelf *cfg;
@ -245,8 +257,8 @@ _cb_add(void *data, void *data2 __UNUSED__)
_ilist_fill(cfdata); _ilist_fill(cfdata);
} }
static void static void
_cb_delete(void *data, void *data2 __UNUSED__) _cb_delete(void *data, void *data2 __UNUSED__)
{ {
Shelf_Del_Confirm_Data *d; Shelf_Del_Confirm_Data *d;
char buf[PATH_MAX]; char buf[PATH_MAX];
@ -254,19 +266,19 @@ _cb_delete(void *data, void *data2 __UNUSED__)
d = E_NEW(Shelf_Del_Confirm_Data, 1); d = E_NEW(Shelf_Del_Confirm_Data, 1);
if (!d) return; if (!d) return;
d->cfdata = data; d->cfdata = data;
if (!d->cfdata) if (!d->cfdata)
{ {
E_FREE(d); E_FREE(d);
return; return;
} }
if (!d->cfdata->cur_shelf) if (!d->cfdata->cur_shelf)
{ {
E_FREE(d); E_FREE(d);
return; return;
} }
d->es = eina_list_nth(e_shelf_list(), d->es = eina_list_nth(e_shelf_list(),
e_widget_ilist_selected_get(d->cfdata->o_list)); e_widget_ilist_selected_get(d->cfdata->o_list));
if (!d->es) if (!d->es)
{ {
E_FREE(d); E_FREE(d);
return; return;
@ -287,16 +299,16 @@ _cb_delete(void *data, void *data2 __UNUSED__)
} }
snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br><br>" snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br><br>"
"Are you sure you want to delete this shelf?"), "Are you sure you want to delete this shelf?"),
d->cfdata->cur_shelf); d->cfdata->cur_shelf);
e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"), e_confirm_dialog_show(_("Are you sure you want to delete this shelf?"),
"application-exit", buf, _("Delete"), _("Keep"), "application-exit", buf, _("Delete"), _("Keep"),
_cb_dialog_yes, NULL, d, NULL, _cb_dialog_destroy, d); _cb_dialog_yes, NULL, d, NULL, _cb_dialog_destroy, d);
} }
static void static void
_cb_dialog_yes(void *data) _cb_dialog_yes(void *data)
{ {
Shelf_Del_Confirm_Data *d; Shelf_Del_Confirm_Data *d;
@ -318,28 +330,29 @@ _cb_dialog_destroy(void *data)
E_FREE(d); E_FREE(d);
} }
static void static void
_cb_config(void *data, void *data2 __UNUSED__) _cb_config(void *data, void *data2 __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Shelf *es; E_Shelf *es;
if (!(cfdata = data)) return; if (!(cfdata = data)) return;
es = eina_list_nth(e_shelf_list(), es = eina_list_nth(e_shelf_list(),
e_widget_ilist_selected_get(cfdata->o_list)); e_widget_ilist_selected_get(cfdata->o_list));
if (!es) return; if (!es) return;
if (!es->config_dialog) e_int_shelf_config(es); if (!es->config_dialog) e_int_shelf_config(es);
} }
static void static void
_cb_contents(void *data, void *data2 __UNUSED__) _cb_contents(void *data, void *data2 __UNUSED__)
{ {
E_Config_Dialog_Data *cfdata; E_Config_Dialog_Data *cfdata;
E_Shelf *es; E_Shelf *es;
if (!(cfdata = data)) return; if (!(cfdata = data)) return;
es = eina_list_nth(e_shelf_list(), es = eina_list_nth(e_shelf_list(),
e_widget_ilist_selected_get(cfdata->o_list)); e_widget_ilist_selected_get(cfdata->o_list));
if (!es) return; if (!es) return;
if (!es->config_dialog) e_int_gadcon_config_shelf(es->gadcon); if (!es->config_dialog) e_int_gadcon_config_shelf(es->gadcon);
} }