Many updates to install dialog

1 files changed, 93 insertions, 39 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 75ce1a1..65aaa32 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -17,2 +17,4 @@
 
+#include <stdio.h>
+ 
 #ifdef QWS
@@ -20,2 +22,3 @@
 #include <qpe/qpeapplication.h>
+#include <qpe/resource.h>
 #include <qpe/storage.h>
@@ -23,14 +26,16 @@
 
-#include <qmultilineedit.h>
-#include <qdialog.h>
-#include <qcombobox.h>
 #include <qcheckbox.h>
-#include <qpushbutton.h>
+#include <qcombobox.h>
+#include <qdialog.h>
+#include <qgroupbox.h>
+#include <qmultilineedit.h>
 #include <qlabel.h>
-
+#include <qlayout.h>
+#include <qpushbutton.h>
 
 #include "datamgr.h"
-#include "instoptionsimpl.h"
 #include "destination.h"
+#include "instoptionsimpl.h"
 #include "installdlgimpl.h"
+#include "ipkg.h"
 #include "utils.h"
@@ -38,5 +43,8 @@
 
-InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
-    : InstallDlg( parent, name, modal, fl )
+InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, const char *title = 0 )
+    : QWidget( 0, 0, 0 )
 {
+    setCaption( title );
+    init( TRUE );
+    
     pIpkg = 0;
@@ -60,5 +68,5 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
     output->setReadOnly( true );
-        QFont f( "helvetica" );
-        f.setPointSize( 10 );
-        output->setFont( f );
+        //QFont f( "helvetica" );
+        //f.setPointSize( 10 );
+        //output->setFont( f );
 
@@ -79,5 +87,5 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
         // setup package data
-        QString remove = "Remove\n";
-        QString install = "\nInstall\n";
-        QString upgrade = "\nUpgrade\n";
+        QString remove = tr( "Remove\n" );
+        QString install = tr( "Install\n" );
+        QString upgrade = tr( "Upgrade\n" );
         for ( it = packageList.begin() ; it != packageList.end() ; ++it )
@@ -88,3 +96,3 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
                         installList.push_back( item );
-                        install += "   " + item.packageName + "\n";
+                        install.append( QString( "   %1\n" ).arg( item.packageName ) );
                 }
@@ -93,3 +101,3 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
                         removeList.push_back( item );
-                        remove += "   " + item.packageName + "\n";
+                        remove.append( QString( "   %1\n" ).arg( item.packageName ) );
                 }
@@ -98,10 +106,12 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
             updateList.push_back( item );
-            QString type = " (Upgrade)";
+            QString type;
             if ( item.option == "R" )
-                type = " (ReInstall)";
-            upgrade += "   " + item.packageName + type + "\n";
-    }
+                type = tr( "(ReInstall)" );
+            else
+                type = tr( "(Upgrade)" );
+            upgrade.append( QString( "   %1 %2\n" ).arg( item.packageName ).arg( type ) );
+        }
     }
 
-    output->setText( remove + install + upgrade );
+    output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
 
@@ -110,5 +120,7 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
 
-InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, QWidget *parent, const char *name, bool modal, WFlags fl )
-    : InstallDlg( parent, name, modal, fl )
+InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 )
+    : QWidget( 0, 0, 0 )
 {
+    setCaption( title );
+    init( FALSE );
     pIpkg = ipkg;
@@ -120,10 +132,48 @@ InstallDlgImpl::~InstallDlgImpl()
 {
+    if ( pIpkg )
+        delete pIpkg;
 }
 
-bool InstallDlgImpl :: showDlg()
+void InstallDlgImpl :: init( bool displayextrainfo )
 {
-    showMaximized();
-    bool ret = exec();
+    QGridLayout *layout = new QGridLayout( this ); 
+    layout->setSpacing( 4 );
+    layout->setMargin( 4 );
 
-    return ret;
+    if ( displayextrainfo )
+    {
+        QLabel *label = new QLabel( tr( "Destination" ), this );
+        layout->addWidget( label, 0, 0 );
+        destination = new QComboBox( FALSE, this );
+        layout->addWidget( destination, 0, 1 );
+        connect( destination, SIGNAL( highlighted( const QString & ) ),
+                this, SLOT( displayAvailableSpace( const QString & ) ) );
+
+        QLabel *label2 = new QLabel( tr( "Space Avail" ), this );
+        layout->addWidget( label2, 1, 0 );
+        txtAvailableSpace = new QLabel( "", this );
+        layout->addWidget( txtAvailableSpace, 1, 1 );
+    }
+    else
+    {
+        destination = 0x0;
+        txtAvailableSpace = 0x0;
+    }
+    
+    QGroupBox *GroupBox2 = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
+    GroupBox2->layout()->setSpacing( 0 );
+    GroupBox2->layout()->setMargin( 4 );
+
+    QVBoxLayout *GroupBox2Layout = new QVBoxLayout( GroupBox2->layout() );
+    output = new QMultiLineEdit( GroupBox2 );
+    GroupBox2Layout->addWidget( output );
+    layout->addMultiCellWidget( GroupBox2, 2, 2, 0, 1 );
+
+    btnInstall = new QPushButton( Resource::loadPixmap( "aqpkg/apply" ), tr( "Start" ), this );
+    layout->addWidget( btnInstall, 3, 0 );
+    connect( btnInstall, SIGNAL( clicked() ), this, SLOT( installSelected() ) );
+    
+    btnOptions = new QPushButton( Resource::loadPixmap( "aqpkg/config" ), tr( "Options" ), this );
+    layout->addWidget( btnOptions, 3, 1 );
+    connect( btnOptions, SIGNAL( clicked() ), this, SLOT( optionsSelected() ) );
 }
@@ -147,3 +197,3 @@ void InstallDlgImpl :: installSelected()
 {
-    if ( btnInstall->text() == "Abort" )
+    if ( btnInstall->text() == tr( "Abort" ) )
     {
@@ -151,5 +201,5 @@ void InstallDlgImpl :: installSelected()
         {
-            displayText( "\n**** User Clicked ABORT ***" );
+            displayText( tr( "\n**** User Clicked ABORT ***" ) );
             pIpkg->abort();
-            displayText( "**** Process Aborted ****" );
+            displayText( tr( "**** Process Aborted ****" ) );
         }
@@ -157,2 +207,3 @@ void InstallDlgImpl :: installSelected()
         btnInstall->setText( tr( "Close" ) );
+        btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
         return;
@@ -161,3 +212,3 @@ void InstallDlgImpl :: installSelected()
     {
-        done( 1 );
+        emit reloadData( this );
         return;
@@ -169,4 +220,4 @@ void InstallDlgImpl :: installSelected()
 
-    btnInstall->setText( "Abort" );
-
+    btnInstall->setText( tr( "Abort" ) );
+    btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
     if ( pIpkg )
@@ -174,3 +225,2 @@ void InstallDlgImpl :: installSelected()
         output->setText( "" );
-        
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
@@ -244,2 +294,3 @@ void InstallDlgImpl :: installSelected()
         delete pIpkg;
+        pIpkg = 0;
     }
@@ -249,4 +300,5 @@ void InstallDlgImpl :: installSelected()
     btnInstall->setText( tr( "Close" ) );
+    btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
 
-    if ( destination->currentText() != 0 && destination->currentText() != "" )
+    if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
         displayAvailableSpace( destination->currentText() );
@@ -257,4 +309,5 @@ void InstallDlgImpl :: displayText(const QString &text )
 {
-    QString t = output->text() + "\n" + text;
-    output->setText( t );
+    //output->setText( QString( "%1\n%2" ).arg( output->text() ).arg( text ) );
+    QString newtext = QString( "%1\n%2" ).arg( output->text() ).arg( text );
+    output->setText( newtext );
     output->setCursorPosition( output->numLines(), 0 );
@@ -286,5 +339,6 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
     else
-        space = "Unknown";
+        space = tr( "Unknown" );
         
-    txtAvailableSpace->setText( space );
+    if ( txtAvailableSpace )
+        txtAvailableSpace->setText( space );
 }