8 files changed, 34 insertions, 13 deletions

diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index 45a6663..42093cf 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -1009,12 +1009,17 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
         return newitem;
     }
     else
     {
         InstallData *newitem = new InstallData();
         newitem->option = "D";
+        
+        // If local file, remove using package name, not filename
+        if ( p->isPackageStoredLocally() )
+            name = item->text();
+        
         if ( !p->isPackageStoredLocally() )
             newitem->packageName = p->getInstalledPackageName();
         else
             newitem->packageName = name;
 
         if ( p->getInstalledTo() )
@@ -1038,12 +1043,16 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
             // Error - should handle
         }
         else if ( val == -1 )
         {
             // Version available is older - remove only
             newitem->option = "D";
+           
+            // If local file, remove using package name, not filename
+            if ( p->isPackageStoredLocally() )
+                name = item->text();
         }
         else
         {
             QString caption;
             QString text;
             QString secondButton;
@@ -1077,12 +1086,15 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
                     case 0: // Cancel
                         delete newitem;
                         return 0x0;
                         break;
                     case 1: // Remove
                         newitem->option = "D";
+                        // If local file, remove using package name, not filename
+                        if ( p->isPackageStoredLocally() )
+                            name = item->text();
                         break;
                     case 2: // Reinstall or Upgrade
                         newitem->option = secondOption;
                         break;
                 }
             }
diff --git a/noncore/settings/aqpkg/opie-aqpkg.control b/noncore/settings/aqpkg/opie-aqpkg.control
index b8ad1e8..46bffdd 100644
--- a/noncore/settings/aqpkg/opie-aqpkg.control
+++ b/noncore/settings/aqpkg/opie-aqpkg.control
@@ -1,11 +1,11 @@
 Package: opie-aqpkg
 Files: bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop 
 Priority: optional
 Section: Settings
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Replaces: aqpkg
 Architecture: arm
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
 Description: A Package Manager
 
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index adda832..5a521d3 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -113,12 +113,13 @@ void Package :: setLocalPackage( Package *p )
             differentVersionAvailable = false;
 }
 
 void Package :: setVersion( const QString &v )
 {
     version = v;
+            differentVersionAvailable = false;
 
     if ( localPackage )
         if ( localPackage->getVersion() < getVersion() && !installed )
             differentVersionAvailable = true;
         else
             differentVersionAvailable = false;
diff --git a/noncore/settings/aqpkg/packagewin.cpp b/noncore/settings/aqpkg/packagewin.cpp
index 9553cd1..499d647 100644
--- a/noncore/settings/aqpkg/packagewin.cpp
+++ b/noncore/settings/aqpkg/packagewin.cpp
@@ -41,17 +41,18 @@
 PackageWindow::PackageWindow( Package *package, const QString &server )
         : QWidget( 0, 0, 0 )
 {
         QString str;
         if ( package )
         {
+        Package *local = package->getLocalPackage();
                 setCaption( package->getPackageName() );
                 QString destName;
-                if ( package->getLocalPackage() )
+                if ( local )
                 {
-                        if ( package->getLocalPackage()->getInstalledTo() )
+                        if ( local->getInstalledTo() )
                                 destName = package->getLocalPackage()->getInstalledTo()->getDestinationName();
                 }
                 else
                 {
                         if ( package->getInstalledTo() )
                                 destName = package->getInstalledTo()->getDestinationName();
@@ -83,13 +84,13 @@ PackageWindow::PackageWindow( Package *package, const QString &server )
                         str.append( package->getVersion() );
                 }
                 else
                 {
                         str.append( tr( "<p><b>Version Available</b> - " ) );
                         str.append( package->getVersion() );
-                        if ( package->getLocalPackage() )
+                        if ( local )
                         {
                                 if ( package->isInstalled() )
                                 {
                                         str.append( tr( "<p><b>Version Installed</b> - " ) );
                                         str.append( package->getInstalledVersion() );
                                 }
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp
index 4693db1..0282236 100644
--- a/noncore/settings/aqpkg/server.cpp
+++ b/noncore/settings/aqpkg/server.cpp
@@ -116,13 +116,13 @@ void Server :: readLocalIpks( Server *local )
     {
         // OK, we have a local IPK file, I think the standard naming conventions
         // for these are packagename_version_arm.ipk
         QString file = (*it)->file();
 
         // Changed to display the filename (excluding the path)
-        QString packageName = Utils::getFilenameFromIpkFilename( file );
+        QString packageName = Utils::getPackageNameFromIpkFilename( file );      
         QString ver = Utils::getPackageVersionFromIpkFilename( file );
         Package *package = new Package( packageName );
         package->setVersion( ver );
         package->setFilename( file );
         package->setPackageStoredLocally( true );
         packageList.append( package );
@@ -241,12 +241,15 @@ void Server :: readPackageFile( Server *local, bool clearAll, bool installingToR
 }
 
 void Server :: buildLocalPackages( Server *local )
 {
     Package *curr;
     QListIterator<Package> it( packageList );
+    
+    QList<Package> *locallist = &local->getPackageList();
+    
     for ( ; it.current(); ++it )
     {
         curr = it.current();
         QString name = curr->getPackageName();
 
         // If the package name is an ipk name, then convert the filename to a package name
@@ -256,12 +259,20 @@ void Server :: buildLocalPackages( Server *local )
         if ( local )
         {
             Package *p = local->getPackage( name );
             curr->setLocalPackage( p );
             if ( p )
             {
+                // Replace local version 
+                if ( curr->getVersion() > p->getVersion() )
+                {
+                    int pos = locallist->at();
+                    locallist->remove( p );
+                    locallist->insert( pos, curr );
+                }
+                
                 // Set some default stuff like size and things
                 if ( p->getInstalledVersion() == curr->getVersion() )
                 {
                     p->setPackageSize( curr->getPackageSize() );
                     p->setSection( curr->getSection() );
                     p->setDescription( curr->getDescription() );
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index 3d127a8..8def0d6 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -45,13 +45,13 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
     ModulesView = new QListView( this );
     int colnum = ModulesView->addColumn( tr( "Module" ) );
     colnum = ModulesView->addColumn( tr( "Size" ) );
     ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
     colnum = ModulesView->addColumn( tr( "Use#" ) );
     ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
-    colnum = ModulesView->addColumn( tr( "Used By" ) );
+    colnum = ModulesView->addColumn( tr( "Used by" ) );
     ModulesView->setAllColumnsShowFocus( TRUE );
     layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 );
     QWhatsThis::add( ModulesView, tr( "This is a list of all the kernel modules currently loaded on this handheld device.\n\nClick and hold on a module to see additional information about the module, or to unload it." ) );
         
         // Test if we have /sbin/modinfo, and if so, allow module detail window
         if ( QFile::exists( "/sbin/modinfo" ) )
@@ -138,15 +138,13 @@ void ModulesInfo::slotSendClicked()
 {
         if ( !ModulesView->currentItem() )
         {
                 return;
         }
         
-        QString capstr = tr( "You really want to execute\n" );
-        capstr.append( CommandCB->currentText() );
-        capstr.append( "\nfor this module?" );
+        QString capstr = tr( "You really want to execute %1 for this module?" ).arg( CommandCB->currentText() );
 
         QString modname = ModulesView->currentItem()->text( 0 );
         
     if ( QMessageBox::warning( this, modname, capstr,
          QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
     {
diff --git a/noncore/settings/sysinfo/opie-sysinfo.control b/noncore/settings/sysinfo/opie-sysinfo.control
index acb51e5..8250174 100644
--- a/noncore/settings/sysinfo/opie-sysinfo.control
+++ b/noncore/settings/sysinfo/opie-sysinfo.control
@@ -1,10 +1,10 @@
 Package: opie-sysinfo
 Files: bin/sysinfo apps/Settings/sysinfo.desktop pics/sysinfo
 Priority: optional
 Section: opie/applications
 Maintainer: Dan Williams <williamsdr@acm.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: System Information dialog
  For the Opie environment.
+Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index 1de1a19..8dec9be 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -161,15 +161,13 @@ void ProcessInfo::slotSendClicked()
         QListViewItem *currprocess = ProcessView->currentItem();
         if ( !currprocess )
         {
                 return;
         }
         
-        QString capstr = tr( "You really want to send\n" );
-        capstr.append( SignalCB->currentText() );
-        capstr.append( "\nto this process?" );
+        QString capstr = tr( "You really want to send %1 to this process?" ).arg( SignalCB->currentText() );
 
         
         if ( QMessageBox::warning( this, currprocess->text( 1 ), capstr,
                  QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
         {
                 currprocess = ProcessView->currentItem();