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_entry_test.c etk_image_test.c etk_menu_test.c
etk_paned_test.c etk_scale_test.c etk_scrolled_view_test.c
etk_table_test.c etk_test.c etk_tree_test.c
Log Message:
* More work on the menus
* Add a menu bar (need some theming)
* Add a status bar (the resize grip doesn't work yet)
* Clean up etk_test
* Some minor fixes and new things
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_button_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_button_test.c 23 Oct 2005 08:05:34 -0000 1.3
+++ etk_button_test.c 20 Nov 2005 10:33:28 -0000 1.4
@@ -1,13 +1,7 @@
#include "etk_test.h"
-#include "../../config.h"
-
-static Etk_Bool _etk_test_button_window_deleted_cb (void *data)
-{
- Etk_Window *win = data;
- etk_widget_hide (ETK_WIDGET(win));
- return 1;
-}
+#include "config.h"
+/* Creates the window for the button test */
void etk_test_button_window_create(void *data)
{
static Etk_Widget *win = NULL;
@@ -18,17 +12,17 @@
Etk_Widget *button_radio;
Etk_Widget *image;
- if (win)
- {
- etk_widget_show_all(ETK_WIDGET(win));
- return;
- }
-
+ if (win)
+ {
+ etk_widget_show_all(ETK_WIDGET(win));
+ return;
+ }
+
win = etk_window_new();
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);
-
+ etk_container_border_width_set(ETK_CONTAINER(win), 5);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+
vbox = etk_vbox_new(FALSE, 3);
etk_container_add(ETK_CONTAINER(win), vbox);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_canvas_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_canvas_test.c 11 Nov 2005 22:48:48 -0000 1.5
+++ etk_canvas_test.c 20 Nov 2005 10:33:28 -0000 1.6
@@ -1,17 +1,10 @@
#include "etk_test.h"
#include <Evas.h>
#include <stdlib.h>
-#include "../../config.h"
static void _etk_test_canvas_object_add(void *data);
-static Etk_Bool _etk_test_canvas_window_deleted_cb (void *data)
-{
- Etk_Window *win = data;
- etk_widget_hide (ETK_WIDGET(win));
- return 1;
-}
-
+/* Creates the window for the canvas test */
void etk_test_canvas_window_create(void *data)
{
static Etk_Widget *win = NULL;
@@ -27,8 +20,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Canvas Test"));
-
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_canvas_window_deleted_cb), win);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
vbox = etk_vbox_new(FALSE, 5);
etk_container_add(ETK_CONTAINER(win), vbox);
@@ -44,6 +36,7 @@
etk_widget_show_all(win);
}
+/* Adds a rectangle object to the canvas */
static void _etk_test_canvas_object_add(void *data)
{
Etk_Canvas *canvas;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_colorpicker_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_colorpicker_test.c 23 Oct 2005 08:05:34 -0000 1.3
+++ etk_colorpicker_test.c 20 Nov 2005 10:33:28 -0000 1.4
@@ -1,29 +1,20 @@
#include "etk_test.h"
-#include "../../config.h"
-
-static Etk_Bool _etk_test_canvas_window_deleted_cb (void *data)
-{
- Etk_Window *win = data;
- etk_widget_hide (ETK_WIDGET(win));
- return 1;
-}
+/* Creates the window for the color picker test */
void etk_test_colorpicker_window_create(void *data)
{
static Etk_Widget *win = NULL;
Etk_Widget *cp;
- if (win)
- {
- etk_widget_show_all(ETK_WIDGET(win));
- return;
- }
-
+ if (win)
+ {
+ etk_widget_show_all(ETK_WIDGET(win));
+ return;
+ }
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Color Picker"));
-
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_canvas_window_deleted_cb), win);
-
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+
cp = etk_colorpicker_new();
etk_container_add(ETK_CONTAINER(win), cp);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_entry_test.c 2 Nov 2005 13:53:38 -0000 1.4
+++ etk_entry_test.c 20 Nov 2005 10:33:28 -0000 1.5
@@ -1,20 +1,11 @@
#include "etk_test.h"
+static void _etk_test_entry_print_clicked(Etk_Object *object, void *data);
+
static Etk_Widget *label = NULL;
static Etk_Widget *entry = NULL;
-static Etk_Bool _etk_test_entry_window_deleted_cb(void *data)
-{
- Etk_Window *win = data;
- etk_widget_hide (ETK_WIDGET(win));
- return 1;
-}
-
-static void _etk_test_entry_print_clicked(Etk_Object *object, void *data)
-{
- etk_label_set(ETK_LABEL(label), etk_entry_text_get(ETK_ENTRY(entry)));
-}
-
+/* Creates the window for the entry test */
void etk_test_entry_window_create(void *data)
{
static Etk_Widget *win = NULL;
@@ -29,9 +20,8 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Entry Test"));
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_entry_window_deleted_cb), win);
-
table = etk_table_new(2, 2, FALSE);
etk_container_add(ETK_CONTAINER(win), table);
@@ -47,3 +37,9 @@
etk_widget_show_all(win);
}
+
+/* Prints the text of the entry in the label */
+static void _etk_test_entry_print_clicked(Etk_Object *object, void *data)
+{
+ etk_label_set(ETK_LABEL(label), etk_entry_text_get(ETK_ENTRY(entry)));
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_image_test.c 16 Oct 2005 00:05:57 -0000 1.2
+++ etk_image_test.c 20 Nov 2005 10:33:28 -0000 1.3
@@ -1,13 +1,7 @@
#include "etk_test.h"
-#include "../../config.h"
-
-static Etk_Bool _etk_test_image_window_deleted_cb (void *data)
-{
- Etk_Window *win = data;
- etk_widget_hide (ETK_WIDGET(win));
- return 1;
-}
+#include "config.h"
+/* Creates the window for the image test */
void etk_test_image_window_create(void *data)
{
static Etk_Widget *win = NULL;
@@ -15,16 +9,15 @@
Etk_Widget *labels[2];
Etk_Widget *table;
- if (win)
- {
- etk_widget_show_all(ETK_WIDGET(win));
- return;
- }
-
+ if (win)
+ {
+ etk_widget_show_all(ETK_WIDGET(win));
+ return;
+ }
+
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Image Test"));
-
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_image_window_deleted_cb), win);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
images[0] = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
etk_image_keep_aspect_set(ETK_IMAGE(images[0]), TRUE);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_menu_test.c 13 Nov 2005 12:20:33 -0000 1.3
+++ etk_menu_test.c 20 Nov 2005 10:33:28 -0000 1.4
@@ -1,29 +1,25 @@
#include "etk_test.h"
#include "config.h"
-/* Called when the user tries to destroy the window */
-static Etk_Bool _etk_test_menu_window_deleted_cb(Etk_Object *object, void
*data)
+typedef enum _Etk_Test_Menu_Item_Type
{
- etk_widget_hide(ETK_WIDGET(object));
- return TRUE;
-}
+ ETK_TEST_MENU_ITEM_NORMAL,
+ ETK_TEST_MENU_ITEM_SEPARATOR
+} Etk_Test_Menu_Item_Type;
-/* Called when the user clicks on the window */
-static Etk_Bool _etk_test_menu_window_down_cb(Etk_Object *object, void
*event_info, void *data)
-{
- etk_menu_popup(ETK_MENU(data));
-
- return TRUE;
-}
+static void _etk_test_menu_window_down_cb(Etk_Object *object, void
*event_info, void *data);
+static Etk_Widget *_etk_test_menu_item_new(Etk_Test_Menu_Item_Type item_type,
const char *label, Etk_Stock_Id stock_id, Etk_Menu_Shell *menu_shell);
-/* Create the window for the menu test */
+/* Creates the window for the menu test */
void etk_test_menu_window_create(void *data)
{
static Etk_Widget *win = NULL;
- Etk_Widget *menu, *menu2, *menu3;
+ Etk_Widget *vbox;
+ Etk_Widget *menu_bar;
+ Etk_Widget *menu;
Etk_Widget *menu_item;
Etk_Widget *label;
- Etk_Widget *image;
+ Etk_Widget *statusbar;
if (win)
{
@@ -33,63 +29,109 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Menu Test"));
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_menu_window_deleted_cb), NULL);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_widget_size_request_set(win, 300, 200);
- label = etk_label_new(_("Click me :)"));
- etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
- etk_container_add(ETK_CONTAINER(win), label);
+ /****************
+ * Menu Bar
+ ****************/
+ menu_bar = etk_menu_bar_new();
- /* Main Menu */
+ /* File Menu */
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("File"),
-1, ETK_MENU_SHELL(menu_bar));
menu = etk_menu_new();
+ etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Open"),
ETK_STOCK_OPEN, ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Save"),
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu));
- menu_item = etk_menu_item_new_with_label(_("Open"));
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/open.png");
- etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image));
- etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item));
-
- menu_item = etk_menu_item_new_with_label(_("Close"));
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/close.png");
- etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image));
- etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item));
-
- menu_item = etk_menu_item_new_with_label(_("Save"));
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/save.png");
- etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image));
- etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item));
-
- menu_item = etk_menu_separator_new();
- etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item));
+ /* Edit Menu */
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Edit"),
-1, ETK_MENU_SHELL(menu_bar));
+ menu = etk_menu_new();
+ etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Cut"), ETK_STOCK_CUT,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Copy"),
ETK_STOCK_COPY, ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Paste"),
ETK_STOCK_PASTE, ETK_MENU_SHELL(menu));
- menu_item = etk_menu_item_new_with_label(_("Menu Item Test"));
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
- etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image));
- etk_menu_shell_append(ETK_MENU_SHELL(menu), ETK_MENU_ITEM(menu_item));
+ /* Help Menu */
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Help"),
-1, ETK_MENU_SHELL(menu_bar));
+ menu = etk_menu_new();
+ etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("About"), -1,
ETK_MENU_SHELL(menu));
+
+ /****************
+ * Popup Menu
+ ****************/
+ /* Main menu */
+ menu = etk_menu_new();
+ etk_signal_connect("mouse_down", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_menu_window_down_cb), menu);
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Open"),
ETK_STOCK_OPEN, ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Save"),
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL, -1,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Cut"), ETK_STOCK_CUT,
ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Copy"),
ETK_STOCK_COPY, ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Paste"),
ETK_STOCK_PASTE, ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL, -1,
ETK_MENU_SHELL(menu));
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Menu Item
Test"), -1, ETK_MENU_SHELL(menu));
/* Sub menu 1 */
- menu2 = etk_menu_new();
- etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu2));
-
- menu_item = etk_menu_item_new_with_label(_("Child Menu Test"));
- etk_menu_shell_append(ETK_MENU_SHELL(menu2), ETK_MENU_ITEM(menu_item));
+ menu = etk_menu_new();
+ etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Child Menu Test"),
-1, ETK_MENU_SHELL(menu));
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with
child"), -1, ETK_MENU_SHELL(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with image"),
ETK_STOCK_SAVE, ETK_MENU_SHELL(menu));
- menu_item = etk_menu_item_new_with_label(_("Item with image"));
- image = etk_image_new_from_file(PACKAGE_DATA_DIR "/images/test.png");
- etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image));
- etk_menu_shell_append(ETK_MENU_SHELL(menu2), ETK_MENU_ITEM(menu_item));
+ /* Sub menu 2 */
+ menu = etk_menu_new();
+ etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Child Menu Test"),
-1, ETK_MENU_SHELL(menu));
- menu_item = etk_menu_item_new_with_label(_("Item with child"));
- etk_menu_shell_append(ETK_MENU_SHELL(menu2), ETK_MENU_ITEM(menu_item));
- /* Sub menu 2 */
- menu3 = etk_menu_new();
- etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu3));
+ vbox = etk_vbox_new(FALSE, 0);
+ etk_container_add(ETK_CONTAINER(win), vbox);
- menu_item = etk_menu_item_new_with_label(_("Child Menu Test"));
- etk_menu_shell_append(ETK_MENU_SHELL(menu3), ETK_MENU_ITEM(menu_item));
+ etk_box_pack_start(ETK_BOX(vbox), menu_bar, FALSE, FALSE, 0);
+ label = etk_label_new(_("Click me :)"));
+ etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
+ etk_widget_pass_events_set(label, TRUE);
+ etk_box_pack_start(ETK_BOX(vbox), label, TRUE, TRUE, 0);
- etk_signal_connect("mouse_down", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_menu_window_down_cb), menu);
+ statusbar = etk_statusbar_new();
+ etk_box_pack_end(ETK_BOX(vbox), statusbar, FALSE, FALSE, 0);
etk_widget_show_all(win);
}
+
+/* Called when the user clicks on the window */
+static void _etk_test_menu_window_down_cb(Etk_Object *object, void
*event_info, void *data)
+{
+ etk_menu_popup(ETK_MENU(data));
+}
+
+/* Creates a new menu item */
+static Etk_Widget *_etk_test_menu_item_new(Etk_Test_Menu_Item_Type item_type,
const char *label, Etk_Stock_Id stock_id, Etk_Menu_Shell *menu_shell)
+{
+ Etk_Widget *menu_item = NULL;
+
+ switch (item_type)
+ {
+ case ETK_TEST_MENU_ITEM_NORMAL:
+ menu_item = etk_menu_item_new_with_label(label);
+ break;
+ case ETK_TEST_MENU_ITEM_SEPARATOR:
+ menu_item = etk_menu_separator_new();
+ break;
+ default:
+ return NULL;
+ }
+ if (stock_id >= 0)
+ {
+ Etk_Widget *image;
+
+ image = etk_image_new_from_stock(stock_id);
+ etk_menu_item_image_set(ETK_MENU_ITEM(menu_item), ETK_IMAGE(image));
+ }
+ etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
+
+ return menu_item;
+}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_paned_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_paned_test.c 28 Oct 2005 14:06:25 -0000 1.1
+++ etk_paned_test.c 20 Nov 2005 10:33:28 -0000 1.2
@@ -1,31 +1,23 @@
#include "etk_test.h"
-#include "../../config.h"
-
-static Etk_Bool _etk_test_paned_window_deleted_cb(void *data)
-{
- Etk_Window *win = data;
- etk_widget_hide(ETK_WIDGET(win));
- return 1;
-}
+/* Creates the window for the paned test */
void etk_test_paned_window_create(void *data)
{
static Etk_Widget *win = NULL;
Etk_Widget *vpaned, *hpaned;
Etk_Widget *label;
- if (win)
- {
- etk_widget_show_all(ETK_WIDGET(win));
- return;
- }
-
+ if (win)
+ {
+ etk_widget_show_all(ETK_WIDGET(win));
+ return;
+ }
+
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Paned Test"));
etk_widget_size_request_set(win, 300, 200);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_paned_window_deleted_cb), win);
-
vpaned = etk_vpaned_new();
etk_container_add(ETK_CONTAINER(win), vpaned);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_scale_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_scale_test.c 28 Oct 2005 14:06:25 -0000 1.4
+++ etk_scale_test.c 20 Nov 2005 10:33:28 -0000 1.5
@@ -1,19 +1,8 @@
#include "etk_test.h"
-static Etk_Bool _etk_test_scale_window_deleted_cb(void *data)
-{
- etk_widget_hide(ETK_WIDGET(data));
- 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);
-}
+static void _etk_test_scale_value_changed(Etk_Object *object, double value,
void *data);
+/* Creates the window for the paned test */
void etk_test_scale_window_create(void *data)
{
static Etk_Widget *win = NULL;
@@ -21,17 +10,16 @@
Etk_Widget *scale;
Etk_Widget *label;
- if (win)
- {
- etk_widget_show(ETK_WIDGET(win));
- return;
- }
+ if (win)
+ {
+ etk_widget_show(ETK_WIDGET(win));
+ return;
+ }
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Scale test"));
-
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_scale_window_deleted_cb), win);
-
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+
table = etk_table_new(2, 2, FALSE);
etk_container_add(ETK_CONTAINER(win), table);
@@ -53,3 +41,12 @@
etk_widget_show_all(win);
}
+
+/* Called when the value of the scale is changed */
+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);
+}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/etk/src/bin/etk_scrolled_view_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_scrolled_view_test.c 31 Oct 2005 21:36:40 -0000 1.1
+++ etk_scrolled_view_test.c 20 Nov 2005 10:33:28 -0000 1.2
@@ -1,27 +1,21 @@
#include "etk_test.h"
-static Etk_Bool _etk_test_scrolled_view_window_deleted_cb(void *data)
-{
- Etk_Window *win = data;
- etk_widget_hide(ETK_WIDGET(win));
- return 1;
-}
-
+/* Creates the window for the scrolled view test */
void etk_test_scrolled_view_window_create(void *data)
{
static Etk_Widget *win = NULL;
Etk_Widget *scrolled_view;
Etk_Widget *button;
- if (win)
- {
- etk_widget_show_all(ETK_WIDGET(win));
- return;
- }
-
+ if (win)
+ {
+ etk_widget_show_all(ETK_WIDGET(win));
+ return;
+ }
+
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Scrolled View Test"));
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_scrolled_view_window_deleted_cb), win);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
etk_widget_size_request_set(win, 180, 180);
scrolled_view = etk_scrolled_view_new();
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_table_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_table_test.c 2 Nov 2005 10:41:03 -0000 1.4
+++ etk_table_test.c 20 Nov 2005 10:33:28 -0000 1.5
@@ -1,13 +1,7 @@
#include "etk_test.h"
#include "config.h"
-static Etk_Bool _etk_test_table_window_deleted_cb (void *data)
-{
- Etk_Window *win = data;
- etk_widget_hide (ETK_WIDGET(win));
- return 1;
-}
-
+/* Creates the window for the table test */
void etk_test_table_window_create(void *data)
{
static Etk_Widget *win = NULL;
@@ -22,8 +16,8 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Table Test"));
-
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_table_window_deleted_cb), win);
+ etk_container_border_width_set(ETK_CONTAINER(win), 5);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
widget[0] = etk_button_new_from_stock(ETK_STOCK_OPEN);
etk_button_label_set(ETK_BUTTON(widget[0]), _("Set Icon"));
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_test.c 11 Nov 2005 22:48:48 -0000 1.5
+++ etk_test.c 20 Nov 2005 10:33:28 -0000 1.6
@@ -1,5 +1,6 @@
#include "etk_test.h"
+static void _etk_test_main_window();
static void _etk_test_main_quit_cb(void *data);
static Etk_Test_Set tests[] =
@@ -51,11 +52,22 @@
};
static int num_tests = sizeof(tests) / sizeof (tests[0]);
-static void _etk_test_main_quit_cb(void *data)
+int main(int argc, char *argv[])
{
- etk_main_quit();
+ if (!etk_init())
+ {
+ fprintf(stderr, "Could not init etk. Exiting...\n");
+ return 0;
+ };
+
+ _etk_test_main_window();
+ etk_main();
+ etk_shutdown();
+
+ return 1;
}
+/* Creates the main window */
static void _etk_test_main_window()
{
Etk_Widget *win;
@@ -65,8 +77,9 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Test Application"));
+ etk_container_border_width_set(ETK_CONTAINER(win), 5);
etk_signal_connect("destroy", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_main_quit_cb), NULL);
-
+
table = etk_table_new((num_tests + 3) / 4, 4, TRUE);
etk_container_add(ETK_CONTAINER(win), table);
@@ -79,18 +92,9 @@
etk_widget_show_all(win);
}
-
-int main(int argc, char *argv[])
+/* Called when the window is destroyed */
+static void _etk_test_main_quit_cb(void *data)
{
- if (!etk_init())
- {
- fprintf(stderr, "Could not init etk. Exiting...\n");
- return 0;
- };
-
- _etk_test_main_window();
- etk_main();
- etk_shutdown();
-
- return 1;
+ etk_main_quit();
}
+
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_tree_test.c 11 Nov 2005 22:48:48 -0000 1.15
+++ etk_tree_test.c 20 Nov 2005 10:33:28 -0000 1.16
@@ -1,99 +1,17 @@
#include "etk_test.h"
#include <string.h>
-#include "../../config.h"
+#include "config.h"
-/* Adds n items to the tree */
-static void _etk_test_tree_add_items(Etk_Tree *tree, int n)
-{
- int i;
- Etk_Tree_Col *col1, *col2, *col3;
- char row_name[256];
- char star_path[256];
-
- if (!tree)
- return;
-
- col1 = etk_tree_nth_col_get(tree, 0);
- col2 = etk_tree_nth_col_get(tree, 1);
- col3 = etk_tree_nth_col_get(tree, 2);
-
- etk_tree_freeze(tree);
- for (i = 0; i < n; i++)
- {
- snprintf(row_name, 256, "Row%d", i);
- if (i % 3 == 0)
- strncpy(star_path, PACKAGE_DATA_DIR "/images/1star.png", 256);
- else if (i % 3 == 1)
- strncpy(star_path, PACKAGE_DATA_DIR "/images/2stars.png", 256);
- else
- strncpy(star_path, PACKAGE_DATA_DIR "/images/3stars.png", 256);
-
- etk_tree_append(ETK_TREE(tree), col1, PACKAGE_DATA_DIR
"/images/1star.png", row_name, col2, i, col3, star_path, NULL);
- }
- etk_tree_thaw(tree);
-}
-
-/* Called when the user wants to close the window: we just hide it */
-static Etk_Bool _etk_test_tree_window_deleted_cb(void *data)
-{
- etk_widget_hide(ETK_WIDGET(data));
- return 1;
-}
-
-/* Called when a row is selected */
-static void _etk_test_tree_row_selected(Etk_Object *object, Etk_Tree_Row *row,
void *data)
-{
- Etk_Tree *tree;
- char *col1_string, *col3_path;
- int col2_value;
-
- tree = ETK_TREE(object);
- printf(_("Row selected %p %p\n"), object, row);
- etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), NULL,
&col1_string, etk_tree_nth_col_get(tree, 1), &col2_value,
etk_tree_nth_col_get(tree, 2), &col3_path, NULL);
- printf("\"%s\" %d %s\n\n", col1_string, col2_value, col3_path);
-}
-
-/* Called when a row is unselected */
-static void _etk_test_tree_row_unselected(Etk_Object *object, Etk_Tree_Row
*row, void *data)
-{
- printf(_("Row unselected %p %p\n"), object, row);
-}
-
-/* Called when the "Clear" button is clicked */
-static void _etk_test_tree_clear_list_cb(Etk_Object *object, void *data)
-{
- Etk_Tree *tree;
-
- if (!(tree = ETK_TREE(data)))
- return;
- etk_tree_clear(tree);
-}
-
-/* Called when the "Add 5 items" button is clicked */
-static void _etk_test_tree_add_5_cb(Etk_Object *object, void *data)
-{
- _etk_test_tree_add_items(ETK_TREE(data), 5);
-}
-
-/* Called when the "Add 50 items" button is clicked */
-static void _etk_test_tree_add_50_cb(Etk_Object *object, void *data)
-{
- _etk_test_tree_add_items(ETK_TREE(data), 50);
-}
-
-/* Called when the "Add 500 items" button is clicked */
-static void _etk_test_tree_add_500_cb(Etk_Object *object, void *data)
-{
- _etk_test_tree_add_items(ETK_TREE(data), 500);
-}
-
-/* Called when the "Add 5000 items" button is clicked */
-static void _etk_test_tree_add_5000_cb(Etk_Object *object, void *data)
-{
- _etk_test_tree_add_items(ETK_TREE(data), 5000);
-}
+static void _etk_test_tree_add_items(Etk_Tree *tree, int n);
+static void _etk_test_tree_row_selected(Etk_Object *object, Etk_Tree_Row *row,
void *data);
+static void _etk_test_tree_row_unselected(Etk_Object *object, Etk_Tree_Row
*row, void *data);
+static void _etk_test_tree_clear_list_cb(Etk_Object *object, void *data);
+static void _etk_test_tree_add_5_cb(Etk_Object *object, void *data);
+static void _etk_test_tree_add_50_cb(Etk_Object *object, void *data);
+static void _etk_test_tree_add_500_cb(Etk_Object *object, void *data);
+static void _etk_test_tree_add_5000_cb(Etk_Object *object, void *data);
-/* Create the test window */
+/* Creates the window for the tree test */
void etk_test_tree_window_create(void *data)
{
static Etk_Widget *win = NULL;
@@ -115,7 +33,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Tree Test"));
- etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_tree_window_deleted_cb), win);
+ etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
table = etk_table_new(2, 3, FALSE);
etk_container_add(ETK_CONTAINER(win), table);
@@ -129,9 +47,9 @@
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, 100);
- col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT,
100);
- col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE,
100);
+ col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
ETK_TREE_COL_ICON_TEXT, 90);
+ col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT,
90);
+ col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE,
90);
etk_tree_build(ETK_TREE(tree));
etk_tree_freeze(ETK_TREE(tree));
@@ -158,9 +76,9 @@
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_ICON_TEXT, 100);
- col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT,
100);
- col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE,
100);
+ col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
ETK_TREE_COL_ICON_TEXT, 90);
+ col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"), ETK_TREE_COL_INT,
90);
+ col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"), ETK_TREE_COL_IMAGE,
90);
etk_tree_build(ETK_TREE(tree));
_etk_test_tree_add_items(ETK_TREE(tree), 5000);
@@ -195,3 +113,87 @@
etk_widget_show_all(win);
}
+
+/* Adds n items to the tree */
+static void _etk_test_tree_add_items(Etk_Tree *tree, int n)
+{
+ int i;
+ Etk_Tree_Col *col1, *col2, *col3;
+ char row_name[256];
+ char star_path[256];
+
+ if (!tree)
+ return;
+
+ col1 = etk_tree_nth_col_get(tree, 0);
+ col2 = etk_tree_nth_col_get(tree, 1);
+ col3 = etk_tree_nth_col_get(tree, 2);
+
+ etk_tree_freeze(tree);
+ for (i = 0; i < n; i++)
+ {
+ snprintf(row_name, 256, "Row%d", i);
+ if (i % 3 == 0)
+ strncpy(star_path, PACKAGE_DATA_DIR "/images/1star.png", 256);
+ else if (i % 3 == 1)
+ strncpy(star_path, PACKAGE_DATA_DIR "/images/2stars.png", 256);
+ else
+ strncpy(star_path, PACKAGE_DATA_DIR "/images/3stars.png", 256);
+
+ etk_tree_append(ETK_TREE(tree), col1, PACKAGE_DATA_DIR
"/images/1star.png", row_name, col2, i, col3, star_path, NULL);
+ }
+ etk_tree_thaw(tree);
+}
+
+/* Called when a row is selected */
+static void _etk_test_tree_row_selected(Etk_Object *object, Etk_Tree_Row *row,
void *data)
+{
+ Etk_Tree *tree;
+ char *col1_string, *col3_path;
+ int col2_value;
+
+ tree = ETK_TREE(object);
+ printf(_("Row selected %p %p\n"), object, row);
+ etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), NULL,
&col1_string, etk_tree_nth_col_get(tree, 1), &col2_value,
etk_tree_nth_col_get(tree, 2), &col3_path, NULL);
+ printf("\"%s\" %d %s\n\n", col1_string, col2_value, col3_path);
+}
+
+/* Called when a row is unselected */
+static void _etk_test_tree_row_unselected(Etk_Object *object, Etk_Tree_Row
*row, void *data)
+{
+ printf(_("Row unselected %p %p\n"), object, row);
+}
+
+/* Called when the "Clear" button is clicked */
+static void _etk_test_tree_clear_list_cb(Etk_Object *object, void *data)
+{
+ Etk_Tree *tree;
+
+ if (!(tree = ETK_TREE(data)))
+ return;
+ etk_tree_clear(tree);
+}
+
+/* Called when the "Add 5 items" button is clicked */
+static void _etk_test_tree_add_5_cb(Etk_Object *object, void *data)
+{
+ _etk_test_tree_add_items(ETK_TREE(data), 5);
+}
+
+/* Called when the "Add 50 items" button is clicked */
+static void _etk_test_tree_add_50_cb(Etk_Object *object, void *data)
+{
+ _etk_test_tree_add_items(ETK_TREE(data), 50);
+}
+
+/* Called when the "Add 500 items" button is clicked */
+static void _etk_test_tree_add_500_cb(Etk_Object *object, void *data)
+{
+ _etk_test_tree_add_items(ETK_TREE(data), 500);
+}
+
+/* Called when the "Add 5000 items" button is clicked */
+static void _etk_test_tree_add_5000_cb(Etk_Object *object, void *data)
+{
+ _etk_test_tree_add_items(ETK_TREE(data), 5000);
+}
-------------------------------------------------------
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. For more info visit:
http://ads.osdn.com/?ad_id=7628&alloc_id=16845&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs