-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 44 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.h | 3 |
2 files changed, 26 insertions, 21 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index c9963bc..8090646 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp @@ -291,17 +291,17 @@ void MainWindow :: init() showInstalledPkgs = false; showUpgradedPkgs = false; categoryFilterEnabled = false; updateData(); stack->raiseWidget( networkPkgWindow ); } - +/* void MainWindow :: setDocument( const QString &doc ) { // Remove path from package QString package = Utils::getPackageNameFromIpkFilename( doc ); // std::cout << "Selecting package " << package << std::endl; // First select local server for ( int i = 0 ; i < serversList->count() ; ++i ) @@ -321,22 +321,26 @@ void MainWindow :: setDocument( const QString &doc ) { if ( item->text().startsWith( package ) ) { item->setOn( true ); break; } } } - +*/ void MainWindow :: displaySettings() { SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); if ( dlg->showDlg( 0 ) ) + { + stack->raiseWidget( progressWindow ); updateData(); + stack->raiseWidget( networkPkgWindow ); + } delete dlg; } void MainWindow :: displayHelp() { HelpWindow *dlg = new HelpWindow( this ); dlg->exec(); delete dlg; @@ -723,18 +727,18 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) void MainWindow :: searchForPackage( const QString &text ) { if ( !text.isEmpty() ) { // 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(); +// if ( start != 0 ) +// start = (QCheckListItem *)start->nextSibling(); if ( start == 0 ) start = (QCheckListItem *)packagesList->firstChild(); for ( QCheckListItem *item = start; item != 0 ; item = (QCheckListItem *)item->nextSibling() ) { // cout << "checking " << item->text().lower() << endl; @@ -762,19 +766,18 @@ void MainWindow :: updateServer() mgr->writeOutIpkgConf(); Ipkg ipkg; ipkg.setOption( "update" ); InstallDlgImpl dlg( &ipkg, tr( "Refreshing server package lists" ), this, tr( "Upgrade" ), true ); dlg.showDlg(); - // Reload data - mgr->reloadServerData(); - serverSelected(-1); + reloadData(); + // delete progDlg; } void MainWindow :: upgradePackages() { // We're gonna do an upgrade of all packages // First warn user that this isn't recommended // TODO - ODevice???? @@ -792,19 +795,17 @@ void MainWindow :: upgradePackages() // Now run upgrade Ipkg ipkg; ipkg.setOption( "upgrade" ); InstallDlgImpl dlg( &ipkg, tr( "Upgrading installed packages" ), this, tr( "Upgrade" ), true ); dlg.showDlg(); - // Reload data - mgr->reloadServerData(); - serverSelected(-1); + reloadData(); } } void MainWindow :: downloadPackage() { bool doUpdate = true; if ( downloadEnabled ) { // See if any packages are selected @@ -859,18 +860,17 @@ void MainWindow :: upgradePackages() f.remove(); } } } } if ( doUpdate ) { - mgr->reloadServerData(); - serverSelected( -1 ); + reloadData(); } } void MainWindow :: downloadSelectedPackages() { // First, write out ipkg_conf file so that ipkg can use it mgr->writeOutIpkgConf(); @@ -935,20 +935,18 @@ void MainWindow :: downloadRemotePackage() item.option = "I"; item.packageName = package; vector<InstallData> workingPackages; workingPackages.push_back( item ); InstallDlgImpl dlg2( workingPackages, mgr, this, "Install", true ); dlg2.showDlg(); - // Reload data - mgr->reloadServerData(); - serverSelected(-1); - + reloadData(); + #ifdef QWS // Finally let the main system update itself QCopEnvelope e("QPE/System", "linkChanged(QString)"); QString lf = QString::null; e << lf; #endif } @@ -983,20 +981,18 @@ void MainWindow :: applyChanges() return; } // do the stuff InstallDlgImpl dlg( workingPackages, mgr, this, "Install", true ); dlg.showDlg(); - // Reload data - mgr->reloadServerData(); - serverSelected(-1); - + reloadData(); + #ifdef QWS // Finally let the main system update itself QCopEnvelope e("QPE/System", "linkChanged(QString)"); QString lf = QString::null; e << lf; #endif } @@ -1116,16 +1112,24 @@ InstallData MainWindow :: dealWithItem( QCheckListItem *item ) else item.recreateLinks = false; // User hit cancel (on dlg - assume remove) return item; } } +void MainWindow :: reloadData() +{ + stack->raiseWidget( progressWindow ); + mgr->reloadServerData(); + serverSelected( -1, FALSE ); + stack->raiseWidget( networkPkgWindow ); +} + void MainWindow :: letterPushed( QString t ) { QCheckListItem *top = (QCheckListItem *)packagesList->firstChild(); QCheckListItem *start = (QCheckListItem *)packagesList->currentItem(); if ( packagesList->firstChild() == 0 ) return; QCheckListItem *item; diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h index 46b5fae..be30668 100644 --- a/noncore/settings/aqpkg/mainwin.h +++ b/noncore/settings/aqpkg/mainwin.h @@ -86,26 +86,27 @@ private: void initMainWidget(); void updateData(); void serverSelected( int index, bool showProgress ); void searchForPackage( const QString & ); bool filterByCategory( bool val ); void downloadSelectedPackages(); void downloadRemotePackage(); InstallData dealWithItem( QCheckListItem *item ); + void reloadData(); // Progress widget QWidget *progressWindow; QLabel *m_status; QProgressBar *m_progress; void initProgressWidget(); public slots: - void setDocument( const QString &doc ); +// void setDocument( const QString &doc ); void displayHelp(); void displayFindBar(); void repeatFind(); void findPackage( const QString & ); void hideFindBar(); void displayAbout(); void displaySettings(); void filterUninstalledPackages(); |