Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_configure.c e_includes.h
e_int_config_cfgdialogs.c e_int_config_cursor.c
e_int_config_exebuf.c e_int_config_menus.c
e_int_config_performance.c e_int_config_startup.c
e_int_config_winlist.c e_int_shelf_config.c
Added Files:
e_int_config_shelf.c e_int_config_shelf.h
Log Message:
start a shelf config for all shelves (for listing adding/deleting shelves)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- Makefile.am 23 Apr 2006 06:56:22 -0000 1.118
+++ Makefile.am 30 Apr 2006 03:43:47 -0000 1.119
@@ -152,7 +152,8 @@
e_shelf.h \
e_widget_preview.h \
e_int_config_paths.h \
-e_int_shelf_config.h
+e_int_shelf_config.h \
+e_int_config_shelf.h
enlightenment_src = \
e_user.c \
@@ -286,6 +287,7 @@
e_widget_preview.c \
e_int_config_paths.c \
e_int_shelf_config.c \
+e_int_config_shelf.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_configure.c 9 Apr 2006 11:55:18 -0000 1.44
+++ e_configure.c 30 Apr 2006 03:43:47 -0000 1.45
@@ -64,38 +64,39 @@
/* add items here */
e_configure_header_item_add(eco, "enlightenment/appearance",
_("Appearance"));
- e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background
Settings"), e_int_config_background);
- e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme
Selector"), e_int_config_theme);
- e_configure_standard_item_add(eco, "enlightenment/e", _("Font Properties"),
e_int_config_fonts);
+ e_configure_standard_item_add(eco, "enlightenment/desktops",
_("Background"), e_int_config_background);
+ e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme"),
e_int_config_theme);
+ e_configure_standard_item_add(eco, "enlightenment/e", _("Fonts"),
e_int_config_fonts);
/*
e_configure_standard_item_add(eco, "enlightenment/e", _("Font Display
Hinting"), e_int_config_hinting);
*/
- e_configure_standard_item_add(eco, "enlightenment/mouse", _("Cursor
Settings"), e_int_config_cursor);
- e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
Display Settings"), e_int_config_window_display);
+ e_configure_standard_item_add(eco, "enlightenment/mouse", _("Mouse
Cursor"), e_int_config_cursor);
+ e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
Display"), e_int_config_window_display);
+ e_configure_standard_item_add(eco, "enlightenment/shelf", _("Shelves"),
e_int_config_shelf);
e_configure_header_item_add(eco, "enlightenment/extensions",
_("Extensions"));
- e_configure_standard_item_add(eco, "enlightenment/modules", _("Module
Settings"), e_int_config_modules);
+ e_configure_standard_item_add(eco, "enlightenment/modules", _("Modules"),
e_int_config_modules);
e_configure_header_item_add(eco, "enlightenment/screen_setup", _("Screen"));
- e_configure_standard_item_add(eco, "enlightenment/desktops", _("Desktop
Settings"), e_int_config_desks);
- e_configure_standard_item_add(eco, "enlightenment/desktops", _("Display
Settings"), e_int_config_display);
- e_configure_standard_item_add(eco, "enlightenment/desktops", _("Desktop
Lock Settings"), e_int_config_desklock);
+ e_configure_standard_item_add(eco, "enlightenment/desktops", _("Virtual
Desktops"), e_int_config_desks);
+ e_configure_standard_item_add(eco, "enlightenment/desktops", _("Screen
Resolution"), e_int_config_display);
+ e_configure_standard_item_add(eco, "enlightenment/desktops", _("Screen
Lock"), e_int_config_desklock);
e_configure_header_item_add(eco, "enlightenment/behavior", _("Behavior"));
- e_configure_standard_item_add(eco, "enlightenment/e", _("Focus Settings"),
e_int_config_focus);
- e_configure_standard_item_add(eco, "enlightenment/e", _("Key Binding
Settings"), e_int_config_keybindings);
- e_configure_standard_item_add(eco, "enlightenment/favorites", _("Menu
Settings"), e_int_config_menus);
+ e_configure_standard_item_add(eco, "enlightenment/e", _("Window Focus"),
e_int_config_focus);
+ e_configure_standard_item_add(eco, "enlightenment/e", _("Key Bindings"),
e_int_config_keybindings);
+ e_configure_standard_item_add(eco, "enlightenment/favorites", _("Menus"),
e_int_config_menus);
e_configure_header_item_add(eco, "enlightenment/misc", _("Miscellaneous"));
- e_configure_standard_item_add(eco, "enlightenment/configuration",
_("Performance Settings"), e_int_config_performance);
- e_configure_standard_item_add(eco, "enlightenment/configuration", _("Config
Dialog Settings"), e_int_config_cfgdialogs);
+ e_configure_standard_item_add(eco, "enlightenment/configuration",
_("Performance"), e_int_config_performance);
+ e_configure_standard_item_add(eco, "enlightenment/configuration",
_("Configuration Dialogs"), e_int_config_cfgdialogs);
e_configure_header_item_add(eco, "enlightenment/advanced", _("Advanced"));
- e_configure_standard_item_add(eco, "enlightenment/run", _("Startup
Settings"), e_int_config_startup);
- e_configure_standard_item_add(eco, "enlightenment/windows", _("Window List
Settings"), e_int_config_winlist);
- e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
Manipulation Settings"), e_int_config_window_manipulation);
- e_configure_standard_item_add(eco, "enlightenment/run", _("Run Command
Settings"), e_int_config_exebuf);
- e_configure_standard_item_add(eco, "enlightenment/e", _("Search Paths"),
e_int_config_paths);
+ e_configure_standard_item_add(eco, "enlightenment/run", _("Startup"),
e_int_config_startup);
+ e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
List"), e_int_config_winlist);
+ e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
Manipulation"), e_int_config_window_manipulation);
+ e_configure_standard_item_add(eco, "enlightenment/run", _("Run Command"),
e_int_config_exebuf);
+ e_configure_standard_item_add(eco, "enlightenment/e", _("Search
Directories"), e_int_config_paths);
/* FIXME: we should have a way for modules to hook in here and add their
* own entries
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- e_includes.h 23 Apr 2006 06:56:22 -0000 1.100
+++ e_includes.h 30 Apr 2006 03:43:47 -0000 1.101
@@ -133,3 +133,4 @@
#include "e_widget_preview.h"
#include "e_int_config_paths.h"
#include "e_int_shelf_config.h"
+#include "e_int_config_shelf.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_cfgdialogs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_cfgdialogs.c 15 Feb 2006 20:26:53 -0000 1.1
+++ e_int_config_cfgdialogs.c 30 Apr 2006 03:43:47 -0000 1.2
@@ -61,9 +61,7 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->cfgdlg_auto_apply = cfdata->auto_apply;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
}
@@ -85,10 +83,8 @@
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->cfgdlg_auto_apply = cfdata->auto_apply;
e_config->cfgdlg_default_mode = cfdata->default_mode;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_cursor.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_cursor.c 4 Mar 2006 04:46:08 -0000 1.6
+++ e_int_config_cursor.c 30 Apr 2006 03:43:47 -0000 1.7
@@ -64,9 +64,7 @@
if (e_config->use_e_cursor != cfdata->use_e_cursor) changed = 1;
- e_border_button_bindings_ungrab_all();
e_config->use_e_cursor = cfdata->use_e_cursor;
- e_border_button_bindings_grab_all();
e_config_save_queue();
if (changed)
@@ -112,13 +110,11 @@
if (e_config->use_e_cursor != cfdata->use_e_cursor) changed = 1;
if (e_config->cursor_size != cfdata->cursor_size) changed = 1;
- e_border_button_bindings_ungrab_all();
e_config->use_e_cursor = cfdata->use_e_cursor;
if (cfdata->cursor_size <= 0) cfdata->cursor_size = 1;
e_config->cursor_size = cfdata->cursor_size;
-
- e_border_button_bindings_grab_all();
e_config_save_queue();
+
if (changed)
{
Evas_List *l;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_exebuf.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_exebuf.c 13 Feb 2006 13:35:53 -0000 1.1
+++ e_int_config_exebuf.c 30 Apr 2006 03:43:47 -0000 1.2
@@ -81,11 +81,9 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->exebuf_max_exe_list = cfdata->max_exe_list;
e_config->exebuf_max_eap_list = cfdata->max_eap_list;
e_config->exebuf_scroll_animate = cfdata->scroll_animate;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
}
@@ -118,7 +116,6 @@
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->exebuf_max_exe_list = cfdata->max_exe_list;
e_config->exebuf_max_eap_list = cfdata->max_eap_list;
e_config->exebuf_scroll_animate = cfdata->scroll_animate;
@@ -129,7 +126,6 @@
e_config->exebuf_pos_min_h = cfdata->pos_min_h;
e_config->exebuf_pos_max_w = cfdata->pos_max_w;
e_config->exebuf_pos_max_h = cfdata->pos_max_h;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_menus.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_menus.c 13 Feb 2006 15:36:56 -0000 1.5
+++ e_int_config_menus.c 30 Apr 2006 03:43:47 -0000 1.6
@@ -72,11 +72,9 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->menu_eap_name_show = cfdata->menu_eap_name_show;
e_config->menu_eap_generic_show = cfdata->menu_eap_generic_show;
e_config->menu_eap_comment_show = cfdata->menu_eap_comment_show;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
}
@@ -101,7 +99,6 @@
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->menu_eap_name_show = cfdata->menu_eap_name_show;
e_config->menu_eap_generic_show = cfdata->menu_eap_generic_show;
e_config->menu_eap_comment_show = cfdata->menu_eap_comment_show;
@@ -119,7 +116,6 @@
e_config->menus_click_drag_timeout = cfdata->menus_click_drag_timeout;
e_config->menu_autoscroll_margin = cfdata->menu_autoscroll_margin;
e_config->menu_autoscroll_cursor_margin =
cfdata->menu_autoscroll_cursor_margin;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_performance.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_performance.c 13 Feb 2006 15:36:56 -0000 1.6
+++ e_int_config_performance.c 30 Apr 2006 03:43:47 -0000 1.7
@@ -68,10 +68,8 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0;
e_config->framerate = cfdata->framerate;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
}
@@ -97,7 +95,6 @@
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
if (cfdata->framerate <= 0.0) cfdata->framerate = 1.0;
e_config->framerate = cfdata->framerate;
e_config->cache_flush_interval = cfdata->cache_flush_interval;
@@ -105,7 +102,6 @@
e_config->image_cache = (cfdata->image_cache * 1024);
e_config->edje_cache = cfdata->edje_cache;
e_config->edje_collection_cache = cfdata->edje_collection_cache;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_startup.c 13 Feb 2006 15:36:56 -0000 1.2
+++ e_int_config_startup.c 30 Apr 2006 03:43:47 -0000 1.3
@@ -52,11 +52,8 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->show_splash = cfdata->show_splash;
- e_border_button_bindings_grab_all();
e_config_save_queue();
-
return 1;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_winlist.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_int_config_winlist.c 13 Feb 2006 15:36:56 -0000 1.7
+++ e_int_config_winlist.c 30 Apr 2006 03:43:47 -0000 1.8
@@ -96,7 +96,6 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->winlist_list_show_iconified = cfdata->list_show_iconified;
e_config->winlist_list_show_other_desk_windows =
cfdata->list_show_other_desk_windows;
e_config->winlist_list_show_other_screen_windows =
cfdata->list_show_other_screen_windows;
@@ -107,7 +106,6 @@
e_config->winlist_scroll_animate = cfdata->scroll_animate;
e_config->winlist_list_focus_while_selecting =
cfdata->list_focus_while_selecting;
e_config->winlist_list_raise_while_selecting =
cfdata->list_raise_while_selecting;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
@@ -158,7 +156,6 @@
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- e_border_button_bindings_ungrab_all();
e_config->winlist_list_show_iconified = cfdata->list_show_iconified;
e_config->winlist_list_show_other_desk_windows =
cfdata->list_show_other_desk_windows;
e_config->winlist_list_show_other_screen_windows =
cfdata->list_show_other_screen_windows;
@@ -177,7 +174,6 @@
e_config->winlist_pos_min_h = cfdata->pos_min_h;
e_config->winlist_pos_max_w = cfdata->pos_max_w;
e_config->winlist_pos_max_h = cfdata->pos_max_h;
- e_border_button_bindings_grab_all();
e_config_save_queue();
return 1;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_shelf_config.c 29 Apr 2006 03:51:27 -0000 1.2
+++ e_int_shelf_config.c 30 Apr 2006 03:43:47 -0000 1.3
@@ -122,8 +122,6 @@
cfdata->escfg->fit_size = cfdata->fit_size;
cfdata->escfg->size = cfdata->size;
- printf("%i %i %i\n", cfdata->fit_along, cfdata->fit_size, cfdata->size);
-
if (cfdata->escfg->style) evas_stringshare_del(cfdata->escfg->style);
cfdata->escfg->style = evas_stringshare_add(cfdata->style);
if (cfdata->layering == 0)
@@ -174,7 +172,7 @@
CFStyle *cfs;
/* FIXME: this is just raw config now - it needs UI improvments */
- o = e_widget_list_add(evas, 1, 1);
+ o = e_widget_list_add(evas, 0, 1);
o2 = e_widget_list_add(evas, 0, 0);
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
