Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/ruby-efl/src/etk/examples
Modified Files:
etk_test_button.rb etk_test_tree.rb
Log Message:
- add Ecore_Job to list of requirements
- update Etk bindings (examples work - need to do more thorough testing)
===================================================================
RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/examples/etk_test_button.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_test_button.rb 31 Aug 2006 22:02:48 -0000 1.2
+++ etk_test_button.rb 2 May 2007 21:10:50 -0000 1.3
@@ -3,7 +3,7 @@
super()
self.title = "Etk Button Test"
self.border_width = 5
- EtkBase.signal_connect("delete_event", self,
Window.function(:hide_on_delete), nil)
+ EtkBase.signal_connect("delete-event", self,
Window.function(:hide_on_delete), nil)
end
def create_widgets
@@ -16,7 +16,7 @@
button_normal.tooltip = "This is a normal button"
box.append(button_normal, Etk::BOX_START, Etk::BOX_NONE, 0)
- image = Image.new_from_file(PACKAGE_DATA_DIR + "/images/e_icon.png")
+ image = Image.new_from_file(PACKAGE_DATA_DIR + "/images/e_icon.png",
nil)
button_normal = Button.new_with_label("Button with an image")
button_normal.tooltip = "This is a normal button with an image"
button_normal.image = image
@@ -57,4 +57,5 @@
create_widgets
self.show_all
end
-end
\ No newline at end of file
+end
+
===================================================================
RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/examples/etk_test_tree.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_test_tree.rb 31 Aug 2006 22:02:48 -0000 1.2
+++ etk_test_tree.rb 2 May 2007 21:10:50 -0000 1.3
@@ -9,7 +9,7 @@
def initialize
super()
self.title = "Etk Tree Test"
- EtkBase.signal_connect("delete_event", self,
Window.function(:hide_on_delete), nil)
+ EtkBase.signal_connect("delete-event", self,
Window.function(:hide_on_delete), nil)
end
def create_widgets
@@ -27,10 +27,20 @@
tree.mode = Etk::TREE_MODE_TREE
tree.multiple_select = true
- col1 = TreeCol.wrap(tree.col_new("Column 1",
tree.model_icon_text_new(Etk::TREE_FROM_EDJE), 90))
- col2 = TreeCol.wrap(tree.col_new("Column 2", tree.model_double_new(),
60))
- col3 = TreeCol.wrap(tree.col_new("Column 3",
tree.model_image_new(Etk::TREE_FROM_FILE), 60))
- col4 = TreeCol.wrap(tree.col_new("Column 4",
tree.model_checkbox_new(), 40))
+
+ col1 = TreeCol.wrap(tree.col_new("Column 1", 90, 0.0))
+ col1.model_add(Tree.model_image_new())
+ col1.model_add(Tree.model_text_new())
+
+ col2 = TreeCol.wrap(tree.col_new("Column 2", 60, 0.0))
+ col2.model_add(Tree.model_double_new())
+
+ col3 = TreeCol.wrap(tree.col_new("Column 3", 60, 0.0))
+ col3.model_add(Tree.model_image_new())
+
+ col4 = TreeCol.wrap(tree.col_new("Column 4", 40, 0.0))
+ col4.model_add(Tree.model_checkbox_new())
+
#col4 = etk_tree_col_new(ETK_TREE(tree), "Column 4",
etk_tree_model_checkbox_new(ETK_TREE(tree)), 40);
tree.build
@@ -38,25 +48,26 @@
tree.freeze
0.upto(1) { |i|
- row = TreeRow.wrap(tree.va_call(:append, 'P',
- col1, Theme.icon_theme, "places/user-home_16",
"Row1",
- col2, 10.0,
- col3, PACKAGE_DATA_DIR + "/images/1star.png",
- col4, false, nil))
-
- # notice that we are calling Tree.va_call and not tree.va_call (in
other words,
+ row = Tree.wrap(tree.va_call(:row_append, 'P',
+ nil,
+ col1, Theme.icon_path,
"places/user-home_16", "Row1",
+ col2, 10.0,
+ col3, PACKAGE_DATA_DIR +
"/images/1star.png", nil,
+ col4, false, nil))
+
+ # notice that we are calling Tree.va_call and not tree.va_call (in
other words,
# we're NOT calling an instance method)
- row = TreeRow.wrap(Tree.va_call(:append_to_row, 'P', row,
- col1, Theme.icon_theme, "places/folder_16",
"Row2",
- col2, 20.0,
- col3, PACKAGE_DATA_DIR + "/images/2stars.png",
- col4, false, nil))
- Tree.va_call(:append_to_row, 'P', row,
- col1, Theme.icon_theme,
"mimetypes/text-x-generic_16", "Row3",
- col2, 30.0,
- col3, PACKAGE_DATA_DIR + "/images/3stars.png",
- col4, false, nil)
+ row = Tree.wrap(tree.va_call(:row_append, 'P', row,
+ col1, Theme.icon_path,
"places/folder_16", "Row2",
+ col2, 20.0,
+ col3, PACKAGE_DATA_DIR +
"/images/2stars.png", nil,
+ col4, false, nil))
+ row = Tree.wrap(tree.va_call(:row_append, 'P', row,
+ col1, Theme.icon_path,
"mimetypes/text-x-generic_16", "Row3",
+ col2, 30.0,
+ col3, PACKAGE_DATA_DIR +
"/images/3stars.png", nil,
+ col4, false, nil))
}
tree.thaw
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
