Now display package information in separate window...easier for those long descriptions. Also use click and hold to display info, not double-click.

5 files changed, 180 insertions, 38 deletions

diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index 5b5d506..d241d1b 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -2,12 +2,13 @@ TEMPLATE	= app
 CONFIG		= qt warn_on release
 HEADERS		= global.h \
 		  mainwin.h \
 		  datamgr.h \
 		  settingsimpl.h \
 		  ipkg.h \
+		  packagewin.h \
 		  package.h \
 		  installdlgimpl.h \
 		  instoptionsimpl.h \
 		  destination.h \
 		  utils.h \
 		  server.h \
@@ -17,12 +18,13 @@ HEADERS		= global.h \
 SOURCES		= mainwin.cpp \
 		  datamgr.cpp \
 		  mem.cpp \
 		  settingsimpl.cpp \
 		  ipkg.cpp \
 		  main.cpp \
+		  packagewin.cpp \
 		  package.cpp \
 		  installdlgimpl.cpp \
 		  instoptionsimpl.cpp \
 		  destination.cpp \
 		  utils.cpp \
 		  server.cpp \
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index fb40d52..1aec6a8 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -45,12 +45,13 @@
 #include "global.h"
 #include "inputdlg.h"
 #include "ipkg.h"
 #include "installdlgimpl.h"
 #include "letterpushbutton.h"
 #include "mainwin.h"
+#include "packagewin.h"
 #include "settingsimpl.h"
 #include "utils.h"
 
 extern int compareVersions( const char *v1, const char *v2 );
 
 MainWindow :: MainWindow()
@@ -227,21 +228,24 @@ void MainWindow :: initMainWidget()
 {
     networkPkgWindow = new QWidget( this );
 
     QLabel *l = new QLabel( tr( "Servers:" ), networkPkgWindow );
 
     serversList = new QComboBox( networkPkgWindow );
-    connect( serversList, SIGNAL( activated( int ) ), this, SLOT( serverSelected( int ) ) );
+    connect( serversList, SIGNAL(activated(int)), this, SLOT(serverSelected(int)) );
     QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) );
 
     installedIcon = Resource::loadPixmap( "installed" );
     updatedIcon = Resource::loadPixmap( "aqpkg/updated" );
 
     packagesList = new QListView( networkPkgWindow );
     packagesList->addColumn( tr( "Packages" ), 225 );
     QWhatsThis::add( packagesList, tr( "This is a listing of all packages for the server feed selected above.\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( packagesList->viewport(), QPEApplication::RightOnHold );
+    connect( packagesList, SIGNAL(rightButtonPressed(QListViewItem *,const QPoint &,int)),
+             this, SLOT(slotDisplayPackage(QListViewItem *)) );
 
     QVBoxLayout *vbox = new QVBoxLayout( networkPkgWindow, 0, -1 );
     QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
     hbox1->addWidget( l );
     hbox1->addWidget( serversList );
 
@@ -668,55 +672,18 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
                 item->setPixmap( 0, updatedIcon );
             }
             else
             {
                 item->setPixmap( 0, installedIcon );
             }
-
-            QString destName = "";
-            if ( package->getLocalPackage() )
-            {
-                if ( package->getLocalPackage()->getInstalledTo() )
-                    destName = package->getLocalPackage()->getInstalledTo()->getDestinationName();
-            }
-            else
-            {
-                if ( package->getInstalledTo() )
-                    destName = package->getInstalledTo()->getDestinationName();
-            }
-            if ( destName != "" )
-                new QCheckListItem( item, QString( tr( "Installed To - %1" ).arg( destName ) ) );
         }
         else
         {
             item->setPixmap( 0, nullIcon );
         }
 
-        if ( !package->isPackageStoredLocally() )
-        {
-            new QCheckListItem( item, QString( tr( "Description - %1" ).arg( package->getDescription() ) ) );
-            new QCheckListItem( item, QString( tr( "Size - %1" ).arg( package->getPackageSize() ) ) );
-            new QCheckListItem( item, QString( tr( "Section - %1" ).arg( package->getSection() ) ) );
-                    }
-        else
-            new QCheckListItem( item, QString( tr( "Filename - %1" ).arg( package->getFilename() ) ) );
-
-		if ( serverName == LOCAL_SERVER )
-		{
-        	new QCheckListItem( item, QString( tr( "V. Installed - %1" ).arg( package->getVersion() ) ) );
-		}
-		else
-		{
-        	new QCheckListItem( item, QString( tr( "V. Available - %1" ).arg( package->getVersion() ) ) );
-        	if ( package->getLocalPackage() )
-        	{
-				if ( package->isInstalled() )
-	            	new QCheckListItem( item, QString( tr( "V. Installed - %1" ).arg( package->getInstalledVersion() ) ) );
-			}
-		}
-
         packagesList->insertItem( item );
     }
 
     // If the local server or the local ipkgs server disable the download button
     if ( serverName == LOCAL_SERVER )
     {
@@ -1179,6 +1146,13 @@ void MainWindow :: letterPushed( QString t )
 
         item = (QCheckListItem *)item->nextSibling();
         if ( !item )
             item = (QCheckListItem *)packagesList->firstChild();
     } while ( item != start);
 }
