engine/nepomuk/nepomukmodel.cpp engine/nepomuk/nepomukmodel.h raptor.trig @@ -5,6 +5,8 @@ project(raptor) # Find the required Libaries find_package(KDE4 REQUIRED) include(KDE4Defaults) +find_package(Nepomuk REQUIRED) +include(MacroAddOntologyClasses) #find_package(Plasma REQUIRED) #add_subdirectory(widget) @@ -40,12 +42,23 @@ set(raptor_SRCS engine/kickoff/searchmodel.cpp engine/kickoff/kickoffmodel.cpp engine/kickoff/favoritesmodel.cpp + engine/nepomuk/nepomukmodel.cpp ) + +NEPOMUK_ADD_ONTOLOGY_CLASSES( + raptor_SRCS + ONTOLOGIES + ${CMAKE_CURRENT_SOURCE_DIR}/raptor.trig + ) + # Now make sure all files get to the right place +#kde4_add_library(plasma_applet_raptor STATIC ${raptor_SRCS}) kde4_add_plugin(plasma_applet_raptor ${raptor_SRCS}) +#kde4_add_library(raptor STATIC ${raptor_SRCS}) + target_link_libraries(plasma_applet_raptor - ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} solidcontrol) + ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} ${NEPOMUK_LIBRARIES} solidcontrol) install(TARGETS plasma_applet_raptor DESTINATION ${PLUGIN_INSTALL_DIR}) CMakeLists.txt @@ -102,12 +102,13 @@ void RaptorGraphicsView::setRootIndex(const QModelIndex &index) return; } if (!index.data(Qt::UserRole + 2).isNull()) { - emit applicationClicked(KUrl(index.data(Qt::UserRole + 2).toString())); //Qt::UserRole + 2 is Kickoff::UrlRole + emit applicationClicked(index); //Qt::UserRole + 2 is Kickoff::UrlRole return; } d->rootIndex = index; getItems(); + setViewMode(viewModeFromItemCount()); d->layout->setMenuItems(d->items); d->layout->invalidate(); update(); @@ -172,9 +173,6 @@ void RaptorGraphicsView::setModel(QAbstractItemModel *model) void RaptorGraphicsView::setViewMode(ViewMode viewMode) { d->delegate->setViewMode((RaptorItemDelegate::ViewMode)viewMode); - - d->layout->invalidate(); - update(); } RaptorGraphicsView::ViewMode RaptorGraphicsView::viewMode() @@ -249,6 +247,7 @@ void RaptorGraphicsView::getItems() qDeleteAll(d->items); d->currentHoveredItem = 0; d->items.clear(); + if (d->model->canFetchMore(d->rootIndex)) { d->model->fetchMore(d->rootIndex); } @@ -388,16 +387,18 @@ void RaptorGraphicsView::mouseMoveEvent(QGraphicsSceneMouseEvent *event) RaptorGraphicsView::ViewMode RaptorGraphicsView::viewModeFromItemCount() { - /*switch (d->items.count()) { + //return RaptorGraphicsView::TwoApps; + /* + switch (d->items.count()) { case 1: return RaptorGraphicsView::SingleApp; case 2: return RaptorGraphicsView::TwoApps; case 3: case 4: - case 5: + case 5:*/ return RaptorGraphicsView::Normal; - default:*/ + /*default: return RaptorGraphicsView::Search; - /*}*/ + }*/ } view/raptorgraphicsview.cpp @@ -63,7 +63,7 @@ protected slots: signals: void enteredItem(const QModelIndex &); - void applicationClicked(const KUrl &); + void applicationClicked(const QModelIndex &); void favoriteClicked(const QString &); protected: view/raptorgraphicsview.h @@ -18,6 +18,7 @@ #include "engine/kickoff/applicationmodel.h" #include "engine/kickoff/searchmodel.h" #include "engine/kickoff/favoritesmodel.h" +#include "engine/nepomuk/nepomukmodel.h" #include "view/raptorgraphicsview.h" #include "view/breadcrumb.h" @@ -37,6 +38,7 @@ #include <KConfig> #include <KDebug> #include <KIcon> +#include <KNotification> // Plasma #include <Plasma/Theme> @@ -46,6 +48,11 @@ #include <Plasma/FrameSvg> #include <plasma/runnermanager.h> +//Nepomuk +#include <Nepomuk/ResourceManager> +#include "application.h" +#include "applicationlaunch.h" + const int CONTENTS_RECT_HORIZONTAL_MARGIN = 32; const int CONTENTS_RECT_VERTICAL_MARGIN = 10; const int FRAME_RECT_HORIZONTAL_MARGIN = 22; @@ -72,7 +79,8 @@ public: RaptorGraphicsWidget *q; RaptorGraphicsView *view; - Kickoff::ApplicationModel *model; + //Kickoff::ApplicationModel *model; + QAbstractItemModel * model; Kickoff::SearchModel * searchModel; Kickoff::FavoritesModel * favoritesModel; @@ -94,8 +102,16 @@ RaptorGraphicsWidget::RaptorGraphicsWidget(QGraphicsItem *parent, const KConfigG { setAcceptHoverEvents(true); - d->model = new Kickoff::ApplicationModel(this); - d->model->init(); +// d->model = new Kickoff::ApplicationModel(this); +// d->model->init(); + if (!Nepomuk::ResourceManager::instance()->init()) { + kDebug() << "fucking nepomuk never dies"; + d->model = new Raptor::NepomukModel(this); + } else { + KNotification::event(i18n("Nepomuk is not running. Falling back to useless mode!!!")); + d->model = new Kickoff::ApplicationModel(this); + qobject_cast<Kickoff::ApplicationModel*>(d->model)->init(); + } d->searchModel = new Kickoff::SearchModel(); d->favoritesModel = new Kickoff::FavoritesModel(this); @@ -184,7 +200,7 @@ RaptorGraphicsWidget::RaptorGraphicsWidget(QGraphicsItem *parent, const KConfigG // connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), this, SLOT(updateColors())); - connect(d->view, SIGNAL(applicationClicked(const KUrl &)), this, SLOT(launchApplication(const KUrl &))); + connect(d->view, SIGNAL(applicationClicked(const QModelIndex &)), this, SLOT(launchApplication(const QModelIndex &))); 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>&))); @@ -214,16 +230,23 @@ void RaptorGraphicsWidget::setFavoritesModel() if (d->view->model() == d->favoritesModel) { //d->view->setRootIndex(QModelIndex()); refineModel(); - } - else { + } else { d->view->setModel(d->favoritesModel); d->view->setRootIndex(d->favoritesModel->index(0, 0, QModelIndex())); } } -void RaptorGraphicsWidget::launchApplication(const KUrl &url) +void RaptorGraphicsWidget::launchApplication(const QModelIndex &index) { - KDesktopFile desktopFile(url.pathOrUrl()); + if (qobject_cast<Raptor::NepomukModel*>(d->model)) { + Nepomuk::Application app(index.data(Raptor::NepomukModel::NepomukUriRole).toString());//FIXME: Need to change the role maybe... + app.setLaunchCount(app.launchCount() + 1); + Nepomuk::ApplicationLaunch launch(QDateTime::currentDateTime().toString()); + launch.setLaunchDate(QDateTime::currentDateTime()); + launch.setLaunchedApplication(app); + app.setLastLaunch(launch); + } + KDesktopFile desktopFile(KUrl(index.data(Raptor::NepomukModel::UrlRole).toUrl()).pathOrUrl()); KService service(&desktopFile); KRun::run(service, KUrl::List(), 0); } view/raptorgraphicswidget.cpp @@ -13,6 +13,7 @@ #define RAPTORGRAPHICSWIDGET_H #include <QGraphicsWidget> +#include <QModelIndex> #include <plasma/querymatch.h> class KUrl; @@ -35,7 +36,7 @@ class RaptorGraphicsWidget : public QGraphicsWidget void addOrRemoveFavorite(const QString &); void updateColors(); - void launchApplication(const KUrl &); + void launchApplication(const QModelIndex &); void refineModel(); void matchesChanged(const QList<Plasma::QueryMatch>&); view/raptorgraphicswidget.h @@ -12,6 +12,7 @@ #include "raptoritemdelegate.h" #include "engine/kickoff/favoritesmodel.h" +#include "engine/nepomuk/nepomukmodel.h" //Qt #include <QPainter> view/raptoritemdelegate.cpp @@ -11,6 +11,7 @@ #include "raptormenuitem.h" #include "raptoritemdelegate.h" #include "raptorgraphicsview.h" +#include "engine/nepomuk/nepomukmodel.h" #include <QStyleOptionViewItem> #include <QPainter> @@ -29,8 +30,8 @@ class RaptorMenuItem::Private public: Private(const QModelIndex &index, RaptorGraphicsView *p, RaptorMenuItem *q) : q(q), index(index), option(new QStyleOptionViewItem), view(p), value(0) { - lastUsed = i18n("20 Minutes");//FIXME: Replace with proper last used info :) - lastUsedWidth = Plasma::Theme::defaultTheme()->fontMetrics().width(lastUsed); + //lastUsed = i18n("20 Minutes");//FIXME: Replace with proper last used info :) + //lastUsedWidth = Plasma::Theme::defaultTheme()->fontMetrics().width(lastUsed); } ~Private() { @@ -177,11 +178,11 @@ void RaptorMenuItem::update() QString RaptorMenuItem::lastUsed() const { - //TODO: Check whether the lastused text changed in the modelindex later and recalculate the size then... - return d->lastUsed; + //FIXME: Caching? + return d->index.data(Raptor::NepomukModel::LastLaunchedRole).toDateTime().toString(); } int RaptorMenuItem::lastUsedWidth() { - return d->lastUsedWidth; + return Plasma::Theme::defaultTheme()->fontMetrics().width(d->index.data(Raptor::NepomukModel::LastLaunchedRole).toDateTime().toString()); } view/raptormenuitem.cpp faecae1fdfaf877c047e7b091a25d502bb03a496 Lukas Appelhans l.appelhans@gmx.de http://github.com/ruphy/raptor/commit/f887040424e326b59abd9a19525ff3825f31eccb f887040424e326b59abd9a19525ff3825f31eccb 2009-06-21T13:51:21-07:00 2009-06-21T13:51:21-07:00 This commit introduces the changes done at Nepomuk-Sprint by Alessandro, Francesco and me... -hard dep on Nepomuk for now / needs nepomuk-playground -new default model based on nepomuk -raptor-ontology -menu structure saved nepomuk -last launched date in menu things to discuss: -how to get TOM categories: ideas: introduce fdo spec & if that is not in the .desktop-file guess the category from the current category system (Audio;Qt;KDE or sth like that) or from the documentation... -how to do ordered by click-count, idea: just use the click-count-role in the model and then let the layout order the items correctly... (dunno if that'll work though, just thinking...) Now launching Raptor will bring you some weird menu-structure, but it will be great! xD 4279e235cbd2e584477b57ebe4900c2ffecb49ba Lukas Appelhans l.appelhans@gmx.de