summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/networkpkgmgr.cpp6
-rw-r--r--noncore/settings/aqpkg/package.cpp12
-rw-r--r--noncore/settings/aqpkg/settings.ui2
3 files changed, 17 insertions, 3 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp
index e8e2982..d9e62b6 100644
--- a/noncore/settings/aqpkg/networkpkgmgr.cpp
+++ b/noncore/settings/aqpkg/networkpkgmgr.cpp
@@ -279,44 +279,46 @@ void NetworkPackageManager :: serverSelected( int )
279 destName = it->getLocalPackage()->getInstalledTo()->getDestinationName(); 279 destName = it->getLocalPackage()->getInstalledTo()->getDestinationName();
280 } 280 }
281 else 281 else
282 { 282 {
283 if ( it->getInstalledTo() ) 283 if ( it->getInstalledTo() )
284 destName = it->getInstalledTo()->getDestinationName(); 284 destName = it->getInstalledTo()->getDestinationName();
285 } 285 }
286 if ( destName != "" ) 286 if ( destName != "" )
287 new QCheckListItem( item, QString( "Installed To - " ) + destName ); 287 new QCheckListItem( item, QString( "Installed To - " ) + destName );
288 } 288 }
289 289
290 if ( !it->isPackageStoredLocally() ) 290 if ( !it->isPackageStoredLocally() )
291 {
291 new QCheckListItem( item, QString( "Description - " ) + it->getDescription() ); 292 new QCheckListItem( item, QString( "Description - " ) + it->getDescription() );
293 new QCheckListItem( item, QString( "Size - " ) + it->getPackageSize() );
294 new QCheckListItem( item, QString( "Section - " ) + it->getSection() );
295 }
292 else 296 else
293 new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() ); 297 new QCheckListItem( item, QString( "Filename - " ) + it->getFilename() );
294 298
295 if ( serverName == LOCAL_SERVER ) 299 if ( serverName == LOCAL_SERVER )
296 { 300 {
297 new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() ); 301 new QCheckListItem( item, QString( "V. Installed - " ) + it->getVersion() );
298 } 302 }
299 else 303 else
300 { 304 {
301 new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() ); 305 new QCheckListItem( item, QString( "V. Available - " ) + it->getVersion() );
302 if ( it->getLocalPackage() ) 306 if ( it->getLocalPackage() )
303 { 307 {
304 if ( it->isInstalled() ) 308 if ( it->isInstalled() )
305 new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() ); 309 new QCheckListItem( item, QString( "V. Installed - " ) + it->getInstalledVersion() );
306 } 310 }
307 } 311 }
308 312
309 new QCheckListItem( item, QString( "Size - " ) + it->getPackageSize() );
310 new QCheckListItem( item, QString( "Section - " ) + it->getSection() );
311 packagesList->insertItem( item ); 313 packagesList->insertItem( item );
312 } 314 }
313 315
314 // If the local server or the local ipkgs server disable the download button 316 // If the local server or the local ipkgs server disable the download button
315 if ( serverName == LOCAL_SERVER ) 317 if ( serverName == LOCAL_SERVER )
316 { 318 {
317 upgrade->setEnabled( false ); 319 upgrade->setEnabled( false );
318 download->setText( "Download" ); 320 download->setText( "Download" );
319 download->setEnabled( true ); 321 download->setEnabled( true );
320 } 322 }
321 else if ( serverName == LOCAL_IPKGS ) 323 else if ( serverName == LOCAL_IPKGS )
322 { 324 {
diff --git a/noncore/settings/aqpkg/package.cpp b/noncore/settings/aqpkg/package.cpp
index 526de5e..db3e927 100644
--- a/noncore/settings/aqpkg/package.cpp
+++ b/noncore/settings/aqpkg/package.cpp
@@ -12,35 +12,47 @@
12 * it under the terms of the GNU General Public License as published by * 12 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation; either version 2 of the License, or * 13 * the Free Software Foundation; either version 2 of the License, or *
14 * (at your option) any later version. * 14 * (at your option) any later version. *
15 * * 15 * *
16 ***************************************************************************/ 16 ***************************************************************************/
17 17
18#include "package.h" 18#include "package.h"
19#include "global.h" 19#include "global.h"
20 20
21Package::Package( QString &name ) 21Package::Package( QString &name )
22{ 22{
23 packageName = name; 23 packageName = name;
24
25 version = "N/A";
26 description = "N/A";
27 packageSize = "N/A";
28 section = "N/A";
29
24 localPackage = 0; 30 localPackage = 0;
25 installed = false; 31 installed = false;
26 packageStoredLocally = false; 32 packageStoredLocally = false;
27 installedToRoot = false; 33 installedToRoot = false;
28 installed = false; 34 installed = false;
29 installedTo = 0; 35 installedTo = 0;
30} 36}
31 37
32Package::Package( char *name ) 38Package::Package( char *name )
33{ 39{
34 packageName = name; 40 packageName = name;
41
42 version = "N/A";
43 description = "N/A";
44 packageSize = "N/A";
45 section = "N/A";
46
35 localPackage = 0; 47 localPackage = 0;
36 installed = false; 48 installed = false;
37 packageStoredLocally = false; 49 packageStoredLocally = false;
38 installedToRoot = false; 50 installedToRoot = false;
39 installed = false; 51 installed = false;
40 installedTo = 0; 52 installedTo = 0;
41} 53}
42 54
43Package::~Package() 55Package::~Package()
44{ 56{
45} 57}
46 58
diff --git a/noncore/settings/aqpkg/settings.ui b/noncore/settings/aqpkg/settings.ui
index c2db861..44e8fd9 100644
--- a/noncore/settings/aqpkg/settings.ui
+++ b/noncore/settings/aqpkg/settings.ui
@@ -470,25 +470,25 @@
470 <name>text</name> 470 <name>text</name>
471 <string>Name:</string> 471 <string>Name:</string>
472 </property> 472 </property>
473 </widget> 473 </widget>
474 <widget row="2" column="1" > 474 <widget row="2" column="1" >
475 <class>QCheckBox</class> 475 <class>QCheckBox</class>
476 <property stdset="1"> 476 <property stdset="1">
477 <name>name</name> 477 <name>name</name>
478 <cstring>linkToRoot</cstring> 478 <cstring>linkToRoot</cstring>
479 </property> 479 </property>
480 <property stdset="1"> 480 <property stdset="1">
481 <name>text</name> 481 <name>text</name>
482 <string>LinkToRoot</string> 482 <string>Link To Root</string>
483 </property> 483 </property>
484 <property stdset="1"> 484 <property stdset="1">
485 <name>checked</name> 485 <name>checked</name>
486 <bool>true</bool> 486 <bool>true</bool>
487 </property> 487 </property>
488 </widget> 488 </widget>
489 <widget row="1" column="1" > 489 <widget row="1" column="1" >
490 <class>QLineEdit</class> 490 <class>QLineEdit</class>
491 <property stdset="1"> 491 <property stdset="1">
492 <name>name</name> 492 <name>name</name>
493 <cstring>destinationurl</cstring> 493 <cstring>destinationurl</cstring>
494 </property> 494 </property>