- Launch directly the new search instead of stopping the current one if the user changed the search pattern

This commit is contained in:
Christophe Dumez 2010-01-30 18:15:25 +00:00
parent 5656fe9a9b
commit b4b61b9b7d
2 changed files with 13 additions and 2 deletions

View file

@ -88,6 +88,7 @@ SearchEngine::SearchEngine(GUI *parent, Bittorrent *BTSession) : QWidget(parent)
// Fill in category combobox // Fill in category combobox
fillCatCombobox(); fillCatCombobox();
connect(search_pattern, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(displayPatternContextMenu(QPoint))); connect(search_pattern, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(displayPatternContextMenu(QPoint)));
connect(search_pattern, SIGNAL(textEdited(QString)), this, SLOT(searchTextEdited(QString)));
} }
void SearchEngine::fillCatCombobox() { void SearchEngine::fillCatCombobox() {
@ -199,6 +200,11 @@ void SearchEngine::saveSearchHistory() {
settings.setValue("Search/searchHistory",searchHistory.stringList()); settings.setValue("Search/searchHistory",searchHistory.stringList());
} }
void SearchEngine::searchTextEdited(QString) {
// Enable search button
search_button->setText(tr("Search"));
}
// Function called when we click on search button // Function called when we click on search button
void SearchEngine::on_search_button_clicked(){ void SearchEngine::on_search_button_clicked(){
if(searchProcess->state() != QProcess::NotRunning){ if(searchProcess->state() != QProcess::NotRunning){
@ -207,8 +213,12 @@ void SearchEngine::on_search_button_clicked(){
if(searchTimeout->isActive()) { if(searchTimeout->isActive()) {
searchTimeout->stop(); searchTimeout->stop();
} }
search_button->setText("Search"); if(search_button->text() != tr("Search")) {
return; search_button->setText(tr("Search"));
return;
} else {
searchProcess->waitForFinished(1000);
}
} }
// Reload environment variables (proxy) // Reload environment variables (proxy)
searchProcess->setEnvironment(QProcess::systemEnvironment()); searchProcess->setEnvironment(QProcess::systemEnvironment());

View file

@ -125,6 +125,7 @@ protected slots:
void displayPatternContextMenu(QPoint); void displayPatternContextMenu(QPoint);
void createCompleter(); void createCompleter();
void fillCatCombobox(); void fillCatCombobox();
void searchTextEdited(QString);
}; };
#endif #endif