Add preference for default metadata

Author: mtwebster

gresources/nemo-file-management-properties.glade

@@ -609,6 +609,22 @@ along with .  If not, see <http://www.gnu.org/licenses/>.
                                             <property name="position">5</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <object class="GtkCheckButton" id="show_preview_pane_checkbutton">
+                                            <property name="label" translatable="yes">Show preview pane</property>
+                                            <property name="visible">True</property>
+                                            <property name="can-focus">True</property>
+                                            <property name="receives-default">True</property>
+                                            <property name="use-underline">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="draw-indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                            <property name="position">6</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                     </child>
                                   </object>

libnemo-private/nemo-global-preferences.h

@@ -42,6 +42,7 @@ G_BEGIN_DECLS
 /* Display  */
 #define NEMO_PREFERENCES_SHOW_HIDDEN_FILES			"show-hidden-files"
 #define NEMO_PREFERENCES_SHOW_ADVANCED_PERMISSIONS		"show-advanced-permissions"
+#define NEMO_PREFERENCES_SHOW_PREVIEW_PANE			"show-preview-pane"
 #define NEMO_PREFERENCES_DATE_FORMAT            "date-format"
 #define NEMO_PREFERENCES_DATE_FONT_CHOICE  "date-font-choice"
 #define NEMO_PREFERENCES_MONO_FONT_NAME "monospace-font-name"

libnemo-private/nemo-metadata.h

@@ -60,7 +60,7 @@
 #define NEMO_METADATA_KEY_WINDOW_MAXIMIZED			"nemo-window-maximized"
 #define NEMO_METADATA_KEY_WINDOW_STICKY			"nemo-window-sticky"
 #define NEMO_METADATA_KEY_WINDOW_KEEP_ABOVE			"nemo-window-keep-above"
-#define NEMO_METADATA_KEY_WINDOW_SHOW_PREVIEW_PANE		"nemo-window-show-preview-pane"
+#define NEMO_METADATA_KEY_WINDOW_SHOW_PREVIEW_PANE      "nemo-window-show-preview-pane"
 
 #define NEMO_METADATA_KEY_SIDEBAR_BACKGROUND_COLOR   	"nemo-sidebar-background-color"
 #define NEMO_METADATA_KEY_SIDEBAR_BACKGROUND_IMAGE   	"nemo-sidebar-background-image"

libnemo-private/org.nemo.gschema.xml

@@ -274,6 +274,11 @@
       <summary>Show favorites first in windows</summary>
       <description>If set to true, then Nemo shows favorites prior to other files in the icon and list views.</description>
     </key>
+    <key name="show-preview-pane" type="b">
+      <default>false</default>
+      <summary>Show the preview pane by default in newly visited folders</summary>
+      <description>If set to true, then Nemo shows the preview pane when visiting new folders.</description>
+    </key>
     <key name="default-sort-order" enum="org.nemo.SortOrder">
       <aliases>
 	<alias value='modification_date' target='mtime'/>

src/nemo-file-management-properties.c

@@ -91,6 +91,7 @@
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_SHOW_THUMBNAILS_ICON_TOOLBAR_WIDGET "show_show_thumbnails_icon_toolbar_togglebutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_TOGGLE_EXTRA_PANE_ICON_TOOLBAR_WIDGET "show_toggle_extra_pane_icon_toolbar_togglebutton"
 
+#define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_PREVIEW_PANE_WIDGET "show_preview_pane_checkbutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_FULL_PATH_IN_TITLE_BARS_WIDGET "show_full_path_in_title_bars_checkbutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_CLOSE_DEVICE_VIEW_ON_EJECT_WIDGET "close_device_view_on_eject_checkbutton"
 #define NEMO_FILE_MANAGEMENT_PROPERTIES_AUTOMOUNT_MEDIA_WIDGET "media_automount_checkbutton"
@@ -931,6 +932,10 @@ nemo_file_management_properties_dialog_setup (GtkBuilder  *builder,
 			   NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_SHOW_THUMBNAILS_ICON_TOOLBAR_WIDGET,
 			   NEMO_PREFERENCES_SHOW_SHOW_THUMBNAILS_TOOLBAR);
 
+	bind_builder_bool (builder, nemo_preferences,
+			   NEMO_FILE_MANAGEMENT_PROPERTIES_SHOW_PREVIEW_PANE_WIDGET,
+			   NEMO_PREFERENCES_SHOW_PREVIEW_PANE);
+
 	/* setup preferences */
 	bind_builder_bool (builder, nemo_icon_view_preferences,
 			   NEMO_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET,

src/nemo-view.c

@@ -528,6 +528,7 @@ nemo_view_reset_to_defaults (NemoView *view)
     file = view->details->slot->viewed_file;
     nemo_file_set_metadata(file, NEMO_METADATA_KEY_SHOW_THUMBNAILS, NULL, NULL);
     nemo_file_set_metadata(file, NEMO_METADATA_KEY_DEFAULT_VIEW, NULL, NULL);
+    nemo_file_set_metadata (file, NEMO_METADATA_KEY_WINDOW_SHOW_PREVIEW_PANE, NULL, NULL);
     gtk_action_activate (gtk_action_group_get_action (nemo_window_get_main_action_group (window), NEMO_ACTION_RELOAD));
 }
 

src/nemo-window.c

@@ -1626,6 +1626,10 @@ zoom_level_changed_callback (NemoView *view,
 	nemo_window_sync_zoom_widgets (window);
 }
 
+/* Forward declarations */
+static void nemo_window_preview_pane_on_internal (NemoWindow *window, gboolean write_metadata);
+static void nemo_window_preview_pane_off_internal (NemoWindow *window, gboolean write_metadata);
+
 /* Check if any slot in the window (across all panes and tabs) has
  * preview pane enabled in its metadata, excluding the given slot.
  */
@@ -1672,13 +1676,15 @@ any_other_slot_wants_preview_pane (NemoWindow *window,
 /* Synchronize the preview pane state based on a slot's directory metadata.
  * This checks the slot's current directory's saved preference and applies it,
  * taking into account whether other slots in the window want the preview pane.
+ * If no metadata is saved for this directory, uses the default from GSettings.
  */
 static void
 sync_preview_pane_from_slot_metadata (NemoWindow *window,
                                        NemoWindowSlot *slot)
 {
 	NemoFile *directory_file;
 	gboolean show_preview;
+	gboolean default_show_preview;
 
 	if (slot == NULL || slot->content_view == NULL) {
 		return;
@@ -1689,17 +1695,23 @@ sync_preview_pane_from_slot_metadata (NemoWindow *window,
 		return;
 	}
 
+	/* Get the default from GSettings - this is used when directory has no saved metadata */
+	default_show_preview = g_settings_get_boolean (nemo_preferences,
+	                                                NEMO_PREFERENCES_SHOW_PREVIEW_PANE);
+
+	/* Get the preview pane preference: uses directory metadata if saved,
+	 * otherwise falls back to the GSettings default */
 	show_preview = nemo_file_get_boolean_metadata (directory_file,
 	                                                NEMO_METADATA_KEY_WINDOW_SHOW_PREVIEW_PANE,
-	                                                FALSE);
+	                                                default_show_preview);
 
-	/* Apply the saved state */
+	/* Apply the saved state (don't write metadata - this is automatic sync, not user action) */
 	if (show_preview && !window->details->show_preview_pane) {
-		nemo_window_preview_pane_on (window);
+		nemo_window_preview_pane_on_internal (window, FALSE);
 	} else if (!show_preview && window->details->show_preview_pane) {
 		/* Only close preview pane if no other slot wants it */
 		if (!any_other_slot_wants_preview_pane (window, slot)) {
-			nemo_window_preview_pane_off (window);
+			nemo_window_preview_pane_off_internal (window, FALSE);
 		}
 	}
 }
@@ -2546,8 +2558,9 @@ nemo_window_split_view_showing (NemoWindow *window)
 	return g_list_length (NEMO_WINDOW (window)->details->panes) > 1;
 }
 
-void
-nemo_window_preview_pane_on (NemoWindow *window)
+static void
+nemo_window_preview_pane_on_internal (NemoWindow *window,
+                                       gboolean    write_metadata)
 {
 	NemoWindowSlot *slot;
 	GList *selection;
@@ -2602,8 +2615,8 @@ nemo_window_preview_pane_on (NemoWindow *window)
 	window->details->show_preview_pane = TRUE;
 	// nemo_window_update_show_hide_ui_elements (window);
 
-	/* Save preview pane state to directory metadata */
-	if (slot != NULL && slot->content_view != NULL) {
+	/* Save preview pane state to directory metadata (only if explicitly requested) */
+	if (write_metadata && slot != NULL && slot->content_view != NULL) {
 		NemoFile *directory_file;
 
 		directory_file = nemo_view_get_directory_as_file (slot->content_view);
@@ -2620,7 +2633,15 @@ nemo_window_preview_pane_on (NemoWindow *window)
 }
 
 void
-nemo_window_preview_pane_off (NemoWindow *window)
+nemo_window_preview_pane_on (NemoWindow *window)
+{
+	/* User-triggered action: write metadata to remember this choice */
+	nemo_window_preview_pane_on_internal (window, TRUE);
+}
+
+static void
+nemo_window_preview_pane_off_internal (NemoWindow *window,
+                                        gboolean    write_metadata)
 {
 	GtkPaned *paned;
 	NemoWindowSlot *slot;
@@ -2653,9 +2674,9 @@ nemo_window_preview_pane_off (NemoWindow *window)
 
 	// nemo_window_update_show_hide_ui_elements (window);
 
-	/* Save preview pane state to directory metadata */
+	/* Save preview pane state to directory metadata (only if explicitly requested) */
 	slot = nemo_window_get_active_slot (window);
-	if (slot != NULL && slot->content_view != NULL) {
+	if (write_metadata && slot != NULL && slot->content_view != NULL) {
 		NemoFile *directory_file;
 
 		directory_file = nemo_view_get_directory_as_file (slot->content_view);
@@ -2671,6 +2692,13 @@ nemo_window_preview_pane_off (NemoWindow *window)
     g_object_notify_by_pspec (G_OBJECT (window), properties[PROP_SHOW_PREVIEW_PANE]);
 }
 
+void
+nemo_window_preview_pane_off (NemoWindow *window)
+{
+	/* User-triggered action: write metadata to remember this choice */
+	nemo_window_preview_pane_off_internal (window, TRUE);
+}
+
 gboolean
 nemo_window_preview_pane_showing (NemoWindow *window)
 {