Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_test.c e_widget_framelist.c
Added Files:
e_widget_frametable.c e_widget_frametable.h
Log Message:
table widget wrapper - NOTE - NON-homogenous tables do NOT work. :) need to
fix that :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- Makefile.am 12 Oct 2005 22:21:50 -0000 1.58
+++ Makefile.am 13 Oct 2005 00:41:08 -0000 1.59
@@ -89,7 +89,8 @@
e_widget_framelist.h \
e_widget_list.h \
e_widget_button.h \
-e_widget_label.h
+e_widget_label.h \
+e_widget_frametable.h
enlightenment_src = \
e_user.c \
@@ -161,6 +162,7 @@
e_widget_list.c \
e_widget_button.c \
e_widget_label.c \
+e_widget_frametable.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- e_includes.h 12 Oct 2005 23:00:45 -0000 1.43
+++ e_includes.h 13 Oct 2005 00:41:09 -0000 1.44
@@ -71,3 +71,4 @@
#include "e_widget_list.h"
#include "e_widget_button.h"
#include "e_widget_label.h"
+#include "e_widget_frametable.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_test.c 12 Oct 2005 16:02:33 -0000 1.21
+++ e_test.c 13 Oct 2005 00:41:09 -0000 1.22
@@ -307,7 +307,7 @@
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
}
-#elif 0
+#elif 1
static int my_val = 0;
static int my_val2 = 0;
static int my_val3 = 0;
@@ -365,6 +365,23 @@
e_widget_list_object_append(hb, o, 0, 0, 0.0);
+ o = e_widget_frametable_add(e, "My Frame Table", 1);
+
+ e_widget_frametable_object_append(o, e_widget_label_add(e, "Label 1"),
+ 0, 0, 1, 1,
+ 1, 1, 1, 1);
+ e_widget_frametable_object_append(o, e_widget_label_add(e, "Label 2"),
+ 1, 0, 1, 1,
+ 1, 1, 1, 1);
+ e_widget_frametable_object_append(o, e_widget_label_add(e, "Label 3"),
+ 2, 0, 1, 1,
+ 1, 1, 1, 1);
+ e_widget_frametable_object_append(o, e_widget_label_add(e, "Label 4"),
+ 0, 1, 1, 1,
+ 1, 1, 1, 1);
+
+ e_widget_list_object_append(hb, o, 0, 0, 0.5);
+
e_widget_list_object_append(ol, hb, 1, 1, 0.5);
o = e_widget_button_add(e, "Button", "enlightenment/exit", NULL, NULL,
NULL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_framelist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_framelist.c 11 Oct 2005 16:25:00 -0000 1.2
+++ e_widget_framelist.c 13 Oct 2005 00:41:09 -0000 1.3
@@ -40,7 +40,7 @@
wd->o_box = o;
e_box_orientation_set(o, horiz);
e_box_homogenous_set(o, 0);
- edje_object_part_swallow(o, "items", wd->o_box);
+ edje_object_part_swallow(wd->o_frame, "items", o);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
-------------------------------------------------------
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
