Changeset 13883

Timestamp:

Jan 27, 2013, 5:19:51 PM (9 years ago)

Author:

jordan

Message:

(qt) #4076 'free space indicator' -- added.

Location:

trunk/qt

Files:

• mainwin.cc (modified) (6 diffs)
• mainwin.h (modified) (2 diffs)
• session.cc (modified) (2 diffs)
• session.h (modified) (2 diffs)

trunk/qt/mainwin.cc

@@ -283 +283 @@
     connect( &mySession, SIGNAL(sourceChanged()), this, SLOT(onSessionSourceChanged()) );
     connect( &mySession, SIGNAL(statsUpdated()), this, SLOT(refreshStatusBar()) );
+    connect( &mySession, SIGNAL(sessionUpdated()), this, SLOT(refreshFreeSpace()) );
     connect( &mySession, SIGNAL(dataReadProgress()), this, SLOT(dataReadProgress()) );
     connect( &mySession, SIGNAL(dataSendProgress()), this, SLOT(dataSendProgress()) );
@@ -301 +302 @@
     refreshTrayIconSoon( );
     refreshStatusBar( );
+    refreshFreeSpace( );
     refreshTitle( );
     refreshVisibleCount( );
@@ -393 +395 @@
         h->addWidget( l );
 
+    //h->addStretch( 1 );
+    h->addSpacing ( HIG::PAD_BIG );
+
+        l = myFreeSpaceTextLabel = new QLabel (this);
+        const int minimumFreeSpaceWidth = l->fontMetrics().width( Formatter::sizeToString(1024 * 1024));
+        l->setMinimumWidth( minimumFreeSpaceWidth );
+        h->addWidget( l );
+        l = myFreeSpaceIconLabel = new QLabel (this);
+        l->setPixmap( getStockIcon( "drive-harddisk", QStyle::SP_DriveHDIcon ).pixmap( smallIconSize ) );
+        h->addWidget( l );
+
     h->addStretch( 1 );
 
+        l = myStatsLabel = new QLabel( this );
+        h->addWidget( l );
         a = new QActionGroup( this );
         a->addAction( ui.action_TotalRatio );
@@ -415 +430 @@
         p->setMenu( m );
         h->addWidget( p );
-        l = myStatsLabel = new QLabel( this );
-        h->addWidget( l );
-
-    h->addStretch( 1 );
+
+    //h->addStretch( 1 );
+    h->addSpacing ( HIG::PAD );
 
         l = myDownloadSpeedLabel = new QLabel( this );
@@ -429 +443 @@
         h->addWidget( l );
 
-    h->addStretch( 1 );
+    h->addSpacing ( HIG::PAD );
 
         l = myUploadSpeedLabel = new QLabel;
@@ -718 +732 @@
 
 void
+TrMainWindow :: refreshFreeSpace( )
+{
+  const int64_t bytes (mySession.downloadDirFreeSpace());
+
+  if (bytes >= 0)
+    {
+      const QString text = Formatter::sizeToString (bytes);
+
+      const QString tip = tr("Download directory \"%1\" has %2 space free")
+        .arg(myPrefs.getString(Prefs::DOWNLOAD_DIR))
+        .arg(text);
+
+      myFreeSpaceTextLabel->setText (text);
+      myFreeSpaceTextLabel->setToolTip (tip);
+      myFreeSpaceIconLabel->setToolTip (tip);
+    }
+
+  myFreeSpaceTextLabel->setVisible (bytes >= 0);
+  myFreeSpaceIconLabel->setVisible (bytes >= 0);
+}
+
+void
 TrMainWindow :: refreshTrayIconSoon( )
 {

trunk/qt/mainwin.h

@@ -106 +106 @@
         void showSessionTransfer( );
         void refreshVisibleCount( );
+        void refreshFreeSpace( );
         void refreshTitle( );
         void refreshStatusBar( );
@@ -160 +161 @@
         QLabel * myDownloadSpeedLabel;
         QLabel * myUploadSpeedLabel;
+        QLabel * myFreeSpaceTextLabel;
+        QLabel * myFreeSpaceIconLabel;
         QLabel * myNetworkLabel;
 

trunk/qt/session.cc

@@ -248 +248 @@
     mySession( 0 ),
     myConfigDir( QString::fromUtf8( configDir ) ),
-    myNAM( 0 )
+    myNAM( 0 ),
+    myDownloadDirFreeSpace( -1 )
 {
     myStats.ratio = TR_RATIO_NA;
@@ -993 +994 @@
         mySessionVersion = str;
 
+    if( tr_variantDictFindInt( d, TR_KEY_download_dir_free_space, &i ) && ( myDownloadDirFreeSpace != i ) )
+        myDownloadDirFreeSpace = i;
+
     //std::cerr << "Session :: updateInfo end" << std::endl;
     connect( &myPrefs, SIGNAL(changed(int)), this, SLOT(updatePref(int)) );

trunk/qt/session.h

@@ -58 +58 @@
         const struct tr_session_stats& getCumulativeStats( ) const { return myCumulativeStats; }
         const QString& sessionVersion( ) const { return mySessionVersion; }
+        int64_t downloadDirFreeSpace( ) const { return myDownloadDirFreeSpace; }
 
     public:
@@ -160 +161 @@
         struct tr_session_stats myCumulativeStats;
         QString mySessionVersion;
+        int64_t myDownloadDirFreeSpace;
 };