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

List:       kde-commits
Subject:    KDE/kdepim/akonadi
From:       Volker Krause <vkrause () kde ! org>
Date:       2009-10-02 9:21:55
Message-ID: 1254475315.503894.15948.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1030418 by vkrause:

Use the new contact view from kdepimlibs.


 M  +1 -0      akonadiconsole/CMakeLists.txt  
 M  +6 -6      akonadiconsole/browserwidget.cpp  
 M  +22 -11    akonadiconsole/browserwidget_contentview.ui  
 M  +0 -2      libkdepim-copy/CMakeLists.txt  
 D             libkdepim-copy/addresseeview.cpp  
 D             libkdepim-copy/addresseeview.h  
 D             libkdepim-copy/sendsmsdialog.cpp  
 D             libkdepim-copy/sendsmsdialog.h  


--- trunk/KDE/kdepim/akonadi/akonadiconsole/CMakeLists.txt #1030417:1030418
@@ -78,6 +78,7 @@
 
 target_link_libraries( akonadiconsole_bin
   ${KDEPIMLIBS_AKONADI_LIBS}
+  ${KDEPIMLIBS_AKONADI_CONTACT_LIBS}
   akonadi_next
   ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
   akonadi-kcal
--- trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget.cpp #1030417:1030418
@@ -48,10 +48,9 @@
 #include <akonadi/statisticstooltipproxymodel.h>
 
 #include <kabc/addressee.h>
+#include <kabc/contactgroup.h>
 #include <kcal/incidence.h>
 
-#include <libkdepim-copy/addresseeview.h>
-
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kconfiggroup.h>
@@ -263,10 +262,11 @@
 {
   mCurrentItem = item;
   if ( item.hasPayload<KABC::Addressee>() ) {
-    const KABC::Addressee addr = item.payload<KABC::Addressee>();
-
-    contentUi.addresseeView->setAddressee( addr );
-    contentUi.stack->setCurrentWidget( contentUi.addresseeViewPage );
+    contentUi.contactView->setItem( item );
+    contentUi.stack->setCurrentWidget( contentUi.contactViewPage );
+  } else if ( item.hasPayload<KABC::ContactGroup>() ) {
+    contentUi.contactGroupView->setItem( item );
+    contentUi.stack->setCurrentWidget( contentUi.contactGroupViewPage );
   } else if ( item.hasPayload<KCal::Incidence::Ptr>() ) {
     contentUi.incidenceView->setItem( item );
     contentUi.stack->setCurrentWidget( contentUi.incidenceViewPage );
--- trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget_contentview.ui #1030417:1030418
@@ -49,16 +49,20 @@
            </item>
           </layout>
          </widget>
-         <widget class="QWidget" name="addresseeViewPage">
-          <layout class="QVBoxLayout">
-           <property name="margin">
-            <number>0</number>
-           </property>
+         <widget class="QWidget" name="contactViewPage">
+          <layout class="QVBoxLayout" name="verticalLayout_3">
            <item>
-            <widget class="KPIM::AddresseeView" name="addresseeView"/>
+            <widget class="Akonadi::ContactViewer" name="contactView" native="true"/>
            </item>
           </layout>
          </widget>
+         <widget class="QWidget" name="contactGroupViewPage">
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <item>
+            <widget class="Akonadi::ContactGroupViewer" name="contactGroupView" native="true"/>
+           </item>
+          </layout>
+         </widget>
          <widget class="QWidget" name="incidenceViewPage">
           <layout class="QVBoxLayout">
            <property name="margin">
@@ -423,11 +427,6 @@
    <header>ktextbrowser.h</header>
   </customwidget>
   <customwidget>
-   <class>KPIM::AddresseeView</class>
-   <extends>KTextBrowser</extends>
-   <header location="global">libkdepim-copy/addresseeview.h</header>
-  </customwidget>
-  <customwidget>
    <class>Akonadi::KCalItemBrowser</class>
    <extends>KTextBrowser</extends>
    <header location="global">kcal/kcalitembrowser.h</header>
@@ -444,6 +443,18 @@
    <header location="global">nepomuk/kratingwidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>Akonadi::ContactViewer</class>
+   <extends>QWidget</extends>
+   <header location="global">akonadi/contact/contactviewer.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>Akonadi::ContactGroupViewer</class>
+   <extends>QWidget</extends>
+   <header location="global">akonadi/contact/contactgroupviewer.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
--- trunk/KDE/kdepim/akonadi/libkdepim-copy/CMakeLists.txt #1030417:1030418
@@ -7,7 +7,6 @@
 
 
 set(kdepim-copy_LIB_SRCS
-    addresseeview.cpp
     calendardiffalgo.cpp
     diffalgo.cpp
     htmldiffalgodisplay.cpp
@@ -15,7 +14,6 @@
     kdatepickerpopup.cpp
     kincidencechooser.cpp
     ksubscription.cpp
-    sendsmsdialog.cpp
     uistatesaver.cpp
 )
 
[prev in list] [next in list] [prev in thread] [next in thread]