From kde-commits  Fri Aug 31 22:52:20 2007
From: Antonio Aloisio <antonio.aloisio () gmail ! com>
Date: Fri, 31 Aug 2007 22:52:20 +0000
To: kde-commits
Subject: playground/pim/kblogger/src
Message-Id: <1188600740.866444.9125.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=118860075307613

SVN commit 707066 by aloisio:

send media seems to work

 M  +3 -3      backend.cpp  
 M  +0 -2      blogchooser.cpp  
 M  +1 -1      composer.cpp  
 M  +19 -10    uploaddialog.cpp  
 M  +1 -1      uploaddialog.h  


--- trunk/playground/pim/kblogger/src/backend.cpp #707065:707066
@@ -75,8 +75,8 @@
     /*
     connect(&mJobsQueue,SIGNAL(jobDone()),
             this, SLOT(updateWaitWidget()));*/
-    connect(&mJobsQueue, SIGNAL(jobsDone()),
-            this, SLOT( hideWaitWidget() ));
+    /*connect(&mJobsQueue, SIGNAL(jobsDone()),
+            this, SLOT( hideWaitWidget() ));*/
 }
 
 backend::~backend()
@@ -212,7 +212,7 @@
   n.setValue(media);
   kbloggerBlog blog = blogsMap->value( kbMedia->getBlogName() );
   backendJobs *mJob = new backendJobs(  blog,
-                                        backendJobs::REMOVE_POSTING,
+                                        backendJobs::CREATE_MEDIA,
                                         n, caller,
                                         this);
   if ( mJobsQueue.addJob(mJob) ){
--- trunk/playground/pim/kblogger/src/blogchooser.cpp #707065:707066
@@ -28,8 +28,6 @@
 blogChooser::blogChooser(QWidget *parent): QWidget(parent){
     kDebug() << "blogChooser::blogChooser" << endl;
     setupUi(this);
-     connect ( blogCombo, SIGNAL( currentIndexChanged(const QString& ) ),
-	       this, SLOT( populateCategoriesList(const QString&) ) );
      populateBlogList();
 }
   
--- trunk/playground/pim/kblogger/src/composer.cpp #707065:707066
@@ -105,7 +105,7 @@
               this, SLOT( slotRefreshCateroriesFromServer() ) );
     connect ( mBlogChooser->blogCombo, SIGNAL( currentIndexChanged(const QString& ) ),
 	       this, SLOT( populateCategoriesList(const QString& ) ) );
-    
+
     //Try to fill the composer fields with the posting informations.
     loadPostSlot (posting);
 
--- trunk/playground/pim/kblogger/src/uploaddialog.cpp #707065:707066
@@ -36,6 +36,8 @@
 #include <kurlrequester.h>
 #include <kvbox.h>
 #include <kstandarddirs.h>
+// #include <kio/jobclasses.h>
+// #include <kio/jobuidelegate.h>
 
 //#include "configdialog.h"
 #include "kbloggerconfig.h"
@@ -115,8 +117,8 @@
      mMedia= new kbloggerMedia();
      KIO::TransferJob *fileJob = KIO::get( FilekURLRequester->url() );
      
-     connect( fileJob, SIGNAL( result( KIO::Job* ) ), //FIXME Result doesn't exist
-       this, SLOT( handleFileJobResult( KIO::Job* ) ) );
+     connect( fileJob, SIGNAL( result( KJob* ) ), //FIXME Result doesn't exist
+       this, SLOT( handleFileJobResult( KJob* ) ) );
      connect( fileJob, SIGNAL( data( KIO::Job*,  const QByteArray & ) ),
        this, SLOT( handleFileJobData( KIO::Job*,  const QByteArray & ) ) );
      connect( fileJob, SIGNAL( mimetype( KIO::Job*,  const QString & ) ),
@@ -125,12 +127,15 @@
 
 void uploadDialog::handleFileJobData( KIO::Job* job, const QByteArray& data ){
  kDebug() << "uploadDialog::handleFileJobData()"<< data << endl;
+ if ( data.isNull() ){
+   kError() << "data is NULL" << endl;
+   return;
+ }
+ if ( data.isEmpty() ){
+   kError() << "data is EMPTY" << endl;
+   return;
+ }
  mMedia->setData(data);
- /*int mSize= ( mMedia->data() ).size();
- int size= data.size();
- ( mMedia->data() ).resize( mSize + size );
- for( int i=0; i< size; i++ ) // FIXMe ?
-  ( mMedia->data() )[ mSize + i ] = data[ i ];*/
 }
  
 void uploadDialog::handleFileJobMimetype( KIO::Job* job, const QString& mimetype ){
@@ -138,14 +143,18 @@
  mMedia->setMimetype( mimetype );
 }
  
-void uploadDialog::handleFileJobResult( KIO::Job* job ){
+void uploadDialog::handleFileJobResult( KJob* job ){
  if( job->error() ){
-         job->showErrorDialog(); //FIXME DEPRECATED
+         //job->showErrorDialog(); //TODO Something
   return;
  }
  kDebug() << "uploadDialog::handleFileJobResult() got file successfully" << endl;
+ if ( mMedia->data().isEmpty() ){
+   kError() << "media->data is EMPTY" << endl;
+   return;
+ }
  mMedia->setName( NameLineEdit->text() );
- mMedia->setBlogName(mBlogChooser->blogCombo->currentText()); //TODO
+ mMedia->setBlogName(mBlogChooser->blogCombo->currentText());
  backend::self()->sendMedia(mMedia);
 }
 
--- trunk/playground/pim/kblogger/src/uploaddialog.h #707065:707066
@@ -56,7 +56,7 @@
 private Q_SLOTS:
     virtual void uploadSlot();
     
-    virtual void handleFileJobResult( KIO::Job* );
+    virtual void handleFileJobResult( KJob* );
     virtual void handleFileJobData( KIO::Job*,  const QByteArray & );
     virtual void handleFileJobMimetype( KIO::Job*, const QString& );