-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 11 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.h | 1 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 16 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.h | 3 |
4 files changed, 22 insertions, 9 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 0b5a5eb..3c72f2b 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -39,4 +39,5 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
39 | // Create our menu | 39 | // Create our menu |
40 | QPopupMenu *help = new QPopupMenu( this ); | 40 | QPopupMenu *help = new QPopupMenu( this ); |
41 | |||
41 | help->insertItem( "&General", this, SLOT(displayHelp()), Qt::CTRL+Qt::Key_H ); | 42 | help->insertItem( "&General", this, SLOT(displayHelp()), Qt::CTRL+Qt::Key_H ); |
42 | help->insertItem( "&About", this, SLOT(displayAbout()), Qt::CTRL+Qt::Key_A ); | 43 | help->insertItem( "&About", this, SLOT(displayAbout()), Qt::CTRL+Qt::Key_A ); |
@@ -46,5 +47,6 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
46 | 47 | ||
47 | QPopupMenu *edit = new QPopupMenu( this ); | 48 | QPopupMenu *edit = new QPopupMenu( this ); |
48 | edit->insertItem( "&Search", this, SLOT(searchForPackage()), Qt::CTRL+Qt::Key_F ); | 49 | edit->insertItem( "&Find", this, SLOT(searchForPackage()), Qt::CTRL+Qt::Key_F ); |
50 | edit->insertItem( "&Find Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_R ); | ||
49 | 51 | ||
50 | // Create the main menu | 52 | // Create the main menu |
@@ -96,5 +98,10 @@ void MainWindow :: displayHelp() | |||
96 | void MainWindow :: searchForPackage() | 98 | void MainWindow :: searchForPackage() |
97 | { | 99 | { |
98 | networkPkgWindow->searchForPackage(); | 100 | networkPkgWindow->searchForPackage( false ); |
101 | } | ||
102 | |||
103 | void MainWindow :: repeatSearchForPackage() | ||
104 | { | ||
105 | networkPkgWindow->searchForPackage( true ); | ||
99 | } | 106 | } |
100 | 107 | ||
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h index 9fa0eca..267233f 100644 --- a/noncore/settings/aqpkg/mainwin.h +++ b/noncore/settings/aqpkg/mainwin.h | |||
@@ -44,4 +44,5 @@ public slots: | |||
44 | void displayHelp(); | 44 | void displayHelp(); |
45 | void searchForPackage(); | 45 | void searchForPackage(); |
46 | void repeatSearchForPackage(); | ||
46 | void displayAbout(); | 47 | void displayAbout(); |
47 | void displaySettings(); | 48 | void displaySettings(); |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 78d3df5..a058285 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -676,11 +676,15 @@ void NetworkPackageManager :: letterPushed( QString t ) | |||
676 | 676 | ||
677 | 677 | ||
678 | void NetworkPackageManager :: searchForPackage() | 678 | void NetworkPackageManager :: searchForPackage( bool findNext ) |
679 | { | 679 | { |
680 | bool ok = FALSE; | 680 | bool ok = false; |
681 | QString searchText = InputDialog::getText( "Search for package", "Enter package to search for", QString::null, &ok, this ).lower(); | 681 | if ( !findNext || lastSearchText.isEmpty() ) |
682 | if ( ok && !searchText.isEmpty() ) | 682 | lastSearchText = InputDialog::getText( "Search for package", "Enter package to search for", lastSearchText, &ok, this ).lower(); |
683 | else | ||
684 | ok = true; | ||
685 | |||
686 | if ( ok && !lastSearchText.isEmpty() ) | ||
683 | { | 687 | { |
684 | cout << "searching for " << searchText << endl; | 688 | cout << "searching for " << lastSearchText << endl; |
685 | // look through package list for text startng at current position | 689 | // look through package list for text startng at current position |
686 | vector<InstallData> workingPackages; | 690 | vector<InstallData> workingPackages; |
@@ -696,5 +700,5 @@ void NetworkPackageManager :: searchForPackage() | |||
696 | { | 700 | { |
697 | cout << "checking " << item->text().lower() << endl; | 701 | cout << "checking " << item->text().lower() << endl; |
698 | if ( item->text().lower().find( searchText ) != -1 ) | 702 | if ( item->text().lower().find( lastSearchText ) != -1 ) |
699 | { | 703 | { |
700 | cout << "matched " << item->text() << endl; | 704 | cout << "matched " << item->text() << endl; |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h index 3a111ff..20f6e2d 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.h +++ b/noncore/settings/aqpkg/networkpkgmgr.h | |||
@@ -41,5 +41,5 @@ public: | |||
41 | void selectLocalPackage( const QString &pkg ); | 41 | void selectLocalPackage( const QString &pkg ); |
42 | void updateData(); | 42 | void updateData(); |
43 | void searchForPackage(); | 43 | void searchForPackage( bool findNext ); |
44 | private: | 44 | private: |
45 | DataManager *dataMgr; | 45 | DataManager *dataMgr; |
@@ -54,4 +54,5 @@ private: | |||
54 | ProgressDlg *progressDlg; | 54 | ProgressDlg *progressDlg; |
55 | QString currentlySelectedServer; | 55 | QString currentlySelectedServer; |
56 | QString lastSearchText; | ||
56 | 57 | ||
57 | bool showJumpTo; | 58 | bool showJumpTo; |