author | andyq <andyq> | 2002-11-03 01:19:52 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-03 01:19:52 (UTC) |
commit | 485fae36510cb42690c9df55fae64312b1e656ae (patch) (unidiff) | |
tree | a629829c2fdee60af78cb78184f4d6c27f384c89 /noncore | |
parent | d04882e254eb91aa26fb46bf49c438d12fcda862 (diff) | |
download | opie-485fae36510cb42690c9df55fae64312b1e656ae.zip opie-485fae36510cb42690c9df55fae64312b1e656ae.tar.gz opie-485fae36510cb42690c9df55fae64312b1e656ae.tar.bz2 |
Added search for package feature
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.h | 1 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 34 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.h | 2 |
4 files changed, 44 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 9f19dfa..0b5a5eb 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -46,2 +46,5 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
46 | 46 | ||
47 | QPopupMenu *edit = new QPopupMenu( this ); | ||
48 | edit->insertItem( "&Search", this, SLOT(searchForPackage()), Qt::CTRL+Qt::Key_F ); | ||
49 | |||
47 | // Create the main menu | 50 | // Create the main menu |
@@ -49,2 +52,3 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
49 | menu->insertItem( "&Settings", settings ); | 52 | menu->insertItem( "&Settings", settings ); |
53 | menu->insertItem( "&Edit", edit ); | ||
50 | menu->insertItem( "&Help", help ); | 54 | menu->insertItem( "&Help", help ); |
@@ -91,2 +95,7 @@ void MainWindow :: displayHelp() | |||
91 | 95 | ||
96 | void MainWindow :: searchForPackage() | ||
97 | { | ||
98 | networkPkgWindow->searchForPackage(); | ||
99 | } | ||
100 | |||
92 | void MainWindow :: displayAbout() | 101 | void MainWindow :: displayAbout() |
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h index a9e290c..9fa0eca 100644 --- a/noncore/settings/aqpkg/mainwin.h +++ b/noncore/settings/aqpkg/mainwin.h | |||
@@ -44,2 +44,3 @@ public slots: | |||
44 | void displayHelp(); | 44 | void displayHelp(); |
45 | void searchForPackage(); | ||
45 | void displayAbout(); | 46 | void displayAbout(); |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index ccce401..78d3df5 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -472,3 +472,3 @@ void NetworkPackageManager :: applyChanges() | |||
472 | 472 | ||
473 | vector<InstallData> workingPackages; | 473 | vector<InstallData> workingPackages; |
474 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); | 474 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); |
@@ -675 +675,33 @@ void NetworkPackageManager :: letterPushed( QString t ) | |||
675 | } | 675 | } |
676 | |||
677 | |||
678 | void NetworkPackageManager :: searchForPackage() | ||
679 | { | ||
680 | bool ok = FALSE; | ||
681 | QString searchText = InputDialog::getText( "Search for package", "Enter package to search for", QString::null, &ok, this ).lower(); | ||
682 | if ( ok && !searchText.isEmpty() ) | ||
683 | { | ||
684 | cout << "searching for " << searchText << endl; | ||
685 | // look through package list for text startng at current position | ||
686 | vector<InstallData> workingPackages; | ||
687 | QCheckListItem *start = (QCheckListItem *)packagesList->currentItem(); | ||
688 | if ( start != 0 ) | ||
689 | start = (QCheckListItem *)start->nextSibling(); | ||
690 | |||
691 | if ( start == 0 ) | ||
692 | start = (QCheckListItem *)packagesList->firstChild(); | ||
693 | |||
694 | for ( QCheckListItem *item = start; item != 0 ; | ||
695 | item = (QCheckListItem *)item->nextSibling() ) | ||
696 | { | ||
697 | cout << "checking " << item->text().lower() << endl; | ||
698 | if ( item->text().lower().find( searchText ) != -1 ) | ||
699 | { | ||
700 | cout << "matched " << item->text() << endl; | ||
701 | packagesList->ensureItemVisible( item ); | ||
702 | packagesList->setCurrentItem( item ); | ||
703 | break; | ||
704 | } | ||
705 | } | ||
706 | } | ||
707 | } \ No newline at end of file | ||
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h index 3c437b4..3a111ff 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.h +++ b/noncore/settings/aqpkg/networkpkgmgr.h | |||
@@ -42,3 +42,3 @@ public: | |||
42 | void updateData(); | 42 | void updateData(); |
43 | 43 | void searchForPackage(); | |
44 | private: | 44 | private: |