Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_int_config_apps.c e_main.c
Removed Files:
e_fdo_menu_to_order.c e_fdo_menu_to_order.h
Log Message:
Remove fdo to .order code. Menus will be used directly soon.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -3 -r1.178 -r1.179
--- Makefile.am 20 Mar 2007 01:13:40 -0000 1.178
+++ Makefile.am 24 Mar 2007 18:02:29 -0000 1.179
@@ -176,7 +176,6 @@
e_int_config_wallpaper_import.h \
e_int_config_wallpaper_gradient.h \
e_color_dialog.h \
-e_fdo_menu_to_order.h \
e_sys.h \
e_obj_dialog.h \
e_int_config_transitions.h \
@@ -340,7 +339,6 @@
e_int_config_wallpaper_import.c \
e_int_config_wallpaper_gradient.c \
e_color_dialog.c \
-e_fdo_menu_to_order.c \
e_sys.c \
e_int_config_transitions.c \
e_obj_dialog.c \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- e_includes.h 20 Mar 2007 01:08:38 -0000 1.149
+++ e_includes.h 24 Mar 2007 18:02:29 -0000 1.150
@@ -151,7 +151,6 @@
#include "e_widget_color_well.h"
#include "e_widget_csel.h"
#include "e_color_dialog.h"
-#include "e_fdo_menu_to_order.h"
#include "e_sys.h"
#include "e_int_config_transitions.h"
#include "e_obj_dialog.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- e_int_config_apps.c 2 Mar 2007 17:00:20 -0000 1.60
+++ e_int_config_apps.c 24 Mar 2007 18:02:29 -0000 1.61
@@ -582,67 +582,6 @@
}
#endif
-static E_Dialog *_e_int_config_apps_regen_dialog = NULL;
-
-static void
-_e_int_config_apps_cb_regen_dialog_regen(void *data, E_Dialog *dia)
-{
- e_object_del(E_OBJECT(_e_int_config_apps_regen_dialog));
- _e_int_config_apps_regen_dialog = NULL;
- e_fdo_menu_to_order(1);
-// if (cfdata->gui.o_fm_all) e_fm2_refresh(cfdata->gui.o_fm_all);
-// if (cfdata->gui.o_fm) e_fm2_refresh(cfdata->gui.o_fm);
-}
-
-static void
-_e_int_config_apps_cb_regen_dialog_update(void *data, E_Dialog *dia)
-{
- e_object_del(E_OBJECT(_e_int_config_apps_regen_dialog));
- _e_int_config_apps_regen_dialog = NULL;
- e_fdo_menu_to_order(0);
-}
-
-static void
-_e_int_config_apps_cb_regen_dialog_delete(E_Win *win)
-{
- E_Dialog *dia;
-
- dia = win->data;
- e_object_del(E_OBJECT(_e_int_config_apps_regen_dialog));
- _e_int_config_apps_regen_dialog = NULL;
-}
-
-static void
-_cb_button_regen(void *data1, void *data2)
-{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data1;
- if (_e_int_config_apps_regen_dialog)
e_object_del(E_OBJECT(_e_int_config_apps_regen_dialog));
- _e_int_config_apps_regen_dialog =
e_dialog_new(e_container_current_get(e_manager_current_get()), "E",
"_menu_regen_dialog");
- if (!_e_int_config_apps_regen_dialog) return;
- e_win_delete_callback_set(_e_int_config_apps_regen_dialog->win,
_e_int_config_apps_cb_regen_dialog_delete);
- e_dialog_title_set(_e_int_config_apps_regen_dialog, _("Regenerate or update
your Applications menu?"));
- e_dialog_text_set(_e_int_config_apps_regen_dialog,
- _("You can regenerate your Applications menu.<br>"
- "This will delete any customizations you have made.<br>"
- "This will replace the Applications menu with the system
menu.<br>"
- "<br>"
- "Or you could just update your Applications menu.<br>"
- "This will add any new Applications, and remove any old
ones from<br>"
- "your Applications menu. Customizations you have made
will remain."
- ));
- e_dialog_icon_set(_e_int_config_apps_regen_dialog,
"enlightenment/regenerate_menus", 64);
- e_dialog_button_add(_e_int_config_apps_regen_dialog, _("Regenerate"), NULL,
- _e_int_config_apps_cb_regen_dialog_regen, NULL);
- e_dialog_button_add(_e_int_config_apps_regen_dialog, _("Update"), NULL,
- _e_int_config_apps_cb_regen_dialog_update, NULL);
- e_dialog_button_focus_num(_e_int_config_apps_regen_dialog, 1);
- e_win_centered_set(_e_int_config_apps_regen_dialog->win, 1);
- e_dialog_show(_e_int_config_apps_regen_dialog);
-
e_dialog_border_icon_set(_e_int_config_apps_regen_dialog,"enlightenment/regenerate_menus");
-}
-
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
@@ -821,14 +760,6 @@
e_widget_framelist_object_append(of, mt);
e_widget_disabled_set(cfdata->gui.o_move_down_button, 1);
*/
- if (!once)
- {
- mt = e_widget_button_add(evas, _("Regenerate / Update
\"Applications\" Menu"), "enlightenment/regenerate_menus",
- _cb_button_regen, cfdata, NULL);
- cfdata->gui.o_regen_button = mt;
- e_widget_framelist_object_append(of, mt);
- }
- e_widget_table_object_append(ot, of, 2, 0, 2, 4, 1, 1, 1, 1);
}
e_widget_list_object_append(o, ot, 1, 1, 0.5);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -3 -r1.206 -r1.207
--- e_main.c 24 Mar 2007 16:58:25 -0000 1.206
+++ e_main.c 24 Mar 2007 18:02:29 -0000 1.207
@@ -1043,16 +1043,6 @@
homedir);
system(buf);
}
- /* FIXME: THIS is a hack to get people started!!!
- * Soon to be replaced with fancy background converting and resyncing code.
- * Currently this is likely to be done each time E is started up on some
systems.
- * On the other hand, some of those systems wont have FDO menus, so this
should not take long.
- */
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/all/.order", homedir);
- if (!ecore_file_exists(buf))
- {
- e_fdo_menu_to_order(1);
- }
/* FIXME: THIS is to get people started - shoudl be in a wizard */
snprintf(buf, sizeof(buf), "%s/.e/e/fileman/favorites", homedir);
if (!ecore_file_exists(buf))
-------------------------------------------------------------------------
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
