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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/clients/akonadiconsole
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-01-06 11:43:39
Message-ID: 1231242219.181139.24451.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 906464 by tmcguire:

Build without Nepomuk. If Nepomuk is not found, the tab is removed.
Please verify that everything still works if Nepomuk is found.


 M  +16 -5     CMakeLists.txt  
 M  +14 -0     browserwidget.cpp  
 M  +2 -0      browserwidget.h  
 M  +2 -2      browserwidget_contentview.ui  
 A             config.h.cmake  


--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/CMakeLists.txt #906463:906464
@@ -1,8 +1,13 @@
 include_directories(${CMAKE_SOURCE_DIR}/akonadi)
 include_directories(${CMAKE_SOURCE_DIR}/libkdepim)
 
-if ( NEPOMUK_FOUND )
+if(NEPOMUK_FOUND)
+  set(AKONADICONSOLE_EXTRA_LIBS ${NEPOMUK_LIBRARIES})
+  include_directories(${NEPOMUK_INCLUDES})
+endif(NEPOMUK_FOUND)
 
+configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+
 set(akonadiconsole_bin_SRCS
   agentwidget.cpp
   browserwidget.cpp
@@ -38,10 +43,16 @@
 kde4_add_executable(akonadiconsole_bin ${akonadiconsole_bin_SRCS})
 set_target_properties(akonadiconsole_bin PROPERTIES OUTPUT_NAME akonadiconsole)
 
-target_link_libraries( akonadiconsole_bin ${KDE4_AKONADI_LIBS} akonadi-kabccommon \
${KDE4_AKONADI_KMIME_LIBS} akonadi-kcal kdepim ${KDE4_KDEUI_LIBS} \
${NEPOMUK_LIBRARIES} ) +target_link_libraries( akonadiconsole_bin
+  ${KDE4_AKONADI_LIBS}
+  akonadi-kabccommon
+  ${KDE4_AKONADI_KMIME_LIBS}
+  akonadi-kcal
+  kdepim
+  ${KDE4_KDEUI_LIBS}
+  ${AKONADICONSOLE_EXTRA_LIBS}
+)
 
 install( TARGETS akonadiconsole_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
 install( FILES akonadiconsole.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-INSTALL( FILES akonadiconsoleui.rc DESTINATION ${DATA_INSTALL_DIR}/akonadiconsole )
-
-endif ( NEPOMUK_FOUND )
+install( FILES akonadiconsoleui.rc DESTINATION ${DATA_INSTALL_DIR}/akonadiconsole )
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/browserwidget.cpp #906463:906464
@@ -18,6 +18,9 @@
 */
 
 #include "browserwidget.h"
+
+#include <config.h>
+
 #include "collectionattributespage.h"
 #include "collectioninternalspage.h"
 #include "collectionaclpage.h"
@@ -47,8 +50,11 @@
 #include <kconfig.h>
 #include <kmessagebox.h>
 #include <kxmlguiwindow.h>
+
+#ifdef NEPOMUK_FOUND
 #include <nepomuk/resource.h>
 #include <nepomuk/variant.h>
+#endif
 
 #include <QSplitter>
 #include <QTextEdit>
@@ -68,7 +74,9 @@
     QWidget( parent ),
     mItemModel( 0 ),
     mCurrentCollection( 0 ),
+#ifdef NEPOMUK_FOUND
     mNepomukModel( 0 ),
+#endif
     mStdActionManager( 0 ),
     mMonitor( 0 )
 {
@@ -130,6 +138,10 @@
   mStdActionManager->setCollectionSelectionModel( mCollectionView->selectionModel() \
);  mStdActionManager->setItemSelectionModel( itemUi.itemView->selectionModel() );
   mStdActionManager->createAllActions();
+
+#ifndef NEPOMUK_FOUND
+  contentUi.mainTabWidget->removeTab( contentUi.mainTabWidget->indexOf( \
contentUi.nepomukTab ) ); +#endif
 }
 
 void BrowserWidget::collectionActivated(const QModelIndex & index)
@@ -211,6 +223,7 @@
   }
   contentUi.attrView->setModel( mAttrModel );
 
+#ifdef NEPOMUK_FOUND
   Nepomuk::Resource res( item.url() );
   delete mNepomukModel;
   mNepomukModel = 0;
@@ -234,6 +247,7 @@
     contentUi.nepomukView->setEnabled( false );
   }
   contentUi.nepomukView->setModel( mNepomukModel );
+#endif
 
   if ( mMonitor )
     mMonitor->deleteLater(); // might be the one calling us
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/browserwidget.h #906463:906464
@@ -71,7 +71,9 @@
     Akonadi::Collection::Id mCurrentCollection;
     Akonadi::Item mCurrentItem;
     QStandardItemModel *mAttrModel;
+#ifdef NEPOMUK_FOUND
     QStandardItemModel *mNepomukModel;
+#endif
     Akonadi::StandardActionManager *mStdActionManager;
     Akonadi::Monitor *mMonitor;
 };
--- trunk/KDE/kdepim/akonadi/clients/akonadiconsole/browserwidget_contentview.ui \
#906463:906464 @@ -11,7 +11,7 @@
   </property>
   <layout class="QGridLayout" >
    <item row="0" column="0" colspan="2" >
-    <widget class="KTabWidget" name="ktabwidget" >
+    <widget class="KTabWidget" name="mainTabWidget" >
      <property name="currentIndex" >
       <number>0</number>
      </property>
@@ -328,7 +328,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_5" >
+     <widget class="QWidget" name="nepomukTab" >
       <attribute name="title" >
        <string>Nepomuk</string>
       </attribute>


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