elementaryart team mailing list archive

[Timo Reimerdes <sedremier@xxxxxxxxx>]

Timo Reimerdes has proposed merging lp:~timorei/marlin/Fixes809389 into lp:marlin.

Requested reviews:
  The elementary Project (elementaryproject)
Related bugs:
  Bug #809389 in Marlin: "Make preferred column width configurable for column view."
  https://bugs.launchpad.net/marlin/+bug/809389

For more details, see:
https://code.launchpad.net/~timorei/marlin/Fixes809389/+merge/67720

Added the gconf-key:
org.gnome.marlin.column-view.preferred-column-width
and made the column view use it.

Also added Gsettings marlin_column_view_settings to global-preferences to keep things clean and not clutter general marlin preferences.
-- 
https://code.launchpad.net/~timorei/marlin/Fixes809389/+merge/67720
Your team The elementary Project is requested to review the proposed merge of lp:~timorei/marlin/Fixes809389 into lp:marlin.

=== modified file 'libcore/marlin-global-preferences.h'
--- libcore/marlin-global-preferences.h	2011-05-07 19:35:56 +0000
+++ libcore/marlin-global-preferences.h	2011-07-12 15:41:29 +0000
@@ -3,6 +3,7 @@
 
 GSettings  *settings;
 GSettings  *marlin_icon_view_settings;
+GSettings	 *marlin_column_view_settings;
 
 static gchar *tags_colors[10] = { NULL, "#fce94f", "#fcaf3e", "#997666", "#8ae234", "#729fcf", "#ad7fa8", "#ef2929", "#d3d7cf", "#888a85" };
 

=== modified file 'org.gnome.marlin.gschema.xml.in'
--- org.gnome.marlin.gschema.xml.in	2011-05-30 22:32:56 +0000
+++ org.gnome.marlin.gschema.xml.in	2011-07-12 15:41:29 +0000
@@ -174,5 +174,13 @@
       <_description>Zoom level used by the icon view.</_description>
     </key>
   </schema>
+  
+  <schema id="org.gnome.marlin.column-view" path="/apps/marlin/column-view/">
+    <key name="preferred-column-width" type="i">
+      <default>240</default>
+      <_summary>prefered column width</_summary>
+      <_description>The column width preferred by the miller column view.</_description>
+    </key>
+  </schema>
 
 </schemalist>

=== modified file 'src/gof-window-slot.c'
--- src/gof-window-slot.c	2011-05-31 04:20:37 +0000
+++ src/gof-window-slot.c	2011-07-12 15:41:29 +0000
@@ -23,6 +23,7 @@
 #include "fm-list-view.h"
 #include "fm-columns-view.h"
 #include "marlin-view-window.h"
+#include "marlin-global-preferences.h"
 
 static void gof_window_slot_init       (GOFWindowSlot *slot);
 static void gof_window_slot_class_init (GOFWindowSlotClass *class);
@@ -94,8 +95,8 @@
     gtk_widget_show (vbox2);
     slot->colpane = vbox2;
     slot->hpane = hpane;
-
-    gtk_widget_set_size_request (column, 180, -1);
+		int preferred_column_width = (int)(g_settings_get_int (marlin_column_view_settings, "preferred-column-width"));
+    gtk_widget_set_size_request (column, preferred_column_width, -1);
 
     gtk_paned_pack1 (GTK_PANED (hpane), column, FALSE, FALSE);
     gtk_paned_pack2 (GTK_PANED (hpane), vbox2, TRUE, FALSE);

=== modified file 'src/marlin-application.c'
--- src/marlin-application.c	2011-06-25 01:11:47 +0000
+++ src/marlin-application.c	2011-07-12 15:41:29 +0000
@@ -628,6 +628,8 @@
     /* gsettings parameters */
     settings = g_settings_new ("org.gnome.marlin.preferences");
     marlin_icon_view_settings = g_settings_new ("org.gnome.marlin.icon-view");
+    marlin_column_view_settings = g_settings_new ("org.gnome.marlin.column-view");
+    
     tags = marlin_view_tags_new ();
 
     plugins = marlin_plugin_manager_new ();