Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_menus.c e_configure.c Makefile.am e_includes.h
e_int_config_apps_menu.c
Added Files:
e_int_config_apps_order.h e_int_config_apps_order.c
Log Message:
Some fixed for Favorites Editor & ilist issues.
Add edit dialog for ibar/startup/restart.
Remove 'Application Menus' from e_int_menus until a full Menu editor is made.
Can now edit ibar/startup/restart & Favorites.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -3 -r1.210 -r1.211
--- e_int_menus.c 6 Apr 2007 00:08:17 -0000 1.210
+++ e_int_menus.c 6 Apr 2007 01:00:54 -0000 1.211
@@ -786,11 +786,13 @@
e_util_menu_item_edje_icon_set(mi, "enlightenment/shelf");
e_menu_item_callback_set(mi, _e_int_menus_shelf_item_cb, NULL);
+ #if 0
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Application Menus"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/applications");
e_menu_item_callback_set(mi, _e_int_menus_applications_item_cb, NULL);
-
+ #endif
+
l = evas_hash_find(_e_int_menus_augmentation, "config");
if (l)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- e_configure.c 5 Apr 2007 21:31:14 -0000 1.94
+++ e_configure.c 6 Apr 2007 01:00:54 -0000 1.95
@@ -403,12 +403,10 @@
_e_configure_item_add(cat, _("Transitions"), "enlightenment/transitions",
e_int_config_transitions);
_e_configure_item_add(cat, _("Startup"), "enlightenment/startup",
e_int_config_startup);
- #if 0
cat = _e_configure_category_add(eco, _("Applications"),
"enlightenment/applications");
- _e_configure_item_add(cat, _("IBar Applications"),
"enlightenment/ibar_applications", e_int_config_apps_ibar);
+ _e_configure_item_add(cat, _("IBar Applications"),
"enlightenment/ibar_applications", e_int_config_apps_ibar);
_e_configure_item_add(cat, _("Restart Applications"),
"enlightenment/restart_applications", e_int_config_apps_restart);
_e_configure_item_add(cat, _("Startup Applications"),
"enlightenment/startup_applications", e_int_config_apps_startup);
- #endif
cat = _e_configure_category_add(eco, _("Screen"),
"enlightenment/screen_setup");
_e_configure_item_add(cat, _("Virtual Desktops"), "enlightenment/desktops",
e_int_config_desks);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -3 -r1.182 -r1.183
--- Makefile.am 5 Apr 2007 21:31:14 -0000 1.182
+++ Makefile.am 6 Apr 2007 01:00:54 -0000 1.183
@@ -134,6 +134,7 @@
e_int_config_desklock.h \
e_int_config_exebuf.h \
e_int_config_apps_menu.h \
+e_int_config_apps_order.h \
e_int_config_cfgdialogs.h \
e_int_config_color_classes.h \
e_int_config_mime.h \
@@ -294,6 +295,7 @@
e_int_config_desklock.c \
e_int_config_exebuf.c \
e_int_config_apps_menu.c \
+e_int_config_apps_order.c \
e_int_config_cfgdialogs.c \
e_int_config_intl.c \
e_int_config_imc.c \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -3 -r1.153 -r1.154
--- e_includes.h 5 Apr 2007 21:31:14 -0000 1.153
+++ e_includes.h 6 Apr 2007 01:00:54 -0000 1.154
@@ -105,6 +105,7 @@
#include "e_int_config_dpms.h"
#include "e_int_config_exebuf.h"
#include "e_int_config_apps_menu.h"
+#include "e_int_config_apps_order.h"
#include "e_int_config_cfgdialogs.h"
#include "e_int_config_intl.h"
#include "e_int_config_imc.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps_menu.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_apps_menu.c 5 Apr 2007 21:31:14 -0000 1.1
+++ e_int_config_apps_menu.c 6 Apr 2007 01:00:54 -0000 1.2
@@ -1,8 +1,6 @@
#include "e.h"
-/* TODO: This should be modified to handle any other fdo menu editing.
- *
- */
+/* TODO: This should be modified to handle any other fdo menu editing. */
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
@@ -241,18 +239,40 @@
E_Config_Dialog_Data *cfdata;
Evas_Object *icon;
Efreet_Desktop *desk;
- const char *name;
+ Evas *evas;
+ Evas_Coord w;
+ const char *file;
cfdata = data;
if (e_widget_ilist_selected_get(cfdata->o_apps) < 0) return;
+
+ evas = evas_object_evas_get(cfdata->o_list);
+ evas_event_freeze(evas);
+ edje_freeze();
+ e_widget_ilist_freeze(cfdata->o_list);
+
desk = efreet_desktop_get(cfdata->app);
if (!desk) return;
-
- icon = e_widget_ilist_selected_icon_get(cfdata->o_apps);
- name = e_widget_ilist_selected_label_get(cfdata->o_apps);
- e_widget_ilist_append(cfdata->o_list, icon, name,
+ if (desk->icon)
+ {
+ if (desk->icon[0] == '/') file = desk->icon;
+ else
+ file = efreet_icon_path_find(e_config->icon_theme,
+ desk->icon, "24x24");
+
+ icon = e_icon_add(evas_object_evas_get(cfdata->o_list));
+ e_icon_file_set(icon, file);
+ e_icon_fill_inside_set(icon, 1);
+ }
+ e_widget_ilist_append(cfdata->o_list, icon, desk->name,
_list_cb_selected, cfdata, cfdata->app);
- /* Disab Add till del */
+ 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);
+
efreet_menu_desktop_insert(cfdata->menu, desk, -1);
}
@@ -261,14 +281,27 @@
{
E_Config_Dialog_Data *cfdata;
Efreet_Desktop *desk;
+ Evas *evas;
+ Evas_Coord w;
int num;
cfdata = data;
num = e_widget_ilist_selected_get(cfdata->o_list);
if (num < 0) return;
+
+ evas = evas_object_evas_get(cfdata->o_list);
+ 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;
- e_widget_ilist_remove_num(cfdata->o_list, num);
- /* TODO: Efreet Menu Desktop Delete */
efreet_menu_desktop_remove(cfdata->menu, desk);
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
