Changeset 5015

Timestamp:

Feb 13, 2008, 3:00:21 AM (14 years ago)

Author:

charles

Message:

(gtk) new "add torrent" popup to let users choose which files to download, file priority, add paused, delete source .torrent, etc

Location:

trunk

Files:

• gtk/Makefile.am (modified) (2 diffs)
• gtk/dialogs.c (modified) (6 diffs)
• gtk/dialogs.h (modified) (1 diff)
• gtk/file-list.c (modified) (1 diff)
• gtk/ipc.c (modified) (6 diffs)
• gtk/main.c (modified) (9 diffs)
• gtk/my-valgrind.sh (modified) (1 diff)
• gtk/open.c (added)
• gtk/open.h (added)
• gtk/tr_core.c (modified) (11 diffs)
• gtk/tr_core.h (modified) (4 diffs)
• gtk/tr_prefs.c (modified) (7 diffs)
• gtk/tr_prefs.h (modified) (2 diffs)
• gtk/tr_torrent.c (modified) (5 diffs)
• gtk/tr_torrent.h (modified) (1 diff)
• gtk/util.c (modified) (1 diff)
• gtk/util.h (modified) (2 diffs)
• po/POTFILES.in (modified) (2 diffs)

trunk/gtk/Makefile.am

@@ -24 +24 @@
     makemeta-ui.h \
     msgwin.h \
+    open.h \
     stats.h \
     sexy-icon-entry.h \
@@ -49 +50 @@
     makemeta-ui.c \
     msgwin.c \
+    open.c \
     sexy-icon-entry.c \
     stats.c \

trunk/gtk/dialogs.c

@@ -23 +23 @@
  *****************************************************************************/
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
@@ -37 +32 @@
 #include "hig.h"
 #include "tr_core.h"
-#include "tr_icon.h"
 #include "tr_prefs.h"
-#include "util.h"
-
-#define UPDATE_INTERVAL         1000
-#define PREFNAME                "transmission-dialog-pref-name"
-#define FILESWIND_EXTRA_INDENT  4
-
-#define STRIPROOT( path )                                                     \
-    ( g_path_is_absolute( (path) ) ? g_path_skip_root( (path) ) : (path) )
-
-struct addcb
-{
-  GtkWidget * widget;
-  TrCore * core;
-  gboolean autostart;
-  gboolean usingaltdir;
-  GtkFileChooser *altdir;
-  GtkButtonBox *altbox;
+
+struct dirdata
+{
+    GtkWidget  * widget;
+    TrCore     * core;
+    GList      * files;
+    tr_ctor    * ctor;
 };
 
-struct dirdata
-{
-    GtkWidget             * widget;
-    TrCore                * core;
-    GList                 * files;
-    uint8_t               * data;
-    size_t                  size;
-    enum tr_torrent_action  action;
-    gboolean                paused;
-};
-
-static void
-addwindnocore( gpointer gdata, GObject * core );
-static void
-autoclick(GtkWidget *widget, gpointer gdata);
-static void
-dirclick(GtkWidget *widget, gpointer gdata);
-static void
-addresp(GtkWidget *widget, gint resp, gpointer gdata);
-static void
-promptdirnocore( gpointer gdata, GObject * core );
-static void
-promptresp( GtkWidget * widget, gint resp, gpointer data );
-
-void
-makeaddwind( GtkWindow * parent, TrCore * core )
-{
-  GtkWidget *wind = gtk_file_chooser_dialog_new(_("Open Torrent"), parent,
-    GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-    GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
-  struct addcb *data = g_new(struct addcb, 1);
-  GtkWidget *vbox = gtk_vbox_new(FALSE, 3);
-  GtkWidget *bbox = gtk_hbutton_box_new();
-  GtkWidget *autocheck = gtk_check_button_new_with_mnemonic(
-    _("Automatically _start torrent"));
-  GtkWidget *dircheck = gtk_check_button_new_with_mnemonic(
-    _("Use alternate _download directory"));
-  GtkFileFilter *filter = gtk_file_filter_new();
-  GtkFileFilter *unfilter = gtk_file_filter_new();
-  GtkWidget *getdir = gtk_file_chooser_button_new(
-    _("Choose a download directory"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-  char * pref;
-
-  data->widget = wind;
-  data->core = core;
-  data->autostart = TRUE;
-  data->usingaltdir = FALSE;
-  data->altdir = GTK_FILE_CHOOSER(getdir);
-  data->altbox = GTK_BUTTON_BOX(bbox);
-
-  g_object_weak_ref( G_OBJECT( core ), addwindnocore, data );
-
-  gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_EDGE);
-  gtk_box_pack_start_defaults(GTK_BOX(bbox), dircheck);
-  gtk_box_pack_start_defaults(GTK_BOX(bbox), getdir);
-
-  gtk_box_pack_start_defaults(GTK_BOX(vbox), autocheck);
-  gtk_box_pack_start_defaults(GTK_BOX(vbox), bbox);
-
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(autocheck), TRUE);
-  pref = pref_string_get( PREF_KEY_DIR_DEFAULT );
-  if( pref != NULL ) {
-      gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER( wind ), pref );
-      g_free( pref );
-  }
-
-  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dircheck), FALSE);
-  gtk_widget_set_sensitive(getdir, FALSE);
-
-  gtk_file_filter_set_name(filter, _("Torrent files"));
-  gtk_file_filter_add_pattern(filter, "*.torrent");
-  gtk_file_filter_set_name(unfilter, _("All files"));
-  gtk_file_filter_add_pattern(unfilter, "*");
-
-  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(wind), filter);
-  gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(wind), unfilter);
-  gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(wind), TRUE);
-  gtk_file_chooser_set_extra_widget(GTK_FILE_CHOOSER(wind), vbox);
-
-  g_signal_connect(G_OBJECT(autocheck), "clicked", G_CALLBACK(autoclick),data);
-  g_signal_connect(G_OBJECT(dircheck), "clicked", G_CALLBACK(dirclick), data);
-  g_signal_connect(G_OBJECT(wind), "response", G_CALLBACK(addresp), data);
-
-  gtk_widget_show_all(wind);
-}
-
-void
-addwindnocore( gpointer gdata, GObject * core UNUSED )
-{
-    struct addcb * data = gdata;
+static void
+promptdirnocore( gpointer gdata, GObject * core UNUSED )
+{
+    struct dirdata * stuff = gdata;
 
     /* prevent the response callback from trying to remove the weak
        reference which no longer exists */
-    data->core = NULL;
-
-    gtk_dialog_response( GTK_DIALOG( data->widget ), GTK_RESPONSE_NONE );
-}
-
-static void
-autoclick(GtkWidget *widget, gpointer gdata) {
-  struct addcb *data = gdata;
-
-  data->autostart = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-}
-
-static void
-dirclick(GtkWidget *widget, gpointer gdata) {
-  struct addcb *data = gdata;
-
-  data->usingaltdir = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-  gtk_widget_set_sensitive(GTK_WIDGET(data->altdir), data->usingaltdir);
-}
-
-static void
-addresp(GtkWidget *widget, gint resp, gpointer gdata) {
-  struct addcb *data = gdata;
-  GSList *files, *ii;
-  GList *stupidgtk;
-  char *dir;
-  enum tr_torrent_action action;
-
-  if(GTK_RESPONSE_ACCEPT == resp) {
-    dir = NULL;
-    if(data->usingaltdir)
-      dir = gtk_file_chooser_get_filename(data->altdir);
-    files = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(widget));
-    action = tr_prefs_get_action( PREF_KEY_ADDSTD );
-
-    if( NULL == dir )
+    stuff->core = NULL;
+
+    gtk_dialog_response( GTK_DIALOG( stuff->widget ), GTK_RESPONSE_NONE );
+}
+
+static void
+promptresp( GtkWidget * widget, gint resp, gpointer data )
+{
+    struct dirdata * stuff;
+
+    stuff = data;
+
+    if( GTK_RESPONSE_ACCEPT == resp )
     {
-        stupidgtk = NULL;
-        for( ii = files; NULL != ii; ii = ii->next )
-        {
-            stupidgtk = g_list_append( stupidgtk, ii->data );
-        }
-        tr_core_add_list( data->core, stupidgtk, action, !data->autostart );
-        freestrlist(stupidgtk);
-    }
-    else
-    {
-        for( ii = files; NULL != ii; ii = ii->next )
-        {
-            tr_core_add_dir( data->core, ii->data, dir,
-                             action, !data->autostart );
-            g_free( ii->data );
-        }
+        char * dir;
+        GList * l;
+
+        /* update the destination */
+        dir = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( widget ) );
+        tr_ctorSetDestination( stuff->ctor, TR_FORCE, dir );
         g_free( dir );
-    }
-    tr_core_torrents_added( data->core );
-    g_slist_free(files);
-  }
-
-  if( NULL != data->core )
-  {
-      g_object_weak_unref( G_OBJECT( data->core ), addwindnocore, data );
-  }
-
-  g_free( data );
-  gtk_widget_destroy(widget);
+
+        /* if there's metainfo in the ctor already, use it */
+        if( !tr_ctorGetMetainfo( stuff->ctor, NULL ) )
+            tr_core_add_ctor( stuff->core, stuff->ctor );
+
+        /* if there's a list of files, use them too */
+        for( l=stuff->files; l!=NULL; l=l->next )
+            if( !tr_ctorSetMetainfoFromFile( stuff->ctor, l->data ) )
+                tr_core_add_ctor( stuff->core, stuff->ctor );
+    }
+
+    if( stuff->core )
+        g_object_weak_unref( G_OBJECT( stuff->core ), promptdirnocore, stuff );
+
+    gtk_widget_destroy( widget );
+    freestrlist( stuff->files );
+    tr_ctorFree( stuff->ctor );
+    g_free( stuff );
 }
 
@@ -235 +106 @@
 }
 
+static void
+deleteToggled( GtkToggleButton * tb, gpointer ctor )
+{
+    tr_ctorSetDeleteSource( ctor, gtk_toggle_button_get_active( tb ) );
+}
+
+static void
+startToggled( GtkToggleButton * tb, gpointer ctor )
+{
+    tr_ctorSetPaused( ctor, TR_FORCE, !gtk_toggle_button_get_active( tb ) );
+}
+
 void
-promptfordir( GtkWindow * parent, TrCore * core, GList * files, uint8_t * data,
-              size_t size, enum tr_torrent_action act, gboolean paused )
-{
-    char * path;
+promptfordir( GtkWindow * parent, TrCore * core, GList * files, tr_ctor * ctor )
+{
+    uint8_t          flag = 0;
+    const char     * str;
     struct dirdata * stuff;
     GtkWidget      * wind;
+    GtkWidget      * v;
+    GtkWidget      * w;
 
     stuff = g_new0( struct dirdata, 1 );
-    stuff->core    = core;
-    if( NULL != files )
-    {
-        stuff->files = dupstrlist( files );
-    }
-    if( NULL != data )
-    {
-        stuff->data = g_new( uint8_t, size );
-        memcpy( stuff->data, data, size );
-        stuff->size = size;
-    }
-    stuff->action  = act;
-    stuff->paused  = paused;
+    stuff->core   = core;
+    stuff->ctor   = ctor;
+    stuff->files  = dupstrlist( files );
 
     g_object_weak_ref( G_OBJECT( core ), promptdirnocore, stuff );
@@ -267 +142 @@
     gtk_file_chooser_set_local_only( GTK_FILE_CHOOSER( wind ), TRUE );
     gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( wind ), FALSE );
-    path = getdownloaddir( );
-    gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( wind ), path );
-    g_free( path );
+    tr_ctorGetDestination( ctor, TR_FORCE, &str );
+    gtk_file_chooser_set_uri( GTK_FILE_CHOOSER( wind ), str );
+
+    v = gtk_vbox_new( FALSE, GUI_PAD );
+
+        w = gtk_check_button_new_with_mnemonic( _( "_Delete original torrent file" ) );
+        g_signal_connect( w, "toggled", G_CALLBACK( deleteToggled ), ctor );
+        tr_ctorGetDeleteSource( ctor, &flag );
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( w ), flag );
+        gtk_box_pack_start( GTK_BOX( v ), w, FALSE, FALSE, 0 );
+
+        w = gtk_check_button_new_with_mnemonic( _( "_Start when added" ) );
+        g_signal_connect( w, "toggled", G_CALLBACK( startToggled ), ctor );
+        tr_ctorGetPaused( ctor, TR_FORCE, &flag );
+        gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( w ), !flag );
+        gtk_box_pack_start( GTK_BOX( v ), w, FALSE, FALSE, 0 );
+
+    gtk_file_chooser_set_extra_widget( GTK_FILE_CHOOSER( wind ), v );
 
     stuff->widget = wind;
@@ -277 +167 @@
 
     gtk_widget_show_all(wind);
-}
-
-void
-promptdirnocore( gpointer gdata, GObject * core UNUSED )
-{
-    struct dirdata * stuff = gdata;
-
-    /* prevent the response callback from trying to remove the weak
-       reference which no longer exists */
-    stuff->core = NULL;
-
-    gtk_dialog_response( GTK_DIALOG( stuff->widget ), GTK_RESPONSE_NONE );
-}
-
-static void
-promptresp( GtkWidget * widget, gint resp, gpointer data )
-{
-    struct dirdata * stuff;
-    char           * dir;
-    GList          * ii;
-
-    stuff = data;
-
-    if( GTK_RESPONSE_ACCEPT == resp )
-    {
-        dir = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER( widget ) );
-        /* it seems that we will always get a directory */
-        g_assert( NULL != dir );
-        for( ii = g_list_first( stuff->files ); NULL != ii; ii = ii->next )
-        {
-            tr_core_add_dir( stuff->core, ii->data, dir,
-                             stuff->action, stuff->paused );
-        }
-        if( NULL != stuff->data )
-        {
-            tr_core_add_data_dir( stuff->core, stuff->data, stuff->size, dir,
-                                  stuff->paused );
-        }
-        tr_core_torrents_added( stuff->core );
-        g_free( dir );
-    }
-
-    if( NULL != stuff->core )
-    {
-        g_object_weak_unref( G_OBJECT( stuff->core ), promptdirnocore, stuff );
-    }
-
-    freestrlist( stuff->files );
-    g_free( stuff->data );
-    g_free( stuff );
-    gtk_widget_destroy( widget );
 }
 
@@ -346 +185 @@
 {
     struct quitdata * stuff = data;
-
-    pref_flag_set( PREF_KEY_ASKQUIT,
-                   !gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(stuff->dontask) ) );
+    GtkToggleButton * tb = GTK_TOGGLE_BUTTON( stuff->dontask );
+
+    tr_core_set_pref_bool( stuff->core,
+                           PREF_KEY_ASKQUIT,
+                           !gtk_toggle_button_get_active( tb ) );
 
     if( response == GTK_RESPONSE_ACCEPT )

trunk/gtk/dialogs.h

@@ -30 +30 @@
 #include "util.h"
 
-/* show the "add a torrent" dialog */
-void
-makeaddwind( GtkWindow * parent, TrCore * core );
-
 /* prompt for a download directory for torrents, then add them */
-void
-promptfordir( GtkWindow * parent, TrCore * core, GList * files, uint8_t * data,
-              size_t size, enum tr_torrent_action act, gboolean paused );
+void promptfordir( GtkWindow* parent, TrCore*, GList* filenames, tr_ctor* );
 
 /* prompt if the user wants to quit, calls func with cbdata if they do */
-void
-askquit( TrCore*, GtkWindow* parent, callbackfunc_t func, void * cbdata );
+void askquit( TrCore*, GtkWindow* parent, callbackfunc_t func, void* cbdata );
 
 #endif /* TG_PREFS_H */

trunk/gtk/file-list.c

@@ -375 +375 @@
 {
     FileData * data = gdata;
+
+    g_object_weak_unref( G_OBJECT( data->gtor ), torrentDestroyed, data );
+
     file_list_set_torrent( data->top, NULL );
 }

trunk/gtk/ipc.c

@@ -580 +580 @@
     struct constate      * con = arg;
     struct constate_serv * srv = &con->u.serv;
-    enum tr_torrent_action action;
     benc_val_t           * path;
     int                    ii;
+    tr_ctor              * ctor;
+    GList                * list = NULL;
 
     if( NULL == val || TYPE_LIST != val->type )
@@ -590 +591 @@
     }
 
-    action = tr_prefs_get_action( PREF_KEY_ADDIPC );
+    ctor = tr_ctorNew( srv->core );
+
     for( ii = 0; ii < val->val.l.count; ii++ )
     {
@@ -598 +600 @@
             g_utf8_validate( path->val.s.s, path->val.s.i, NULL ) )
         {
-            tr_core_add( TR_CORE( srv->core ), path->val.s.s, action, FALSE );
-        }
-    }
-    tr_core_torrents_added( TR_CORE( srv->core ) );
+            list = g_list_append( list, g_strndup( path->val.s.s, path->val.s.i ) );
+        }
+    }
+
+    if( list ) {
+        tr_core_add_list( srv->core, list, ctor );
+        tr_core_torrents_added( TR_CORE( srv->core ) );
+    }
 
     /* XXX should send info response back with torrent ids */
@@ -613 +619 @@
     struct constate      * con = arg;
     struct constate_serv * srv = &con->u.serv;
-    enum tr_torrent_action action;
     benc_val_t           * file, * data, * dir, * start;
-    gboolean               paused;
+    tr_ctor              * ctor;
 
     if( NULL == val || TYPE_DICT != val->type )
@@ -637 +642 @@
     }
 
-    action = tr_prefs_get_action( PREF_KEY_ADDIPC );
-    paused = ( NULL == start || start->val.i ? FALSE : TRUE );
-    if( NULL != file )
-    {
-        if( NULL == dir )
-        {
-            tr_core_add( srv->core, file->val.s.s, action, paused );
-        }
-        else
-        {
-            tr_core_add_dir( srv->core, file->val.s.s, dir->val.s.s,
-                             action, paused );
-        }
-    }
-    else
-    {
-        if( NULL == dir )
-        {
-            tr_core_add_data( srv->core, (uint8_t *) data->val.s.s,
-                              data->val.s.i, paused );
-        }
-        else
-        {
-            tr_core_add_data_dir( srv->core, (uint8_t *) data->val.s.s,
-                                  data->val.s.i, dir->val.s.s, paused );
-        }
-    }
+    ctor = tr_ctorNew( tr_core_handle( srv->core ) );
+    if( dir )
+        tr_ctorSetDestination( ctor, TR_FORCE, dir->val.s.s );
+    if( file )
+        tr_ctorSetMetainfoFromFile( ctor, file->val.s.s );
+    if( data )
+        tr_ctorSetMetainfo( ctor, (uint8_t*)data->val.s.s, data->val.s.i );
+    if( start )
+        tr_ctorSetPaused( ctor, TR_FORCE, !start->val.i );
+
+    tr_core_add_ctor( TR_CORE( srv->core ), ctor );
+
     tr_core_torrents_added( TR_CORE( srv->core ) );
 
@@ -999 +989 @@
         case IPC_MSG_GETDIR:
             /* XXX sending back "" when we're prompting is kind of bogus */
-            pref = pref_flag_get( PREF_KEY_DIR_ASK ) ? "" : getdownloaddir();
+            pref = pref_flag_get( PREF_KEY_OPTIONS_PROMPT ) ? "" : getdownloaddir();
             buf = ipc_mkstr( con->ipc, &size, IPC_MSG_DIR, tag, pref );
             break;

trunk/gtk/main.c

@@ -48 +48 @@
 #include "makemeta-ui.h"
 #include "msgwin.h"
+#include "open.h"
 #include "stats.h"
 #include "torrent-inspector.h"
@@ -147 +148 @@
          gpointer gdata );
 static void
-coreprompt( TrCore *, GList *, enum tr_torrent_action, gboolean, gpointer );
-static void
-corepromptdata( TrCore *, uint8_t *, size_t, gboolean, gpointer );
+coreprompt( TrCore *, GList *, gpointer, gpointer );
 static void
 initializeFromPrefs( struct cbdata * cbdata );
@@ -330 +329 @@
 appsetup( TrWindow * wind, GList * args,
           struct cbdata * cbdata,
-          gboolean paused, gboolean minimized )
-{
-    enum tr_torrent_action action;
-
+          gboolean forcepause, gboolean minimized )
+{
     /* fill out cbdata */
     cbdata->wind       = NULL;
@@ -350 +347 @@
     g_signal_connect( cbdata->core, "directory-prompt",
                       G_CALLBACK( coreprompt ), cbdata );
-    g_signal_connect( cbdata->core, "directory-prompt-data",
-                      G_CALLBACK( corepromptdata ), cbdata );
     g_signal_connect_swapped( cbdata->core, "quit",
                               G_CALLBACK( wannaquit ), cbdata );
@@ -364 +359 @@
 
     /* add torrents from command-line and saved state */
-    tr_core_load( cbdata->core, paused );
+    tr_core_load( cbdata->core, forcepause );
 
     if( NULL != args )
     {
-        action = tr_prefs_get_action( PREF_KEY_ADDIPC );
-        tr_core_add_list( cbdata->core, args, action, paused );
+        tr_ctor * ctor = tr_ctorNew( tr_core_handle( cbdata->core ) );
+        if( forcepause )
+            tr_ctorSetPaused( ctor, TR_FORCE, TRUE );
+        tr_core_add_list( cbdata->core, args, ctor );
     }
     tr_core_torrents_added( cbdata->core );
@@ -626 +623 @@
     GList * freeme = NULL;
 
-#ifdef DND_DEBUG
+#if 0
+    int i;
     char *sele = gdk_atom_name(sel->selection);
     char *targ = gdk_atom_name(sel->target);
@@ -684 +682 @@
         if( paths != NULL )
         {
-            enum tr_torrent_action action = tr_prefs_get_action( PREF_KEY_ADDSTD );
+            tr_ctor * ctor = tr_ctorNew( tr_core_handle( data->core ) );
             paths = g_list_reverse( paths );
-            tr_core_add_list( data->core, paths, action, FALSE );
+            tr_core_add_list( data->core, paths, ctor );
             tr_core_torrents_added( data->core );
             g_list_free( paths );
@@ -749 +747 @@
 }
 
-void
-coreprompt( TrCore * core, GList * paths, enum tr_torrent_action act,
-            gboolean paused, gpointer gdata )
+static void
+coreprompt( TrCore                 * core,
+            GList                  * paths,
+            gpointer                 ctor,
+            gpointer                 gdata )
 {
     struct cbdata * cbdata = gdata;
 
-    promptfordir( cbdata->wind, core, paths, NULL, 0, act, paused );
-}
-
-void
-corepromptdata( TrCore * core, uint8_t * data, size_t size,
-                gboolean paused, gpointer gdata )
-{
-    struct cbdata * cbdata = gdata;
-
-    promptfordir( cbdata->wind, core, NULL, data, size, TR_TOR_LEAVE, paused );
+    if( g_list_length( paths ) != 1 )
+        promptfordir( cbdata->wind, core, paths, ctor );
+    else {
+        tr_ctorSetMetainfoFromFile( ctor, paths->data );
+        makeaddwind( cbdata->wind, core, ctor );
+    }
 }
 
@@ -1014 +1010 @@
     if ( !strcmp (action_name, "open-torrent-menu") || !strcmp( action_name, "open-torrent-toolbar" ))
     {
-        makeaddwind( data->wind, data->core );
+        makeaddwind( data->wind, data->core, tr_ctorNew( tr_core_handle( data->core ) ) );
     }
     else if (!strcmp (action_name, "show-stats"))

trunk/gtk/my-valgrind.sh

@@ -3 +3 @@
 export G_DEBUG=gc-friendly
 export GLIBCXX_FORCE_NEW=1
-valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=64 --log-file=x-valgrind --show-reachable=yes ./transmission
+valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=64 --log-file=x-valgrind --show-reachable=yes ./transmission ~/Desktop/*torrent

trunk/gtk/tr_core.c

@@ -78 +78 @@
                         gpointer marshal )
 {
-    typedef void (*TRMarshalPrompt)
-        ( gpointer, GList *, enum tr_torrent_action, gboolean, gpointer );
+    typedef void (*TRMarshalPrompt)( gpointer, GList *, gpointer, gpointer );
     TRMarshalPrompt        callback;
     GCClosure            * cclosure = (GCClosure*) closure;
     GList                * paths;
-    enum tr_torrent_action action;
-    gboolean               paused;
+    gpointer               ctor;
     gpointer               inst, gdata;
 
-    g_return_if_fail( 4 == count );
-
-    inst    = g_value_peek_pointer( vals );
-    paths   = g_value_get_pointer( vals + 1 );
-    action  = g_value_get_int( vals + 2 );
-    paused  = g_value_get_boolean( vals + 3 );
-    gdata   = closure->data;
+    g_return_if_fail( 3 == count );
+
+    inst      = g_value_peek_pointer( vals );
+    paths     = g_value_get_pointer( vals + 1 );
+    ctor      = g_value_get_pointer( vals + 2 );
+    gdata     = closure->data;
 
     callback = (TRMarshalPrompt) ( NULL == marshal ?
                                    cclosure->callback : marshal );
-    callback( inst, paths, action, paused, gdata );
-}
-
-static void
-tr_core_marshal_data( GClosure * closure, GValue * ret UNUSED, guint count,
-                      const GValue * vals, gpointer hint UNUSED,
-                      gpointer marshal )
-{
-    typedef void (*TRMarshalPrompt)
-        ( gpointer, uint8_t *, size_t, gboolean, gpointer );
-    TRMarshalPrompt        callback;
-    GCClosure            * cclosure = (GCClosure*) closure;
-    uint8_t              * data;
-    size_t                 size;
-    gboolean               paused;
-    gpointer               inst, gdata;
-
-    g_return_if_fail( 4 == count );
-
-    inst    = g_value_peek_pointer( vals );
-    data    = (uint8_t *) g_value_get_string( vals + 1 );
-    size    = g_value_get_uint( vals + 2 );
-    paused  = g_value_get_boolean( vals + 3 );
-    gdata   = closure->data;
-
-    callback = (TRMarshalPrompt) ( NULL == marshal ?
-                                   cclosure->callback : marshal );
-    callback( inst, data, size, paused, gdata );
+    callback( inst, paths, ctor, gdata );
 }
 
@@ -172 +142 @@
                                           G_SIGNAL_RUN_LAST, 0, NULL, NULL,
                                           tr_core_marshal_prompt, G_TYPE_NONE,
-                                          3, G_TYPE_POINTER, G_TYPE_INT,
-                                          G_TYPE_BOOLEAN );
-    core_class->promptdatasig = g_signal_new( "directory-prompt-data",
-                                              G_TYPE_FROM_CLASS( g_class ),
-                                              G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-                                              tr_core_marshal_data,
-                                              G_TYPE_NONE, 3, G_TYPE_STRING,
-                                              G_TYPE_UINT, G_TYPE_BOOLEAN );
+                                          2, G_TYPE_POINTER, G_TYPE_POINTER );
     core_class->quitsig = g_signal_new( "quit", G_TYPE_FROM_CLASS( g_class ),
                                         G_SIGNAL_RUN_LAST, 0, NULL, NULL,
@@ -487 +450 @@
 }
 
-static void
-tr_core_insert( TrCore * self, TrTorrent * tor )
+void
+tr_core_add_torrent( TrCore * self, TrTorrent * tor )
 {
     const tr_info * inf = tr_torrent_info( tor );
@@ -495 +458 @@
     GtkListStore * store = GTK_LIST_STORE( tr_core_model( self ) );
     GtkTreeIter unused;
+
     gtk_list_store_insert_with_values( store, &unused, 0, 
                                        MC_NAME,          inf->name,
@@ -504 +468 @@
                                        MC_ID,            self->priv->nextid,
                                        -1);
-    self->priv->nextid++;
-    g_object_unref( tor );
+    ++self->priv->nextid;
+
+    /* cleanup */
+    g_object_unref( G_OBJECT( tor ) );
     g_free( collated );
 }
@@ -530 +496 @@
     torrents = tr_loadTorrents ( tr_core_handle( self ), ctor, &count );
     for( i=0; i<count; ++i )
-        tr_core_insert( self, tr_torrent_new_preexisting( torrents[i] ) );
+        tr_core_add_torrent( self, tr_torrent_new_preexisting( torrents[i] ) );
 
     tr_free( torrents );
@@ -539 +505 @@
 }
 
-gboolean
-tr_core_add( TrCore * self, const char * path, enum tr_torrent_action act,
-             gboolean paused )
-{
-    GList * list;
-    int     ret;
-
-    TR_IS_CORE( self );
-
-    list = g_list_append( NULL, (void *) path );
-    ret  = tr_core_add_list( self, list, act, paused );
-    g_list_free( list );
-
-    return 1 == ret;
-}
-
 static void
 tr_core_errsig( TrCore * self, enum tr_core_err type, const char * msg )
@@ -564 +514 @@
 }
 
-gboolean
-tr_core_add_dir( TrCore * self, const char * path, const char * dir,
-                 enum tr_torrent_action act, gboolean paused )
+static void
+tr_core_apply_defaults( tr_ctor * ctor )
+{
+    if( tr_ctorGetPaused( ctor, TR_FORCE, NULL ) )
+        tr_ctorSetPaused( ctor, TR_FORCE, !pref_flag_get( PREF_KEY_START ) );
+
+    if( tr_ctorGetDeleteSource( ctor, NULL ) )
+        tr_ctorSetDeleteSource( ctor, pref_flag_get( PREF_KEY_DELETE_ORIGINAL ) );
+
+    if( tr_ctorGetMaxConnectedPeers( ctor, TR_FORCE, NULL ) )
+        tr_ctorSetMaxConnectedPeers( ctor, TR_FORCE, pref_int_get( PREF_KEY_MAX_PEERS_PER_TORRENT ) );
+
+    if( tr_ctorGetDestination( ctor, TR_FORCE, NULL ) ) {
+        char * path = pref_string_get( PREF_KEY_DIR_DEFAULT );
+        tr_ctorSetDestination( ctor, TR_FORCE, path );
+        g_free( path );
+    }
+}
+
+void
+tr_core_add_ctor( TrCore * self, tr_ctor * ctor )
 {
     TrTorrent * tor;
     char      * errstr;
 
-    TR_IS_CORE( self );
-
     errstr = NULL;
-    tor = tr_torrent_new( tr_core_handle( self ), path, dir, act, paused, &errstr );
-    if( NULL == tor )
+
+    tr_core_apply_defaults( ctor );
+    tor = tr_torrent_new_ctor( tr_core_handle( self ), ctor, &errstr );
+    if( !tor )
     {
         tr_core_errsig( self, TR_CORE_ERR_ADD_TORRENT, errstr );
         g_free( errstr );
-        return FALSE;
-    }
-    g_assert( NULL == errstr );
-
-    tr_core_insert( self, tor );
-
-    return TRUE;
-}
-
-int
-tr_core_add_list( TrCore * self, GList * paths, enum tr_torrent_action act,
-                  gboolean paused )
-{
-    char * dir;
-    int count;
-
-    TR_IS_CORE( self );
-
-    if( pref_flag_get( PREF_KEY_DIR_ASK ) )
+        errstr = NULL;
+    }
+    else
+    {
+        g_assert( !errstr );
+        tr_core_add_torrent( self, tor );
+    }
+}
+
+void
+tr_core_add_list( TrCore   * self,
+                  GList    * paths,
+                  tr_ctor  * ctor )
+{
+    tr_core_apply_defaults( ctor );
+
+    if( pref_flag_get( PREF_KEY_OPTIONS_PROMPT ) )
     {
         TrCoreClass * class = g_type_class_peek( TR_CORE_TYPE );
-        g_signal_emit( self, class->promptsig, 0, paths, act, paused );
-        return 0;
-    }
-
-    dir = getdownloaddir();
-    count = 0;
-    for( ; paths; paths=paths->next )
-        if( tr_core_add_dir( self, paths->data, dir, act, paused ) )
-            count++;
-
-    g_free( dir );
-    return count;
-}
-
-gboolean
-tr_core_add_data( TrCore * self, uint8_t * data, size_t size, gboolean paused )
-{
-    gboolean ret;
-    char * path;
-    TR_IS_CORE( self );
-
-    if( pref_flag_get( PREF_KEY_DIR_ASK ) )
-    {
-        TrCoreClass * class = g_type_class_peek( TR_CORE_TYPE );
-        g_signal_emit( self, class->promptdatasig, 0, data, size, paused );
-        return FALSE;
-    }
-
-    path = getdownloaddir( );
-    ret = tr_core_add_data_dir( self, data, size, path, paused );
-    g_free( path );
-    return ret;
-}
-
-gboolean
-tr_core_add_data_dir( TrCore * self, uint8_t * data, size_t size,
-                      const char * dir, gboolean paused )
-{
-    TrTorrent * tor;
-    char      * errstr = NULL;
-
-    TR_IS_CORE( self );
-
-    tor = tr_torrent_new_with_data( tr_core_handle( self ), data, size, dir,
-                                    paused, &errstr );
-    if( NULL == tor )
-    {
-        tr_core_errsig( self, TR_CORE_ERR_ADD_TORRENT, errstr );
-        g_free( errstr );
-        return FALSE;
-    }
-    g_assert( NULL == errstr );
-
-    tr_core_insert( self, tor );
-
-    return TRUE;
+        g_signal_emit( self, class->promptsig, 0, paths, ctor );
+    }
+    else
+    {
+        for( ; paths; paths=paths->next )
+            if( !tr_ctorSetMetainfoFromFile( ctor, paths->data ) )
+                tr_core_add_ctor( self, ctor );
+        tr_ctorFree( ctor );
+    }
 }
 
@@ -661 +580 @@
 tr_core_torrents_added( TrCore * self )
 {
-    TR_IS_CORE( self );
-
     tr_core_update( self );
     tr_core_errsig( self, TR_CORE_ERR_NO_MORE_TORRENTS, NULL );
@@ -672 +589 @@
     TrTorrent * tor;
     GtkTreeModel * model = tr_core_model( self );
-
-    TR_IS_CORE( self );
 
     gtk_tree_model_get( model, iter, MC_TORRENT, &tor, -1 );
@@ -747 +662 @@
 tr_core_quit( TrCore * self )
 {
-    TrCoreClass * class;
-
-    TR_IS_CORE( self );
-
-    class = g_type_class_peek( TR_CORE_TYPE );
+    TrCoreClass * class = g_type_class_peek( TR_CORE_TYPE );
     g_signal_emit( self, class->quitsig, 0 );
 }

trunk/gtk/tr_core.h

@@ -31 +31 @@
 #include <gtk/gtk.h>
 
-#include <libtransmission/bencode.h>
 #include <libtransmission/transmission.h>
 
+#include "tr_torrent.h"
 #include "util.h"
 
-#define TR_CORE_TYPE            ( tr_core_get_type() )
-
-#define TR_CORE( obj )                                                        \
-  ( G_TYPE_CHECK_INSTANCE_CAST( (obj),   TR_CORE_TYPE, TrCore ) )
-
-#define TR_CORE_CLASS( class )                                                \
-  ( G_TYPE_CHECK_CLASS_CAST(    (class), TR_CORE_TYPE, TrCoreClass ) )
-
-#define TR_IS_CORE( obj )                                                     \
-  ( G_TYPE_CHECK_INSTANCE_TYPE( (obj),   TR_CORE_TYPE ) )
-
-#define TR_IS_CORE_CLASS( class )                                             \
-  ( G_TYPE_CHECK_CLASS_TYPE(    (class), TR_CORE_TYPE ) )
-
-#define TR_CORE_GET_CLASS( obj )                                              \
-  ( G_TYPE_INSTANCE_GET_CLASS(  (obj),   TR_CORE_TYPE, TrCoreClass ) )
-
+#define TR_CORE_TYPE (tr_core_get_type())
+#define TR_CORE(o) G_TYPE_CHECK_INSTANCE_CAST((o),TR_CORE_TYPE,TrCore)
+#define TR_IS_CORE(o) G_TYPE_CHECK_INSTANCE_TYPE((o),TR_CORE_TYPE)
+#define TR_CORE_CLASS(k) G_TYPE_CHECK_CLASS_CAST((k),TR_CORE_TYPE,TrCoreClass)
+#define TR_IS_CORE_CLASS(k) G_TYPE_CHECK_CLASS_TYPE((k),TR_CORE_TYPE)
+#define TR_CORE_GET_CLASS(o) G_TYPE_INSTANCE_GET_CLASS((o),TR_CORE_TYPE,TrCoreClass)
 
 struct core_stats
@@ -62 +51 @@
 };
 
-/* treat the contents of this structure as private */
 typedef struct TrCore
 {
@@ -79 +67 @@
 
     /* "directory-prompt" signal:
-       void handler( TrCore *, GList *, enum tr_torrent_action, gboolean, gpointer ) */
+       void handler( TrCore *, GList *, gpointer ctor, gpointer userData ) */
     int promptsig;
-
-    /* "directory-prompt-data" signal:
-       void handler( TrCore *, uint8_t *, size_t, gboolean, gpointer ) */
-    int promptdatasig;
 
     /* "quit" signal:
@@ -121 +105 @@
 tr_core_get_stats( const TrCore * self );
 
-/* Load saved state, return number of torrents added. May trigger one
-   or more "error" signals with TR_CORE_ERR_ADD_TORRENT */
-int
-tr_core_load( TrCore * self, gboolean forcepaused );
+/******
+*******
+******/
 
-/* Any the tr_core_add functions below may trigger an "error" signal
-   with TR_CORE_ERR_ADD_TORRENT */
+/**
+ * Load saved state and return number of torrents added.
+ * May trigger one or more "error" signals with TR_CORE_ERR_ADD_TORRENT
+ */
+int tr_core_load( TrCore * self, gboolean forcepaused );
 
-/* Add the torrent at the given path */
-gboolean
-tr_core_add( TrCore * self, const char * path, enum tr_torrent_action act,
-             gboolean paused );
+/**
+ * Add a torrent.
+ * May trigger an "error" signal with TR_CORE_ERR_ADD_TORRENT
+ * Caller must free the ctor.
+ */
+void tr_core_add_ctor( TrCore * self, tr_ctor * ctor );
 
-/* Add the torrent at the given path with the given download directory */
-gboolean
-tr_core_add_dir( TrCore * self, const char * path, const char * dir,
-                 enum tr_torrent_action act, gboolean paused );
+/**
+ * Add a list of torrents.
+ * May trigger one or more "error" signals with TR_CORE_ERR_ADD_TORRENT
+ */
+void tr_core_add_list( TrCore   * self,
+                       GList    * torrentFiles,
+                       tr_ctor  * ctor );
 
-/* Add a list of torrents with the given paths */
-int
-tr_core_add_list( TrCore * self, GList * paths, enum tr_torrent_action act,
-                  gboolean paused );
+/**
+ * Add a torrent.
+ */
+void tr_core_add_torrent( TrCore*, TrTorrent* );
 
-/* Add the torrent data in the given buffer */
-gboolean
-tr_core_add_data( TrCore * self, uint8_t * data, size_t size, gboolean paused );
+/**
+ * Notifies listeners that torrents have been added.
+ * This should be called after one or more tr_core_add*() calls.
+ */
+void tr_core_torrents_added( TrCore * self );
 
-/* Add the torrent data in the given buffer with the given download directory */
-gboolean
-tr_core_add_data_dir( TrCore * self, uint8_t * data, size_t size,
-                      const char * dir, gboolean paused );
-
-/* Save state, update model, and signal the end of a torrent cluster */
-void
-tr_core_torrents_added( TrCore * self );
+/******
+*******
+******/
 
 /* remove a torrent, waiting for it to pause if necessary */

trunk/gtk/tr_prefs.c

@@ -43 +43 @@
     pref_int_set_default    ( PREF_KEY_UL_LIMIT, 50 );
 
-    pref_flag_set_default   ( PREF_KEY_DIR_ASK, FALSE );
+    pref_flag_set_default   ( PREF_KEY_OPTIONS_PROMPT, TRUE );
     pref_string_set_default ( PREF_KEY_DIR_DEFAULT, g_get_home_dir() );
 
@@ -54 +54 @@
     pref_flag_set_default   ( PREF_KEY_ENCRYPTED_ONLY, FALSE );
 
-    pref_string_set_default ( PREF_KEY_ADDSTD, toractionname(TR_TOR_COPY) );
-    pref_string_set_default ( PREF_KEY_ADDIPC, toractionname(TR_TOR_COPY) );
-
     pref_int_set_default    ( PREF_KEY_MSGLEVEL, TR_MSG_INF );
 
@@ -63 +60 @@
     pref_flag_set_default   ( PREF_KEY_MINIMAL_VIEW, FALSE );
 
+    pref_flag_set_default   ( PREF_KEY_START, TRUE );
+    pref_flag_set_default   ( PREF_KEY_DELETE_ORIGINAL, FALSE );
+
     pref_save( NULL );
-}
-
-/**
-***
-**/
-
-int
-tr_prefs_get_action( const char * key )
-{
-    char * val = pref_string_get( key );
-    const int ret = toraddaction( val );
-    g_free( val );
-    return ret;
-}
-
-void
-tr_prefs_set_action( const char * key, int action )
-{
-    pref_string_set( key, toractionname(action) );
 }
 
@@ -156 +137 @@
 
 static void
-action_cb( GtkComboBox * w, gpointer core )
-{
-    const char * key = g_object_get_data( G_OBJECT(w), PREFS_KEY );
-    GtkTreeIter iter;
-    if( gtk_combo_box_get_active_iter( GTK_COMBO_BOX(w), &iter ) )
-    {
-        int action;
-        GtkTreeModel * model = gtk_combo_box_get_model( GTK_COMBO_BOX(w) );
-        gtk_tree_model_get( model, &iter, 1, &action, -1 );
-        tr_core_set_pref( core, key, toractionname(action) );
-    }
-}
-
-static GtkWidget*
-new_action_combo( const char * key, gpointer core )
-{
-    const char * s;
-    GtkTreeIter iter;
-    GtkCellRenderer * rend;
-    GtkListStore * model;
-    GtkWidget * w;
-
-    model = gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_INT );
-
-    s = _("Use the torrent file where it is");
-    gtk_list_store_append( model, &iter );
-    gtk_list_store_set( model, &iter, 1, TR_TOR_LEAVE, 0, s, -1 );
-
-    s = _("Keep a copy of the torrent file");
-    gtk_list_store_append( model, &iter );
-    gtk_list_store_set( model, &iter, 1, TR_TOR_COPY, 0, s, -1 );
-
-    s = _("Keep a copy and remove the original");
-    gtk_list_store_append( model, &iter );
-    gtk_list_store_set( model, &iter, 1, TR_TOR_MOVE, 0, s, -1 );
-
-    w = gtk_combo_box_new_with_model( GTK_TREE_MODEL(model) ); 
-    gtk_combo_box_set_active( GTK_COMBO_BOX(w), tr_prefs_get_action(key) );
-    g_object_set_data_full( G_OBJECT(w), PREFS_KEY, g_strdup(key), g_free );
-    rend = gtk_cell_renderer_text_new( );
-    gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(w), rend, TRUE );
-    gtk_cell_layout_add_attribute( GTK_CELL_LAYOUT(w), rend, "text", 0 );
-    g_signal_connect( w, "changed", G_CALLBACK(action_cb), core );
-
-    return w;
-}
-
-static void
 target_cb( GtkWidget * widget, gpointer target )
 {
     gtk_widget_set_sensitive( GTK_WIDGET(target), gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ) );
-}
-
-static void
-target_invert_cb( GtkWidget * widget, gpointer target )
-{
-    gtk_widget_set_sensitive( GTK_WIDGET(target), !gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(widget) ) );
 }
 
@@ -268 +195 @@
 }
 
-GtkWidget *
-tr_prefs_dialog_new( GObject * core, GtkWindow * parent )
+static GtkWidget*
+generalPage( GObject * core )
+{
+    int row = 0;
+    const char * s;
+    GtkWidget * t;
+    GtkWidget * w;
+
+    t = hig_workarea_create ();
+
+    hig_workarea_add_section_title (t, &row, _("Windows"));
+        
+        s = _("Show an icon in the system _tray");
+        w = new_check_button( s, PREF_KEY_SYSTRAY, core );
+        hig_workarea_add_wide_control( t, &row, w );
+        
+        s = _("Confirm _quit");
+        w = new_check_button( s, PREF_KEY_ASKQUIT, core );
+        hig_workarea_add_wide_control( t, &row, w );
+
+    hig_workarea_finish (t, &row);
+    return t;
+}
+
+static GtkWidget*
+torrentPage( GObject * core )
+{
+    int row = 0;
+    const char * s;
+    GtkWidget * t;
+    GtkWidget * w;
+
+    t = hig_workarea_create ();
+
+    hig_workarea_add_section_title( t, &row, _( "Location" ) );
+
+        w = new_path_chooser_button( PREF_KEY_DIR_DEFAULT, core );
+        hig_workarea_add_row( t, &row, _( "Default download location:" ), w, NULL );
+
+    hig_workarea_add_section_divider( t, &row );
+    hig_workarea_add_section_title( t, &row, _( "Adding Torrents" ) );
+
+        s = _( "Show _options window" );
+        w = new_check_button( s, PREF_KEY_OPTIONS_PROMPT, core );
+        hig_workarea_add_wide_control( t, &row, w );
+
+        s = _( "_Start transfers when added" );
+        w = new_check_button( s, PREF_KEY_START, core );
+        hig_workarea_add_wide_control( t, &row, w );
+
+        s = _( "_Delete original torrent file" );
+        w = new_check_button( s, PREF_KEY_DELETE_ORIGINAL, core );
+        hig_workarea_add_wide_control( t, &row, w );
+
+    hig_workarea_finish (t, &row);
+    return t;
+}
+
+static GtkWidget*
+peerPage( GObject * core )
+{
+    int row = 0;
+    const char * s;
+    GtkWidget * t;
+    GtkWidget * w;
+
+    t = hig_workarea_create ();
+    hig_workarea_add_section_title (t, &row, _("Options"));
+        
+        s = _("Use peer _exchange if possible");
+        w = new_check_button( s, PREF_KEY_PEX, core );
+        hig_workarea_add_wide_control( t, &row, w );
+        
+        s = _("_Ignore unencrypted peers");
+        w = new_check_button( s, PREF_KEY_ENCRYPTED_ONLY, core );
+        hig_workarea_add_wide_control( t, &row, w );
+
+    hig_workarea_add_section_divider( t, &row );
+    hig_workarea_add_section_title( t, &row, _( "Limits" ) );
+  
+        w = new_spin_button( PREF_KEY_MAX_PEERS_GLOBAL, core, 1, 3000, 5 );
+        hig_workarea_add_row( t, &row, _( "Total max peers:" ), w, NULL );
+        w = new_spin_button( PREF_KEY_MAX_PEERS_PER_TORRENT, core, 1, 300, 5 );
+        hig_workarea_add_row( t, &row, _( "Per-torrent max peers:" ), w, NULL );
+
+    hig_workarea_finish (t, &row);
+    return t;
+}
+
+static GtkWidget*
+bandwidthPage( GObject * core )
+{
+    int row = 0;
+    const char * s;
+    GtkWidget * t;
+    GtkWidget * w, * w2;
+
+    t = hig_workarea_create ();
+
+    hig_workarea_add_section_title (t, &row, _("Speed Limits"));
+
+        s = _("_Limit upload speed (KiB/s)");
+        w = new_check_button( s, PREF_KEY_UL_LIMIT_ENABLED, core );
+        w2 = new_spin_button( PREF_KEY_UL_LIMIT, core, 0, INT_MAX, 5 );
+        gtk_widget_set_sensitive( GTK_WIDGET(w2), pref_flag_get( PREF_KEY_UL_LIMIT_ENABLED ) );
+        g_signal_connect( w, "toggled", G_CALLBACK(target_cb), w2 );
+        hig_workarea_add_row_w( t, &row, w, w2, NULL );
+
+        s = _("Li_mit download speed (KiB/s)");
+        w = new_check_button( s, PREF_KEY_DL_LIMIT_ENABLED, core );
+        w2 = new_spin_button( PREF_KEY_DL_LIMIT, core, 0, INT_MAX, 5 );
+        gtk_widget_set_sensitive( GTK_WIDGET(w2), pref_flag_get( PREF_KEY_DL_LIMIT_ENABLED ) );
+        g_signal_connect( w, "toggled", G_CALLBACK(target_cb), w2 );
+        hig_workarea_add_row_w( t, &row, w, w2, NULL );
+
+    hig_workarea_finish (t, &row);
+    return t;
+}
+
+static GtkWidget*
+networkPage( GObject * core, gpointer alive )
 {
     int row = 0;
@@ -277 +323 @@
     GtkWidget * l;
     GtkWidget * h;
+    GtkTooltips * tips;
+
+    tips = gtk_tooltips_new( );
+
+    t = hig_workarea_create ();
+    hig_workarea_add_section_title (t, &row, _("Network"));
+        
+        s = _("_Automatically map port" );
+        w = new_check_button( s, PREF_KEY_NAT, core );
+        hig_workarea_add_wide_control( t, &row, w );
+        gtk_tooltips_set_tip( GTK_TOOLTIPS( tips ), w, _( "NAT traversal uses either NAT-PMP or UPnP" ), NULL );
+
+        h = gtk_hbox_new( FALSE, GUI_PAD );
+        w2 = new_spin_button( PREF_KEY_PORT, core, 1, INT_MAX, 1 );
+        gtk_box_pack_start( GTK_BOX(h), w2, FALSE, FALSE, 0 );
+        l = gtk_label_new( NULL );
+        gtk_misc_set_alignment( GTK_MISC(l), 0.0f, 0.5f );
+        gtk_box_pack_start( GTK_BOX(h), l, FALSE, FALSE, 0 );
+        hig_workarea_add_row( t, &row, _("Incoming TCP _Port"), h, w );
+
+        g_object_set_data( G_OBJECT(l), "tr-port-spin", w2 );
+        g_object_set_data( G_OBJECT(l), "alive", alive );
+        testing_port_cb( NULL, l );
+
+        g_signal_connect( w, "toggled", G_CALLBACK(toggled_cb), l );
+        g_signal_connect( w2, "value-changed", G_CALLBACK(testing_port_cb), l );
+
+    hig_workarea_finish (t, &row);
+    return t;
+}
+
+GtkWidget *
+tr_prefs_dialog_new( GObject * core, GtkWindow * parent )
+{
     GtkWidget * d;
-    GtkTooltips * tips;
+    GtkWidget * n;
+    GtkWidget * w;
     gboolean * alive;
 
     alive = g_new( gboolean, 1 );
     *alive = TRUE;
-
-    tips = gtk_tooltips_new( );
 
     d = gtk_dialog_new_with_buttons( _("Preferences"), parent,
@@ -295 +374 @@
     g_object_weak_ref( G_OBJECT( d ), dialogDestroyed, alive );
 
+    n = gtk_notebook_new( );
+
+    w = torrentPage( core );
+    gtk_notebook_append_page( GTK_NOTEBOOK( n ), w, gtk_label_new (_("Torrents")) );
+    w = peerPage( core );
+    gtk_notebook_append_page( GTK_NOTEBOOK( n ), w, gtk_label_new (_("Peers")) );
+    w = bandwidthPage( core );
+    gtk_notebook_append_page( GTK_NOTEBOOK( n ), w, gtk_label_new (_("Bandwidth")) );
+    w = networkPage( core, alive );
+    gtk_notebook_append_page( GTK_NOTEBOOK( n ), w, gtk_label_new (_("Network")) );
+    w = generalPage( core );
+    gtk_notebook_append_page( GTK_NOTEBOOK( n ), w, gtk_label_new (_("General")) );
+
+
     g_signal_connect( d, "response", G_CALLBACK(response_cb), core );
-
-    t = hig_workarea_create ();
-
-    hig_workarea_add_section_title (t, &row, _("Speed Limits"));
-
-        s = _("_Limit upload speed (KiB/s)");
-        w = new_check_button( s, PREF_KEY_UL_LIMIT_ENABLED, core );
-        w2 = new_spin_button( PREF_KEY_UL_LIMIT, core, 0, INT_MAX, 5 );
-        gtk_widget_set_sensitive( GTK_WIDGET(w2), pref_flag_get( PREF_KEY_UL_LIMIT_ENABLED ) );
-        g_signal_connect( w, "toggled", G_CALLBACK(target_cb), w2 );
-        hig_workarea_add_row_w( t, &row, w, w2, NULL );
-
-        s = _("Li_mit download speed (KiB/s)");
-        w = new_check_button( s, PREF_KEY_DL_LIMIT_ENABLED, core );
-        w2 = new_spin_button( PREF_KEY_DL_LIMIT, core, 0, INT_MAX, 5 );
-        gtk_widget_set_sensitive( GTK_WIDGET(w2), pref_flag_get( PREF_KEY_DL_LIMIT_ENABLED ) );
-        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, _("Downloads"));
-
-        s = _("P_rompt for download directory");
-        w = new_check_button( s, PREF_KEY_DIR_ASK, core );
-        w2 = new_path_chooser_button( PREF_KEY_DIR_DEFAULT, core );
-        gtk_widget_set_sensitive( GTK_WIDGET(w2), !pref_flag_get( PREF_KEY_DIR_ASK ) );
-        g_signal_connect( w, "toggled", G_CALLBACK(target_invert_cb), w2 );
-        hig_workarea_add_row_w( t, &row, w, w2, NULL );
-
-        w = new_action_combo( PREF_KEY_ADDSTD, core );
-        s = _("For torrents added _normally:");
-        l = hig_workarea_add_row( t, &row, s, w, NULL );
-
-        w = new_action_combo( PREF_KEY_ADDIPC, core );
-        s = _("For torrents added from _command-line:");
-        l = hig_workarea_add_row( t, &row, s, w, NULL );
-
-    hig_workarea_add_section_divider( t, &row );
-    hig_workarea_add_section_title( t, &row, _( "Peer Connections" ) );
-  
-        w = new_spin_button( PREF_KEY_MAX_PEERS_GLOBAL, core, 1, 3000, 5 );
-        hig_workarea_add_row( t, &row, _( "Global maximum connected peers:" ), w, NULL );
-        w = new_spin_button( PREF_KEY_MAX_PEERS_PER_TORRENT, core, 1, 300, 5 );
-        hig_workarea_add_row( t, &row, _( "Maximum connected peers for new torrents:" ), w, NULL );
-
-    hig_workarea_add_section_divider( t, &row );
-    hig_workarea_add_section_title (t, &row, _("Network"));
-        
-        s = _("_Automatically map port" );
-        w = new_check_button( s, PREF_KEY_NAT, core );
-        hig_workarea_add_wide_control( t, &row, w );
-        gtk_tooltips_set_tip( GTK_TOOLTIPS( tips ), w, _( "NAT traversal uses either NAT-PMP or UPnP" ), NULL );
-
-        h = gtk_hbox_new( FALSE, GUI_PAD );
-        w2 = new_spin_button( PREF_KEY_PORT, core, 1, INT_MAX, 1 );
-        gtk_box_pack_start( GTK_BOX(h), w2, FALSE, FALSE, 0 );
-        l = gtk_label_new( NULL );
-        gtk_misc_set_alignment( GTK_MISC(l), 0.0f, 0.5f );
-        gtk_box_pack_start( GTK_BOX(h), l, FALSE, FALSE, 0 );
-        hig_workarea_add_row( t, &row, _("Incoming TCP _Port"), h, w );
-
-        g_object_set_data( G_OBJECT(l), "tr-port-spin", w2 );
-        g_object_set_data( G_OBJECT(l), "alive", alive );
-        testing_port_cb( NULL, l );
-
-        g_signal_connect( w, "toggled", G_CALLBACK(toggled_cb), l );
-        g_signal_connect( w2, "value-changed", G_CALLBACK(testing_port_cb), l );
-
-    hig_workarea_add_section_divider( t, &row );
-    hig_workarea_add_section_title (t, &row, _("Options"));
-        
-        s = _("Use peer _exchange if possible");
-        w = new_check_button( s, PREF_KEY_PEX, core );
-        hig_workarea_add_wide_control( t, &row, w );
-        
-        s = _("_Ignore unencrypted peers");
-        w = new_check_button( s, PREF_KEY_ENCRYPTED_ONLY, core );
-        hig_workarea_add_wide_control( t, &row, w );
-        
-        s = _("Show an icon in the system _tray");
-        w = new_check_button( s, PREF_KEY_SYSTRAY, core );
-        hig_workarea_add_wide_control( t, &row, w );
-        
-        s = _("Confirm _quit");
-        w = new_check_button( s, PREF_KEY_ASKQUIT, core );
-        hig_workarea_add_wide_control( t, &row, w );
-
-    hig_workarea_finish (t, &row);
-    gtk_box_pack_start_defaults( GTK_BOX(GTK_DIALOG(d)->vbox), t );
+    gtk_box_pack_start_defaults( GTK_BOX(GTK_DIALOG(d)->vbox), n );
     gtk_widget_show_all( GTK_DIALOG(d)->vbox );
     return d;

trunk/gtk/tr_prefs.h

@@ -25 +25 @@
 #define PREF_KEY_UL_LIMIT_ENABLED       "upload-limit-enabled"
 #define PREF_KEY_UL_LIMIT               "upload-limit"
-#define PREF_KEY_DIR_ASK                "prompt-for-download-directory"
+#define PREF_KEY_OPTIONS_PROMPT         "show-options-window"
 #define PREF_KEY_DIR_DEFAULT            "default-download-directory"
-#define PREF_KEY_ADDSTD                 "add-behavior-standard"
-#define PREF_KEY_ADDIPC                 "add-behavior-ipc"
+#define PREF_KEY_START                  "start-added-torrents"
+#define PREF_KEY_DELETE_ORIGINAL        "delete-original-torrent-files"
 #define PREF_KEY_PORT                   "listening-port"
 #define PREF_KEY_NAT                    "nat-traversal-enabled"
@@ -49 +49 @@
 void tr_prefs_init_global( void );
 
-int  tr_prefs_get_action( const char * key );
-void tr_prefs_set_action( const char * key, int action );
-
 #endif

trunk/gtk/tr_torrent.c

@@ -39 +39 @@
 {
    tr_torrent * handle;
-   char * delfile;
    gboolean seeding_cap_enabled;
    gdouble seeding_cap; /* ratio to stop seeding at */
@@ -55 +54 @@
                                                   struct TrTorrentPrivate );
     p->handle = NULL;
-    p->delfile = NULL;
     p->seeding_cap = 2.0;
 
@@ -72 +70 @@
 tr_torrent_dispose( GObject * o )
 {
-    GObjectClass * parent = g_type_class_peek(g_type_parent(TR_TORRENT_TYPE));
+    GObjectClass * parent;
     TrTorrent * self = TR_TORRENT( o );
 
@@ -79 +77 @@
         if( self->priv->handle )
             tr_torrentClose( self->priv->handle );
-        g_free( self->priv->delfile );
         self->priv = NULL;
     }
 
-    /* chain up to the parent class */
+    parent = g_type_class_peek(g_type_parent(TR_TORRENT_TYPE));
     parent->dispose( o );
 }
 
 static void
-tr_torrent_class_init(gpointer g_class, gpointer g_class_data UNUSED )
+tr_torrent_class_init( gpointer g_class, gpointer g_class_data UNUSED )
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS(g_class);
     gobject_class->dispose = tr_torrent_dispose;
-    g_type_class_add_private( g_class, sizeof(struct TrTorrentPrivate) );
+    g_type_class_add_private( g_class, sizeof( struct TrTorrentPrivate ) );
 }
 
 GType
-tr_torrent_get_type(void)
+tr_torrent_get_type( void )
 {
   static GType type = 0;
 
-  if(0 == type) {
+  if( !type )
+  {
     static const GTypeInfo info = {
       sizeof (TrTorrentClass),
@@ -171 +169 @@
 
 TrTorrent *
-tr_torrent_new( tr_handle               * handle,
-                const char              * metainfo_filename,
-                const char              * destination,
-                enum tr_torrent_action    act,
-                gboolean                  paused,
-                char                   ** err )
-{
-  TrTorrent * ret;
-  tr_torrent * tor;
-  tr_ctor * ctor;
-  int errcode = -1;
-
-  g_assert( destination );
-
-  *err = NULL;
-
-  ctor = tr_ctorNew( handle );
-  tr_ctorSetMetainfoFromFile( ctor, metainfo_filename );
-  tr_ctorSetDestination( ctor, TR_FORCE, destination );
-  tr_ctorSetPaused( ctor, TR_FORCE, paused );
-  tr_ctorSetMaxConnectedPeers( ctor, TR_FORCE, pref_int_get( PREF_KEY_MAX_PEERS_PER_TORRENT ) );
-  tor = tr_torrentNew( handle, ctor, &errcode );
-  tr_ctorFree( ctor );
+tr_torrent_new_ctor( tr_handle  * handle,
+                     tr_ctor    * ctor,
+                     char      ** err )
+{
+    tr_torrent * tor;
+    int errcode;
+
+    errcode = -1;
+    *err = NULL;
+
+    tor = tr_torrentNew( handle, ctor, &errcode );
   
-  if( tor == NULL ) {
-    switch( errcode ) {
-      case TR_EINVALID:
-        *err = g_strdup_printf(_("%s: not a valid torrent file"), metainfo_filename );
-        break;
-      case TR_EDUPLICATE:
-        *err = g_strdup_printf(_("%s: torrent is already open"), metainfo_filename );
-        break;
-      default:
-        *err = g_strdup( metainfo_filename );
-        break;
+    if( !tor )
+    {
+        const char * filename = tr_ctorGetSourceFile( ctor );
+        if( !filename )
+            filename = "(null)";
+
+        switch( errcode )
+        {
+            case TR_EINVALID:
+                *err = g_strdup_printf( _("%s: not a valid torrent file"), filename );
+                 break;
+            case TR_EDUPLICATE:
+                *err = g_strdup_printf( _("%s: torrent is already open"), filename );
+                break;
+            default:
+                *err = g_strdup( filename );
+                break;
+        }
+
+        return NULL;
     }
-    return NULL;
-  }
-
-  ret = maketorrent( tor );
-  if( TR_TOR_MOVE == act )
-    ret->priv->delfile = g_strdup( metainfo_filename );
-  return ret;
-}
-
-TrTorrent *
-tr_torrent_new_with_data( tr_handle    * handle,
-                          uint8_t      * metainfo,
-                          size_t         size,
-                          const char   * destination,
-                          gboolean       paused,
-                          char        ** err )
-{
-  tr_torrent * tor;
-  tr_ctor * ctor;
-  int errcode = -1;  
-
-  g_assert( destination );
-
-  *err = NULL;
-
-  ctor = tr_ctorNew( handle );
-  tr_ctorSetMetainfo( ctor, metainfo, size );
-  tr_ctorSetDestination( ctor, TR_FORCE, destination );
-  tr_ctorSetPaused( ctor, TR_FORCE, paused );
-  tr_ctorSetMaxConnectedPeers( ctor, TR_FORCE, pref_int_get( PREF_KEY_MAX_PEERS_PER_TORRENT ) );
-  tor = tr_torrentNew( handle, ctor, &errcode );
-  
-  if( tor == NULL ) {
-    switch( errcode ) {
-      case TR_EINVALID:
-        *err = g_strdup( _("not a valid torrent file") );
-        break;
-      case TR_EDUPLICATE:
-        *err = g_strdup( _("torrent is already open") );
-        break;
-      default:
-        *err = g_strdup( "" );
-        break;
-    }
-    return NULL;
-  }
-
-  return maketorrent( tor );
+
+    return maketorrent( tor );
 }
 

trunk/gtk/tr_torrent.h

@@ -88 +88 @@
 
 TrTorrent *
-tr_torrent_new( tr_handle * handle, const char * path, const char * dir,
-                enum tr_torrent_action act, gboolean paused, char ** err);
-
-TrTorrent *
-tr_torrent_new_with_data( tr_handle * handle, uint8_t * data, size_t size,
-                          const char * dir, gboolean paused, char ** err );
+tr_torrent_new_ctor( tr_handle * handle, tr_ctor * ctor, char ** err );
 
 #endif

trunk/gtk/util.c

@@ -223 +223 @@
 }
 
-enum tr_torrent_action
-toraddaction( const char * action )
-{
-    if( !action || !strcmp( "copy", action ) )
-        return TR_TOR_COPY;
-
-    if( !strcmp( "move", action ) )
-        return TR_TOR_MOVE;
-
-    return TR_TOR_LEAVE;
-}
-
-const char *
-toractionname( enum tr_torrent_action action )
-{
-    switch( action )
-    {
-        case TR_TOR_COPY:
-            return "copy";
-
-        case TR_TOR_MOVE:
-            return "move";
-
-        default:
-            return "leave";
-    }
-}
-
 char *
 getdownloaddir( void )

trunk/gtk/util.h

@@ -34 +34 @@
 /* NULL-safe version of strcmp */
 int tr_strcmp( const char*, const char * );
-
-/* XXX this shouldn't be here */
-enum tr_torrent_action { TR_TOR_LEAVE, TR_TOR_COPY, TR_TOR_MOVE };
 
 /* return number of items in array */
@@ -82 +79 @@
 GList *
 checkfilenames( int argc, char ** argv );
-
-/* returns the flag for an action string */
-enum tr_torrent_action
-toraddaction( const char * action );
-
-/* returns the action string for a flag */
-const char *
-toractionname( enum tr_torrent_action action );
 
 /* retrieve the global download directory */

trunk/po/POTFILES.in

@@ -4 +4 @@
 gtk/conf.c
 gtk/dialogs.c
+gtk/file-list.c
 gtk/hig.c
 gtk/io.c
@@ -10 +11 @@
 gtk/makemeta-ui.c
 gtk/msgwin.c
+gtk/open.c
 gtk/stats.c
 gtk/torrent-cell-renderer.c