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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kaddressbook
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2007-02-04 13:23:54
Message-ID: 1170595434.059330.20350.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 630105 by tokoe:

Removed 'Get Image from Blog' feature as it is an usability nightmare and didn't work
at all for some testcases...

It can be fixed for KDE 4.0 by using libsyndication...

CCMAIL:136429


 M  +1 -3      Makefile.am  
 M  +1 -76     imagewidget.cpp  
 M  +0 -23     imagewidget.h  


--- branches/KDE/3.5/kdepim/kaddressbook/Makefile.am #630104:630105
@@ -12,7 +12,6 @@
           -I$(top_builddir)/kaddressbook/common \
           -I$(top_srcdir) \
           -I$(top_buildir)/kaddressbook/editors \
-          -I$(top_srcdir)/akregator/src \
           $(all_includes)
 
 bin_PROGRAMS = kaddressbook
@@ -48,8 +47,7 @@
                             $(top_builddir)/libkcal/libkcal.la \
                             -lkabc_file $(LIB_KABC) $(LIB_KHTML) \
                             $(top_builddir)/kaddressbook/common/libkabcommon.la \
-                            $(top_builddir)/kaddressbook/editors/libkabim.la \
-                            ../akregator/src/librss/librsslocal.la \
+                            $(top_builddir)/kaddressbook/editors/libkabim.la
                             -lkdeprint
 libkaddressbook_la_COMPILE_FIRST = $(top_srcdir)/libkdepim/categoryselectdialog.h \
                                    $(top_srcdir)/libkdepim/categoryeditdialog.h \
--- branches/KDE/3.5/kdepim/kaddressbook/imagewidget.cpp #630104:630105
@@ -34,10 +34,6 @@
 #include <kurldrag.h>
 #include <libkdepim/kpixmapregionselectordialog.h>
 
-#include <librss/loader.h>
-#include <librss/document.h>
-#include <librss/image.h>
-
 #include <qapplication.h>
 #include <qdragobject.h>
 #include <qeventloop.h>
@@ -52,12 +48,10 @@
 #include "imagewidget.h"
 
 ImageLoader::ImageLoader()
-  : QObject( 0, "ImageLoader" ),
-    mIsLoadingBlog( false )
+  : QObject( 0, "ImageLoader" )
 {
 }
 
-
 KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok )
 {
   KABC::Picture picture;
@@ -108,51 +102,7 @@
   return picture;
 }
 
-KABC::Picture ImageLoader::loadBlog( const KURL &url, bool *ok )
-{
-  RSS::Loader *loader = RSS::Loader::create();
-  connect( loader, SIGNAL( loadingComplete( Loader*, Document, Status ) ),
-           this, SLOT( loadingComplete( Loader*, Document, Status ) ) );
-  loader->loadFrom( url, new RSS::FileRetriever );
 
-  mIsLoadingBlog = true;
-  while ( mIsLoadingBlog ) {
-    qApp->eventLoop()->processEvents( QEventLoop::ExcludeUserInput );
-    usleep( 500 );
-  }
-
-  if ( mPicture.data().isNull() ) {
-    KMessageBox::sorry( 0,
-        i18n( "Blog feed at '%1' does not contain an image." ).arg( url.url() ) );
-    (*ok) = false;
-  }
-  (*ok) = true;
-
-  return mPicture;
-}
-
-void ImageLoader::loadingComplete( RSS::Loader*,
-                                   RSS::Document doc,
-                                   RSS::Status status )
-{
-  mIsLoadingBlog = false;
-
-  if ( status != RSS::Success ) {
-    mPicture = KABC::Picture();
-    return;
-  }
-
-  if ( !doc.image() ) {
-    mPicture = KABC::Picture();
-    return;
-  }
-
-  bool ok = false;
-  KABC::Picture pic = loadPicture( doc.image()->url().url(), &ok );
-  if ( ok )
-    mPicture = pic;
-}
-
 ImageButton::ImageButton( const QString &title, QWidget *parent )
   : QPushButton( title, parent ),
     mReadOnly( false ), mImageLoader( 0 )
@@ -183,11 +133,6 @@
   mImageLoader = loader;
 }
 
-void ImageButton::setBlogFeed( const KURL &url )
-{
-  mBlogFeed = url;
-}
-
 void ImageButton::startDrag()
 {
   if ( !mPicture.data().isNull() ) {
@@ -272,9 +217,6 @@
 {
   QPopupMenu menu( this );
   menu.insertItem( i18n( "Reset" ), this, SLOT( clear() ) );
-  if ( mBlogFeed.isValid() )
-    menu.insertItem( i18n("Get From Blog"), this, SLOT( loadBlog() ) );
-
   menu.exec( event->globalPos() );
 }
 
@@ -294,17 +236,6 @@
   }
 }
 
-void ImageButton::loadBlog()
-{
-  bool ok = false;
-  KABC::Picture pic = mImageLoader->loadBlog( mBlogFeed, &ok );
-  if ( ok ) {
-    mPicture = pic;
-    updateGUI();
-    emit changed();
-  }
-}
-
 void ImageButton::clear()
 {
   mPicture = KABC::Picture();
@@ -346,11 +277,6 @@
   mImageButton->setReadOnly( mReadOnly );
 }
 
-void ImageBaseWidget::setBlogFeed( const QString &feed )
-{
-  mImageButton->setBlogFeed( feed );
-}
-
 void ImageBaseWidget::setImage( const KABC::Picture &photo )
 {
   mImageButton->setPicture( photo );
@@ -381,7 +307,6 @@
 void ImageWidget::loadContact( KABC::Addressee *addr )
 {
   mPhotoWidget->setImage( addr->photo() );
-  mPhotoWidget->setBlogFeed( addr->custom( "KADDRESSBOOK", "BlogFeed" ) );
   mLogoWidget->setImage( addr->logo() );
 }
 
--- branches/KDE/3.5/kdepim/kaddressbook/imagewidget.h #630104:630105
@@ -32,15 +32,6 @@
 
 #include "contacteditorwidget.h"
 
-#include <librss/global.h>
-
-namespace RSS {
-class Loader;
-class Document;
-}
-
-using namespace RSS;
-
 /**
   Small helper class
  */
@@ -52,13 +43,8 @@
     ImageLoader();
 
     KABC::Picture loadPicture( const KURL &url, bool *ok );
-    KABC::Picture loadBlog( const KURL &url, bool *ok );
 
-  private slots:
-    void loadingComplete( Loader*, Document, Status );
-
   private:
-    bool mIsLoadingBlog;
     KABC::Picture mPicture;
 };
 
@@ -79,8 +65,6 @@
 
     void setImageLoader( ImageLoader *loader );
 
-    void setBlogFeed( const KURL &url );
-
   signals:
     void changed();
     void urlDropped( const KURL& );
@@ -94,7 +78,6 @@
 
   private slots:
     void load();
-    void loadBlog();
     void clear();
 
   private:
@@ -102,7 +85,6 @@
     void updateGUI();
 
     bool mReadOnly;
-    KURL mBlogFeed;
     QPoint mDragStartPos;
     KABC::Picture mPicture;
 
@@ -119,11 +101,6 @@
     ~ImageBaseWidget();
 
     /**
-      Set URL of blog feed for getting the image.
-     */
-    void setBlogFeed( const QString & );
-
-    /**
       Sets the photo object.
      */
     void setImage( const KABC::Picture &photo );
[prev in list] [next in list] [prev in thread] [next in thread]