Diffstat (limited to 'noncore/settings/aqpkg/networkpkgmgr.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 77 |
1 files changed, 34 insertions, 43 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index c209589..b4b6475 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp @@ -12,30 +12,26 @@ * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ -#include <fstream> -#include <iostream> -using namespace std; - #include <unistd.h> -#include <stdlib.h> -#include <linux/limits.h> #ifdef QWS #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/config.h> +#include <qpe/resource.h> #else #include <qapplication.h> #endif #include <qlabel.h> #include <qfile.h> #include <qmessagebox.h> +#include <qwhatsthis.h> #include "datamgr.h" #include "networkpkgmgr.h" #include "installdlgimpl.h" #include "ipkg.h" #include "inputdlg.h" @@ -94,13 +90,13 @@ void NetworkPackageManager :: updateData() emit progressUpdate( i ); qApp->processEvents(); // cout << "Adding " << it->getServerName() << " to combobox" << endl; if ( !it->isServerActive() ) { - cout << serverName << " is not active" << endl; +// cout << serverName << " is not active" << endl; i--; continue; } serversList->insertItem( serverName ); if ( serverName == currentlySelectedServer ) @@ -142,14 +138,20 @@ void NetworkPackageManager :: selectLocalPackage( const QString &pkg ) void NetworkPackageManager :: initGui() { QLabel *l = new QLabel( tr( "Servers" ), this ); serversList = new QComboBox( this ); connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int ))); + QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) ); + + installedIcon = Resource::loadPixmap( "aqpkg/installed" ); + updatedIcon = Resource::loadPixmap( "aqpkg/updated" ); packagesList = new QListView( this ); + 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." ) ); QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 ); QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 ); hbox1->addWidget( l ); hbox1->addWidget( serversList ); @@ -171,24 +173,26 @@ void NetworkPackageManager :: initGui() else hbox4->addWidget( b ); } } vbox->addWidget( packagesList ); - packagesList->addColumn( tr( "Packages" ) ); downloadEnabled = TRUE; } void NetworkPackageManager :: serverSelected( int index ) { serverSelected( index, TRUE ); } void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) { + QPixmap nullIcon( installedIcon.size() ); + nullIcon.fill( colorGroup().base() ); + // display packages QString serverName = serversList->currentText(); currentlySelectedServer = serverName; vector<Server>::iterator s = dataMgr->getServer( serverName ); @@ -257,30 +261,29 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) // If the local server, only display installed packages if ( serverName == LOCAL_SERVER && !it->isInstalled() ) continue; - text.append( it->getPackageName() ); + QCheckListItem *item = new QCheckListItem( packagesList, it->getPackageName(), QCheckListItem::CheckBox ); + if ( it->isInstalled() ) { - text.append( " (installed)" ); - - // If a different version of package is available, postfix it with an * - if ( it->getVersion() != it->getInstalledVersion() ) + // If a different version of package is available, show update available icon + // Otherwise, show installed icon + if ( it->getVersion() != it->getInstalledVersion() && + compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1) { - if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 ) - text.append( "*" ); + item->setPixmap( 0, updatedIcon ); } + else + { + item->setPixmap( 0, installedIcon ); } - QCheckListItem *item = new QCheckListItem( packagesList, text, QCheckListItem::CheckBox ); - - if ( it->isInstalled() ) - { QString destName = ""; if ( it->getLocalPackage() ) { if ( it->getLocalPackage()->getInstalledTo() ) destName = it->getLocalPackage()->getInstalledTo()->getDestinationName(); } @@ -289,12 +292,16 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) if ( it->getInstalledTo() ) destName = it->getInstalledTo()->getDestinationName(); } if ( destName != "" ) new QCheckListItem( item, QString( tr( "Installed To - %1" ).arg( destName ) ) ); } + else + { + item->setPixmap( 0, nullIcon ); + } if ( !it->isPackageStoredLocally() ) { new QCheckListItem( item, QString( tr( "Description - %1" ).arg( it->getDescription() ) ) ); new QCheckListItem( item, QString( tr( "Size - %1" ).arg( it->getPackageSize() ) ) ); new QCheckListItem( item, QString( tr( "Section - %1" ).arg( it->getSection() ) ) ); @@ -505,22 +512,13 @@ void NetworkPackageManager :: downloadSelectedPackages() for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); item != 0 ; item = (QCheckListItem *)item->nextSibling() ) { if ( item->isOn() ) { - QString name = item->text(); - int pos = name.find( "*" ); - name.truncate( pos ); - - // if (there is a (installed), remove it - pos = name.find( "(installed)" ); - if ( pos > 0 ) - name.truncate( pos - 1 ); - - ipkg.setPackage( name ); + ipkg.setPackage( item->text() ); ipkg.runIpkg( ); } } } void NetworkPackageManager :: downloadRemotePackage() @@ -611,19 +609,12 @@ void NetworkPackageManager :: applyChanges() // If not installed - install // If installed and different version available - upgrade // If installed and version up to date - remove InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) { QString name = item->text(); - int pos = name.find( "*" ); - name.truncate( pos ); - - // if (there is a (installed), remove it - pos = name.find( "(installed)" ); - if ( pos > 0 ) - name.truncate( pos - 1 ); // Get package vector<Server>::iterator s = dataMgr->getServer( serversList->currentText() ); Package *p = s->getPackage( name ); // If the package has a filename then it is a local file @@ -648,14 +639,14 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) else item.packageName = name; if ( p->getInstalledTo() ) { item.destination = p->getInstalledTo(); - cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl; - cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl; +// cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl; +// cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl; } else { item.destination = p->getLocalPackage()->getInstalledTo(); } @@ -731,15 +722,15 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) // User hit cancel (on dlg - assume remove) return item; } } -void NetworkPackageManager :: displayText( const QString &t ) +void NetworkPackageManager :: displayText( const QString &/*t*/ ) { - cout << t << endl; +// cout << t << endl; } void NetworkPackageManager :: letterPushed( QString t ) { QCheckListItem *top = (QCheckListItem *)packagesList->firstChild(); @@ -775,29 +766,29 @@ void NetworkPackageManager :: letterPushed( QString t ) void NetworkPackageManager :: searchForPackage( const QString &text ) { if ( !text.isEmpty() ) { - cout << "searching for " << text << endl; +// cout << "searching for " << text << endl; // look through package list for text startng at current position vector<InstallData> workingPackages; QCheckListItem *start = (QCheckListItem *)packagesList->currentItem(); if ( start != 0 ) start = (QCheckListItem *)start->nextSibling(); if ( start == 0 ) start = (QCheckListItem *)packagesList->firstChild(); for ( QCheckListItem *item = start; item != 0 ; item = (QCheckListItem *)item->nextSibling() ) { - cout << "checking " << item->text().lower() << endl; +// cout << "checking " << item->text().lower() << endl; if ( item->text().lower().find( text ) != -1 ) { - cout << "matched " << item->text() << endl; +// cout << "matched " << item->text() << endl; packagesList->ensureItemVisible( item ); packagesList->setCurrentItem( item ); break; } } } |