engine/kickoff/searchmodel.cpp engine/kickoff/searchmodel.h @@ -32,6 +32,7 @@ set(raptor_SRCS engine/kickoff/kickoffabstractmodel.cpp engine/kickoff/models.cpp engine/kickoff/leavemodel.cpp + engine/kickoff/searchmodel.cpp ) # Now make sure all files get to the right place CMakeLists.txt @@ -1,4 +1,4 @@ -/* +/* Copyright 2007 Robert Knight <robertknight@gmail.com> This library is free software; you can redistribute it and/or @@ -18,67 +18,21 @@ */ // Own -#include "core/searchmodel.h" +#include "searchmodel.h" -#include "config-kickoff-applets.h" // Qt // KDE #include <KDebug> #include <KMimeType> #include <KServiceTypeTrader> -#ifdef HAVE_STRIGIDBUS -#include <strigi/qtdbus/strigiclient.h> -#endif -#include <solid/networking.h> - -// Local -#include "core/models.h" using namespace Kickoff; -class SearchModel::Private -{ -public: - Private(SearchModel *parent) : q(parent) {} - - void addItemForIface(SearchInterface *iface,QStandardItem *item) - { - int index = searchIfaces.indexOf(iface); - Q_ASSERT(index >= 0); - q->item(index)->appendRow(item); - } - void clear() - { - for (int i=0;i<q->rowCount();i++) { - q->item(i)->removeRows(0,q->item(i)->rowCount()); - } - } - - SearchModel * const q; - QList<SearchInterface*> searchIfaces; -}; - -SearchModel::SearchModel(QObject *parent) - : KickoffModel(parent) - , d(new Private(this)) +SearchModel::SearchModel() + : ApplicationModel() { - d->searchIfaces << new ApplicationSearch(this); - //d->searchIfaces << new IndexerSearch(this); - d->searchIfaces << new WebSearch(this); - foreach(SearchInterface *iface,d->searchIfaces) { - QStandardItem *ifaceItem = new QStandardItem(iface->name()); - appendRow(ifaceItem); - connect(iface,SIGNAL(resultsAvailable(QStringList)), - this,SLOT(resultsAvailable(QStringList))); - connect(iface,SIGNAL(resultsAvailable(ResultList)), - this,SLOT(resultsAvailable(ResultList))); - connect(iface,SIGNAL(resultsAvailable(QStringList)), - this,SIGNAL(resultsAvailable())); - connect(iface,SIGNAL(resultsAvailable(ResultList)), - this,SIGNAL(resultsAvailable())); - } } SearchModel::~SearchModel() { @@ -87,7 +41,7 @@ SearchModel::~SearchModel() void SearchModel::resultsAvailable(const QStringList& results) { SearchInterface *iface = qobject_cast<SearchInterface*>(sender()); - + Q_ASSERT(iface); foreach(const QString& result,results) { @@ -96,146 +50,5 @@ void SearchModel::resultsAvailable(const QStringList& results) d->addItemForIface(iface,resultItem); } } -void SearchModel::resultsAvailable(const ResultList& results) -{ - SearchInterface *iface = qobject_cast<SearchInterface*>(sender()); - - Q_ASSERT(iface); - - foreach(const SearchResult& result,results) { - QStandardItem *item = StandardItemFactory::createItemForUrl(result.url); - item->setData(result.title,Qt::DisplayRole); - item->setData(result.subTitle,SubTitleRole); - d->addItemForIface(iface,item); - } -} -void SearchModel::setQuery(const QString& query) -{ - d->clear(); - - if (query.isEmpty()) { - return; - } - - foreach(SearchInterface *iface, d->searchIfaces) { - iface->setQuery(query); - } -} - -SearchInterface::SearchInterface(QObject *parent) - : QObject(parent) -{ -} - -ApplicationSearch::ApplicationSearch(QObject *parent) - : SearchInterface(parent) -{ -} - -QString ApplicationSearch::name() const -{ - return i18n("Applications"); -} - -void ApplicationSearch::setQuery(const QString& query) -{ - //QString mimeName = mimeNameForQuery(query); - QString traderQuery = QString("((exist GenericName) and ('%1' ~~ GenericName)) or ('%1' ~~ Name) or ('%1' ~~ Exec) or ((exist Keywords) and ('%1' ~in Keywords))" - //" or ('%2' in MimeType)" - ) - .arg(query); //.arg(mimeName); - KServiceTypeTrader *trader = KServiceTypeTrader::self(); - KService::List results = trader->query("Application",traderQuery); - - // If we have KDE 3 and KDE 4 versions of a service, return only the - // KDE 4 version - QHash<QString,int> desktopNames; - QSet<QString> execFields; - - - for (int i=0;i<results.count();i++) { - KService::Ptr service = results[i]; - int existingPos = desktopNames.value(service->name(),-1); - KService::Ptr existing = existingPos < 0 ? KService::Ptr(0) : results[existingPos]; - - - if (!existing.isNull()) { - if (isLaterVersion(existing,service)) { - results[i] = 0; - } else if (isLaterVersion(service,existing)) { - results[existingPos] = 0; - } else { - // do not show more than one entry which does the same thing when run - // (ie. ignore entries that have an identical 'Exec' field to an existing - // entry) - if (execFields.contains(service->exec()) && service->noDisplay()) { - results[i] = 0; - } - } - } else { - desktopNames.insert(service->name(),i); - execFields.insert(service->exec()); - } - } - - - QStringList pathResults; - foreach(const KService::Ptr &service,results) { - if (!service.isNull() && !service->noDisplay()) { - pathResults << service->entryPath(); - } - } - emit resultsAvailable(pathResults); -} - -QString ApplicationSearch::mimeNameForQuery(const QString& query) const -{ - KMimeType::Ptr type = KMimeType::findByPath('.'+query,0,true); - if (type) { - kDebug() << "Mime type name" << type->name(); - return type->name(); - } - return QString(); -} -WebSearch::WebSearch(QObject *parent) - : SearchInterface(parent) -{ -} -QString WebSearch::name() const -{ - return i18n("Web Searches"); -} -void WebSearch::setQuery(const QString& query) -{ - ResultList results; - SearchResult googleResult; - googleResult.url = QString("http://www.google.com/search?q=%1").arg(query); - googleResult.title = i18n("Search web for '%1'",query); - results << googleResult; - emit resultsAvailable(results); -} -IndexerSearch::IndexerSearch(QObject *parent) - : SearchInterface(parent) -{ -} -QString IndexerSearch::name() const -{ - return i18n("Documents"); -} -void IndexerSearch::setQuery(const QString& query) -{ -#ifdef HAVE_STRIGIDBUS - static const StrigiClient searchClient; - - QList<QString> urls; - QList<StrigiHit> hits = searchClient.getHits(query,10,0); - foreach(const StrigiHit& hit,hits) { - if (!hit.uri.isEmpty()) { - urls << hit.uri; - } - } - emit resultsAvailable(urls); -#endif -} #include "searchmodel.moc" kickoff/core/searchmodel.cpp @@ -15,6 +15,7 @@ #include "view/raptoritemdelegate.h" #include "view/raptorscrollbutton.h" #include "engine/kickoff/applicationmodel.h" +#include "engine/kickoff/searchmodel.h" #include "view/raptorbreadcrumb.h" // Qt @@ -32,6 +33,7 @@ // Plasma #include <Plasma/Theme> #include <Plasma/LineEdit> +#include <plasma/runnermanager.h> class RaptorGraphicsWidget::Private { @@ -48,12 +50,14 @@ public: RaptorItemsView *view; QGraphicsProxyWidget *proxy; Kickoff::ApplicationModel *model; + Kickoff::SearchModel * searchModel; RaptorScrollButton *rightScrollButton; QGraphicsProxyWidget *rightScrollButtonProxy; RaptorScrollButton *leftScrollButton; QGraphicsProxyWidget *leftScrollButtonProxy; Plasma::LineEdit *searchLine; RaptorBreadCrumb * breadCrumb; + Plasma::RunnerManager * manager; }; RaptorGraphicsWidget::RaptorGraphicsWidget(QGraphicsItem *parent) : QGraphicsWidget(parent), @@ -63,6 +67,7 @@ RaptorGraphicsWidget::RaptorGraphicsWidget(QGraphicsItem *parent) : QGraphicsWid d->view = new RaptorItemsView(); RaptorItemDelegate *delegate = new RaptorItemDelegate(); d->model = new Kickoff::ApplicationModel(); + d->searchModel = new Kickoff::SearchModel(); d->breadCrumb = new RaptorBreadCrumb(d->view, d->model, this); d->searchLine = new Plasma::LineEdit(this); d->rightScrollButton = new RaptorScrollButton(RaptorScrollButton::Right); @@ -100,6 +105,9 @@ RaptorGraphicsWidget::RaptorGraphicsWidget(QGraphicsItem *parent) : QGraphicsWid d->proxy = new QGraphicsProxyWidget(this); d->proxy->setWidget(d->view); + d->manager = new Plasma::RunnerManager(this); + d->manager->reloadConfiguration(); + layout->addItem(d->proxy); connect(d->rightScrollButton, SIGNAL(clicked()), SLOT(scrollRight())); @@ -111,6 +119,9 @@ RaptorGraphicsWidget::RaptorGraphicsWidget(QGraphicsItem *parent) : QGraphicsWid connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(updateColors())); connect(d->view, SIGNAL(applicationClicked(const KUrl &)), this, SLOT(launchApplication(const KUrl &))); + connect(d->searchLine, SIGNAL(textEdited(const QString&)), this, SLOT(refineModel())); + connect(d->manager, SIGNAL(matchesChanged(const QList<Plasma::QueryMatch>&)), this, + SLOT(matchesChanged(const QList<Plasma::QueryMatch>&))); d->view->focusCentralItem(); } @@ -149,7 +160,7 @@ void RaptorGraphicsWidget::scrollRight() int nextRow = selected.row()+1; if(nextRow>rowCount-1) nextRow = 0; - + QModelIndex rightOne = d->model->index(nextRow, 0); d->view->setCurrentIndex(rightOne); d->view->update(); @@ -163,12 +174,12 @@ void RaptorGraphicsWidget::updateColors() // QSizeF RaptorGraphicsWidget::sizeHint(Qt::SizeHint which, const QSizeF & constraint ) const // { // QSizeF size; -// +// // kDebug()<<"minimum"<<d->view->minimumSize(); // kDebug()<<"hint"<<d->view->sizeHint(); // kDebug()<<"maximum"<<d->view->maximumSize(); // kDebug()<<"current"<<this->size().toSize(); -// +// // switch (which) { // case Qt::MinimumSize : // size = QSizeF(200,100); @@ -181,7 +192,7 @@ void RaptorGraphicsWidget::updateColors() // size = QSizeF(d->view->maximumSize()); // break; // } -// +// // return size; // } @@ -194,3 +205,25 @@ void RaptorGraphicsWidget::resizeEvent(QGraphicsSceneResizeEvent *event) QGraphicsWidget::resizeEvent(event); } + +void RaptorGraphicsWidget::refineModel() +{ + if ( d->searchLine->text().isEmpty() ) + { + d->manager->reset(); + d->view->setModel(d->model); + return; + } + + d->manager->launchQuery(d->searchLine->text()); +} + +void RaptorGraphicsWidget::matchesChanged(const QList<Plasma::QueryMatch> &matches) +{ + foreach (const Plasma::QueryMatch &ent, matches) + { + + } +} + +#include "raptorgraphicswidget.moc" view/raptorgraphicswidget.cpp @@ -12,6 +12,7 @@ #define RAPTORGRAPHICSWIDGET_H #include <QGraphicsWidget> +#include <plasma/querymatch.h> class KUrl; @@ -31,6 +32,8 @@ class RaptorGraphicsWidget : public QGraphicsWidget void launchApplication(const KUrl &); void scrollLeft(); void scrollRight(); + void refineModel(); + void matchesChanged(const QList<Plasma::QueryMatch>&); private: class Private; view/raptorgraphicswidget.h ed67b761f87ffe0492e0fa0c2fbf4ef4d0cca6f6 Dario Freddi drf54321@gmail.com http://github.com/ruphy/raptor/commit/d5a9572211d299ee8eafbc64da59963d65e6cc3e d5a9572211d299ee8eafbc64da59963d65e6cc3e 2008-09-24T08:16:35-07:00 2008-09-24T08:16:35-07:00 added runner interface, stub of the model used to search Signed-off-by: Dario Freddi <drf54321@gmail.com> 0378d108bdc702f454ddb22f5bdda1980c52cdbc Dario Freddi drf54321@gmail.com