Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_menu_test.c etk_paned_test.c etk_tree_test.c
Log Message:
* Some work on Etk_Tree
* Some work on Etk_Paned (API break)
* Fix a bug on Etk_Canvas
* Various fixes
* Theme improvement and fixes
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_menu_test.c 2 Dec 2005 21:57:55 -0000 1.6
+++ etk_menu_test.c 19 Dec 2005 13:30:32 -0000 1.7
@@ -56,14 +56,14 @@
* Menu Bar
****************/
/* File Menu */
- menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("File"),
-1, ETK_MENU_SHELL(menu_bar), NULL);
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("File"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu_bar), NULL);
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_DOCUMENT_OPEN, ETK_MENU_SHELL(menu), statusbar);
_etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Save"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu), statusbar);
/* Edit Menu */
- menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Edit"),
-1, ETK_MENU_SHELL(menu_bar), NULL);
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Edit"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu_bar), NULL);
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_EDIT_CUT, ETK_MENU_SHELL(menu), statusbar);
@@ -71,10 +71,10 @@
_etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Paste"),
ETK_STOCK_EDIT_PASTE, ETK_MENU_SHELL(menu), statusbar);
/* Help Menu */
- menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Help"),
-1, ETK_MENU_SHELL(menu_bar), NULL);
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Help"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu_bar), NULL);
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), statusbar);
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("About"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), statusbar);
/****************
* Popup Menu
@@ -84,24 +84,24 @@
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_DOCUMENT_OPEN, ETK_MENU_SHELL(menu), statusbar);
_etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Save"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu), statusbar);
- _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL, -1,
ETK_MENU_SHELL(menu), statusbar);
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL,
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), statusbar);
_etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Cut"),
ETK_STOCK_EDIT_CUT, ETK_MENU_SHELL(menu), statusbar);
_etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Copy"),
ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu), statusbar);
_etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Paste"),
ETK_STOCK_EDIT_PASTE, ETK_MENU_SHELL(menu), statusbar);
- _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL, -1,
ETK_MENU_SHELL(menu), statusbar);
- menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Menu Item
Test"), -1, ETK_MENU_SHELL(menu), statusbar);
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_SEPARATOR, NULL,
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), statusbar);
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Menu Item
Test"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), statusbar);
/* Sub menu 1 */
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), statusbar);
- menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with
child"), -1, ETK_MENU_SHELL(menu), statusbar);
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Child Menu Test"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), statusbar);
+ menu_item = _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with
child"), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), statusbar);
_etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Item with image"),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu), statusbar);
/* 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), statusbar);
+ _etk_test_menu_item_new(ETK_TEST_MENU_ITEM_NORMAL, _("Child Menu Test"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), statusbar);
etk_widget_show_all(win);
}
@@ -129,7 +129,7 @@
default:
return NULL;
}
- if (stock_id >= 0)
+ if (stock_id != ETK_STOCK_NO_STOCK)
{
Etk_Widget *image;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_paned_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_paned_test.c 20 Nov 2005 10:33:28 -0000 1.2
+++ etk_paned_test.c 19 Dec 2005 13:30:32 -0000 1.3
@@ -4,8 +4,12 @@
void etk_test_paned_window_create(void *data)
{
static Etk_Widget *win = NULL;
+ Etk_Widget *vbox, *hbox;
Etk_Widget *vpaned, *hpaned;
Etk_Widget *label;
+ Etk_Widget *frame;
+ Etk_Widget *check_button;
+ Etk_Widget *hseparator;
if (win)
{
@@ -15,25 +19,57 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), _("Etk Paned Test"));
- etk_widget_size_request_set(win, 300, 200);
+ etk_widget_size_request_set(win, 300, 300);
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
+ vbox = etk_vbox_new(FALSE, 0);
+ etk_container_add(ETK_CONTAINER(win), vbox);
+
+ /* Paned Area */
vpaned = etk_vpaned_new();
- etk_container_add(ETK_CONTAINER(win), vpaned);
+ etk_box_pack_start(ETK_BOX(vbox), vpaned, TRUE, TRUE, 0);
hpaned = etk_hpaned_new();
- etk_paned_add1(ETK_PANED(vpaned), hpaned);
+ etk_paned_add1(ETK_PANED(vpaned), hpaned, FALSE);
- label = etk_label_new(_("Frame 1"));
+ label = etk_label_new(_("HPaned Child 1"));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
- etk_paned_add1(ETK_PANED(hpaned), label);
- label = etk_label_new(_("Frame 2"));
+ etk_paned_add1(ETK_PANED(hpaned), label, TRUE);
+
+ label = etk_label_new(_("HPaned Child 2"));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
- etk_paned_add2(ETK_PANED(hpaned), label);
- label = etk_label_new(_("Frame 3"));
+ etk_paned_add2(ETK_PANED(hpaned), label, FALSE);
+
+ label = etk_label_new(_("VPaned Child 2"));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
- etk_paned_add2(ETK_PANED(vpaned), label);
+ etk_paned_add2(ETK_PANED(vpaned), label, TRUE);
+
+ hseparator = etk_hseparator_new();
+ etk_box_pack_start(ETK_BOX(vbox), hseparator, FALSE, FALSE, 6);
+
+ /* Properties Area */
+ hbox = etk_hbox_new(TRUE, 0);
+ etk_box_pack_start(ETK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
+ frame = etk_frame_new(_("HPaned Properties"));
+ etk_box_pack_start(ETK_BOX(hbox), frame, TRUE, TRUE, 0);
+ vbox = etk_vbox_new(TRUE, 0);
+ etk_container_add(ETK_CONTAINER(frame), vbox);
+ check_button = etk_check_button_new_with_label(_("Child 1 Expand"));
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), TRUE);
+ etk_box_pack_start(ETK_BOX(vbox), check_button, TRUE, TRUE, 0);
+ check_button = etk_check_button_new_with_label(_("Child 2 Expand"));
+ etk_box_pack_start(ETK_BOX(vbox), check_button, TRUE, TRUE, 0);
+
+ frame = etk_frame_new(_("VPaned Properties"));
+ etk_box_pack_start(ETK_BOX(hbox), frame, TRUE, TRUE, 0);
+ vbox = etk_vbox_new(TRUE, 0);
+ etk_container_add(ETK_CONTAINER(frame), vbox);
+ check_button = etk_check_button_new_with_label(_("Child 1 Expand"));
+ etk_box_pack_start(ETK_BOX(vbox), check_button, TRUE, TRUE, 0);
+ check_button = etk_check_button_new_with_label(_("Child 2 Expand"));
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check_button), TRUE);
+ etk_box_pack_start(ETK_BOX(vbox), check_button, TRUE, TRUE, 0);
-
etk_widget_show_all(win);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_tree_test.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- etk_tree_test.c 4 Dec 2005 14:54:56 -0000 1.17
+++ etk_tree_test.c 19 Dec 2005 13:30:32 -0000 1.18
@@ -50,9 +50,11 @@
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_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_EDJE), 90);
- col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"),
etk_tree_model_double_new(ETK_TREE(tree)), 90);
- col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"),
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 90);
+ etk_tree_multiple_select_set(ETK_TREE(tree), TRUE);
+ col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
etk_tree_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_EDJE), 60);
+ etk_tree_col_expand_set(col1, TRUE);
+ col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"),
etk_tree_model_double_new(ETK_TREE(tree)), 60);
+ col3 = etk_tree_col_new(ETK_TREE(tree), _("Column 3"),
etk_tree_model_image_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 60);
etk_tree_build(ETK_TREE(tree));
etk_tree_freeze(ETK_TREE(tree));
@@ -75,6 +77,7 @@
etk_widget_size_request_set(tree, 320, 400);
etk_table_attach_defaults(ETK_TABLE(table), tree, 1, 1, 1, 1);
+ etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_LIST);
etk_tree_multiple_select_set(ETK_TREE(tree), TRUE);
col1 = etk_tree_col_new(ETK_TREE(tree), _("Column 1"),
etk_tree_model_icon_text_new(ETK_TREE(tree), ETK_TREE_FROM_FILE), 90);
col2 = etk_tree_col_new(ETK_TREE(tree), _("Column 2"),
etk_tree_model_int_new(ETK_TREE(tree)), 90);
@@ -133,7 +136,7 @@
for (i = 0; i < n; i++)
{
snprintf(row_name, 256, "Row%d", i);
- if (i % 3 == 0)
+ if (1/*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);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
