summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp44
-rw-r--r--noncore/settings/aqpkg/mainwin.h3
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
@@ -296,7 +296,7 @@ void MainWindow :: init()
296 296
297 stack->raiseWidget( networkPkgWindow ); 297 stack->raiseWidget( networkPkgWindow );
298} 298}
299 299/*
300void MainWindow :: setDocument( const QString &doc ) 300void MainWindow :: setDocument( const QString &doc )
301{ 301{
302 // Remove path from package 302 // Remove path from package
@@ -326,12 +326,16 @@ void MainWindow :: setDocument( const QString &doc )
326 } 326 }
327 } 327 }
328} 328}
329 329*/
330void MainWindow :: displaySettings() 330void MainWindow :: displaySettings()
331{ 331{
332 SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); 332 SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true );
333 if ( dlg->showDlg( 0 ) ) 333 if ( dlg->showDlg( 0 ) )
334 {
335 stack->raiseWidget( progressWindow );
334 updateData(); 336 updateData();
337 stack->raiseWidget( networkPkgWindow );
338 }
335 delete dlg; 339 delete dlg;
336} 340}
337 341
@@ -728,8 +732,8 @@ void MainWindow :: searchForPackage( const QString &text )
728 // look through package list for text startng at current position 732 // look through package list for text startng at current position
729 vector<InstallData> workingPackages; 733 vector<InstallData> workingPackages;
730 QCheckListItem *start = (QCheckListItem *)packagesList->currentItem(); 734 QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
731 if ( start != 0 ) 735// if ( start != 0 )
732 start = (QCheckListItem *)start->nextSibling(); 736// start = (QCheckListItem *)start->nextSibling();
733 737
734 if ( start == 0 ) 738 if ( start == 0 )
735 start = (QCheckListItem *)packagesList->firstChild(); 739 start = (QCheckListItem *)packagesList->firstChild();
@@ -767,9 +771,8 @@ void MainWindow :: updateServer()
767 InstallDlgImpl dlg( &ipkg, tr( "Refreshing server package lists" ), this, tr( "Upgrade" ), true ); 771 InstallDlgImpl dlg( &ipkg, tr( "Refreshing server package lists" ), this, tr( "Upgrade" ), true );
768 dlg.showDlg(); 772 dlg.showDlg();
769 773
770 // Reload data 774 reloadData();
771 mgr->reloadServerData(); 775
772 serverSelected(-1);
773// delete progDlg; 776// delete progDlg;
774} 777}
775 778
@@ -797,9 +800,7 @@ void MainWindow :: upgradePackages()
797 InstallDlgImpl dlg( &ipkg, tr( "Upgrading installed packages" ), this, tr( "Upgrade" ), true ); 800 InstallDlgImpl dlg( &ipkg, tr( "Upgrading installed packages" ), this, tr( "Upgrade" ), true );
798 dlg.showDlg(); 801 dlg.showDlg();
799 802
800 // Reload data 803 reloadData();
801 mgr->reloadServerData();
802 serverSelected(-1);
803 } 804 }
804} 805}
805 void MainWindow :: downloadPackage() 806 void MainWindow :: downloadPackage()
@@ -864,8 +865,7 @@ void MainWindow :: upgradePackages()
864 865
865 if ( doUpdate ) 866 if ( doUpdate )
866 { 867 {
867 mgr->reloadServerData(); 868 reloadData();
868 serverSelected( -1 );
869 } 869 }
870} 870}
871 871
@@ -940,10 +940,8 @@ void MainWindow :: downloadRemotePackage()
940 InstallDlgImpl dlg2( workingPackages, mgr, this, "Install", true ); 940 InstallDlgImpl dlg2( workingPackages, mgr, this, "Install", true );
941 dlg2.showDlg(); 941 dlg2.showDlg();
942 942
943 // Reload data 943 reloadData();
944 mgr->reloadServerData(); 944
945 serverSelected(-1);
946
947#ifdef QWS 945#ifdef QWS
948 // Finally let the main system update itself 946 // Finally let the main system update itself
949 QCopEnvelope e("QPE/System", "linkChanged(QString)"); 947 QCopEnvelope e("QPE/System", "linkChanged(QString)");
@@ -988,10 +986,8 @@ void MainWindow :: applyChanges()
988 InstallDlgImpl dlg( workingPackages, mgr, this, "Install", true ); 986 InstallDlgImpl dlg( workingPackages, mgr, this, "Install", true );
989 dlg.showDlg(); 987 dlg.showDlg();
990 988
991 // Reload data 989 reloadData();
992 mgr->reloadServerData(); 990
993 serverSelected(-1);
994
995#ifdef QWS 991#ifdef QWS
996 // Finally let the main system update itself 992 // Finally let the main system update itself
997 QCopEnvelope e("QPE/System", "linkChanged(QString)"); 993 QCopEnvelope e("QPE/System", "linkChanged(QString)");
@@ -1121,6 +1117,14 @@ InstallData MainWindow :: dealWithItem( QCheckListItem *item )
1121 } 1117 }
1122} 1118}
1123 1119
1120void MainWindow :: reloadData()
1121{
1122 stack->raiseWidget( progressWindow );
1123 mgr->reloadServerData();
1124 serverSelected( -1, FALSE );
1125 stack->raiseWidget( networkPkgWindow );
1126}
1127
1124void MainWindow :: letterPushed( QString t ) 1128void MainWindow :: letterPushed( QString t )
1125{ 1129{
1126 QCheckListItem *top = (QCheckListItem *)packagesList->firstChild(); 1130 QCheckListItem *top = (QCheckListItem *)packagesList->firstChild();
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
@@ -91,6 +91,7 @@ private:
91 void downloadSelectedPackages(); 91 void downloadSelectedPackages();
92 void downloadRemotePackage(); 92 void downloadRemotePackage();
93 InstallData dealWithItem( QCheckListItem *item ); 93 InstallData dealWithItem( QCheckListItem *item );
94 void reloadData();
94 95
95 // Progress widget 96 // Progress widget
96 QWidget *progressWindow; 97 QWidget *progressWindow;
@@ -100,7 +101,7 @@ private:
100 void initProgressWidget(); 101 void initProgressWidget();
101 102
102public slots: 103public slots:
103 void setDocument( const QString &doc ); 104// void setDocument( const QString &doc );
104 void displayHelp(); 105 void displayHelp();
105 void displayFindBar(); 106 void displayFindBar();
106 void repeatFind(); 107 void repeatFind();