Prepare merging of some parts of view_file_list and view_file_icon and

simplification of view_file* interface.

src/Makefile.am

@@ -190,6 +190,8 @@ geeqie_SOURCES = \
 	view_dir_list.h	\
 	view_dir_tree.c	\
 	view_dir_tree.h	\
+	view_file.c	\
+	view_file.h	\
 	view_file_list.c	\
 	view_file_list.h	\
 	view_file_icon.c	\

src/typedefs.h

@@ -27,6 +27,11 @@ typedef enum {
 	DIRVIEW_TREE
 } DirViewType;
 
+typedef enum {
+	FILEVIEW_LIST,
+	FILEVIEW_ICON
+} FileViewType;
+
 typedef enum {
 	CMD_COPY = GQ_EDITOR_GENERIC_SLOTS,
 	CMD_MOVE,
@@ -142,9 +147,12 @@ typedef struct _FileData FileData;
 typedef struct _FileDataChangeInfo FileDataChangeInfo;
 
 typedef struct _LayoutWindow LayoutWindow;
+
 typedef struct _ViewDir ViewDir;
 typedef struct _ViewDirInfoList ViewDirInfoList;
 typedef struct _ViewDirInfoTree ViewDirInfoTree;
+
+typedef struct _ViewFile ViewFile;
 typedef struct _ViewFileList ViewFileList;
 typedef struct _ViewFileIcon ViewFileIcon;
 
@@ -492,6 +500,9 @@ struct _LayoutWindow
 
 	LayoutLocation file_location;
 
+	ViewFile *vf;
+	FileViewType file_view_type;
+
 	ViewFileList *vfl;
 	ViewFileIcon *vfi;
 	GtkWidget *file_view;
@@ -586,6 +597,33 @@ struct _ViewDirInfoTree
 	gint busy_ref;
 };
 
+
+struct _ViewFile
+{
+	FileViewType type;
+	gpointer info;
+
+	GtkWidget *widget;
+	GtkWidget *listview;
+
+	gchar *path;
+	GList *list;
+
+	SortType sort_method;
+	gint sort_ascend;
+
+	/* func list */
+	void (*func_thumb_status)(ViewFile *vf, gdouble val, const gchar *text, gpointer data);
+	gpointer data_thumb_status;
+
+	void (*func_status)(ViewFile *vf, gpointer data);
+	gpointer data_status;
+
+	LayoutWindow *layout;
+
+	GtkWidget *popup;
+};
+
 struct _ViewFileList
 {
 	GtkWidget *widget;

src/view_file.c

@@ -0,0 +1,19 @@
+/*
+ * Geeqie
+ * Copyright (C) 2008 The Geeqie Team
+ *
+ * Author: Laurent Monin
+ *
+ * This software is released under the GNU General Public License (GNU GPL).
+ * Please read the included file COPYING for more information.
+ * This software comes with no warranty of any kind, use at your own risk!
+ */
+
+#include "main.h"
+#include "view_file.h"
+
+#include "debug.h"
+#include "view_file_list.h"
+#include "view_file_icon.h"
+
+

src/view_file.h

@@ -0,0 +1,15 @@
+/*
+ * Geeqie
+ * Copyright (C) 2008 The Geeqie Team
+ *
+ * Author: Laurent Monin
+ *
+ * This software is released under the GNU General Public License (GNU GPL).
+ * Please read the included file COPYING for more information.
+ * This software comes with no warranty of any kind, use at your own risk!
+ */
+
+#ifndef VIEW_FILE_H
+#define VIEW_FILE_H
+
+#endif /* VIEW_FILE_H */