GNOME.org
 

[PATCH] Add optional empty view

The attached patch adds an empty view, that is used as a dummy
NautilusView. It can be used for backend performance measurement, for
instance by adding hooks and debug output to file_add and file_remove.

-- 
Christian Neumair <chris gnome-de org>

Index: configure.in
===================================================================
RCS file: /cvs/gnome/nautilus/configure.in,v
retrieving revision 1.691
diff -u -p -r1.691 configure.in
--- configure.in	2 Oct 2006 11:43:37 -0000	1.691
+++ configure.in	10 Oct 2006 08:33:47 -0000
@@ -285,7 +285,15 @@ AC_CHECK_LIB(selinux, is_selinux_enabled
    ])
 AC_SUBST(SELINUX_LIBS)
 
-	
+
+AC_ARG_ENABLE(empty_view,
+ AC_HELP_STRING([--enable-empty-view], [Enable empty view]),
+ [ENABLE_EMPTY_VIEW=1
+  AC_DEFINE(ENABLE_EMPTY_VIEW, 1, [define to enable the empty view that is used for performance measurement])])
+
+AC_SUBST(ENABLE_EMPTY_VIEW)
+AM_CONDITIONAL(ENABLE_EMPTY_VIEW, test "x$ENABLE_EMPTY_VIEW" = "x1")
+
 dnl ==========================================================================
 
 dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
Index: src/nautilus-application.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-application.c,v
retrieving revision 1.243
diff -u -p -r1.243 nautilus-application.c
--- src/nautilus-application.c	21 Jun 2006 16:26:16 -0000	1.243
+++ src/nautilus-application.c	10 Oct 2006 08:34:28 -0000
@@ -34,6 +34,9 @@
 #include "file-manager/fm-icon-view.h"
 #include "file-manager/fm-list-view.h"
 #include "file-manager/fm-tree-view.h"
+#if ENABLE_EMPTY_VIEW
+#include "file-manager/fm-empty-view.h"
+#endif /* ENABLE_EMPTY_VIEW */
 #include "nautilus-information-panel.h"
 #include "nautilus-history-sidebar.h"
 #include "nautilus-places-sidebar.h"
