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

List:       kde-debian-devel
Subject:    [devel] kdenonbeta/kdedebian/kapture
From:       Peter Rockai <mornfall () logisys ! dyndns ! org>
Date:       2005-01-28 12:50:06
Message-ID: 20050128125006.227B21CFE3 () office ! kde ! org
[Download RAW message or body]

CVS commit by mornfall: 

When an package is clicked in the TreeView, show an IteratorView for it. (This
was broken ever since libapt-front porting started...). Cruft--.


  M +5 -4      kapture/kapture.cpp   1.45
  M +6 -4      libkapture/celemview.cpp   1.9
  M +1 -0      libkapture/celemview.h   1.14
  M +3 -19     libkapture/pkgcelemview.h   1.14


--- kdenonbeta/kdedebian/kapture/kapture/kapture.cpp  #1.44:1.45
@@ -139,4 +139,5 @@ void Kapture::newIteratorView (Iterator 
     if (i == Iterator ()) return;
     // if (! e) return;
+    kdDebug() << "Kapture::newIteratorView (nonempty iterator)" << endl;
     IteratorView *v = 0;
     for (int j = 0; j <= m_iteratorsShown; j ++) {
@@ -150,8 +151,7 @@ void Kapture::newIteratorView (Iterator 
         }
     } // XXX: fix this... uptade: huh?
-    if (! (i == Iterator ())) {
         m_iteratorsShown ++;
         v = m_iteratorViewFact -> create (this, i, true);
-    }
+    kdDebug() << "iteratorView: " << v << endl;
     if (v) {
         v -> setUseHistory (true);
@@ -202,4 +202,5 @@ bool Kapture::executeAction (const Itera
     bool ok = false;
     if (a ("select")) {
+        kdDebug() << "Kapture::executeAction: select" << endl;
         showIterator (a . iterator ());
         ok = true;

--- kdenonbeta/kdedebian/kapture/libkapture/celemview.cpp  #1.8:1.9
@@ -21,10 +21,12 @@ IteratorView *IteratorViewFactory::creat
 {
     IteratorView *ret = 0;
-    /* if (pkgIterator (el))
-        ret = new PackageIteratorView (parent);
+    try {
+        PackageIterator p( i );
+        ret = new PackageIteratorView( parent );
+    } catch (std::bad_cast) {}
     if (ret)
         ret -> setUseHistory (hist);
-    if (ret && el)
-        ret -> showElem (el); */
+    if (ret && i != Iterator())
+        ret -> showIterator (i);
     return ret;
 }

--- kdenonbeta/kdedebian/kapture/libkapture/celemview.h  #1.13:1.14
@@ -48,4 +48,5 @@ namespace kapture {
             virtual void histForward () { aptFront::HistoryManager::histForward (); }
             virtual void histBack () { aptFront::HistoryManager::histBack (); }
+                        virtual void showIterator( Iterator i ) = 0;
         signals:
             void iteratorChanged (kapture::IteratorView *);

--- kdenonbeta/kdedebian/kapture/libkapture/pkgcelemview.h  #1.13:1.14
@@ -42,17 +42,4 @@ namespace kapture {
     class PackageIteratorView;
 
-    /* class PkgChanger : public QObject
-    {
-        Q_OBJECT
-        public:
-            PkgChanger (capture::IteratorPtr P, QObject *who, const char *slot);
-            bool event (QEvent *e);
-        signals:
-            void sig (capture::IteratorPtr);
-        protected:
-            capture::IteratorPtr m_pkg;
-            int m_id;
-    }; */
-
     class PackageIteratorView: public IteratorView
     {
@@ -68,4 +55,7 @@ namespace kapture {
         public slots:
             void setVersion (VersionIterator V);
+                virtual void showIterator( Iterator p ) {
+                        changeIterator( p );
+                }
             // virtual void showIterator (Iterator i);
         protected:
@@ -76,14 +66,8 @@ namespace kapture {
             PackageIteratorViewDetails *m_details;
             QScrollView *m_detailsScroll;
-            // QLabel *m_descr;
             TreeView *m_depList; // ?
             TreeView *m_revDepList;
             TreeTransform m_depTreeBuild;
             TreeTransform m_revDepTreeBuild;
-            // GrouperFactory *m_depGrouper;
-            //Tree *m_deps;
-            // GrouperFactory *m_revDepGrouper;
-            //Tree *m_revDeps;
-            // StablePackageIterator m_pkg;
             StablePackageIterator m_pkg;
             StableVersionIterator m_ver;


_______________________________________________
kde-debian-devel mailing list
kde-debian-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-debian-devel
[prev in list] [next in list] [prev in thread] [next in thread]