New icon theme config dialog. It doesn't actually save the config yet,
and it could benefit from the general ecore_desktop caching I will write soon. Not so happy about the information display in the top right corner, if anybody has a better idea, feel free to change it or let me know. SVN revision: 24923
This commit is contained in:
David Walter Seikel
parent
2286040067
commit
770820eee8
|
|
@ -130,6 +130,7 @@ e_widget_slider.h \
|
|||
e_int_config_window_manipulation.h \
|
||||
e_int_config_window_display.h \
|
||||
e_int_config_theme.h \
|
||||
e_int_config_icon_themes.h \
|
||||
e_int_config_menus.h \
|
||||
e_int_config_keybindings.h \
|
||||
e_int_config_cursor.h \
|
||||
|
|
@ -278,6 +279,7 @@ e_widget_slider.c \
|
|||
e_int_config_window_manipulation.c \
|
||||
e_int_config_window_display.c \
|
||||
e_int_config_theme.c \
|
||||
e_int_config_icon_themes.c \
|
||||
e_int_config_menus.c \
|
||||
e_int_config_keybindings.c \
|
||||
e_int_config_cursor.c \
|
||||
|
|
|
|||
|
|
@ -1180,7 +1180,7 @@ e_app_fields_fill(E_App *a, const char *path)
|
|||
{
|
||||
/* FIXME: Should do this only when needed, is it can be expensive. */
|
||||
/* FIXME: Use a real icon size and theme. */
|
||||
v = ecore_desktop_icon_find(desktop->icon, NULL, NULL);
|
||||
v = (char *) ecore_desktop_icon_find(desktop->icon, NULL, NULL);
|
||||
if (v)
|
||||
a->icon_path = evas_stringshare_add(v);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ e_configure_show(E_Container *con)
|
|||
e_configure_standard_item_add(eco, "enlightenment/background", _("Wallpaper"), e_int_config_wallpaper);
|
||||
e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme"), e_int_config_theme);
|
||||
e_configure_standard_item_add(eco, "enlightenment/fonts", _("Fonts"), e_int_config_fonts);
|
||||
e_configure_standard_item_add(eco, "enlightenment/icon_themes", _("Icon Themes"), e_int_config_icon_themes);
|
||||
e_configure_standard_item_add(eco, "enlightenment/mouse", _("Mouse Cursor"), e_int_config_cursor);
|
||||
e_configure_standard_item_add(eco, "enlightenment/windows", _("Window Display"), e_int_config_window_display);
|
||||
e_configure_standard_item_add(eco, "enlightenment/shelf", _("Shelves"), e_int_config_shelf);
|
||||
|
|
|
|||
|
|
@ -103,6 +103,7 @@
|
|||
#include "e_int_config_window_manipulation.h"
|
||||
#include "e_int_config_window_display.h"
|
||||
#include "e_int_config_theme.h"
|
||||
#include "e_int_config_icon_themes.h"
|
||||
#include "e_int_config_menus.h"
|
||||
#include "e_int_config_keybindings.h"
|
||||
#include "e_int_config_cursor.h"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,383 @@
|
|||
/*
|
||||
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||
*/
|
||||
#include "e.h"
|
||||
|
||||
#define MOD_UNLOADED 0
|
||||
#define MOD_ENABLED 1
|
||||
|
||||
typedef struct _CFIconTheme CFIconTheme;
|
||||
|
||||
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);
|
||||
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
|
||||
static void _ilist_cb_change(void *data, Evas_Object *obj);
|
||||
static void _add_theme(void *value, void *user_data);
|
||||
static int _sort_icon_themes(void *data1, void *data2);
|
||||
|
||||
struct _CFIconTheme
|
||||
{
|
||||
char *name;
|
||||
Ecore_Desktop_Icon_Theme *theme;
|
||||
};
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
Evas_List *icon_themes;
|
||||
int state;
|
||||
char *themename;
|
||||
struct {
|
||||
Evas_Object *comment;
|
||||
Evas_Object *list;
|
||||
Evas_Object *o_fm;
|
||||
Evas_Object *o_frame;
|
||||
Evas_Object *o_up_button;
|
||||
} gui;
|
||||
};
|
||||
|
||||
EAPI E_Config_Dialog *
|
||||
e_int_config_icon_themes(E_Container *con)
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_View *v;
|
||||
|
||||
v = E_NEW(E_Config_Dialog_View, 1);
|
||||
|
||||
v->create_cfdata = _create_data;
|
||||
v->free_cfdata = _free_data;
|
||||
v->basic.create_widgets = _basic_create_widgets;
|
||||
v->basic.apply_cfdata = _basic_apply_data;
|
||||
|
||||
cfd = e_config_dialog_new(con,
|
||||
_("Icon Theme Settings"),
|
||||
"E", "_config_icon_themes_dialog",
|
||||
"enlightenment/icon_themes", 0, v, NULL);
|
||||
return cfd;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Ecore_Hash *icon_themes = NULL;
|
||||
|
||||
if ((icon_themes = ecore_desktop_icon_theme_list()))
|
||||
ecore_hash_for_each_node(icon_themes, _add_theme, cfdata);
|
||||
|
||||
if (cfdata->icon_themes)
|
||||
cfdata->icon_themes = evas_list_sort(cfdata->icon_themes, evas_list_count(cfdata->icon_themes), _sort_icon_themes);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
cfdata->cfd = cfd;
|
||||
_fill_data(cfdata);
|
||||
return cfdata;
|
||||
}
|
||||
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_List *l;
|
||||
|
||||
while ((l = cfdata->icon_themes))
|
||||
{
|
||||
CFIconTheme *m;
|
||||
|
||||
m = l->data;
|
||||
cfdata->icon_themes = evas_list_remove_list(cfdata->icon_themes, l);
|
||||
free(m->name);
|
||||
E_FREE(m);
|
||||
}
|
||||
E_FREE(cfdata->themename);
|
||||
free(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
E_Module *m;
|
||||
const char *v;
|
||||
int i;
|
||||
|
||||
v = cfdata->themename;
|
||||
if (!v) return 0;
|
||||
#if 0
|
||||
for (i = 0; i < evas_list_count(cfdata->icon_themes); i++)
|
||||
{
|
||||
CFIconTheme *cm;
|
||||
|
||||
cm = evas_list_nth(cfdata->icon_themes, i);
|
||||
if ((cm) && (!strcmp(cm->name, v)))
|
||||
{
|
||||
if (cm->state != cfdata->state)
|
||||
{
|
||||
e_widget_disabled_set(cfdata->gui.configure, 1);
|
||||
e_widget_disabled_set(cfdata->gui.about, 1);
|
||||
|
||||
m = e_icon_theme_find(v);
|
||||
if (!m)
|
||||
{
|
||||
m = e_icon_theme_new(v);
|
||||
if (!m) break;
|
||||
}
|
||||
switch (cfdata->state)
|
||||
{
|
||||
case MOD_ENABLED:
|
||||
if (!m->enabled)
|
||||
{
|
||||
if (!e_icon_theme_enable(m))
|
||||
{
|
||||
cm->state = MOD_UNLOADED;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (m->enabled)
|
||||
{
|
||||
if (m->func.config)
|
||||
e_widget_disabled_set(cfdata->gui.configure, 0);
|
||||
if (m->func.about)
|
||||
e_widget_disabled_set(cfdata->gui.about, 0);
|
||||
cm->state = MOD_ENABLED;
|
||||
}
|
||||
break;
|
||||
case MOD_UNLOADED:
|
||||
if (m)
|
||||
{
|
||||
if (m->func.config)
|
||||
e_widget_disabled_set(cfdata->gui.configure, 1);
|
||||
if (m->func.about)
|
||||
e_widget_disabled_set(cfdata->gui.about, 1);
|
||||
e_icon_theme_disable(m);
|
||||
e_object_del(E_OBJECT(m));
|
||||
cm->state = MOD_UNLOADED;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_button_up(void *data1, void *data2)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = data1;
|
||||
if (cfdata->gui.o_fm)
|
||||
e_fm2_parent_go(cfdata->gui.o_fm);
|
||||
if (cfdata->gui.o_frame)
|
||||
e_widget_scrollframe_child_pos_set(cfdata->gui.o_frame, 0, 0);
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_files_changed(void *data, Evas_Object *obj, void *event_info)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = data;
|
||||
if (!cfdata->gui.o_fm) return;
|
||||
if (!e_fm2_has_parent_get(cfdata->gui.o_fm))
|
||||
{
|
||||
if (cfdata->gui.o_up_button)
|
||||
e_widget_disabled_set(cfdata->gui.o_up_button, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (cfdata->gui.o_up_button)
|
||||
e_widget_disabled_set(cfdata->gui.o_up_button, 0);
|
||||
}
|
||||
if (cfdata->gui.o_frame)
|
||||
e_widget_scrollframe_child_pos_set(cfdata->gui.o_frame, 0, 0);
|
||||
}
|
||||
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *of, *ob, *ot, *ilist, *mt;
|
||||
E_Radio_Group *rg;
|
||||
E_Module *m;
|
||||
Evas_List *l;
|
||||
char buf[4096];
|
||||
Evas_Coord ew, eh, mw, mh;
|
||||
E_Fm2_Config fmc;
|
||||
|
||||
o = e_widget_list_add(evas, 1, 0);
|
||||
ot = e_widget_table_add(evas, 1);
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Icon Themes"), 1);
|
||||
ilist = e_widget_ilist_add(evas, 24, 24, &(cfdata->themename));
|
||||
cfdata->gui.list = ilist;
|
||||
e_widget_on_change_hook_set(ilist, _ilist_cb_change, cfdata);
|
||||
|
||||
cfdata->state = -1;
|
||||
for (l = cfdata->icon_themes; l; l = l->next)
|
||||
{
|
||||
CFIconTheme *cm;
|
||||
Evas_Object *oc = NULL;
|
||||
|
||||
cm = l->data;
|
||||
if (cm)
|
||||
{
|
||||
if (cm->theme)
|
||||
{
|
||||
if (!cm->theme->example_path)
|
||||
cm->theme->example_path = (char *) ecore_desktop_icon_find(cm->theme->example, "24x24", cm->name);
|
||||
if (cm->theme->example_path)
|
||||
{
|
||||
oc = e_icon_add(evas);
|
||||
e_icon_file_set(oc, cm->theme->example_path);
|
||||
e_icon_fill_inside_set(oc, 1);
|
||||
}
|
||||
}
|
||||
e_widget_ilist_append(ilist, oc, cm->theme->name, NULL, NULL, cm->name);
|
||||
}
|
||||
}
|
||||
|
||||
e_widget_ilist_go(ilist);
|
||||
e_widget_min_size_set(of, 160, 160);
|
||||
e_widget_framelist_object_append(of, ilist);
|
||||
e_widget_table_object_append(ot, of, 0, 0, 2, 4, 1, 1, 1, 1);
|
||||
|
||||
of = e_widget_framelist_add(evas, _("Icon Theme"), 0);
|
||||
|
||||
mt = e_widget_textblock_add(evas);
|
||||
e_widget_textblock_plain_set(mt, "");
|
||||
e_widget_min_size_set(mt, 200, 75);
|
||||
cfdata->gui.comment = mt;
|
||||
e_widget_framelist_object_append(of, mt);
|
||||
|
||||
mt = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir",
|
||||
_cb_button_up, cfdata, NULL);
|
||||
cfdata->gui.o_up_button = mt;
|
||||
e_widget_framelist_object_append(of, mt);
|
||||
|
||||
mt = e_fm2_add(evas);
|
||||
cfdata->gui.o_fm = mt;
|
||||
memset(&fmc, 0, sizeof(E_Fm2_Config));
|
||||
fmc.view.mode = E_FM2_VIEW_MODE_LIST;
|
||||
fmc.view.open_dirs_in_place = 1;
|
||||
fmc.view.selector = 1;
|
||||
fmc.view.single_click = 0;
|
||||
fmc.view.no_subdir_jump = 0;
|
||||
fmc.icon.list.w = 24;
|
||||
fmc.icon.list.h = 24;
|
||||
fmc.icon.fixed.w = 1;
|
||||
fmc.icon.fixed.h = 1;
|
||||
fmc.icon.extension.show = 1;
|
||||
fmc.list.sort.no_case = 1;
|
||||
fmc.list.sort.dirs.first = 1;
|
||||
fmc.list.sort.dirs.last = 0;
|
||||
fmc.selection.single = 1;
|
||||
fmc.selection.windows_modifiers = 0;
|
||||
e_fm2_config_set(mt, &fmc);
|
||||
evas_object_smart_callback_add(mt, "dir_changed",
|
||||
_cb_files_changed, cfdata);
|
||||
// evas_object_smart_callback_add(mt, "selection_change",
|
||||
// _cb_files_selection_change, cfdata);
|
||||
// evas_object_smart_callback_add(mt, "selected",
|
||||
// _cb_files_selected, cfdata);
|
||||
// evas_object_smart_callback_add(mt, "changed",
|
||||
// _cb_files_files_changed, cfdata);
|
||||
e_fm2_path_set(cfdata->gui.o_fm, "/opt/kde3/share/icons/crystalsvg", "/");
|
||||
|
||||
ob = e_widget_scrollframe_pan_add(evas, mt,
|
||||
e_fm2_pan_set,
|
||||
e_fm2_pan_get,
|
||||
e_fm2_pan_max_get,
|
||||
e_fm2_pan_child_size_get);
|
||||
cfdata->gui.o_frame = ob;
|
||||
e_widget_min_size_set(ob, 200, 290);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
|
||||
e_widget_table_object_append(ot, of, 2, 0, 2, 4, 1, 1, 1, 1);
|
||||
e_widget_list_object_append(o, ot, 1, 1, 0.5);
|
||||
|
||||
e_dialog_resizable_set(cfd->dia, 1);
|
||||
return o;
|
||||
}
|
||||
|
||||
static void
|
||||
_ilist_cb_change(void *data, Evas_Object *obj)
|
||||
{
|
||||
E_Module *m;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
Evas_List *l;
|
||||
const char *v;
|
||||
char icn[PATH_MAX];
|
||||
Ecore_Desktop_Icon_Theme *theme;
|
||||
|
||||
cfdata = data;
|
||||
v = cfdata->themename;
|
||||
if (!v) return;
|
||||
|
||||
if ((theme = ecore_desktop_icon_theme_get(v, NULL)))
|
||||
{
|
||||
char *text;
|
||||
size_t length;
|
||||
|
||||
length = strlen(theme->comment) + strlen(theme->path) + 16;
|
||||
if (theme->inherits)
|
||||
length += strlen(theme->inherits) + 32;
|
||||
text = malloc(length);
|
||||
if (text)
|
||||
{
|
||||
if (theme->inherits)
|
||||
sprintf(text, "%s\npath = %s\ninherits from %s", theme->comment, theme->path, theme->inherits);
|
||||
else
|
||||
sprintf(text, "%s\npath = %s", theme->comment, theme->path);
|
||||
e_widget_textblock_plain_set(cfdata->gui.comment, text);
|
||||
}
|
||||
e_fm2_path_set(cfdata->gui.o_fm, ecore_file_get_dir(theme->path), "/");
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_add_theme(void *value, void *user_data)
|
||||
{
|
||||
Ecore_Hash_Node *node;
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
char *key;
|
||||
Ecore_Desktop_Icon_Theme *theme;
|
||||
CFIconTheme *m;
|
||||
|
||||
cfdata = user_data;
|
||||
node = (Ecore_Hash_Node *) value;
|
||||
key = (char *)node->key;
|
||||
theme = (Ecore_Desktop_Icon_Theme *)node->value;
|
||||
|
||||
m = E_NEW(CFIconTheme, 1);
|
||||
if (m)
|
||||
{
|
||||
m->name = strdup(key);
|
||||
m->theme = theme;
|
||||
cfdata->icon_themes = evas_list_append(cfdata->icon_themes, m);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static int
|
||||
_sort_icon_themes(void *data1, void *data2)
|
||||
{
|
||||
CFIconTheme *m1, *m2;
|
||||
|
||||
if (!data1) return 1;
|
||||
if (!data2) return -1;
|
||||
|
||||
m1 = data1;
|
||||
m2 = data2;
|
||||
return (strcmp((const char*)m1->theme->name, (const char*)m2->theme->name));
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
/*
|
||||
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
|
||||
*/
|
||||
#ifdef E_TYPEDEFS
|
||||
#else
|
||||
#ifndef E_INT_CONFIG_ICON_THEMES_H
|
||||
#define E_INT_CONFIG_ICON_THEMES_H
|
||||
|
||||
EAPI E_Config_Dialog *e_int_config_icon_themes(E_Container *con);
|
||||
|
||||
#endif
|
||||
#endif
|
||||
Loading…
Reference in New Issue