[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kio/misc
From:       Matt Rogers <matt.rogers () kdemail ! net>
Date:       2004-01-28 5:03:46
Message-ID: 20040128050346.6C29494B1 () office ! kde ! org
[Download RAW message or body]

CVS commit by mattr: 

Change the labels in the statusbar so that they describe what they actually
mean. (BR 67466)
Also fix a 32-bit/64-bit mixup so that for files > 2GB the correct remaining
size gets displayed

Can't backport most of this due to the string changes, so the earliest you'll
see this in a released version is KDE 3.3

CCMAIL: 67466-done@bugs.kde.org


  M +5 -5      uiserver.cpp   1.108


--- kdelibs/kio/misc/uiserver.cpp  #1.107:1.108
@@ -595,6 +595,6 @@ UIServer::UIServer()
   // setup statusbar
   statusBar()->insertItem( i18n(" Files: %1 ").arg( 0 ), ID_TOTAL_FILES);
-  statusBar()->insertItem( i18n(" Size: %1 kB ").arg( "0" ), ID_TOTAL_SIZE);
-  statusBar()->insertItem( i18n(" Time: 00:00:00 "), ID_TOTAL_TIME);
+  statusBar()->insertItem( i18n(" Rem Size: %1 kB ").arg( "0" ), ID_TOTAL_SIZE);
+  statusBar()->insertItem( i18n(" Rem Time: 00:00:00 "), ID_TOTAL_TIME);
   statusBar()->insertItem( i18n(" %1 kB/s ").arg("0"), ID_TOTAL_SPEED);
 
@@ -1055,5 +1055,5 @@ void UIServer::slotUpdate() {
 
   int iTotalFiles = 0;
-  int iTotalSize = 0;
+  KIO::filesize_t iTotalSize = 0;
   int iTotalSpeed = 0;
   QTime totalRemTime;
@@ -1079,7 +1079,7 @@ void UIServer::slotUpdate() {
   // update statusbar
   statusBar()->changeItem( i18n( " Files: %1 ").arg( iTotalFiles ), ID_TOTAL_FILES);
-  statusBar()->changeItem( i18n( " Size: %1 ").arg( KIO::convertSize( iTotalSize ) ),
+  statusBar()->changeItem( i18n( " Rem Size: %1 ").arg( KIO::convertSize( iTotalSize ) ),
                            ID_TOTAL_SIZE);
-  statusBar()->changeItem( i18n( " Time: %1 ").arg( totalRemTime.toString() ), ID_TOTAL_TIME);
+  statusBar()->changeItem( i18n( " Rem Time: %1 ").arg( totalRemTime.toString() ), ID_TOTAL_TIME);
   statusBar()->changeItem( i18n( " %1/s ").arg( KIO::convertSize( iTotalSpeed ) ),
                            ID_TOTAL_SPEED);


[prev in list] [next in list] [prev in thread] [next in thread]