Ticket #1788: gtk-ratiolimit.patch

gtk/conf.c

@@ -200 +200 @@
         pref_int_set( key, value );
 }
 
+double
+pref_double_get( const char * key )
+{
+    double d = 0.0;
+
+    tr_bencDictFindDouble( getPrefs( ), key, &d );
+    return d;
+}
+
+void
+pref_double_set( const char * key,
+                 double       value )
+{
+    tr_bencDictAddDouble( getPrefs( ), key, value );
+}
+
+void
+pref_double_set_default( const char * key,
+                         double       value )
+{
+    if ( !tr_bencDictFind( getPrefs( ), key ) )
+         pref_double_set( key, value );
+}
+
 /***
 ****
 ***/

gtk/conf.h

@@ -32 +32 @@
 void             pref_int_set           ( const char * key, int64_t value );
 void             pref_int_set_default   ( const char * key, int64_t value );
 
+double           pref_double_get        ( const char * key );
+void             pref_double_set        ( const char * key, double value );
+void             pref_double_set_default( const char * key, double value );
+
 gboolean         pref_flag_get          ( const char * key );
 void             pref_flag_set          ( const char * key, gboolean value );
 void             pref_flag_set_default  ( const char * key, gboolean value );

gtk/details.c

@@ -1171 +1171 @@
 }
 
 static void
+ratio_toggled_cb( GtkToggleButton *tb,
+                  gpointer         gtor )
+{
+    tr_torrent * tor = tr_torrent_handle( gtor );
+    
+    tr_torrentSetRatioLimited( tor, gtk_toggle_button_get_active( tb ) );
+}
+
+static void
 sensitize_from_check_cb( GtkToggleButton *toggle,
                          gpointer         w )
 {
@@ -1190 +1199 @@
 }
 
 static void
+setRatioLimit( GtkSpinButton* spin,
+               gpointer       gtor )
+{
+    tr_torrent * tor = tr_torrent_handle ( gtor );
+    float        ratio = gtk_spin_button_get_value ( spin );
+
+    tr_torrentSetRatioLimit( tor, ratio );
+}
+
+static void
 ul_speed_spun_cb( GtkSpinButton *spin,
                   gpointer       gtor )
 {
@@ -1204 +1223 @@
 }
 
 static void
+ratio_spun_cb( GtkSpinButton *spin,
+               gpointer       gtor )
+{
+    setRatioLimit( spin, gtor );
+}
+
+static void
 max_peers_spun_cb( GtkSpinButton * spin,
                    gpointer        gtor )
 {
@@ -1217 +1243 @@
 {
     uint16_t     maxConnectedPeers;
     int          i, row;
+    double       d;
     gboolean     b;
     GtkWidget *  t, *w, *tb;
     tr_torrent * tor = tr_torrent_handle ( gtor );
@@ -1263 +1290 @@
     sensitize_from_check_cb ( GTK_TOGGLE_BUTTON( tb ), w );
     hig_workarea_add_row_w ( t, &row, tb, w, NULL );
 
+    tb =
+        gtk_check_button_new_with_mnemonic( _(
+                                               "Limit seeding _ratio:" ) );
+    
+    b = tr_torrentIsRatioLimited( tor );
+    gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON( tb ), b );
+    g_signal_connect ( tb, "toggled", G_CALLBACK(
+                           ratio_toggled_cb ), gtor );
+
+    d = tr_torrentGetRatioLimit( tor );
+    w = gtk_spin_button_new_with_range( 0.5, INT_MAX, .05 );
+    gtk_spin_button_set_digits( GTK_SPIN_BUTTON( w ), 2); 
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), d );
+
+    g_signal_connect ( w, "value-changed", G_CALLBACK(
+                          ratio_spun_cb ), gtor );
+    g_signal_connect ( tb, "toggled", G_CALLBACK(
+                          sensitize_from_check_cb ), w );
+    sensitize_from_check_cb ( GTK_TOGGLE_BUTTON( tb ), w );
+    hig_workarea_add_row_w ( t, &row, tb, w, NULL );
+
     hig_workarea_add_section_divider ( t, &row );
     hig_workarea_add_section_title ( t, &row, _( "Peer Connections" ) );
 

gtk/main.c

@@ -1082 +1082 @@
         const int limit = pref_int_get( key );
         tr_sessionSetSpeedLimit( tr, TR_UP, limit );
     }
+    else if( !strcmp( key, TR_PREFS_KEY_RATIO_ENABLED ) )
+    {
+        const gboolean b = pref_flag_get( key );
+        tr_sessionSetRatioLimited( tr, b );
+    }
+    else if( !strcmp( key, TR_PREFS_KEY_RATIO ) )
+    {
+        const double limit = pref_double_get( key );
+        tr_sessionSetRatioLimit( tr, limit );
+    }
     else if( !strncmp( key, "sched-", 6 ) )
     {
         updateScheduledLimits( tr );

gtk/tr-core.c

@@ -1270 +1270 @@
     }
 }
 
+void
+tr_core_set_pref_double( TrCore *     self,
+                         const char * key,
+                         double       newval )
+{
+    const double oldval = pref_double_get( key );
+
+    if( oldval != newval )
+    {
+        pref_double_set( key, newval );
+        commitPrefsChange( self, key );
+    }
+}
+

gtk/tr-core.h

@@ -204 +204 @@
                                const char * key,
                                int          val );
 
+/* Set a double preference value, save the prefs file, and emit the
+   "prefs-changed" signal */
+void     tr_core_set_pref_double( TrCore *     self,
+                                  const char * key,
+                                  double       val );
 
 /**
 ***

gtk/tr-prefs.c

@@ -145 +145 @@
 {
     gpointer    core;
     GTimer *    last_change;
+    gboolean    isDouble;
 };
 
 static void
@@ -168 +169 @@
     {
         /* update the core */
         const char * key = g_object_get_data( o, PREF_KEY );
-        const int    value = gtk_spin_button_get_value_as_int(
-             GTK_SPIN_BUTTON( spin ) );
-        tr_core_set_pref_int( TR_CORE( data->core ), key, value );
+        if (data->isDouble)
+        {
+            const double value = gtk_spin_button_get_value( GTK_SPIN_BUTTON( spin ) );
+            tr_core_set_pref_double( TR_CORE( data->core ), key, value );
+        }
+        else
+        {
+            const int    value = gtk_spin_button_get_value_as_int(
+                                 GTK_SPIN_BUTTON( spin ) );
+            tr_core_set_pref_int( TR_CORE( data->core ), key, value );
+        }
 
         /* cleanup */
         g_object_set_data( o, IDLE_DATA, NULL );
@@ -183 +192 @@
 
 static void
 spun_cb( GtkSpinButton * w,
-         gpointer        core )
+         gpointer        core,
+         gboolean        isDouble )
 {
     /* user may be spinning through many values, so let's hold off
        for a moment to keep from flooding the core with changes */
@@ -195 +205 @@
         data = g_new( struct spin_idle_data, 1 );
         data->core = core;
         data->last_change = g_timer_new( );
+        data->isDouble = isDouble;
         g_object_set_data_full( o, IDLE_DATA, data, spin_idle_data_free );
         g_object_ref( G_OBJECT( o ) );
         g_timeout_add( 100, spun_cb_idle, w );
@@ -202 +213 @@
     g_timer_start( data->last_change );
 }
 
+static void
+spun_cb_int( GtkSpinButton * w,
+             gpointer        core )
+{
+    spun_cb( w, core, FALSE );
+}
+
+static void
+spun_cb_double( GtkSpinButton * w,
+                gpointer        core )
+{
+    spun_cb( w, core, TRUE );
+}
+
 static GtkWidget*
 new_spin_button( const char * key,
                  gpointer     core,
@@ -215 +240 @@
                                 key ), g_free );
     gtk_spin_button_set_digits( GTK_SPIN_BUTTON( w ), 0 );
     gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), pref_int_get( key ) );
-    g_signal_connect( w, "value-changed", G_CALLBACK( spun_cb ), core );
+    g_signal_connect( w, "value-changed", G_CALLBACK( spun_cb_int ), core );
+    return w;
+}
+
+static GtkWidget*
+new_spin_button_double( const char * key,
+                       gpointer      core,
+                       double        low,
+                       double        high,
+                       double        step )
+{
+    GtkWidget * w = gtk_spin_button_new_with_range( low, high, step );
+
+    g_object_set_data_full( G_OBJECT( w ), PREF_KEY, g_strdup(
+                                key ), g_free );
+    gtk_spin_button_set_digits( GTK_SPIN_BUTTON( w ), 2 );
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON( w ), pref_double_get( key ) );
+    g_signal_connect( w, "value-changed", G_CALLBACK( spun_cb_double ), core );
     return w;
 }
 
@@ -1120 +1162 @@
     g_signal_connect( w, "toggled", G_CALLBACK( target_cb ), w2 );
     hig_workarea_add_row_w( t, &row, w, w2, NULL );
 
+    s = _( "Default seeding _ratio limit:" );
+    w = new_check_button( s, TR_PREFS_KEY_RATIO_ENABLED, core );
+    w2 = new_spin_button_double( TR_PREFS_KEY_RATIO, core, .5, INT_MAX, .05 );
+    gtk_widget_set_sensitive( GTK_WIDGET( w2 ), pref_flag_get( TR_PREFS_KEY_RATIO_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, _( "Scheduled Limits" ) );