diff src/layout.c @ 574:3da75054d4e1

Drop ViewFileIcon, use ViewFile and ViewFileInfoIcon instead.

--- a/src/layout.c	Sun May 04 16:16:07 2008 +0000
+++ b/src/layout.c	Sun May 04 18:45:06 2008 +0000
@@ -28,7 +28,6 @@
 #include "utilops.h"
 #include "view_dir.h"
 #include "view_file.h"
-#include "view_file_icon.h"
 #include "ui_bookmark.h"
 #include "ui_fileops.h"
 #include "ui_menu.h"
@@ -727,55 +726,26 @@
 	layout_status_update_progress(lw, val, text);
 }
 
-static void layout_icon_status_cb(ViewFileIcon *vfi, gpointer data)
-{
-	LayoutWindow *lw = data;
-
-	layout_status_update_info(lw, NULL);
-}
-
-static void layout_icon_thumb_cb(ViewFileIcon *vfi, gdouble val, const gchar *text, gpointer data)
-{
-	LayoutWindow *lw = data;
-
-	layout_status_update_progress(lw, val, text);
-}
-
 static GtkWidget *layout_list_new(LayoutWindow *lw)
 {
-	GtkWidget *widget = NULL;
+	lw->vf = vf_new(lw->file_view_type, NULL);
+	vf_set_layout(lw->vf, lw);
+
+	vf_set_status_func(lw->vf, layout_list_status_cb, lw);
+	vf_set_thumb_status_func(lw->vf, layout_list_thumb_cb, lw);
+
+	vf_marks_set(lw->vf, lw->marks_enabled);
 
 	switch (lw->file_view_type)
 	{
 	case FILEVIEW_ICON:
-		{
-		lw->vfi = vficon_new(NULL);
-		vficon_set_layout(lw->vfi, lw);
-
-		vficon_set_status_func(lw->vfi, layout_icon_status_cb, lw);
-		vficon_set_thumb_status_func(lw->vfi, layout_icon_thumb_cb, lw);
-		/* FIXME vficon_marks_set(lw->vfi, lw->marks_enabled); */
-
-		widget = lw->vfi->widget;
-		}
 		break;
 	case FILEVIEW_LIST:
-		{
-		lw->vf = vf_new(lw->file_view_type, NULL);
-		vf_set_layout(lw->vf, lw);
-
-		vf_set_status_func(lw->vf, layout_list_status_cb, lw);
-		vf_set_thumb_status_func(lw->vf, layout_list_thumb_cb, lw);
-
-		vf_marks_set(lw->vf, lw->marks_enabled);
 		vf_thumb_set(lw->vf, lw->thumbs_enabled);
-
-		widget = lw->vf->widget;
-		}
 		break;
 	}
 
-	return widget;
+	return lw->vf->widget;
 }
 
 static void layout_list_sync_thumb(LayoutWindow *lw)
@@ -793,7 +763,6 @@
 	if (!lw) return;
 #if 0
 	if (lw->vf) vf_scroll_to_subpart(lw->vf, needle);
-	if (lw->vfi) vficon_scroll_to_subpart(lw->vfi, needle);
 #endif
 }
 
@@ -802,7 +771,6 @@
 	if (!layout_valid(&lw)) return NULL;
 
 	if (lw->vf) return vf_get_list(lw->vf);
-	if (lw->vfi) return vficon_get_list(lw->vfi);
 
 	return NULL;
 }
@@ -812,7 +780,6 @@
 	if (!layout_valid(&lw)) return 0;
 
 	if (lw->vf) return vf_count(lw->vf, bytes);
-	if (lw->vfi) return vficon_count(lw->vfi, bytes);
 
 	return 0;
 }
@@ -822,7 +789,6 @@
 	if (!layout_valid(&lw)) return NULL;
 
 	if (lw->vf) return vf_index_get_path(lw->vf, index);
-	if (lw->vfi) return vficon_index_get_path(lw->vfi, index);
 
 	return NULL;
 }
@@ -832,7 +798,6 @@
 	if (!layout_valid(&lw)) return NULL;
 
 	if (lw->vf) return vf_index_get_data(lw->vf, index);
-	if (lw->vfi) return vficon_index_get_data(lw->vfi, index);
 
 	return NULL;
 }
@@ -842,7 +807,6 @@
 	if (!layout_valid(&lw)) return -1;
 
 	if (lw->vf) return vf_index_by_path(lw->vf, path);
-	if (lw->vfi) return vficon_index_by_path(lw->vfi, path);
 
 	return -1;
 }
@@ -852,7 +816,6 @@
 	if (!layout_valid(&lw)) return;
 
 	if (lw->vf) vf_select_by_fd(lw->vf, fd);
-	if (lw->vfi) vficon_select_by_fd(lw->vfi, fd);
 }
 
 static void layout_list_sync_sort(LayoutWindow *lw)
@@ -860,7 +823,6 @@
 	if (!layout_valid(&lw)) return;
 
 	if (lw->vf) vf_sort_set(lw->vf, lw->sort_method, lw->sort_ascend);
-	if (lw->vfi) vficon_sort_set(lw->vfi, lw->sort_method, lw->sort_ascend);
 }
 
 GList *layout_selection_list(LayoutWindow *lw)
@@ -877,7 +839,6 @@
 		}
 
 	if (lw->vf) return vf_selection_get_list(lw->vf);
-	if (lw->vfi) return vficon_selection_get_list(lw->vfi);
 
 	return NULL;
 }
@@ -887,7 +848,6 @@
 	if (!layout_valid(&lw)) return NULL;
 
 	if (lw->vf) return vf_selection_get_list_by_index(lw->vf);
-	if (lw->vfi) return vficon_selection_get_list_by_index(lw->vfi);
 
 	return NULL;
 }
@@ -897,7 +857,6 @@
 	if (!layout_valid(&lw)) return 0;
 
 	if (lw->vf) return vf_selection_count(lw->vf, bytes);
-	if (lw->vfi) return vficon_selection_count(lw->vfi, bytes);
 
 	return 0;
 }
@@ -907,7 +866,6 @@
 	if (!layout_valid(&lw)) return;
 
 	if (lw->vf) vf_select_all(lw->vf);
-	if (lw->vfi) vficon_select_all(lw->vfi);
 }
 
 void layout_select_none(LayoutWindow *lw)
@@ -915,7 +873,6 @@
 	if (!layout_valid(&lw)) return;
 
 	if (lw->vf) vf_select_none(lw->vf);
-	if (lw->vfi) vficon_select_none(lw->vfi);
 }
 
 void layout_mark_to_selection(LayoutWindow *lw, gint mark, MarkToSelectionMode mode)
@@ -923,7 +880,6 @@
 	if (!layout_valid(&lw)) return;
 
 	if (lw->vf) vf_mark_to_selection(lw->vf, mark, mode);
-	if (lw->vfi) vficon_mark_to_selection(lw->vfi, mark, mode);
 }
 
 void layout_selection_to_mark(LayoutWindow *lw, gint mark, SelectionToMarkMode mode)
@@ -931,7 +887,6 @@
 	if (!layout_valid(&lw)) return;
 
 	if (lw->vf) vf_selection_to_mark(lw->vf, mark, mode);
-	if (lw->vfi) vficon_selection_to_mark(lw->vfi, mark, mode);
 
 	layout_status_update_info(lw, NULL); /* osd in fullscreen mode */
 }
@@ -958,7 +913,6 @@
 	if (lw->vd) vd_set_path(lw->vd, lw->path);
 
 	if (lw->vf) vf_set_path(lw->vf, lw->path);
-	if (lw->vfi) vficon_set_path(lw->vfi, lw->path);
 }
 
 gint layout_set_path(LayoutWindow *lw, const gchar *path)
@@ -1032,7 +986,6 @@
 	if (lw->vd) vd_refresh(lw->vd);
 
 	if (lw->vf) vf_refresh(lw->vf);
-	if (lw->vfi) vficon_refresh(lw->vfi);
 }
 
 static void layout_refresh_by_time(LayoutWindow *lw)
@@ -1307,7 +1260,7 @@
 		if (!GTK_WIDGET_VISIBLE(lw->tools))
 			{
 			gtk_widget_show(lw->tools);
-			if (lw->vfi) vficon_refresh(lw->vfi);
+			if (lw->vf) vf_refresh(lw->vf);
 			}
 		}
 
@@ -1678,7 +1631,7 @@
 
 	lw->file_view = NULL;
 	lw->vf = NULL;
-	lw->vfi = NULL;
+	lw->vf = NULL;
 
 	lw->info_box = NULL;
 	lw->info_progress_bar = NULL;
@@ -2061,7 +2014,6 @@
 	if (lw->image) layout_image_maint_renamed(lw, fd);
 
 	if (lw->vf) update |= vf_maint_renamed(lw->vf, fd);
-	if (lw->vfi) update |= vficon_maint_renamed(lw->vfi, fd);
 
 	if (update) layout_real_time_update(lw);
 }
@@ -2073,7 +2025,6 @@
 	if (lw->image) layout_image_maint_removed(lw, fd);
 
 	if (lw->vf) update |= vf_maint_removed(lw->vf, fd, ignore_list);
-	if (lw->vfi) update |= vficon_maint_removed(lw->vfi, fd, ignore_list);
 
 	if (update) layout_real_time_update(lw);
 }
@@ -2085,7 +2036,6 @@
 	if (lw->image) layout_image_maint_moved(lw, fd);
 
 	if (lw->vf) update |= vf_maint_moved(lw->vf, fd, ignore_list);
-	if (lw->vfi) update |= vficon_maint_moved(lw->vfi, fd, ignore_list);
 
 	if (update) layout_real_time_update(lw);
 }