From fabadbc7caba39006fcdda5167c29fa287e23cc3 Mon Sep 17 00:00:00 2001
From: drw <drw>
Date: Thu, 17 Apr 2003 20:19:52 +0000
Subject: Added better verbosity options and option to save ipkg output to a file (per 'bugs' #856 & #857).  Also fixed Ok/Cancel behavior on install options dialog.

---
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 2bb8b4d..76d0a80 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -16,9 +16,12 @@
  ***************************************************************************/
 
 #include <stdio.h>
+
+#include <opie/ofiledialog.h>
  
 #ifdef QWS
 #include <qpe/config.h>
+#include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
@@ -27,6 +30,7 @@
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdialog.h>
+#include <qfileinfo.h>
 #include <qgroupbox.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
@@ -63,6 +67,7 @@ InstallDlgImpl::InstallDlgImpl( QList<InstallData> &packageList, DataManager *da
 
     // Grab flags - Turn MAKE_LINKS on by default (if no flags found)
     flags = cfg.readNumEntry( "installFlags", 0 );
+    infoLevel = cfg.readNumEntry( "infoLevel", 1 );
 #else
 	flags = 0;
 #endif
@@ -190,17 +195,45 @@ void InstallDlgImpl :: init( bool displayextrainfo )
 
 void InstallDlgImpl :: optionsSelected()
 {
-    InstallOptionsDlgImpl opt( flags, this, "Option", true );
-    opt.exec();
-
-    // set options selected from dialog
-    flags = opt.getFlags();
+    if ( btnOptions->text() == tr( "Options" ) )
+    {
+        InstallOptionsDlgImpl opt( flags, infoLevel, this, "Option", true );
+        if ( opt.exec() == QDialog::Accepted )
+        {
+            // set options selected from dialog
+            flags = opt.getFlags();
+            infoLevel = opt.getInfoLevel();
 
 #ifdef QWS
-    Config cfg( "aqpkg" );
-    cfg.setGroup( "settings" );
-    cfg.writeEntry( "installFlags", flags );
+            Config cfg( "aqpkg" );
+            cfg.setGroup( "settings" );
+            cfg.writeEntry( "installFlags", flags );
+            cfg.writeEntry( "infoLevel", infoLevel );
 #endif
+        }
+    }
+    else // Save output
+    {
+        QMap<QString, QStringList> map;
+        map.insert( tr( "All" ), QStringList() );
+        QStringList text;
+        text << "text/*";
+        map.insert(tr( "Text" ), text );
+        text << "*";
+        map.insert( tr( "All" ), text );
+        
+        QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+        if( !filename.isEmpty() )
+        {
+            QString currentFileName = QFileInfo( filename ).fileName();
+            DocLnk doc;
+            doc.setType( "text/plain" );
+            doc.setFile( filename );
+            doc.setName( currentFileName );
+            FileManager fm;
+            fm.saveFile( doc, output->text() );
+        }
+    }
 }
 
 void InstallDlgImpl :: installSelected()
@@ -272,14 +305,14 @@ void InstallDlgImpl :: installSelected()
             if ( idata->destination->linkToRoot() )
                 tmpFlags |= MAKE_LINKS;
             
-            pIpkg->setFlags( tmpFlags );
+            pIpkg->setFlags( tmpFlags, infoLevel );
             pIpkg->runIpkg();
         }
 
         pIpkg->setOption( "install" );
         pIpkg->setDestination( dest );
         pIpkg->setDestinationDir( destDir );
-        pIpkg->setFlags( instFlags );
+        pIpkg->setFlags( instFlags, infoLevel );
         QListIterator<InstallData> it2( installList );
         for ( ; it2.current(); ++it2 )
         {
@@ -303,7 +336,7 @@ void InstallDlgImpl :: installSelected()
             int tmpFlags = flags;
             if ( idata->destination->linkToRoot() && idata->recreateLinks )
                 tmpFlags |= MAKE_LINKS;
-            pIpkg->setFlags( tmpFlags );
+            pIpkg->setFlags( tmpFlags, infoLevel );
             pIpkg->runIpkg();
         }
 
@@ -315,6 +348,9 @@ void InstallDlgImpl :: installSelected()
 //    btnInstall->setEnabled( true );
     btnInstall->setText( tr( "Close" ) );
     btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
+    
+    btnOptions->setText( tr( "Save output" ) );
+    btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
 
     if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
         displayAvailableSpace( destination->currentText() );
diff --git a/noncore/settings/aqpkg/installdlgimpl.h b/noncore/settings/aqpkg/installdlgimpl.h
index c30963e..15cf427 100644
--- a/noncore/settings/aqpkg/installdlgimpl.h
+++ b/noncore/settings/aqpkg/installdlgimpl.h
@@ -59,6 +59,7 @@ private:
     QList<InstallData> removeList;
     QList<InstallData> updateList;
     int flags;
+    int infoLevel;
     Ipkg *pIpkg;
     bool upgradePackages;
     
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp
index 47b250d..72d794f 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.cpp
+++ b/noncore/settings/aqpkg/instoptionsimpl.cpp
@@ -20,14 +20,16 @@
 #endif
 
 #include <qcheckbox.h>
+#include <qcombobox.h>
 #include <qgroupbox.h>
+#include <qlabel.h>
 #include <qlayout.h>
 
 #include "global.h"
 #include "instoptionsimpl.h"
 #include "ipkg.h"
 
-InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const char* name, bool modal, WFlags fl )
+InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, int verb, QWidget * parent, const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     setCaption( tr( "Options" ) );
@@ -55,8 +57,18 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const
     forceOverwrite = new QCheckBox( tr( "Force Overwrite" ), grpbox );
     grplayout->addWidget( forceOverwrite );
 
