author | drw <drw> | 2003-01-10 21:07:59 (UTC) |
---|---|---|
committer | drw <drw> | 2003-01-10 21:07:59 (UTC) |
commit | 3d5b0fdc15ed9b3ee392e52254aa9db73e2b7dac (patch) (side-by-side diff) | |
tree | a6cb5e1cc109fc9ec54aca9b61726111771f08bf /noncore/settings/aqpkg/networkpkgmgr.cpp | |
parent | 1c7ae0ce09caf37c3c7d5d284eee390940143a26 (diff) | |
download | opie-3d5b0fdc15ed9b3ee392e52254aa9db73e2b7dac.zip opie-3d5b0fdc15ed9b3ee392e52254aa9db73e2b7dac.tar.gz opie-3d5b0fdc15ed9b3ee392e52254aa9db73e2b7dac.tar.bz2 |
Made find dialog a toolbar, fixed show options under View menu
Diffstat (limited to 'noncore/settings/aqpkg/networkpkgmgr.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 52 |
1 files changed, 31 insertions, 21 deletions
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 91afe02..c209589 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp @@ -257,23 +257,23 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) // If the local server, only display installed packages if ( serverName == LOCAL_SERVER && !it->isInstalled() ) continue; - text += it->getPackageName(); + text.append( it->getPackageName() ); if ( it->isInstalled() ) { - text += " (installed)"; + text.append( " (installed)" ); // If a different version of package is available, postfix it with an * if ( it->getVersion() != it->getInstalledVersion() ) { if ( compareVersions( it->getInstalledVersion(), it->getVersion() ) == 1 ) - text += "*"; + text.append( "*" ); } } QCheckListItem *item = new QCheckListItem( packagesList, text, QCheckListItem::CheckBox ); if ( it->isInstalled() ) @@ -287,35 +287,35 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) else { if ( it->getInstalledTo() ) destName = it->getInstalledTo()->getDestinationName(); } if ( destName != "" ) - new QCheckListItem( item, QString( tr( "Installed To - " ) ) + destName ); + new QCheckListItem( item, QString( tr( "Installed To - %1" ).arg( destName ) ) ); } if ( !it->isPackageStoredLocally() ) { - new QCheckListItem( item, QString( tr( "Description - " ) ) + it->getDescription() ); - new QCheckListItem( item, QString( tr( "Size - " ) ) + it->getPackageSize() ); - new QCheckListItem( item, QString( tr( "Section - " ) ) + it->getSection() ); + new QCheckListItem( item, QString( tr( "Description - %1" ).arg( it->getDescription() ) ) ); + new QCheckListItem( item, QString( tr( "Size - %1" ).arg( it->getPackageSize() ) ) ); + new QCheckListItem( item, QString( tr( "Section - %1" ).arg( it->getSection() ) ) ); } else - new QCheckListItem( item, QString( tr( "Filename - " ) ) + it->getFilename() ); + new QCheckListItem( item, QString( tr( "Filename - %1" ).arg( it->getFilename() ) ) ); if ( serverName == LOCAL_SERVER ) { - new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getVersion() ); + new QCheckListItem( item, QString( tr( "V. Installed - %1" ).arg( it->getVersion() ) ) ); } else { - new QCheckListItem( item, QString( tr( "V. Available - " ) ) + it->getVersion() ); + new QCheckListItem( item, QString( tr( "V. Available - %1" ).arg( it->getVersion() ) ) ); if ( it->getLocalPackage() ) { if ( it->isInstalled() ) - new QCheckListItem( item, QString( tr( "V. Installed - " ) ) + it->getInstalledVersion() ); + new QCheckListItem( item, QString( tr( "V. Installed - %1" ).arg( it->getInstalledVersion() ) ) ); } } packagesList->insertItem( item ); } @@ -369,12 +369,13 @@ void NetworkPackageManager :: updateServer() } void NetworkPackageManager :: upgradePackages() { // We're gonna do an upgrade of all packages // First warn user that this isn't recommended + // TODO - ODevice???? QString text = tr( "WARNING: Upgrading while\nOpie/Qtopia is running\nis NOT recommended!\n\nAre you sure?\n" ); QMessageBox warn( tr( "Warning" ), text, QMessageBox::Warning, QMessageBox::Yes, QMessageBox::No | QMessageBox::Escape | QMessageBox::Default , 0, this ); warn.adjustSize(); @@ -770,23 +771,17 @@ void NetworkPackageManager :: letterPushed( QString t ) if ( !item ) item = (QCheckListItem *)packagesList->firstChild(); } while ( item != start); } -void NetworkPackageManager :: searchForPackage( bool findNext ) +void NetworkPackageManager :: searchForPackage( const QString &text ) { - bool ok = false; - if ( !findNext || lastSearchText.isEmpty() ) - lastSearchText = InputDialog::getText( tr( "Search for package" ), tr( "Enter package to search for" ), lastSearchText, &ok, this ).lower(); - else - ok = true; - - if ( ok && !lastSearchText.isEmpty() ) + if ( !text.isEmpty() ) { - cout << "searching for " << lastSearchText << endl; + cout << "searching for " << text << endl; // look through package list for text startng at current position vector<InstallData> workingPackages; QCheckListItem *start = (QCheckListItem *)packagesList->currentItem(); if ( start != 0 ) start = (QCheckListItem *)start->nextSibling(); @@ -794,13 +789,13 @@ void NetworkPackageManager :: searchForPackage( bool findNext ) start = (QCheckListItem *)packagesList->firstChild(); for ( QCheckListItem *item = start; item != 0 ; item = (QCheckListItem *)item->nextSibling() ) { cout << "checking " << item->text().lower() << endl; - if ( item->text().lower().find( lastSearchText ) != -1 ) + if ( item->text().lower().find( text ) != -1 ) { cout << "matched " << item->text() << endl; packagesList->ensureItemVisible( item ); packagesList->setCurrentItem( item ); break; } @@ -808,24 +803,39 @@ void NetworkPackageManager :: searchForPackage( bool findNext ) } } void NetworkPackageManager :: showOnlyUninstalledPackages( bool val ) { showUninstalledPkgs = val; + if ( val ) + { + showInstalledPkgs = FALSE; + showUpgradedPkgs = FALSE; + } serverSelected( -1 ); } void NetworkPackageManager :: showOnlyInstalledPackages( bool val ) { showInstalledPkgs = val; + if ( val ) + { + showUninstalledPkgs = FALSE; + showUpgradedPkgs = FALSE; + } serverSelected( -1 ); } void NetworkPackageManager :: showUpgradedPackages( bool val ) { showUpgradedPkgs = val; + if ( val ) + { + showUninstalledPkgs = FALSE; + showInstalledPkgs = FALSE; + } serverSelected( -1 ); } bool NetworkPackageManager :: filterByCategory( bool val ) { if ( val ) |