4 files changed, 63 insertions, 11 deletions

diff --git a/noncore/settings/packagemanager/mainwindow.cpp b/noncore/settings/packagemanager/mainwindow.cpp
index 486561d..05f21bc 100644
--- a/noncore/settings/packagemanager/mainwindow.cpp
+++ b/noncore/settings/packagemanager/mainwindow.cpp
@@ -38,24 +38,25 @@
 #include <qtoolbar.h>
 #include <qwhatsthis.h>
 
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include "mainwindow.h"
 #include "installdlg.h"
 #include "filterdlg.h"
 #include "promptdlg.h"
 #include "entrydlg.h"
+#include "packageinfodlg.h"
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags fl )
     : QMainWindow( parent, name, fl || WStyle_ContextHelp )
     , m_config( "packman" )
     , m_packman( &m_config, this )
     , m_menuBar( this )
     , m_toolBar( this )
     , m_findBar( this )
     , m_widgetStack( this )
     , m_packageList( this )
     , m_statusWidget( this )
     , m_statusText( &m_statusWidget )
@@ -108,24 +109,26 @@ void MainWindow::closeEvent( QCloseEvent *event )
     {
         delete m_widgetStack.visibleWidget();
         m_widgetStack.raiseWidget( &m_packageList );
         event->ignore();
     }
 }
 
 void MainWindow::initPackageList()
 {
     m_packageList.addColumn( tr( "Packages" ) );
     QWhatsThis::add( &m_packageList, tr( "This is a listing of all packages.\n\nA blue dot next to the package name indicates that the package is currently installed.\n\nA blue dot with a star indicates that a newer version of the package is available from the server feed.\n\nClick inside the box at the left to select a package." ) );
     QPEApplication::setStylusOperation( m_packageList.viewport(), QPEApplication::RightOnHold );
+    connect( &m_packageList, SIGNAL(rightButtonPressed(QListViewItem *,const QPoint &,int)),
+             this, SLOT(slotDisplayPackageInfo(QListViewItem *)) );
 }
 
 void MainWindow::initStatusWidget()
 {
     QVBoxLayout *layout = new QVBoxLayout( &m_statusWidget, 4, 4 );
 
     m_statusText.setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
     layout->addWidget( &m_statusText );
 
     connect( &m_packman, SIGNAL(initStatus(int)), this, SLOT(slotInitStatusBar(int)) );
     connect( &m_packman, SIGNAL(statusText(const QString &)), this, SLOT(slotStatusText(const QString &)) );
     connect( &m_packman, SIGNAL(statusBar(int)), this, SLOT(slotStatusBar(int)) );
@@ -343,37 +346,37 @@ void MainWindow::slotStatusText( const QString &status )
 }
 
 void MainWindow::slotStatusBar( int currStep )
 {
     m_statusBar.setProgress( currStep );
 }
 
 void MainWindow::slotUpdate()
 {
     // Create package manager output widget
     InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Update package information" ), false,
                                       OPackage::Update );
-    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseInstallDlg()) );
+    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
 
     // Display widget
     m_widgetStack.addWidget( dlg, 3 );
     m_widgetStack.raiseWidget( dlg );
 }
 
 void MainWindow::slotUpgrade()
 {
     // Create package manager output widget
     InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Upgrade installed packages" ), false,
                                       OPackage::Upgrade );
-    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseInstallDlg()) );
+    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
 
     // Display widget
     m_widgetStack.addWidget( dlg, 3 );
     m_widgetStack.raiseWidget( dlg );
 }
 
 void MainWindow::slotDownload()
 {
     // Retrieve list of packages selected for download (if any)
     QStringList *workingPackages = new QStringList();
 
     for ( QCheckListItem *item = static_cast<QCheckListItem *>(m_packageList.firstChild());
@@ -402,25 +405,25 @@ void MainWindow::slotDownload()
         else
             return; // user entered nothing or pressed cancel
 
         // Store download directory in config file
         m_config.writeEntry( "DownloadDir", workingDir );
 
         // Get starting directory
         QDir::setCurrent( workingDir );
 
         // Create package manager output widget
         InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Download packages" ), false,
                                         OPackage::Download, workingPackages );
-        connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseInstallDlg()) );
+        connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
 
         // Display widget
         m_widgetStack.addWidget( dlg, 3 );
         m_widgetStack.raiseWidget( dlg );
     }
 }
 
 void MainWindow::slotApply()
 {
     QStringList *removeList = 0x0;
     QStringList *installList = 0x0;
     QStringList *upgradeList = 0x0;
@@ -500,32 +503,32 @@ void MainWindow::slotApply()
     OPackage::Command installCmd = OPackage::NotDefined;
     if ( installList && !installList->isEmpty() )
         installCmd = OPackage::Install;
     OPackage::Command upgradeCmd = OPackage::NotDefined;
     if ( upgradeList && !upgradeList->isEmpty() )
         upgradeCmd = OPackage::Upgrade;
 
     // Create package manager output widget
     InstallDlg *dlg = new InstallDlg( this, &m_packman, tr( "Apply changes" ), true,
                                       removeCmd, removeList,
                                       installCmd, installList,
                                       upgradeCmd, upgradeList );
-    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseInstallDlg()) );
+    connect( dlg, SIGNAL(closeInstallDlg()), this, SLOT(slotCloseDlg()) );
 
     // Display widget
     m_widgetStack.addWidget( dlg, 3 );
     m_widgetStack.raiseWidget( dlg );
 }
 