-    verboseWget = new QCheckBox( tr( "Verbose WGet" ), grpbox );
-    grplayout->addWidget( verboseWget );
+    QLabel *l = new QLabel( tr( "Information Level" ), grpbox );
+    grplayout->addWidget( l );
+    
+    verboseIpkg = new QComboBox( grpbox );
+    verboseIpkg->insertItem( tr( "Errors only" ) );
+    verboseIpkg->insertItem( tr( "Normal messages" ) );
+    verboseIpkg->insertItem( tr( "Informative messages" ) );
+    verboseIpkg->insertItem( tr( "Troubleshooting output" ) );
+    verboseIpkg->setCurrentItem( verb );
+    grplayout->addWidget( verboseIpkg );
+    
+    grplayout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
     
     if ( flags & FORCE_DEPENDS )
     	forceDepends->setChecked( true );
@@ -66,8 +78,8 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const
     	forceRemove->setChecked( true );
     if ( flags & FORCE_OVERWRITE )
     	forceOverwrite->setChecked( true );
-    if ( flags & VERBOSE_WGET )
-    	verboseWget->setChecked( true );
+//    if ( flags & VERBOSE_WGET )
+//    	verboseWget->setChecked( true );
 //    if ( flags & MAKE_LINKS )
 //    	makeLinks->setChecked( true );
 
@@ -97,3 +109,8 @@ int InstallOptionsDlgImpl :: getFlags()
 
     return flags;
 }
+
+int InstallOptionsDlgImpl :: getInfoLevel()
+{
+    return verboseIpkg->currentItem();
+}
diff --git a/noncore/settings/aqpkg/instoptionsimpl.h b/noncore/settings/aqpkg/instoptionsimpl.h
index f4724a0..1312afd 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.h
+++ b/noncore/settings/aqpkg/instoptionsimpl.h
@@ -20,14 +20,16 @@
 #include <qdialog.h>
 
 class QCheckBox;
+class QComboBox;
 
 class InstallOptionsDlgImpl : public QDialog
 {
     Q_OBJECT
 public:
-    InstallOptionsDlgImpl( int flags, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+    InstallOptionsDlgImpl( int, int, QWidget * = 0, const char * = 0, bool = false, WFlags = 0 );
     ~InstallOptionsDlgImpl();
     int getFlags();
+    int getInfoLevel();
 
 private:
     QCheckBox* forceDepends;
@@ -35,6 +37,7 @@ private:
     QCheckBox* forceRemove;
     QCheckBox* forceOverwrite;
     QCheckBox* verboseWget;
+	QComboBox* verboseIpkg;
 };
 
 #endif
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index e66c02d..7df643e 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -69,7 +69,7 @@ bool Ipkg :: runIpkg( )
         commands << runtimeDir;
         commands << ";";
     }
-    commands << "ipkg" << "-force-defaults";
+    commands << "ipkg" << "-V" << QString::number( infoLevel ) << "-force-defaults";
 
     // only set the destination for an install operation
     if ( option == "install" )
@@ -86,7 +86,7 @@ bool Ipkg :: runIpkg( )
             commands << "-force-removal-of-essential-packages";
         if ( flags & FORCE_OVERWRITE )
             commands << "-force-overwrite";
-        if ( flags & VERBOSE_WGET )
+        if ( infoLevel == 3 )
             commands << "-verbose_wget";
 
         // Handle make links
@@ -253,7 +253,7 @@ void Ipkg :: removeStatusEntry()
     rename( outStatusFile, statusFile );
 }
 
-int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString option )
+int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
 {
     // If one is already running - should never be but just to be safe
     if ( proc )
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index d49bb04..531bfc0 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -49,7 +49,7 @@ public:
     void setPackage( const char *pkg )              { package = pkg; }
     void setDestination( const char *dest )         { destination = dest; }
     void setDestinationDir( const char *dir )       { destDir = dir; }
-    void setFlags( int fl )                         { flags = fl; }
+    void setFlags( int fl, int il )                 { flags = fl; infoLevel = il; }
     void setRuntimeDirectory( const char *dir )     { runtimeDir = dir; }
 
 signals:
@@ -73,6 +73,7 @@ private:
     QString runtimeDir;
     OProcess *proc;
     int flags;
+    int infoLevel;
     bool finished;
 
     QList<QString> *dependantPackages;
--
cgit v0.9.0.2