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

List:       kde-commits
Subject:    KDE/kdepim/mobile
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-12-09 19:13:11
Message-ID: 20101209191311.85007AC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204937 by tokoe:

Add category configuration dialogs to tasks and contacts


 M  +4 -2      calendar/mainview.cpp  
 M  +1 -0      contacts/KAddressBookActions.qml  
 M  +4 -0      contacts/main.cpp  
 M  +16 -0     contacts/mainview.cpp  
 M  +1 -0      contacts/mainview.h  
 M  +1 -0      tasks/TaskActions.qml  
 M  +15 -0     tasks/mainview.cpp  
 M  +1 -0      tasks/mainview.h  


--- trunk/KDE/kdepim/mobile/calendar/mainview.cpp #1204936:1204937
@@ -70,6 +70,7 @@
 #include <kmessagebox.h>
 #include <ksystemtimezone.h>
 #include <incidenceeditor-ng/categoryeditdialog.h>
+#include <incidenceeditor-ng/editorconfig.h>
 #include <incidenceeditor-ng/incidencedefaults.h>
 #include <libkdepimdbusinterfaces/reminderclient.h>
 
@@ -524,9 +525,10 @@
 
 void MainView::configureCategories()
 {
-  CalendarSupport::CategoryConfig config( Settings::self(), 0 );
+  CalendarSupport::CategoryConfig config( \
IncidenceEditorNG::EditorConfig::instance()->config(), 0 );  \
                IncidenceEditorNG::CategoryEditDialog dialog( &config, 0 );
-  dialog.exec();
+  if ( dialog.exec() )
+    config.writeConfig();
 }
 
 QAbstractProxyModel* MainView::createItemFilterModel() const
--- trunk/KDE/kdepim/mobile/contacts/KAddressBookActions.qml #1204936:1204937
@@ -38,6 +38,7 @@
     ActionListItem { name : "synchronize_all_items" }
     ScriptActionItem { name : "to_selection_screen"; title : KDE.i18n( "Select \
Multiple Address Books" ) }  ActionListItem { name : "import_vcards" }
+    ActionListItem { name : "configure_categories" }
   }
 
   FavoriteManager{ model : favoritesList }
--- trunk/KDE/kdepim/mobile/contacts/main.cpp #1204936:1204937
@@ -26,6 +26,8 @@
 # include <winuser.h>
 #endif
 
+#include <incidenceeditor-ng/korganizereditorconfig.h>
+
 #include "mainview.h"
 
 #ifdef MAIL_SERIALIZER_PLUGIN_STATIC
@@ -43,6 +45,8 @@
   const QByteArray& ba = QByteArray( "kaddressbook-mobile" );
   const KLocalizedString name = ki18n( "KAddressBook Mobile" );
 
+  IncidenceEditorNG::EditorConfig::setEditorConfig( new \
IncidenceEditorNG::KOrganizerEditorConfig ); //FIXME: use our own config for contacts \
+  KAboutData aboutData( ba, ba, name, ba, name );
   aboutData.setProductName( "KAddressbook Mobile" ); //has to match the bugzilla \
product name  
--- trunk/KDE/kdepim/mobile/contacts/mainview.cpp #1204936:1204937
@@ -40,10 +40,14 @@
 #include <akonadi/contact/standardcontactactionmanager.h>
 #include <akonadi/itemcreatejob.h>
 #include <akonadi/itemfetchscope.h>
+#include <calendarsupport/categoryconfig.h>
+#include <incidenceeditor-ng/categoryeditdialog.h>
+#include <incidenceeditor-ng/editorconfig.h>
 #include <kabc/addressee.h>
 #include <kabc/contactgroup.h>
 #include <kaction.h>
 #include <kactioncollection.h>
+#include <kconfigskeleton.h>
 #include <kfiledialog.h>
 #include <klineedit.h>
 #include <klocale.h>
@@ -109,6 +113,10 @@
   connect( action, SIGNAL(triggered(bool)), SLOT(searchLdap()) );
   actionCollection()->addAction( QLatin1String( "search_ldap" ), action );
   
