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

List:       kde-commits
Subject:    KDE/kdepim/korganizer
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-11-24 14:08:27
Message-ID: 20101124140827.6D46CAC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1200277 by tokoe:

Use the CollectionPropertiesDialog from StandardCalendarActionManager
instead of our own copy.


 M  +0 -2      CMakeLists.txt  
 M  +7 -18     akonadicollectionview.cpp  
 M  +0 -1      akonadicollectionview.h  
 M  +10 -0     calendarview.cpp  
 D             collectiongeneralpage.cpp  
 D             collectiongeneralpage.h  
 D             kocollectionpropertiesdialog.cpp  
 D             kocollectionpropertiesdialog.h  


--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #1200276:1200277
@@ -141,8 +141,6 @@
 if (KDEPIM_BUILD_DESKTOP)
 
   set(korganizerprivate_LIB_SRCS
-    kocollectionpropertiesdialog.cpp
-    collectiongeneralpage.cpp
     koeventviewerdialog.cpp
     datenavigator.cpp
     kdatenavigator.cpp
--- trunk/KDE/kdepim/korganizer/akonadicollectionview.cpp #1200276:1200277
@@ -30,7 +30,6 @@
 #include "kocore.h"
 #include "kohelper.h"
 #include "koprefs.h"
-#include "kocollectionpropertiesdialog.h"
 
 #include <calendarsupport/calendarmodel.h>
 #include <calendarsupport/collectionselection.h>
@@ -218,9 +217,14 @@
     connect( mActionManager->action( \
Akonadi::StandardActionManager::DeleteCollections ), SIGNAL( triggered( bool ) ),  \
this, SLOT( deleteCalendar() ) );  
-    mActionManager->interceptAction( \
                Akonadi::StandardActionManager::CollectionProperties );
-    connect( mActionManager->action( \
Akonadi::StandardActionManager::CollectionProperties ), SIGNAL( triggered( bool ) ), \
this, SLOT( slotCollectionProperties() ) ); +    mActionManager->setContextText( \
Akonadi::StandardActionManager::CollectionProperties, \
Akonadi::StandardActionManager::DialogTitle, +                                    \
i18nc( "@title:window", "Properties of Calendar Folder %1" ) );  
+    const QStringList pages = QStringList() << QLatin1String( \
"CalendarSupport::CollectionGeneralPage" ) +                                          \
<< QLatin1String( "Akonadi::CachePolicyPage" ); +
+    mActionManager->setCollectionPropertiesPageNames( pages );
+
     mDisableColor = new KAction( mCollectionview );
     mDisableColor->setText( "&Disable Color");
     mDisableColor->setEnabled( false );
@@ -451,19 +455,4 @@
     emit resourcesAddedRemoved();
 }
 
-
-void AkonadiCollectionView::slotCollectionProperties()
-{
-  QModelIndex index = mCollectionview->selectionModel()->currentIndex(); \
                //selectedRows()
-  Q_ASSERT( index.isValid() );
-  const Akonadi::Collection collection = CalendarSupport::collectionFromIndex( index \
                );
-  Q_ASSERT( collection.isValid() );
-
-  KOCollectionPropertiesDialog* dlg = new KOCollectionPropertiesDialog( collection, \
                this );
-
-  dlg->setCaption(  i18nc( "@title:window", "Properties of Calendar Folder %1" , \
                collection.name() ) );
-  dlg->resize( 400, 500 );
-  dlg->show();
-}
-
 #include "akonadicollectionview.moc" // for EntityModelStateSaver Q_PRIVATE_SLOT
--- trunk/KDE/kdepim/korganizer/akonadicollectionview.h #1200276:1200277
@@ -105,7 +105,6 @@
     void assignColor();
     void disableColor();
     void setDefaultCalendar();
-    void slotCollectionProperties();
 
   private:
     Akonadi::StandardCalendarActionManager* mActionManager;
--- trunk/KDE/kdepim/korganizer/calendarview.cpp #1200276:1200277
@@ -60,6 +60,7 @@
 #include <calendarsupport/categoryconfig.h>
 #include <calendarsupport/utils.h>
 #include <calendarsupport/calendaradaptor.h>
+#include <calendarsupport/collectiongeneralpage.h>
 #include <calendarsupport/collectionselection.h>
 #include <calendarsupport/groupware.h>
 #include <calendarsupport/freebusymanager.h>
@@ -251,7 +252,16 @@
            this, SLOT(processTodoListSelection(const Akonadi::Item &,const QDate &)) \
);  disconnect( mTodoList, SIGNAL(incidenceSelected(const Akonadi::Item &,const QDate \
                &)),
               this, SLOT(processMainViewSelection(const Akonadi::Item &,const QDate \
&)) ); +
+  {
+    static bool pageRegistered = false;
+
+    if ( !pageRegistered ) {
+      Akonadi::CollectionPropertiesDialog::registerPage( new \
CalendarSupport::CollectionGeneralPageFactory ); +      pageRegistered = true;
 }
+  }
+}
 
 CalendarView::~CalendarView()
 {


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