[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/base/nepomuk-kde
From: Sebastian Trueg <sebastian () trueg ! de>
Date: 2011-02-25 19:19:09
Message-ID: 20110225191909.366513E1F1 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1222742 by trueg:
Merged the user context stuff into nepomukannotation
M +4 -0 annotation/CMakeLists.txt
A annotation/contextplasmoid (directory)
M +1 -3 annotation/contextplasmoid/CMakeLists.txt
A annotation/contextservice (directory)
M +3 -13 annotation/contextservice/CMakeLists.txt
M +20 -2 annotation/contextservice/nepomukusercontextservice.cpp
M +2 -0 annotation/contextservice/nepomukusercontextservice.h
M +5 -0 annotation/lib/CMakeLists.txt
A annotation/lib/dbusconnectionpool.cpp \
usercontext/lib/dbusconnectionpool.cpp#1199798 [License: LGPL (v2+)] A \
annotation/lib/dbusconnectionpool.h usercontext/lib/dbusconnectionpool.h#1199798 \
[License: LGPL (v2+)] A annotation/lib/nepomukcontext.cpp \
usercontext/lib/nepomukcontext.cpp#1199798 [License: LGPL (v2)] A \
annotation/lib/nepomukcontext.h usercontext/lib/nepomukcontext.h#1199798 [License: \
LGPL (v2)] D usercontext/lib/dbusconnectionpool.cpp
D usercontext/lib/dbusconnectionpool.h
D usercontext/lib/nepomukcontext.cpp
D usercontext/lib/nepomukcontext.h
D usercontext/plasmoid (directory)
D usercontext/service (directory)
--- trunk/playground/base/nepomuk-kde/annotation/CMakeLists.txt #1222741:1222742
@@ -1,3 +1,5 @@
+add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+
add_subdirectory(lib)
add_subdirectory(plugins)
add_subdirectory(simpleannotator)
@@ -4,3 +6,5 @@
add_subdirectory(textannotator)
add_subdirectory(resourceeditor)
add_subdirectory(test)
+add_subdirectory(contextservice)
+add_subdirectory(contextplasmoid)
--- trunk/playground/base/nepomuk-kde/annotation/contextplasmoid/CMakeLists.txt \
#1199798:1222742 @@ -1,7 +1,6 @@
# Project Needs a name ofcourse
project(plasma-nepomukcontextchooser)
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
@@ -16,9 +15,8 @@
# Now make sure all files get to the right place
kde4_add_plugin(plasma_applet_nepomukcontextchooser ${nepomukcontextchooser_SRCS})
target_link_libraries(plasma_applet_nepomukcontextchooser
- nepomukcontext
nepomukannotation
- nepomukextras
+ ${NEPOMUKEXTRAS_LIBRARIES}
${KDE4_PLASMA_LIBS}
${KDE4_KDEUI_LIBS}
${NEPOMUK_LIBRARIES}
--- trunk/playground/base/nepomuk-kde/annotation/contextservice/CMakeLists.txt \
#1199798:1222742 @@ -1,11 +1,3 @@
-# search packages used by KDE
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-include(MacroLibrary)
-
-find_package(Soprano REQUIRED)
-find_package(Nepomuk REQUIRED)
-
include_directories(
${QT_INCLUDES}
${KDE4_INCLUDES}
@@ -13,18 +5,16 @@
${SOPRANO_INCLUDE_DIR}
)
-set(SRCS
+set(nepomukcontextservice_SRCS
nepomukusercontextservice.cpp
)
-soprano_add_ontology(SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig "PIMO" \
"Nepomuk::Vocabulary" "trig")
-
-qt4_add_dbus_adaptor(SRCS
+qt4_add_dbus_adaptor(nepomukcontextservice_SRCS
org.kde.nepomuk.UserContextService.xml
nepomukusercontextservice.h
Nepomuk::UserContextService)
-kde4_add_plugin(nepomukusercontextservice ${SRCS})
+kde4_add_plugin(nepomukusercontextservice ${nepomukcontextservice_SRCS})
target_link_libraries(nepomukusercontextservice
${SOPRANO_CLIENT_LIBRARIES}
--- trunk/playground/base/nepomuk-kde/annotation/contextservice/nepomukusercontextservice.cpp \
#1199798:1222742 @@ -1,5 +1,5 @@
/* This file is part of the Nepomuk Project
- Copyright (c) 2008-2010 Sebastian Trueg <trueg@kde.org>
+ Copyright (c) 2008-2011 Sebastian Trueg <trueg@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -18,7 +18,6 @@
#include "nepomukusercontextservice.h"
#include "usercontextserviceadaptor.h"
-#include "pimo.h"
#include <KUrl>
#include <KLocale>
@@ -35,6 +34,7 @@
#include <Nepomuk/Resource>
#include <Nepomuk/ResourceManager>
#include <Nepomuk/Variant>
+#include <Nepomuk/Vocabulary/PIMO>
/**
@@ -44,6 +44,8 @@
NEPOMUK_EXPORT_SERVICE( Nepomuk::UserContextService, "nepomukusercontextservice")
+// TODO: once a task or project is completed we should also remove it as a context \
automatically +
Nepomuk::UserContextService::UserContextService( QObject* parent, const \
QList<QVariant>& ) : Service( parent )
{
@@ -103,6 +105,15 @@
m_currentProject = uri;
if ( !m_currentProject.hasType( Vocabulary::PIMO::Project() ) )
m_currentProject.addType( Vocabulary::PIMO::Project() );
+
+ // check if the current task is part of the new project and if not
+ // reset it
+ if ( m_currentTask.isValid() &&
+ !isPartOf( m_currentProject, m_currentTask ) ) {
+ m_currentTask = Resource();
+ emit currentTaskChanged( QString() );
+ }
+
emit currentProjectChanged( uriString );
}
}
@@ -123,4 +134,11 @@
}
}
+
+bool Nepomuk::UserContextService::isPartOf( const Resource& parent, const Resource& \
potentialChild ) +{
+ // FIXME
+ return true;
+}
+
#include "nepomukusercontextservice.moc"
--- trunk/playground/base/nepomuk-kde/annotation/contextservice/nepomukusercontextservice.h \
#1199798:1222742 @@ -80,6 +80,8 @@
void currentTaskChanged( const QString& uri );
private:
+ bool isPartOf( const Resource& parent, const Resource& potentialChild );
+
Resource m_currentContext;
Resource m_currentProject;
Resource m_currentTask;
--- trunk/playground/base/nepomuk-kde/annotation/lib/CMakeLists.txt #1222741:1222742
@@ -28,6 +28,8 @@
textannotation.cpp
stackedtextannotation.cpp
stackedpimotextannotation.cpp
+ nepomukcontext.cpp
+ dbusconnectionpool.cpp
gui/annotationrelevancefiltermodel.cpp
gui/resourceannotationmodel.cpp
gui/annotationmodel.cpp
@@ -49,6 +51,8 @@
gui/kedittagsdialog.cpp
)
+qt4_add_dbus_interface(corelib_SRCS \
"../contextservice/org.kde.nepomuk.UserContextService.xml" \
nepomukcontextserviceinterface) +
soprano_add_ontology(corelib_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nepomuk/nuao.trig "NUAO" "Nepomuk::Vocabulary" \
"trig") soprano_add_ontology(corelib_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/tmo.trig "TMO" "Nepomuk::Vocabulary" "trig") \
@@ -85,6 +89,7 @@
stackedtextannotation.h
stackedpimotextannotation.h
textannotation.h
+ nepomukcontext.h
gui/annotationrelevancefiltermodel.h
gui/annotationmodel.h
gui/resourceannotationmodel.h
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic