From 51308346e4684d352fe29ef38fe69631f7d24b06 Mon Sep 17 00:00:00 2001
From: titan <titan>
Date: Wed, 28 Mar 2007 17:50:49 +0000
Subject: [PATCH] Update ephoto to api changes and shuffle some code.

SVN revision: 29214
---
 src/bin/ephoto.c           |  3 +++
 src/bin/ephoto_list_view.c | 12 +++++++-----
 src/bin/ephoto_main.c      | 14 ++++++--------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/bin/ephoto.c b/src/bin/ephoto.c
index 7964568..6e82b0f 100644
--- a/src/bin/ephoto.c
+++ b/src/bin/ephoto.c
@@ -271,6 +271,9 @@ int main(int argc, char **argv)
 	
 	/*Start the GUI*/
 	create_main_gui();
+	
+	/*Star the ewl loop*/
+	ewl_main();
 
 	return 0;
 }
diff --git a/src/bin/ephoto_list_view.c b/src/bin/ephoto_list_view.c
index cfd76d0..219ee6f 100644
--- a/src/bin/ephoto_list_view.c
+++ b/src/bin/ephoto_list_view.c
@@ -51,19 +51,21 @@ Ewl_Widget *add_ltree(Ewl_Widget *c)
 	ewl_model_data_fetch_set(model, list_data_fetch);
 	ewl_model_data_count_set(model, list_data_count);
 
+        view = ewl_view_new();
+        ewl_view_widget_fetch_set(view, list_view_new);
+        ewl_view_header_fetch_set(view, list_header_fetch);
+
 	tree = ewl_tree2_new();
 	ewl_tree2_headers_visible_set(EWL_TREE2(tree), 0);
 	ewl_tree2_fixed_rows_set(EWL_TREE2(tree), 1);
+	ewl_tree2_column_count_set(EWL_TREE2(tree), 1);
 	ewl_mvc_model_set(EWL_MVC(tree), model);
+	ewl_mvc_view_set(EWL_MVC(tree), view);
+	ewl_mvc_selection_mode_set(EWL_MVC(tree), EWL_SELECTION_MODE_SINGLE);
 	ewl_object_fill_policy_set(EWL_OBJECT(tree), EWL_FLAG_FILL_ALL);
 	ewl_container_child_append(EWL_CONTAINER(c), tree);
 	ewl_widget_show(tree);
 
-	view = ewl_view_new();
-	ewl_view_widget_fetch_set(view, list_view_new);
-	ewl_view_header_fetch_set(view, list_header_fetch);
-	ewl_tree2_column_append(EWL_TREE2(tree), view, FALSE);
-
 	return tree;
 }
 
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 88595c7..358c403 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -141,7 +141,6 @@ void create_main_gui(void)
         button = add_button(em->toolbar, NULL, PACKAGE_DATA_DIR "/images/get_exif.png", NULL, NULL);
         ewl_image_size_set(EWL_IMAGE(EWL_BUTTON(button)->image_object), 30, 30);
 	ewl_attach_tooltip_text_set(button, "You do not have libexif 0.6.13");
-
 #ifdef BUILD_EXIF_SUPPORT
 	ewl_callback_append(button, EWL_CALLBACK_CLICKED, display_exif_dialog, NULL);
 	ewl_attach_tooltip_text_set(button, "View Exif Data");
@@ -163,8 +162,6 @@ void create_main_gui(void)
 	
 	populate(NULL, NULL, "Complete Library");
 
-	ewl_main();
-
 	return;
 }
 
@@ -235,20 +232,21 @@ static Ewl_Widget *add_atree(Ewl_Widget *c)
 	ewl_model_data_fetch_set(model, album_data_fetch);
 	ewl_model_data_count_set(model, album_data_count);
 
+        view = ewl_view_new();
+        ewl_view_widget_fetch_set(view, album_view_new);
+        ewl_view_header_fetch_set(view, album_header_fetch);
+
 	tree = ewl_tree2_new();
 	ewl_tree2_headers_visible_set(EWL_TREE2(tree), 0);
 	ewl_tree2_fixed_rows_set(EWL_TREE2(tree), 1);
+	ewl_tree2_column_count_set(EWL_TREE2(tree), 1);
 	ewl_mvc_model_set(EWL_MVC(tree), model);
+	ewl_mvc_view_set(EWL_MVC(tree), view);
 	ewl_mvc_selection_mode_set(EWL_MVC(tree), EWL_SELECTION_MODE_SINGLE);
 	ewl_object_fill_policy_set(EWL_OBJECT(tree), EWL_FLAG_FILL_ALL);
 	ewl_container_child_append(EWL_CONTAINER(c), tree);
 	ewl_widget_show(tree);
 
-	view = ewl_view_new();
-	ewl_view_widget_fetch_set(view, album_view_new);
-	ewl_view_header_fetch_set(view, album_header_fetch);
-	ewl_tree2_column_append(EWL_TREE2(tree), view, FALSE);
-
 	return tree;
 }