Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_border.c e_border.h e_includes.h e_widget.c
Added Files:
e_int_border_locks.c e_int_border_locks.h
Log Message:
locks have been dialogified :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- Makefile.am 14 Oct 2005 11:18:00 -0000 1.62
+++ Makefile.am 17 Oct 2005 11:51:46 -0000 1.63
@@ -94,7 +94,8 @@
e_widget_table.h \
e_config_dialog.h \
e_int_config_focus.h \
-e_icon_layout.h
+e_icon_layout.h \
+e_int_border_locks.h
enlightenment_src = \
e_user.c \
@@ -171,6 +172,7 @@
e_config_dialog.c \
e_int_config_focus.c \
e_icon_layout.c \
+e_int_border_locks.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.449
retrieving revision 1.450
diff -u -3 -r1.449 -r1.450
--- e_border.c 16 Oct 2005 05:59:18 -0000 1.449
+++ e_border.c 17 Oct 2005 11:51:46 -0000 1.450
@@ -2723,23 +2723,10 @@
{
int was_menu = 0;
- if (bd->border_locks_menu)
+ if (bd->border_locks_dialog)
{
- e_object_del(E_OBJECT(bd->border_locks_menu));
- bd->border_locks_menu = NULL;
- was_menu = 1;
- }
- if (bd->border_locks_user_menu)
- {
- e_object_del(E_OBJECT(bd->border_locks_user_menu));
- bd->border_locks_user_menu = NULL;
- was_menu = 1;
- }
- if (bd->border_locks_application_menu)
- {
- e_object_del(E_OBJECT(bd->border_locks_application_menu));
- bd->border_locks_application_menu = NULL;
- was_menu = 1;
+ e_object_del(E_OBJECT(bd->border_locks_dialog));
+ bd->border_locks_dialog = NULL;
}
if (bd->border_remember_menu)
{
@@ -5699,40 +5686,6 @@
}
}
-#define NEW_LOCK_FN(var) \
-static void \
-_e_border_menu_cb_##var(void *data, E_Menu *m, E_Menu_Item *mi) \
-{ \
- E_Border *bd; \
- bd = data; \
- bd->var = e_menu_item_toggle_get(mi); \
- bd->changed = 1; \
-}
-
-NEW_LOCK_FN(lock_user_location)
-NEW_LOCK_FN(lock_client_location)
-NEW_LOCK_FN(lock_user_size)
-NEW_LOCK_FN(lock_client_size)
-NEW_LOCK_FN(lock_user_stacking)
-NEW_LOCK_FN(lock_client_stacking)
-NEW_LOCK_FN(lock_user_iconify)
-NEW_LOCK_FN(lock_client_iconify)
-NEW_LOCK_FN(lock_user_desk)
-NEW_LOCK_FN(lock_client_desk)
-NEW_LOCK_FN(lock_user_sticky)
-NEW_LOCK_FN(lock_client_sticky)
-NEW_LOCK_FN(lock_user_shade)
-NEW_LOCK_FN(lock_client_shade)
-NEW_LOCK_FN(lock_user_maximize)
-NEW_LOCK_FN(lock_client_maximize)
-NEW_LOCK_FN(lock_user_fullscreen)
-NEW_LOCK_FN(lock_client_fullscreen)
-NEW_LOCK_FN(lock_border)
-NEW_LOCK_FN(lock_close)
-/*NEW_LOCK_FN(lock_focus_in)*/
-/*NEW_LOCK_FN(lock_focus_out)*/
-NEW_LOCK_FN(lock_life)
-
static void
_e_border_menu_cb_remember(void *data, E_Menu *m, E_Menu_Item *mi)
{
@@ -6177,6 +6130,14 @@
}
static void
+_e_border_menu_cb_locks(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ E_Border *bd;
+ bd = data;
+ e_int_border_locks(bd);
+}
+
+static void
_e_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key,
Ecore_X_Time timestamp)
{
E_Menu *m;
@@ -6185,67 +6146,6 @@
if (bd->border_menu) return;
m = e_menu_new();
- bd->border_locks_user_menu = m;
-
-#define NEW_LOCK_MI(txt, var) \
- mi = e_menu_item_new(m); \
- e_menu_item_label_set(mi, txt); \
- e_menu_item_check_set(mi, 1); \
- e_menu_item_toggle_set(mi, bd->var); \
- e_menu_item_callback_set(mi, _e_border_menu_cb_##var, bd);
-
- NEW_LOCK_MI(_("Position"), lock_user_location);
- NEW_LOCK_MI(_("Size"), lock_user_size);
- NEW_LOCK_MI(_("Stacking"), lock_user_stacking);
- NEW_LOCK_MI(_("Iconify"), lock_user_iconify);
-/* NEW_LOCK_MI(_("Virtual Desktop)"), lock_user_desk);*/
- NEW_LOCK_MI(_("Sticky"), lock_user_sticky);
- NEW_LOCK_MI(_("Shade"), lock_user_shade);
- NEW_LOCK_MI(_("Maximize"), lock_user_maximize);
- NEW_LOCK_MI(_("Fullscreen"), lock_user_fullscreen);
-
- m = e_menu_new();
- bd->border_locks_application_menu = m;
-
- NEW_LOCK_MI(_("Position"), lock_client_location);
- NEW_LOCK_MI(_("Size"), lock_client_size);
- NEW_LOCK_MI(_("Stacking"), lock_client_stacking);
- NEW_LOCK_MI(_("Iconify"), lock_client_iconify);
-/* NEW_LOCK_MI(_("Virtual Desktop"), lock_client_desk);*/
- NEW_LOCK_MI(_("Sticky"), lock_client_sticky);
- NEW_LOCK_MI(_("Shade"), lock_client_shade);
- NEW_LOCK_MI(_("Maximize"), lock_client_maximize);
- NEW_LOCK_MI(_("Fullscreen"), lock_client_fullscreen);
-
- m = e_menu_new();
- bd->border_locks_menu = m;
-
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("User"));
- e_menu_item_submenu_set(mi, bd->border_locks_user_menu);
- e_menu_item_icon_edje_set(mi,
- (char *)e_theme_edje_file_get("base/theme/borders",
-
"widgets/border/default/locks_user"),
- "widgets/border/default/locks_user");
-
- mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Application"));
- e_menu_item_submenu_set(mi, bd->border_locks_application_menu);
- e_menu_item_icon_edje_set(mi,
- (char *)e_theme_edje_file_get("base/theme/borders",
-
"widgets/border/default/locks_application"),
- "widgets/border/default/locks_application");
-
- mi = e_menu_item_new(m);
- e_menu_item_separator_set(mi, 1);
-
- NEW_LOCK_MI(_("Border"), lock_border);
- NEW_LOCK_MI(_("Close"), lock_close);
-/* NEW_LOCK_MI(_("Focus In"), lock_focus_in);*/
-/* NEW_LOCK_MI(_("Focus Out"), lock_focus_out);*/
- NEW_LOCK_MI(_("Lifespan"), lock_life);
-
- m = e_menu_new();
bd->border_remember_menu = m;
#define NEW_REMEMBER_MI(txt, flag, var, cb) \
@@ -6462,8 +6362,8 @@
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
- e_menu_item_label_set(mi, _("Locks"));
- e_menu_item_submenu_set(mi, bd->border_locks_menu);
+ e_menu_item_label_set(mi, _("Window Locks"));
+ e_menu_item_callback_set(mi, _e_border_menu_cb_locks, bd);
e_menu_item_icon_edje_set(mi,
(char *)e_theme_edje_file_get("base/theme/borders",
"widgets/border/default/locks"),
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- e_border.h 29 Sep 2005 15:01:04 -0000 1.119
+++ e_border.h 17 Oct 2005 11:51:46 -0000 1.120
@@ -351,9 +351,7 @@
Evas_List *stick_desks;
E_Menu *border_menu;
- E_Menu *border_locks_menu;
- E_Menu *border_locks_user_menu;
- E_Menu *border_locks_application_menu;
+ E_Config_Dialog *border_locks_dialog;
E_Menu *border_remember_menu;
E_Menu *border_stacking_menu;
Evas_List *pending_move_resize;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- e_includes.h 14 Oct 2005 11:18:00 -0000 1.47
+++ e_includes.h 17 Oct 2005 11:51:46 -0000 1.48
@@ -76,3 +76,4 @@
#include "e_config_dialog.h"
#include "e_int_config_focus.h"
#include "e_icon_layout.h"
+#include "e_int_border_locks.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_widget.c 16 Oct 2005 12:24:30 -0000 1.5
+++ e_widget.c 17 Oct 2005 11:51:46 -0000 1.6
@@ -417,7 +417,6 @@
{
Evas_Object *o, *parent;
- printf("disable focused %p!\n", obj);
parent = obj;
for (;;)
{
@@ -425,7 +424,6 @@
if (!o) break;
parent = o;
}
- printf("jump %p\n", parent);
e_widget_focus_jump(parent, 1);
}
if (sd->disable_func) sd->disable_func(obj);
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
