Ticket #4607: gtk-expand-less.patch

gtk/conf.c

@@ -114 +114 @@
     tr_bencDictAddStr( d, PREF_KEY_SORT_MODE, "sort-by-name" );
     tr_bencDictAddBool( d, PREF_KEY_SORT_REVERSED, FALSE );
     tr_bencDictAddBool( d, PREF_KEY_COMPACT_VIEW, FALSE );
+
+    tr_bencDictAddBool( d, PREF_KEY_EXPAND_LESS_IN_FILE_TREE, FALSE );
 }
 
 static char*

gtk/tr-prefs.c

@@ -360 +360 @@
     g_signal_connect( w, "toggled", G_CALLBACK( target_cb ), w2 );
     hig_workarea_add_row_w( t, &row, w, w2, NULL );
 
+    hig_workarea_add_section_divider( t, &row );
+    hig_workarea_add_section_title( t, &row, _( "Miscellaneous" ) );
+
+    s = _( "Expand _less in file tree" );
+    w = new_check_button( s, PREF_KEY_EXPAND_LESS_IN_FILE_TREE, core );
+    hig_workarea_add_wide_control( t, &row, w );
+
+
     hig_workarea_finish( t, &row );
     return t;
 }

gtk/tr-prefs.h

@@ -50 +50 @@
 #define PREF_KEY_TORRENT_COMPLETE_SOUND_ENABLED          "torrent-complete-sound-enabled"
 #define PREF_KEY_TRASH_CAN_ENABLED                       "trash-can-enabled"
 #define PREF_KEY_USER_HAS_GIVEN_INFORMED_CONSENT         "user-has-given-informed-consent"
+#define PREF_KEY_EXPAND_LESS_IN_FILE_TREE                "expand-less-in-file-tree"
 
 enum
 {

gtk/file-list.c

@@ -19 +19 @@
 #include <libtransmission/transmission.h>
 #include <libtransmission/utils.h>
 
+#include "conf.h"
 #include "file-list.h"
 #include "hig.h"
 #include "icons.h"
@@ -173 +174 @@
             int child_priority;
             int64_t child_have, child_size;
 
+
             gtk_tree_model_get( model, &child, FC_SIZE, &child_size,
                                                FC_HAVE, &child_have,
                                                FC_PRIORITY, &child_priority,
@@ -566 +568 @@
     }
 
     gtk_tree_view_set_model( GTK_TREE_VIEW( data->view ), data->model );
-    gtk_tree_view_expand_all( GTK_TREE_VIEW( data->view ) );
+    if ( gtr_pref_flag_get( PREF_KEY_EXPAND_LESS_IN_FILE_TREE ) ) 
+    {
+        GtkTreePath* tree_path = gtk_tree_path_new_first();
+        gtk_tree_view_expand_row( GTK_TREE_VIEW( data->view ), tree_path, FALSE );
+    }
+    else 
+    {
+        gtk_tree_view_expand_all( GTK_TREE_VIEW( data->view ) );
+    }
+
     g_object_unref( data->model );
 }
 
@@ -911 +922 @@
     gtr_file_list_set_torrent( ret, torrentId );
 
     pango_font_description_free( pango_font_description );
+
     return ret;
 }