+
+void MainWindow :: slotDisplayPackage( QListViewItem *item )
+{
+    QString itemstr( ((QCheckListItem*)item)->text() );
+    PackageWindow *p = new PackageWindow( mgr->getServer( serversList->currentText() )->getPackage( itemstr ) );
+    p->showMaximized();
+}
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index 4b044de..0295519 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -28,12 +28,13 @@ class InstallDlgImpl;
 class QAction;
 class QCheckListItem;
 class QComboBox;
 class QLabel;
 class QLineEdit;
 class QListView;
+class QListViewItem;
 class QToolBar;
 class QProgressBar;
 class QWidgetStack;
 
 class MainWindow :public  QMainWindow
 {
@@ -132,8 +133,9 @@ private slots:
     void serverSelected( int index );
     void updateServer();
     void upgradePackages();
     void downloadPackage();
     void applyChanges();
     void letterPushed( QString t );
+    void slotDisplayPackage( QListViewItem * );
 };
 #endif
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp
new file mode 100644
index 0000000..f00453e
--- a/dev/null
+++ b/noncore/settings/aqpkg/packagewin.cpp
@@ -0,0 +1,119 @@
+/*
+                             This file is part of the OPIE Project
+               =.
+             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
+           .>+-=
+ _;:,     .>    :=|.         This file is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This file is distributed in the hope that
+     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+..}^=.=       =       ;      Public License for more details.
+++=   -.     .`     .:
+ :     =  ...= . :.=-        You should have received a copy of the GNU
+ -.   .:....=;==+<;          General Public License along with this file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
+#include "packagewin.h"
+#include "package.h"
+#include "datamgr.h"
+
+#include <qpe/resource.h>
+
+#include <qlabel.h>
+#include <qlayout.h>
+#include <qpushbutton.h>
+#include <qstring.h>
+
+PackageWindow::PackageWindow( Package *package, const QString &server )
+	: QWidget( 0, 0, 0 )
+{
+	QVBoxLayout *layout = new QVBoxLayout( this, 4, 4 );
+	QString str;
+	if ( package )
+	{
+		setCaption( package->getPackageName() );
+		QString destName;
+		if ( package->getLocalPackage() )
+		{
+			if ( package->getLocalPackage()->getInstalledTo() )
+				destName = package->getLocalPackage()->getInstalledTo()->getDestinationName();
+		}
+		else
+		{
+			if ( package->getInstalledTo() )
+				destName = package->getInstalledTo()->getDestinationName();
+		}
+
+		if ( !package->isPackageStoredLocally() )
+		{
+			str.append( tr( "<b>Description</b> - " ) );
+			str.append( package->getDescription() );
+			if ( !destName.isNull() )
+			{
+				str.append( tr( "<p><b>Installed To</b> - " ) );
+				str.append( destName );
+			}
+			str.append( tr( "<p><b>Size</b> - " ) );
+			str.append( package->getPackageSize() );
+			str.append( tr( "<p><b>Section</b> - " ) );
+			str.append( package->getSection() );
+		}
+		else
+		{
+			str.append( tr( "<p><b>Filename</b> - " ) );
+			str.append( package->getFilename() );
+		}
+
+		if ( server == LOCAL_SERVER )
+		{
+			str.append( tr( "<p><b>Version Installed</b> - " ) );
+			str.append( package->getVersion() );
+		}
+		else
+		{
+			str.append( tr( "<p><b>Version Available</b> - " ) );
+			str.append( package->getVersion() );
+			if ( package->getLocalPackage() )
+			{
+				if ( package->isInstalled() )
+				{
+					str.append( tr( "<p><b>Version Installed</b> - " ) );
+					str.append( package->getInstalledVersion() );
+				}
+			}
+		}
+	}
+	else
+	{
+		setCaption( tr( "Package Information" ) );
+		str = tr( "Package information is unavailable" );
+	}
+	
+	QLabel *l = new QLabel( str, this );
+	l->setTextFormat( Qt::RichText );
+	l->setAlignment( Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak );
+	layout->addWidget( l );
+	
+	QPushButton *btn = new QPushButton( Resource::loadPixmap( "enter" ), tr( "Close" ), this );
+	layout->addWidget( btn );
+	connect( btn, SIGNAL( clicked() ), this, SLOT( close() ) );
+
+}
+
+PackageWindow::~PackageWindow()
+{
+}
+
diff --git a/noncore/settings/aqpkg/packagewin.h b/noncore/settings/aqpkg/packagewin.h
new file mode 100644
index 0000000..c1943b5
--- a/dev/null
+++ b/noncore/settings/aqpkg/packagewin.h
@@ -0,0 +1,45 @@
+/*
+                             This file is part of the OPIE Project
+               =.
+             .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
+           .>+-=
+ _;:,     .>    :=|.         This file is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This file is distributed in the hope that
+     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+..}^=.=       =       ;      Public License for more details.
+++=   -.     .`     .:
+ :     =  ...= . :.=-        You should have received a copy of the GNU
+ -.   .:....=;==+<;          General Public License along with this file;
+  -_. . .   )=.  =           see the file COPYING. If not, write to the
+    --        :-=`           Free Software Foundation, Inc.,
+                             59 Temple Place - Suite 330,
+                             Boston, MA 02111-1307, USA.
+
+*/
+
+#ifndef PACKAGEWIN_H
+#define PACKAGEWIN_H
+
+#include <qwidget.h>
+
+class Package;
+
+class PackageWindow :public  QWidget
+{
+	Q_OBJECT
+public:
+
+	PackageWindow( Package * = 0x0, const QString & = QString::null );
+	~PackageWindow();
+};
+
+#endif
\ No newline at end of file