author | drw <drw> | 2003-01-19 21:10:00 (UTC) |
---|---|---|
committer | drw <drw> | 2003-01-19 21:10:00 (UTC) |
commit | 49786b34a40d0e2ba6dd5c77acddf1c38758b89c (patch) (unidiff) | |
tree | 3cb1c1c1593d17256910fb57111b19a87898ae74 /noncore/settings/aqpkg | |
parent | ae272396cec6ca6bcfbee0d59b7948b7fe908238 (diff) | |
download | opie-49786b34a40d0e2ba6dd5c77acddf1c38758b89c.zip opie-49786b34a40d0e2ba6dd5c77acddf1c38758b89c.tar.gz opie-49786b34a40d0e2ba6dd5c77acddf1c38758b89c.tar.bz2 |
Updates to main package list, icons for installed/updated packages, QWhatsThis and a couple other tweaks
-rw-r--r-- | noncore/settings/aqpkg/aqpkg.pro | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/main.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 85 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.h | 4 |
5 files changed, 47 insertions, 58 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 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on debug | 2 | CONFIG = qt warn_on release |
3 | HEADERS = global.h \ | 3 | HEADERS = global.h \ |
4 | mainwin.h \ | 4 | mainwin.h \ |
5 | datamgr.h \ | 5 | 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 @@ | |||
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include <iostream> | ||
19 | using namespace std; | ||
20 | |||
21 | #ifdef QWS | 18 | #ifdef QWS |
22 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
23 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <qpe/qcopenvelope_qws.h> |
@@ -35,7 +32,7 @@ using namespace std; | |||
35 | 32 | ||
36 | int main(int argc, char *argv[]) | 33 | int main(int argc, char *argv[]) |
37 | { | 34 | { |
38 | cout << "Root dir = " << ROOT << endl; | 35 | // cout << "Root dir = " << ROOT << endl; |
39 | #ifdef QWS | 36 | #ifdef QWS |
40 | QPEApplication a( argc, argv ); | 37 | QPEApplication a( argc, argv ); |
41 | #else | 38 | #else |
@@ -44,7 +41,7 @@ int main(int argc, char *argv[]) | |||
44 | 41 | ||
45 | #ifdef QWS | 42 | #ifdef QWS |
46 | // Disable suspend mode | 43 | // Disable suspend mode |
47 | cout << "Disabling suspend mode" << endl; | 44 | // cout << "Disabling suspend mode" << endl; |
48 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend; | 45 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend; |
49 | #endif | 46 | #endif |
50 | 47 | ||
@@ -56,7 +53,7 @@ int main(int argc, char *argv[]) | |||
56 | 53 | ||
57 | #ifdef QWS | 54 | #ifdef QWS |
58 | // Reenable suspend mode | 55 | // Reenable suspend mode |
59 | cout << "Enabling suspend mode" << endl; | 56 | // cout << "Enabling suspend mode" << endl; |
60 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | 57 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; |
61 | #endif | 58 | #endif |
62 | #ifdef _DEBUG | 59 | #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 @@ | |||
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include <iostream> | ||
19 | using namespace std; | ||
20 | |||
21 | #include <qpe/qpemenubar.h> | 18 | #include <qpe/qpemenubar.h> |
22 | #include <qpe/qpetoolbar.h> | 19 | #include <qpe/qpetoolbar.h> |
23 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
@@ -224,7 +221,7 @@ void MainWindow :: setDocument( const QString &doc ) | |||
224 | { | 221 | { |
225 | // Remove path from package | 222 | // Remove path from package |
226 | QString package = Utils::getPackageNameFromIpkFilename( doc ); | 223 | QString package = Utils::getPackageNameFromIpkFilename( doc ); |
227 | std::cout << "Selecting package " << package << std::endl; | 224 | // std::cout << "Selecting package " << package << std::endl; |
228 | networkPkgWindow->selectLocalPackage( package ); | 225 | networkPkgWindow->selectLocalPackage( package ); |
229 | } | 226 | } |
230 | 227 | ||
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 @@ | |||
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include <fstream> | ||
19 | #include <iostream> | ||
20 | using namespace std; | ||
21 | |||
22 | #include <unistd.h> | 18 | #include <unistd.h> |
23 | #include <stdlib.h> | ||
24 | #include <linux/limits.h> | ||
25 | 19 | ||
26 | #ifdef QWS | 20 | #ifdef QWS |
27 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
28 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
29 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
24 | #include <qpe/resource.h> | ||
30 | #else | 25 | #else |
31 | #include <qapplication.h> | 26 | #include <qapplication.h> |
32 | #endif | 27 | #endif |
33 | #include <qlabel.h> | 28 | #include <qlabel.h> |
34 | #include <qfile.h> | 29 | #include <qfile.h> |
35 | #include <qmessagebox.h> | 30 | #include <qmessagebox.h> |
31 | #include <qwhatsthis.h> | ||
36 | 32 | ||
37 | #include "datamgr.h" | 33 | #include "datamgr.h" |
38 | #include "networkpkgmgr.h" | 34 | #include "networkpkgmgr.h" |
@@ -97,7 +93,7 @@ void NetworkPackageManager :: updateData() | |||
97 | // cout << "Adding " << it->getServerName() << " to combobox" << endl; | 93 | // cout << "Adding " << it->getServerName() << " to combobox" << endl; |
98 | if ( !it->isServerActive() ) | 94 | if ( !it->isServerActive() ) |
99 | { | 95 | { |
100 | cout << serverName << " is not active" << endl; | 96 | // cout << serverName << " is not active" << endl; |
101 | i--; | 97 | i--; |
102 | continue; | 98 | continue; |
103 | } | 99 | } |
@@ -145,8 +141,14 @@ void NetworkPackageManager :: initGui() | |||
145 | QLabel *l = new QLabel( tr( "Servers" ), this ); | 141 | QLabel *l = new QLabel( tr( "Servers" ), this ); |
146 | serversList = new QComboBox( this ); | 142 | serversList = new QComboBox( this ); |
147 | connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int ))); | 143 | connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int ))); |
144 | QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) ); | ||
145 | |||
146 | installedIcon = Resource::loadPixmap( "aqpkg/installed" ); | ||
147 | updatedIcon = Resource::loadPixmap( "aqpkg/updated" ); | ||
148 | 148 | ||
149 | packagesList = new QListView( this ); | 149 | packagesList = new QListView( this ); |
150 | packagesList->addColumn( tr( "Packages" ), 225 ); | ||
151 | 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." ) ); | ||
150 | 152 | ||
151 | QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 ); | 153 | QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 ); |
152 | QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 ); | 154 | QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 ); |
@@ -174,8 +176,7 @@ void NetworkPackageManager :: initGui() | |||
174 | } | 176 | } |
175 | 177 | ||
176 | vbox->addWidget( packagesList ); | 178 | vbox->addWidget( packagesList ); |
177 | packagesList->addColumn( tr( "Packages" ) ); | 179 | |
178 | |||
179 | downloadEnabled = TRUE; | 180 | downloadEnabled = TRUE; |
180 | } | 181 | } |
181 | 182 | ||
@@ -186,6 +187,9 @@ void NetworkPackageManager :: serverSelected( int index ) | |||
186 | 187 | ||
187 | void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) | 188 | void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) |
188 | { | 189 | { |
190 | QPixmap nullIcon( installedIcon.size() ); | ||
191 | nullIcon.fill( colorGroup().base() ); | ||
192 | |||
189 | // display packages | 193 | // display packages |
190 | QString serverName = serversList->currentText(); | 194 | QString serverName = serversList->currentText(); |
191 | currentlySelectedServer = serverName; | 195 | currentlySelectedServer = serverName; |
@@ -260,24 +264,23 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) | |||
260 | continue; | 264 | continue; |
261 | 265 | ||
262 | 266 | ||
263 | text.append( it->getPackageName() ); | 267 | QCheckListItem *item = new QCheckListItem( packagesList, it->getPackageName(), QCheckListItem::CheckBox ); |
268 | |||
264 | if ( it->isInstalled() ) | 269 | if ( it->isInstalled() ) |
265 | { | 270 | { |
266 | text.append( " (installed)" ); | 271 | // If a different version of package is available, show update available icon |
267 | 272 | // Otherwise, show installed icon | |
268 | // If a different version of package is available, postfix it with an * | 273 | if ( it->getVersion() != it->getInstalledVersion() && |
269 | if ( it->getVersion() != it->getInstalledVersion() ) | 274 | compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1) |
270 | { | 275 | { |
271 | 276 | ||
272 | if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 ) | 277 | item->setPixmap( 0, updatedIcon ); |
273 | text.append( "*" ); | ||
274 | } | 278 | } |
275 | } | 279 | else |
276 | 280 | { | |
277 | QCheckListItem *item = new QCheckListItem( packagesList, text, QCheckListItem::CheckBox ); | 281 | item->setPixmap( 0, installedIcon ); |
278 | 282 | } | |
279 | if ( it->isInstalled() ) | 283 | |
280 | { | ||
281 | QString destName = ""; | 284 | QString destName = ""; |
282 | if ( it->getLocalPackage() ) | 285 | if ( it->getLocalPackage() ) |
283 | { | 286 | { |
@@ -292,13 +295,17 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) | |||
292 | if ( destName != "" ) | 295 | if ( destName != "" ) |
293 | new QCheckListItem( item, QString( tr( "Installed To - %1" ).arg( destName ) ) ); | 296 | new QCheckListItem( item, QString( tr( "Installed To - %1" ).arg( destName ) ) ); |
294 | } | 297 | } |
298 | else | ||
299 | { | ||
300 | item->setPixmap( 0, nullIcon ); | ||
301 | } | ||
295 | 302 | ||
296 | if ( !it->isPackageStoredLocally() ) | 303 | if ( !it->isPackageStoredLocally() ) |
297 | { | 304 | { |
298 | new QCheckListItem( item, QString( tr( "Description - %1" ).arg( it->getDescription() ) ) ); | 305 | new QCheckListItem( item, QString( tr( "Description - %1" ).arg( it->getDescription() ) ) ); |
299 | new QCheckListItem( item, QString( tr( "Size - %1" ).arg( it->getPackageSize() ) ) ); | 306 | new QCheckListItem( item, QString( tr( "Size - %1" ).arg( it->getPackageSize() ) ) ); |
300 | new QCheckListItem( item, QString( tr( "Section - %1" ).arg( it->getSection() ) ) ); | 307 | new QCheckListItem( item, QString( tr( "Section - %1" ).arg( it->getSection() ) ) ); |
301 | } | 308 | } |
302 | else | 309 | else |
303 | new QCheckListItem( item, QString( tr( "Filename - %1" ).arg( it->getFilename() ) ) ); | 310 | new QCheckListItem( item, QString( tr( "Filename - %1" ).arg( it->getFilename() ) ) ); |
304 | 311 | ||
@@ -508,16 +515,7 @@ void NetworkPackageManager :: downloadSelectedPackages() | |||
508 | { | 515 | { |
509 | if ( item->isOn() ) | 516 | if ( item->isOn() ) |
510 | { | 517 | { |
511 | QString name = item->text(); | 518 | ipkg.setPackage( item->text() ); |
512 | int pos = name.find( "*" ); | ||
513 | name.truncate( pos ); | ||
514 | |||
515 | // if (there is a (installed), remove it | ||
516 | pos = name.find( "(installed)" ); | ||
517 | if ( pos > 0 ) | ||
518 | name.truncate( pos - 1 ); | ||
519 | |||
520 | ipkg.setPackage( name ); | ||
521 | ipkg.runIpkg( ); | 519 | ipkg.runIpkg( ); |
522 | } | 520 | } |
523 | } | 521 | } |
@@ -614,13 +612,6 @@ void NetworkPackageManager :: applyChanges() | |||
614 | InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) | 612 | InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) |
615 | { | 613 | { |
616 | QString name = item->text(); | 614 | QString name = item->text(); |
617 | int pos = name.find( "*" ); | ||
618 | name.truncate( pos ); | ||
619 | |||
620 | // if (there is a (installed), remove it | ||
621 | pos = name.find( "(installed)" ); | ||
622 | if ( pos > 0 ) | ||
623 | name.truncate( pos - 1 ); | ||
624 | 615 | ||
625 | // Get package | 616 | // Get package |
626 | vector<Server>::iterator s = dataMgr->getServer( serversList->currentText() ); | 617 | vector<Server>::iterator s = dataMgr->getServer( serversList->currentText() ); |
@@ -651,8 +642,8 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) | |||
651 | if ( p->getInstalledTo() ) | 642 | if ( p->getInstalledTo() ) |
652 | { | 643 | { |
653 | item.destination = p->getInstalledTo(); | 644 | item.destination = p->getInstalledTo(); |
654 | cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl; | 645 | // cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl; |
655 | cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl; | 646 | // cout << "dest - " << p->getInstalledTo()->getDestinationPath() << endl; |
656 | } | 647 | } |
657 | else | 648 | else |
658 | { | 649 | { |
@@ -734,9 +725,9 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) | |||
734 | } | 725 | } |
735 | } | 726 | } |
736 | 727 | ||
737 | void NetworkPackageManager :: displayText( const QString &t ) | 728 | void NetworkPackageManager :: displayText( const QString &/*t*/ ) |
738 | { | 729 | { |
739 | cout << t << endl; | 730 | // cout << t << endl; |
740 | } | 731 | } |
741 | 732 | ||
742 | 733 | ||
@@ -778,7 +769,7 @@ void NetworkPackageManager :: searchForPackage( const QString &text ) | |||
778 | { | 769 | { |
779 | if ( !text.isEmpty() ) | 770 | if ( !text.isEmpty() ) |
780 | { | 771 | { |
781 | cout << "searching for " << text << endl; | 772 | // cout << "searching for " << text << endl; |
782 | // look through package list for text startng at current position | 773 | // look through package list for text startng at current position |
783 | vector<InstallData> workingPackages; | 774 | vector<InstallData> workingPackages; |
784 | QCheckListItem *start = (QCheckListItem *)packagesList->currentItem(); | 775 | QCheckListItem *start = (QCheckListItem *)packagesList->currentItem(); |
@@ -791,10 +782,10 @@ void NetworkPackageManager :: searchForPackage( const QString &text ) | |||
791 | for ( QCheckListItem *item = start; item != 0 ; | 782 | for ( QCheckListItem *item = start; item != 0 ; |
792 | item = (QCheckListItem *)item->nextSibling() ) | 783 | item = (QCheckListItem *)item->nextSibling() ) |
793 | { | 784 | { |
794 | cout << "checking " << item->text().lower() << endl; | 785 | // cout << "checking " << item->text().lower() << endl; |
795 | if ( item->text().lower().find( text ) != -1 ) | 786 | if ( item->text().lower().find( text ) != -1 ) |
796 | { | 787 | { |
797 | cout << "matched " << item->text() << endl; | 788 | // cout << "matched " << item->text() << endl; |
798 | packagesList->ensureItemVisible( item ); | 789 | packagesList->ensureItemVisible( item ); |
799 | packagesList->setCurrentItem( item ); | 790 | packagesList->setCurrentItem( item ); |
800 | break; | 791 | 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 @@ | |||
19 | #define NETWORKPKGMGR_H | 19 | #define NETWORKPKGMGR_H |
20 | 20 | ||
21 | #include <qlayout.h> | 21 | #include <qlayout.h> |
22 | #include <qpixmap.h> | ||
22 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
23 | #include <qwidget.h> | 24 | #include <qwidget.h> |
24 | #include <qcombobox.h> | 25 | #include <qcombobox.h> |
@@ -53,6 +54,9 @@ private: | |||
53 | 54 | ||
54 | QComboBox *serversList; | 55 | QComboBox *serversList; |
55 | QListView *packagesList; | 56 | QListView *packagesList; |
57 | |||
58 | QPixmap installedIcon; | ||
59 | QPixmap updatedIcon; | ||
56 | 60 | ||
57 | QString currentlySelectedServer; | 61 | QString currentlySelectedServer; |
58 | QString categoryFilter; | 62 | QString categoryFilter; |