forked from enlightenment/enlightenment
e17: apps startup config dialog: added section to add .desktops from /etc/xdg/autostart
- whitespace cleanup SVN revision: 57375
This commit is contained in:
Hannes Janetzek
parent
58a6daea12
commit
3dccde7da9
|
|
@ -3,15 +3,24 @@
|
|||
typedef struct _E_Config_Data
|
||||
{
|
||||
const char *title, *icon, *dialog, *filename;
|
||||
Eina_Bool show_autostart;
|
||||
} E_Config_Data;
|
||||
|
||||
typedef struct _E_Config_App_List
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
Evas_Object *o_list, *o_add, *o_del;
|
||||
Eina_List *desks;
|
||||
} E_Config_App_List;
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Config_Data *data;
|
||||
Evas_Object *o_list, *o_add, *o_del;
|
||||
Evas_Object *o_order, *o_up, *o_down;
|
||||
Eina_List *apps, *new_apps;
|
||||
Evas_Object *o_list, *o_up, *o_down, *o_del;
|
||||
Eina_List *apps;
|
||||
Ecore_Timer *fill_delay;
|
||||
E_Config_App_List apps_user;
|
||||
E_Config_App_List apps_xdg; /* xdg autostart apps */
|
||||
};
|
||||
|
||||
/* local function prototypes */
|
||||
|
|
@ -24,7 +33,8 @@ static Eina_List *_load_menu(const char *path);
|
|||
static Eina_List *_load_order(const char *path);
|
||||
static int _save_menu(E_Config_Dialog_Data *cfdata);
|
||||
static int _save_order(E_Config_Dialog_Data *cfdata);
|
||||
static void _fill_apps_list(E_Config_Dialog_Data *cfdata);
|
||||
static void _fill_apps_list(E_Config_App_List *apps);
|
||||
static void _fill_xdg_list(E_Config_App_List *apps);
|
||||
static void _fill_order_list(E_Config_Dialog_Data *cfdata);
|
||||
static void _cb_apps_list_selected(void *data);
|
||||
static void _cb_order_list_selected(void *data);
|
||||
|
|
@ -35,7 +45,9 @@ static void _cb_add(void *data, void *data2 __UNUSED__);
|
|||
static void _cb_del(void *data, void *data2 __UNUSED__);
|
||||
static void _cb_up(void *data, void *data2 __UNUSED__);
|
||||
static void _cb_down(void *data, void *data2 __UNUSED__);
|
||||
static void _cb_order_del(void *data, void *data2 __UNUSED__);
|
||||
static Eina_Bool _cb_fill_delay(void *data);
|
||||
static void _list_items_state_set(E_Config_App_List *apps);
|
||||
|
||||
E_Config_Dialog *
|
||||
e_int_config_apps_add(E_Container *con, const char *params __UNUSED__)
|
||||
|
|
@ -102,6 +114,7 @@ e_int_config_apps_startup(E_Container *con, const char *params __UNUSED__)
|
|||
data->dialog = eina_stringshare_add("applications/startup_applications");
|
||||
data->icon = eina_stringshare_add("preferences-applications-startup");
|
||||
data->filename = eina_stringshare_add(buff);
|
||||
data->show_autostart = EINA_TRUE;
|
||||
return _create_dialog(con, data);
|
||||
}
|
||||
|
||||
|
|
@ -161,6 +174,8 @@ _create_data(E_Config_Dialog *cfd)
|
|||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
cfdata->data = data;
|
||||
cfdata->apps_xdg.cfdata = cfdata;
|
||||
cfdata->apps_user.cfdata = cfdata;
|
||||
if (!strcmp(ext, ".menu"))
|
||||
cfdata->apps = _load_menu(data->filename);
|
||||
else if (!strcmp(ext, ".order"))
|
||||
|
|
@ -187,7 +202,9 @@ _free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
EINA_LIST_FREE(cfdata->apps, desk)
|
||||
efreet_desktop_free(desk);
|
||||
EINA_LIST_FREE(cfdata->new_apps, desk)
|
||||
EINA_LIST_FREE(cfdata->apps_user.desks, desk)
|
||||
efreet_desktop_free(desk);
|
||||
EINA_LIST_FREE(cfdata->apps_xdg.desks, desk)
|
||||
efreet_desktop_free(desk);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
|
@ -200,30 +217,52 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
|
||||
otb = e_widget_toolbook_add(evas, 24, 24);
|
||||
|
||||
if (cfdata->data->show_autostart)
|
||||
{
|
||||
/* XDG autostart page */
|
||||
ot = e_widget_table_add(evas, EINA_FALSE);
|
||||
cfdata->apps_xdg.o_list = e_widget_ilist_add(evas, 24, 24, NULL);
|
||||
e_widget_ilist_multi_select_set(cfdata->apps_xdg.o_list, EINA_TRUE);
|
||||
e_widget_size_min_get(cfdata->apps_xdg.o_list, &mw, NULL);
|
||||
if (mw < (200 * e_scale)) mw = (200 * e_scale);
|
||||
e_widget_size_min_set(cfdata->apps_xdg.o_list, mw, (75 * e_scale));
|
||||
e_widget_table_object_append(ot, cfdata->apps_xdg.o_list, 0, 0, 2, 1, 1, 1, 1, 1);
|
||||
cfdata->apps_xdg.o_add = e_widget_button_add(evas, _("Add"), "list-add",
|
||||
_cb_add, &cfdata->apps_xdg, NULL);
|
||||
e_widget_disabled_set(cfdata->apps_xdg.o_add, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->apps_xdg.o_add, 0, 1, 1, 1, 1, 1, 1, 0);
|
||||
cfdata->apps_xdg.o_del = e_widget_button_add(evas, _("Remove"), "list-remove",
|
||||
_cb_del, &cfdata->apps_xdg, NULL);
|
||||
e_widget_disabled_set(cfdata->apps_xdg.o_del, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->apps_xdg.o_del, 1, 1, 1, 1, 1, 1, 1, 0);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("System"), ot,
|
||||
1, 1, 1, 1, 0.5, 0.0);
|
||||
}
|
||||
|
||||
/* Selection page */
|
||||
ot = e_widget_table_add(evas, EINA_FALSE);
|
||||
cfdata->o_list = e_widget_ilist_add(evas, 24, 24, NULL);
|
||||
e_widget_ilist_multi_select_set(cfdata->o_list, EINA_TRUE);
|
||||
e_widget_size_min_get(cfdata->o_list, &mw, NULL);
|
||||
cfdata->apps_user.o_list = e_widget_ilist_add(evas, 24, 24, NULL);
|
||||
e_widget_ilist_multi_select_set(cfdata->apps_user.o_list, EINA_TRUE);
|
||||
e_widget_size_min_get(cfdata->apps_user.o_list, &mw, NULL);
|
||||
if (mw < (200 * e_scale)) mw = (200 * e_scale);
|
||||
e_widget_size_min_set(cfdata->o_list, mw, (75 * e_scale));
|
||||
e_widget_table_object_append(ot, cfdata->o_list, 0, 0, 2, 1, 1, 1, 1, 1);
|
||||
cfdata->o_add = e_widget_button_add(evas, _("Add"), "list-add",
|
||||
_cb_add, cfdata, NULL);
|
||||
e_widget_disabled_set(cfdata->o_add, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->o_add, 0, 1, 1, 1, 1, 1, 1, 0);
|
||||
cfdata->o_del = e_widget_button_add(evas, _("Remove"), "list-remove",
|
||||
_cb_del, cfdata, NULL);
|
||||
e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->o_del, 1, 1, 1, 1, 1, 1, 1, 0);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Selection"), ot,
|
||||
e_widget_size_min_set(cfdata->apps_user.o_list, mw, (75 * e_scale));
|
||||
e_widget_table_object_append(ot, cfdata->apps_user.o_list, 0, 0, 2, 1, 1, 1, 1, 1);
|
||||
cfdata->apps_user.o_add = e_widget_button_add(evas, _("Add"), "list-add",
|
||||
_cb_add, &cfdata->apps_user, NULL);
|
||||
e_widget_disabled_set(cfdata->apps_user.o_add, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->apps_user.o_add, 0, 1, 1, 1, 1, 1, 1, 0);
|
||||
cfdata->apps_user.o_del = e_widget_button_add(evas, _("Remove"), "list-remove",
|
||||
_cb_del, &cfdata->apps_user, NULL);
|
||||
e_widget_disabled_set(cfdata->apps_user.o_del, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->apps_user.o_del, 1, 1, 1, 1, 1, 1, 1, 0);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Applications"), ot,
|
||||
1, 1, 1, 1, 0.5, 0.0);
|
||||
|
||||
/* Order page */
|
||||
ot = e_widget_table_add(evas, EINA_FALSE);
|
||||
cfdata->o_order = e_widget_ilist_add(evas, 24, 24, NULL);
|
||||
cfdata->o_list = e_widget_ilist_add(evas, 24, 24, NULL);
|
||||
_fill_order_list(cfdata);
|
||||
e_widget_table_object_append(ot, cfdata->o_order, 0, 0, 2, 1, 1, 1, 1, 1);
|
||||
e_widget_table_object_append(ot, cfdata->o_list, 0, 0, 3, 1, 1, 1, 1, 1);
|
||||
cfdata->o_up = e_widget_button_add(evas, _("Up"), "go-up",
|
||||
_cb_up, cfdata, NULL);
|
||||
e_widget_disabled_set(cfdata->o_up, EINA_TRUE);
|
||||
|
|
@ -232,6 +271,10 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
_cb_down, cfdata, NULL);
|
||||
e_widget_disabled_set(cfdata->o_down, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->o_down, 1, 1, 1, 1, 1, 1, 1, 0);
|
||||
cfdata->o_del = e_widget_button_add(evas, _("Remove"), "list-remove",
|
||||
_cb_order_del, cfdata, NULL);
|
||||
e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
|
||||
e_widget_table_object_append(ot, cfdata->o_del, 2, 1, 1, 1, 1, 1, 1, 0);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Order"), ot,
|
||||
1, 1, 1, 1, 0.5, 0.0);
|
||||
|
||||
|
|
@ -333,11 +376,60 @@ _save_order(E_Config_Dialog_Data *cfdata)
|
|||
}
|
||||
|
||||
static void
|
||||
_fill_apps_list(E_Config_Dialog_Data *cfdata)
|
||||
_list_items_state_set(E_Config_App_List *apps)
|
||||
{
|
||||
Eina_List *l = NULL, *desks = NULL;
|
||||
Efreet_Desktop *desk = NULL;
|
||||
Evas *evas;
|
||||
Eina_List *l;
|
||||
Efreet_Desktop *desk;
|
||||
|
||||
if (!apps->o_list)
|
||||
return;
|
||||
|
||||
evas = evas_object_evas_get(apps->o_list);
|
||||
evas_event_freeze(evas);
|
||||
edje_freeze();
|
||||
e_widget_ilist_freeze(apps->o_list);
|
||||
e_widget_ilist_clear(apps->o_list);
|
||||
|
||||
EINA_LIST_FOREACH(apps->desks, l, desk)
|
||||
{
|
||||
Evas_Object *icon = NULL, *end = NULL;
|
||||
|
||||
end = edje_object_add(evas);
|
||||
if (!e_theme_edje_object_set(end, "base/theme/widgets",
|
||||
"e/widgets/ilist/toggle_end"))
|
||||
{
|
||||
evas_object_del(end);
|
||||
end = NULL;
|
||||
}
|
||||
|
||||
if (!end) break;
|
||||
|
||||
if (eina_list_search_unsorted(apps->cfdata->apps, _cb_desks_sort, desk))
|
||||
{
|
||||
edje_object_signal_emit(end, "e,state,checked", "e");
|
||||
}
|
||||
else
|
||||
{
|
||||
edje_object_signal_emit(end, "e,state,unchecked", "e");
|
||||
}
|
||||
|
||||
icon = e_util_desktop_icon_add(desk, 24, evas);
|
||||
e_widget_ilist_append_full(apps->o_list, icon, end, desk->name,
|
||||
_cb_apps_list_selected, apps, NULL);
|
||||
}
|
||||
|
||||
e_widget_ilist_go(apps->o_list);
|
||||
e_widget_ilist_thaw(apps->o_list);
|
||||
edje_thaw();
|
||||
evas_event_thaw(evas);
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_apps_list(E_Config_App_List *apps)
|
||||
{
|
||||
Eina_List *desks = NULL;
|
||||
Efreet_Desktop *desk = NULL;
|
||||
|
||||
desks = efreet_util_desktop_name_glob_list("*");
|
||||
EINA_LIST_FREE(desks, desk)
|
||||
|
|
@ -349,7 +441,7 @@ _fill_apps_list(E_Config_Dialog_Data *cfdata)
|
|||
efreet_desktop_free(desk);
|
||||
continue;
|
||||
}
|
||||
ll = eina_list_search_unsorted_list(cfdata->new_apps, _cb_desks_sort, desk);
|
||||
ll = eina_list_search_unsorted_list(apps->desks, _cb_desks_sort, desk);
|
||||
if (ll)
|
||||
{
|
||||
Efreet_Desktop *old;
|
||||
|
|
@ -369,46 +461,65 @@ _fill_apps_list(E_Config_Dialog_Data *cfdata)
|
|||
efreet_desktop_free(desk);
|
||||
}
|
||||
else
|
||||
cfdata->new_apps = eina_list_append(cfdata->new_apps, desk);
|
||||
apps->desks = eina_list_append(apps->desks, desk);
|
||||
}
|
||||
cfdata->new_apps = eina_list_sort(cfdata->new_apps, -1, _cb_desks_sort);
|
||||
apps->desks = eina_list_sort(apps->desks, -1, _cb_desks_sort);
|
||||
|
||||
evas = evas_object_evas_get(cfdata->o_list);
|
||||
evas_event_freeze(evas);
|
||||
edje_freeze();
|
||||
e_widget_ilist_freeze(cfdata->o_list);
|
||||
e_widget_ilist_clear(cfdata->o_list);
|
||||
_list_items_state_set(apps);
|
||||
}
|
||||
|
||||
EINA_LIST_FOREACH(cfdata->new_apps, l, desk)
|
||||
static void
|
||||
_fill_xdg_list(E_Config_App_List *apps)
|
||||
{
|
||||
Eina_List *files;
|
||||
Efreet_Desktop *desk = NULL;
|
||||
const char *path = "/etc/xdg/autostart";
|
||||
char *file, *ext;
|
||||
char buf[4096];
|
||||
|
||||
files = ecore_file_ls(path);
|
||||
EINA_LIST_FREE(files, file)
|
||||
{
|
||||
Evas_Object *icon = NULL, *end = NULL;
|
||||
Eina_List *ll;
|
||||
|
||||
end = edje_object_add(evas);
|
||||
if (!e_theme_edje_object_set(end, "base/theme/widgets",
|
||||
"e/widgets/ilist/toggle_end"))
|
||||
if ((file[0] == '.') || !(ext = strrchr(file, '.')) || (strcmp(ext, ".desktop")))
|
||||
{
|
||||
evas_object_del(end);
|
||||
end = NULL;
|
||||
free(file);
|
||||
continue;
|
||||
}
|
||||
snprintf(buf, sizeof(buf), "%s/%s", path, file);
|
||||
free(file);
|
||||
|
||||
if (eina_list_search_unsorted(cfdata->apps, _cb_desks_sort, desk))
|
||||
desk = efreet_desktop_new(buf);
|
||||
if (!desk)
|
||||
continue;
|
||||
|
||||
ll = eina_list_search_unsorted_list(apps->desks, _cb_desks_sort, desk);
|
||||
if (ll)
|
||||
{
|
||||
if (end) edje_object_signal_emit(end, "e,state,checked", "e");
|
||||
Efreet_Desktop *old;
|
||||
|
||||
old = eina_list_data_get(ll);
|
||||
/*
|
||||
* This fixes when we have several .desktop with the same name,
|
||||
* and the only difference is that some of them are for specific
|
||||
* desktops.
|
||||
*/
|
||||
if ((old->only_show_in) && (!desk->only_show_in))
|
||||
{
|
||||
efreet_desktop_free(old);
|
||||
eina_list_data_set(ll, desk);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (end) edje_object_signal_emit(end, "e,state,unchecked", "e");
|
||||
efreet_desktop_free(desk);
|
||||
}
|
||||
else
|
||||
apps->desks = eina_list_append(apps->desks, desk);
|
||||
}
|
||||
|
||||
icon = e_util_desktop_icon_add(desk, 24, evas);
|
||||
e_widget_ilist_append_full(cfdata->o_list, icon, end, desk->name,
|
||||
_cb_apps_list_selected, cfdata, NULL);
|
||||
}
|
||||
apps->desks = eina_list_sort(apps->desks, -1, _cb_desks_sort);
|
||||
|
||||
e_widget_ilist_go(cfdata->o_list);
|
||||
e_widget_ilist_thaw(cfdata->o_list);
|
||||
edje_thaw();
|
||||
evas_event_thaw(evas);
|
||||
_list_items_state_set(apps);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -418,23 +529,23 @@ _fill_order_list(E_Config_Dialog_Data *cfdata)
|
|||
Efreet_Desktop *desk = NULL;
|
||||
Evas *evas;
|
||||
|
||||
evas = evas_object_evas_get(cfdata->o_order);
|
||||
evas = evas_object_evas_get(cfdata->o_list);
|
||||
evas_event_freeze(evas);
|
||||
edje_freeze();
|
||||
e_widget_ilist_freeze(cfdata->o_order);
|
||||
e_widget_ilist_clear(cfdata->o_order);
|
||||
e_widget_ilist_freeze(cfdata->o_list);
|
||||
e_widget_ilist_clear(cfdata->o_list);
|
||||
|
||||
EINA_LIST_FOREACH(cfdata->apps, l, desk)
|
||||
{
|
||||
Evas_Object *icon = NULL;
|
||||
|
||||
icon = e_util_desktop_icon_add(desk, 24, evas);
|
||||
e_widget_ilist_append(cfdata->o_order, icon, desk->name,
|
||||
e_widget_ilist_append(cfdata->o_list, icon, desk->name,
|
||||
_cb_order_list_selected, cfdata, NULL);
|
||||
}
|
||||
|
||||
e_widget_ilist_go(cfdata->o_order);
|
||||
e_widget_ilist_thaw(cfdata->o_order);
|
||||
e_widget_ilist_go(cfdata->o_list);
|
||||
e_widget_ilist_thaw(cfdata->o_list);
|
||||
edje_thaw();
|
||||
evas_event_thaw(evas);
|
||||
}
|
||||
|
|
@ -442,22 +553,22 @@ _fill_order_list(E_Config_Dialog_Data *cfdata)
|
|||
static void
|
||||
_cb_apps_list_selected(void *data)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
E_Config_App_List *apps;
|
||||
const E_Ilist_Item *it;
|
||||
Eina_List *l;
|
||||
unsigned int enabled = 0, disabled = 0;
|
||||
|
||||
if (!(cfdata = data)) return;
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_list), l, it)
|
||||
if (!(apps = data)) return;
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(apps->o_list), l, it)
|
||||
{
|
||||
if ((!it->selected) || (it->header)) continue;
|
||||
if (eina_list_search_unsorted(cfdata->apps, _cb_desks_name, it->label))
|
||||
if (eina_list_search_unsorted(apps->cfdata->apps, _cb_desks_name, it->label))
|
||||
enabled++;
|
||||
else
|
||||
disabled++;
|
||||
}
|
||||
e_widget_disabled_set(cfdata->o_add, !disabled);
|
||||
e_widget_disabled_set(cfdata->o_del, !enabled);
|
||||
e_widget_disabled_set(apps->o_add, !disabled);
|
||||
e_widget_disabled_set(apps->o_del, !enabled);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -467,10 +578,11 @@ _cb_order_list_selected(void *data)
|
|||
int sel, count;
|
||||
|
||||
if (!(cfdata = data)) return;
|
||||
sel = e_widget_ilist_selected_get(cfdata->o_order);
|
||||
sel = e_widget_ilist_selected_get(cfdata->o_list);
|
||||
count = eina_list_count(cfdata->apps);
|
||||
e_widget_disabled_set(cfdata->o_up, (sel == 0));
|
||||
e_widget_disabled_set(cfdata->o_down, !(sel < (count - 1)));
|
||||
e_widget_disabled_set(cfdata->o_del, EINA_FALSE);
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
@ -500,35 +612,65 @@ _cb_desks_sort(const void *data1, const void *data2)
|
|||
static void
|
||||
_cb_add(void *data, void *data2 __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
E_Config_App_List *apps;
|
||||
const E_Ilist_Item *it;
|
||||
Eina_List *l;
|
||||
|
||||
if (!(cfdata = data)) return;
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(cfdata->o_list), l, it)
|
||||
if (!(apps = data)) return;
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(apps->o_list), l, it)
|
||||
{
|
||||
Efreet_Desktop *desk;
|
||||
|
||||
if ((!it->selected) || (it->header)) continue;
|
||||
if (!(desk = eina_list_search_unsorted(cfdata->new_apps, _cb_desks_name, it->label))) continue;
|
||||
if (!eina_list_search_unsorted(cfdata->apps, _cb_desks_sort, desk))
|
||||
if (!(desk = eina_list_search_unsorted(apps->desks, _cb_desks_name, it->label))) continue;
|
||||
if (!eina_list_search_unsorted(apps->cfdata->apps, _cb_desks_sort, desk))
|
||||
{
|
||||
Evas_Object *end;
|
||||
|
||||
end = e_widget_ilist_item_end_get(it);
|
||||
if (end) edje_object_signal_emit(end, "e,state,checked", "e");
|
||||
efreet_desktop_ref(desk);
|
||||
cfdata->apps = eina_list_append(cfdata->apps, desk);
|
||||
apps->cfdata->apps = eina_list_append(apps->cfdata->apps, desk);
|
||||
}
|
||||
}
|
||||
e_widget_ilist_unselect(cfdata->o_list);
|
||||
e_widget_disabled_set(cfdata->o_add, EINA_TRUE);
|
||||
e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
|
||||
_fill_order_list(cfdata);
|
||||
e_widget_ilist_unselect(apps->o_list);
|
||||
e_widget_disabled_set(apps->o_add, EINA_TRUE);
|
||||
e_widget_disabled_set(apps->o_del, EINA_TRUE);
|
||||
_fill_order_list(apps->cfdata);
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_del(void *data, void *data2 __UNUSED__)
|
||||
{
|
||||
E_Config_App_List *apps;
|
||||
const E_Ilist_Item *it;
|
||||
Eina_List *l;
|
||||
|
||||
if (!(apps = data)) return;
|
||||
EINA_LIST_FOREACH(e_widget_ilist_items_get(apps->o_list), l, it)
|
||||
{
|
||||
Efreet_Desktop *desk;
|
||||
|
||||
if ((!it->selected) || (it->header)) continue;
|
||||
if ((desk = eina_list_search_unsorted(apps->cfdata->apps, _cb_desks_name, it->label)))
|
||||
{
|
||||
Evas_Object *end;
|
||||
|
||||
end = e_widget_ilist_item_end_get(it);
|
||||
if (end) edje_object_signal_emit(end, "e,state,unchecked", "e");
|
||||
apps->cfdata->apps = eina_list_remove(apps->cfdata->apps, desk);
|
||||
efreet_desktop_unref(desk);
|
||||
}
|
||||
}
|
||||
|
||||
e_widget_ilist_unselect(apps->o_list);
|
||||
e_widget_disabled_set(apps->o_add, EINA_TRUE);
|
||||
e_widget_disabled_set(apps->o_del, EINA_TRUE);
|
||||
_fill_order_list(apps->cfdata);
|
||||
}
|
||||
|
||||
static void
|
||||
_cb_order_del(void *data, void *data2 __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
const E_Ilist_Item *it;
|
||||
|
|
@ -540,18 +682,18 @@ _cb_del(void *data, void *data2 __UNUSED__)
|
|||
Efreet_Desktop *desk;
|
||||
|
||||
if ((!it->selected) || (it->header)) continue;
|
||||
|
||||
if ((desk = eina_list_search_unsorted(cfdata->apps, _cb_desks_name, it->label)))
|
||||
{
|
||||
Evas_Object *end;
|
||||
|
||||
end = e_widget_ilist_item_end_get(it);
|
||||
if (end) edje_object_signal_emit(end, "e,state,unchecked", "e");
|
||||
cfdata->apps = eina_list_remove(cfdata->apps, desk);
|
||||
efreet_desktop_unref(desk);
|
||||
}
|
||||
}
|
||||
|
||||
_list_items_state_set(&(cfdata->apps_xdg));
|
||||
_list_items_state_set(&(cfdata->apps_user));
|
||||
|
||||
e_widget_ilist_unselect(cfdata->o_list);
|
||||
e_widget_disabled_set(cfdata->o_add, EINA_TRUE);
|
||||
e_widget_disabled_set(cfdata->o_del, EINA_TRUE);
|
||||
_fill_order_list(cfdata);
|
||||
}
|
||||
|
|
@ -566,13 +708,13 @@ _cb_up(void *data, void *data2 __UNUSED__)
|
|||
int sel;
|
||||
|
||||
if (!(cfdata = data)) return;
|
||||
evas = evas_object_evas_get(cfdata->o_order);
|
||||
evas = evas_object_evas_get(cfdata->o_list);
|
||||
evas_event_freeze(evas);
|
||||
edje_freeze();
|
||||
e_widget_ilist_freeze(cfdata->o_order);
|
||||
e_widget_ilist_freeze(cfdata->o_list);
|
||||
|
||||
sel = e_widget_ilist_selected_get(cfdata->o_order);
|
||||
lbl = e_widget_ilist_selected_label_get(cfdata->o_order);
|
||||
sel = e_widget_ilist_selected_get(cfdata->o_list);
|
||||
lbl = e_widget_ilist_selected_label_get(cfdata->o_list);
|
||||
if ((l = eina_list_search_unsorted_list(cfdata->apps, _cb_desks_name, lbl)))
|
||||
{
|
||||
Efreet_Desktop *desk;
|
||||
|
|
@ -587,18 +729,18 @@ _cb_up(void *data, void *data2 __UNUSED__)
|
|||
cfdata->apps = eina_list_remove_list(cfdata->apps, l);
|
||||
cfdata->apps = eina_list_prepend_relative_list(cfdata->apps, desk, ll);
|
||||
|
||||
e_widget_ilist_remove_num(cfdata->o_order, sel);
|
||||
e_widget_ilist_go(cfdata->o_order);
|
||||
e_widget_ilist_remove_num(cfdata->o_list, sel);
|
||||
e_widget_ilist_go(cfdata->o_list);
|
||||
icon = e_util_desktop_icon_add(desk, 24, evas);
|
||||
e_widget_ilist_prepend_relative(cfdata->o_order, icon, desk->name,
|
||||
e_widget_ilist_prepend_relative(cfdata->o_list, icon, desk->name,
|
||||
_cb_order_list_selected, cfdata,
|
||||
NULL, (sel - 1));
|
||||
e_widget_ilist_selected_set(cfdata->o_order, (sel - 1));
|
||||
e_widget_ilist_selected_set(cfdata->o_list, (sel - 1));
|
||||
}
|
||||
}
|
||||
|
||||
e_widget_ilist_go(cfdata->o_order);
|
||||
e_widget_ilist_thaw(cfdata->o_order);
|
||||
e_widget_ilist_go(cfdata->o_list);
|
||||
e_widget_ilist_thaw(cfdata->o_list);
|
||||
edje_thaw();
|
||||
evas_event_thaw(evas);
|
||||
}
|
||||
|
|
@ -613,13 +755,13 @@ _cb_down(void *data, void *data2 __UNUSED__)
|
|||
int sel;
|
||||
|
||||
if (!(cfdata = data)) return;
|
||||
evas = evas_object_evas_get(cfdata->o_order);
|
||||
evas = evas_object_evas_get(cfdata->o_list);
|
||||
evas_event_freeze(evas);
|
||||
edje_freeze();
|
||||
e_widget_ilist_freeze(cfdata->o_order);
|
||||
e_widget_ilist_freeze(cfdata->o_list);
|
||||
|
||||
sel = e_widget_ilist_selected_get(cfdata->o_order);
|
||||
lbl = e_widget_ilist_selected_label_get(cfdata->o_order);
|
||||
sel = e_widget_ilist_selected_get(cfdata->o_list);
|
||||
lbl = e_widget_ilist_selected_label_get(cfdata->o_list);
|
||||
if ((l = eina_list_search_unsorted_list(cfdata->apps, _cb_desks_name, lbl)))
|
||||
{
|
||||
Efreet_Desktop *desk;
|
||||
|
|
@ -634,18 +776,18 @@ _cb_down(void *data, void *data2 __UNUSED__)
|
|||
cfdata->apps = eina_list_remove_list(cfdata->apps, l);
|
||||
cfdata->apps = eina_list_append_relative_list(cfdata->apps, desk, ll);
|
||||
|
||||
e_widget_ilist_remove_num(cfdata->o_order, sel);
|
||||
e_widget_ilist_go(cfdata->o_order);
|
||||
e_widget_ilist_remove_num(cfdata->o_list, sel);
|
||||
e_widget_ilist_go(cfdata->o_list);
|
||||
icon = e_util_desktop_icon_add(desk, 24, evas);
|
||||
e_widget_ilist_append_relative(cfdata->o_order, icon, desk->name,
|
||||
e_widget_ilist_append_relative(cfdata->o_list, icon, desk->name,
|
||||
_cb_order_list_selected, cfdata,
|
||||
NULL, sel);
|
||||
e_widget_ilist_selected_set(cfdata->o_order, (sel + 1));
|
||||
e_widget_ilist_selected_set(cfdata->o_list, (sel + 1));
|
||||
}
|
||||
}
|
||||
|
||||
e_widget_ilist_go(cfdata->o_order);
|
||||
e_widget_ilist_thaw(cfdata->o_order);
|
||||
e_widget_ilist_go(cfdata->o_list);
|
||||
e_widget_ilist_thaw(cfdata->o_list);
|
||||
edje_thaw();
|
||||
evas_event_thaw(evas);
|
||||
}
|
||||
|
|
@ -656,11 +798,20 @@ _cb_fill_delay(void *data)
|
|||
E_Config_Dialog_Data *cfdata;
|
||||
int mw;
|
||||
|
||||
if (!(cfdata = data)) return ECORE_CALLBACK_RENEW;
|
||||
_fill_apps_list(cfdata);
|
||||
e_widget_size_min_get(cfdata->o_list, &mw, NULL);
|
||||
if (!(cfdata = data)) return ECORE_CALLBACK_CANCEL;
|
||||
_fill_apps_list(&cfdata->apps_user);
|
||||
e_widget_size_min_get(cfdata->apps_user.o_list, &mw, NULL);
|
||||
if (mw < (200 * e_scale)) mw = (200 * e_scale);
|
||||
e_widget_size_min_set(cfdata->o_list, mw, (75 * e_scale));
|
||||
e_widget_size_min_set(cfdata->apps_user.o_list, mw, (75 * e_scale));
|
||||
|
||||
if (cfdata->data->show_autostart)
|
||||
{
|
||||
_fill_xdg_list(&cfdata->apps_xdg);
|
||||
e_widget_size_min_get(cfdata->apps_xdg.o_list, &mw, NULL);
|
||||
if (mw < (200 * e_scale)) mw = (200 * e_scale);
|
||||
e_widget_size_min_set(cfdata->apps_xdg.o_list, mw, (75 * e_scale));
|
||||
}
|
||||
|
||||
cfdata->fill_delay = NULL;
|
||||
return ECORE_CALLBACK_CANCEL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue