kdenonbeta/kdedebian/kapture

[Peter Rockai <mornfall@logisys.dyndns.org>]

CVS commit by mornfall: 

Better errordialog (use QLabel instead of KListBox). List URLs of failed
downloads instead of "XXX" ;).


  M +4 -2      libcapture/pkgmanager.cpp   1.47
  M +10 -6     libkapture/errordialog.cpp   1.5


--- kdenonbeta/kdedebian/kapture/libcapture/pkgmanager.cpp  #1.46:1.47
@@ -328,6 +328,8 @@ bool PkgManager::_update (pkgAcquireStat
             continue;
         (*it) -> Finished ();
-        _error -> Warning ("Item 'XXX': download failed"); // XXX
-        // XXX: warn user about failures
+        string err ("Download of item \"");
+        err . append ((*it) -> DescURI ());
+        err . append ("\" failed");
+        _error -> Warning (err . c_str ());
     }
 

--- kdenonbeta/kdedebian/kapture/libkapture/errordialog.cpp  #1.4:1.5
@@ -1,4 +1,5 @@
 #include <apt-pkg/error.h>
-#include <klistbox.h>
+// #include <klistbox.h>
+#include <qlabel.h>
 
 #include <string>
@@ -13,14 +14,17 @@ ErrorDialog::ErrorDialog (QWidget *paren
     : KDialogBase (parent, name, true, "Errors and Warnings", Close, Close)
 {
-    KListBox *b = new KListBox (this);
-    b -> setMinimumSize (QSize (500, 90));
-    setMainWidget (b);
+    QLabel *l = new QLabel (this);
+    l -> setMinimumSize (QSize (300, 90));
+    setMainWidget (l);
     string s;
+    string m ("<qt>");
     while (! _error -> empty ()) {
         bool t = _error -> PopMessage (s);
-        string m (t ? "ERROR: " : "WARNING: ");
+        m . append (t ? "<b><font color=\"red\">ERROR:</font></b> " : "<b>WARNING:</b> ");
         m . append (s);
-        b -> insertItem (QString::fromUtf8 (m.c_str ()));
+        m . append ("<br>\n");
     }
+    m . append ("</qt>");
+    l -> setText (m);
 }
                                                                     /* }}} */