formatting

SVN revision: 72857
This commit is contained in:
Mike Blumenkrantz 2012-06-26 08:40:08 +00:00
parent f8e53aca00
commit 09f0916a91
1 changed files with 170 additions and 168 deletions

View File

@ -1,17 +1,17 @@
#include "e.h"
/* local subsystem functions */
static void _e_config_dialog_free(E_Config_Dialog *cfd);
static void _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type);
static void _e_config_dialog_free(E_Config_Dialog *cfd);
static void _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type);
static Eina_Bool _e_config_dialog_cb_auto_apply_timer(void *data);
static void _e_config_dialog_cb_dialog_del(void *obj);
static void _e_config_dialog_cb_ok(void *data, E_Dialog *dia);
static void _e_config_dialog_cb_apply(void *data, E_Dialog *dia);
static void _e_config_dialog_cb_advanced(void *data, void *data2);
static void _e_config_dialog_cb_basic(void *data, void *data2);
static int _e_config_dialog_check_changed(E_Config_Dialog *cfd, unsigned char def);
static void _e_config_dialog_cb_changed(void *data, Evas_Object *obj);
static void _e_config_dialog_cb_close(void *data, E_Dialog *dia);
static void _e_config_dialog_cb_dialog_del(void *obj);
static void _e_config_dialog_cb_ok(void *data, E_Dialog *dia);
static void _e_config_dialog_cb_apply(void *data, E_Dialog *dia);
static void _e_config_dialog_cb_advanced(void *data, void *data2);
static void _e_config_dialog_cb_basic(void *data, void *data2);
static int _e_config_dialog_check_changed(E_Config_Dialog *cfd, unsigned char def);
static void _e_config_dialog_cb_changed(void *data, Evas_Object *obj);
static void _e_config_dialog_cb_close(void *data, E_Dialog *dia);
/* local subsystem globals */
static Eina_List *_e_config_dialog_list = NULL;
@ -32,8 +32,8 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
cfd->class = eina_stringshare_add(class);
if (icon)
{
cfd->icon = eina_stringshare_add(icon);
cfd->icon_size = icon_size;
cfd->icon = eina_stringshare_add(icon);
cfd->icon_size = icon_size;
}
cfd->data = data;
cfd->hide_buttons = 1;
@ -42,36 +42,37 @@ e_config_dialog_new(E_Container *con, const char *title, const char *name, const
if (cfd->view->override_auto_apply)
{
/* Dialog Requested To Not Auto-Apply */
if ((cfd->view->basic.apply_cfdata) ||
/* Dialog Requested To Not Auto-Apply */
if ((cfd->view->basic.apply_cfdata) ||
(cfd->view->advanced.apply_cfdata))
cfd->hide_buttons = 0;
cfd->hide_buttons = 0;
}
else
{
/* Ok To Override, Or Not Specified. Use Config Value */
if (e_config->cfgdlg_auto_apply)
cfd->hide_buttons = 1;
else
{
if ((cfd->view->basic.apply_cfdata) ||
/* Ok To Override, Or Not Specified. Use Config Value */
if (e_config->cfgdlg_auto_apply)
cfd->hide_buttons = 1;
else
{
if ((cfd->view->basic.apply_cfdata) ||
(cfd->view->advanced.apply_cfdata))
cfd->hide_buttons = 0;
}
cfd->hide_buttons = 0;
}
}
switch (e_config->cfgdlg_default_mode)
{
case E_CONFIG_DIALOG_CFDATA_TYPE_BASIC:
if (cfd->view->basic.create_widgets)
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
break;
if (cfd->view->basic.create_widgets)
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
break;
case E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED:
if (cfd->view->advanced.create_widgets)
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED);
else if (cfd->view->basic.create_widgets)
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
break;
if (cfd->view->advanced.create_widgets)
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED);
else if (cfd->view->basic.create_widgets)
_e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
break;
}
_e_config_dialog_list = eina_list_append(_e_config_dialog_list, cfd);
@ -86,30 +87,30 @@ e_config_dialog_find(const char *name, const char *class)
EINA_LIST_FOREACH(_e_config_dialog_list, l, cfd)
{
if ((!e_util_strcmp(name, cfd->name)) &&
(!e_util_strcmp(class, cfd->class)))
{
E_Zone *z;
if ((!e_util_strcmp(name, cfd->name)) &&
(!e_util_strcmp(class, cfd->class)))
{
E_Zone *z;
z = e_util_zone_current_get(e_manager_current_get());
e_border_uniconify(cfd->dia->win->border);
e_win_raise(cfd->dia->win);
if (z->container == cfd->dia->win->border->zone->container)
e_border_desk_set(cfd->dia->win->border, e_desk_current_get(z));
else
{
if (!cfd->dia->win->border->sticky)
e_desk_show(cfd->dia->win->border->desk);
ecore_x_pointer_warp(cfd->dia->win->border->zone->container->win,
cfd->dia->win->border->zone->x + (cfd->dia->win->border->zone->w / 2),
cfd->dia->win->border->zone->y + (cfd->dia->win->border->zone->h / 2));
}
e_border_unshade(cfd->dia->win->border, E_DIRECTION_DOWN);
if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
(e_config->focus_setting == E_FOCUS_NEW_WINDOW))
e_border_focus_set(cfd->dia->win->border, 1, 1);
return 1;
}
z = e_util_zone_current_get(e_manager_current_get());
e_border_uniconify(cfd->dia->win->border);
e_win_raise(cfd->dia->win);
if (z->container == cfd->dia->win->border->zone->container)
e_border_desk_set(cfd->dia->win->border, e_desk_current_get(z));
else
{
if (!cfd->dia->win->border->sticky)
e_desk_show(cfd->dia->win->border->desk);
ecore_x_pointer_warp(cfd->dia->win->border->zone->container->win,
cfd->dia->win->border->zone->x + (cfd->dia->win->border->zone->w / 2),
cfd->dia->win->border->zone->y + (cfd->dia->win->border->zone->h / 2));
}
e_border_unshade(cfd->dia->win->border, E_DIRECTION_DOWN);
if ((e_config->focus_setting == E_FOCUS_NEW_DIALOG) ||
(e_config->focus_setting == E_FOCUS_NEW_WINDOW))
e_border_focus_set(cfd->dia->win->border, 1, 1);
return 1;
}
}
return 0;
}
@ -122,12 +123,12 @@ e_config_dialog_get(const char *name, const char *class)
EINA_LIST_FOREACH(_e_config_dialog_list, l, cfd)
{
if (!cfd) continue;
if ((!e_util_strcmp(name, cfd->name)) &&
(!e_util_strcmp(class, cfd->class)))
{
return cfd;
}
if (!cfd) continue;
if ((!e_util_strcmp(name, cfd->name)) &&
(!e_util_strcmp(class, cfd->class)))
{
return cfd;
}
}
return NULL;
}
@ -144,14 +145,14 @@ _e_config_dialog_free(E_Config_Dialog *cfd)
if (cfd->icon) eina_stringshare_del(cfd->icon);
if (cfd->cfdata)
{
cfd->view->free_cfdata(cfd, cfd->cfdata);
cfd->cfdata = NULL;
cfd->view->free_cfdata(cfd, cfd->cfdata);
cfd->cfdata = NULL;
}
if (cfd->dia)
{
e_object_del_attach_func_set(E_OBJECT(cfd->dia), NULL);
e_object_del(E_OBJECT(cfd->dia));
cfd->dia = NULL;
e_object_del_attach_func_set(E_OBJECT(cfd->dia), NULL);
e_object_del(E_OBJECT(cfd->dia));
cfd->dia = NULL;
}
E_FREE(cfd->view);
E_FREE(cfd);
@ -176,13 +177,13 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
if (!pdia) /* creating window for the first time */
{
if ((cfd->view->normal_win) || (e_config->cfgdlg_normal_wins))
cfd->dia = e_dialog_normal_win_new(cfd->con, cfd->name, buf);
else
cfd->dia = e_dialog_new(cfd->con, cfd->name, buf);
e_object_del_attach_func_set(E_OBJECT(cfd->dia),
_e_config_dialog_cb_dialog_del);
} /* window was created before - deleting content only */
if ((cfd->view->normal_win) || (e_config->cfgdlg_normal_wins))
cfd->dia = e_dialog_normal_win_new(cfd->con, cfd->name, buf);
else
cfd->dia = e_dialog_new(cfd->con, cfd->name, buf);
e_object_del_attach_func_set(E_OBJECT(cfd->dia),
_e_config_dialog_cb_dialog_del);
} /* window was created before - deleting content only */
else if (cfd->dia->content_object)
evas_object_del(cfd->dia->content_object);
@ -194,61 +195,61 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
evas = e_win_evas_get(cfd->dia->win);
if (type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
{
if (cfd->view->advanced.create_widgets)
{
o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0);
ob = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata);
if (cfd->view->scroll)
{
e_widget_size_min_resize(ob);
sf = e_widget_scrollframe_simple_add(evas, ob);
e_widget_list_object_append(o, sf, 1, 1, 0.0);
}
else
e_widget_list_object_append(o, ob, 1, 1, 0.0);
ob = e_widget_button_add(evas,
_("Advanced"), "go-next",
_e_config_dialog_cb_advanced, cfd, NULL);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
}
else
{
o = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata);
if (cfd->view->scroll)
{
e_widget_size_min_resize(o);
o = e_widget_scrollframe_simple_add(evas, o);
}
}
if (cfd->view->advanced.create_widgets)
{
o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0);
ob = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata);
if (cfd->view->scroll)
{
e_widget_size_min_resize(ob);
sf = e_widget_scrollframe_simple_add(evas, ob);
e_widget_list_object_append(o, sf, 1, 1, 0.0);
}
else
e_widget_list_object_append(o, ob, 1, 1, 0.0);
ob = e_widget_button_add(evas,
_("Advanced"), "go-next",
_e_config_dialog_cb_advanced, cfd, NULL);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
}
else
{
o = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata);
if (cfd->view->scroll)
{
e_widget_size_min_resize(o);
o = e_widget_scrollframe_simple_add(evas, o);
}
}
}
else
{
if (cfd->view->basic.create_widgets)
{
o = e_widget_list_add(evas, 0, 0);
ob = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata);
if (cfd->view->scroll)
{
e_widget_size_min_resize(ob);
sf = e_widget_scrollframe_simple_add(evas, ob);
e_widget_list_object_append(o, sf, 1, 1, 0.0);
}
else
e_widget_list_object_append(o, ob, 1, 1, 0.0);
ob = e_widget_button_add(evas,
_("Basic"), "go-next",
_e_config_dialog_cb_basic, cfd, NULL);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
}
else
{
o = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata);
if (cfd->view->scroll)
{
e_widget_size_min_resize(o);
o = e_widget_scrollframe_simple_add(evas, o);
}
}
if (cfd->view->basic.create_widgets)
{
o = e_widget_list_add(evas, 0, 0);
ob = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata);
if (cfd->view->scroll)
{
e_widget_size_min_resize(ob);
sf = e_widget_scrollframe_simple_add(evas, ob);
e_widget_list_object_append(o, sf, 1, 1, 0.0);
}
else
e_widget_list_object_append(o, ob, 1, 1, 0.0);
ob = e_widget_button_add(evas,
_("Basic"), "go-next",
_e_config_dialog_cb_basic, cfd, NULL);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
}
else
{
o = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata);
if (cfd->view->scroll)
{
e_widget_size_min_resize(o);
o = e_widget_scrollframe_simple_add(evas, o);
}
}
}
e_widget_size_min_get(o, &mw, &mh);
@ -257,28 +258,28 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
if (!pdia) /* dialog window was created in this function call - need to create buttons once */
{
if (!cfd->hide_buttons)
{
e_dialog_button_add(cfd->dia, _("OK"), NULL,
_e_config_dialog_cb_ok, cfd);
e_dialog_button_add(cfd->dia, _("Apply"), NULL,
_e_config_dialog_cb_apply, cfd);
if (!cfd->cfg_changed)
{
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
}
}
e_dialog_button_add(cfd->dia, _("Close"), NULL,
_e_config_dialog_cb_close, cfd);
}
if (!cfd->hide_buttons)
{
e_dialog_button_add(cfd->dia, _("OK"), NULL,
_e_config_dialog_cb_ok, cfd);
e_dialog_button_add(cfd->dia, _("Apply"), NULL,
_e_config_dialog_cb_apply, cfd);
if (!cfd->cfg_changed)
{
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
}
}
e_dialog_button_add(cfd->dia, _("Close"), NULL,
_e_config_dialog_cb_close, cfd);
}
if (cfd->cfg_changed_auto)
{
int changed;
int changed;
changed = _e_config_dialog_check_changed(cfd, 0);
e_config_dialog_changed_set(cfd, changed);
changed = _e_config_dialog_check_changed(cfd, 0);
e_config_dialog_changed_set(cfd, changed);
}
e_dialog_show(cfd->dia);
@ -297,13 +298,13 @@ _e_config_dialog_cb_auto_apply_timer(void *data)
if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
{
if (cfd->view->basic.apply_cfdata)
cfd->view->basic.apply_cfdata(cfd, cfd->cfdata);
if (cfd->view->basic.apply_cfdata)
cfd->view->basic.apply_cfdata(cfd, cfd->cfdata);
}
else
{
if (cfd->view->advanced.apply_cfdata)
cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
if (cfd->view->advanced.apply_cfdata)
cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
}
return ECORE_CALLBACK_CANCEL;
}
@ -361,9 +362,9 @@ _e_config_dialog_cb_apply(void *data __UNUSED__, E_Dialog *dia)
}
if ((ok) && (!cfd->hide_buttons))
{
cfd->cfg_changed = 0;
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
cfd->cfg_changed = 0;
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
}
}
@ -392,15 +393,15 @@ _e_config_dialog_changed(E_Config_Dialog *cfd)
{
if (!cfd->hide_buttons)
{
cfd->cfg_changed = 1;
e_dialog_button_disable_num_set(cfd->dia, 0, 0);
e_dialog_button_disable_num_set(cfd->dia, 1, 0);
cfd->cfg_changed = 1;
e_dialog_button_disable_num_set(cfd->dia, 0, 0);
e_dialog_button_disable_num_set(cfd->dia, 1, 0);
}
else
{
if (cfd->auto_apply_timer) ecore_timer_del(cfd->auto_apply_timer);
if (cfd->auto_apply_timer) ecore_timer_del(cfd->auto_apply_timer);
cfd->auto_apply_timer = NULL;
cfd->auto_apply_timer =
cfd->auto_apply_timer =
ecore_timer_add(0.5, _e_config_dialog_cb_auto_apply_timer, cfd);
}
}
@ -410,16 +411,16 @@ _e_config_dialog_unchanged(E_Config_Dialog *cfd)
{
if (!cfd->hide_buttons)
{
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
e_dialog_button_disable_num_set(cfd->dia, 0, 1);
e_dialog_button_disable_num_set(cfd->dia, 1, 1);
}
else
{
if (cfd->auto_apply_timer)
{
ecore_timer_del(cfd->auto_apply_timer);
cfd->auto_apply_timer = NULL;
}
if (cfd->auto_apply_timer)
{
ecore_timer_del(cfd->auto_apply_timer);
cfd->auto_apply_timer = NULL;
}
}
}
@ -432,16 +433,16 @@ _e_config_dialog_check_changed(E_Config_Dialog *cfd, unsigned char def)
{
if (cfd->view->basic.check_changed)
changed = cfd->view->basic.check_changed(cfd, cfd->cfdata);
else
else
changed = def;
}
else if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED)
{
if (cfd->view->advanced.check_changed)
changed = cfd->view->advanced.check_changed(cfd, cfd->cfdata);
else
changed = def;
}
{
if (cfd->view->advanced.check_changed)
changed = cfd->view->advanced.check_changed(cfd, cfd->cfdata);
else
changed = def;
}
return changed;
}
@ -489,3 +490,4 @@ e_config_dialog_changed_set(E_Config_Dialog *cfd, unsigned char value)
else
_e_config_dialog_unchanged(cfd);
}