-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 12 | ||||
-rw-r--r-- | noncore/settings/aqpkg/opie-aqpkg.control | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/package.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/aqpkg/packagewin.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 13 | ||||
-rw-r--r-- | noncore/settings/sysinfo/modulesinfo.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/sysinfo/opie-sysinfo.control | 2 | ||||
-rw-r--r-- | noncore/settings/sysinfo/processinfo.cpp | 4 |
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 ) | |||
1014 | newitem->option = "D"; | 1014 | newitem->option = "D"; |
1015 | |||
1016 | // If local file, remove using package name, not filename | ||
1017 | if ( p->isPackageStoredLocally() ) | ||
1018 | name = item->text(); | ||
1019 | |||
1015 | if ( !p->isPackageStoredLocally() ) | 1020 | if ( !p->isPackageStoredLocally() ) |
@@ -1043,2 +1048,6 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1043 | newitem->option = "D"; | 1048 | newitem->option = "D"; |
1049 | |||
1050 | // If local file, remove using package name, not filename | ||
1051 | if ( p->isPackageStoredLocally() ) | ||
1052 | name = item->text(); | ||
1044 | } | 1053 | } |
@@ -1082,2 +1091,5 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1082 | newitem->option = "D"; | 1091 | newitem->option = "D"; |
1092 | // If local file, remove using package name, not filename | ||
1093 | if ( p->isPackageStoredLocally() ) | ||
1094 | name = item->text(); | ||
1083 | break; | 1095 | 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 | |||
4 | Section: Settings | 4 | Section: Settings |
5 | Version: $QPE_VERSION-$SUB_VERSION | ||
6 | Depends: task-opie-minimal | 5 | Depends: task-opie-minimal |
@@ -11 +10,2 @@ Description: A Package Manager | |||
11 | 10 | ||
11 | 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 ) | |||
118 | version = v; | 118 | version = v; |
119 | differentVersionAvailable = false; | ||
119 | 120 | ||
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 ) | |||
46 | { | 46 | { |
47 | Package *local = package->getLocalPackage(); | ||
47 | setCaption( package->getPackageName() ); | 48 | setCaption( package->getPackageName() ); |
48 | QString destName; | 49 | QString destName; |
49 | if ( package->getLocalPackage() ) | 50 | if ( local ) |
50 | { | 51 | { |
51 | if ( package->getLocalPackage()->getInstalledTo() ) | 52 | if ( local->getInstalledTo() ) |
52 | destName = package->getLocalPackage()->getInstalledTo()->getDestinationName(); | 53 | destName = package->getLocalPackage()->getInstalledTo()->getDestinationName(); |
@@ -88,3 +89,3 @@ PackageWindow::PackageWindow( Package *package, const QString &server ) | |||
88 | str.append( package->getVersion() ); | 89 | str.append( package->getVersion() ); |
89 | if ( package->getLocalPackage() ) | 90 | if ( local ) |
90 | { | 91 | { |
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 ) | |||
121 | // Changed to display the filename (excluding the path) | 121 | // Changed to display the filename (excluding the path) |
122 | QString packageName = Utils::getFilenameFromIpkFilename( file ); | 122 | QString packageName = Utils::getPackageNameFromIpkFilename( file ); |
123 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); | 123 | QString ver = Utils::getPackageVersionFromIpkFilename( file ); |
@@ -246,2 +246,5 @@ void Server :: buildLocalPackages( Server *local ) | |||
246 | QListIterator<Package> it( packageList ); | 246 | QListIterator<Package> it( packageList ); |
247 | |||
248 | QList<Package> *locallist = &local->getPackageList(); | ||
249 | |||
247 | for ( ; it.current(); ++it ) | 250 | for ( ; it.current(); ++it ) |
@@ -261,2 +264,10 @@ void Server :: buildLocalPackages( Server *local ) | |||
261 | { | 264 | { |
265 | // Replace local version | ||
266 | if ( curr->getVersion() > p->getVersion() ) | ||
267 | { | ||
268 | int pos = locallist->at(); | ||
269 | locallist->remove( p ); | ||
270 | locallist->insert( pos, curr ); | ||
271 | } | ||
272 | |||
262 | // Set some default stuff like size and things | 273 | // 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 ) | |||
50 | ModulesView->setColumnAlignment( colnum, Qt::AlignRight ); | 50 | ModulesView->setColumnAlignment( colnum, Qt::AlignRight ); |
51 | colnum = ModulesView->addColumn( tr( "Used By" ) ); | 51 | colnum = ModulesView->addColumn( tr( "Used by" ) ); |
52 | ModulesView->setAllColumnsShowFocus( TRUE ); | 52 | ModulesView->setAllColumnsShowFocus( TRUE ); |
@@ -143,5 +143,3 @@ void ModulesInfo::slotSendClicked() | |||
143 | 143 | ||
144 | QString capstr = tr( "You really want to execute\n" ); | 144 | QString capstr = tr( "You really want to execute %1 for this module?" ).arg( CommandCB->currentText() ); |
145 | capstr.append( CommandCB->currentText() ); | ||
146 | capstr.append( "\nfor this module?" ); | ||
147 | 145 | ||
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> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION-$SUB_VERSION | ||
8 | Depends: task-opie-minimal, libopie1 | 7 | Depends: task-opie-minimal, libopie1 |
@@ -10 +9,2 @@ Description: System Information dialog | |||
10 | For the Opie environment. | 9 | For the Opie environment. |
10 | 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() | |||
166 | 166 | ||
167 | QString capstr = tr( "You really want to send\n" ); | 167 | QString capstr = tr( "You really want to send %1 to this process?" ).arg( SignalCB->currentText() ); |
168 | capstr.append( SignalCB->currentText() ); | ||
169 | capstr.append( "\nto this process?" ); | ||
170 | 168 | ||