author | drw <drw> | 2003-01-19 21:10:00 (UTC) |
---|---|---|
committer | drw <drw> | 2003-01-19 21:10:00 (UTC) |
commit | 49786b34a40d0e2ba6dd5c77acddf1c38758b89c (patch) (side-by-side diff) | |
tree | 3cb1c1c1593d17256910fb57111b19a87898ae74 /noncore | |
parent | ae272396cec6ca6bcfbee0d59b7948b7fe908238 (diff) | |
download | opie-49786b34a40d0e2ba6dd5c77acddf1c38758b89c.zip opie-49786b34a40d0e2ba6dd5c77acddf1c38758b89c.tar.gz opie-49786b34a40d0e2ba6dd5c77acddf1c38758b89c.tar.bz2 |
Updates to main package list, icons for installed/updated packages, QWhatsThis and a couple other tweaks
-rw-r--r-- | noncore/settings/aqpkg/aqpkg.pro | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/main.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 85 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.h | 4 |
5 files changed, 47 insertions, 58 deletions
diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro index 5fc323a..b69bae4 100644 --- a/noncore/settings/aqpkg/aqpkg.pro +++ b/noncore/settings/aqpkg/aqpkg.pro @@ -1,6 +1,6 @@ TEMPLATE = app -CONFIG = qt warn_on debug +CONFIG = qt warn_on release HEADERS = global.h \ mainwin.h \ datamgr.h \ settingsimpl.h \ diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp index 53c392e..15ef9d6 100644 --- a/noncore/settings/aqpkg/main.cpp +++ b/noncore/settings/aqpkg/main.cpp @@ -14,11 +14,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include <iostream> -using namespace std; - #ifdef QWS #include <qpe/qpeapplication.h> #include <qpe/qcopenvelope_qws.h> #else @@ -34,18 +31,18 @@ using namespace std; int main(int argc, char *argv[]) { - cout << "Root dir = " << ROOT << endl; +// cout << "Root dir = " << ROOT << endl; #ifdef QWS QPEApplication a( argc, argv ); #else QApplication a( argc, argv ); #endif #ifdef QWS // Disable suspend mode - cout << "Disabling suspend mode" << endl; +// cout << "Disabling suspend mode" << endl; QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend; #endif MainWindow *win = new MainWindow(); @@ -55,9 +52,9 @@ int main(int argc, char *argv[]) a.exec(); #ifdef QWS // Reenable suspend mode - cout << "Enabling suspend mode" << endl; +// cout << "Enabling suspend mode" << endl; QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; #endif #ifdef _DEBUG DumpUnfreed(); diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 1a2ac37..d79673f 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp @@ -14,11 +14,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include <iostream> -using namespace std; - #include <qpe/qpemenubar.h> #include <qpe/qpetoolbar.h> #include <qpe/resource.h> @@ -223,9 +220,9 @@ void MainWindow :: init() void MainWindow :: setDocument( const QString &doc ) { // Remove path from package QString package = Utils::getPackageNameFromIpkFilename( doc ); - std::cout << "Selecting package " << package << std::endl; +// std::cout << "Selecting package " << package << std::endl; networkPkgWindow->selectLocalPackage( package ); } void MainWindow :: displaySettings() 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 @@ -14,26 +14,22 @@ * (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" @@ -96,9 +92,9 @@ void NetworkPackageManager :: updateData() // cout << "Adding " << it->getServerName() << " to combobox" << endl; if ( !it->isServerActive() ) { - cout << serverName << " is not active" << endl; +// cout << serverName << " is not active" << endl; i--; continue; } @@ -144,10 +140,16 @@ 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 ); @@ -173,10 +175,9 @@ void NetworkPackageManager :: initGui() } } vbox->addWidget( packagesList ); - packagesList->addColumn( tr( "Packages" ) ); - + downloadEnabled = TRUE; } void NetworkPackageManager :: serverSelected( int index ) @@ -185,8 +186,11 @@ void NetworkPackageManager :: serverSelected( int index ) } void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) { + QPixmap nullIcon( installedIcon.size() ); + nullIcon.fill( colorGroup().base() ); + // display packages QString serverName = serversList->currentText(); currentlySelectedServer = serverName; @@ -259,26 +263,25 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) 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 ); } - } - - QCheckListItem *item = new QCheckListItem( packagesList, text, QCheckListItem::CheckBox ); - - if ( it->isInstalled() ) - { + else + { + item->setPixmap( 0, installedIcon ); + } + QString destName = ""; if ( it->getLocalPackage() ) { if ( it->getLocalPackage()->getInstalledTo() ) @@ -291,15 +294,19 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) } 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() ) ) ); - } + } else new QCheckListItem( item, QString( tr( "Filename - %1" ).arg( it->getFilename() ) ) ); if ( serverName == LOCAL_SERVER ) @@ -507,18 +514,9 @@ void NetworkPackageManager :: downloadSelectedPackages() 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( ); } } } @@ -613,15 +611,8 @@ void NetworkPackageManager :: applyChanges() // 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 ); @@ -650,10 +641,10 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) 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(); @@ -733,11 +724,11 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) 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 ) @@ -777,9 +768,9 @@ 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 ) @@ -790,12 +781,12 @@ void NetworkPackageManager :: searchForPackage( const QString &text ) 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; } diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h index bd005e2..99eff2e 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.h +++ b/noncore/settings/aqpkg/networkpkgmgr.h @@ -18,8 +18,9 @@ #ifndef NETWORKPKGMGR_H #define NETWORKPKGMGR_H #include <qlayout.h> +#include <qpixmap.h> #include <qpushbutton.h> #include <qwidget.h> #include <qcombobox.h> #include <qlistview.h> @@ -52,8 +53,11 @@ private: DataManager *dataMgr; QComboBox *serversList; QListView *packagesList; + + QPixmap installedIcon; + QPixmap updatedIcon; QString currentlySelectedServer; QString categoryFilter; |