Don't remove the vim tag!
Remove strlen == 0 checks. Fix trailing whitespace. SVN revision: 19898
This commit is contained in:
sebastid
sebastid
parent
175b217eaa
commit
57ae1936f8
|
|
@ -1,3 +1,6 @@
|
|||
/*
|
||||
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||
*/
|
||||
#include "e.h"
|
||||
|
||||
#define BG_SET_DEFAULT_DESK 0
|
||||
|
|
@ -13,44 +16,44 @@ static Evas_Object *_advanced_create_widgets (E_Config_Dialog *cfd, Evas *evas,
|
|||
static void _load_bgs (E_Config_Dialog *cfd, Evas_Object *il);
|
||||
void _ilist_cb_bg_selected (void *data);
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
char *bg, *current_bg;
|
||||
int bg_method;
|
||||
};
|
||||
|
||||
EAPI E_Config_Dialog *
|
||||
e_int_config_background(E_Container *con)
|
||||
e_int_config_background(E_Container *con)
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_View v;
|
||||
|
||||
|
||||
v.create_cfdata = _create_data;
|
||||
v.free_cfdata = _free_data;
|
||||
v.basic.apply_cfdata = _basic_apply_data;
|
||||
v.basic.create_widgets = _basic_create_widgets;
|
||||
v.advanced.apply_cfdata = _advanced_apply_data;
|
||||
v.advanced.create_widgets = _advanced_create_widgets;
|
||||
|
||||
|
||||
cfd = e_config_dialog_new(con, _("Background Settings"), NULL, 0, &v, NULL);
|
||||
return cfd;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
cfdata->bg_method = BG_SET_DEFAULT_DESK;
|
||||
if (e_config->desktop_default_background)
|
||||
cfdata->bg_method = BG_SET_DEFAULT_DESK;
|
||||
if (e_config->desktop_default_background)
|
||||
cfdata->current_bg = strdup(e_config->desktop_default_background);
|
||||
else
|
||||
else
|
||||
cfdata->current_bg = NULL;
|
||||
}
|
||||
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
_fill_data(cfdata);
|
||||
cfd->cfdata = cfdata;
|
||||
|
|
@ -58,59 +61,59 @@ _create_data(E_Config_Dialog *cfd)
|
|||
}
|
||||
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
if (cfdata->current_bg) free(cfdata->current_bg);
|
||||
free(cfdata);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *ot, *of, *il, *im;
|
||||
|
||||
|
||||
//_fill_data(cfdata);
|
||||
|
||||
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
il = e_widget_ilist_add(evas, 48, 48, &(cfdata->bg));
|
||||
e_widget_ilist_selector_set(il, 1);
|
||||
e_widget_min_size_set(il, 180, 40);
|
||||
|
||||
|
||||
/* Load Bgs */
|
||||
_load_bgs(cfd, il);
|
||||
im = cfd->data;
|
||||
|
||||
|
||||
e_widget_focus_set(il, 1);
|
||||
e_widget_ilist_go(il);
|
||||
e_widget_table_object_append(ot, il, 0, 0, 1, 2, 1, 1, 1, 1);
|
||||
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Background Preview"), 0);
|
||||
e_widget_min_size_set(of, 320, 240);
|
||||
e_widget_table_object_append(ot, of, 1, 0, 1, 2, 1, 1, 1, 1);
|
||||
e_widget_framelist_object_append(of, im);
|
||||
|
||||
|
||||
return ot;
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
const char *theme;
|
||||
|
||||
theme = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background");
|
||||
while (e_config->desktop_backgrounds)
|
||||
while (e_config->desktop_backgrounds)
|
||||
{
|
||||
E_Config_Desktop_Background *cfbg;
|
||||
cfbg = e_config->desktop_backgrounds->data;
|
||||
e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
|
||||
}
|
||||
if (e_config->desktop_default_background)
|
||||
if (e_config->desktop_default_background)
|
||||
evas_stringshare_del(e_config->desktop_default_background);
|
||||
|
||||
if (strlen(cfdata->bg) == 0) e_config->desktop_default_background = NULL;
|
||||
|
||||
if (!(cfdata->bg[0])) e_config->desktop_default_background = NULL;
|
||||
else
|
||||
e_config->desktop_default_background = evas_stringshare_add(cfdata->bg);
|
||||
|
||||
|
||||
e_bg_update();
|
||||
e_config_save_queue();
|
||||
if (cfdata->current_bg) free(cfdata->current_bg);
|
||||
|
|
@ -119,31 +122,31 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
|
||||
static Evas_Object *
|
||||
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *ot, *of, *il, *im, *oc;
|
||||
E_Radio_Group *rg;
|
||||
|
||||
|
||||
//_fill_data(cfdata);
|
||||
|
||||
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
il = e_widget_ilist_add(evas, 48, 48, &(cfdata->bg));
|
||||
e_widget_ilist_selector_set(il, 1);
|
||||
e_widget_min_size_set(il, 180, 40);
|
||||
|
||||
|
||||
/* Load Bgs */
|
||||
_load_bgs(cfd, il);
|
||||
im = cfd->data;
|
||||
|
||||
|
||||
//e_widget_focus_set(il, 1);
|
||||
e_widget_ilist_go(il);
|
||||
e_widget_table_object_append(ot, il, 0, 0, 1, 3, 1, 1, 1, 1);
|
||||
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Background Preview"), 0);
|
||||
e_widget_min_size_set(of, 320, 240);
|
||||
e_widget_table_object_append(ot, of, 1, 0, 1, 2, 1, 1, 1, 1);
|
||||
e_widget_framelist_object_append(of, im);
|
||||
|
||||
|
||||
rg = e_widget_radio_group_new(&(cfdata->bg_method));
|
||||
of = e_widget_framelist_add(evas, _("Set Background For"), 0);
|
||||
e_widget_min_size_set(of, 200, 160);
|
||||
|
|
@ -154,26 +157,26 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
|||
e_widget_framelist_object_append(of, oc);
|
||||
oc = e_widget_radio_add(evas, _("All Desktops"), 2, rg);
|
||||
e_widget_framelist_object_append(of, oc);
|
||||
|
||||
|
||||
e_widget_table_object_append(ot, of, 1, 2, 1, 1, 1, 1, 1, 1);
|
||||
return ot;
|
||||
return ot;
|
||||
}
|
||||
|
||||
static int
|
||||
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
E_Zone *z;
|
||||
E_Desk *d;
|
||||
int x, y;
|
||||
const char *theme;
|
||||
|
||||
|
||||
if (!cfdata->bg) return 0;
|
||||
z = e_zone_current_get(cfd->con);
|
||||
d = e_desk_current_get(z);
|
||||
e_desk_xy_get(d, &x, &y);
|
||||
theme = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background");
|
||||
|
||||
switch (cfdata->bg_method)
|
||||
|
||||
switch (cfdata->bg_method)
|
||||
{
|
||||
case BG_SET_DEFAULT_DESK:
|
||||
e_bg_del(-1, -1, -1, -1);
|
||||
|
|
@ -183,13 +186,13 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
e_bg_del(-1, z->num, -1, -1);
|
||||
e_bg_del(z->container->num, -1, -1, -1);
|
||||
e_bg_del(z->container->num, z->num, -1, -1);
|
||||
|
||||
|
||||
if (e_config->desktop_default_background) evas_stringshare_del(e_config->desktop_default_background);
|
||||
if (strlen(cfdata->bg) == 0)
|
||||
if (!(cfdata->bg[0]))
|
||||
e_config->desktop_default_background = NULL;
|
||||
else
|
||||
e_config->desktop_default_background = evas_stringshare_add(cfdata->bg);
|
||||
|
||||
|
||||
e_bg_update();
|
||||
e_config_save_queue();
|
||||
break;
|
||||
|
|
@ -198,7 +201,7 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
e_bg_del(-1, z->num, x, y);
|
||||
e_bg_del(z->container->num, -1, x, y);
|
||||
e_bg_del(z->container->num, z->num, x, y);
|
||||
if (strlen(cfdata->bg) != 0)
|
||||
if (!(cfdata->bg[0]))
|
||||
e_bg_add(z->container->num, z->num, x, y, cfdata->bg);
|
||||
e_bg_update();
|
||||
e_config_save_queue();
|
||||
|
|
@ -207,11 +210,11 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
while (e_config->desktop_backgrounds)
|
||||
{
|
||||
E_Config_Desktop_Background *cfbg;
|
||||
|
||||
|
||||
cfbg = e_config->desktop_backgrounds->data;
|
||||
e_bg_del(cfbg->container, cfbg->zone, cfbg->desk_x, cfbg->desk_y);
|
||||
}
|
||||
if (strlen(cfdata->bg) != 0)
|
||||
if (!(cfdata->bg[0]))
|
||||
e_bg_add(-1, -1, -1, -1, cfdata->bg);
|
||||
e_bg_update();
|
||||
e_config_save_queue();
|
||||
|
|
@ -219,11 +222,11 @@ _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
if (cfdata->current_bg) free(cfdata->current_bg);
|
||||
cfdata->current_bg = strdup(cfdata->bg);
|
||||
return 1; /* Apply was OK */
|
||||
return 1; /* Apply was OK */
|
||||
}
|
||||
|
||||
static void
|
||||
_load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
|
||||
_load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
|
||||
{
|
||||
Evas *evas;
|
||||
Evas_Object *ic, *im, *o, *bg_obj;
|
||||
|
|
@ -233,16 +236,16 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
|
|||
const char *f;
|
||||
char *c;
|
||||
evas = evas_object_evas_get(il);
|
||||
|
||||
|
||||
bg_obj = edje_object_add(cfd->dia->win->evas);
|
||||
|
||||
|
||||
/* Load The Theme's Background */
|
||||
eebuf = ecore_evas_buffer_new(1, 1);
|
||||
evasbuf = ecore_evas_get(eebuf);
|
||||
o = edje_object_add(evasbuf);
|
||||
f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background");
|
||||
c = strdup(f);
|
||||
if (edje_object_file_set(o, f, "desktop/background"))
|
||||
if (edje_object_file_set(o, f, "desktop/background"))
|
||||
{
|
||||
Evas_Object *o = NULL;
|
||||
char b[4096];
|
||||
|
|
@ -251,10 +254,10 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
|
|||
o = e_thumb_generate_begin(c, 48, 48, cfd->dia->win->evas, &o, NULL, NULL);
|
||||
else
|
||||
o = e_thumb_evas_object_get(c, cfd->dia->win->evas, 48, 48, 1);
|
||||
|
||||
|
||||
e_widget_ilist_append(il, o, _("Theme Background"), _ilist_cb_bg_selected, cfd, "");
|
||||
}
|
||||
if (!e_config->desktop_default_background)
|
||||
if (!e_config->desktop_default_background)
|
||||
{
|
||||
e_widget_ilist_selected_set(il, 0);
|
||||
im = e_widget_image_add_from_object(cfd->dia->win->evas, bg_obj, 320, 240);
|
||||
|
|
@ -263,41 +266,41 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
|
|||
|
||||
evas_object_del(o);
|
||||
ecore_evas_free(eebuf);
|
||||
|
||||
|
||||
/* Load other backgrounds */
|
||||
bg_dirs = e_path_dir_list_get(path_backgrounds);
|
||||
for (bg = bg_dirs; bg; bg = bg->next)
|
||||
{
|
||||
for (bg = bg_dirs; bg; bg = bg->next)
|
||||
{
|
||||
E_Path_Dir *d;
|
||||
|
||||
|
||||
d = bg->data;
|
||||
if (ecore_file_is_dir(d->dir))
|
||||
if (ecore_file_is_dir(d->dir))
|
||||
{
|
||||
char *bg_file;
|
||||
Ecore_List *bgs;
|
||||
int i = 1;
|
||||
|
||||
|
||||
bgs = ecore_file_ls(d->dir);
|
||||
if (!bgs) continue;
|
||||
while (bg_file = ecore_list_next(bgs))
|
||||
while (bg_file = ecore_list_next(bgs))
|
||||
{
|
||||
char full_path[4096];
|
||||
|
||||
|
||||
snprintf(full_path, sizeof(full_path), "%s/%s", d->dir, bg_file);
|
||||
if (ecore_file_is_dir(full_path)) continue;
|
||||
if (!e_util_edje_collection_exists(full_path, "desktop/background")) continue;
|
||||
|
||||
if (!e_thumb_exists(full_path))
|
||||
if (!e_util_edje_collection_exists(full_path, "desktop/background")) continue;
|
||||
|
||||
if (!e_thumb_exists(full_path))
|
||||
ic = e_thumb_generate_begin(full_path, 48, 48, evas, &ic, NULL, NULL);
|
||||
else
|
||||
else
|
||||
ic = e_thumb_evas_object_get(full_path, evas, 48, 48, 1);
|
||||
|
||||
|
||||
e_widget_ilist_append(il, ic, ecore_file_strip_ext(bg_file), _ilist_cb_bg_selected, cfd, full_path);
|
||||
if ((e_config->desktop_default_background) &&
|
||||
(!strcmp(e_config->desktop_default_background, full_path)))
|
||||
{
|
||||
if ((e_config->desktop_default_background) &&
|
||||
(!strcmp(e_config->desktop_default_background, full_path)))
|
||||
{
|
||||
Evas_Object *o = NULL;
|
||||
|
||||
|
||||
e_widget_ilist_selected_set(il, i);
|
||||
o = edje_object_add(cfd->dia->win->evas);
|
||||
edje_object_file_set(o, e_config->desktop_default_background, "desktop/background");
|
||||
|
|
@ -317,35 +320,35 @@ _load_bgs(E_Config_Dialog *cfd, Evas_Object *il)
|
|||
cfd->data = im;
|
||||
}
|
||||
|
||||
void
|
||||
_ilist_cb_bg_selected(void *data)
|
||||
void
|
||||
_ilist_cb_bg_selected(void *data)
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
Evas *evas;
|
||||
|
||||
|
||||
cfd = data;
|
||||
cfdata = cfd->cfdata;
|
||||
evas = cfd->dia->win->evas;
|
||||
|
||||
if (strlen(cfdata->bg) == 0)
|
||||
|
||||
if (!(cfdata->bg[0]))
|
||||
{
|
||||
const char *theme;
|
||||
const char *theme;
|
||||
theme = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background");
|
||||
e_widget_image_object_set(cfd->data, e_thumb_evas_object_get(strdup(theme), evas, 320, 240, 1));
|
||||
e_widget_image_object_set(cfd->data, e_thumb_evas_object_get(strdup(theme), evas, 320, 240, 1));
|
||||
}
|
||||
else
|
||||
else
|
||||
{
|
||||
e_widget_image_object_set(cfd->data, e_thumb_evas_object_get(cfdata->bg, evas, 320, 240, 1));
|
||||
}
|
||||
|
||||
if (cfdata->current_bg)
|
||||
if (cfdata->current_bg)
|
||||
{
|
||||
if (!strcmp(cfdata->bg, cfdata->current_bg))
|
||||
if (!strcmp(cfdata->bg, cfdata->current_bg))
|
||||
{
|
||||
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, 1, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue