Merge from BRANCH_1_0

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
@@ -1014,2 +1014,7 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
         newitem->option = "D";
+        
+        // If local file, remove using package name, not filename
+        if ( p->isPackageStoredLocally() )
+            name = item->text();
+        
         if ( !p->isPackageStoredLocally() )
@@ -1043,2 +1048,6 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
             newitem->option = "D";
+           
+            // If local file, remove using package name, not filename
+            if ( p->isPackageStoredLocally() )
+                name = item->text();
         }
@@ -1082,2 +1091,5 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
                         newitem->option = "D";
+                        // If local file, remove using package name, not filename
+                        if ( p->isPackageStoredLocally() )
+                            name = item->text();
                         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
@@ -4,3 +4,2 @@ Priority: optional
 Section: Settings
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
@@ -11 +10,2 @@ 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
@@ -118,2 +118,3 @@ void Package :: setVersion( const QString &v )
     version = v;
+            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
@@ -46,7 +46,8 @@ PackageWindow::PackageWindow( Package *package, const QString &server )
 	{
+        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();
@@ -88,3 +89,3 @@ PackageWindow::PackageWindow( Package *package, const QString &server )
 			str.append( package->getVersion() );
-			if ( package->getLocalPackage() )
+			if ( local )
 			{
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
@@ -121,3 +121,3 @@ void Server :: readLocalIpks( Server *local )
         // Changed to display the filename (excluding the path)
-        QString packageName = Utils::getFilenameFromIpkFilename( file );
+        QString packageName = Utils::getPackageNameFromIpkFilename( file );      
         QString ver = Utils::getPackageVersionFromIpkFilename( file );
@@ -246,2 +246,5 @@ void Server :: buildLocalPackages( Server *local )
     QListIterator<Package> it( packageList );
+    
+    QList<Package> *locallist = &local->getPackageList();
+    
     for ( ; it.current(); ++it )
@@ -261,2 +264,10 @@ void Server :: buildLocalPackages( Server *local )
             {
+                // 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
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
@@ -50,3 +50,3 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
     ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
-    colnum = ModulesView->addColumn( tr( "Used By" ) );
+    colnum = ModulesView->addColumn( tr( "Used by" ) );
     ModulesView->setAllColumnsShowFocus( TRUE );
@@ -143,5 +143,3 @@ void ModulesInfo::slotSendClicked()
 	
-	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() );
 
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
@@ -6,3 +6,2 @@ Maintainer: Dan Williams <williamsdr@acm.org>
 Architecture: arm
-Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
@@ -10 +9,2 @@ 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
@@ -166,5 +166,3 @@ void ProcessInfo::slotSendClicked()
 	
-	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() );