Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_config.c e_configure.c e_includes.h
e_int_border_menu.c
Removed Files:
e_int_config_borders.c e_int_config_borders.h
e_int_config_cursor.c e_int_config_cursor.h
e_int_config_icon_themes.c e_int_config_icon_themes.h
e_int_config_startup.c e_int_config_startup.h
e_int_config_transitions.c e_int_config_transitions.h
Log Message:
move a bunch of other config dialogs over to be modules.
before i do more. i need to fix a glaring stability hole... try remove
aconfig module while the config dialog that module handles is up... :)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -3 -r1.190 -r1.191
--- Makefile.am 7 Jul 2007 15:44:00 -0000 1.190
+++ Makefile.am 8 Jul 2007 03:57:51 -0000 1.191
@@ -119,12 +119,9 @@
e_widget_slider.h \
e_int_config_window_manipulation.h \
e_int_config_window_display.h \
-e_int_config_icon_themes.h \
e_int_config_menus.h \
e_int_config_keybindings.h \
e_int_config_mousebindings.h \
-e_int_config_cursor.h \
-e_int_config_startup.h \
e_int_config_performance.h \
e_int_config_winlist.h \
e_int_config_display.h \
@@ -169,22 +166,20 @@
e_color_dialog.h \
e_sys.h \
e_obj_dialog.h \
-e_int_config_transitions.h \
e_fwin.h \
e_widget_aspect.h \
e_filereg.h \
e_widget_desk_preview.h \
-e_int_config_borders.h \
e_int_config_desk.h \
e_int_config_clientlist.h \
e_fm_prop.h \
-e_int_config_mouse.h \
e_mouse.h \
e_order.h \
e_exec.h \
e_widget_font_preview.h \
e_fm_custom.h \
-e_fm_shared.h
+e_fm_shared.h \
+e_int_config_mouse.h
enlightenment_src = \
e_user.c \
@@ -275,12 +270,9 @@
e_widget_slider.c \
e_int_config_window_manipulation.c \
e_int_config_window_display.c \
-e_int_config_icon_themes.c \
e_int_config_menus.c \
e_int_config_keybindings.c \
e_int_config_mousebindings.c \
-e_int_config_cursor.c \
-e_int_config_startup.c \
e_int_config_performance.c \
e_int_config_winlist.c \
e_int_config_display.c \
@@ -327,22 +319,20 @@
e_widget_color_well.c \
e_color_dialog.c \
e_sys.c \
-e_int_config_transitions.c \
e_obj_dialog.c \
e_fwin.c \
e_widget_aspect.c \
e_widget_desk_preview.c \
e_filereg.c \
-e_int_config_borders.c \
e_int_config_desk.c \
e_fm_prop.c \
e_int_config_clientlist.c \
-e_int_config_mouse.c \
e_mouse.c \
e_order.c \
e_exec.c \
e_widget_font_preview.c \
e_fm_custom.c \
+e_int_config_mouse.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -3 -r1.248 -r1.249
--- e_config.c 7 Jul 2007 15:44:00 -0000 1.248
+++ e_config.c 8 Jul 2007 03:57:51 -0000 1.249
@@ -758,6 +758,11 @@
CFG_MODULE("conf_theme", 1);
CFG_MODULE("conf_colors", 1);
CFG_MODULE("conf_fonts", 1);
+ CFG_MODULE("conf_borders", 1);
+ CFG_MODULE("conf_icon_theme", 1);
+ CFG_MODULE("conf_mouse_cursor", 1);
+ CFG_MODULE("conf_transitions", 1);
+ CFG_MODULE("conf_startup", 1);
}
#if 0
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- e_configure.c 7 Jul 2007 15:44:00 -0000 1.103
+++ e_configure.c 8 Jul 2007 03:57:51 -0000 1.104
@@ -421,16 +421,16 @@
e_configure_init(void)
{
/* FIXME: hardcoded - need to move these into modules - except modules
config */
- e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL,
"enlightenment/appearance");
+// e_configure_registry_category_add("appearance", 10, _("Appearance"),
NULL, "enlightenment/appearance");
// e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"),
NULL, "enlightenment/background", e_int_config_wallpaper);
// e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL,
"enlightenment/themes", e_int_config_theme);
// e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL,
"enlightenment/colors", e_int_config_color_classes);
// e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL,
"enlightenment/fonts", e_int_config_fonts);
- e_configure_registry_item_add("appearance/borders", 50, _("Borders"), NULL,
"enlightenment/windows", e_int_config_borders);
- e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon Theme"),
NULL, "enlightenment/icon_theme", e_int_config_icon_themes);
- e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse
Cursor"), NULL, "enlightenment/mouse", e_int_config_cursor);
- e_configure_registry_item_add("appearance/transitions", 80,
_("Transitions"), NULL, "enlightenment/transitions", e_int_config_transitions);
- e_configure_registry_item_add("appearance/startup", 90, _("Startup"), NULL,
"enlightenment/startup", e_int_config_startup);
+// e_configure_registry_item_add("appearance/borders", 50, _("Borders"),
NULL, "enlightenment/windows", e_int_config_borders);
+// e_configure_registry_item_add("appearance/icon_theme", 60, _("Icon
Theme"), NULL, "enlightenment/icon_theme", e_int_config_icon_themes);
+// e_configure_registry_item_add("appearance/mouse_cursor", 70, _("Mouse
Cursor"), NULL, "enlightenment/mouse", e_int_config_cursor);
+// e_configure_registry_item_add("appearance/transitions", 80,
_("Transitions"), NULL, "enlightenment/transitions", e_int_config_transitions);
+// e_configure_registry_item_add("appearance/startup", 90, _("Startup"),
NULL, "enlightenment/startup", e_int_config_startup);
e_configure_registry_category_add("applications", 20, _("Applications"),
NULL, "enlightenment/applications");
e_configure_registry_item_add("applications/new_application", 10, _("New
Application"), NULL, "enlightenment/add_application", e_int_config_apps_add);
@@ -485,7 +485,7 @@
* set properly
*/
e_configure_registry_category_add("internal", -1, _("Internal"), NULL,
"enlightenment/internal");
- e_configure_registry_item_add("internal/borders_border", -1, _("Border"),
NULL, "enlightenment/windows", e_int_config_borders_border);
+// e_configure_registry_item_add("internal/borders_border", -1, _("Border"),
NULL, "enlightenment/windows", e_int_config_borders_border);
// e_configure_registry_item_add("internal/wallpaper_desk", -1,
_("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL,
"enlightenment/windows", e_int_config_desk);
e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"),
NULL, "enlightenment/windows", e_int_config_apps_ibar_other);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -3 -r1.160 -r1.161
--- e_includes.h 7 Jul 2007 15:44:00 -0000 1.160
+++ e_includes.h 8 Jul 2007 03:57:51 -0000 1.161
@@ -88,12 +88,9 @@
#include "e_widget_slider.h"
#include "e_int_config_window_manipulation.h"
#include "e_int_config_window_display.h"
-#include "e_int_config_icon_themes.h"
#include "e_int_config_menus.h"
#include "e_int_config_keybindings.h"
#include "e_int_config_mousebindings.h"
-#include "e_int_config_cursor.h"
-#include "e_int_config_startup.h"
#include "e_int_config_performance.h"
#include "e_int_config_winlist.h"
#include "e_int_config_display.h"
@@ -143,13 +140,11 @@
#include "e_widget_csel.h"
#include "e_color_dialog.h"
#include "e_sys.h"
-#include "e_int_config_transitions.h"
#include "e_obj_dialog.h"
#include "e_fwin.h"
#include "e_filereg.h"
#include "e_widget_aspect.h"
#include "e_widget_desk_preview.h"
-#include "e_int_config_borders.h"
#include "e_int_config_desk.h"
#include "e_int_config_clientlist.h"
#include "e_fm_prop.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- e_int_border_menu.c 4 Jul 2007 11:11:02 -0000 1.65
+++ e_int_border_menu.c 8 Jul 2007 03:57:51 -0000 1.66
@@ -164,13 +164,16 @@
"e/widgets/border/default/remember");
if (!bd->lock_border)
{
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Borders"));
- e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd);
- e_menu_item_icon_edje_set(mi,
- e_theme_edje_file_get("base/theme/borders",
+ if (e_configure_registry_exists("internal/borders_border"))
+ {
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("Borders"));
+ e_menu_item_callback_set(mi, _e_border_menu_cb_border, bd);
+ e_menu_item_icon_edje_set(mi,
+
e_theme_edje_file_get("base/theme/borders",
"e/widgets/border/default/borderless"),
- "e/widgets/border/default/borderless");
+ "e/widgets/border/default/borderless");
+ }
}
if (!bd->sticky)
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
