cosmetics

4 files changed, 37 insertions, 37 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 084900d..53db477 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -63,3 +63,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
         pvDebug(9,"packageListDocLnk.update");
-         pvDebug(0,"no UPDATE of DocLnk");
   packageListDocLnk.update();
@@ -68,8 +67,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   makeChannel();
-  //opie is hardcoded default ;)
-        //pvDebug(9,"section->setCurrentItem");
-//  for (int i=0;i<section->count();i++)
-        //  if (section->text(i)=="opie")
-        //      section->setCurrentItem(i);
-//  sectionChanged();
+
 
@@ -153,8 +147,14 @@ void MainWindow::makeMenu()
   sectionBar->setHorizontalStretchable( true );
-  QLabel *label = new QLabel( tr("Section: "), sectionBar );
-  label->setBackgroundColor( sectionBar->backgroundColor() );
+  QLabel *label = new QLabel( sectionBar, "section" );
+//  label->setBackgroundMode( NoBackground );
+         label->font().setPointSize( 8 );
+          label->setText( tr( "Section:" ) ); 
+  sectionBar->setStretchableWidget( label );
   section = new QComboBox( false, sectionBar );
+         section->font().setPointSize( 8 );
   label = new QLabel( " / ", sectionBar );
-  label->setBackgroundColor( sectionBar->backgroundColor() );
+         label->font().setPointSize( 8 );
+//  label->setBackgroundMode( PaletteForeground );
   subsection = new QComboBox( false, sectionBar );
+         subsection->font().setPointSize( 8 );
   a = new QAction( tr( "Close Section" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
@@ -168,3 +168,3 @@ void MainWindow::makeMenu()
   sectionAction->addTo( viewMenu );
-         sectionBar->setStretchableWidget( section );
+        // sectionBar->setStretchableWidget( section );
 
@@ -174,3 +174,3 @@ void MainWindow::makeMenu()
   label = new QLabel( tr("Filter: "), findBar );
-  label->setBackgroundColor( findBar->backgroundColor() );
+//  label->setBackgroundMode( PaletteForeground );
   findBar->setHorizontalStretchable( TRUE );
@@ -195,3 +195,3 @@ void MainWindow::makeMenu()
   label = new QLabel( tr("ipkgfind: "), searchBar );
-  label->setBackgroundColor( searchBar->backgroundColor() );
+//  label->setBackgroundMode( PaletteForeground );
   searchBar->setHorizontalStretchable( TRUE );
@@ -219,3 +219,3 @@ void MainWindow::makeMenu()
   label = new QLabel( tr("Destination: "), destBar );
-  label->setBackgroundColor( destBar->backgroundColor() );
+//  label->setBackgroundMode( PaletteForeground );
   destBar->setHorizontalStretchable( TRUE );
@@ -227,5 +227,5 @@ void MainWindow::makeMenu()
   spacer = new QLabel( " ", destBar );
-  spacer->setBackgroundColor( destBar->backgroundColor() );
+//  spacer->setBackgroundMode( PaletteForeground );
   CheckBoxLink = new QCheckBox( tr("Link"), destBar);
-  CheckBoxLink->setBackgroundColor( destBar->backgroundColor() );
+//  CheckBoxLink->setBackgroundMode( PaletteForeground );
   CheckBoxLink->setChecked( settings->createLinks() );
@@ -287,2 +287,4 @@ void MainWindow::makeMenu()
   destShow( cfg.readBoolEntry( "destBar", false ) );
+        setComboName(section,cfg.readEntry("default_section"));
+  sectionChanged();
 }
@@ -297,2 +299,3 @@ MainWindow::~MainWindow()
   cfg.writeEntry( "destBar", !destBar->isHidden() );
+  cfg.writeEntry( "default_section", section->currentText() );
         
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index de1f162..4a8a389 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -69,2 +69,3 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
 #ifdef OPROCESS
+  ipkgProcess->kill();
   ipkgProcess->clearArguments();
@@ -101,2 +102,4 @@ bool PmIpkg::runIpkg(const QString& args, const QString& dest )
 //debug
+        delete ipkgProcess;
+         ipkgProcess = new OProcess();
   ipkgProcess->clearArguments();
@@ -172,3 +175,3 @@ QStringList* PmIpkg::getList( QString packFileName, QString d )
          dest = dest==""?d:dest;
-  if (dest == "/" ) return 0;
+        //  if (dest == "/" ) return 0;
         {
@@ -178,3 +181,3 @@ QStringList* PmIpkg::getList( QString packFileName, QString d )
         }
-         packFileName = dest+"/"+statusDir+"/info/"+packFileName+".list";
+         QString packFileDir = dest+"/"+statusDir+"/info/"+packFileName+".list";
          QFile f( packFileName );
@@ -182,5 +185,11 @@ QStringList* PmIpkg::getList( QString packFileName, QString d )
   {
-           pvDebug(1," Panik!  Could not open");
-          out( "Panik!\n Could not open:\n"+packFileName );
-           return (QStringList*)0;
+          out( "Could not open:\n"+packFileDir );
+          f.close();
+           packFileDir = "/"+statusDir+"/info/"+packFileName+".list";
+           f.setName( packFileDir );
+                 if ( ! f.open(IO_ReadOnly) )
+          {
+                   qDebug(" Panik!  Could not open"+packFileDir);
+                         out( "Could not open:\n"+packFileDir+"\n Panik!" );
+    }
   }
@@ -192,2 +201,3 @@ QStringList* PmIpkg::getList( QString packFileName, QString d )
             }
+  f.close();
   return fileList;
@@ -197,2 +207,3 @@ void PmIpkg::linkPackage( QString packFileName, QString dest )
 {
+        if (dest == "root" || dest == "/" ) return;
         QStringList *fileList = getList( packFileName, dest );
diff --git a/noncore/unsupported/oipkg/utils.cpp b/noncore/unsupported/oipkg/utils.cpp
index 66dcf10..6821343 100644
--- a/noncore/unsupported/oipkg/utils.cpp
+++ b/noncore/unsupported/oipkg/utils.cpp
@@ -1,10 +1,2 @@
 /***************************************************************************
-                          utils.cpp  -  description
-                             -------------------
-    begin                : Sun Apr 28 2002
-    copyright            : (C) 2002 by tille
-    email                : tille@handhelds.org
- ***************************************************************************/
-
-/***************************************************************************
  *                                                                         *
@@ -16,2 +8,3 @@
  ***************************************************************************/
+// (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
diff --git a/noncore/unsupported/oipkg/utils.h b/noncore/unsupported/oipkg/utils.h
index ecc70dc..da33eda 100644
--- a/noncore/unsupported/oipkg/utils.h
+++ b/noncore/unsupported/oipkg/utils.h
@@ -1,10 +1,2 @@
 /***************************************************************************
-                          utils.h  -  description
-                             -------------------
-    begin                : Sun Apr 28 2002
-    copyright            : (C) 2002 by tille
-    email                : tille@handhelds.org
- ***************************************************************************/
-
-/***************************************************************************
  *                                                                         *
@@ -16,2 +8,3 @@
  ***************************************************************************/
+// (c) 2002 Patrick S. Vogt <tille@handhelds.org>