Changeset 8763

Timestamp:

Jun 30, 2009, 6:08:50 PM (13 years ago)

Author:

charles

Message:

(trunk, gtk/qt) use Monsoon's strings for encryption preferences and Deluge's system tray tooltip.

Location:

trunk

Files:

• gtk/tr-core.c (modified) (1 diff)
• gtk/tr-core.h (modified) (2 diffs)
• gtk/tr-icon.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (2 diffs)
• gtk/tr-window.c (modified) (1 diff)
• libtransmission/session.c (modified) (1 diff)
• libtransmission/session.h (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• qt/prefs-dialog.cc (modified) (3 diffs)
• qt/prefs-dialog.h (modified) (1 diff)

trunk/gtk/tr-core.c

@@ -719 +719 @@
 }
 
-static gboolean
-statsForeach( GtkTreeModel * model,
-              GtkTreePath  * path UNUSED,
-              GtkTreeIter  * iter,
-              gpointer       gstats )
-{
-    tr_torrent *        tor;
-    struct core_stats * stats = gstats;
-    int                 activity;
-
-    gtk_tree_model_get( model, iter, MC_TORRENT_RAW, &tor, -1 );
-    activity = tr_torrentGetActivity( tor );
-
-    if( activity == TR_STATUS_DOWNLOAD )
-        ++stats->downloadCount;
-    else if( activity == TR_STATUS_SEED )
-        ++stats->seedingCount;
-
-    return FALSE;
-}
-
-void
-tr_core_get_stats( const TrCore *      core,
-                   struct core_stats * setme )
-{
-    memset( setme, 0, sizeof( struct core_stats ) );
-
-    if( !isDisposed( core ) )
-    {
-        tr_session * session = core->priv->session;
-
-        setme->clientDownloadSpeed = tr_sessionGetPieceSpeed( session, TR_DOWN );
-
-        setme->clientUploadSpeed = tr_sessionGetPieceSpeed( session, TR_UP );
-
-        gtk_tree_model_foreach( core->priv->model, statsForeach, setme );
-    }
-}
-
 static char*
 doCollate( const char * in )

trunk/gtk/tr-core.h

@@ -46 +46 @@
                                                          TrCoreClass )
 
-struct core_stats
-{
-    int      downloadCount;
-    int      seedingCount;
-    float    clientDownloadSpeed;
-    float    clientUploadSpeed;
-};
-
 typedef struct TrCore
 {
@@ -110 +102 @@
 
 tr_session *   tr_core_session( TrCore * self );
-
-void           tr_core_get_stats( const TrCore *      core,
-                                  struct core_stats * setme );
 
 /******

trunk/gtk/tr-icon.c

@@ -52 +52 @@
 refresh_tooltip_cb( gpointer data )
 {
-    GtkStatusIcon *   icon = GTK_STATUS_ICON( data );
-    TrCore *          core = g_object_get_data( G_OBJECT( icon ), "tr-core" );
-    struct core_stats stats;
-    char              downStr[32], upStr[32];
-    char              tip[256];
+    double d;
+    int limit;
+    char up[64];
+    char upLimit[64];
+    char down[64];
+    char downLimit[64];
+    char tip[1024];
+    const char * idle = _( "Idle" );
+    GtkStatusIcon * icon = GTK_STATUS_ICON( data );
+    tr_session * session = tr_core_session( g_object_get_data( G_OBJECT( icon ), "tr-core" ) );
 
-    tr_core_get_stats( core, &stats );
+    /* up */
+    if(((d = tr_sessionGetRawSpeed( session, TR_UP ))) < 0.1 )
+        g_strlcpy( up, idle, sizeof( up ) );
+    else
+        tr_strlspeed( up, d, sizeof( up ) );
 
-    tr_strlspeed( downStr, stats.clientDownloadSpeed, sizeof( downStr ) );
-    tr_strlspeed( upStr, stats.clientUploadSpeed, sizeof( upStr ) );
-    g_snprintf( tip, sizeof( tip ),
-                /* %1$'d is the number of torrents we're seeding,
-                   %2$'d is the number of torrents we're downloading,
-                   %3$s is our download speed,
-                   %4$s is our upload speed */
-                _( "%1$'d Seeding, %2$'d Downloading\nDown: %3$s, Up: %4$s" ),
-                stats.seedingCount,
-                stats.downloadCount,
-                downStr, upStr );
+    /* up limit */
+    if( !tr_sessionGetActiveSpeedLimit( session, TR_UP, &limit ) )
+        *upLimit = '\0';
+    else {
+        char buf[64];
+        tr_strlspeed( buf, limit, sizeof( buf ) );
+        g_snprintf( upLimit, sizeof( upLimit ), _( "(Limit: %s)" ), buf );
+    }
+
+    /* down */
+    if(((d = tr_sessionGetRawSpeed( session, TR_DOWN ))) < 0.1 )
+        g_strlcpy( down, idle, sizeof( down ) );
+    else
+        tr_strlspeed( down, d, sizeof( down ) );
+
+    /* down limit */    
+    if( !tr_sessionGetActiveSpeedLimit( session, TR_DOWN, &limit ) )
+        *downLimit = '\0';
+    else {
+        char buf[64];
+        tr_strlspeed( buf, limit, sizeof( buf ) );
+        g_snprintf( downLimit, sizeof( downLimit ), _( "(Limit: %s)" ), buf );
+    }
+
+    /* %1$s: current upload speed
+     * %2$s: current upload limit, if any
+     * %3$s: current download speed
+     * %4$s: current download limit, if any */
+    g_snprintf( tip, sizeof( tip ), _( "Transmission\nUp: %1$s %2$s\nDown: %3$s %4$s" ), up, upLimit, down, downLimit );
+
 #if GTK_CHECK_VERSION( 2,16,0 )
     gtk_status_icon_set_tooltip_text( GTK_STATUS_ICON( icon ), tip );

trunk/gtk/tr-prefs.c

@@ -456 +456 @@
         const char * text;
     } items[] = {
-        { TR_CLEAR_PREFERRED,      N_( "Plaintext preferred" )  },
-        { TR_ENCRYPTION_PREFERRED, N_( "Encryption preferred" ) },
-        { TR_ENCRYPTION_REQUIRED,  N_( "Encryption required" )  }
+        { TR_CLEAR_PREFERRED,      N_( "Allow encryption" )  },
+        { TR_ENCRYPTION_PREFERRED, N_( "Prefer encryption" ) },
+        { TR_ENCRYPTION_REQUIRED,  N_( "Require encryption" )  }
     };
 
@@ -1399 +1399 @@
     gtk_notebook_append_page( GTK_NOTEBOOK( n ),
                               peerPage( core ),
-                              gtk_label_new ( _( "Peers" ) ) );
+                              gtk_label_new ( _( "Network" ) ) );
     gtk_notebook_append_page( GTK_NOTEBOOK( n ),
                               desktopPage( core ),

trunk/gtk/tr-window.c

@@ -285 +285 @@
 
     g_signal_handler_disconnect( p->core, p->pref_handler_id );
+    g_object_unref( G_OBJECT( p->alt_speed_image[1] ) );
+    g_object_unref( G_OBJECT( p->alt_speed_image[0] ) );
     g_free( p->filter_text );
     g_free( p );

trunk/libtransmission/session.c

@@ -1027 +1027 @@
     int isLimited = TRUE;
 
+    if( !tr_isSession( session ) )
+        return FALSE;
+
     if( tr_sessionUsesAltSpeed( session ) )
         *setme = tr_sessionGetAltSpeed( session, dir );

trunk/libtransmission/session.h

@@ -141 +141 @@
 tr_bool      tr_sessionAllowsDHT( const tr_session * session );
 
-tr_bool      tr_sessionGetActiveSpeedLimit( const tr_session  * session,
-                                            tr_direction        dir,
-                                            int               * setme );
-
 const char * tr_sessionFindTorrentFile( const tr_session * session,
                                         const char *       hashString );

trunk/libtransmission/transmission.h

@@ -630 +630 @@
 void     tr_sessionSetAltSpeedFunc    ( tr_session *, tr_altSpeedFunc *, void * );
 
+
+tr_bool      tr_sessionGetActiveSpeedLimit( const tr_session  * session,
+                                            tr_direction        dir,
+                                            int               * setme );
+
+
 /***
 ****

trunk/qt/prefs-dialog.cc

@@ -361 +361 @@
 
 QWidget *
-PrefsDialog :: createPeersTab( )
+PrefsDialog :: createNetworkTab( )
 {
     HIG * hig = new HIG( this );
@@ -464 +464 @@
 
     QComboBox * box = new QComboBox( );
-    box->addItem( tr( "Plaintext preferred" ), 0 );
-    box->addItem( tr( "Encryption preferred" ), 1 );
-    box->addItem( tr( "Encryption required" ), 2 );
+    box->addItem( tr( "Allow encryption" ), 0 );
+    box->addItem( tr( "Prefer encryption" ), 1 );
+    box->addItem( tr( "Require encryption" ), 2 );
     myWidgets.insert( Prefs :: ENCRYPTION, box );
     connect( box, SIGNAL(activated(int)), this, SLOT(encryptionEdited(int)));
@@ -579 +579 @@
     t->addTab( createSpeedTab( ),        tr( "Speed" ) );
     t->addTab( createPrivacyTab( ),      tr( "Privacy" ) );
-    t->addTab( createPeersTab( ),        tr( "Peers" ) );
+    t->addTab( createNetworkTab( ),      tr( "Network" ) );
     t->addTab( createWebTab( session ),  tr( "Web" ) );
     //t->addTab( createTrackerTab( ),    tr( "Trackers" ) );

trunk/qt/prefs-dialog.h

@@ -79 +79 @@
         bool isAllowed( int key ) const;
         QWidget * createTorrentsTab( );
-        QWidget * createPeersTab( );
+        QWidget * createNetworkTab( );
         QWidget * createPrivacyTab( );
         QWidget * createSpeedTab( );