kdenonbeta/kdedebian/kapture

[Peter Rockai]

CVS commit by mornfall: 

- fix a buglet with cache opening (forgot to fix PkgManager for new
  parameter on PkgCacheFile::Open)
- Add short description column to listtreewidget, also make it no-break
  in tooltip (looks better; will probably add long desc as well, depends
  on how it will look)
- update TODO


  M +3 -2      TODO   1.49
  M +2 -0      libcapture/pkgcache.cpp   1.26
  M +2 -2      libcapture/pkgmanager.cpp   1.36
  M +3 -0      libkapture/listtreewidget.cpp   1.32
  M +4 -3      libkapture/treeview.cpp   1.10


--- kdenonbeta/kdedebian/kapture/TODO  #1.48:1.49
@@ -165,4 +165,5 @@
   - fix package tab closing [done]
   - add icons for packageview
+  - add some nice columns to listtreeview
   - fix multiple-tabs-for-same-package problem [done]
 
@@ -250,5 +251,5 @@
 ::: 0.6 (prealfa) :::
 
-  SWITCHABLE INSTALL/UPGRADE ENGINE [done: 0%]
+  SWITCHABLE INSTALL/UPGRADE ENGINE [done: 20%]
   Create UI and infrastructure to make it possible to switch the engine at
   runtime. Add config option.
@@ -294,5 +295,5 @@
   High) and/or a spinbox (for numeric priority adjustment).
 
-  PRIORITY/U_WANTED SUPPORT IN DIST-UPGRADE [done: 0%]
+  PRIORITY/U_WANTED SUPPORT IN DIST-UPGRADE [done: 30%]
   Classical upgrade remains as it is, as it doesn't touch package states (ie,
   it only upgrades those packages which it can without touching anything

--- kdenonbeta/kdedebian/kapture/libcapture/pkgcache.cpp  #1.25:1.26
@@ -498,4 +498,5 @@ PkgCache::PkgCache (pkgCache *Cache, Pol
 }
                                                                     /* }}} */
+                                                                    /* {{{ */
 PkgCache::~PkgCache ()
 {
@@ -504,4 +505,5 @@ PkgCache::~PkgCache ()
     delete [] m_priAgentCache;
 }
+                                                                    /* }}} */
                                                                     /* {{{ */
 void PkgCache::setExtState (PkgIterator P, bool want, int pri, bool 
recommends, bool suggests)

--- kdenonbeta/kdedebian/kapture/libcapture/pkgmanager.cpp  #1.35:1.36
@@ -161,8 +161,8 @@ bool PkgManager::loadCache ()
     OpProgress prog;
     m_write = true;
-    if (! m_cache . Open (prog, m_write)) {
+    if (! m_cache . Open (prog, false, m_write)) {
         _error -> Discard ();
         m_write = false;
-        if (! m_cache . Open (prog, m_write))
+        if (! m_cache . Open (prog, false, m_write))
             return false; // XXX
     }

--- kdenonbeta/kdedebian/kapture/libkapture/listtreewidget.cpp  #1.31:1.32
@@ -112,4 +112,5 @@ void ListTreeWidgetItem::visit (PkgCElem
             m_item -> setText (1, "BROKEN"); break;
     }
+    m_item -> setText (2, e -> shortDesc ());
 }
                                                                     /* }}} */
@@ -144,8 +145,10 @@ ListTreeWidget::ListTreeWidget (QWidget 
     addColumn ("Package");
     addColumn ("Status");
+    addColumn ("Description");
     /* addColumn ("Current Version");
     addColumn ("Installed Version"); */
     setColumnWidth (0, 180);
     setColumnWidth (1, 90);
+    setResizeMode (LastColumn);
     /* setColumnWidth (2, 120);
     setColumnWidth (3, 120); */

--- kdenonbeta/kdedebian/kapture/libkapture/treeview.cpp  #1.9:1.10
@@ -34,10 +34,10 @@ TreeView::~TreeView ()
 QString TreeView::cElemTooltip (CElemPtr _e)
 {
-    QString str;
+    QString str = "<qt>";
     if (pkgCElem (_e)) {
         PkgCElemPtr e = pkgCElem (_e);
         str . append (QString ("<b>Package:</b>&nbsp;") + e -> Name () + 
"<br>");
-        str . append (QString ("<b>Description:</b>&nbsp;") + e -> shortDesc
-                () + "<br>");
+        str . append (QString ("<b>Description:</b>&nbsp;<nobr>") + e -> 
shortDesc
+                () + "</nobr><br>");
         str . append (QString ("<b>Candidate&nbsp;version:</b>&nbsp;") +
                 PkgManager::cache () -> GetCandidateVer (*e) . VerStr () +
@@ -46,4 +46,5 @@ QString TreeView::cElemTooltip (CElemPtr
                 (e -> CurrentVer () -> end () ? "-" : e -> CurrentVer () ->
                 VerStr ()));
+        str . append ("</qt>");
     }
     return str;