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

List:       kde-commits
Subject:    KDE/kdepim/kjots
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2010-06-16 12:19:42
Message-ID: 20100616121942.BD31FAC8D7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1138645 by skelly:

Create a new page in newly created books.

 M  +16 -2     kjotswidget.cpp  
 M  +1 -0      kjotswidget.h  


--- trunk/KDE/kdepim/kjots/kjotswidget.cpp #1138644:1138645
@@ -761,7 +761,11 @@
 
   if ( !col.isValid() )
     return;
+  doCreateNewPage(col);
+}
 
+void KJotsWidget::doCreateNewPage(const Collection &collection)
+{
   Item newItem;
   newItem.setMimeType( Note::mimeType() );
 
@@ -785,7 +789,7 @@
   eda->setIconName( "text-plain" );
   newItem.addAttribute(eda);
 
-  Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob( newItem, col, this );
+  Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob( newItem, collection, this );
   connect( job, SIGNAL( result( KJob* ) ), SLOT(newPageResult( KJob* )) );
 
 }
@@ -798,10 +802,20 @@
 
 void KJotsWidget::newBookResult( KJob* job )
 {
-  if ( job->error() )
+  if ( job->error() ) {
     kDebug() << job->errorString();
+    return;
 }
+  Akonadi::CollectionCreateJob *createJob = qobject_cast<Akonadi::CollectionCreateJob*>(job);
+  if ( !createJob )
+    return;
+  const Collection collection = createJob->collection();
+  if ( !collection.isValid() )
+    return;
 
+  doCreateNewPage(collection);
+}
+
 QString KJotsWidget::renderSelectionToHtml()
 {
   QHash<QString, QVariant> hash;
--- trunk/KDE/kdepim/kjots/kjotswidget.h #1138644:1138645
@@ -92,6 +92,7 @@
 
   void updateCaption();
   void updateMenu();
+  void doCreateNewPage( const Akonadi::Collection &collection );
 
   Q_SCRIPTABLE void newPage();
   Q_SCRIPTABLE void newBook();
[prev in list] [next in list] [prev in thread] [next in thread]