Enlightenment CVS committal
Author : lok
Project : e17
Module : apps/estickies
Dir : e17/apps/estickies/src/bin
Modified Files:
theme_chooser.c
Log Message:
Moving to Etk_Tree2.
===================================================================
RCS file: /cvs/e/e17/apps/estickies/src/bin/theme_chooser.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- theme_chooser.c 15 Aug 2006 18:10:38 -0000 1.2
+++ theme_chooser.c 16 Jan 2007 15:51:55 -0000 1.3
@@ -20,7 +20,7 @@
static void _e_theme_ok_cb(Etk_Object *object, void *data);
static void _e_theme_apply_cb(Etk_Object *object, void *data);
static void _e_theme_cancel_cb(Etk_Object *object, void *data);
-static void _e_theme_chooser_item_selected_cb(Etk_Object *object, Etk_Tree_Row
*row, void *data);
+static void _e_theme_chooser_item_selected_cb(Etk_Object *object,
Etk_Tree2_Row *row, void *data);
static void _e_theme_apply_now(E_Sticky *s);
void
@@ -39,9 +39,9 @@
Etk_Widget *frame;
Etk_Widget *button;
Etk_Widget *vbox;
- Etk_Tree_Col *col1;
- Etk_Tree_Row *row;
- Etk_Tree_Model *model;
+ Etk_Tree2_Col *col1;
+ Etk_Tree2_Row *row;
+ Etk_Tree2_Model *model;
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), "Estickies - Theme Chooser");
@@ -59,17 +59,19 @@
etk_widget_size_request_set(preview, 320, 240);
/* tree to hold the thumbs */
- thumbs = etk_tree_new();
+ thumbs = etk_tree2_new();
etk_widget_size_request_set(thumbs, 180, 240);
- etk_tree_mode_set(ETK_TREE(thumbs), ETK_TREE_MODE_LIST);
- etk_tree_multiple_select_set(ETK_TREE(thumbs), ETK_FALSE);
- model = etk_tree_model_icon_text_new(ETK_TREE(thumbs), ETK_TREE_FROM_EDJE);
- etk_tree_model_icon_text_icon_width_set(model, 80);
- col1 = etk_tree_col_new(ETK_TREE(thumbs), "Themes", model, 150);
- etk_tree_row_height_set(ETK_TREE(thumbs), 60);
- etk_tree_headers_visible_set(ETK_TREE(thumbs), ETK_FALSE);
+ etk_tree2_mode_set(ETK_TREE2(thumbs), ETK_TREE2_MODE_LIST);
+ etk_tree2_multiple_select_set(ETK_TREE2(thumbs), ETK_FALSE);
+ col1 = etk_tree2_col_new(ETK_TREE2(thumbs), "Themes", 150, 0.0);
+ model = etk_tree2_model_image_new();
+ etk_tree2_model_image_width_set(model, 80, 0.5);
+ etk_tree2_col_model_add(col1, model);
+ etk_tree2_col_model_add(col1, etk_tree2_model_text_new());
+ etk_tree2_rows_height_set(ETK_TREE2(thumbs), 60);
+ etk_tree2_headers_visible_set(ETK_TREE2(thumbs), ETK_FALSE);
etk_signal_connect("row_selected", ETK_OBJECT(thumbs),
ETK_CALLBACK(_e_theme_chooser_item_selected_cb), s);
- etk_tree_build(ETK_TREE(thumbs));
+ etk_tree2_build(ETK_TREE2(thumbs));
/* scan for themes and add them to the list */
themes = ecore_file_ls(PACKAGE_DATA_DIR"/themes");
@@ -83,9 +85,9 @@
theme_no_ext = ecore_file_strip_ext(theme);
snprintf(theme_file, sizeof(theme_file), PACKAGE_DATA_DIR"/themes/%s",
theme);
- row = etk_tree_append(ETK_TREE(thumbs), col1, theme_file, "preview",
theme_no_ext, NULL);
+ row = etk_tree2_row_append(ETK_TREE2(thumbs), NULL, col1, theme_file,
"preview", theme_no_ext, NULL);
if(i == 0)
- etk_tree_row_select(row);
+ etk_tree2_row_select(row);
++i;
free(theme_no_ext);
}
@@ -144,16 +146,16 @@
}
static void
-_e_theme_chooser_item_selected_cb(Etk_Object *object, Etk_Tree_Row *row, void
*data)
+_e_theme_chooser_item_selected_cb(Etk_Object *object, Etk_Tree2_Row *row, void
*data)
{
E_Sticky *s;
- Etk_Tree *tree;
+ Etk_Tree2 *tree;
char *icol_string;
s = data;
- tree = ETK_TREE(object);
+ tree = ETK_TREE2(object);
- etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), &icol_string,
NULL, NULL, NULL);
+ etk_tree2_row_fields_get(row, etk_tree2_nth_col_get(tree, 0), &icol_string,
NULL, NULL, NULL);
etk_image_set_from_edje(ETK_IMAGE(preview), icol_string, "preview");
}
@@ -203,17 +205,17 @@
static void
_e_theme_apply_now(E_Sticky *s)
{
- Etk_Tree_Row *row;
+ Etk_Tree2_Row *row;
char *icol_string;
if(!_e_sticky_exists(s))
return;
- row = etk_tree_selected_row_get(ETK_TREE(thumbs));
+ row = etk_tree2_selected_row_get(ETK_TREE2(thumbs));
if(!row)
return;
- etk_tree_row_fields_get(row, etk_tree_nth_col_get(ETK_TREE(thumbs), 0),
+ etk_tree2_row_fields_get(row, etk_tree2_nth_col_get(ETK_TREE2(thumbs), 0),
&icol_string, NULL, NULL, NULL);
if(_e_theme_apply == STICKY_ONLY)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
