Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf_applications
Modified Files:
e_int_config_apps.c
Log Message:
Rework the ibar/restart/startup Apps dialog.
- Resizable
- Lists ALL applications
- Can multi-select on the ilists now
- Dialog takes up less space.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/modules/conf_applications/e_int_config_apps.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_apps.c 23 Aug 2007 10:48:29 -0000 1.5
+++ e_int_config_apps.c 4 Dec 2007 16:34:11 -0000 1.6
@@ -1,69 +1,72 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
#include "e.h"
-/* TODO: This should be modified to handle any other fdo menu editing. */
+typedef struct _E_Config_Data
+{
+ const char *title, *icon, *dialog, *filename;
+} E_Config_Data;
+
+struct _E_Config_Dialog_Data
+{
+ E_Config_Data *data;
+ Evas_Object *o_all, *o_sel;
+ Evas_Object *o_add, *o_del;
+ Evas_Object *o_up, *o_down;
+ Ecore_List *apps;
+ char *app, *sel;
+};
+/* local protos */
+static E_Config_Dialog *_create_dialog(E_Container *con, E_Config_Data *data);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(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 int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static void _fill_categories(E_Config_Dialog_Data *cfdata);
+static Ecore_List *_load_menu(const char *path);
+static Ecore_List *_load_order(const char *path);
static void _fill_apps(E_Config_Dialog_Data *cfdata);
static void _fill_list(E_Config_Dialog_Data *cfdata);
-static void _category_cb_selected(void *data);
-static void _apps_cb_selected(void *data);
-static void _list_cb_selected(void *data);
-static void _cb_categories(void *data, void *data2);
+static int _cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2);
+static void _all_list_cb_change(void *data, Evas_Object *obj);
+static void _sel_list_cb_change(void *data, Evas_Object *obj);
+static void _all_list_cb_selected(void *data);
+static void _sel_list_cb_selected(void *data);
static void _cb_add(void *data, void *data2);
static void _cb_del(void *data, void *data2);
static void _cb_up(void *data, void *data2);
static void _cb_down(void *data, void *data2);
-static int _cb_desktop_name_sort(Efreet_Desktop *a, Efreet_Desktop *b);
-
static int _save_menu(E_Config_Dialog_Data *cfdata);
static int _save_order(E_Config_Dialog_Data *cfdata);
-static Ecore_List *_load_menu(const char *path);
-static Ecore_List *_load_order(const char *path);
-typedef struct _E_Config_Once
+EAPI E_Config_Dialog *
+e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__)
{
- const char *title;
- const char *icon;
- const char *dialog;
- char *filename;
-} E_Config_Once;
-
-static E_Config_Dialog *_create_config_dialog(E_Container *con, E_Config_Once
*once);
+ E_Config_Data *data;
+ char buf[4096];
-struct _E_Config_Dialog_Data
-{
- E_Config_Once *once;
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite.menu",
+ e_user_homedir_get());
+ data = E_NEW(E_Config_Data, 1);
+ data->title = evas_stringshare_add(_("Favorites Menu"));
+ data->dialog = evas_stringshare_add("_config_apps_favs_dialog");
+ data->icon = evas_stringshare_add("enlightenment/favorites");
+ data->filename = evas_stringshare_add(buf);
- Evas_Object *o_apps, *o_list;
- Evas_Object *o_add, *o_del, *o_categories;
- Evas_Object *o_up, *o_down;
- Ecore_List *apps;
- const char *category;
- int category_n;
-
- char *fav, *app;
-};
+ return _create_dialog(con, data);
+}
EAPI E_Config_Dialog *
-e_int_config_apps_add(E_Container *con, const char *params __UNUSED__)
+e_int_config_apps_add(E_Container *con, const char *params __UNUSED__)
{
E_Desktop_Edit *ed;
Efreet_Desktop *de = NULL;
char path[PATH_MAX];
const char *desktop_dir;
-
+
desktop_dir = e_user_desktop_dir_get();
if (desktop_dir)
{
int i;
-
+
for (i = 1; i < 65536; i++)
{
snprintf(path, sizeof(path), "%s/_new_app-%i.desktop",
@@ -85,249 +88,194 @@
de = efreet_desktop_empty_new(NULL);
if (!de) return NULL;
ed = e_desktop_edit(con, de);
- return (E_Config_Dialog *)ed;
+ if (!ed) return NULL;
+ return ed->cfd;
}
EAPI E_Config_Dialog *
-e_int_config_apps_favs(E_Container *con, const char *params __UNUSED__)
+e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__)
{
- E_Config_Once *once;
+ E_Config_Data *data;
char buf[4096];
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite.menu",
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/default/.order",
e_user_homedir_get());
+ data = E_NEW(E_Config_Data, 1);
+ data->title = evas_stringshare_add(_("IBar Applications"));
+ data->dialog = evas_stringshare_add("_config_apps_ibar_dialog");
+ data->icon = evas_stringshare_add("enlightenment/ibar_applications");
+ data->filename = evas_stringshare_add(buf);
- once = E_NEW(E_Config_Once, 1);
- once->title = _("Favorites Menu");
- once->dialog = "_config_apps_favs_dialog";
- once->icon = "enlightenment/favorites";
- once->filename = strdup(buf);
- return _create_config_dialog(con, once);
-}
-
-EAPI E_Config_Dialog *
-e_int_config_apps_ibar(E_Container *con, const char *params __UNUSED__)
-{
- E_Config_Once *once;
- char buf[4096];
-
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/bar/default/.order",
- e_user_homedir_get());
-
- once = E_NEW(E_Config_Once, 1);
- once->title = _("IBar Applications");
- once->icon = "enlightenment/ibar_applications";
- once->dialog = "_config_apps_ibar_dialog";
- once->filename = strdup(buf);
-
- return _create_config_dialog(con, once);
+ return _create_dialog(con, data);
}
EAPI E_Config_Dialog *
e_int_config_apps_ibar_other(E_Container *con, const char *path)
{
- E_Config_Once *once;
+ E_Config_Data *data;
if (!path) return NULL;
- once = E_NEW(E_Config_Once, 1);
- once->title = _("IBar Applications");
- once->icon = "enlightenment/ibar_applications";
- once->dialog = "_config_apps_ibar_dialog";
- once->filename = strdup(path);
-
- return _create_config_dialog(con, once);
+ data = E_NEW(E_Config_Data, 1);
+ data->title = evas_stringshare_add(_("IBar Applications"));
+ data->dialog = evas_stringshare_add("_config_apps_ibar_dialog");
+ data->icon = evas_stringshare_add("enlightenment/ibar_applications");
+ data->filename = evas_stringshare_add(path);
+
+ return _create_dialog(con, data);
}
EAPI E_Config_Dialog *
e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__)
{
- E_Config_Once *once;
+ E_Config_Data *data;
char buf[4096];
-
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order",
+
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order",
e_user_homedir_get());
+ data = E_NEW(E_Config_Data, 1);
+ data->title = evas_stringshare_add(_("Startup Applications"));
+ data->dialog = evas_stringshare_add("_config_apps_startup_dialog");
+ data->icon = evas_stringshare_add("enlightenment/startup_applications");
+ data->filename = evas_stringshare_add(buf);
- once = E_NEW(E_Config_Once, 1);
- once->title = _("Startup Applications");
- once->icon = "enlightenment/startup_applications";
- once->dialog = "_config_apps_startup_dialog";
- once->filename = strdup(buf);
-
- return _create_config_dialog(con, once);
+ return _create_dialog(con, data);
}
EAPI E_Config_Dialog *
e_int_config_apps_restart(E_Container *con, const char *params __UNUSED__)
{
- E_Config_Once *once;
+ E_Config_Data *data;
char buf[4096];
-
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order",
+
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order",
e_user_homedir_get());
+ data = E_NEW(E_Config_Data, 1);
+ data->title = evas_stringshare_add(_("Restart Applications"));
+ data->dialog = evas_stringshare_add("_config_apps_restart_dialog");
+ data->icon = evas_stringshare_add("enlightenment/restart_applications");
+ data->filename = evas_stringshare_add(buf);
- once = E_NEW(E_Config_Once, 1);
- once->title = _("Restart Applications");
- once->icon = "enlightenment/restart_applications";
- once->dialog = "_config_apps_restart_dialog";
- once->filename = strdup(buf);
-
- return _create_config_dialog(con, once);
+ return _create_dialog(con, data);
}
+/* local functions */
static E_Config_Dialog *
-_create_config_dialog(E_Container *con, E_Config_Once *once)
+_create_dialog(E_Container *con, E_Config_Data *data)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
- if (e_config_dialog_find("E", once->dialog)) return NULL;
+ if (e_config_dialog_find("E", data->dialog))
+ {
+ if (data->title) evas_stringshare_del(data->title);
+ if (data->dialog) evas_stringshare_del(data->dialog);
+ if (data->icon) evas_stringshare_del(data->icon);
+ if (data->filename) evas_stringshare_del(data->filename);
+ E_FREE(data);
+ return NULL;
+ }
v = E_NEW(E_Config_Dialog_View, 1);
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create;
v->basic.apply_cfdata = _basic_apply;
-
- cfd = e_config_dialog_new(con, once->title, "E", once->dialog,
- once->icon, 0, v, once);
+ cfd = e_config_dialog_new(con, data->title, "E", data->dialog,
+ data->icon, 0, v, data);
+ e_dialog_resizable_set(cfd->dia, 1);
return cfd;
}
-/* Private Functions */
static void *
_create_data(E_Config_Dialog *cfd)
{
E_Config_Dialog_Data *cfdata;
- E_Config_Once *once;
+ E_Config_Data *data;
const char *ext;
- cfdata = E_NEW(E_Config_Dialog_Data, 1);
- once = cfd->data;
- if (!once->filename) return NULL;
+ if (!(data = cfd->data)) return NULL;
+ if (!data->filename) return NULL;
- ext = strrchr(once->filename, '.');
+ ext = strrchr(data->filename, '.');
if (!ext) return NULL;
- cfdata->once = once;
- if (!strcmp(ext, ".menu"))
- cfdata->apps = _load_menu(once->filename);
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ cfdata->data = data;
+ if (!strcmp(ext, ".menu"))
+ cfdata->apps = _load_menu(data->filename);
else if (!strcmp(ext, ".order"))
- cfdata->apps = _load_order(once->filename);
-
- return cfdata;
-}
-
-static Ecore_List *
-_load_menu(const char *path)
-{
- Efreet_Menu *menu, *entry;
- Ecore_List *apps;
-
- apps = ecore_list_new();
- ecore_list_free_cb_set(apps, ECORE_FREE_CB(efreet_desktop_free));
+ cfdata->apps = _load_order(data->filename);
- menu = efreet_menu_parse(path);
- if (!menu) return apps;
-
- ecore_list_first_goto(menu->entries);
- while ((entry = ecore_list_next(menu->entries)))
- {
- if (entry->type != EFREET_MENU_ENTRY_DESKTOP) continue;
- efreet_desktop_ref(entry->desktop);
- ecore_list_append(apps, entry->desktop);
- }
- efreet_menu_free(menu);
- return apps;
-}
-
-static Ecore_List *
-_load_order(const char *path)
-{
- E_Order *order;
- Evas_List *l;
- Ecore_List *apps;
-
- apps = ecore_list_new();
- ecore_list_free_cb_set(apps, ECORE_FREE_CB(efreet_desktop_free));
- order = e_order_new(path);
- for (l = order->desktops; l; l = l->next)
- {
- efreet_desktop_ref(l->data);
- ecore_list_append(apps, l->data);
- }
-
- e_object_del(E_OBJECT(order));
- return apps;
+ return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- if (cfdata->once)
+ E_Config_Data *data;
+
+ data = cfdata->data;
+ if (data)
{
- E_FREE(cfdata->once->filename);
- E_FREE(cfdata->once);
+ if (data->title) evas_stringshare_del(data->title);
+ if (data->dialog) evas_stringshare_del(data->dialog);
+ if (data->icon) evas_stringshare_del(data->icon);
+ if (data->filename) evas_stringshare_del(data->filename);
+ E_FREE(data);
}
-
+ if (cfdata->app) free(cfdata->app);
+ if (cfdata->sel) free(cfdata->sel);
if (cfdata->apps) ecore_list_destroy(cfdata->apps);
- if (cfdata->category) ecore_string_release(cfdata->category);
- E_FREE(cfdata->app);
- E_FREE(cfdata->fav);
E_FREE(cfdata);
}
static Evas_Object *
_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
- Evas_Object *ot, *of, *ob;
-
- ot = e_widget_table_add(evas, 0);
-
- of = e_widget_frametable_add(evas, _("Application Categories"), 0);
- ob = e_widget_button_add(evas, _("Categories"), "widget/categories",
- _cb_categories, cfdata, NULL);
- cfdata->o_categories = ob;
- e_widget_disabled_set(ob, 1);
- e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0);
-
- ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->app));
- cfdata->o_apps = ob;
- _fill_categories(cfdata);
- e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
-
- e_widget_table_object_append(ot, of, 0, 0, 1, 4, 1, 1, 1, 1);
-
- ob = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, cfdata,
NULL);
- cfdata->o_add = ob;
- e_widget_disabled_set(ob, 1);
- e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 0, 0);
-
- ob = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_del, cfdata,
NULL);
- cfdata->o_del = ob;
- e_widget_disabled_set(ob, 1);
- e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 0, 0);
-
- of = e_widget_framelist_add(evas, cfdata->once->title, 0);
- ob = e_widget_ilist_add(evas, 24, 24, &(cfdata->fav));
- cfdata->o_list = ob;
+ Evas_Object *o, *ot, *ow, *bt;
+
+ o = e_widget_list_add(evas, 0, 1);
+ ot = e_widget_frametable_add(evas, _("All Applications"), 0);
+ ow = e_widget_ilist_add(evas, 24, 24, &(cfdata->app));
+ e_widget_ilist_multi_select_set(ow, 1);
+ e_widget_on_change_hook_set(ow, _all_list_cb_change, cfdata);
+ cfdata->o_all = ow;
+ _fill_apps(cfdata);
+ e_widget_frametable_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 1, 1);
+ ow = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add,
+ cfdata, NULL);
+ cfdata->o_add = ow;
+ e_widget_disabled_set(ow, 1);
+ e_widget_frametable_object_append(ot, ow, 0, 1, 1, 1, 1, 0, 1, 0);
+ e_widget_list_object_append(o, ot, 1, 1, 0.5);
+
+ ot = e_widget_frametable_add(evas, _("Selected Applications"), 0);
+ ow = e_widget_ilist_add(evas, 24, 24, &(cfdata->sel));
+ e_widget_ilist_multi_select_set(ow, 1);
+ e_widget_on_change_hook_set(ow, _sel_list_cb_change, cfdata);
+ cfdata->o_sel = ow;
_fill_list(cfdata);
- e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(ot, of, 2, 0, 1, 4, 1, 1, 1, 1);
+ e_widget_frametable_object_append(ot, ow, 0, 0, 1, 1, 1, 1, 1, 1);
+ bt = e_widget_table_add(evas, 0);
+ ow = e_widget_button_add(evas, _("Up"), "widget/up_arrow", _cb_up,
+ cfdata, NULL);
+ cfdata->o_up = ow;
+ e_widget_disabled_set(ow, 1);
+ e_widget_table_object_append(bt, ow, 0, 0, 1, 1, 1, 0, 1, 0);
+ ow = e_widget_button_add(evas, _("Down"), "widget/down_arrow", _cb_down,
+ cfdata, NULL);
+ cfdata->o_down = ow;
+ e_widget_disabled_set(ow, 1);
+ e_widget_table_object_append(bt, ow, 1, 0, 1, 1, 1, 0, 1, 0);
+ e_widget_frametable_object_append(ot, bt, 0, 1, 1, 1, 1, 0, 1, 0);
+ ow = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_del,
+ cfdata, NULL);
+ cfdata->o_del = ow;
+ e_widget_disabled_set(ow, 1);
+ e_widget_frametable_object_append(ot, ow, 0, 2, 1, 1, 1, 0, 1, 0);
+ e_widget_list_object_append(o, ot, 1, 1, 0.5);
- ob = e_widget_button_add(evas, _("Up"), "widget/up_arrow",
- _cb_up, cfdata, NULL);
- cfdata->o_up = ob;
- e_widget_disabled_set(ob, 1);
- e_widget_table_object_append(ot, ob, 3, 1, 1, 1, 1, 0, 0, 0);
-
- ob = e_widget_button_add(evas, _("Down"), "widget/down_arrow",
- _cb_down, cfdata, NULL);
- cfdata->o_down = ob;
- e_widget_disabled_set(ob, 1);
- e_widget_table_object_append(ot, ob, 3, 2, 1, 1, 1, 0, 0, 0);
-
- e_dialog_resizable_set(cfd->dia, 1);
- return ot;
+ return o;
}
static int
@@ -335,12 +283,10 @@
{
int ret = 0;
char *ext;
-
- if (!cfdata->apps || !cfdata->once || !cfdata->once->filename) return 1;
- ext = strrchr(cfdata->once->filename, '.');
+ if ((!cfdata->data) || (!cfdata->data->filename)) return 0;
+ ext = strrchr(cfdata->data->filename, '.');
if (!ext) return 0;
-
if (!strcmp(ext, ".menu"))
ret = _save_menu(cfdata);
else if (!strcmp(ext, ".order"))
@@ -349,375 +295,402 @@
return ret;
}
-static int
-_save_menu(E_Config_Dialog_Data *cfdata)
+static Ecore_List *
+_load_menu(const char *path)
{
- Efreet_Menu *menu;
- Efreet_Desktop *desk;
- int ret;
-
- menu = efreet_menu_new();
- ecore_list_first_goto(cfdata->apps);
- while ((desk = ecore_list_next(cfdata->apps)))
- efreet_menu_desktop_insert(menu, desk, -1);
+ Efreet_Menu *menu, *entry;
+ Ecore_List *apps = NULL;
- ret = efreet_menu_save(menu, cfdata->once->filename);
+ apps = ecore_list_new();
+ ecore_list_free_cb_set(apps, ECORE_FREE_CB(efreet_desktop_free));
+ menu = efreet_menu_parse(path);
+ if (!menu) return apps;
+ ecore_list_first_goto(menu->entries);
+ while ((entry = ecore_list_next(menu->entries)))
+ {
+ if (entry->type != EFREET_MENU_ENTRY_DESKTOP) continue;
+ efreet_desktop_ref(entry->desktop);
+ ecore_list_append(apps, entry->desktop);
+ }
efreet_menu_free(menu);
- return ret;
+ if (apps) ecore_list_sort(apps, ECORE_COMPARE_CB(_cb_sort_desks),
ECORE_SORT_MIN);
+ return apps;
}
-static int
-_save_order(E_Config_Dialog_Data *cfdata)
+static Ecore_List *
+_load_order(const char *path)
{
- E_Order *order;
- Efreet_Desktop *desk;
-
- order = e_order_new(cfdata->once->filename);
- if (!order) return 0;
- e_order_clear(order);
- ecore_list_first_goto(cfdata->apps);
- while ((desk = ecore_list_next(cfdata->apps)))
- e_order_append(order, desk);
+ E_Order *order = NULL;
+ Evas_List *l = NULL;
+ Ecore_List *apps = NULL;
+ apps = ecore_list_new();
+ ecore_list_free_cb_set(apps, ECORE_FREE_CB(efreet_desktop_free));
+ if (!path) return apps;
+ order = e_order_new(path);
+ if (!order) return apps;
+ for (l = order->desktops; l; l = l->next)
+ {
+ efreet_desktop_ref(l->data);
+ ecore_list_append(apps, l->data);
+ }
+ if (l) evas_list_free(l);
e_object_del(E_OBJECT(order));
- return 1;
+ if (apps) ecore_list_sort(apps, ECORE_COMPARE_CB(_cb_sort_desks),
ECORE_SORT_MIN);
+ return apps;
}
-static void
-_fill_categories(E_Config_Dialog_Data *cfdata)
+static void
+_fill_apps(E_Config_Dialog_Data *cfdata)
{
+ Ecore_List *desks = NULL, *l = NULL;
+ Efreet_Desktop *desk = NULL;
Evas *evas;
- Evas_Coord w;
- Ecore_List *cats;
- char *category;
+ int w;
- evas = evas_object_evas_get(cfdata->o_apps);
- evas_event_freeze(evas);
- edje_freeze();
- e_widget_ilist_freeze(cfdata->o_apps);
- e_widget_ilist_clear(cfdata->o_apps);
+ l = ecore_list_new();
+ ecore_list_free_cb_set(l, ECORE_FREE_CB(efreet_desktop_free));
- cats = efreet_util_desktop_categories_list();
- ecore_list_sort(cats, ECORE_COMPARE_CB(strcmp), ECORE_SORT_MIN);
- ecore_list_first_goto(cats);
- while ((category = ecore_list_next(cats)))
- e_widget_ilist_append(cfdata->o_apps, NULL, category,
- _category_cb_selected, cfdata, category);
- ecore_list_destroy(cats);
-
- e_widget_ilist_go(cfdata->o_apps);
- e_widget_min_size_get(cfdata->o_apps, &w, NULL);
- e_widget_min_size_set(cfdata->o_apps, w, 200);
- e_widget_ilist_thaw(cfdata->o_apps);
- edje_thaw();
- evas_event_thaw(evas);
-}
-
-static int
-_cb_desktop_name_sort(Efreet_Desktop *a, Efreet_Desktop *b)
-{
- return strcmp(a->name, b->name);
-}
-
-static void
-_fill_apps(E_Config_Dialog_Data *cfdata)
-{
- Evas *evas;
- Evas_Coord w;
+ evas = evas_object_evas_get(cfdata->o_all);
+ desks = efreet_util_desktop_name_glob_list("*");
+ ecore_list_sort(desks, ECORE_COMPARE_CB(_cb_sort_desks), ECORE_SORT_MIN);
+ ecore_list_first_goto(desks);
+ while ((desk = ecore_list_next(desks)))
+ {
+ if (!ecore_list_find(l, ECORE_COMPARE_CB(_cb_sort_desks), desk))
+ {
+ efreet_desktop_ref(desk);
+ ecore_list_append(l, desk);
+ }
+ }
- Ecore_List *desktops;
- Efreet_Desktop *desktop;
+ if (desks) ecore_list_destroy(desks);
+ if (l) ecore_list_sort(l, ECORE_COMPARE_CB(_cb_sort_desks), ECORE_SORT_MIN);
- if (!cfdata->category) return;
- evas = evas_object_evas_get(cfdata->o_apps);
evas_event_freeze(evas);
edje_freeze();
- e_widget_ilist_freeze(cfdata->o_apps);
- e_widget_ilist_clear(cfdata->o_apps);
- e_widget_ilist_header_append(cfdata->o_apps, NULL, cfdata->category);
-
- desktops = (Ecore_List
*)efreet_util_desktop_category_list(cfdata->category);
- ecore_list_sort(desktops, ECORE_COMPARE_CB(_cb_desktop_name_sort),
ECORE_SORT_MIN);
- ecore_list_first_goto(desktops);
- while ((desktop = ecore_list_next(desktops)))
- {
- Evas_Object *icon;
-
- icon = e_util_desktop_icon_add(desktop, "24x24", evas);
- e_widget_ilist_append(cfdata->o_apps, icon, desktop->name,
- _apps_cb_selected, cfdata, desktop->orig_path);
- }
-
- e_widget_ilist_go(cfdata->o_apps);
- e_widget_min_size_get(cfdata->o_apps, &w, NULL);
- e_widget_min_size_set(cfdata->o_apps, w, 200);
- e_widget_ilist_thaw(cfdata->o_apps);
+ e_widget_ilist_freeze(cfdata->o_all);
+ e_widget_ilist_clear(cfdata->o_all);
+ ecore_list_first_goto(l);
+ while ((desk = ecore_list_next(l)))
+ {
+ Evas_Object *icon = NULL;
+
+ icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ e_widget_ilist_append(cfdata->o_all, icon, desk->name,
+ _all_list_cb_selected, cfdata, desk->orig_path);
+ }
+ if (l) ecore_list_destroy(l);
+
+ e_widget_ilist_go(cfdata->o_all);
+ e_widget_ilist_thaw(cfdata->o_all);
edje_thaw();
evas_event_thaw(evas);
+ e_widget_min_size_get(cfdata->o_all, &w, NULL);
+ e_widget_min_size_set(cfdata->o_all, w, 240);
}
-static void
+static void
_fill_list(E_Config_Dialog_Data *cfdata)
{
+ Efreet_Desktop *desk = NULL;
Evas *evas;
- Evas_Coord w;
- Efreet_Desktop *desktop;
-
- if ((!cfdata->apps))
- {
- e_widget_min_size_set(cfdata->o_list, 200, 200);
- return;
- }
+ int w;
- evas = evas_object_evas_get(cfdata->o_list);
+ if (!cfdata->apps) return;
+ evas = evas_object_evas_get(cfdata->o_sel);
evas_event_freeze(evas);
edje_freeze();
- e_widget_ilist_freeze(cfdata->o_list);
-
+ e_widget_ilist_freeze(cfdata->o_sel);
+ e_widget_ilist_clear(cfdata->o_sel);
ecore_list_first_goto(cfdata->apps);
- while ((desktop = ecore_list_next(cfdata->apps)))
+ while ((desk = ecore_list_next(cfdata->apps)))
{
Evas_Object *icon = NULL;
- icon = e_util_desktop_icon_add(desktop, "24x24", evas);
- e_widget_ilist_append(cfdata->o_list, icon, desktop->name,
- _list_cb_selected, cfdata, desktop->orig_path);
+ icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ e_widget_ilist_append(cfdata->o_sel, icon, desk->name,
+ _sel_list_cb_selected, cfdata, desk->orig_path);
}
-
- e_widget_ilist_go(cfdata->o_list);
- e_widget_min_size_get(cfdata->o_list, &w, NULL);
- e_widget_min_size_set(cfdata->o_list, w, 200);
- e_widget_ilist_thaw(cfdata->o_list);
+ if (cfdata->apps) ecore_list_destroy(cfdata->apps);
+ cfdata->apps = NULL;
+ e_widget_ilist_go(cfdata->o_sel);
+ e_widget_min_size_get(cfdata->o_sel, &w, NULL);
+ e_widget_min_size_set(cfdata->o_sel, w, 240);
+ e_widget_ilist_thaw(cfdata->o_sel);
edje_thaw();
evas_event_thaw(evas);
+ e_widget_disabled_set(cfdata->o_del, 1);
+}
+
+static int
+_cb_sort_desks(Efreet_Desktop *d1, Efreet_Desktop *d2)
+{
+ if (!d1->name) return 1;
+ if (!d2->name) return -1;
+ return strcmp(d1->name, d2->name);
}
static void
-_category_cb_selected(void *data)
+_all_list_cb_change(void *data, Evas_Object *obj)
{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data;
+ E_Config_Dialog_Data *cfdata = NULL;
- cfdata->category_n = e_widget_ilist_selected_get(cfdata->o_apps);
- if (cfdata->category) ecore_string_release(cfdata->category);
- cfdata->category = ecore_string_instance(cfdata->app);
- _fill_apps(cfdata);
- e_widget_disabled_set(cfdata->o_categories, 0);
+ if (!(cfdata = data)) return;
+
+ /* unselect anything in Sel List & disable buttons */
+ e_widget_ilist_unselect(cfdata->o_sel);
+ e_widget_disabled_set(cfdata->o_up, 1);
+ e_widget_disabled_set(cfdata->o_down, 1);
+ e_widget_disabled_set(cfdata->o_del, 1);
}
static void
-_apps_cb_selected(void *data)
+_sel_list_cb_change(void *data, Evas_Object *obj)
{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data;
- e_widget_disabled_set(cfdata->o_add, 0);
+ E_Config_Dialog_Data *cfdata = NULL;
+
+ if (!(cfdata = data)) return;
+
+ /* unselect anything in All List & disable buttons */
+ e_widget_ilist_unselect(cfdata->o_all);
+ e_widget_disabled_set(cfdata->o_add, 1);
}
static void
-_list_cb_selected(void *data)
+_all_list_cb_selected(void *data)
{
- E_Config_Dialog_Data *cfdata;
+ E_Config_Dialog_Data *cfdata = NULL;
+ int sel;
+
+ if (!(cfdata = data)) return;
+ sel = e_widget_ilist_selected_count_get(cfdata->o_all);
+ if (sel == 0)
+ e_widget_disabled_set(cfdata->o_add, 1);
+ else
+ e_widget_disabled_set(cfdata->o_add, 0);
+}
+
+static void
+_sel_list_cb_selected(void *data)
+{
+ E_Config_Dialog_Data *cfdata = NULL;
int sel, count;
-
- cfdata = data;
- e_widget_disabled_set(cfdata->o_del, 0);
- count = e_widget_ilist_count(cfdata->o_list);
- sel = e_widget_ilist_selected_get(cfdata->o_list);
- if (sel == 0)
+ if (!(cfdata = data)) return;
+ e_widget_disabled_set(cfdata->o_del, 0);
+ sel = e_widget_ilist_selected_get(cfdata->o_sel);
+ count = e_widget_ilist_count(cfdata->o_sel);
+ if (sel == 0)
e_widget_disabled_set(cfdata->o_up, 1);
else
e_widget_disabled_set(cfdata->o_up, 0);
- if (sel < (count -1))
+ if (sel < (count - 1))
e_widget_disabled_set(cfdata->o_down, 0);
else
e_widget_disabled_set(cfdata->o_down, 1);
}
static void
-_cb_categories(void *data, void *data2)
-{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data;
- e_widget_disabled_set(cfdata->o_categories, 1);
- if (cfdata->category) ecore_string_release(cfdata->category);
- cfdata->category = NULL;
- _fill_categories(cfdata);
- e_widget_ilist_nth_show(cfdata->o_apps, cfdata->category_n, 1);
- cfdata->category_n = 0;
-}
-
-static void
_cb_add(void *data, void *data2)
{
- E_Config_Dialog_Data *cfdata;
- Evas_Object *icon;
- Efreet_Desktop *desk;
+ E_Config_Dialog_Data *cfdata = NULL;
+ Evas_List *l = NULL;
Evas *evas;
- Evas_Coord w;
-
- cfdata = data;
- if (!cfdata->apps) return;
- if (e_widget_ilist_selected_get(cfdata->o_apps) < 0) return;
- desk = efreet_desktop_get(cfdata->app);
- if (!desk) return;
+ int w, i;
- evas = evas_object_evas_get(cfdata->o_list);
+ if (!(cfdata = data)) return;
+ evas = evas_object_evas_get(cfdata->o_all);
evas_event_freeze(evas);
edje_freeze();
- e_widget_ilist_freeze(cfdata->o_list);
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
- e_widget_ilist_append(cfdata->o_list, icon, desk->name,
- _list_cb_selected, cfdata, cfdata->app);
- e_widget_ilist_go(cfdata->o_list);
- e_widget_min_size_get(cfdata->o_list, &w, NULL);
- e_widget_min_size_set(cfdata->o_list, w, 200);
- e_widget_ilist_thaw(cfdata->o_list);
+ e_widget_ilist_freeze(cfdata->o_all);
+
+ for (i = 0, l = e_widget_ilist_items_get(cfdata->o_all); l; l = l->next,
i++)
+ {
+ E_Ilist_Item *item = NULL;
+ Efreet_Desktop *desk = NULL;
+ Evas_Object *icon = NULL;
+ const char *lbl;
+
+ if (!(item = l->data)) continue;
+ if (!item->selected) continue;
+ lbl = e_widget_ilist_nth_label_get(cfdata->o_all, i);
+ if (!lbl) continue;
+ desk = efreet_util_desktop_name_find(lbl);
+ if (!desk) continue;
+ icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ e_widget_ilist_append(cfdata->o_sel, icon, desk->name,
+ _sel_list_cb_selected, cfdata, desk->orig_path);
+ }
+
+ e_widget_ilist_go(cfdata->o_sel);
+ e_widget_min_size_get(cfdata->o_sel, &w, NULL);
+ e_widget_min_size_set(cfdata->o_sel, w, 240);
+ e_widget_ilist_thaw(cfdata->o_sel);
+ e_widget_ilist_unselect(cfdata->o_all);
edje_thaw();
evas_event_thaw(evas);
-
- ecore_list_append(cfdata->apps, desk);
}
static void
_cb_del(void *data, void *data2)
{
- E_Config_Dialog_Data *cfdata;
- Efreet_Desktop *desk;
+ E_Config_Dialog_Data *cfdata = NULL;
+ Evas_List *l = NULL;
Evas *evas;
- Evas_Coord w;
- int num;
-
- cfdata = data;
- if (!cfdata->apps) return;
- num = e_widget_ilist_selected_get(cfdata->o_list);
- if (num < 0) return;
+ int w;
- evas = evas_object_evas_get(cfdata->o_list);
+ if (!(cfdata = data)) return;
+ evas = evas_object_evas_get(cfdata->o_sel);
evas_event_freeze(evas);
edje_freeze();
- e_widget_ilist_freeze(cfdata->o_list);
- e_widget_ilist_remove_num(cfdata->o_list, num);
- e_widget_ilist_go(cfdata->o_list);
- e_widget_min_size_get(cfdata->o_list, &w, NULL);
- e_widget_min_size_set(cfdata->o_list, w, 200);
- e_widget_ilist_thaw(cfdata->o_list);
- edje_thaw();
- evas_event_thaw(evas);
-
- desk = efreet_desktop_get(cfdata->fav);
- if (!desk) return;
- if (ecore_list_goto(cfdata->apps, desk))
+ e_widget_ilist_freeze(cfdata->o_sel);
+ for (l = e_widget_ilist_items_get(cfdata->o_sel); l; l = l->next)
{
- Efreet_Desktop *tmp;
+ int i = 0;
- tmp = ecore_list_remove(cfdata->apps);
- efreet_desktop_free(tmp);
+ i = e_widget_ilist_selected_get(cfdata->o_sel);
+ if (i == -1) break;
+ e_widget_ilist_remove_num(cfdata->o_sel, i);
}
- efreet_desktop_free(desk);
+ e_widget_ilist_unselect(cfdata->o_sel);
+ e_widget_ilist_go(cfdata->o_sel);
+ e_widget_min_size_get(cfdata->o_sel, &w, NULL);
+ e_widget_min_size_set(cfdata->o_sel, w, 240);
+ e_widget_ilist_thaw(cfdata->o_sel);
+ edje_thaw();
+ evas_event_thaw(evas);
}
static void
_cb_up(void *data, void *data2)
{
- E_Config_Dialog_Data *cfdata;
- Efreet_Desktop *desk;
+ E_Config_Dialog_Data *cfdata = NULL;
+ Evas_Object *icon = NULL;
+ Efreet_Desktop *desk = NULL;
Evas *evas;
- Evas_Object *icon;
- Evas_Coord w;
- int sel, i;
-
- cfdata = data;
- if (!cfdata->apps) return;
-
- sel = e_widget_ilist_selected_get(cfdata->o_list);
- if (sel < 0) return;
+ const char *lbl;
+ int sel, w;
- desk = efreet_desktop_get(cfdata->fav);
- if (!desk) return;
-
- evas = evas_object_evas_get(cfdata->o_list);
+ if (!(cfdata = data)) return;
+ if (e_widget_ilist_selected_count_get(cfdata->o_sel) > 1) return;
+ evas = evas_object_evas_get(cfdata->o_sel);
evas_event_freeze(evas);
edje_freeze();
- e_widget_ilist_freeze(cfdata->o_list);
- e_widget_ilist_remove_num(cfdata->o_list, sel);
- e_widget_ilist_go(cfdata->o_list);
-
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
- e_widget_ilist_prepend_relative(cfdata->o_list, icon, desk->name,
- _list_cb_selected, cfdata, cfdata->fav, (sel - 1));
- e_widget_ilist_selected_set(cfdata->o_list, (sel - 1));
- e_widget_ilist_go(cfdata->o_list);
- e_widget_min_size_get(cfdata->o_list, &w, NULL);
- e_widget_min_size_set(cfdata->o_list, w, 200);
- e_widget_ilist_thaw(cfdata->o_list);
- edje_thaw();
- evas_event_thaw(evas);
-
- if (ecore_list_goto(cfdata->apps, desk))
+ e_widget_ilist_freeze(cfdata->o_sel);
+ sel = e_widget_ilist_selected_get(cfdata->o_sel);
+ lbl = e_widget_ilist_nth_label_get(cfdata->o_sel, sel);
+ if (lbl)
{
- Efreet_Desktop *tmp;
-
- i = ecore_list_index(cfdata->apps);
- tmp = ecore_list_remove(cfdata->apps);
- ecore_list_index_goto(cfdata->apps, (i - 1));
- ecore_list_insert(cfdata->apps, desk);
- efreet_desktop_free(tmp);
+ desk = efreet_util_desktop_name_find(lbl);
+ if (desk)
+ {
+ e_widget_ilist_remove_num(cfdata->o_sel, sel);
+ e_widget_ilist_go(cfdata->o_sel);
+ icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ e_widget_ilist_prepend_relative(cfdata->o_sel, icon, desk->name,
+ _sel_list_cb_selected, cfdata,
+ desk->orig_path, (sel - 1));
+ e_widget_ilist_selected_set(cfdata->o_sel, (sel - 1));
+ }
}
- else
- efreet_desktop_free(desk);
+ e_widget_ilist_go(cfdata->o_sel);
+ e_widget_min_size_get(cfdata->o_sel, &w, NULL);
+ e_widget_min_size_set(cfdata->o_sel, w, 240);
+ e_widget_ilist_thaw(cfdata->o_sel);
+ edje_thaw();
+ evas_event_thaw(evas);
}
static void
_cb_down(void *data, void *data2)
{
- E_Config_Dialog_Data *cfdata;
- Efreet_Desktop *desk;
+ E_Config_Dialog_Data *cfdata = NULL;
+ Evas_Object *icon = NULL;
+ Efreet_Desktop *desk = NULL;
Evas *evas;
- Evas_Object *icon;
- Evas_Coord w;
- int sel, i;
+ const char *lbl;
+ int sel, w;
- cfdata = data;
- if (!cfdata->apps) return;
-
- sel = e_widget_ilist_selected_get(cfdata->o_list);
- if (sel < 0) return;
-
- desk = efreet_desktop_get(cfdata->fav);
- if (!desk) return;
-
- evas = evas_object_evas_get(cfdata->o_list);
+ if (!(cfdata = data)) return;
+ if (e_widget_ilist_selected_count_get(cfdata->o_sel) > 1) return;
+ evas = evas_object_evas_get(cfdata->o_sel);
evas_event_freeze(evas);
edje_freeze();
- e_widget_ilist_freeze(cfdata->o_list);
- e_widget_ilist_remove_num(cfdata->o_list, sel);
- e_widget_ilist_go(cfdata->o_list);
-
- icon = e_util_desktop_icon_add(desk, "24x24", evas);
- e_widget_ilist_append_relative(cfdata->o_list, icon, desk->name,
- _list_cb_selected, cfdata, cfdata->fav, sel);
- e_widget_ilist_selected_set(cfdata->o_list, (sel + 1));
- e_widget_ilist_go(cfdata->o_list);
- e_widget_min_size_get(cfdata->o_list, &w, NULL);
- e_widget_min_size_set(cfdata->o_list, w, 200);
- e_widget_ilist_thaw(cfdata->o_list);
+ e_widget_ilist_freeze(cfdata->o_sel);
+ sel = e_widget_ilist_selected_get(cfdata->o_sel);
+ lbl = e_widget_ilist_nth_label_get(cfdata->o_sel, sel);
+ if (lbl)
+ {
+ desk = efreet_util_desktop_name_find(lbl);
+ if (desk)
+ {
+ e_widget_ilist_remove_num(cfdata->o_sel, sel);
+ e_widget_ilist_go(cfdata->o_sel);
+ icon = e_util_desktop_icon_add(desk, "24x24", evas);
+ e_widget_ilist_append_relative(cfdata->o_sel, icon, desk->name,
+ _sel_list_cb_selected, cfdata,
+ desk->orig_path, sel);
+ e_widget_ilist_selected_set(cfdata->o_sel, (sel + 1));
+ }
+ }
+ e_widget_ilist_go(cfdata->o_sel);
+ e_widget_min_size_get(cfdata->o_sel, &w, NULL);
+ e_widget_min_size_set(cfdata->o_sel, w, 240);
+ e_widget_ilist_thaw(cfdata->o_sel);
edje_thaw();
evas_event_thaw(evas);
+}
+
+static int
+_save_menu(E_Config_Dialog_Data *cfdata)
+{
+ Evas_List *l = NULL;
+ Efreet_Menu *menu = NULL;
+ int i, ret;
- if (ecore_list_goto(cfdata->apps, desk))
+ menu = efreet_menu_new();
+ for (i = 0, l = e_widget_ilist_items_get(cfdata->o_sel); l; l = l->next,
i++)
{
- Efreet_Desktop *tmp;
+ E_Ilist_Item *item = NULL;
+ Efreet_Desktop *desk = NULL;
+ const char *lbl;
+
+ if (!(item = l->data)) continue;
+ lbl = e_widget_ilist_nth_label_get(cfdata->o_sel, i);
+ if (!lbl) continue;
+ desk = efreet_util_desktop_name_find(lbl);
+ if (!desk) continue;
+ efreet_menu_desktop_insert(menu, desk, -1);
+ }
+ ret = efreet_menu_save(menu, cfdata->data->filename);
+ efreet_menu_free(menu);
+ return ret;
+}
+
+static int
+_save_order(E_Config_Dialog_Data *cfdata)
+{
+ Evas_List *l = NULL;
+ E_Order *order = NULL;
+ int i;
- i = ecore_list_index(cfdata->apps);
- tmp = ecore_list_remove(cfdata->apps);
- ecore_list_index_goto(cfdata->apps, (i + 1));
- ecore_list_insert(cfdata->apps, desk);
- efreet_desktop_free(tmp);
+ order = e_order_new(cfdata->data->filename);
+ if (!order) return 0;
+ e_order_clear(order);
+ for (i = 0, l = e_widget_ilist_items_get(cfdata->o_sel); l; l = l->next,
i++)
+ {
+ E_Ilist_Item *item = NULL;
+ Efreet_Desktop *desk = NULL;
+ const char *lbl;
+
+ if (!(item = l->data)) continue;
+ lbl = e_widget_ilist_nth_label_get(cfdata->o_sel, i);
+ if (!lbl) continue;
+ desk = efreet_util_desktop_name_find(lbl);
+ if (!desk) continue;
+ e_order_append(order, desk);
}
- else
- efreet_desktop_free(desk);
+ e_object_del(E_OBJECT(order));
+ return 1;
}
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs