[KMess-commits] SF.net SVN: kmess: [3369] trunk/kmess

[<sif...@us...>]

Revision: 3369
          http://kmess.svn.sourceforge.net/kmess/?rev=3369&view=rev
Author:   sifcenter
Date:     2008-06-29 14:33:27 -0700 (Sun, 29 Jun 2008)

Log Message:
-----------
Adjusted the layout of transfer entry. Ticket #269.

Modified Paths:
--------------
    trunk/kmess/ChangeLog
    trunk/kmess/src/dialogs/transferentry.cpp
    trunk/kmess/src/dialogs/transferentry.h
    trunk/kmess/src/dialogs/transferentry.ui

Modified: trunk/kmess/ChangeLog
===================================================================
--- trunk/kmess/ChangeLog	2008-06-29 21:26:06 UTC (rev 3368)
+++ trunk/kmess/ChangeLog	2008-06-29 21:33:27 UTC (rev 3369)
@@ -7,6 +7,7 @@
   * Fixed the sorting for groups. Maybe the user must be remove the group entries or entire
     file: .kde4/share/apps/kmess/co...@em.../contactlist . Ticket #262.
   * Fixed the saving for formatting msn+ choice.
+  * Adjusted the layout of transfer entry. Ticket #269.
 
 2008-06-28 (sifcenter)
   * Added Group switcher to contact properties dialog. Closed ticket #38.

Modified: trunk/kmess/src/dialogs/transferentry.cpp
===================================================================
--- trunk/kmess/src/dialogs/transferentry.cpp	2008-06-29 21:26:06 UTC (rev 3368)
+++ trunk/kmess/src/dialogs/transferentry.cpp	2008-06-29 21:33:27 UTC (rev 3369)
@@ -19,18 +19,12 @@
 
 #include "../kmessdebug.h"
 
-#include <QImage>
-#include <QLabel>
 #include <QPixmap>
 
 #include <KLocale>
-#include <KProgressDialog>
 #include <KRun>
-#include <KUrlLabel>
-
 #include <KIconLoader>
 #include <KMimeType>
-#include <KSqueezedTextLabel>
 #include <KUrl>
 
 
@@ -159,7 +153,7 @@
 
 
 // Mark the transfer as failed
-void TransferEntry::failTransfer(const QString &message)
+void TransferEntry::failTransfer( const QString &message )
 {
   if( isDone_ )
   {
@@ -180,10 +174,9 @@
   }
   else
   {
-    statusLabel_->setText(message);
+    statusLabel_->setText( message );
   }
 
-  speedLabel_->setText( "" );
   timer_->stop();
 
   // Make sure the widget does not resize when the progressbar hides
@@ -222,13 +215,13 @@
 
   // Update the widgets
   statusLabel_->setText( i18n("Completed") );
-  speedLabel_->setText( "" );
+
   progressBar_->hide();
   cancelLabel_->setEnabled(false);
   cancelLabel_->hide();
-  openLabel_->setEnabled(true);
-  openLabel_->show();
-  timer_->stop();
+  openLabel_  ->setEnabled(true);
+  openLabel_  ->show();
+  timer_      ->stop();
 
   isDone_ = true;
 }
@@ -258,6 +251,7 @@
 }
 
 
+
 // Convert a string to some more readable form
 QString TransferEntry::toReadableBytes(uint bytes)
 {
@@ -281,7 +275,7 @@
 
 
 // Set a status message
-void TransferEntry::setStatusMessage(const QString &message)
+void TransferEntry::setStatusMessage( const QString &message )
 {
 #ifdef KMESSTEST
   KMESS_ASSERT( ! isDone_ );
@@ -299,7 +293,7 @@
   kDebug() << "displaying '" << message << "'.";
 #endif
 
-  statusLabel_->setText(message);
+  statusLabel_->setText( message );
 }
 
 
@@ -336,18 +330,16 @@
   kDebug() << "transfer is at " << ((float)percent/10) << " percent.";
 #endif
 
-  KLocalizedString statusLabel;
-
   if( incoming_ )
   {
-    statusLabel = ki18n( "%1 of %2 received" );
+    statusText_ = i18n( "%1 of %2 received.", transferred, total );
   }
   else
   {
-    statusLabel = ki18n( "%1 of %2 sent" );
+    statusText_ = i18n( "%1 of %2 sent.", transferred, total );
   }
 
-  statusLabel_->setText( statusLabel.subs( transferred ).subs( total ).toString() );
+  statusLabel_->setText( statusText_ + " " + speedText_ );
 }
 
 
@@ -381,8 +373,9 @@
     eta = i18n( "infinite" );
   }
 
-  speed = QString("Speed: %1 ETA: %2").arg( toReadableBytes( bytesSpeed ) ).arg( eta );
-  speedLabel_->setText( speed );
+  speedText_ = QString("Speed: %1, ETA: %2").arg( toReadableBytes( bytesSpeed ) ).arg( eta );
+
+  statusLabel_->setText( statusText_ + " " + speedText_ );
 }
 
 #include "transferentry.moc"

Modified: trunk/kmess/src/dialogs/transferentry.h
===================================================================
--- trunk/kmess/src/dialogs/transferentry.h	2008-06-29 21:26:06 UTC (rev 3368)
+++ trunk/kmess/src/dialogs/transferentry.h	2008-06-29 21:33:27 UTC (rev 3369)
@@ -20,7 +20,6 @@
 
 #include "ui_transferentry.h"
 
-#include <QPixmap>
 
 
 /**
@@ -91,6 +90,10 @@
     QTimer  *timer_;
      // The previous trasferred bytes
     uint    previousTransferred_;
+    // The current status text
+    QString statusText_;
+    // The current speed text
+    QString speedText_;
     // The ID of this transfer, used by the Transfer Window
     int     transferID_;
 };

Modified: trunk/kmess/src/dialogs/transferentry.ui
===================================================================
--- trunk/kmess/src/dialogs/transferentry.ui	2008-06-29 21:26:06 UTC (rev 3368)
+++ trunk/kmess/src/dialogs/transferentry.ui	2008-06-29 21:33:27 UTC (rev 3369)
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>350</width>
-    <height>85</height>
+    <height>70</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -18,7 +18,7 @@
   <property name="minimumSize" >
    <size>
     <width>350</width>
-    <height>85</height>
+    <height>70</height>
    </size>
   </property>
   <property name="maximumSize" >
@@ -108,7 +108,7 @@
           </size>
          </property>
          <property name="text" >
-          <string/>
+          <string>KSqueezedTextLabel</string>
          </property>
         </widget>
        </item>
@@ -133,18 +133,11 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string/>
+        <string>KSqueezedTextLabel</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="speedLabel_" >
-       <property name="text" >
-        <string>Speed:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
       <spacer>
        <property name="orientation" >
         <enum>Qt::Vertical</enum>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.