Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_button_test.c etk_canvas_test.c etk_colorpicker_test.c
etk_scale_test.c etk_table_test.c etk_test.h etk_tree_test.c
Log Message:
A lot of changes, most significant are:
* [Tree] A tree can now have resizable column headers
* [Tree] Fix the rendering of the first column of a tree in the LIST mode
* [Scale] Implemented
* [Scrollbar] Implemented
* XCursor Support
* Should fix the amd64 segv (I need a confirmation)
* A lot of invisible things, bug fixes and mem leaks solved
* The canvas is broken
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_button_test.c 16 Oct 2005 00:05:57 -0000 1.2
+++ etk_button_test.c 23 Oct 2005 08:05:34 -0000 1.3
@@ -25,7 +25,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Button test"));
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Button Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_button_window_deleted_cb), win);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_canvas_test.c 16 Oct 2005 00:05:57 -0000 1.2
+++ etk_canvas_test.c 23 Oct 2005 08:05:34 -0000 1.3
@@ -56,6 +56,7 @@
return;
object = evas_object_rectangle_add(evas);
+ evas_object_show(object);
etk_canvas_object_add(canvas, object);
x = rand() % 300;
@@ -74,6 +75,5 @@
//printf("%d %d %d %d / %d %d %d %d\n", x, y, w, h, r, g, b, a);
- evas_object_show(object);
evas_object_raise(object);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_colorpicker_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_colorpicker_test.c 16 Oct 2005 00:05:57 -0000 1.2
+++ etk_colorpicker_test.c 23 Oct 2005 08:05:34 -0000 1.3
@@ -19,7 +19,6 @@
return;
}
-
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Color Picker"));
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_scale_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_scale_test.c 16 Oct 2005 00:05:57 -0000 1.2
+++ etk_scale_test.c 23 Oct 2005 08:05:34 -0000 1.3
@@ -6,11 +6,20 @@
return 1;
}
+static void _etk_test_scale_value_changed(Etk_Object *object, double value,
void *data)
+{
+ char string[256];
+
+ snprintf(string, 255, "%'.2f", value);
+ etk_label_set(ETK_LABEL(data), string);
+}
+
void etk_test_scale_window_create(void *data)
{
static Etk_Widget *win = NULL;
- Etk_Widget *hbox;
+ Etk_Widget *table;
Etk_Widget *scale;
+ Etk_Widget *label;
if (win)
{
@@ -23,18 +32,24 @@
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_scale_window_deleted_cb), win);
- hbox = etk_hbox_new(TRUE, 3);
- etk_container_add(ETK_CONTAINER(win), hbox);
- etk_widget_show(hbox);
-
- scale = etk_widget_new(ETK_BIN_TYPE, "theme_group", "hscale", "focusable",
TRUE, NULL);
- etk_widget_size_request_set(scale, 70, -1);
- etk_box_pack_start(ETK_BOX(hbox), scale, TRUE, TRUE, 0);
- etk_widget_show(scale);
- scale = etk_widget_new(ETK_BIN_TYPE, "theme_group", "vscale", "focusable",
TRUE, NULL);
- etk_widget_size_request_set(scale, -1, 70);
- etk_box_pack_start(ETK_BOX(hbox), scale, TRUE, TRUE, 0);
- etk_widget_show(scale);
+ table = etk_table_new(2, 2, FALSE);
+ etk_container_add(ETK_CONTAINER(win), table);
+
+ scale = etk_hscale_new(0.0, 255.0, 128.0, 1.0, 10.0);
+ etk_widget_size_request_set(scale, 70, 70);
+ etk_table_attach_defaults(ETK_TABLE(table), scale, 0, 0, 0, 0);
+
+ label = etk_label_new("128.00");
+ etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_signal_connect("value_changed", ETK_OBJECT(scale),
ETK_CALLBACK(_etk_test_scale_value_changed), label);
+
+ scale = etk_vscale_new(0.0, 255.0, 128.0, 1.0, 10.0);
+ etk_widget_size_request_set(scale, 70, 70);
+ etk_table_attach_defaults(ETK_TABLE(table), scale, 1, 1, 0, 0);
+
+ label = etk_label_new("128.00");
+ etk_table_attach(ETK_TABLE(table), label, 1, 1, 1, 1, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_signal_connect("value_changed", ETK_OBJECT(scale),
ETK_CALLBACK(_etk_test_scale_value_changed), label);
- etk_widget_show(win);
+ etk_widget_show_all(win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_table_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_table_test.c 16 Oct 2005 00:05:57 -0000 1.2
+++ etk_table_test.c 23 Oct 2005 08:05:34 -0000 1.3
@@ -27,7 +27,7 @@
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_table_window_deleted_cb), win);
image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/open.png");
- widget[0] = etk_button_new_with_label(_("Set Icon"));
+ widget[0] = etk_button_new_with_label("Set Icon");
etk_button_image_set(ETK_BUTTON(widget[0]), ETK_IMAGE(image));
widget[20] = etk_alignment_new(0.5, 0.5, 0.0, 0.0);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_test.h 16 Oct 2005 00:05:57 -0000 1.2
+++ etk_test.h 23 Oct 2005 08:05:34 -0000 1.3
@@ -3,12 +3,6 @@
#include "Etk.h"
-/* Gettext */
-#include <libintl.h>
-#define _(String) gettext (String)
-#define gettext_noop(String) String
-#define N_(String) gettext_noop (String)
-
typedef struct _Etk_Test_Set Etk_Test_Set;
struct _Etk_Test_Set
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_tree_test.c 16 Oct 2005 00:05:57 -0000 1.6
+++ etk_tree_test.c 23 Oct 2005 08:05:34 -0000 1.7
@@ -38,13 +38,13 @@
/* The tree: */
tree = etk_tree_new();
- etk_widget_size_request_set(tree, 300, 400);
+ etk_widget_size_request_set(tree, 320, 400);
etk_table_attach_defaults(ETK_TABLE(table), tree, 0, 0, 1, 1);
etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_TREE);
- col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
ETK_TREE_COL_ICON_TEXT);
- col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT);
- col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE);
+ col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
ETK_TREE_COL_ICON_TEXT, 10, 100, TRUE);
+ col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT,
10, 100, TRUE);
+ col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE,
10, 100, TRUE);
etk_tree_build(ETK_TREE(tree));
etk_tree_freeze(ETK_TREE(tree));
@@ -62,13 +62,13 @@
/* The list: */
tree = etk_tree_new();
- etk_widget_size_request_set(tree, 300, 400);
+ etk_widget_size_request_set(tree, 320, 400);
etk_table_attach_defaults(ETK_TABLE(table), tree, 1, 1, 1, 1);
etk_tree_multiple_select_set(ETK_TREE(tree), TRUE);
- col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"), ETK_TREE_COL_TEXT);
- col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT);
- col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE);
+ col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"), ETK_TREE_COL_TEXT,
10, 100, TRUE);
+ col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT,
10, 100, TRUE);
+ col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE,
10, 100, TRUE);
etk_tree_build(ETK_TREE(tree));
etk_tree_freeze(ETK_TREE(tree));
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
