nautilus r14384 - in trunk: . src src/file-manager

[cneumair svn gnome org]

Author: cneumair
Date: Mon Jul 21 09:56:59 2008
New Revision: 14384
URL: http://svn.gnome.org/viewvc/nautilus?rev=14384&view=rev

Log:
2008-07-21  Christian Neumair  <cneumair gnome org>

	* src/file-manager/fm-icon-view.c (fm_icon_view_register),
	(fm_compact_view_register):
	* src/file-manager/fm-icon-view.h:
	* src/nautilus-application.c (nautilus_application_instance_init):
	* src/nautilus-file-management-properties.c:
	* src/nautilus-file-management-properties.glade:
	Display compact view after list view, rather than before it. Fixes
	keybindings, and #543934. Thanks to Diego Escalante Urrelo.


Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-icon-view.c
   trunk/src/file-manager/fm-icon-view.h
   trunk/src/nautilus-application.c
   trunk/src/nautilus-file-management-properties.c
   trunk/src/nautilus-file-management-properties.glade

Modified: trunk/src/file-manager/fm-icon-view.c
==============================================================================
--- trunk/src/file-manager/fm-icon-view.c	(original)
+++ trunk/src/file-manager/fm-icon-view.c	Mon Jul 21 09:56:59 2008
@@ -3023,7 +3023,12 @@
 {
 	TRANSLATE_VIEW_INFO (fm_icon_view)
 	nautilus_view_factory_register (&fm_icon_view);
+}
 
+void
+fm_compact_view_register (void)
+{
 	TRANSLATE_VIEW_INFO (fm_compact_view)
 	nautilus_view_factory_register (&fm_compact_view);
 }
+

Modified: trunk/src/file-manager/fm-icon-view.h
==============================================================================
--- trunk/src/file-manager/fm-icon-view.h	(original)
+++ trunk/src/file-manager/fm-icon-view.h	Mon Jul 21 09:56:59 2008
@@ -116,5 +116,6 @@
 gboolean fm_icon_view_is_compact   (FMIconView *icon_view);
 
 void    fm_icon_view_register       (void);
+void    fm_compact_view_register    (void);
 
 #endif /* FM_ICON_VIEW_H */

Modified: trunk/src/nautilus-application.c
==============================================================================
--- trunk/src/nautilus-application.c	(original)
+++ trunk/src/nautilus-application.c	Mon Jul 21 09:56:59 2008
@@ -217,6 +217,7 @@
 	fm_icon_view_register ();
 	fm_desktop_icon_view_register ();
 	fm_list_view_register ();
+	fm_compact_view_register ();
 #if ENABLE_EMPTY_VIEW
 	fm_empty_view_register ();
 #endif /* ENABLE_EMPTY_VIEW */

Modified: trunk/src/nautilus-file-management-properties.c
==============================================================================
--- trunk/src/nautilus-file-management-properties.c	(original)
+++ trunk/src/nautilus-file-management-properties.c	Mon Jul 21 09:56:59 2008
@@ -79,8 +79,8 @@
 
 static const char * const default_view_values[] = {
 	"icon_view",
-	"compact_view",
 	"list_view",
+	"compact_view",
 	NULL
 };
 

Modified: trunk/src/nautilus-file-management-properties.glade
==============================================================================
--- trunk/src/nautilus-file-management-properties.glade	(original)
+++ trunk/src/nautilus-file-management-properties.glade	Mon Jul 21 09:56:59 2008
@@ -168,8 +168,8 @@
 				<widget class="GtkComboBox" id="default_view_combobox">
 				  <property name="visible">True</property>
 				  <property name="items" translatable="yes">Icon View
-Compact View
-List View</property>
+List View
+Compact View</property>
 				  <property name="add_tearoffs">False</property>
 				  <property name="focus_on_click">True</property>
 				</widget>