Changeset 5765 for trunk/gtk/makemeta-ui.c

Timestamp:

May 7, 2008, 4:06:07 AM (14 years ago)

Author:

charles

Message:

(gtk) #906: Making a new torrent folder scans the entire home directory

File:

• trunk/gtk/makemeta-ui.c (modified) (11 diffs)

trunk/gtk/makemeta-ui.c

@@ -25 +25 @@
 #define UPDATE_INTERVAL_MSEC 200
 
+#define BUILDER_KEY "builder"
+#define UI_KEY "ui"
+
 typedef struct
 {
@@ -46 +49 @@
 {
     MakeMetaUI * ui = p;
-    tr_metaInfoBuilderFree( ui->builder );
     memset( ui, ~0, sizeof(MakeMetaUI) );
     g_free( ui );
@@ -80 +82 @@
     char buf[1024];
     double fraction;
-    MakeMetaUI * ui = (MakeMetaUI *) user_data;
+    MakeMetaUI * ui = user_data;
     GtkProgressBar * p = GTK_PROGRESS_BAR( ui->progressbar );
 
@@ -140 +142 @@
 response_cb( GtkDialog* d, int response, gpointer user_data )
 {
-    MakeMetaUI * ui = (MakeMetaUI*) user_data;
+    MakeMetaUI * ui = user_data;
     char *tmp;
     char buf[1024];
@@ -191 +193 @@
 
 static void
-onSelectionChanged( GtkFileChooser *chooser, gpointer user_data )
-{
-    MakeMetaUI * ui = (MakeMetaUI *) user_data;
-    char * filename;
+refreshFromBuilder( MakeMetaUI * ui )
+{
     char sizeStr[128];
     char buf[MAX_PATH_LENGTH];
-    uint64_t totalSize=0;
-    int fileCount=0, pieceCount=0, pieceSize=0;
-
-    if( ui->builder ) {
-        tr_metaInfoBuilderFree( ui->builder );
-        ui->builder = NULL;
-    }
-
-    filename = gtk_file_chooser_get_filename( chooser );
+    tr_metainfo_builder * builder = ui->builder;
+    const char * filename = builder ? builder->top : NULL;
+
     if( !filename )
         g_snprintf( buf, sizeof( buf ), _( "No files selected" ) );
-    else {
-        ui->builder = tr_metaInfoBuilderCreate( ui->handle, filename );
+    else
         g_snprintf( buf, sizeof(buf), "%s.torrent (%d%%)", filename, 0 );
-        g_free( filename );
-        fileCount = ui->builder->fileCount;
-        totalSize = ui->builder->totalSize;
-        pieceCount = ui->builder->pieceCount;
-        pieceSize = ui->builder->pieceSize;
-    }
     gtk_progress_bar_set_text( GTK_PROGRESS_BAR( ui->progressbar ), buf );
     refreshButtons( ui );
@@ -223 +210 @@
         g_snprintf( buf, sizeof( buf ), _( "<i>No files selected</i>" ) );
     else {
-        tr_strlsize( sizeStr, totalSize, sizeof(sizeStr) );
+        tr_strlsize( sizeStr, builder->totalSize, sizeof(sizeStr) );
         g_snprintf( buf, sizeof( buf ),
                     /* %1$s is the torrent size
                        %2$'d is its number of files */
                     ngettext( "<i>%1$s; %2$'d File</i>",
-                              "<i>%1$s; %2$'d Files</i>", fileCount ),
-                    sizeStr, fileCount );
+                              "<i>%1$s; %2$'d Files</i>", builder->fileCount ),
+                    sizeStr, builder->fileCount );
     }
     gtk_label_set_markup ( GTK_LABEL(ui->size_lb), buf );
@@ -236 +223 @@
         *buf = '\0';
     else {
-        tr_strlsize( sizeStr, pieceSize, sizeof(sizeStr) );
+        tr_strlsize( sizeStr, builder->pieceSize, sizeof(sizeStr) );
         g_snprintf( buf, sizeof( buf ),
                     /* %1$'s is number of pieces;
@@ -242 +229 @@
                     ngettext( "<i>%1$'d Piece @ %2$s</i>",
                               "<i>%1$'d Pieces @ %2$s</i>",
-                              pieceCount ),
-                    pieceCount, sizeStr );
+                              builder->pieceCount ),
+                    builder->pieceCount, sizeStr );
     }
     gtk_label_set_markup ( GTK_LABEL(ui->pieces_lb), buf );
+}
+
+static void
+onSelectionChanged( GtkFileChooser * chooser, gpointer gui )
+{
+    MakeMetaUI * ui = gui;
+    char * filename = gtk_file_chooser_get_filename( chooser );
+    tr_metainfo_builder * builder = tr_metaInfoBuilderCreate( ui->handle, filename );
+
+    g_object_set_data_full( G_OBJECT( chooser ),
+                            BUILDER_KEY,
+                            builder,
+                            (GDestroyNotify)tr_metaInfoBuilderFree );
+    ui->builder = builder;
+
+    refreshFromBuilder( ui );
+
+    g_free( filename );
 }
 
@@ -254 +259 @@
     gtk_widget_set_sensitive( w, active );
     if( active )
-        g_signal_emit_by_name( w, "selection-changed", NULL );
+    {
+        MakeMetaUI * ui = g_object_get_data( G_OBJECT( w ), UI_KEY );
+        ui->builder = g_object_get_data( G_OBJECT( w ), BUILDER_KEY );
+        refreshFromBuilder( ui );
+    }
 }
     
@@ -285 +294 @@
         l = gtk_radio_button_new_with_mnemonic( NULL, _( "_Single File:" ) );
         w = gtk_file_chooser_button_new( NULL, GTK_FILE_CHOOSER_ACTION_OPEN );
+        g_object_set_data( G_OBJECT( w ), UI_KEY, ui );
         hig_workarea_add_row_w( t, &row, l, w, NULL );
         group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( l ) );
@@ -292 +302 @@
         l = gtk_radio_button_new_with_mnemonic( group, _( "_Folder:" ) );
         w = gtk_file_chooser_button_new( NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
+        g_object_set_data( G_OBJECT( w ), UI_KEY, ui );
         hig_workarea_add_row_w( t, &row, l, w, NULL );
         g_signal_connect( l, "toggled", G_CALLBACK(onFileModeToggled), w );