-void MainWindow::slotCloseInstallDlg()
+void MainWindow::slotCloseDlg()
 {
     // Close install dialog
     delete m_widgetStack.visibleWidget();
 
     // Reload package list
     initPackageInfo();
 
     // Update Opie launcher links
     QCopEnvelope e("QPE/System", "linkChanged(QString)");
     QString lf = QString::null;
     e << lf;
 }
@@ -656,12 +659,25 @@ void MainWindow::slotFindHideToolbar()
 
 void MainWindow::slotFindChanged( const QString &findText )
 {
 
     m_actionFindNext->setEnabled( !findText.isEmpty() );
     searchForPackage( findText );
 }
 
 void MainWindow::slotFindNext()
 {
     searchForPackage( m_findEdit->text() );
 }
+
+void MainWindow::slotDisplayPackageInfo( QListViewItem *packageItem )
+{
+    QString packageName( ( static_cast<QCheckListItem*>( packageItem ) )->text() );
+
+    // Create package manager output widget
+    PackageInfoDlg *dlg = new PackageInfoDlg( this, &m_packman, packageName );
+    connect( dlg, SIGNAL(closeInfoDlg()), this, SLOT(slotCloseDlg()) );
+
+    // Display widget
+    m_widgetStack.addWidget( dlg, 3 );
+    m_widgetStack.raiseWidget( dlg );
+}
diff --git a/noncore/settings/packagemanager/mainwindow.h b/noncore/settings/packagemanager/mainwindow.h
index 285cddf..fb555c5 100644
--- a/noncore/settings/packagemanager/mainwindow.h
+++ b/noncore/settings/packagemanager/mainwindow.h
@@ -107,30 +107,33 @@ private slots:
     void slotWidgetStackShow( QWidget *widget );
 
     // Status widget slots
     void slotInitStatusBar( int numSteps );
     void slotStatusText( const QString &status );
     void slotStatusBar( int currStep );
 
     // Actions menu action slots
     void slotUpdate();
     void slotUpgrade();
     void slotDownload();
     void slotApply();
-    void slotCloseInstallDlg();
+    void slotCloseDlg();
     void slotConfigure();
 
     // View menu action slots
     void slotShowNotInstalled();
     void slotShowInstalled();
     void slotShowUpdated();
     void slotFilterChange();
     void slotFilter( bool isOn );
 
     // Find action slots
     void slotFindShowToolbar();
     void slotFindHideToolbar();
     void slotFindChanged( const QString &findText );
     void slotFindNext();
+
+    // Other slots
+    void slotDisplayPackageInfo( QListViewItem * );
 };
 
 #endif
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index 71f17eb..26356b9 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -25,32 +25,58 @@
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "packageinfodlg.h"
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 
 #include <qpe/resource.h>
 
+#include <opie/otabwidget.h>
+
 PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
     : QWidget( 0x0 )
     , m_packman( pm )
-    , m_output( this )
+    , m_information( this )
+    , m_files( this )
 {
     // Initialize UI
     if ( parent )
         parent->setCaption( package );
 
     QVBoxLayout *layout = new QVBoxLayout( this, 4, 0 );
 
-    m_output.setReadOnly( true );
-    layout->addWidget( &m_output );
+    OTabWidget *tabWidget = new OTabWidget( this );
+    layout->addWidget( tabWidget );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "enter" ), tr( "Close" ), this );
     layout->addWidget( btn );
-// TODO    connect( btn, SIGNAL(clicked()), this, SLOT(slotBtnClose()) );
+    connect( btn, SIGNAL(clicked()), this, SLOT(slotBtnClose()) );
+
+    // Information tab
+    m_information.reparent( tabWidget, QPoint( 0, 0 ) );
+    m_information.setReadOnly( true );
+    tabWidget->addTab( &m_information, "UtilsIcon", tr( "Information" ) );
+
+    // Files tab
+    QWidget *filesWidget = new QWidget( tabWidget );
+    QVBoxLayout *filesLayout = new QVBoxLayout( filesWidget, 4, 0 );
+    m_files.reparent( filesWidget, QPoint( 0, 0 ) );
+    m_files.setReadOnly( true );
+    filesLayout->addWidget( &m_files );
 
+    btn = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ), tr( "Retrieve file list" ),
+                           filesWidget );
+    filesLayout->addWidget( btn );
+// TODO    connect( btn, SIGNAL(clicked()), this, SLOT(slotFileScan()) );
+    tabWidget->addTab( filesWidget, "binary", tr( "Files" ) );
 
+    tabWidget->setCurrentTab( tr( "Information" ) );
+}
+
+void PackageInfoDlg::slotBtnClose()
+{
+    emit closeInfoDlg();
 }
diff --git a/noncore/settings/packagemanager/packageinfodlg.h b/noncore/settings/packagemanager/packageinfodlg.h
index 3bb9a7a..09af6f4 100644
--- a/noncore/settings/packagemanager/packageinfodlg.h
+++ b/noncore/settings/packagemanager/packageinfodlg.h
@@ -43,16 +43,23 @@ class OPackageManager;
 
 class PackageInfoDlg : public QWidget
 {
     Q_OBJECT
 
 public:
     PackageInfoDlg( QWidget *parent = 0x0, OPackageManager *pm = 0x0, const QString &package = QString::null );
 
 private:
     OPackageManager *m_packman;     // Pointer to application instance of package manager
 
     // UI controls
-    QMultiLineEdit   m_output;      // Multi-line edit to display package information
+    QMultiLineEdit   m_information; // Multi-line edit to display package information
+    QMultiLineEdit   m_files;       // Multi-line edit to display package file list
+
+private slots:
+    void slotBtnClose();
+
+signals:
+    void closeInfoDlg();
 };
 
 #endif