@@ -188,6 +191,9 @@ nautilus_application_instance_init (Naut
 	fm_icon_view_register ();
 	fm_desktop_icon_view_register ();
 	fm_list_view_register ();
+#if ENABLE_EMPTY_VIEW
+	fm_empty_view_register ();
+#endif /* ENABLE_EMPTY_VIEW */
 
 	/* register sidebars */
 	nautilus_places_sidebar_register ();
Index: src/file-manager/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/Makefile.am,v
retrieving revision 1.80
diff -u -p -r1.80 Makefile.am
--- src/file-manager/Makefile.am	25 Nov 2004 14:59:54 -0000	1.80
+++ src/file-manager/Makefile.am	10 Oct 2006 08:34:39 -0000
@@ -40,6 +40,13 @@ libnautilus_file_manager_la_SOURCES=	\
 	fm-tree-view.h			\
 	$(NULL)
 
+EMPTY_VIEW_SOURCES = \
+	fm-empty-view.c \
+	fm-empty-view.h
+
+if ENABLE_EMPTY_VIEW
+libnautilus_file_manager_la_SOURCES += $(EMPTY_VIEW_SOURCES)
+endif
 
 uidir = $(datadir)/nautilus/ui
 ui_DATA =					\
--- /dev/null	2006-10-06 16:57:55.000000000 +0200
+++ src/file-manager/fm-empty-view.c	2006-10-10 10:44:39.000000000 +0200
@@ -0,0 +1,387 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* fm-empty-view.c - implementation of empty view of directory.
+
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Christian Neumair <chris gnome-de org>
+*/
+
+#include <config.h>
+#include "fm-empty-view.h"
+
+#include <string.h>
+#include <libnautilus-private/nautilus-file-utilities.h>
+#include <libnautilus-private/nautilus-view.h>
+#include <libnautilus-private/nautilus-view-factory.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-vfs-extensions.h>
+
+struct FMEmptyViewDetails {
+	int number_of_files;
+};
+
+static GList *fm_empty_view_get_selection                   (FMDirectoryView   *view);
+static GList *fm_empty_view_get_selection_for_file_transfer (FMDirectoryView   *view);
+static void   fm_empty_view_scroll_to_file                  (NautilusView      *view,
+							     const char        *uri);
+static void   fm_empty_view_iface_init                      (NautilusViewIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (FMEmptyView, fm_empty_view, FM_TYPE_DIRECTORY_VIEW, 
+			 G_IMPLEMENT_INTERFACE (NAUTILUS_TYPE_VIEW,
+						fm_empty_view_iface_init));
+
+/* for EEL_CALL_PARENT */
+#define parent_class fm_empty_view_parent_class
+
+static void
+fm_empty_view_add_file (FMDirectoryView *view, NautilusFile *file, NautilusDirectory *directory)
+{
+	FM_EMPTY_VIEW (view)->details->number_of_files++;
+}
+
+
+static void
+fm_empty_view_begin_loading (FMDirectoryView *view)
+{
+}
+
+static void
+fm_empty_view_clear (FMDirectoryView *view)
+{
+}
+
+
+static void
+fm_empty_view_file_changed (FMDirectoryView *view, NautilusFile *file, NautilusDirectory *directory)
+{
+}
+
+static GtkWidget *
+fm_empty_view_get_background_widget (FMDirectoryView *view)
+{
+	return GTK_WIDGET (view);
+}
+
+static GList *
+fm_empty_view_get_selection (FMDirectoryView *view)
+{
+	return NULL;
+}
+
+
+static GList *
+fm_empty_view_get_selection_for_file_transfer (FMDirectoryView *view)
+{
+	return NULL;
+}
+
+static guint
+fm_empty_view_get_item_count (FMDirectoryView *view)
+{
+	return FM_EMPTY_VIEW (view)->details->number_of_files;
+}
+
+static gboolean
+fm_empty_view_is_empty (FMDirectoryView *view)
+{
+	return FM_EMPTY_VIEW (view)->details->number_of_files == 0;
+}
+
+static void
+fm_empty_view_end_file_changes (FMDirectoryView *view)
+{
+}
+
+static void
+fm_empty_view_remove_file (FMDirectoryView *view, NautilusFile *file, NautilusDirectory *directory)
+{
+	FM_EMPTY_VIEW (view)->details->number_of_files--;
+	g_assert (FM_EMPTY_VIEW (view)->details->number_of_files >= 0);
+}
+
+static void
+fm_empty_view_set_selection (FMDirectoryView *view, GList *selection)
+{
+	fm_directory_view_notify_selection_changed (view);
+}
+
+static void
+fm_empty_view_select_all (FMDirectoryView *view)
+{
+}
+
+static void
+fm_empty_view_reveal_selection (FMDirectoryView *view)
+{
+}
+
+static void
+fm_empty_view_merge_menus (FMDirectoryView *view)
+{
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, merge_menus, (view));
+}
+
+static void
+fm_empty_view_update_menus (FMDirectoryView *view)
+{
+	EEL_CALL_PARENT (FM_DIRECTORY_VIEW_CLASS, update_menus, (view));
+}
+
+/* Reset sort criteria and zoom level to match defaults */
+static void
+fm_empty_view_reset_to_defaults (FMDirectoryView *view)
+{
+}
+
+static void
+fm_empty_view_bump_zoom_level (FMDirectoryView *view, int zoom_increment)
+{
+}
+
+static NautilusZoomLevel
+fm_empty_view_get_zoom_level (FMDirectoryView *view)
+{
+	return NAUTILUS_ZOOM_LEVEL_STANDARD;
+}
+
+static void
+fm_empty_view_zoom_to_level (FMDirectoryView *view,
+			    NautilusZoomLevel zoom_level)
+{
+}
+
+static void
+fm_empty_view_restore_default_zoom_level (FMDirectoryView *view)
+{
+}
+
+static gboolean 
+fm_empty_view_can_zoom_in (FMDirectoryView *view) 
+{
+	return FALSE;
+}
+
+static gboolean 
+fm_empty_view_can_zoom_out (FMDirectoryView *view) 
+{
+	return FALSE;
+}
+
+static void
+fm_empty_view_start_renaming_file (FMDirectoryView *view,
+				  NautilusFile *file,
+				  gboolean select_all)
+{
+}
+
+static void
+fm_empty_view_click_policy_changed (FMDirectoryView *directory_view)
+{
+}
+
+
+static int
+fm_empty_view_compare_files (FMDirectoryView *view, NautilusFile *file1, NautilusFile *file2)
+{
+	if (file1 < file2) {
+		return -1;
+	}
+
+	if (file1 > file2) {
+		return +1;
+	}
+
+	return 0;
+}
+
+static gboolean
+fm_empty_view_using_manual_layout (FMDirectoryView *view)
+{
+	return FALSE;
+}
+
+static void
+fm_empty_view_end_loading (FMDirectoryView *view)
+{
+}
+
+static void
+fm_empty_view_finalize (GObject *object)
+{
+	FMEmptyView *empty_view;
+
+	empty_view = FM_EMPTY_VIEW (object);
+	g_free (empty_view->details);
+
+	G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+static void
+fm_empty_view_emblems_changed (FMDirectoryView *directory_view)
+{
+}
+
+static char *
+fm_empty_view_get_first_visible_file (NautilusView *view)
+{
+	return NULL;
+}
+
+static void
+fm_empty_view_scroll_to_file (NautilusView *view,
+			      const char *uri)
+{
+}
+
+static void
+fm_empty_view_grab_focus (NautilusView *view)
+{
+	gtk_widget_grab_focus (GTK_WIDGET (view));
+}
+
+static void
+fm_empty_view_sort_directories_first_changed (FMDirectoryView *view)
+{
+}
+
+
+static void
+fm_empty_view_class_init (FMEmptyViewClass *class)
+{
+	FMDirectoryViewClass *fm_directory_view_class;
+
+	fm_directory_view_class = FM_DIRECTORY_VIEW_CLASS (class);
+
+	G_OBJECT_CLASS (class)->finalize = fm_empty_view_finalize;
+
+	fm_directory_view_class->add_file = fm_empty_view_add_file;
+	fm_directory_view_class->begin_loading = fm_empty_view_begin_loading;
+	fm_directory_view_class->bump_zoom_level = fm_empty_view_bump_zoom_level;
+	fm_directory_view_class->can_zoom_in = fm_empty_view_can_zoom_in;
+	fm_directory_view_class->can_zoom_out = fm_empty_view_can_zoom_out;
+        fm_directory_view_class->click_policy_changed = fm_empty_view_click_policy_changed;
+	fm_directory_view_class->clear = fm_empty_view_clear;
+	fm_directory_view_class->file_changed = fm_empty_view_file_changed;
+	fm_directory_view_class->get_background_widget = fm_empty_view_get_background_widget;
+	fm_directory_view_class->get_selection = fm_empty_view_get_selection;
+	fm_directory_view_class->get_selection_for_file_transfer = fm_empty_view_get_selection_for_file_transfer;
+	fm_directory_view_class->get_item_count = fm_empty_view_get_item_count;
+	fm_directory_view_class->is_empty = fm_empty_view_is_empty;
+	fm_directory_view_class->remove_file = fm_empty_view_remove_file;
+	fm_directory_view_class->merge_menus = fm_empty_view_merge_menus;
+	fm_directory_view_class->update_menus = fm_empty_view_update_menus;
+	fm_directory_view_class->reset_to_defaults = fm_empty_view_reset_to_defaults;
+	fm_directory_view_class->restore_default_zoom_level = fm_empty_view_restore_default_zoom_level;
+	fm_directory_view_class->reveal_selection = fm_empty_view_reveal_selection;
+	fm_directory_view_class->select_all = fm_empty_view_select_all;
+	fm_directory_view_class->set_selection = fm_empty_view_set_selection;
+	fm_directory_view_class->compare_files = fm_empty_view_compare_files;
+	fm_directory_view_class->sort_directories_first_changed = fm_empty_view_sort_directories_first_changed;
+	fm_directory_view_class->start_renaming_file = fm_empty_view_start_renaming_file;
+	fm_directory_view_class->get_zoom_level = fm_empty_view_get_zoom_level;
+	fm_directory_view_class->zoom_to_level = fm_empty_view_zoom_to_level;
+        fm_directory_view_class->emblems_changed = fm_empty_view_emblems_changed;
+	fm_directory_view_class->end_file_changes = fm_empty_view_end_file_changes;
+	fm_directory_view_class->using_manual_layout = fm_empty_view_using_manual_layout;
+	fm_directory_view_class->end_loading = fm_empty_view_end_loading;
+}
+
+static const char *
+fm_empty_view_get_id (NautilusView *view)
+{
+	return FM_EMPTY_VIEW_ID;
+}
+
+
+static void
+fm_empty_view_iface_init (NautilusViewIface *iface)
+{
+	fm_directory_view_init_view_iface (iface);
+	
+	iface->get_view_id = fm_empty_view_get_id;
+	iface->get_first_visible_file = fm_empty_view_get_first_visible_file;
+	iface->scroll_to_file = fm_empty_view_scroll_to_file;
+	iface->get_title = NULL;
+	iface->grab_focus = fm_empty_view_grab_focus;
+}
+
+
+static void
+fm_empty_view_init (FMEmptyView *empty_view)
+{
+	empty_view->details = g_new0 (FMEmptyViewDetails, 1);
+}
+
+static NautilusView *
+fm_empty_view_create (NautilusWindowInfo *window)
+{
+	FMEmptyView *view;
+
+	view = g_object_new (FM_TYPE_EMPTY_VIEW, "window", window, NULL);
+	g_object_ref (view);
+	gtk_object_sink (GTK_OBJECT (view));
+	return NAUTILUS_VIEW (view);
+}
+
+static gboolean
+fm_empty_view_supports_uri (const char *uri,
+			   GnomeVFSFileType file_type,
+			   const char *mime_type)
+{
+	if (file_type == GNOME_VFS_FILE_TYPE_DIRECTORY) {
+		return TRUE;
+	}
+	if (strcmp (mime_type, NAUTILUS_SAVED_SEARCH_MIMETYPE) == 0){
+		return TRUE;
+	}
+	if (g_str_has_prefix (uri, "trash:")) {
+		return TRUE;
+	}
+	if (g_str_has_prefix (uri, EEL_SEARCH_URI)) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+static NautilusViewInfo fm_empty_view = {
+	FM_EMPTY_VIEW_ID,
+	"Empty",
+	"Empty View",
+	"_Empty View",
+	"The empty view encountered an error.",
+	"The empty view encountered an error while starting up.",
+	"Display this location with the empty view.",
+	fm_empty_view_create,
+	fm_empty_view_supports_uri
+};
+
+void
+fm_empty_view_register (void)
+{
+	fm_empty_view.label = fm_empty_view.label;
+	fm_empty_view.view_as_label = fm_empty_view.view_as_label;
+	fm_empty_view.view_as_label_with_mnemonic = fm_empty_view.view_as_label_with_mnemonic;
+	fm_empty_view.error_label = fm_empty_view.error_label;
+	fm_empty_view.startup_error_label = fm_empty_view.startup_error_label;
+	fm_empty_view.display_location_label = fm_empty_view.display_location_label;
+
+	nautilus_view_factory_register (&fm_empty_view);
+}
--- /dev/null	2006-10-06 16:57:55.000000000 +0200
+++ src/file-manager/fm-empty-view.h	2006-10-08 15:06:48.000000000 +0200
@@ -0,0 +1,52 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+
+/* fm-empty-view.h - interface for empty view of directory.
+
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   
+   The Gnome Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The Gnome Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+
+   Authors: Christian Neumair <chris gnome-de org>
+*/
+
+#ifndef FM_EMPTY_VIEW_H
+#define FM_EMPTY_VIEW_H
+
+#include "fm-directory-view.h"
+
+#define FM_TYPE_EMPTY_VIEW		(fm_empty_view_get_type ())
+#define FM_EMPTY_VIEW(obj)		(GTK_CHECK_CAST ((obj), FM_TYPE_EMPTY_VIEW, FMEmptyView))
+#define FM_EMPTY_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), FM_TYPE_EMPTY_VIEW, FMEmptyViewClass))
+#define FM_IS_EMPTY_VIEW(obj)		(GTK_CHECK_TYPE ((obj), FM_TYPE_EMPTY_VIEW))
+#define FM_IS_EMPTY_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), FM_TYPE_EMPTY_VIEW))
+
+#define FM_EMPTY_VIEW_ID "OAFIID:Nautilus_File_Manager_Empty_View"
+
+typedef struct FMEmptyViewDetails FMEmptyViewDetails;
+
+typedef struct {
+	FMDirectoryView parent_instance;
+	FMEmptyViewDetails *details;
+} FMEmptyView;
+
+typedef struct {
+	FMDirectoryViewClass parent_class;
+} FMEmptyViewClass;
+
+GType fm_empty_view_get_type (void);
+void  fm_empty_view_register (void);
+
+#endif /* FM_EMPTY_VIEW_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]