Changeset 3449

Timestamp:

Oct 17, 2007, 6:31:12 PM (15 years ago)

Author:

charles

Message:

(gtk) remember between sessions which column is used for sorting in the main window's torrent list

Location:

trunk/gtk

Files:

• main.c (modified) (2 diffs)
• tr_core.c (modified) (2 diffs)
• tr_core.h (modified) (1 diff)
• tr_prefs.c (modified) (1 diff)
• tr_prefs.h (modified) (1 diff)
• tr_window.c (modified) (1 diff)

trunk/gtk/main.c

@@ -651 +651 @@
         PREF_KEY_PEX,
         PREF_KEY_SYSTRAY,
+        PREF_KEY_SORT_COLUMN,
         PREF_KEY_ENCRYPTED_ONLY
     };
@@ -711 +712 @@
             cbdata->icon = NULL;
         }
+    }
+    else if( !strcmp( key, PREF_KEY_SORT_COLUMN ) )
+    {
+        tr_core_set_sort_column_from_prefs( cbdata->core );
     }
     else if( !strcmp( key, PREF_KEY_PEX ) )

trunk/gtk/tr_core.c

@@ -237 +237 @@
 }
 
+#define STR_REVERSE "reverse-"
+#define STR_PROGRESS "progress"
+#define STR_NAME "name"
+
+static void
+onSortColumnChanged( GtkTreeSortable * sortable, gpointer unused UNUSED )
+{
+    int column;
+    GtkSortType order;
+    if( gtk_tree_sortable_get_sort_column_id( sortable, &column, &order ) )
+    {
+        GString * gstr = g_string_new( NULL );
+        switch( column ) {
+            case MC_PROG_D: g_string_assign( gstr, STR_PROGRESS ); break;
+            default: g_string_assign( gstr, STR_NAME ); break;
+        }
+        if( order == GTK_SORT_DESCENDING )
+            g_string_prepend( gstr, STR_REVERSE );
+        pref_string_set( PREF_KEY_SORT_COLUMN, gstr->str );
+        g_string_free( gstr, TRUE );
+    }
+}
+
+void
+tr_core_set_sort_column_from_prefs( TrCore * core )
+{
+    char * val = pref_string_get( PREF_KEY_SORT_COLUMN );
+    char * freeme = val;
+    gint column;
+    GtkSortType order = GTK_SORT_ASCENDING;
+    if( g_str_has_prefix( val, STR_REVERSE ) ) {
+        order = GTK_SORT_DESCENDING;
+        val += strlen( STR_REVERSE );
+    }
+    if( !strcmp( val, STR_PROGRESS ) )
+        column = MC_PROG_D;
+    else /* default */
+        column = MC_NAME;
+    gtk_tree_sortable_set_sort_column_id ( GTK_TREE_SORTABLE( core->model ), column, order );
+    g_free( freeme );
+}
+
 static void
 tr_core_init( GTypeInstance * instance, gpointer g_class SHUTUP )
@@ -266 +308 @@
     g_assert( ALEN( types ) == MC_ROW_COUNT );
     store = gtk_list_store_newv( MC_ROW_COUNT, types );
+    g_signal_connect( store, "sort-column-changed", G_CALLBACK(onSortColumnChanged), NULL );
 
     gtk_tree_sortable_set_sort_func( GTK_TREE_SORTABLE(store),

trunk/gtk/tr_core.h

@@ -181 +181 @@
 tr_core_set_pref_int( TrCore * self, const char * key, int val );
 
+void
+tr_core_set_sort_column_from_prefs( TrCore * core );
+
 /* column names for the model used to store torrent information */
 /* keep this in sync with the type array in tr_core_init() in tr_core.c */

trunk/gtk/tr_prefs.c

@@ -48 +48 @@
     pref_int_set_default    ( PREF_KEY_MSGLEVEL, TR_MSG_INF );
 
+    pref_string_set_default ( PREF_KEY_SORT_COLUMN, "name" );
+
     pref_save( NULL );
 }

trunk/gtk/tr_prefs.h

@@ -36 +36 @@
 #define PREF_KEY_ENCRYPTED_ONLY    "encrypted-connections-only"
 #define PREF_KEY_MSGLEVEL          "debug-message-level"
+#define PREF_KEY_SORT_COLUMN       "sort-column"
 
 void tr_prefs_init_global( void );

trunk/gtk/tr_window.c

@@ -174 +174 @@
     char              * str;
 
-    view     = gtk_tree_view_new();
+    view = gtk_tree_view_new();
 
     p->selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(view) );