+  action = new KAction( i18n( "Configure Categories" ), this );
+  connect( action, SIGNAL( triggered( bool ) ), SLOT( configureCategories() ) );
+  actionCollection()->addAction( QLatin1String( "configure_categories" ), action );
+
   connect( itemSelectionModel(), SIGNAL( selectionChanged( const QItemSelection&, \
                const QItemSelection& ) ),
            this, SLOT( itemSelectionChanged( const QItemSelection&, const \
QItemSelection& ) ) );  connect( itemActionModel(), SIGNAL( selectionChanged( \
QItemSelection, QItemSelection ) ), @@ -437,4 +445,12 @@
   }
 }
 
+void MainView::configureCategories()
+{
+  CalendarSupport::CategoryConfig config( \
IncidenceEditorNG::EditorConfig::instance()->config(), 0 ); +  \
IncidenceEditorNG::CategoryEditDialog dialog( &config, 0 ); +  if ( dialog.exec() )
+    config.writeConfig();
+}
+
 #include "mainview.moc"
--- trunk/KDE/kdepim/mobile/contacts/mainview.h #1204936:1204937
@@ -60,6 +60,7 @@
     void searchLdap();
     void importFromLdap();
     void updateActionTexts();
+    void configureCategories();
 
   protected:
     virtual void doDelayedInit();
--- trunk/KDE/kdepim/mobile/tasks/TaskActions.qml #1204936:1204937
@@ -39,6 +39,7 @@
     ScriptActionItem { name : "to_selection_screen"; title : KDE.i18n( "Select \
Multiple Task Lists" ) }  ActionListItem { name : "import_tasks" }
     ActionListItem { name : "export_account_tasks" }
+    ActionListItem { name : "configure_categories" }
   }
 
   FavoriteManager{ model : favoritesList }
--- trunk/KDE/kdepim/mobile/tasks/mainview.cpp #1204936:1204937
@@ -35,10 +35,13 @@
 #include "taskthreadgroupercomparator.h"
 #include "threadgroupermodel.h"
 
+#include <incidenceeditor-ng/categoryeditdialog.h>
+#include <incidenceeditor-ng/editorconfig.h>
 #include <incidenceeditor-ng/incidencedefaults.h>
 #include <calendarsupport/archivedialog.h>
 #include <calendarsupport/calendar.h>
 #include <calendarsupport/calendarutils.h>
+#include <calendarsupport/categoryconfig.h>
 #include <calendarsupport/freebusymanager.h>
 #include <calendarsupport/utils.h>
 #include <calendarsupport/kcalprefs.h>
@@ -140,6 +143,10 @@
   connect( actionCollection()->action( QLatin1String( "archive_old_entries" ) ),
            SIGNAL( triggered( bool ) ), SLOT( archiveOldEntries() ) );
 
+  KAction *action = new KAction( i18n( "Configure Categories" ), this );
+  connect( action, SIGNAL( triggered( bool ) ), SLOT( configureCategories() ) );
+  actionCollection()->addAction( QLatin1String( "configure_categories" ), action );
+
   KPIM::ReminderClient::startDaemon();
 }
 
@@ -405,6 +412,14 @@
   return new TasksExportHandler();
 }
 
+void MainView::configureCategories()
+{
+  CalendarSupport::CategoryConfig config( \
IncidenceEditorNG::EditorConfig::instance()->config(), 0 ); +  \
IncidenceEditorNG::CategoryEditDialog dialog( &config, 0 ); +  if ( dialog.exec() )
+    config.writeConfig();
+}
+
 Item MainView::currentItem() const
 {
   const QModelIndexList list = itemSelectionModel()->selectedRows();
--- trunk/KDE/kdepim/mobile/tasks/mainview.h #1204936:1204937
@@ -70,6 +70,7 @@
     void processActionFinish( const Akonadi::Item &item );
     void archiveOldEntries();
     void updateActionTexts();
+    void configureCategories();
 
   protected:
     virtual void doDelayedInit();


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