summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/aqpkg.pro2
-rw-r--r--noncore/settings/aqpkg/main.cpp9
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp5
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.cpp77
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.h4
5 files changed, 43 insertions, 54 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,5 +1,5 @@
TEMPLATE = app
-CONFIG = qt warn_on debug
+CONFIG = qt warn_on release
HEADERS = global.h \
mainwin.h \
datamgr.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
@@ -15,9 +15,6 @@
* *
***************************************************************************/
-#include <iostream>
-using namespace std;
-
#ifdef QWS
#include <qpe/qpeapplication.h>
#include <qpe/qcopenvelope_qws.h>
@@ -35,7 +32,7 @@ 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
@@ -44,7 +41,7 @@ int main(int argc, char *argv[])
#ifdef QWS
// Disable suspend mode
- cout << "Disabling suspend mode" << endl;
+// cout << "Disabling suspend mode" << endl;
QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend;
#endif
@@ -56,7 +53,7 @@ int main(int argc, char *argv[])
#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
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
@@ -15,9 +15,6 @@
* *
***************************************************************************/
-#include <iostream>
-using namespace std;
-
#include <qpe/qpemenubar.h>
#include <qpe/qpetoolbar.h>
#include <qpe/resource.h>
@@ -224,7 +221,7 @@ 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 );
}
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
@@ -15,24 +15,20 @@
* *
***************************************************************************/
-#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"
@@ -97,7 +93,7 @@ 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;
}
@@ -145,8 +141,14 @@ 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 );
@@ -174,7 +176,6 @@ void NetworkPackageManager :: initGui()
}
vbox->addWidget( packagesList );
- packagesList->addColumn( tr( "Packages" ) );
downloadEnabled = TRUE;
}
@@ -186,6 +187,9 @@ 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;
@@ -260,24 +264,23 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress )
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() )
{
@@ -292,6 +295,10 @@ 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() )
{
@@ -508,16 +515,7 @@ void NetworkPackageManager :: downloadSelectedPackages()
{
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( );
}
}
@@ -614,13 +612,6 @@ void NetworkPackageManager :: applyChanges()
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() );
@@ -651,8 +642,8 @@ 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
{
@@ -734,9 +725,9 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item )
}
}
-void NetworkPackageManager :: displayText( const QString &t )
+void NetworkPackageManager :: displayText( const QString &/*t*/ )
{
- cout << t << endl;
+// cout << t << endl;
}
@@ -778,7 +769,7 @@ 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();
@@ -791,10 +782,10 @@ 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
@@ -19,6 +19,7 @@
#define NETWORKPKGMGR_H
#include <qlayout.h>
+#include <qpixmap.h>
#include <qpushbutton.h>
#include <qwidget.h>
#include <qcombobox.h>
@@ -54,6 +55,9 @@ private:
QComboBox *serversList;
QListView *packagesList;
+ QPixmap installedIcon;
+ QPixmap updatedIcon;
+
QString currentlySelectedServer;
QString categoryFilter;