From: Enlightenment C. <no...@cv...> - 2006-10-05 08:34:47
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: eap_to_desktop Log Message: Now it should be clear how to use it... =================================================================== RCS file: /cvs/e/e17/apps/e/eap_to_desktop,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- eap_to_desktop 24 Sep 2006 14:55:52 -0000 1.4 +++ eap_to_desktop 5 Oct 2006 08:34:37 -0000 1.5 @@ -8,7 +8,11 @@ # Don't use this on module.eaps, as the icon ends up in the wrong place. WD=`pwd` -FILENAME=`basename $@ .eap` + +# small hack to avoid people using *.eap and don't know what to do... +if [ ! "$i" == "*.eap" ]; then + FILENAME=`basename '$1' .eap` +fi if [ -e "$FILENAME.eap" ]; then rm -fr /tmp/convert.eap/$FILENAME @@ -83,5 +87,7 @@ cd $WD >/dev/null rm -fr /tmp/convert.eap/$FILENAME else - echo "Not a .eap file." + echo -e "\nExample:" + echo "cd ~/.e/e/applications/all/" + echo -e "$0 firefox.eap\n" fi |
From: Enlightenment C. <no...@cv...> - 2006-11-12 02:41:31
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: xnest.sh Log Message: added strace =================================================================== RCS file: /cvs/e/e17/apps/e/xnest.sh,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- xnest.sh 10 Nov 2006 15:00:39 -0000 1.10 +++ xnest.sh 12 Nov 2006 02:41:28 -0000 1.11 @@ -19,6 +19,7 @@ "-m") action="valgrind --tool=memcheck --log-file=valgrind_log" ;; "-p") action="memprof --display=$main" ; main=":1" ; display="" ;; "-r") action="memprof_raster --display=$main" ; main=":1" ; display="" ;; + "-s") action="strace -F -o strace_log" ;; "-v") action="valkyrie -display $main" ; main=":1" ; display="" ;; *) echo -e "Usage : xnest.sh [option]" echo -e "\tdefault option is -b" @@ -30,6 +31,7 @@ echo -e "\t-m memory check\t\t\t\t\tvalgrind" echo -e "\t-p memory profiling\t\t\t\tmemprof" echo -e "\t-r raster's memory profiling\t\t\tmemprof_raster" + echo -e "\t-s show syscalls\t\t\t\tstrace" echo -e "\t-v GUI memory check\t\t\t\tvalkyrie" echo -e "" echo -e "You need to add \"-display :1\" as the run arguments for the GUI debugger." |
From: Enlightenment C. <no...@cv...> - 2006-11-23 00:57:20
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_mime.c Log Message: Added the same searchpathes for mimetypes as the efm is using. There is still a bug in line 318, when disabling this line the mimetype editor displays mimetypes, if enabled it doesn't show a single mimetype. Will fix that later... Also added the vim macro. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_mime.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- e_int_config_mime.c 14 Nov 2006 06:09:32 -0000 1.15 +++ e_int_config_mime.c 23 Nov 2006 00:57:18 -0000 1.16 @@ -1,3 +1,6 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ #include "e.h" typedef struct _Config_Glob Config_Glob; @@ -82,11 +85,23 @@ if (!cfdata) return; homedir = e_user_homedir_get(); + snprintf(buf, sizeof(buf), "/usr/local/etc/mime.types"); + if (ecore_file_exists(buf)) + _load_mimes(cfdata, buf); + + snprintf(buf, sizeof(buf), "/etc/mime.types"); + if (ecore_file_exists(buf)) + _load_mimes(cfdata, buf); + snprintf(buf, sizeof(buf), "/usr/local/share/mime/globs"); if (ecore_file_exists(buf)) _load_mimes(cfdata, buf); snprintf(buf, sizeof(buf), "/usr/share/mime/globs"); + if (ecore_file_exists(buf)) + _load_mimes(cfdata, buf); + + snprintf(buf, sizeof(buf), "%s/.mime.types", homedir); if (ecore_file_exists(buf)) _load_mimes(cfdata, buf); |
From: Enlightenment C. <no...@cv...> - 2006-12-03 21:25:50
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_menus.c Log Message: Standalone windows menu does now have a title. But how should i set this for the (favorite) applications menu...? Will add that later. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.186 retrieving revision 1.187 diff -u -3 -r1.186 -r1.187 --- e_int_menus.c 19 Nov 2006 08:58:05 -0000 1.186 +++ e_int_menus.c 3 Dec 2006 21:25:47 -0000 1.187 @@ -91,6 +91,7 @@ subm = e_int_menus_favorite_apps_new(); dat->apps = subm; mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Favorite Applications")); e_util_menu_item_edje_icon_set(mi, "enlightenment/favorites"); e_menu_item_submenu_set(mi, subm); @@ -914,6 +915,9 @@ borders = evas_list_append(borders, border); } + dat = (Main_Data *)e_object_data_get(E_OBJECT(m)); + if (!dat) e_menu_title_set(m, _("Windows")); + if (!borders) { /* FIXME here we want nothing, but that crashes!!! */ @@ -952,7 +956,6 @@ e_util_menu_item_edje_icon_set(mi, "enlightenment/windows"); e_menu_item_callback_set(mi, _e_int_menus_clients_cleanup_cb, zone); - dat = (Main_Data *)e_object_data_get(E_OBJECT(m)); if (dat) { mi = e_menu_item_new(m); |
From: Enlightenment C. <no...@cv...> - 2006-12-30 23:42:08
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_menus.c Log Message: Show 'Add A Shelf' even if we don't have a single shelf. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.188 retrieving revision 1.189 diff -u -3 -r1.188 -r1.189 --- e_int_menus.c 28 Dec 2006 13:43:30 -0000 1.188 +++ e_int_menus.c 30 Dec 2006 23:42:03 -0000 1.189 @@ -1202,7 +1202,6 @@ /* FIXME here we want nothing, but that crashes!!! */ mi = e_menu_item_new(m); e_menu_item_label_set(mi, _("(No Shelves)")); - return; } for (l = shelves; l; l = l->next) { @@ -1272,9 +1271,12 @@ e_menu_item_label_set(mi, _("Add A Shelf")); e_menu_item_callback_set(mi, _e_int_menus_shelves_add_cb, NULL); - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Delete A Shelf")); - e_menu_item_callback_set(mi, _e_int_menus_shelves_del_cb, NULL); + if (shelves) + { + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Delete A Shelf")); + e_menu_item_callback_set(mi, _e_int_menus_shelves_del_cb, NULL); + } } static void |
From: Enlightenment C. <no...@cv...> - 2007-01-18 21:57:11
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_desks.c e_int_config_display.c Log Message: Window title change to fit configuration panel, reverse resolution order. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desks.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- e_int_config_desks.c 15 Jan 2007 11:35:54 -0000 1.27 +++ e_int_config_desks.c 19 Jan 2007 03:57:09 -0000 1.28 @@ -53,7 +53,7 @@ v->advanced.create_widgets = _advanced_create_widgets; /* create config diaolg for NULL object/data */ cfd = e_config_dialog_new(con, - _("Desktop Settings"), + _("Virtual Desktops Settings"), "E", "_config_desks_dialog", "enlightenment/desktops", 0, v, NULL); return cfd; =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- e_int_config_display.c 15 Jan 2007 17:19:44 -0000 1.31 +++ e_int_config_display.c 19 Jan 2007 03:57:09 -0000 1.32 @@ -240,7 +240,7 @@ v->override_auto_apply = 1; cfd = e_config_dialog_new(con, - _("Display Settings"), + _("Screen Resolution Settings"), "E", "_config_display_dialog", "enlightenment/screen_resolution", 0, v, NULL); return cfd; @@ -451,6 +451,7 @@ /* Sort the list */ cfdata->resolutions = evas_list_sort(cfdata->resolutions, evas_list_count(cfdata->resolutions), _sort_resolutions); + cfdata->resolutions = evas_list_reverse(cfdata->resolutions); evas_event_freeze(evas_object_evas_get(ol)); edje_freeze(); |
From: Enlightenment C. <no...@cv...> - 2007-01-20 12:23:06
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: de.po Log Message: Horray, new german translation by Thomas 'thomasg' Gstaedtner (th...@gs...). |
From: Enlightenment C. <no...@cv...> - 2007-01-20 12:23:38
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: Horray, new german translation by Thomas 'thomasg' Gstaedtner (th...@gs...). =================================================================== RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.148 retrieving revision 1.149 diff -u -3 -r1.148 -r1.149 --- configure.in 7 Jan 2007 11:56:12 -0000 1.148 +++ configure.in 20 Jan 2007 18:23:03 -0000 1.149 @@ -142,7 +142,7 @@ #ALL_LINGUAS="bg de eo es fi fr ja pl pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW ko" #ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW" # a lot of .po's are broken -ALL_LINGUAS="bg eo ja ru hu sl it fr" +ALL_LINGUAS="bg de eo ja ru hu sl it fr" AC_SUBST(ALL_LINGUAS) AM_GNU_GETTEXT([external]) |
From: Enlightenment C. <no...@cv...> - 2007-01-22 11:24:32
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_display.c Log Message: Jump to selection (approved by devilhorns). =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- e_int_config_display.c 19 Jan 2007 03:57:09 -0000 1.32 +++ e_int_config_display.c 22 Jan 2007 17:24:30 -0000 1.33 @@ -375,7 +375,7 @@ E_Radio_Group *rg; E_Manager *man; Ecore_X_Screen_Size *sizes; - int i, s; + int i, s, sel; _fill_data(cfdata); @@ -466,12 +466,9 @@ snprintf(buf, sizeof(buf), "%ix%i", res->size.width, res->size.height); e_widget_ilist_append(ol, NULL, buf, _ilist_item_change, cfdata, NULL); - if (res->size.width == cfdata->orig_size.width - && res->size.height == cfdata->orig_size.height) - { - e_widget_ilist_selected_set(ol, i); - _load_rates(cfdata); - } + if (res->size.width == cfdata->orig_size.width && + res->size.height == cfdata->orig_size.height) + sel = res->id; } if (!cfdata->has_rates) @@ -482,6 +479,8 @@ E_FREE(sizes); e_widget_ilist_go(ol); + e_widget_ilist_selected_set(ol, sel); + _load_rates(cfdata); e_widget_ilist_thaw(ol); edje_thaw(); evas_event_thaw(evas_object_evas_get(ol)); |
From: Enlightenment C. <no...@cv...> - 2007-03-05 22:31:02
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: de.po Log Message: German translation update from Thomas Gstädtner (th...@gs...). |
From: Enlightenment C. <no...@cv...> - 2007-05-24 20:58:03
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: de.po Log Message: German translation update by Thomas Gstaedtner - thanks! |
From: Enlightenment C. <no...@cv...> - 2007-07-10 21:37:10
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: de.po Log Message: New german translation by Thomas Gstaedtner (th...@gs...). Thank you. |
From: Enlightenment C. <no...@cv...> - 2007-07-20 23:58:04
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_profiles Modified Files: e_int_config_profiles.c Log Message: fixed seggi, changed window size for devilhorns =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/e_int_config_profiles.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_profiles.c 16 Jul 2007 00:45:58 -0000 1.1 +++ e_int_config_profiles.c 20 Jul 2007 23:58:02 -0000 1.2 @@ -212,7 +212,7 @@ snprintf(buf, sizeof(buf), _("You requested to delete \"%s\".<br><br>" "Are you sure you want to delete this profile?"), - cfdata->sel_profile); + d->cfdata->sel_profile); e_confirm_dialog_show(_("Are you sure you want to delete this profile?"), "enlightenment/exit", buf, NULL, NULL, _cb_dialog_yes, NULL, d, NULL, _cb_dialog_destroy, d); @@ -247,7 +247,7 @@ { E_Dialog *dia; Evas *evas; - Evas_Coord mw, mh; + Evas_Coord mh; Evas_Object *ol, *ob; dia = e_dialog_new(cfdata->cfd->con, "E", "profiles_new_profile_dialog"); @@ -268,8 +268,8 @@ e_widget_table_object_append(ol, ob, 1, 0, 1, 1, 1, 1, 1, 1); - e_widget_min_size_get(ol, &mw, &mh); - e_dialog_content_set(dia, ol, mw, mh); + e_widget_min_size_get(ol, NULL, &mh); + e_dialog_content_set(dia, ol, 150, mh); e_dialog_button_add(dia, _("OK"), NULL, _new_profile_cb_ok, cfdata); e_dialog_button_add(dia, _("Cancel"), NULL, _new_profile_cb_close, cfdata); |
From: Enlightenment C. <no...@cv...> - 2007-07-21 12:35:17
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: AUTHORS Log Message: added myself :) =================================================================== RCS file: /cvs/e/e17/apps/e/AUTHORS,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- AUTHORS 21 Jun 2007 20:09:12 -0000 1.35 +++ AUTHORS 21 Jul 2007 12:35:06 -0000 1.36 @@ -17,3 +17,4 @@ Byron Hillis <me...@sc...> Ravenlock (Eric Schuele) <e.s...@co...> ManoWarrior (Luchezar Petkov) <luc...@gm...> +morlenxus (Brian Miculcy) <mor...@gm...> |
From: Enlightenment C. <no...@cv...> - 2007-08-02 23:40:59
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_profiles Modified Files: e_mod_main.c Log Message: Added a configuration menu entry for the profiles dialog. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c 29 Jul 2007 10:24:55 -0000 1.2 +++ e_mod_main.c 2 Aug 2007 23:40:58 -0000 1.3 @@ -8,7 +8,11 @@ /**/ /* actual module specifics */ +static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_mod_menu_add(void *data, E_Menu *m); + static E_Module *conf_module = NULL; +static E_Int_Menu_Augmentation *maug = NULL; /**/ /***************************************************************************/ @@ -33,6 +37,8 @@ { e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced"); e_configure_registry_item_add("advanced/profiles", 50, _("Profiles"), NULL, "enlightenment/profiles", e_int_config_profiles); + maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL); + conf_module = m; e_module_delayed_set(m, 1); return m; @@ -62,4 +68,23 @@ _("Enlightenment Configuration Module - Profiles"), _("Configuration dialog for config profiles.")); return 1; +} + +/* menu item callback(s) */ +static void +_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi) +{ + e_configure_registry_call("advanced/profiles", m->zone->container, NULL); +} + +/* menu item add hook */ +static void +_e_mod_menu_add(void *data, E_Menu *m) +{ + E_Menu_Item *mi; + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Profiles")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/profiles"); + e_menu_item_callback_set(mi, _e_mod_run_cb, NULL); } |
From: Enlightenment C. <no...@cv...> - 2007-08-03 10:20:38
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.c Log Message: Allow to create plain profiles / clone current profile. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v retrieving revision 1.261 retrieving revision 1.262 diff -u -3 -r1.261 -r1.262 --- e_config.c 1 Aug 2007 12:37:00 -0000 1.261 +++ e_config.c 3 Aug 2007 10:20:34 -0000 1.262 @@ -1809,12 +1809,6 @@ snprintf(buf, sizeof(buf), "%s/.e/e/config/%s/%s.cfg", homedir, _e_config_profile, domain); ef = eet_open(buf, EET_FILE_MODE_READ); - if (!ef) - { - snprintf(buf, sizeof(buf), "%s/.e/e/config/%s/%s.cfg", - homedir, "default", domain); - ef = eet_open(buf, EET_FILE_MODE_READ); - } if (ef) { data = eet_data_read(ef, edd, "config"); |
From: Enlightenment C. <no...@cv...> - 2007-08-03 10:20:38
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_profiles Modified Files: e_int_config_profiles.c Log Message: Allow to create plain profiles / clone current profile. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/e_int_config_profiles.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_profiles.c 24 Jul 2007 18:47:26 -0000 1.3 +++ e_int_config_profiles.c 3 Aug 2007 10:20:35 -0000 1.4 @@ -27,6 +27,7 @@ E_Dialog *dia_new_profile; char *new_profile; + int new_profile_type; }; typedef struct _Del_Profile_Confirm_Data Del_Profile_Confirm_Data; @@ -61,7 +62,7 @@ E_Config_Dialog_Data *cfdata; cfdata = E_NEW(E_Config_Dialog_Data, 1); - cfdata->cfd = cfd; + cfdata->cfd = cfd; return cfdata; } @@ -244,9 +245,10 @@ _dia_new_profile(E_Config_Dialog_Data *cfdata) { E_Dialog *dia; + E_Radio_Group *rg; Evas *evas; - Evas_Coord mh; - Evas_Object *ol, *ob; + Evas_Coord mw, mh; + Evas_Object *ot, *ob; dia = e_dialog_new(cfdata->cfd->con, "E", "profiles_new_profile_dialog"); if (!dia) return NULL; @@ -258,16 +260,30 @@ evas = e_win_evas_get(dia->win); e_dialog_title_set(dia, _("Add New Profile")); - ol = e_widget_table_add(evas, 0); - e_widget_table_object_append(ol, e_widget_label_add(evas, _("Name:")), + + ot = e_widget_table_add(evas, 0); + ob = e_widget_label_add(evas, _("Name:")); + e_widget_table_object_append(ot, ob, 0, 0, 1, 1, - 1, 1, 0, 1); + 0, 1, 0, 0); ob = e_widget_entry_add(evas, &(cfdata->new_profile)); - e_widget_table_object_append(ol, ob, + e_widget_min_size_set(ob, 100, 1); + e_widget_table_object_append(ot, ob, 1, 0, 1, 1, - 1, 1, 1, 1); - e_widget_min_size_get(ol, NULL, &mh); - e_dialog_content_set(dia, ol, 150, mh); + 1, 1, 1, 0); + + rg = e_widget_radio_group_new(&cfdata->new_profile_type); + ob = e_widget_radio_add(evas, _("Plain Profile"), 0, rg); + e_widget_table_object_append(ot, ob, + 0, 1, 2, 1, + 1, 1, 1, 0); + ob = e_widget_radio_add(evas, _("Clone Current Profile"), 1, rg); + e_widget_table_object_append(ot, ob, + 0, 2, 2, 1, + 1, 1, 1, 0); + + e_widget_min_size_get(ot, &mw, &mh); + e_dialog_content_set(dia, ot, mw, mh); e_dialog_button_add(dia, _("OK"), NULL, _new_profile_cb_ok, cfdata); e_dialog_button_add(dia, _("Cancel"), NULL, _new_profile_cb_close, cfdata); @@ -294,13 +310,26 @@ _new_profile_cb_ok(void *data, E_Dialog *dia) { E_Config_Dialog_Data *cfdata; + char cur_profile[1024]; + cfdata = data; if (!cfdata) return; + + snprintf (cur_profile, sizeof (cur_profile), "%s", e_config_profile_get ()); + + if (cfdata->new_profile) + { + e_config_profile_add(cfdata->new_profile); + if (cfdata->new_profile_type) + { + e_config_profile_set (cfdata->new_profile); + e_config_save(); + e_config_profile_set (cur_profile); + } + } e_object_unref(E_OBJECT(dia)); cfdata->dia_new_profile = NULL; - - if (cfdata->new_profile) e_config_profile_add(cfdata->new_profile); cfdata->new_profile = NULL; _ilist_fill(cfdata); } |
From: Enlightenment C. <no...@cv...> - 2007-08-03 15:57:30
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_theme Modified Files: e_mod_main.c Log Message: Move fixed menu entries into modules. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_mod_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.c 29 Jul 2007 10:24:56 -0000 1.3 +++ e_mod_main.c 3 Aug 2007 15:57:27 -0000 1.4 @@ -8,7 +8,11 @@ /**/ /* actual module specifics */ +static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_mod_menu_add(void *data, E_Menu *m); + static E_Module *conf_module = NULL; +static E_Int_Menu_Augmentation *maug = NULL; /**/ /***************************************************************************/ @@ -33,6 +37,8 @@ { e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance"); e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme); + maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL); + conf_module = m; e_module_delayed_set(m, 1); return m; @@ -42,6 +48,12 @@ e_modapi_shutdown(E_Module *m) { E_Config_Dialog *cfd; + /* remove module-supplied menu additions */ + if (maug) + { + e_int_menus_menu_augmentation_del("config/1", maug); + maug = NULL; + } while ((cfd = e_config_dialog_get("E", "_config_theme_dialog"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("appearance/theme"); e_configure_registry_category_del("appearance"); @@ -62,4 +74,23 @@ _("Enlightenment Configuration Module - Theme"), _("Configuration dialog for theme.")); return 1; +} + +/* menu item callback(s) */ +static void +_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi) +{ + e_configure_registry_call("appearance/theme", m->zone->container, NULL); +} + +/* menu item add hook */ +static void +_e_mod_menu_add(void *data, E_Menu *m) +{ + E_Menu_Item *mi; + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Theme")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/themes"); + e_menu_item_callback_set(mi, _e_mod_run_cb, NULL); } |
From: Enlightenment C. <no...@cv...> - 2007-08-03 15:57:30
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_mod_main.c Log Message: Move fixed menu entries into modules. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_mod_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_main.c 29 Jul 2007 10:24:56 -0000 1.5 +++ e_mod_main.c 3 Aug 2007 15:57:27 -0000 1.6 @@ -8,7 +8,11 @@ /**/ /* actual module specifics */ +static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_mod_menu_add(void *data, E_Menu *m); + static E_Module *conf_module = NULL; +static E_Int_Menu_Augmentation *maug = NULL; /**/ /***************************************************************************/ @@ -35,6 +39,8 @@ e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper); e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal"); e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk); + maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL); + conf_module = m; e_module_delayed_set(m, 1); return m; @@ -44,6 +50,12 @@ e_modapi_shutdown(E_Module *m) { E_Config_Dialog *cfd; + /* remove module-supplied menu additions */ + if (maug) + { + e_int_menus_menu_augmentation_del("config/1", maug); + maug = NULL; + } while ((cfd = e_config_dialog_get("E", "_config_wallpaper_dialog"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("internal/wallpaper_desk"); e_configure_registry_category_del("internal"); @@ -66,4 +78,23 @@ _("Enlightenment Configuration Module - Wallpaper"), _("Configuration dialog for wallpaper configuration.")); return 1; +} + +/* menu item callback(s) */ +static void +_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi) +{ + e_configure_registry_call("appearance/wallpaper", m->zone->container, NULL); +} + +/* menu item add hook */ +static void +_e_mod_menu_add(void *data, E_Menu *m) +{ + E_Menu_Item *mi; + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Wallpaper")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/background"); + e_menu_item_callback_set(mi, _e_mod_run_cb, NULL); } |
From: Enlightenment C. <no...@cv...> - 2007-08-03 15:57:59
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_menus.c Log Message: Move fixed menu entries into modules. =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.224 retrieving revision 1.225 diff -u -3 -r1.224 -r1.225 --- e_int_menus.c 3 Aug 2007 05:29:40 -0000 1.224 +++ e_int_menus.c 3 Aug 2007 15:57:27 -0000 1.225 @@ -761,30 +761,12 @@ } static void -_e_int_menus_background_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) -{ - e_configure_registry_call("appearance/wallpaper", m->zone->container, NULL); -} - -static void -_e_int_menus_theme_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) -{ - e_configure_registry_call("appearance/theme", m->zone->container, NULL); -} - -static void _e_int_menus_module_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) { e_configure_registry_call("extensions/modules", m->zone->container, NULL); } static void -_e_int_menus_shelf_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) -{ - e_configure_registry_call("extensions/shelves", m->zone->container, NULL); -} - -static void _e_int_menus_config_pre_cb(void *data, E_Menu *m) { E_Menu_Item *mi; @@ -800,34 +782,9 @@ e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration"); e_menu_item_callback_set(mi, _e_int_menus_config_item_cb, NULL); - l = evas_hash_find(_e_int_menus_augmentation, "config/1"); - if (l) - { - mi = e_menu_item_new(m); - e_menu_item_separator_set(mi, 1); - - _e_int_menus_augmentation_add(m, l); - } - mi = e_menu_item_new(m); e_menu_item_separator_set(mi, 1); - if (e_configure_registry_exists("appearance/wallpaper")) - { - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Wallpaper")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/background"); - e_menu_item_callback_set(mi, _e_int_menus_background_item_cb, NULL); - } - - if (e_configure_registry_exists("appearance/theme")) - { - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Theme")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/themes"); - e_menu_item_callback_set(mi, _e_int_menus_theme_item_cb, NULL); - } - if (e_configure_registry_exists("extensions/modules")) { mi = e_menu_item_new(m); @@ -836,14 +793,12 @@ e_menu_item_callback_set(mi, _e_int_menus_module_item_cb, NULL); } - if (e_configure_registry_exists("extensions/shelves")) + l = evas_hash_find(_e_int_menus_augmentation, "config/1"); + if (l) { - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, _("Shelves")); - e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf"); - e_menu_item_callback_set(mi, _e_int_menus_shelf_item_cb, NULL); + _e_int_menus_augmentation_add(m, l); } - + l = evas_hash_find(_e_int_menus_augmentation, "config/2"); if (l) { @@ -1515,22 +1470,12 @@ { Evas_List *l; E_Menu_Item *mi; - int i = 0; for (l = augmentation; l; l = l->next) { E_Int_Menu_Augmentation *aug; aug = l->data; - - if (i) - { - mi = e_menu_item_new(m); - e_menu_item_separator_set(mi, 1); - } - else - i++; - if (aug->add.func) aug->add.func(aug->add.data, m); } |
From: Enlightenment C. <no...@cv...> - 2007-08-03 16:03:12
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_profiles Modified Files: e_mod_main.c Log Message: Move fixed menu entries into modules. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_profiles/e_mod_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_main.c 2 Aug 2007 23:40:58 -0000 1.3 +++ e_mod_main.c 3 Aug 2007 15:57:27 -0000 1.4 @@ -48,6 +48,12 @@ e_modapi_shutdown(E_Module *m) { E_Config_Dialog *cfd; + /* remove module-supplied menu additions */ + if (maug) + { + e_int_menus_menu_augmentation_del("config/1", maug); + maug = NULL; + } while ((cfd = e_config_dialog_get("E", "_config_profiles_dialog"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("advanced/profiles"); e_configure_registry_category_del("advanced"); |
From: Enlightenment C. <no...@cv...> - 2007-08-03 16:07:15
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_shelves Modified Files: e_mod_main.c Log Message: Move fixed menu entries into modules. =================================================================== RCS file: /cvs/e/e17/apps/e/src/modules/conf_shelves/e_mod_main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_mod_main.c 29 Jul 2007 10:24:56 -0000 1.2 +++ e_mod_main.c 3 Aug 2007 15:57:27 -0000 1.3 @@ -8,7 +8,11 @@ /**/ /* actual module specifics */ +static void _e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_mod_menu_add(void *data, E_Menu *m); + static E_Module *conf_module = NULL; +static E_Int_Menu_Augmentation *maug = NULL; /**/ /***************************************************************************/ @@ -33,6 +37,8 @@ { e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL, "enlightenment/extensions"); e_configure_registry_item_add("extensions/shelves", 20, _("Shelves"), NULL, "enlightenment/shelf", e_int_config_shelf); + maug = e_int_menus_menu_augmentation_add("config/1", _e_mod_menu_add, NULL, NULL, NULL); + conf_module = m; e_module_delayed_set(m, 1); return m; @@ -42,6 +48,12 @@ e_modapi_shutdown(E_Module *m) { E_Config_Dialog *cfd; + /* remove module-supplied menu additions */ + if (maug) + { + e_int_menus_menu_augmentation_del("config/1", maug); + maug = NULL; + } while ((cfd = e_config_dialog_get("E", "_config_shelf_dialog"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("extensions/shelves"); e_configure_registry_category_del("extensions"); @@ -62,4 +74,23 @@ _("Enlightenment Configuration Module - Shelves"), _("Configuration dialog for shelves.")); return 1; +} + +/* menu item callback(s) */ +static void +_e_mod_run_cb(void *data, E_Menu *m, E_Menu_Item *mi) +{ + e_configure_registry_call("extensions/shelves", m->zone->container, NULL); +} + +/* menu item add hook */ +static void +_e_mod_menu_add(void *data, E_Menu *m) +{ + E_Menu_Item *mi; + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, _("Shelves")); + e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf"); + e_menu_item_callback_set(mi, _e_mod_run_cb, NULL); } |
From: Enlightenment C. <no...@cv...> - 2007-08-03 22:41:47
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_engine Log Message: Directory /cvs/e/e17/apps/e/src/modules/conf_engine added to the repository |
From: Enlightenment C. <no...@cv...> - 2007-08-03 22:44:23
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_engine Added Files: Makefile.am e-module-conf_engine.edj e_int_config_engine.c e_int_config_engine.h e_mod_main.c e_mod_main.h module.desktop.in Log Message: New configuration dialog 'engine'. Only basic mode for now, advanced stuff will follow soon. :) |
From: Enlightenment C. <no...@cv...> - 2007-08-03 22:44:52
|
Enlightenment CVS committal Author : morlenxus Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: New configuration dialog 'engine'. Only basic mode for now, advanced stuff will follow soon. :) =================================================================== RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.179 retrieving revision 1.180 diff -u -3 -r1.179 -r1.180 --- configure.in 1 Aug 2007 12:37:00 -0000 1.179 +++ configure.in 3 Aug 2007 22:44:21 -0000 1.180 @@ -280,6 +280,8 @@ src/modules/conf_imc/module.desktop src/modules/conf_profiles/Makefile src/modules/conf_profiles/module.desktop +src/modules/conf_engine/Makefile +src/modules/conf_engine/module.desktop src/modules/conf_applications/Makefile src/modules/conf_applications/module.desktop src/modules/conf_desks/Makefile |