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

List:       kde-commits
Subject:    kdeadmin/kpackage
From:       Toivo Pedaste <toivo () ucs ! uwa ! edu ! au>
Date:       2003-02-25 15:35:41
[Download RAW message or body]

CVS commit by toivo: 

Fix problems with /etc/apt/sources.list handling


  M +13 -8     debAptInterface.cpp   1.36
  M +2 -2      kpPty.cpp   1.34
  M +0 -2      managementWidget.cpp   1.64
  M +18 -6     updateLoc.cpp   1.40
  M +2 -2      updateLoc.h   1.21


--- kdeadmin/kpackage/debAptInterface.cpp  #1.35:1.36
@@ -34,5 +34,5 @@ DEBAPT::DEBAPT():DEB()
   locatedialog = new Locations(i18n("Location of Debian Packages"));
 
-  locatedialog->aLocations(1, 12, this, i18n("A"),
+  locatedialog->aLocations(1, 60, this, i18n("A"),
                            i18n("APT sources entries"));
   locatedialog->dLocations(1, 8, this, i18n("D"),
@@ -315,5 +315,5 @@ QStringList DEBAPT::getFileList(packageI
   QString name = p->getProperty("name");
 
-  from = "cat ";
+  from = "cat -n ";
   from += INFODIR;
   from += name;
@@ -390,13 +390,18 @@ QString DEBAPT::doInstall(int installFla
 QStringList DEBAPT::readApt()
 {
-  QString cmd = "cat ";
+  QString cmd = "cat -E ";
   cmd += APT_SOURCE;
 
   QStringList list = kpty->run(cmd);
+  if (!kpty->Result) {
   QString s;
   for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+      (*it).truncate((*it).length() - 1);
     (*it) = (*it).stripWhiteSpace();
   }
   return list;
+  } else {
+    return 0;
+  }
 }
 

--- kdeadmin/kpackage/managementWidget.cpp  #1.63:1.64
@@ -141,6 +141,4 @@ void managementWidget::setupWidgets()
 
   packageDisplay = new packageDisplayWidget(rightpanel);
-  //  packageDisplay->setFrameStyle(QFrame::Panel|QFrame::Sunken);
-  //  packageDisplay->setLineWidth(2);
   connect(this, SIGNAL(changePackage(packageInfo *)),
           packageDisplay, SLOT(changePackage(packageInfo *)));

--- kdeadmin/kpackage/updateLoc.cpp  #1.39:1.40
@@ -13,5 +13,5 @@
 
 #include <qvbox.h>
-
+#include <qscrollview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -268,10 +268,17 @@ aUpdateLoc::aUpdateLoc(QWidget *p, int p
   ap[0] = 0;
 
-  QGroupBox *floc = new QGroupBox(label, this);
+  QGroupBox *floc = new QGroupBox(1,Qt::Vertical, label, this);
   vf->addWidget(floc,1);
-  QVBoxLayout *vloc = new QVBoxLayout(floc, 15, 10, "vloc");
+  QScrollView* sv = new QScrollView(floc);    
+    sv->setHScrollBarMode(QScrollView::AlwaysOff);
+    sv->setResizePolicy(QScrollView::AutoOneFit);
+
+      QFrame *f = new QFrame(sv->viewport());
+    sv->addChild(f);
+
+  QVBoxLayout *vloc = new QVBoxLayout(f, 0, 3, "vloc");
 
   for (int i = 0; i < numLines; i++) {
-    ap[i] = new apanel( floc);
+    ap[i] = new apanel( f);
     vloc->addWidget(ap[i],0);
   }
@@ -288,4 +295,5 @@ void aUpdateLoc::readSettings() 
 {
   int i = 0;
+  QString a,b;
   QStringList list = interface->readApt();
   for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
@@ -299,4 +307,8 @@ void aUpdateLoc::readSettings() 
       }
       i++;
+      if (i >= numLines) {
+        ap[numLines - 1]->setText(i18n("File truncated...."));
+        break;
+      }
     }
   }           
@@ -320,5 +332,5 @@ void aUpdateLoc::writeSettings() {
       }
       ln.replace("#","\\#");
-      s += ap[i]->getText();
+      s += ln;
       list.append(s);
     }

--- kdeadmin/kpackage/updateLoc.h  #1.20:1.21
@@ -159,5 +159,5 @@ private:
 
   int numLines;
-  enum { PNUM = 40 };
+  enum { PNUM = 100 };
   apanel *ap[PNUM];
 


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