Changeset 11452

Timestamp:

Dec 4, 2010, 12:19:52 AM (12 years ago)

Author:

charles

Message:

(trunk qt) #3772 "users' changes in the Preferences and Properties dialog get applied before they're done editing" -- fixed.

Location:

trunk/qt

Files:

• details.cc (modified) (9 diffs)
• details.h (modified) (2 diffs)
• prefs-dialog.cc (modified) (6 diffs)
• prefs-dialog.h (modified) (1 diff)

trunk/qt/details.cc

@@ -72 +72 @@
     const int REFRESH_INTERVAL_MSEC = 4000;
 
+    const char * PREF_KEY( "pref-key" );
+
     enum // peer columns
     {
@@ -897 +899 @@
 }
 void
-Details :: onDownloadLimitChanged( int val )
-{
-    mySession.torrentSet( myIds, "downloadLimit", val );
+Details :: onSpinBoxEditingFinished( )
+{
+    const QObject * spin = sender();
+    const QString key = spin->property( PREF_KEY ).toString( );
+    const QDoubleSpinBox * d = qobject_cast<const QDoubleSpinBox*>( spin );
+    if( d )
+        mySession.torrentSet( myIds, key, d->value( ) );
+    else
+        mySession.torrentSet( myIds, key, qobject_cast<const QSpinBox*>(spin)->value( ) );
     getNewData( );
 }
+
 void
 Details :: onUploadLimitedToggled( bool val )
 {
     mySession.torrentSet( myIds, "uploadLimited", val );
-    getNewData( );
-}
-void
-Details :: onUploadLimitChanged( int val )
-{
-    mySession.torrentSet( myIds, "uploadLimit", val );
     getNewData( );
 }
@@ -924 +927 @@
 
 void
-Details :: onIdleLimitChanged( int val )
-{
-    mySession.torrentSet( myIds, "seedIdleLimit", val );
-    getNewData( );
-}
-
-void
 Details :: onRatioModeChanged( int index )
 {
     const int val = myRatioCombo->itemData( index ).toInt( );
     mySession.torrentSet( myIds, "seedRatioMode", val );
-}
-
-void
-Details :: onRatioLimitChanged( double val )
-{
-    mySession.torrentSet( myIds, "seedRatioLimit", val );
-    getNewData( );
-}
-
-void
-Details :: onMaxPeersChanged( int val )
-{
-    mySession.torrentSet( myIds, "peer-limit", val );
-    getNewData( );
 }
 
@@ -1090 +1072 @@
     mySingleDownCheck = c;
     s = new QSpinBox( );
+    s->setProperty( PREF_KEY, QString( "downloadLimit" ) );
     s->setSingleStep( 5 );
     s->setRange( 0, INT_MAX );
@@ -1096 +1079 @@
     enableWhenChecked( c, s );
     connect( c, SIGNAL(clicked(bool)), this, SLOT(onDownloadLimitedToggled(bool)) );
-    connect( s, SIGNAL(valueChanged(int)), this, SLOT(onDownloadLimitChanged(int)));
+    connect( s, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
 
     c = new QCheckBox( tr( "Limit &upload speed (%1):" ).arg( speed_K_str ) );
@@ -1103 +1086 @@
     s->setSingleStep( 5 );
     s->setRange( 0, INT_MAX );
+    s->setProperty( PREF_KEY, QString( "uploadLimit" ) );
     mySingleUpSpin = s;
     hig->addRow( c, s );
     enableWhenChecked( c, s );
     connect( c, SIGNAL(clicked(bool)), this, SLOT(onUploadLimitedToggled(bool)) );
-    connect( s, SIGNAL(valueChanged(int)), this, SLOT(onUploadLimitChanged(int)));
+    connect( s, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
 
     m = new QComboBox;
@@ -1130 +1114 @@
     ds = new QDoubleSpinBox( );
     ds->setRange( 0.5, INT_MAX );
-    connect( ds, SIGNAL(valueChanged(double)), this, SLOT(onRatioLimitChanged(double)));
+    ds->setProperty( PREF_KEY, QString( "seedRatioLimit" ) );
+    connect( ds, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
     h->addWidget( myRatioSpin = ds );
     hig->addRow( tr( "&Ratio:" ), h, m );
@@ -1145 +1130 @@
     s->setSingleStep( 5 );
     s->setRange( 1, 9999 );
-    connect( s, SIGNAL(valueChanged(int)), this, SLOT(onIdleLimitChanged(int)));
+    s->setProperty( PREF_KEY, QString( "seedIdleLimit" ) );
+    connect( s, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
     h->addWidget( myIdleSpin = s );
     hig->addRow( tr( "&Idle:" ), h, m );
@@ -1156 +1142 @@
     s->setSingleStep( 5 );
     s->setRange( 1, 300 );
-    connect( s, SIGNAL(valueChanged(int)), this, SLOT(onMaxPeersChanged(int)));
+    s->setProperty( PREF_KEY, QString( "peer-limit" ) );
+    connect( s, SIGNAL(editingFinished()), this, SLOT(onSpinBoxEditingFinished()));
     myPeerLimitSpin = s;
     hig->addRow( tr( "&Maximum peers:" ), s );

trunk/qt/details.h

@@ -143 +143 @@
         void onHonorsSessionLimitsToggled( bool );
         void onDownloadLimitedToggled( bool );
-        void onDownloadLimitChanged( int );
+        void onSpinBoxEditingFinished( );
         void onUploadLimitedToggled( bool );
-        void onUploadLimitChanged( int );
         void onRatioModeChanged( int );
-        void onRatioLimitChanged( double );
         void onIdleModeChanged( int );
-        void onIdleLimitChanged( int );
         void onShowTrackerScrapesToggled( bool );
         void onShowBackupTrackersToggled( bool );
@@ -156 +153 @@
         void onEditTrackerClicked( );
         void onRemoveTrackerClicked( );
-        void onMaxPeersChanged( int );
         void refresh( );
 };

trunk/qt/prefs-dialog.cc

@@ -79 +79 @@
 
 void
-PrefsDialog :: spinBoxChangedIdle( )
-{
-    const QObject * spin( sender()->property( "SPIN" ).value<QObject*>( ) );
+PrefsDialog :: spinBoxEditingFinished()
+{
+    const QObject * spin = sender();
     const int key = spin->property( PREF_KEY ).toInt( );
-
     const QDoubleSpinBox * d = qobject_cast<const QDoubleSpinBox*>( spin );
-    if( d != 0 )
+    if( d )
         setPref( key, d->value( ) );
     else
         setPref( key, qobject_cast<const QSpinBox*>(spin)->value( ) );
-}
-
-void
-PrefsDialog :: spinBoxChanged( int value )
-{
-    Q_UNUSED( value );
-
-    static const QString timerName( "TIMER_CHILD" );
-    QObject * o( sender( ) );
-
-    // user may be spinning through many values, so let's hold off
-    // for a moment to kekep from flooding a bunch of prefs changes
-    QTimer * timer( o->findChild<QTimer*>( timerName ) );
-    if( timer == 0 )
-    {
-        timer = new QTimer( o );
-        timer->setObjectName( timerName );
-        timer->setSingleShot( true );
-        timer->setProperty( "SPIN", qVariantFromValue( o ) );
-        connect( timer, SIGNAL(timeout()), this, SLOT(spinBoxChangedIdle()));
-    }
-    timer->start( 200 );
 }
 
@@ -121 +98 @@
     spin->setValue( myPrefs.getInt( key ) );
     spin->setProperty( PREF_KEY, key );
-    connect( spin, SIGNAL(valueChanged(int)), this, SLOT(spinBoxChanged(int)));
+    connect( spin, SIGNAL(editingFinished()), this, SLOT(spinBoxEditingFinished()));
     myWidgets.insert( key, spin );
     return spin;
-}
-
-void
-PrefsDialog :: doubleSpinBoxChanged( double value )
-{
-    Q_UNUSED( value );
-
-    spinBoxChanged( 0 );
 }
 
@@ -143 +112 @@
     spin->setValue( myPrefs.getDouble( key ) );
     spin->setProperty( PREF_KEY, key );
-    connect( spin, SIGNAL(valueChanged(double)), this, SLOT(doubleSpinBoxChanged(double)));
+    connect( spin, SIGNAL(editingFinished()), this, SLOT(spinBoxEditingFinished()));
     myWidgets.insert( key, spin );
     return spin;
@@ -149 +118 @@
 
 void
-PrefsDialog :: timeChanged( const QTime& time )
-{
-    const int key( sender()->property( PREF_KEY ).toInt( ) );
-    const int seconds( QTime().secsTo( time ) );
-    setPref( key, seconds / 60 );
-}
-
+PrefsDialog :: timeEditingFinished( )
+{
+    QTimeEdit * e = qobject_cast<QTimeEdit*>(sender());
+    if( e )
+    {
+        const int key( e->property( PREF_KEY ).toInt( ) );
+        const QTime time( e->time( ) );
+        const int seconds( QTime().secsTo( time ) );
+std::cerr << "setPref to " << (seconds/60) << " minutes" << std::endl;
+        setPref( key, seconds / 60 );
+    }
+}
 QTimeEdit*
 PrefsDialog :: timeEditNew( int key )
@@ -165 +139 @@
     e->setTime( QTime().addSecs( minutes * 60 ) );
     myWidgets.insert( key, e );
-    connect( e, SIGNAL(timeChanged(const QTime&)), this, SLOT(timeChanged(const QTime&)) );
+    connect( e, SIGNAL(editingFinished()), this, SLOT(timeEditingFinished()) );
     return e;
 }
 
 void
-PrefsDialog :: textChanged( const QString& text )
-{
-    const int key( sender()->property( PREF_KEY ).toInt( ) );
-    setPref( key, text );
-}
-
+PrefsDialog :: lineEditingFinished( )
+{
+    QLineEdit * e = qobject_cast<QLineEdit*>(sender());
+    if( e && e->isModified( ) )
+    {
+        const int key( e->property( PREF_KEY ).toInt( ) );
+        const QString text( e->text() );
+        setPref( key, text );
+    }
+}
 QLineEdit*
 PrefsDialog :: lineEditNew( int key, int echoMode )
@@ -183 +161 @@
     e->setEchoMode( QLineEdit::EchoMode( echoMode ) );
     myWidgets.insert( key, e );
-    connect( e, SIGNAL(textChanged(const QString&)), this, SLOT(textChanged(const QString&)) );
+    connect( e, SIGNAL(editingFinished()), this, SLOT(lineEditingFinished()) );
     return e;
 }

trunk/qt/prefs-dialog.h

@@ -42 +42 @@
     private slots:
         void checkBoxToggled( bool checked );
-        void spinBoxChanged( int value );
-        void doubleSpinBoxChanged( double value );
-        void spinBoxChangedIdle( );
-        void timeChanged( const QTime& );
-        void textChanged( const QString& );
+        void spinBoxEditingFinished( );
+        void timeEditingFinished( );
+        void lineEditingFinished( );
         void refreshPref( int key );
         void encryptionEdited( int );