Changeset 13992

Timestamp:

Feb 9, 2013, 4:42:07 AM (9 years ago)

Author:

jordan

Message:

(qt) #4076 'free space indicator': better user feedback when updating the freespace indicator in remote mode

Location:

trunk/qt

Files:

• freespace-label.cc (modified) (2 diffs)
• freespace-label.h (modified) (1 diff)
• options.cc (modified) (6 diffs)
• options.h (modified) (2 diffs)

trunk/qt/freespace-label.cc

@@ -29 +29 @@
   mySession (session),
   myTag (-1),
-  myPath (path),
   myTimer (this)
 {
@@ -41 +40 @@
            this,       SLOT(onSessionExecuted(int64_t, const QString&, struct tr_variant*)));
 
-  onTimer ();
+  setPath (path);
+}
+
+void
+FreespaceLabel :: setPath (const QString& path)
+{
+  if (myPath != path)
+    {
+      setText (tr("<i>Counting Free Space...</i>"));
+      myPath = path;
+      onTimer ();
+    }
 }
 

trunk/qt/freespace-label.h

@@ -28 +28 @@
     FreespaceLabel (Session&, const QString& path, QWidget *parent=0);
     virtual ~FreespaceLabel () {}
-    void setPath (const QString& folder) { myPath=folder; onTimer(); }
+    void setPath (const QString& folder);
 
   private:

trunk/qt/options.cc

@@ -10 +10 @@
  * $Id$
  */
-
-#include <cstdio>
 
 #include <QApplication>
@@ -88 +86 @@
     myVerifyButton( 0 ),
     myVerifyFile( 0 ),
-    myVerifyHash( QCryptographicHash::Sha1 )
-
+    myVerifyHash( QCryptographicHash::Sha1 ),
+    myEditTimer (this)
 {
     setWindowTitle( tr( "Open Torrent" ) );
@@ -95 +93 @@
     QGridLayout * layout = new QGridLayout( this );
     int row = 0;
+
+    myEditTimer.setInterval (2000);
+    myEditTimer.setSingleShot (true);
+    connect (&myEditTimer, SIGNAL(timeout()), this, SLOT(onDestinationEditedIdle()));
 
     const int iconSize( style( )->pixelMetric( QStyle :: PM_SmallIconSize ) );
@@ -121 +123 @@
     layout->addWidget( l, ++row, 0, Qt::AlignLeft );
     const QString downloadDir (prefs.getString (Prefs::DOWNLOAD_DIR));
+    myFreespaceLabel = new FreespaceLabel (mySession, downloadDir, this);
 
     if( session.isLocal( ) )
@@ -139 +142 @@
         layout->addWidget( e, row, 1 );
         l->setBuddy( e );
-    }
-
-    l = myFreespaceLabel = new FreespaceLabel (mySession, downloadDir, this);
+        connect (e, SIGNAL(textEdited(const QString&)), this, SLOT(onDestinationEdited(const QString&)));
+    }
+
+    l = myFreespaceLabel;
     layout->addWidget (l, ++row, 0, 1, 2, Qt::Alignment (Qt::AlignRight | Qt::AlignTop));
     layout->setRowMinimumHeight (row, l->height() + HIG::PAD);
@@ -464 +468 @@
       refreshDestinationButton ();
     }
+}
+
+void
+Options :: onDestinationEdited (const QString& text)
+{
+  Q_UNUSED (text);
+
+  myEditTimer.start ();
+}
+
+void
+Options :: onDestinationEditedIdle ()
+{
+  myFreespaceLabel->setPath (myDestinationEdit->text());
 }
 

trunk/qt/options.h

@@ -103 +103 @@
         void onFilesSelected( const QStringList& );
         void onDestinationsSelected( const QStringList& );
+        void onDestinationEdited (const QString&);
+        void onDestinationEditedIdle ();
 
     private:
@@ -120 +122 @@
         typedef QMap<uint32_t,int32_t> mybins_t;
         mybins_t myVerifyBins;
+        QTimer myEditTimer;
 
 };