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

List:       kde-commits
Subject:    kdenetwork/kget
From:       Rainer Wirtz <rainer.wirtz () gmx ! de>
Date:       2005-02-10 17:26:17
Message-ID: 20050210172617.A22111D1BB () office ! kde ! org
[Download RAW message or body]

CVS commit by ratz: 

Fixes bug 98182
BUG: 98182
CCBUG: 98182


  M +3 -3      logwindow.cpp   1.15
  M +2 -2      slave.cpp   1.25
  M +7 -7      transfer.cpp   1.62


--- kdenetwork/kget/logwindow.cpp  #1.14:1.15
@@ -122,9 +122,9 @@ void SeparatedLog::addLog(uint id, const
         // if I don't do this, ID#10 gets sorted between ID#1 and ID#2, ugly.      
     } else {
-        trMap[id] += message;
+        trMap[id] += ("\n"+message);
     }
 
     if (idSelected == id) {
-        ml_log->append(message);
+        refresh();
     }
 }

--- kdenetwork/kget/slave.cpp  #1.24:1.25
@@ -254,5 +254,5 @@ void Slave::slotResult(KIO::Job * job)
     else {
         QString tmsg="<font color=\"red\"> <b>" + job->errorString() + \
-                     "</font></b>";
+                "</b></font>";
         InfoMessage(tmsg);
         if (m_parent->retryOnError() && \

--- kdenetwork/kget/transfer.cpp  #1.61:1.62
@@ -273,6 +273,6 @@ void Transfer::updateAll()
     updateStatus(status);       // first phase of animation
 
-    logMessage(i18n("Copy file from: %1").arg(src.url()));
-    logMessage(i18n("To: %1").arg(dest.url()));
+    logMessage(i18n("Copy file from: %1").arg(src.prettyURL()));
+    logMessage(i18n("To: %1").arg(dest.prettyURL()));
 
     // source
@@ -380,6 +380,6 @@ void Transfer::slotResume()
     assert(status == ST_STOPPED);
 
-    sDebug << "src: " << src.url() << endl;
-    sDebug << "dest " << dest.url() << endl;
+    sDebug << "src: " << src.prettyURL() << endl;
+    sDebug << "dest " << dest.prettyURL() << endl;
 
     m_paResume->setEnabled(false);
@@ -552,5 +552,5 @@ void Transfer::slotRenaming(KIO::Job *, 
         dest = to;
 
-        logMessage(i18n("Renaming to %1").arg(dest.url().ascii()));
+        logMessage(i18n("Renaming to %1").arg(dest.prettyURL().ascii()));
 
           // destination
@@ -610,5 +610,5 @@ void Transfer::slotTotalSize(KIO::filesi
         totalSize = bytes;
         if (totalSize != 0) {
-            logMessage(i18n("Total size is %1 bytes").arg((double)totalSize,0,'f'));
+            logMessage(i18n("Total size is %1 bytes").arg((double)totalSize,0,'f',0));
             setText(view->lv_total, KIO::convertSize(totalSize));
                         if(dlgIndividual)
@@ -748,5 +748,5 @@ bool Transfer::read(KSimpleConfig * conf
 
     if (!src.isValid() && !ksettings.b_expertMode) {
-        KMessageBox::error(kmain, i18n("Malformed URL:\n") + src.url(), i18n("Error"));
+        KMessageBox::error(kmain, i18n("Malformed URL:\n") + src.prettyURL(), i18n("Error"));
         return false;
     }


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