[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/nepomuk-kde/annotation
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-05-03 19:59:42
Message-ID: 20100503195942.1E744AC8AB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1122402 by trueg:

New class AnnotationMenu which has two modes:
1. Context mode (no resource set): allows to change the current context
2. Resource mode: allows to relate the current resource to another resource and \
annotate it.

CCMAIL: slauriere@mandriva.com


 M  +8 -0      lib/CMakeLists.txt  
 A             lib/gui/annotationmenu.cpp   [License: LGPL]
 A             lib/gui/annotationmenu.h   [License: LGPL]
 M  +12 -0     test/CMakeLists.txt  
 A             test/annotationmenutester.cpp   [License: LGPL]


--- trunk/playground/base/nepomuk-kde/annotation/lib/CMakeLists.txt #1122401:1122402
@@ -18,6 +18,7 @@
   ${CMAKE_CURRENT_BINARY_DIR}
   ${nepomukutils_SOURCE_DIR}
   ${nepomuk_kde_SOURCE_DIR}/misc
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../usercontext/lib
 )
 
 set( corelib_SRCS
@@ -52,10 +53,14 @@
     gui/resourceeditor.cpp
     gui/labeleditwidget.cpp
     gui/strigitextextractionjob.cpp
+    gui/annotationmenu.cpp
     ${nepomuk_kde_SOURCE_DIR}/misc/kpixmapsequence.cpp
     ${nepomuk_kde_SOURCE_DIR}/misc/kpixmapsequenceoverlaypainter.cpp
 )
 
+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") \
+  kde4_add_ui_files(corelib_SRCS gui/resourceeditor.ui)
 
 kde4_add_library(nepomukannotation SHARED ${corelib_SRCS})
@@ -63,6 +68,7 @@
 target_link_libraries(
   nepomukannotation 
   ${NEPOMUK_LIBRARIES}
+  ${NEPOMUK_QUERY_LIBRARIES}
   ${SOPRANO_LIBRARIES}
   ${SOPRANO_INDEX_LIBRARIES}
   ${QT_QTGUI_LIBRARY}
@@ -70,6 +76,7 @@
   ${STRIGI_STREAMANALYZER_LIBRARY}
   ${STRIGI_STREAMS_LIBRARY}
   nepomukutils
+  nepomukcontext
 )
 
 set_target_properties(nepomukannotation PROPERTIES VERSION 0.1.0 SOVERSION 0)
@@ -102,6 +109,7 @@
   gui/resourcerelationview.h
   gui/statementeditor.h
   gui/resourceeditor.h
+  gui/annotationmenu.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk)
 install(FILES nepomuk-annotationplugin.desktop DESTINATION \
${SERVICETYPES_INSTALL_DIR})  
--- trunk/playground/base/nepomuk-kde/annotation/test/CMakeLists.txt #1122401:1122402
@@ -39,3 +39,15 @@
   ${KDE4_KDECORE_LIBS}
   ${KDE4_KDEUI_LIBS}
 )
+
+
+kde4_add_executable(annotationmenutester annotationmenutester.cpp)
+target_link_libraries(annotationmenutester
+  nepomukutils
+  nepomukannotation
+  ${NEPOMUK_LIBRARIES}
+  ${QT_QTGUI_LIBRARY}
+  ${QT_QTDBUS_LIBRARY}
+  ${KDE4_KDECORE_LIBS}
+  ${KDE4_KDEUI_LIBS}
+)


[prev in list] [next in list] [prev in thread] [next in thread]