enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

e personal application launchers: overhaul a little bit. 

Merge both "add launcher" and "del launcher" entries in the configuration panel to a single "personal application launchers".


SVN revision: 72825
This commit is contained in:
Chidambar Zinnoury 2012-06-25 19:05:59 +00:00
parent b4706e4872
commit 770c930a75
6 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/conf_applications/Makefile.am
View File

@ -26,8 +26,8 @@ module_la_SOURCES = e_mod_main.c \
e_int_config_defapps.h \
e_int_config_deskenv.c \
e_int_config_deskenv.h \
e_int_config_delapps.c \
e_int_config_delapps.h
e_int_config_apps_personal.c \
e_int_config_apps_personal.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version

38
src/modules/conf_applications/e_int_config_delapps.c → src/modules/conf_applications/e_int_config_apps_personal.c
View File

@ -7,7 +7,7 @@ struct _E_Config_Dialog_Data
struct
{
Evas_Object *list, *del;
Evas_Object *list, *add, *del;
} obj;
};
@ -18,16 +18,17 @@ static Evas_Object *_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E
static Eina_Bool _desks_update(void *data, int ev_type __UNUSED__, void *ev __UNUSED__);
static int _cb_desks_sort(const void *data1, const void *data2);
static void _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il);
static void _btn_cb_add(void *data, void *data2);
static void _btn_cb_del(void *data, void *data2);
static void _widget_list_selection_changed(void *data, Evas_Object *obj __UNUSED__);
E_Config_Dialog *
e_int_config_delapps(E_Container *con, const char *params __UNUSED__)
e_int_config_apps_personal(E_Container *con, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "applications/del_applications"))
if (e_config_dialog_find("E", "applications/personal_applications"))
return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
@ -35,9 +36,9 @@ e_int_config_delapps(E_Container *con, const char *params __UNUSED__)
v->free_cfdata = _free_data;
v->basic.create_widgets = _basic_create;
cfd = e_config_dialog_new(con, _("Delete Launchers"),
"E", "applications/del_applications",
"preferences-applications-del", 0, v, NULL);
cfd = e_config_dialog_new(con, _("Personal Application Launchers"),
"E", "applications/personal_applications",
"preferences-applications-personal", 0, v, NULL);
return cfd;
}
@ -82,15 +83,19 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
if (mh < (160 * e_scale)) mh = 160 * e_scale;
e_widget_size_min_set(li, mw, mh);
e_widget_on_change_hook_set(li, _widget_list_selection_changed, cfdata);
e_widget_table_object_append(of, li, 0, 1, 1, 1, 1, 1, 1, 1);
e_widget_table_object_append(of, li, 0, 1, 2, 1, 1, 1, 1, 1);
_fill_apps_list(cfdata, cfdata->obj.list);
e_widget_ilist_go(li);
ob = e_widget_button_add(evas, _("Delete"), NULL, _btn_cb_del, cfdata, NULL);
ob = e_widget_button_add(evas, _("Add"), "list-add", _btn_cb_add, cfdata, NULL);
cfdata->obj.add = ob;
e_widget_table_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0);
ob = e_widget_button_add(evas, _("Remove"), "list-remove", _btn_cb_del, cfdata, NULL);
cfdata->obj.del = ob;
e_widget_disabled_set(ob, 1);
e_widget_table_object_append(of, ob, 0, 2, 1, 1, 1, 1, 1, 0);
e_widget_table_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 0);
e_dialog_resizable_set(cfd->dia, 1);
e_win_centered_set(cfd->dia->win, 1);
@ -173,6 +178,21 @@ _fill_apps_list(E_Config_Dialog_Data *cfdata, Evas_Object *il)
evas_event_thaw(evas);
}
static void
_btn_cb_add(void *data, void *data2 __UNUSED__)
{
E_Config_Dialog_Data *cfdata = data;
E_Manager *man;
E_Container *con;
man = e_manager_current_get();
if (!man) return;
con = e_container_current_get(man);
if (!con) return;
e_desktop_edit(con, NULL);
}
static void
_btn_cb_del(void *data, void *data2 __UNUSED__)
{

9
src/modules/conf_applications/e_int_config_apps_personal.h Normal file
View File

@ -0,0 +1,9 @@
#ifdef E_TYPEDEFS
#else
#ifndef E_INT_CONFIG_APPS_PERSONAL_H
#define E_INT_CONFIG_APPS_PERSONAL_H
E_Config_Dialog *e_int_config_apps_personal(E_Container *con, const char *params __UNUSED__);
#endif
#endif

9
src/modules/conf_applications/e_int_config_delapps.h
View File

@ -1,9 +0,0 @@
#ifdef E_TYPEDEFS
#else
#ifndef E_INT_CONFIG_DELAPPS_H
#define E_INT_CONFIG_DELAPPS_H
E_Config_Dialog *e_int_config_delapps(E_Container *con, const char *params __UNUSED__);
#endif
#endif

14
src/modules/conf_applications/e_mod_main.c
View File

@ -17,14 +17,14 @@ e_modapi_init(E_Module *m)
{
e_configure_registry_category_add("applications", 20, _("Apps"), NULL,
"preferences-applications");
e_configure_registry_item_add("applications/new_application", 10,
_("Create Launcher"), NULL,
e_configure_registry_item_add("applications/new_application", -1,
_("Create Application Launcher"), NULL,
"preferences-applications-add",
e_int_config_apps_add);
e_configure_registry_item_add("applications/del_application", 20,
_("Delete Personal Launchers"), NULL,
"preferences-applications-del",
e_int_config_delapps);
e_configure_registry_item_add("applications/personal_applications", 20,
_("Personal Application Launchers"), NULL,
"preferences-applications-personal",
e_int_config_apps_personal);
e_configure_registry_item_add("applications/favorite_applications", 30,
_("Favorite Applications"), NULL,
"user-bookmarks",
@ -71,7 +71,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_category_del("internal");
e_configure_registry_item_del("applications/favorite_applications");
e_configure_registry_item_del("applications/new_application");
e_configure_registry_item_del("applications/del_application");
e_configure_registry_item_del("applications/personal_applications");
e_configure_registry_item_del("applications/ibar_applications");
e_configure_registry_item_del("applications/restart_applications");
e_configure_registry_item_del("applications/startup_applications");

4
src/modules/conf_applications/e_mod_main.h
View File

@ -5,13 +5,13 @@
#include "e_int_config_apps.h"
#include "e_int_config_defapps.h"
#include "e_int_config_deskenv.h"
#include "e_int_config_delapps.h"
#include "e_int_config_apps_personal.h"
#undef E_TYPEDEFS
#include "e_int_config_apps.h"
#include "e_int_config_defapps.h"
#include "e_int_config_deskenv.h"
#include "e_int_config_delapps.h"
#include "e_int_config_apps_personal.h"
EAPI extern E_Module_Api e_modapi;