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

formatting 

SVN revision: 73128
This commit is contained in:
Mike Blumenkrantz 2012-07-02 08:09:17 +00:00
parent 82ee910b78
commit f19d0eeaba
16 changed files with 1986 additions and 1954 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/conf_theme/e_int_config_borders.c
View File

@ -256,3 +256,4 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
e_dialog_resizable_set(cfd->dia, 1);
return o;
}

13
src/modules/conf_theme/e_int_config_color_classes.c
View File

@ -16,13 +16,15 @@ struct _CFColor_Class
E_Color_Class *cc;
struct {
struct
{
int r[3], g[3], b[3], a[3];
Eina_Bool changed;
Eina_Bool enabled;
} val;
struct {
struct
{
Evas_Object *icon;
Evas_Object *end;
CFColor_Class_Type type;
@ -38,7 +40,8 @@ struct _E_Config_Dialog_Data
Eina_List *selected;
Eina_List *changed;
struct {
struct
{
Evas *evas;
Evas_Object *ilist;
Evas_Object *frame;
@ -131,7 +134,6 @@ static const CFColor_Class_Description _color_classes_modules[] =
#undef CCDESC_S
#undef CCDESC_T
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
@ -759,9 +761,11 @@ _fill_data_add_item(E_Config_Dialog_Data *cfdata, CFColor_Class *ccc)
case COLOR_CLASS_TEXT:
group = "e/modules/conf_colors/preview/text";
break;
case COLOR_CLASS_SOLID:
group = "e/modules/conf_colors/preview/solid";
break;
default:
group = "e/modules/conf_colors/preview/unknown";
}
@ -899,3 +903,4 @@ _fill_data_delayed(void *data)
_fill_data(cfdata);
return ECORE_CALLBACK_CANCEL;
}

8
src/modules/conf_theme/e_int_config_cursor.c
View File

@ -14,7 +14,8 @@ struct _E_Config_Dialog_Data
int cursor_size;
Eina_List *disable_list;
struct {
struct
{
Evas_Object *idle_cursor;
} gui;
};
@ -91,10 +92,10 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return ((e_config->show_cursor != cfdata->show_cursor) ||
return (e_config->show_cursor != cfdata->show_cursor) ||
(e_config->idle_cursor != cfdata->idle_cursor) ||
(e_config->use_e_cursor != cfdata->use_e_cursor) ||
(e_config->cursor_size != cfdata->cursor_size));
(e_config->cursor_size != cfdata->cursor_size);
}
static void
@ -168,3 +169,4 @@ _basic_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dial
return o;
}

1
src/modules/conf_theme/e_int_config_fonts.c
View File

@ -1126,3 +1126,4 @@ _font_preview_update(E_Config_Dialog_Data *cfdata)
eina_stringshare_del(name);
}
}

3
src/modules/conf_theme/e_int_config_icon_themes.c
View File

@ -314,7 +314,7 @@ _sort_icon_themes(const void *data1, const void *data2)
if (!m1->name.name) return 1;
if (!m2->name.name) return -1;
return (strcmp(m1->name.name, m2->name.name));
return strcmp(m1->name.name, m2->name.name);
}
static Evas_Object *
@ -335,3 +335,4 @@ _icon_new(Evas *evas, const char *theme, const char *icon, unsigned int size)
return o;
}

13
src/modules/conf_theme/e_int_config_scale.c
View File

@ -75,7 +75,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->use_custom = e_config->scale.use_custom;
cfdata->use_mode = 0;
if (cfdata->use_dpi) cfdata->use_mode = 1;
else if (cfdata->use_custom) cfdata->use_mode = 2;
else if (cfdata->use_custom)
cfdata->use_mode = 2;
cfdata->min = e_config->scale.min;
cfdata->max = e_config->scale.max;
cfdata->factor = e_config->scale.factor;
@ -141,8 +142,8 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
static int
_basic_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return ((cfdata->use_dpi != e_config->scale.use_dpi) ||
(cfdata->base_dpi != e_config->scale.base_dpi));
return (cfdata->use_dpi != e_config->scale.use_dpi) ||
(cfdata->base_dpi != e_config->scale.base_dpi);
}
static void
@ -193,7 +194,6 @@ _adv_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *c
e_widget_toolbook_page_append(otb, NULL, _("Policy"), o,
1, 0, 1, 0, 0.5, 0.0);
/* Constraints */
o = e_widget_list_add(evas, 0, 0);
ow = e_widget_label_add(evas, _("Minimum"));
@ -252,12 +252,12 @@ _adv_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
else if (cfdata->use_mode == 2)
use_custom = 1;
return ((use_dpi != e_config->scale.use_dpi) ||
return (use_dpi != e_config->scale.use_dpi) ||
(use_custom != e_config->scale.use_custom) ||
(cfdata->min != e_config->scale.min) ||
(cfdata->max != e_config->scale.max) ||
(cfdata->factor != e_config->scale.factor) ||
(cfdata->base_dpi != e_config->scale.base_dpi));
(cfdata->base_dpi != e_config->scale.base_dpi);
return 1;
}
@ -271,3 +271,4 @@ _adv_policy_changed(void *data, Evas_Object *obj __UNUSED__)
e_widget_disabled_set(cfdata->gui.adv.dpi_slider, (cfdata->use_mode != 1));
e_widget_disabled_set(cfdata->gui.adv.custom_slider, (cfdata->use_mode != 2));
}

1
src/modules/conf_theme/e_int_config_startup.c
View File

@ -328,3 +328,4 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
e_dialog_resizable_set(cfd->dia, 1);
return ot;
}

3
src/modules/conf_theme/e_int_config_theme.c
View File

@ -194,6 +194,7 @@ _cb_files_selected(void *data, Evas_Object *obj, void *event_info)
cfdata = data;
}
#endif
static void
@ -300,6 +301,7 @@ _cb_web(void *data1, void *data2 __UNUSED__)
else
cfdata->dia_web = e_int_config_theme_web(cfdata->cfd);
}
#endif
static void
@ -1098,3 +1100,4 @@ _advanced_apply_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
return 1;
}

1
src/modules/conf_theme/e_int_config_theme_import.c
View File

@ -369,3 +369,4 @@ _theme_import_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNU
if (o) e_widget_activate(o);
}
}

3
src/modules/conf_theme/e_int_config_theme_web.c
View File

@ -100,6 +100,7 @@ _web_apply(const char *path, void *data)
a = e_action_find("restart");
if ((a) && (a->func.go)) a->func.go(NULL, NULL);
}
#endif
E_Dialog *
@ -113,7 +114,6 @@ e_int_config_theme_web(E_Config_Dialog *parent)
E_Fm2_Config fmc;
char usr_dir[PATH_MAX];
dia = e_dialog_new(parent->con, "E", "_theme_web_dialog");
if (!dia) return NULL;
@ -132,7 +132,6 @@ e_int_config_theme_web(E_Config_Dialog *parent)
e_object_del_attach_func_set(E_OBJECT(dia), _web_del_cb);
e_win_centered_set(dia->win, 1);
ol = e_widget_list_add(e_win_evas_get(dia->win), 0, 1);
// The Exchange Smart Object

10
src/modules/conf_theme/e_int_config_transitions.c
View File

@ -82,7 +82,7 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
static int
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
return ((!cfdata->transition_start && e_config->transition_start) ||
return (!cfdata->transition_start && e_config->transition_start) ||
(cfdata->transition_start && !e_config->transition_start) ||
(!cfdata->transition_desk && e_config->transition_desk) ||
(cfdata->transition_desk && !e_config->transition_desk) ||
@ -93,7 +93,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
(cfdata->transition_desk && e_config->transition_desk &&
strcmp(cfdata->transition_desk, e_config->transition_desk)) ||
(cfdata->transition_change && e_config->transition_change &&
strcmp(cfdata->transition_change, e_config->transition_change)));
strcmp(cfdata->transition_change, e_config->transition_change));
}
static int
@ -239,9 +239,11 @@ _event_cb_changed(void *data)
case 0:
trans = e_config->transition_start;
break;
case 1:
trans = e_config->transition_desk;
break;
case 2:
trans = e_config->transition_change;
break;
@ -292,14 +294,17 @@ _trans_cb_changed(void *data)
E_FREE(cfdata->transition_start);
if (t) cfdata->transition_start = strdup(t);
break;
case 1:
E_FREE(cfdata->transition_desk);
if (t) cfdata->transition_desk = strdup(t);
break;
case 2:
E_FREE(cfdata->transition_change);
if (t) cfdata->transition_change = strdup(t);
break;
default:
break;
}
@ -393,3 +398,4 @@ _e_wid_done(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUS
evas_object_show(o);
e_widget_preview_extern_object_set(cfdata->tp, o);
}

3
src/modules/conf_theme/e_int_config_wallpaper.c
View File

@ -170,6 +170,7 @@ e_int_config_wallpaper_web_done(E_Config_Dialog *dia)
cfdata = dia->cfdata;
cfdata->dia_web = NULL;
}
#endif
static void
@ -350,6 +351,7 @@ _cb_web(void *data1, void *data2 __UNUSED__)
else
cfdata->dia_web = e_int_config_wallpaper_web(cfdata->cfd);
}
#endif
static void
@ -729,3 +731,4 @@ _adv_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
e_config_save_queue();
return 1;
}

7
src/modules/conf_theme/e_int_config_wallpaper_import.c
View File

@ -527,6 +527,7 @@ _import_edj_gen(Import *import)
"} } } } }\n"
, fstrip, enc, w, h, fstrip);
break;
case IMPORT_TILE:
fprintf(f,
"images { image: \"%s\" %s; }\n"
@ -544,6 +545,7 @@ _import_edj_gen(Import *import)
"} } } } } } }\n"
, fstrip, enc, w, h, fstrip, w, h);
break;
case IMPORT_CENTER:
fprintf(f,
"images { image: \"%s\" %s; }\n"
@ -563,6 +565,7 @@ _import_edj_gen(Import *import)
"} } } } }\n"
, fstrip, enc, w, h, cr, cg, cb, ca, w, h, w, h, fstrip);
break;
case IMPORT_SCALE_ASPECT_IN:
locale = e_intl_language_get();
setlocale(LC_NUMERIC, "C");
@ -585,6 +588,7 @@ _import_edj_gen(Import *import)
, fstrip, enc, w, h, cr, cg, cb, ca, (double)w / (double)h, (double)w / (double)h, fstrip);
setlocale(LC_NUMERIC, locale);
break;
case IMPORT_SCALE_ASPECT_OUT:
locale = e_intl_language_get();
setlocale(LC_NUMERIC, "C");
@ -603,6 +607,7 @@ _import_edj_gen(Import *import)
, fstrip, enc, w, h, (double)w / (double)h, (double)w / (double)h, fstrip);
setlocale(LC_NUMERIC, locale);
break;
case IMPORT_PAN:
locale = e_intl_language_get();
setlocale(LC_NUMERIC, "C");
@ -664,6 +669,7 @@ _import_edj_gen(Import *import)
, fstrip, enc, w, h, (double)w / (double)h, (double)w / (double)h, fstrip);
setlocale(LC_NUMERIC, locale);
break;
default:
/* won't happen */
break;
@ -1032,3 +1038,4 @@ _fsel_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, v
if (o) e_widget_activate(o);
}
}

1
src/modules/conf_theme/e_int_config_wallpaper_web.c
View File

@ -291,4 +291,5 @@ e_int_config_wallpaper_web(E_Config_Dialog *parent)
return dia;
}
#endif

3
src/modules/conf_theme/e_int_config_xsettings.c
View File

@ -134,7 +134,6 @@ _ilist_files_add(E_Config_Dialog_Data *cfdata, const char *dir)
{
if (!eina_list_data_find(cfdata->widget_themes, file))
{
cfdata->widget_themes = eina_list_append(cfdata->widget_themes, file);
continue;
}
@ -244,10 +243,10 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
/* e_widget_on_change_hook_set(ow, _settings_changed, cfdata); */
e_widget_list_object_append(o, ow, 0, 0, 0.0);
e_dialog_resizable_set(cfd->dia, 1);
_fill_files_ilist(cfdata);
return o;
}

1
src/modules/conf_theme/e_mod_main.c
View File

@ -180,3 +180,4 @@ _e_mod_menu_theme_add(void *data __UNUSED__, E_Menu *m)
e_util_menu_item_theme_icon_set(mi, "preferences-desktop-theme");
e_menu_item_callback_set(mi, _e_mod_run_theme_cb, NULL);
}