Changeset 6718

Timestamp:

Sep 5, 2008, 9:01:00 PM (14 years ago)

Author:

charles

Message:

(gtk) *incomplete* fix for #1192. this actually breaks things in the short term; I'll finish the rest ASAP

File:

• trunk/gtk/file-list.c (modified) (8 diffs)

trunk/gtk/file-list.c

@@ -365 +365 @@
 
 static void
-setDownload( FileData * data, int do_download )
-{
+onHighClicked( GtkButton * button UNUSED, gpointer gdata )
+{
+    setPriority( gdata, TR_PRI_HIGH );
+}
+static void
+onNormalClicked( GtkButton * button UNUSED, gpointer gdata )
+{
+    setPriority( gdata, TR_PRI_NORMAL );
+}
+static void
+onLowClicked( GtkButton * button UNUSED, gpointer gdata )
+{
+    setPriority( gdata, TR_PRI_LOW );
+}
+
+static void
+onDownloadToggled( GtkCellRendererToggle * cell UNUSED, char * path_str, gpointer gdata )
+{
+    FileData * data = gdata;
     GtkTreeView * view = GTK_TREE_VIEW( data->view );
-    GArray * a = getActiveFiles( view );
-    tr_torrentSetFileDLs ( tr_torrent_handle( data->gtor ),
-                           (tr_file_index_t*)a->data,
-                           (tr_file_index_t)a->len,
-                           do_download );
-    refresh( data );
+    GtkTreeSelection * sel = gtk_tree_view_get_selection( view );
+    GtkTreePath * path = gtk_tree_path_new_from_string( path_str );
+    GArray * a;
+
+    if( gtk_tree_selection_path_is_selected( sel, path ) )
+    {
+        /* clicked in a selected row... use the current selection */
+        a = getActiveFiles( view );
+    }
+    else
+    {
+        /* clicked OUTSIDE of the selected row... just use the clicked row */
+        unsigned int i;
+        gboolean is_file;
+        GtkTreeModel * model = gtk_tree_view_get_model( view );
+        GtkTreeIter iter;
+        gtk_tree_model_get_iter( model, &iter, path );
+        a = g_array_new( FALSE, FALSE, sizeof( tr_file_index_t ) );
+        gtk_tree_model_get( model, &iter, FC_IS_FILE, &is_file, FC_INDEX, &i, -1 );
+        if( is_file ) {
+            g_message( "appending %u", i );
+            g_array_append_val( a, i );
+        }
+    }
+
+    if( a->len )
+    {
+        /* toggle the selected files based on the first one's current value */
+        const tr_file_index_t i = g_array_index( a, tr_file_index_t, 0 );
+        const tr_info * inf = tr_torrentInfo( tr_torrent_handle( data->gtor ) );
+        const int do_download = inf->files[i].dnd;
+        tr_torrentSetFileDLs ( tr_torrent_handle( data->gtor ),
+                               (tr_file_index_t*)a->data,
+                               (tr_file_index_t)a->len,
+                               do_download );
+        refresh( data );
+    }
+
+    /* cleanup */
     g_array_free( a, TRUE );
-}
-
-static void
-onHighClicked( GtkButton * button UNUSED, gpointer gdata )
-{
-    setPriority( gdata, TR_PRI_HIGH );
-}
-static void
-onNormalClicked( GtkButton * button UNUSED, gpointer gdata )
-{
-    setPriority( gdata, TR_PRI_NORMAL );
-}
-static void
-onLowClicked( GtkButton * button UNUSED, gpointer gdata )
-{
-    setPriority( gdata, TR_PRI_LOW );
-}
-static void
-onDownloadClicked( GtkButton * button UNUSED, gpointer gdata )
-{
-    setDownload( gdata, TRUE );
-}
-static void
-onIgnoreClicked( GtkButton * button UNUSED, gpointer gdata )
-{
-    setDownload( gdata, FALSE );
+    gtk_tree_path_free( path );
 }
 
@@ -521 +546 @@
     int sub_state;
     gboolean enabled;
+    gboolean active = FALSE;
+    gboolean inconsistent = FALSE;
     gboolean is_file = FALSE;
-    const char * text;
 
     gtk_tree_model_get( model, iter, FC_IS_FILE, &is_file,
@@ -529 +555 @@
                                      -1 );
     if( is_file && enabled )
-        text = _( "Yes" );
+        active = TRUE;
     else if( is_file )
-        text = _( "No" );
+        active = FALSE;
     else switch( sub_state & SUB_STATE_DOWNLOAD_MASK ) {
-        case SUB_STATE_DOWNLOAD: text = _( "Yes" );   break;
-        case SUB_STATE_IGNORE:   text = _( "No" );    break;
-        default:                 text = _( "Mixed" ); break;
-    }
-
-    g_object_set( renderer, "text", text,
-                            "xalign", (gfloat)0.5,
-                            "yalign", (gfloat)0.5,
+        case SUB_STATE_DOWNLOAD: active = TRUE; break;
+        case SUB_STATE_IGNORE:   active = FALSE; break;
+        default:                 inconsistent = TRUE; break;
+    }
+
+    g_object_set( renderer, "inconsistent", inconsistent,
+                            "active", active,
                             NULL );
 }
@@ -588 +613 @@
 }
 
+static gboolean
+onViewButtonPressed( GtkWidget      * w,
+                     GdkEventButton * event,
+                     gpointer         unused UNUSED )
+{
+    gboolean handled = FALSE;
+
+    if( ( event->type == GDK_BUTTON_PRESS ) && ( event->button == 1 ) )
+    {
+        GtkTreePath * path;
+        GtkTreeViewColumn * column;
+        int cell_x;
+        int cell_y;
+        if( gtk_tree_view_get_path_at_pos( GTK_TREE_VIEW( w ), event->x, event->y,
+                                           &path, &column, &cell_x, &cell_y ) )
+        {
+            const char * column_title = gtk_tree_view_column_get_title( column );
+            if( !strcmp( column_title, _( "Priority" ) ) )
+            {
+                handled = TRUE;
+                g_message( "row is (%s)", gtk_tree_path_to_string( path ) );
+            }
+            gtk_tree_path_free( path );
+        }
+    }
+
+    return handled;
+}
+
 GtkWidget *
 file_list_new( TrTorrent * gtor )
@@ -605 +659 @@
     gtk_tree_view_set_rules_hint( GTK_TREE_VIEW( view ), TRUE );
     gtk_container_set_border_width( GTK_CONTAINER( view ), GUI_PAD_BIG );
+    g_signal_connect( view, "button-press-event", G_CALLBACK(onViewButtonPressed), NULL );
 
     /* set up view */
@@ -637 +692 @@
     gtk_tree_view_column_set_cell_data_func( col, rend, renderProgress, NULL, NULL);
     gtk_tree_view_append_column ( GTK_TREE_VIEW( view ), col);
+data = g_new0( FileData, 1 );
 
     /* add "enabled" column */
-    rend = gtk_cell_renderer_text_new( );
+    rend = gtk_cell_renderer_toggle_new( );
+    g_signal_connect( rend, "toggled", G_CALLBACK( onDownloadToggled ), data );
     /* Translators: this is a column header in Files tab, Details dialog;
        Don't include the prefix "filedetails|" in the translation. 
@@ -661 +718 @@
     gtk_container_add( GTK_CONTAINER( scroll ), view );
     gtk_widget_set_size_request (scroll, -1, 200 );
-
-    data = g_new0( FileData, 1 );
 
     vbox = gtk_vbox_new( FALSE, GUI_PAD );
@@ -674 +729 @@
         g_signal_connect( w, "clicked", G_CALLBACK(onLowClicked), data );
         gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
-        w = gtk_button_new_with_mnemonic( _( "_Ignore" ) );
-        g_signal_connect( w, "clicked", G_CALLBACK(onIgnoreClicked), data );
-        gtk_box_pack_end( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
-        w = gtk_button_new_with_mnemonic( _( "_Download" ) );
-        g_signal_connect( w, "clicked", G_CALLBACK(onDownloadClicked), data );
-        gtk_box_pack_end( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
     hbox = gtk_hbox_new( FALSE, GUI_PAD );
     gtk_box_pack_start_defaults( GTK_BOX( hbox ), scroll );