Changeset 2151

Timestamp:

Jun 18, 2007, 4:52:03 AM (15 years ago)

Author:

charles

Message:

fix the bug Lacrocivious found in the gtk+ "create torrent" dialog

File:

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

trunk/gtk/makemeta-ui.c

@@ -159 +159 @@
 }
 
-static void
-file_mode_toggled_cb (GtkToggleButton *togglebutton, gpointer user_data)
-{
-    if( gtk_toggle_button_get_active( togglebutton ) )
-    {
-        GtkFileChooserButton * w = GTK_FILE_CHOOSER_BUTTON(user_data);
-        gtk_file_chooser_set_action( GTK_FILE_CHOOSER( w ), GTK_FILE_CHOOSER_ACTION_OPEN );
-    }
-}
-
-static void
-dir_mode_toggled_cb (GtkToggleButton *togglebutton, gpointer user_data)
-{
-    if( gtk_toggle_button_get_active( togglebutton ) )
-    {
-        GtkFileChooserButton * w = GTK_FILE_CHOOSER_BUTTON(user_data);
-        gtk_file_chooser_set_action( GTK_FILE_CHOOSER( w ), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
-    }
-}
-
 /***
 ****
@@ -222 +202 @@
     gtk_label_set_markup ( GTK_LABEL(ui->pieces_lb), buf );
     g_free( pch );
+}
+
+static void
+file_chooser_shown_cb( GtkWidget *w, gpointer folder_toggle )
+{
+    const gboolean isFolder = gtk_toggle_button_get_active( folder_toggle );
+    gtk_file_chooser_set_action (GTK_FILE_CHOOSER(w), isFolder
+        ? GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
+        : GTK_FILE_CHOOSER_ACTION_OPEN );
 }
 
@@ -257 +246 @@
 
         g_snprintf( name, sizeof(name), "%s:", _("_File"));
-        w = gtk_file_chooser_button_new( _("File or Directory to Add to the New Torrent"),
-                                         GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
+
+        w = gtk_file_chooser_dialog_new (_("File or Directory to Add to the New Torrent"),
+                                         NULL,
+                                         GTK_FILE_CHOOSER_ACTION_OPEN,
+                                         GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+                                         GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+                                         NULL);
+        g_signal_connect( w, "map", G_CALLBACK(file_chooser_shown_cb), rb_dir );
+        w = gtk_file_chooser_button_new_with_dialog( w );
         g_signal_connect( w, "selection-changed", G_CALLBACK(file_selection_changed_cb), ui );
-        g_signal_connect( rb_file, "toggled", G_CALLBACK(file_mode_toggled_cb), w );
-        g_signal_connect( rb_dir, "toggled", G_CALLBACK(dir_mode_toggled_cb), w );
         hig_workarea_add_row (t, &row, name, w, NULL);