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

List:       kde-commits
Subject:    playground/base/plasma/applets/crystal
From:       Sebastian Kügler <sebas () kde ! org>
Date:       2010-12-01 4:10:09
Message-ID: 20101201041009.13312AC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202484 by sebas:

move imageresourcewidget into its own subdirectory, add a video widget

 M  +2 -1      CMakeLists.txt  
 D             imageresourcewidget.cpp  
 D             imageresourcewidget.h  
 M  +1 -0      ontologies/CMakeLists.txt  
 M  +7 -3      resourcewidget.cpp  
 A             resourcewidgets/imageresourcewidget.cpp   \
imageresourcewidget.cpp#1202460 [License: LGPL (v2+)]  A             \
resourcewidgets/imageresourcewidget.h   imageresourcewidget.h#1202460 [License: LGPL \
(v2+)]  A             resourcewidgets/videoresourcewidget.cpp   \
imageresourcewidget.cpp#1202460 [License: LGPL (v2+)]  A             \
resourcewidgets/videoresourcewidget.h   imageresourcewidget.h#1202460 [License: LGPL \
(v2+)]  M  +1 -1      resultwidget.cpp  


--- trunk/playground/base/plasma/applets/crystal/CMakeLists.txt #1202483:1202484
@@ -28,9 +28,10 @@
     resultwidget.cpp
     resultwebview.cpp
     resourcewidget.cpp
-    imageresourcewidget.cpp
+    resourcewidgets/imageresourcewidget.cpp
     resourcewidgets/contactwidget.cpp
     resourcewidgets/emailwidget.cpp
+    resourcewidgets/videoresourcewidget.cpp
     imagewidget.cpp
     ratingwidget.cpp
     utils.cpp
--- trunk/playground/base/plasma/applets/crystal/ontologies/CMakeLists.txt \
#1202483:1202484 @@ -30,6 +30,7 @@
 soprano_add_ontology(nie_apps_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nfo/nfo.trig \
"PersonContact" "Vocabulary" "trig")  soprano_add_ontology(nie_apps_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nfo/nfo.trig "Email" "Vocabulary" "trig")  \
soprano_add_ontology(nie_apps_SRCS ${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nfo/nfo.trig \
"Image" "Vocabulary" "trig") +soprano_add_ontology(nie_apps_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nfo/nfo.trig "Video" "Vocabulary" "trig")  
 kde4_add_library(niefast_apps STATIC ${nie_apps_SRCS})
 target_link_libraries(niefast_apps ${QT_QTCORE_LIBRARY} ${SOPRANO_LIBRARIES} \
                ${NEPOMUK_LIBRARIES})
--- trunk/playground/base/plasma/applets/crystal/resourcewidget.cpp #1202483:1202484
@@ -38,12 +38,13 @@
 // Nepomuk
 #include <Nepomuk/Resource>
 #include <Nepomuk/Variant>
-
+#include "ontologies/video.h"
 // Own
 #include "resourcewidget.h"
-#include "imageresourcewidget.h"
 #include "resourcewidgets/contactwidget.h"
 #include "resourcewidgets/emailwidget.h"
+#include "resourcewidgets/imageresourcewidget.h"
+#include "resourcewidgets/videoresourcewidget.h"
 #include "ratingwidget.h"
 #include "utils.h"
 
@@ -142,9 +143,9 @@
     kDebug() << "Resource:" << resource.uri() << resource.type() << \
                resource.types();
     kDebug() << "Image         Type:" << NepomukFast::Image().uri() << \
                NepomukFast::Image().type();
     kDebug() << "PersonContact Type:" << NepomukFast::PersonContact().uri();
+    kDebug() << "email type:" << NepomukFast::Email().type();
     */
     Nepomuk::Resource resource = result.resource();
-    kDebug() << "email type:" << NepomukFast::Email().type();
     kDebug() << "==================" << resource.genericLabel() << \
"=====================";  if (resource.types().contains(NepomukFast::Email().type())) \
{  kDebug() << " MATCH --> This is an Email.";
@@ -157,6 +158,9 @@
     } else if (resource.types().contains(NepomukFast::RasterImage().type())) {
         kDebug() << " MATCH --> This is an Image.";
         return new ImageResourceWidget(result);
+    } else if (resource.types().contains(NepomukFast::Video().type())) {
+        kDebug() << " MATCH --> This is an VIDEO.";
+        return new VideoResourceWidget(result);
     }
     kDebug() << " MATCH --> Unknown types.";
     return new ResourceWidget(result);
--- trunk/playground/base/plasma/applets/crystal/resultwidget.cpp #1202483:1202484
@@ -36,7 +36,7 @@
 //own
 #include "resultwidget.h"
 #include "resourcewidget.h"
-#include "imageresourcewidget.h"
+//#include "resourcewidgets/imageresourcewidget.h"
 
 using namespace Crystal;
 


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