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_int_border_locks.c e_int_border_menu.c e_scrollframe.c
e_scrollframe.h
Added Files:
e_int_border_border.c e_int_border_border.h e_widget_ilist.c
e_widget_ilist.h
Log Message:
and working on maing a border selector
does NOTHING YET! BEWARE! do NOT useit if u dont want some pain. i need to
make ecore evas canavses accepssible form an evas pointer etc. to make the
livethumb stuff cleaner so it can work
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -3 -r1.77 -r1.78
--- Makefile.am 6 Nov 2005 05:48:50 -0000 1.77
+++ Makefile.am 6 Nov 2005 08:03:13 -0000 1.78
@@ -110,7 +110,9 @@
e_file_dialog.h \
e_int_border_menu.h \
e_ilist.h \
-e_livethumb.h
+e_livethumb.h \
+e_int_border_border.h \
+e_widget_ilist.h
enlightenment_src = \
e_user.c \
@@ -202,6 +204,8 @@
e_int_border_menu.c \
e_ilist.c \
e_livethumb.c \
+e_int_border_border.c \
+e_widget_ilist.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -3 -r1.460 -r1.461
--- e_border.c 4 Nov 2005 23:30:18 -0000 1.460
+++ e_border.c 6 Nov 2005 08:03:13 -0000 1.461
@@ -2647,6 +2647,11 @@
e_object_del(E_OBJECT(bd->border_remember_dialog));
bd->border_remember_dialog = NULL;
}
+ if (bd->border_border_dialog)
+ {
+ e_object_del(E_OBJECT(bd->border_border_dialog));
+ bd->border_border_dialog = NULL;
+ }
e_int_border_menu_del(bd);
@@ -2754,6 +2759,11 @@
e_object_del(E_OBJECT(bd->border_remember_dialog));
bd->border_remember_dialog = NULL;
}
+ if (bd->border_border_dialog)
+ {
+ e_object_del(E_OBJECT(bd->border_border_dialog));
+ bd->border_border_dialog = NULL;
+ }
e_int_border_menu_del(bd);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- e_border.h 4 Nov 2005 23:30:18 -0000 1.124
+++ e_border.h 6 Nov 2005 08:03:13 -0000 1.125
@@ -356,6 +356,7 @@
E_Menu *border_menu;
E_Config_Dialog *border_locks_dialog;
E_Config_Dialog *border_remember_dialog;
+ E_Config_Dialog *border_border_dialog;
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.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- e_includes.h 6 Nov 2005 05:48:50 -0000 1.61
+++ e_includes.h 6 Nov 2005 08:03:13 -0000 1.62
@@ -91,3 +91,5 @@
#include "e_int_border_menu.h"
#include "e_ilist.h"
#include "e_livethumb.h"
+#include "e_int_border_border.h"
+#include "e_widget_ilist.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_locks.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_border_locks.c 23 Oct 2005 15:13:48 -0000 1.5
+++ e_int_border_locks.c 6 Nov 2005 08:03:13 -0000 1.6
@@ -179,6 +179,8 @@
{
cfdata->border->lock_border = 1;
}
+ /* FIXME: need to check if the remember stuff will actually work or not
+ * (see e_int_border_remember.c where it checks and warns) */
if (cfdata->remember_locks)
{
if (!cfdata->border->remember)
@@ -241,6 +243,8 @@
cfdata->border->lock_focus_in = cfdata->lock.focus_in;
cfdata->border->lock_focus_out = cfdata->lock.focus_out;
cfdata->border->lock_life = cfdata->lock.life;
+ /* FIXME: need to check if the remember stuff will actually work or not
+ * (see e_int_border_remember.c where it checks and warns) */
if (cfdata->lock.remember)
{
if (!cfdata->border->remember)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_border_menu.c 4 Nov 2005 23:30:18 -0000 1.4
+++ e_int_border_menu.c 6 Nov 2005 08:03:13 -0000 1.5
@@ -6,6 +6,7 @@
static void _e_border_cb_border_menu_end(void *data, E_Menu *m);
static void _e_border_menu_cb_locks(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_remember(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _e_border_menu_cb_border(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_close(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_iconify(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_border_menu_cb_kill(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -88,6 +89,13 @@
"widgets/border/default/remember"),
"widgets/border/default/remember");
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,
+ (char *)e_theme_edje_file_get("base/theme/borders",
+
"widgets/border/default/borders"),
+ "widgets/border/default/borders");
+ mi = e_menu_item_new(m);
e_menu_item_separator_set(mi, 1);
mi = e_menu_item_new(m);
@@ -337,6 +345,15 @@
}
static void
+_e_border_menu_cb_border(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ E_Border *bd;
+ bd = data;
+ if (bd->border_border_dialog) return;
+ e_int_border_border(bd);
+}
+
+static void
_e_border_menu_cb_close(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Border *bd;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_scrollframe.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_scrollframe.c 6 Nov 2005 05:48:50 -0000 1.7
+++ e_scrollframe.c 6 Nov 2005 08:03:13 -0000 1.8
@@ -283,6 +283,13 @@
if (vbar) *vbar = sd->vbar_flags;
}
+Evas_Object *
+e_scrollframe_edje_object_get(Evas_Object *obj)
+{
+ API_ENTRY return NULL;
+ return sd->edje_obj;
+}
+
/* local subsystem functions */
static void
_e_smart_edje_drag_v(void *data, Evas_Object *obj, const char *emission, const
char *source)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_scrollframe.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_scrollframe.h 3 Nov 2005 06:17:08 -0000 1.3
+++ e_scrollframe.h 6 Nov 2005 08:03:13 -0000 1.4
@@ -28,6 +28,7 @@
EAPI void e_scrollframe_page_size_get (Evas_Object *obj, Evas_Coord
*x, Evas_Coord *y);
EAPI void e_scrollframe_policy_set (Evas_Object *obj,
E_Scrollframe_Policy hbar, E_Scrollframe_Policy vbar);
EAPI void e_scrollframe_policy_get (Evas_Object *obj,
E_Scrollframe_Policy *hbar, E_Scrollframe_Policy *vbar);
+EAPI Evas_Object *e_scrollframe_edje_object_get (Evas_Object *obj);
#endif
#endif
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
