forked from enlightenment/enlightenment
parent
6888d7b697
commit
e645c7812a
|
@ -1,24 +1,24 @@
|
||||||
#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 int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
static int _basic_apply(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 _cb_config(void *data, void *data2);
|
static void _cb_config(void *data, void *data2);
|
||||||
static Eina_Bool _cb_bg_change(void *data, int type, void *event);
|
static Eina_Bool _cb_bg_change(void *data, int type, void *event);
|
||||||
|
|
||||||
struct _E_Config_Dialog_Data
|
struct _E_Config_Dialog_Data
|
||||||
{
|
{
|
||||||
int con_num;
|
int con_num;
|
||||||
int zone_num;
|
int zone_num;
|
||||||
int desk_x;
|
int desk_x;
|
||||||
int desk_y;
|
int desk_y;
|
||||||
char *bg;
|
char *bg;
|
||||||
char *name;
|
char *name;
|
||||||
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
|
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
|
||||||
char *profile;
|
char *profile;
|
||||||
#endif
|
#endif
|
||||||
Evas_Object *preview;
|
Evas_Object *preview;
|
||||||
Ecore_Event_Handler *hdl;
|
Ecore_Event_Handler *hdl;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -34,30 +34,30 @@ e_int_config_desk(E_Container *con, const char *params)
|
||||||
con_num = zone_num = dx = dy = -1;
|
con_num = zone_num = dx = dy = -1;
|
||||||
if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &dx, &dy) != 4)
|
if (sscanf(params, "%i %i %i %i", &con_num, &zone_num, &dx, &dy) != 4)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (e_config_dialog_find("E", "internal/desk")) return NULL;
|
if (e_config_dialog_find("E", "internal/desk")) return NULL;
|
||||||
|
|
||||||
v = E_NEW(E_Config_Dialog_View, 1);
|
v = E_NEW(E_Config_Dialog_View, 1);
|
||||||
|
|
||||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||||
cfdata->con_num = con_num;
|
cfdata->con_num = con_num;
|
||||||
cfdata->zone_num = zone_num;
|
cfdata->zone_num = zone_num;
|
||||||
cfdata->desk_x = dx;
|
cfdata->desk_x = dx;
|
||||||
cfdata->desk_y = dy;
|
cfdata->desk_y = dy;
|
||||||
|
|
||||||
v->create_cfdata = _create_data;
|
v->create_cfdata = _create_data;
|
||||||
v->free_cfdata = _free_data;
|
v->free_cfdata = _free_data;
|
||||||
v->basic.apply_cfdata = _basic_apply;
|
v->basic.apply_cfdata = _basic_apply;
|
||||||
v->basic.create_widgets = _basic_create;
|
v->basic.create_widgets = _basic_create;
|
||||||
v->override_auto_apply = 1;
|
v->override_auto_apply = 1;
|
||||||
|
|
||||||
cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "internal/desk",
|
cfd = e_config_dialog_new(con, _("Desk Settings"), "E", "internal/desk",
|
||||||
"preferences-desktop", 0, v, cfdata);
|
"preferences-desktop", 0, v, cfdata);
|
||||||
return cfd;
|
return cfd;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
Eina_List *l;
|
Eina_List *l;
|
||||||
const char *bg;
|
const char *bg;
|
||||||
|
@ -70,27 +70,27 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
if (!bg)
|
if (!bg)
|
||||||
bg = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
|
bg = e_theme_edje_file_get("base/theme/backgrounds", "e/desktop/background");
|
||||||
cfdata->bg = strdup(bg);
|
cfdata->bg = strdup(bg);
|
||||||
|
|
||||||
for (l = e_config->desktop_names; l; l = l->next)
|
for (l = e_config->desktop_names; l; l = l->next)
|
||||||
{
|
{
|
||||||
E_Config_Desktop_Name *dn;
|
E_Config_Desktop_Name *dn;
|
||||||
|
|
||||||
dn = l->data;
|
dn = l->data;
|
||||||
if (!dn) continue;
|
if (!dn) continue;
|
||||||
if (dn->container != cfdata->con_num) continue;
|
if (dn->container != cfdata->con_num) continue;
|
||||||
if (dn->zone != cfdata->zone_num) continue;
|
if (dn->zone != cfdata->zone_num) continue;
|
||||||
if ((dn->desk_x != cfdata->desk_x) || (dn->desk_y != cfdata->desk_y))
|
if ((dn->desk_x != cfdata->desk_x) || (dn->desk_y != cfdata->desk_y))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (dn->name)
|
if (dn->name)
|
||||||
cfdata->name = strdup(dn->name);
|
cfdata->name = strdup(dn->name);
|
||||||
ok = 1;
|
ok = 1;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!ok)
|
if (!ok)
|
||||||
{
|
{
|
||||||
snprintf(name, sizeof(name), _(e_config->desktop_default_name), cfdata->desk_x, cfdata->desk_y);
|
snprintf(name, sizeof(name), _(e_config->desktop_default_name), cfdata->desk_x, cfdata->desk_y);
|
||||||
cfdata->name = strdup(name);
|
cfdata->name = strdup(name);
|
||||||
}
|
}
|
||||||
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
|
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
|
||||||
ok = 0;
|
ok = 0;
|
||||||
|
@ -114,10 +114,10 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
_create_data(E_Config_Dialog *cfd)
|
_create_data(E_Config_Dialog *cfd)
|
||||||
{
|
{
|
||||||
E_Config_Dialog_Data *cfdata;
|
E_Config_Dialog_Data *cfdata;
|
||||||
|
|
||||||
cfdata = cfd->data;
|
cfdata = cfd->data;
|
||||||
if (!cfdata) return NULL;
|
if (!cfdata) return NULL;
|
||||||
_fill_data(cfdata);
|
_fill_data(cfdata);
|
||||||
|
@ -125,7 +125,7 @@ _create_data(E_Config_Dialog *cfd)
|
||||||
}
|
}
|
||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
if (cfdata->hdl)
|
if (cfdata->hdl)
|
||||||
ecore_event_handler_del(cfdata->hdl);
|
ecore_event_handler_del(cfdata->hdl);
|
||||||
|
@ -141,36 +141,36 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||||
{
|
{
|
||||||
char name[40];
|
char name[40];
|
||||||
|
|
||||||
if (!cfdata->name[0])
|
if (!cfdata->name[0])
|
||||||
{
|
{
|
||||||
snprintf(name, sizeof(name), _(e_config->desktop_default_name),
|
snprintf(name, sizeof(name), _(e_config->desktop_default_name),
|
||||||
cfdata->desk_x, cfdata->desk_y);
|
cfdata->desk_x, cfdata->desk_y);
|
||||||
cfdata->name = strdup(name);
|
cfdata->name = strdup(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
|
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
|
||||||
if (!cfdata->profile[0])
|
if (!cfdata->profile[0])
|
||||||
cfdata->profile = strdup(e_config->desktop_default_window_profile);
|
cfdata->profile = strdup(e_config->desktop_default_window_profile);
|
||||||
#endif
|
#endif
|
||||||
e_desk_name_del(cfdata->con_num, cfdata->zone_num,
|
e_desk_name_del(cfdata->con_num, cfdata->zone_num,
|
||||||
cfdata->desk_x, cfdata->desk_y);
|
cfdata->desk_x, cfdata->desk_y);
|
||||||
e_desk_name_add(cfdata->con_num, cfdata->zone_num,
|
e_desk_name_add(cfdata->con_num, cfdata->zone_num,
|
||||||
cfdata->desk_x, cfdata->desk_y, cfdata->name);
|
cfdata->desk_x, cfdata->desk_y, cfdata->name);
|
||||||
e_desk_name_update();
|
e_desk_name_update();
|
||||||
|
|
||||||
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
|
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
|
||||||
e_desk_window_profile_del(cfdata->con_num, cfdata->zone_num,
|
e_desk_window_profile_del(cfdata->con_num, cfdata->zone_num,
|
||||||
cfdata->desk_x, cfdata->desk_y);
|
cfdata->desk_x, cfdata->desk_y);
|
||||||
e_desk_window_profile_add(cfdata->con_num, cfdata->zone_num,
|
e_desk_window_profile_add(cfdata->con_num, cfdata->zone_num,
|
||||||
cfdata->desk_x, cfdata->desk_y, cfdata->profile);
|
cfdata->desk_x, cfdata->desk_y, cfdata->profile);
|
||||||
e_desk_window_profile_update();
|
e_desk_window_profile_update();
|
||||||
#endif
|
#endif
|
||||||
e_bg_del(cfdata->con_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
|
e_bg_del(cfdata->con_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
|
||||||
e_bg_add(cfdata->con_num, cfdata->zone_num,
|
e_bg_add(cfdata->con_num, cfdata->zone_num,
|
||||||
cfdata->desk_x, cfdata->desk_y, cfdata->bg);
|
cfdata->desk_x, cfdata->desk_y, cfdata->bg);
|
||||||
e_bg_update();
|
e_bg_update();
|
||||||
|
|
||||||
|
@ -179,13 +179,13 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *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 *o, *of, *ob;
|
Evas_Object *o, *of, *ob;
|
||||||
E_Zone *zone;
|
E_Zone *zone;
|
||||||
|
|
||||||
zone = e_zone_current_get(cfd->con);
|
zone = e_zone_current_get(cfd->con);
|
||||||
|
|
||||||
o = e_widget_list_add(evas, 0, 0);
|
o = e_widget_list_add(evas, 0, 0);
|
||||||
|
|
||||||
of = e_widget_frametable_add(evas, _("Desktop Name"), 0);
|
of = e_widget_frametable_add(evas, _("Desktop Name"), 0);
|
||||||
|
@ -209,30 +209,30 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||||
if (cfdata->bg)
|
if (cfdata->bg)
|
||||||
e_widget_preview_edje_set(ob, cfdata->bg, "e/desktop/background");
|
e_widget_preview_edje_set(ob, cfdata->bg, "e/desktop/background");
|
||||||
e_widget_frametable_object_append(of, ob, 0, 0, 3, 1, 1, 1, 1, 0);
|
e_widget_frametable_object_append(of, ob, 0, 0, 3, 1, 1, 1, 1, 0);
|
||||||
ob = e_widget_button_add(evas, _("Set"), "configure",
|
ob = e_widget_button_add(evas, _("Set"), "configure",
|
||||||
_cb_config, cfdata, NULL);
|
_cb_config, cfdata, NULL);
|
||||||
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 0);
|
e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 0);
|
||||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||||
|
|
||||||
if (cfdata->hdl)
|
if (cfdata->hdl)
|
||||||
ecore_event_handler_del(cfdata->hdl);
|
ecore_event_handler_del(cfdata->hdl);
|
||||||
cfdata->hdl = ecore_event_handler_add(E_EVENT_BG_UPDATE, _cb_bg_change, cfdata);
|
cfdata->hdl = ecore_event_handler_add(E_EVENT_BG_UPDATE, _cb_bg_change, cfdata);
|
||||||
|
|
||||||
return o;
|
return o;
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
char buf[256];
|
char buf[256];
|
||||||
|
|
||||||
cfdata = data;
|
cfdata = data;
|
||||||
if (!cfdata) return;
|
if (!cfdata) return;
|
||||||
snprintf(buf, sizeof(buf), "%i %i %i %i",
|
snprintf(buf, sizeof(buf), "%i %i %i %i",
|
||||||
cfdata->con_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
|
cfdata->con_num, cfdata->zone_num, cfdata->desk_x, cfdata->desk_y);
|
||||||
e_configure_registry_call("internal/wallpaper_desk",
|
e_configure_registry_call("internal/wallpaper_desk",
|
||||||
e_container_current_get(e_manager_current_get()),
|
e_container_current_get(e_manager_current_get()),
|
||||||
buf);
|
buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,22 +242,23 @@ _cb_bg_change(void *data, int type, void *event)
|
||||||
E_Event_Bg_Update *ev;
|
E_Event_Bg_Update *ev;
|
||||||
E_Config_Dialog_Data *cfdata;
|
E_Config_Dialog_Data *cfdata;
|
||||||
const char *file;
|
const char *file;
|
||||||
|
|
||||||
if (type != E_EVENT_BG_UPDATE) return ECORE_CALLBACK_PASS_ON;
|
if (type != E_EVENT_BG_UPDATE) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
cfdata = data;
|
cfdata = data;
|
||||||
ev = event;
|
ev = event;
|
||||||
if (ev->container != cfdata->con_num) return ECORE_CALLBACK_PASS_ON;
|
if (ev->container != cfdata->con_num) return ECORE_CALLBACK_PASS_ON;
|
||||||
if (ev->zone != cfdata->zone_num) return ECORE_CALLBACK_PASS_ON;
|
if (ev->zone != cfdata->zone_num) return ECORE_CALLBACK_PASS_ON;
|
||||||
if (ev->desk_x != cfdata->desk_x) return ECORE_CALLBACK_PASS_ON;
|
if (ev->desk_x != cfdata->desk_x) return ECORE_CALLBACK_PASS_ON;
|
||||||
if (ev->desk_y != cfdata->desk_y) return ECORE_CALLBACK_PASS_ON;
|
if (ev->desk_y != cfdata->desk_y) return ECORE_CALLBACK_PASS_ON;
|
||||||
|
|
||||||
file = e_bg_file_get(cfdata->con_num, cfdata->zone_num,
|
file = e_bg_file_get(cfdata->con_num, cfdata->zone_num,
|
||||||
cfdata->desk_x, cfdata->desk_y);
|
cfdata->desk_x, cfdata->desk_y);
|
||||||
E_FREE(cfdata->bg);
|
E_FREE(cfdata->bg);
|
||||||
cfdata->bg = strdup(file);
|
cfdata->bg = strdup(file);
|
||||||
e_widget_preview_edje_set(cfdata->preview, cfdata->bg,
|
e_widget_preview_edje_set(cfdata->preview, cfdata->bg,
|
||||||
"e/desktop/background");
|
"e/desktop/background");
|
||||||
|
|
||||||
return ECORE_CALLBACK_PASS_ON;
|
return ECORE_CALLBACK_PASS_ON;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue