Changeset 8671

Timestamp:

Jun 11, 2009, 4:17:48 PM (13 years ago)

Author:

charles

Message:

(trunk gtk) #1963: Use tooltip to notify user of added torrent

Location:

trunk/gtk

Files:

• add-dialog.c (modified) (2 diffs)
• main.c (modified) (3 diffs)
• notify.c (modified) (2 diffs)
• notify.h (modified) (1 diff)
• tr-core.c (modified) (12 diffs)
• tr-core.h (modified) (2 diffs)
• tr-prefs.c (modified) (1 diff)

trunk/gtk/add-dialog.c

@@ -124 +124 @@
                 tr_torrentStart( tr_torrent_handle( data->gtor ) );
 
-            tr_core_add_torrent( data->core, data->gtor );
+            tr_core_add_torrent( data->core, data->gtor, FALSE );
 
             if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( data->trash_check ) ) )
@@ -427 +427 @@
         GSList * l = gtk_file_chooser_get_filenames( chooser );
 
-        tr_core_add_list( core, l, start, prompt );
+        tr_core_add_list( core, l, start, prompt, FALSE );
     }
 

trunk/gtk/main.c

@@ -301 +301 @@
     {
         case TR_RPC_TORRENT_ADDED:
-            tr_core_add_torrent( cbdata->core,
-                                 tr_torrent_new_preexisting( tor ) );
+            tr_core_add_torrent( cbdata->core, tr_torrent_new_preexisting( tor ), TRUE );
             break;
 
@@ -518 +517 @@
     /* add torrents from command-line and saved state */
     tr_core_load( cbdata->core, forcepause );
-    tr_core_add_list( cbdata->core, torrentFiles, start, prompt );
+    tr_core_add_list( cbdata->core, torrentFiles, start, prompt, TRUE );
     torrentFiles = NULL;
     tr_core_torrents_added( cbdata->core );
@@ -794 +793 @@
         {
             paths = g_slist_reverse( paths );
-            tr_core_add_list_defaults( data->core, paths );
+            tr_core_add_list_defaults( data->core, paths, TRUE );
             tr_core_torrents_added( data->core );
         }

trunk/gtk/notify.c

@@ -23 +23 @@
 #ifndef HAVE_LIBNOTIFY
 
-void
-tr_notify_init( void ) { }
-void
-tr_notify_send( TrTorrent * tor UNUSED ) { }
+void tr_notify_init( void ) { }
+void tr_notify_send( TrTorrent * tor UNUSED ) { }
+void tr_notify_added( const char * name UNUSED ) { }
 
 #else
@@ -114 +113 @@
 }
 
+void
+tr_notify_added( const char * name )
+{
+    if( pref_flag_get( PREF_KEY_SHOW_DESKTOP_NOTIFICATION ) )
+    {
+        NotifyNotification * n = notify_notification_new(
+            _( "Torrent Added" ), name, "transmission", NULL );
+        notify_notification_set_timeout( n, NOTIFY_EXPIRES_DEFAULT );
+        notify_notification_show( n, NULL );
+    }
+}
+
 #endif

trunk/gtk/notify.h

@@ -20 +20 @@
 void tr_notify_send( TrTorrent * tor );
 
+void tr_notify_added( const char * name );
+
 #endif

trunk/gtk/tr-core.c

@@ -41 +41 @@
 
 #include "conf.h"
+#include "notify.h"
 #include "tr-core.h"
 #ifdef HAVE_DBUS_GLIB
@@ -470 +471 @@
 
     core->priv->adding_from_watch_dir = TRUE;
-    tr_core_add_list_defaults( core, core->priv->monitor_files );
+    tr_core_add_list_defaults( core, core->priv->monitor_files, TRUE );
     core->priv->adding_from_watch_dir = FALSE;
 
@@ -785 +786 @@
 
 void
-tr_core_add_torrent( TrCore *    self,
-                     TrTorrent * gtor )
+tr_core_add_torrent( TrCore     * self,
+                     TrTorrent  * gtor,
+                     gboolean     doNotify )
 {
     const tr_info * inf = tr_torrent_info( gtor );
@@ -803 +805 @@
                                        -1 );
 
+    if( doNotify )
+        tr_notify_added( inf->name );
+
     /* cleanup */
     g_object_unref( G_OBJECT( gtor ) );
@@ -825 +830 @@
     torrents = tr_sessionLoadTorrents ( tr_core_session( self ), ctor, &count );
     for( i = 0; i < count; ++i )
-        tr_core_add_torrent( self, tr_torrent_new_preexisting( torrents[i] ) );
+        tr_core_add_torrent( self, tr_torrent_new_preexisting( torrents[i] ), FALSE );
 
     tr_free( torrents );
@@ -854 +859 @@
 
 static int
-add_ctor( TrCore * core, tr_ctor * ctor, gboolean doPrompt )
+add_ctor( TrCore * core, tr_ctor * ctor, gboolean doPrompt, gboolean doNotify )
 {
     tr_info inf;
@@ -880 +885 @@
                 tr_session * session = tr_core_session( core );
                 TrTorrent * gtor = tr_torrent_new_ctor( session, ctor, &err );
-                g_message( "creating a gtorrent" );
                 if( !err )
-                    tr_core_add_torrent( core, gtor );
+                    tr_core_add_torrent( core, gtor, doNotify );
             }
             tr_metainfoFree( &inf );
@@ -919 +923 @@
 
         if( !err )
-            err = add_ctor( core, ctor, do_prompt );
+            err = add_ctor( core, ctor, do_prompt, TRUE );
 
         tr_free( file_contents );
@@ -933 +937 @@
               const char  * filename,
               gboolean      doStart,
-              gboolean      doPrompt )
+              gboolean      doPrompt,
+              gboolean      doNotify )
 {
     tr_session * session = tr_core_session( core );
@@ -944 +949 @@
         tr_ctorSetMetainfoFromFile( ctor, filename );
 
-        err = add_ctor( core, ctor, doPrompt );
+        err = add_ctor( core, ctor, doPrompt, doNotify );
         if( err == TR_EINVALID )
             tr_core_errsig( core, TR_EINVALID, filename );
@@ -961 +966 @@
 
 void
-tr_core_add_list( TrCore *    core,
-                  GSList *    torrentFiles,
-                  pref_flag_t start,
-                  pref_flag_t prompt )
+tr_core_add_list( TrCore       * core,
+                  GSList       * torrentFiles,
+                  pref_flag_t    start,
+                  pref_flag_t    prompt,
+                  gboolean       doNotify )
 {
     const gboolean doStart = pref_flag_eval( start, PREF_KEY_START );
@@ -971 +977 @@
 
     for( l = torrentFiles; l != NULL; l = l->next )
-        add_filename( core, l->data, doStart, doPrompt );
+        add_filename( core, l->data, doStart, doPrompt, doNotify );
 
     tr_core_torrents_added( core );

trunk/gtk/tr-core.h

@@ -135 +135 @@
                            GSList *    torrentFiles,
                            pref_flag_t start,
-                           pref_flag_t prompt );
-
-#define tr_core_add_list_defaults( c, l ) \
-    tr_core_add_list( c, l, PREF_FLAG_DEFAULT, PREF_FLAG_DEFAULT )
+                           pref_flag_t prompt,
+                           gboolean    doNotify );
+
+#define tr_core_add_list_defaults( c, l, doNotify ) \
+    tr_core_add_list( c, l, PREF_FLAG_DEFAULT, PREF_FLAG_DEFAULT, doNotify )
 
 
@@ -148 +149 @@
 
 /** Add a torrent. */
-void tr_core_add_torrent( TrCore*, TrTorrent* );
+void tr_core_add_torrent( TrCore*, TrTorrent*, gboolean doNotify );
 
 /** Present the main window */

trunk/gtk/tr-prefs.c

@@ -539 +539 @@
     hig_workarea_add_row( t, &row, s, w, NULL );
 
-    s = _( "Use peer e_xchange (PEX)" );
+    s = _( "Use PE_X to find more peers" );
     w = new_check_button( s, TR_PREFS_KEY_PEX_ENABLED, core );
+    s = _( "PEX is a tool for exchanging peer lists with the peers you're connected to." );
+    gtr_widget_set_tooltip_text( w, s );
     hig_workarea_add_wide_control( t, &row, w );
 
-    s = _( "Use _distributed hash table (DHT)" );
+    s = _( "Use _DHT to find more peers" );
     w = new_check_button( s, TR_PREFS_KEY_DHT_ENABLED, core );
+    s = _( "DHT is a tool for finding peers without a tracker." );
+    gtr_widget_set_tooltip_text( w, s );
     hig_workarea_add_wide_control( t, &row, w );