Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 2137 insertions, 0 deletions

diff --git a/konqueror/iconview/Makefile.am b/konqueror/iconview/Makefile.am
new file mode 100644
index 000000000..bc685d997
--- /dev/null
+++ b/konqueror/iconview/Makefile.am
@@ -0,0 +1,17 @@
+
+INCLUDES = -I$(top_srcdir)/libkonq -I$(top_srcdir)/konqueror $(all_includes)
+
+kde_module_LTLIBRARIES = konq_iconview.la
+
+METASOURCES = AUTO
+
+konq_iconview_la_SOURCES = konq_iconview.cc
+konq_iconview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+konq_iconview_la_LIBADD = $(top_builddir)/libkonq/libkonq.la
+
+noinst_HEADERS = konq_iconview.h
+
+kde_services_DATA = konq_iconview.desktop konq_multicolumnview.desktop
+
+rcdir = $(kde_datadir)/konqiconview
+rc_DATA = konq_iconview.rc konq_multicolumnview.rc
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
new file mode 100644
index 000000000..672ac80e8
--- /dev/null
+++ b/konqueror/iconview/konq_iconview.cc
@@ -0,0 +1,1539 @@
+/* This file is part of the KDE projects
+   Copyright (C) 1998, 1999 Torben Weis <[email protected]>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "konq_iconview.h"
+#include "konq_propsview.h"
+
+#include <assert.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <unistd.h>
+#include <qfile.h>
+
+#include <kaction.h>
+#include <kapplication.h>
+#include <kdebug.h>
+#include <kdirlister.h>
+#include <kglobalsettings.h>
+#include <kinputdialog.h>
+#include <konq_settings.h>
+#include <kpropertiesdialog.h>
+#include <kstdaction.h>
+#include <kparts/factory.h>
+#include <ktrader.h>
+#include <klocale.h>
+#include <kivdirectoryoverlay.h>
+#include <kmessagebox.h>
+#include <kstaticdeleter.h>
+
+#include <qregexp.h>
+#include <qdatetime.h>
+
+#include <config.h>
+
+template class QPtrList<KFileIVI>;
+//template class QValueList<int>;
+
+class KonqIconViewFactory : public KParts::Factory
+{
+public:
+   KonqIconViewFactory()
+   {
+      s_defaultViewProps = 0;
+      s_instance = 0;
+   }
+
+   virtual ~KonqIconViewFactory()
+   {
+      if ( s_instance )
+         delete s_instance;
+
+      if ( s_defaultViewProps )
+         delete s_defaultViewProps;
+
+      s_instance = 0;
+      s_defaultViewProps = 0;
+   }
+
+    virtual KParts::Part* createPartObject( QWidget *parentWidget, const char *,
+                                      QObject *parent, const char *name, const char*, const QStringList &args )
+   {
+      if( args.count() < 1 )
+         kdWarning() << "KonqKfmIconView: Missing Parameter" << endl;
+
+      KonqKfmIconView *obj = new KonqKfmIconView( parentWidget, parent, name,args.first() );
+      return obj;
+   }
+
+   static KInstance *instance()
+   {
+      if ( !s_instance )
+         s_instance = new KInstance( "konqiconview" );
+      return s_instance;
+   }
+
+   static KonqPropsView *defaultViewProps()
+   {
+      if ( !s_defaultViewProps )
+         s_defaultViewProps = new KonqPropsView( instance(), 0L );
+
+      return s_defaultViewProps;
+   }
+
+   private:
+      static KInstance *s_instance;
+      static KonqPropsView *s_defaultViewProps;
+};
+
+KInstance *KonqIconViewFactory::s_instance = 0;
+KonqPropsView *KonqIconViewFactory::s_defaultViewProps = 0;
+
+
+K_EXPORT_COMPONENT_FACTORY( konq_iconview, KonqIconViewFactory )
+
+
+IconViewBrowserExtension::IconViewBrowserExtension( KonqKfmIconView *iconView )
+ : KonqDirPartBrowserExtension( iconView )
+{
+  m_iconView = iconView;
+  m_bSaveViewPropertiesLocally = false;
+}
+
+int IconViewBrowserExtension::xOffset()
+{
+  return m_iconView->iconViewWidget()->contentsX();
+}
+
+int IconViewBrowserExtension::yOffset()
+{
+  return m_iconView->iconViewWidget()->contentsY();
+}
+
+void IconViewBrowserExtension::reparseConfiguration()
+{
+    KonqFMSettings::reparseConfiguration();
+    // m_pProps is a problem here (what is local, what is global ?)
+    // but settings is easy :
+    if ( m_iconView->iconViewWidget()->initConfig( false ) )
+        m_iconView->iconViewWidget()->arrangeItemsInGrid(); // called if the font changed.
+}
+
+void IconViewBrowserExtension::trash()
+{
+   KonqOperations::del(m_iconView->iconViewWidget(),
+                       KonqOperations::TRASH,
+                       m_iconView->iconViewWidget()->selectedUrls( KonqIconViewWidget::MostLocalUrls ));
+}
+
+void IconViewBrowserExtension::properties()
+{
+    (void) new KPropertiesDialog( m_iconView->iconViewWidget()->selectedFileItems() );
+}
+
+void IconViewBrowserExtension::editMimeType()
+{
+    KFileItem * item = m_iconView->iconViewWidget()->selectedFileItems().first();
+    KonqOperations::editMimeType( item->mimetype() );
+}
+
+void IconViewBrowserExtension::setSaveViewPropertiesLocally( bool value )
+{
+  m_iconView->m_pProps->setSaveViewPropertiesLocally( value );
+}
+
+void IconViewBrowserExtension::setNameFilter( const QString &nameFilter )
+{
+  //kdDebug(1202) << "IconViewBrowserExtension::setNameFilter " << nameFilter << endl;
+  m_iconView->m_nameFilter = nameFilter;
+}
+
+KonqKfmIconView::KonqKfmIconView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode  )
+    : KonqDirPart( parent, name )
+    , m_bNeedSetCurrentItem( false )
+    , m_pEnsureVisible( 0 )
+    , m_paOutstandingOverlaysTimer( 0 )
+    , m_pTimeoutRefreshTimer( 0 )
+    , m_itemDict( 43 )
+{
+    kdDebug(1202) << "+KonqKfmIconView" << endl;
+
+    setBrowserExtension( new IconViewBrowserExtension( this ) );
+
+    // Create a properties instance for this view
+    m_pProps = new KonqPropsView( KonqIconViewFactory::instance(), KonqIconViewFactory::defaultViewProps() );
+
+    m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" );
+    m_pIconView->initConfig( true );
+
+    connect( m_pIconView,  SIGNAL(imagePreviewFinished()),
+             this, SLOT(slotRenderingFinished()));
+
+    // connect up the icon inc/dec signals
+    connect( m_pIconView,  SIGNAL(incIconSize()),
+             this, SLOT(slotIncIconSize()));
+    connect( m_pIconView,  SIGNAL(decIconSize()),
+             this, SLOT(slotDecIconSize()));
+
+    // pass signals to the extension
+    connect( m_pIconView, SIGNAL( enableAction( const char *, bool ) ),
+             m_extension, SIGNAL( enableAction( const char *, bool ) ) );
+
+    // signals from konqdirpart (for BC reasons)
+    connect( this, SIGNAL( findOpened( KonqDirPart * ) ), SLOT( slotKFindOpened() ) );
+    connect( this, SIGNAL( findClosed( KonqDirPart * ) ), SLOT( slotKFindClosed() ) );
+
+    setWidget( m_pIconView );
+    m_mimeTypeResolver = new KMimeTypeResolver<KFileIVI,KonqKfmIconView>(this);
+
+    setInstance( KonqIconViewFactory::instance() );
+
+    setXMLFile( "konq_iconview.rc" );
+
+    // Don't repaint on configuration changes during construction
+    m_bInit = true;
+
+    m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, SLOT( slotShowDot() ),
+                                      actionCollection(), "show_dot" );
+//    m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files"));
+    m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) );
+
+    m_paDirectoryOverlays = new KToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, SLOT( slotShowDirectoryOverlays() ),
+                                      actionCollection(), "show_directory_overlays" );
+
+    m_pamPreview = new KActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" );
+
+    m_paEnablePreviews = new KToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" );
+    m_paEnablePreviews->setCheckedState( i18n("Disable Previews") );
+    connect( m_paEnablePreviews, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) );
+    m_paEnablePreviews->setIcon("thumbnail");
+    m_pamPreview->insert( m_paEnablePreviews );
+    m_pamPreview->insert( new KActionSeparator(this) );
+
+    KTrader::OfferList plugins = KTrader::self()->query( "ThumbCreator" );
+    QMap< QString, KToggleAction* > previewActions;
+    for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it )
+    {
+        if ( KToggleAction*& preview = previewActions[ ( *it )->name() ] )
+            preview->setName( QCString( preview->name() ) + ',' + ( *it )->desktopEntryName().latin1() );
+        else
+        {
+            preview = new KToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() );
+            connect( preview, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) );
+            m_pamPreview->insert( preview );
+            m_paPreviewPlugins.append( preview );
+        }
+    }
+    KToggleAction *soundPreview = new KToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" );
+    connect( soundPreview, SIGNAL( toggled( bool ) ), this, SLOT( slotPreview( bool ) ) );
+    m_pamPreview->insert( soundPreview );
+    m_paPreviewPlugins.append( soundPreview );
+
+    //    m_pamSort = new KActionMenu( i18n( "Sort..." ), actionCollection(), "sort" );
+
+    KToggleAction *aSortByNameCS = new KRadioAction( i18n( "By Name (Case Sensitive)" ), 0, actionCollection(), "sort_nc" );
+    KToggleAction *aSortByNameCI = new KRadioAction( i18n( "By Name (Case Insensitive)" ), 0, actionCollection(), "sort_nci" );
+    KToggleAction *aSortBySize = new KRadioAction( i18n( "By Size" ), 0, actionCollection(), "sort_size" );
+    KToggleAction *aSortByType = new KRadioAction( i18n( "By Type" ), 0, actionCollection(), "sort_type" );
+    KToggleAction *aSortByDate = new KRadioAction( i18n( "By Date" ), 0, actionCollection(), "sort_date" );
+
+    aSortByNameCS->setExclusiveGroup( "sorting" );
+    aSortByNameCI->setExclusiveGroup( "sorting" );
+    aSortBySize->setExclusiveGroup( "sorting" );
+    aSortByType->setExclusiveGroup( "sorting" );
+    aSortByDate->setExclusiveGroup( "sorting" );
+
+    aSortByNameCS->setChecked( false );
+    aSortByNameCI->setChecked( false );
+    aSortBySize->setChecked( false );
+    aSortByType->setChecked( false );
+    aSortByDate->setChecked( false );
+
+    connect( aSortByNameCS, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByNameCaseSensitive( bool ) ) );
+    connect( aSortByNameCI, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByNameCaseInsensitive( bool ) ) );
+    connect( aSortBySize, SIGNAL( toggled( bool ) ), this, SLOT( slotSortBySize( bool ) ) );
+    connect( aSortByType, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByType( bool ) ) );
+    connect( aSortByDate, SIGNAL( toggled( bool ) ), this, SLOT( slotSortByDate( bool ) ) );
+
+    //enable menu item representing the saved sorting criterion
+    QString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion();
+    KRadioAction *sort_action = dynamic_cast<KRadioAction *>(actionCollection()->action(sortcrit.latin1()));
+    if(sort_action!=NULL) sort_action->activate();
+
+    m_paSortDirsFirst = new KToggleAction( i18n( "Folders First" ), 0, actionCollection(), "sort_directoriesfirst" );
+    KToggleAction *aSortDescending = new KToggleAction( i18n( "Descending" ), 0, actionCollection(), "sort_descend" );
+
+    m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() );
+
+    connect( aSortDescending, SIGNAL( toggled( bool ) ), this, SLOT( slotSortDescending() ) );
+    connect( m_paSortDirsFirst, SIGNAL( toggled( bool ) ), this, SLOT( slotSortDirsFirst() ) );
+
+    //enable stored settings
+    slotSortDirsFirst();
+    if (KonqIconViewFactory::defaultViewProps()->isDescending())
+    {
+     aSortDescending->setChecked(true);
+     m_pIconView->setSorting(true,true);//enable sort ascending in QIconview
+     slotSortDescending();//invert sorting (now descending) and actually resort items
+    }
+
+    /*
+    m_pamSort->insert( aSortByNameCS );
+    m_pamSort->insert( aSortByNameCI );
+    m_pamSort->insert( aSortBySize );
+
+    m_pamSort->popupMenu()->insertSeparator();
+
+    m_pamSort->insert( aSortDescending );
+    */
+    m_paSelect = new KAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, SLOT( slotSelect() ),
+                              actionCollection(), "select" );
+    m_paUnselect = new KAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, SLOT( slotUnselect() ),
+                                actionCollection(), "unselect" );
+    m_paSelectAll = KStdAction::selectAll( this, SLOT( slotSelectAll() ), actionCollection(), "selectall" );
+    m_paUnselectAll = new KAction( i18n( "Unselect All" ), CTRL+Key_U, this, SLOT( slotUnselectAll() ),
+                                   actionCollection(), "unselectall" );
+    m_paInvertSelection = new KAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk,
+                                       this, SLOT( slotInvertSelection() ),
+                                       actionCollection(), "invertselection" );
+
+    m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) );
+    m_paUnselect->setToolTip( i18n( "Allows unselecting of file or folder items based on a given mask" ) );
+    m_paSelectAll->setToolTip( i18n( "Selects all items" ) );
+    m_paUnselectAll->setToolTip( i18n( "Unselects all selected items" ) );
+    m_paInvertSelection->setToolTip( i18n( "Inverts the current selection of items" ) );
+
+    //m_paBottomText = new KToggleAction( i18n( "Text at &Bottom" ), 0, actionCollection(), "textbottom" );
+    //m_paRightText = new KToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" );
+    //m_paBottomText->setExclusiveGroup( "TextPos" );
+    //m_paRightText->setExclusiveGroup( "TextPos" );
+    //connect( m_paBottomText, SIGNAL( toggled( bool ) ), this, SLOT( slotTextBottom( bool ) ) );
+    //connect( m_paRightText, SIGNAL( toggled( bool ) ), this, SLOT( slotTextRight( bool ) ) );
+
+    connect( m_pIconView, SIGNAL( executed( QIconViewItem * ) ),
+             this, SLOT( slotReturnPressed( QIconViewItem * ) ) );
+    connect( m_pIconView, SIGNAL( returnPressed( QIconViewItem * ) ),
+             this, SLOT( slotReturnPressed( QIconViewItem * ) ) );
+
+    connect( m_pIconView, SIGNAL( onItem( QIconViewItem * ) ),
+             this, SLOT( slotOnItem( QIconViewItem * ) ) );
+
+    connect( m_pIconView, SIGNAL( onViewport() ),
+             this, SLOT( slotOnViewport() ) );
+
+    connect( m_pIconView, SIGNAL( mouseButtonPressed(int, QIconViewItem*, const QPoint&)),
+             this, SLOT( slotMouseButtonPressed(int, QIconViewItem*, const QPoint&)) );
+    connect( m_pIconView, SIGNAL( mouseButtonClicked(int, QIconViewItem*, const QPoint&)),
+             this, SLOT( slotMouseButtonClicked(int, QIconViewItem*, const QPoint&)) );
+    connect( m_pIconView, SIGNAL( contextMenuRequested(QIconViewItem*, const QPoint&)),
+             this, SLOT( slotContextMenuRequested(QIconViewItem*, const QPoint&)) );
+
+    // Signals needed to implement the spring loading folders behavior
+    connect( m_pIconView, SIGNAL( held( QIconViewItem * ) ),
+             this, SLOT( slotDragHeld( QIconViewItem * ) ) );
+    connect( m_pIconView, SIGNAL( dragEntered( bool ) ),
+             this, SLOT( slotDragEntered( bool ) ) );
+    connect( m_pIconView, SIGNAL( dragLeft() ),
+             this, SLOT( slotDragLeft() ) );
+    connect( m_pIconView, SIGNAL( dragMove( bool ) ),
+             this, SLOT( slotDragMove( bool ) ) );
+    connect( m_pIconView, SIGNAL( dragFinished() ),
+             this, SLOT( slotDragFinished() ) );
+
+    // Create the directory lister
+    m_dirLister = new KDirLister( true );
+    setDirLister( m_dirLister );
+    m_dirLister->setMainWindow(m_pIconView->topLevelWidget());
+
+    connect( m_dirLister, SIGNAL( started( const KURL & ) ),
+             this, SLOT( slotStarted() ) );
+    connect( m_dirLister, SIGNAL( completed() ), this, SLOT( slotCompleted() ) );
+    connect( m_dirLister, SIGNAL( canceled( const KURL& ) ), this, SLOT( slotCanceled( const KURL& ) ) );
+    connect( m_dirLister, SIGNAL( clear() ), this, SLOT( slotClear() ) );
+    connect( m_dirLister, SIGNAL( newItems( const KFileItemList& ) ),
+             this, SLOT( slotNewItems( const KFileItemList& ) ) );
+    connect( m_dirLister, SIGNAL( deleteItem( KFileItem * ) ),
+             this, SLOT( slotDeleteItem( KFileItem * ) ) );
+    connect( m_dirLister, SIGNAL( refreshItems( const KFileItemList& ) ),
+             this, SLOT( slotRefreshItems( const KFileItemList& ) ) );
+    connect( m_dirLister, SIGNAL( redirection( const KURL & ) ),
+             this, SLOT( slotRedirection( const KURL & ) ) );
+    connect( m_dirLister, SIGNAL( itemsFilteredByMime(const KFileItemList& ) ),
+             SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) );
+    connect( m_dirLister, SIGNAL( infoMessage( const QString& ) ),
+             extension(), SIGNAL( infoMessage( const QString& ) ) );
+    connect( m_dirLister, SIGNAL( percent( int ) ),
+             extension(), SIGNAL( loadingProgress( int ) ) );
+    connect( m_dirLister, SIGNAL( speed( int ) ),
+             extension(), SIGNAL( speedProgress( int ) ) );
+
+    // Now we may react to configuration changes
+    m_bInit = false;
+
+    m_bLoading = true;
+    m_bNeedAlign = false;
+    m_bNeedEmitCompleted = false;
+    m_bUpdateContentsPosAfterListing = false;
+    m_bDirPropertiesChanged = true;
+    m_bPreviewRunningBeforeCloseURL = false;
+    m_pIconView->setResizeMode( QIconView::Adjust );
+
+    connect( m_pIconView, SIGNAL( selectionChanged() ),
+             this, SLOT( slotSelectionChanged() ) );
+
+    // Respect kcmkonq's configuration for word-wrap icon text.
+    // If we want something else, we have to adapt the configuration or remove it...
+    m_pIconView->setIconTextHeight(KonqFMSettings::settings()->iconTextHeight());
+
+    // Finally, determine initial grid size again, with those parameters
+    //    m_pIconView->calculateGridX();
+
+    setViewMode( mode );
+}
+
+KonqKfmIconView::~KonqKfmIconView()
+{
+    // Before anything else, stop the image preview. It might use our fileitems,
+    // and it will only be destroyed togetierh with our widget
+    m_pIconView->stopImagePreview();
+
+    kdDebug(1202) << "-KonqKfmIconView" << endl;
+    m_dirLister->disconnect( this );
+    delete m_dirLister;
+    delete m_mimeTypeResolver;
+    delete m_pProps;
+    //no need for that, KParts deletes our widget already ;-)
+    //    delete m_pIconView;
+}
+
+const KFileItem * KonqKfmIconView::currentItem()
+{
+    return m_pIconView->currentItem() ? static_cast<KFileIVI *>(m_pIconView->currentItem())->item() : 0L;
+}
+
+void KonqKfmIconView::slotPreview( bool toggle )
+{
+    QCString name = sender()->name(); // e.g. clipartthumbnail (or audio/, special case)
+    if (name == "iconview_preview_all")
+    {
+        m_pProps->setShowingPreview( toggle );
+        m_pIconView->setPreviewSettings( m_pProps->previewSettings() );
+        if ( !toggle )
+        {
+            kdDebug() << "KonqKfmIconView::slotPreview stopping all previews for " << name << endl;
+            m_pIconView->disableSoundPreviews();
+
+            bool previewRunning = m_pIconView->isPreviewRunning();
+            if ( previewRunning )
+                m_pIconView->stopImagePreview();
+            m_pIconView->setIcons( m_pIconView->iconSize(), "*" );
+        }
+        else
+        {
+            m_pIconView->startImagePreview( m_pProps->previewSettings(), true );
+        }
+        for ( m_paPreviewPlugins.first(); m_paPreviewPlugins.current(); m_paPreviewPlugins.next() )
+            m_paPreviewPlugins.current()->setEnabled( toggle );
+    }
+    else
+    {
+        QStringList types = QStringList::split( ',', name );
+        for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
+        {
+            m_pProps->setShowingPreview( *it, toggle );
+            m_pIconView->setPreviewSettings( m_pProps->previewSettings() );
+            if ( !toggle )
+            {
+                kdDebug() << "KonqKfmIconView::slotPreview stopping image preview for " << *it << endl;
+                if ( *it == "audio/" )
+                    m_pIconView->disableSoundPreviews();
+                else
+                {
+                    KService::Ptr serv = KService::serviceByDesktopName( *it );
+                    Q_ASSERT( serv != 0L );
+                    if ( serv ) {
+                        bool previewRunning = m_pIconView->isPreviewRunning();
+                        if ( previewRunning )
+                            m_pIconView->stopImagePreview();
+                        QStringList mimeTypes = serv->property("MimeTypes").toStringList();
+                        m_pIconView->setIcons( m_pIconView->iconSize(), mimeTypes );
+                        if ( previewRunning )
+                            m_pIconView->startImagePreview( m_pProps->previewSettings(), false );
+                    }
+                }
+            }
+            else
+            {
+                m_pIconView->startImagePreview( m_pProps->previewSettings(), true );
+            }
+        }
+    }
+}
+
+void KonqKfmIconView::slotShowDot()
+{
+    m_pProps->setShowingDotFiles( !m_pProps->isShowingDotFiles() );
+    m_dirLister->setShowingDotFiles( m_pProps->isShowingDotFiles() );
+    m_dirLister->emitChanges();
+    //we don't want the non-dot files to remain where they are
+    m_bNeedAlign = true;
+    slotCompleted();
+}
+
+void KonqKfmIconView::slotShowDirectoryOverlays()
+{
+    bool show = !m_pProps->isShowingDirectoryOverlays();
+
+    m_pProps->setShowingDirectoryOverlays( show );
+
+    for ( QIconViewItem *item = m_pIconView->firstItem(); item; item = item->nextItem() )
+    {
+        KFileIVI* kItem = static_cast<KFileIVI*>(item);
+        if ( !kItem->item()->isDir() ) continue;
+
+        if (show) {
+            showDirectoryOverlay(kItem);
+        } else {
+            kItem -> setShowDirectoryOverlay(false);
+        }
+    }
+
+    m_pIconView->updateContents();
+}
+
+void KonqKfmIconView::slotSelect()
+{
+    bool ok;
+    QString pattern = KInputDialog::getText( QString::null,
+        i18n( "Select files:" ), "*", &ok, m_pIconView );
+    if ( ok )
+    {
+        QRegExp re( pattern, true, true );
+
+        m_pIconView->blockSignals( true );
+
+        QIconViewItem *it = m_pIconView->firstItem();
+        while ( it )
+        {
+            if ( re.exactMatch( it->text() ) )
+                it->setSelected( true, true );
+            it = it->nextItem();
+        }
+
+        m_pIconView->blockSignals( false );
+
+        // do this once, not for each item
+        m_pIconView->slotSelectionChanged();
+        slotSelectionChanged();
+    }
+}
+
+void KonqKfmIconView::slotUnselect()
+{
+    bool ok;
+    QString pattern = KInputDialog::getText( QString::null,
+        i18n( "Unselect files:" ), "*", &ok, m_pIconView );
+    if ( ok )
+    {
+        QRegExp re( pattern, true, true );
+
+        m_pIconView->blockSignals( true );
+
+        QIconViewItem *it = m_pIconView->firstItem();
+        while ( it )
+        {
+            if ( re.exactMatch( it->text() ) )
+                it->setSelected( false, true );
+            it = it->nextItem();
+        }
+
+        m_pIconView->blockSignals( false );
+
+        // do this once, not for each item
+        m_pIconView->slotSelectionChanged();
+        slotSelectionChanged();
+    }
+}
+
+void KonqKfmIconView::slotSelectAll()
+{
+    m_pIconView->selectAll( true );
+}
+
+void KonqKfmIconView::slotUnselectAll()
+{
+    m_pIconView->selectAll( false );
+}
+
+void KonqKfmIconView::slotInvertSelection()
+{
+    m_pIconView->invertSelection( );
+}
+
+void KonqKfmIconView::slotSortByNameCaseSensitive( bool toggle )
+{
+    if ( !toggle )
+        return;
+
+    KonqIconViewFactory::defaultViewProps()->setSortCriterion("sort_nc");
+    setupSorting( NameCaseSensitive );
+}
+
+void KonqKfmIconView::slotSortByNameCaseInsensitive( bool toggle )
+{
+    if ( !toggle )
+        return;
+
+    KonqIconViewFactory::defaultViewProps()->setSortCriterion("sort_nci");
+    setupSorting( NameCaseInsensitive );
+}
+
+void KonqKfmIconView::slotSortBySize( bool toggle )
+{
+    if ( !toggle )
+        return;
+
+    KonqIconViewFactory::defaultViewProps()->setSortCriterion("sort_size");
+    setupSorting( Size );
+}
+
+void KonqKfmIconView::slotSortByType( bool toggle )
+{
+  if ( !toggle )
+    return;
+
+  KonqIconViewFactory::defaultViewProps()->setSortCriterion("sort_type");
+  setupSorting( Type );
+}
+
+void KonqKfmIconView::slotSortByDate( bool toggle )
+{
+  if( !toggle)
+    return;
+
+  KonqIconViewFactory::defaultViewProps()->setSortCriterion("sort_date");
+  setupSorting( Date );
+}
+
+void KonqKfmIconView::setupSorting( SortCriterion criterion )
+{
+    m_eSortCriterion = criterion;
+
+    setupSortKeys();
+
+    m_pIconView->sort( m_pIconView->sortDirection() );
+}
+
+void KonqKfmIconView::slotSortDescending()
+{
+    if ( m_pIconView->sortDirection() )
+        m_pIconView->setSorting( true, false );
+    else
+        m_pIconView->setSorting( true, true );
+
+    setupSortKeys(); // keys have to change, for directories
+
+    m_pIconView->sort( m_pIconView->sortDirection() );
+
+    KonqIconViewFactory::defaultViewProps()->setDescending( !m_pIconView->sortDirection() );
+}
+
+void KonqKfmIconView::slotSortDirsFirst()
+{
+    m_pIconView->setSortDirectoriesFirst( m_paSortDirsFirst->isChecked() );
+
+    setupSortKeys();
+
+    m_pIconView->sort( m_pIconView->sortDirection() );
+
+    KonqIconViewFactory::defaultViewProps()->setDirsFirst( m_paSortDirsFirst->isChecked() );
+}
+
+void KonqKfmIconView::newIconSize( int size )
+{
+    //Either of the sizes can be 0 to indicate the default (Desktop) size icons.
+    //check for that when checking whether the size changed
+    int effSize = size;
+    if (effSize == 0)
+       effSize = IconSize(KIcon::Desktop);
+
+    int oldEffSize = m_pIconView->iconSize();
+    if (oldEffSize == 0)
+       oldEffSize = IconSize(KIcon::Desktop);
+
+    // Make sure all actions are initialized.
+    KonqDirPart::newIconSize( size );
+
+    if ( effSize == oldEffSize )
+        return;
+
+    // Stop a preview job that might be running
+    m_pIconView->stopImagePreview();
+
+    // Set icons size, arrage items in grid and repaint the whole view
+    m_pIconView->setIcons( size );
+
+    // If previews are enabled start a new job
+    if ( m_pProps->isShowingPreview() )
+        m_pIconView->startImagePreview( m_pProps->previewSettings(), true );
+}
+
+bool KonqKfmIconView::doCloseURL()
+{
+    m_dirLister->stop();
+
+    m_mimeTypeResolver->m_lstPendingMimeIconItems.clear();
+
+    m_bPreviewRunningBeforeCloseURL = m_pIconView->isPreviewRunning();
+    m_pIconView->stopImagePreview();
+    return true;
+}
+
+void KonqKfmIconView::slotReturnPressed( QIconViewItem *item )
+{
+    if ( !item )
+        return;
+
+    item->setSelected( false, true );
+    m_pIconView->visualActivate(item);
+
+    KFileItem *fileItem = (static_cast<KFileIVI*>(item))->item();
+    if ( !fileItem )
+        return;
+    lmbClicked( fileItem );
+}
+
+void KonqKfmIconView::slotDragHeld( QIconViewItem *item )
+{
+    kdDebug() << "KonqKfmIconView::slotDragHeld()" << endl;
+
+    // This feature is not usable if the user wants one window per folder
+    if ( KonqFMSettings::settings()->alwaysNewWin() )
+        return;
+
+    if ( !item )
+        return;
+
+    KFileItem *fileItem = (static_cast<KFileIVI*>(item))->item();
+
+    SpringLoadingManager::self().springLoadTrigger(this, fileItem, item);
+}
+
+void KonqKfmIconView::slotDragEntered( bool )
+{
+    if ( SpringLoadingManager::exists() )
+        SpringLoadingManager::self().dragEntered(this);
+}
+
+void KonqKfmIconView::slotDragLeft()
+{
+    kdDebug() << "KonqKfmIconView::slotDragLeft()" << endl;
+
+    if ( SpringLoadingManager::exists() )
+        SpringLoadingManager::self().dragLeft(this);
+}
+
+void KonqKfmIconView::slotDragMove( bool accepted )
+{
+    if ( !accepted )
+        emit setStatusBarText( i18n( "You cannot drop any items in a directory in which you do not have write permission" ) );
+}
+
+void KonqKfmIconView::slotDragFinished()
+{
+    kdDebug() << "KonqKfmIconView::slotDragFinished()" << endl;
+
+    if ( SpringLoadingManager::exists() )
+        SpringLoadingManager::self().dragFinished(this);
+}
+
+
+void KonqKfmIconView::slotContextMenuRequested(QIconViewItem* _item, const QPoint& _global)
+{
+    const KFileItemList items = m_pIconView->selectedFileItems();
+    if ( items.isEmpty() )
+        return;
+
+    KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems;
+
+    KFileIVI* i = static_cast<KFileIVI*>(_item);
+    if (i)
+        i->setSelected( true, true /* don't touch other items */ );
+
+    KFileItem * rootItem = m_dirLister->rootItem();
+    if ( rootItem ) {
+        KURL parentDirURL = rootItem->url();
+        // Check if parentDirURL applies to the selected items (usually yes, but not with search results)
+        QPtrListIterator<KFileItem> kit( items );
+        for ( ; kit.current(); ++kit )
+            if ( kit.current()->url().directory( 1 ) != rootItem->url().path() )
+                parentDirURL = KURL();
+        // If rootItem is the parent of the selected items, then we can use isWritable() on it.
+        if ( !parentDirURL.isEmpty() && !rootItem->isWritable() )
+            popupFlags |= KParts::BrowserExtension::NoDeletion;
+    }
+
+    emit m_extension->popupMenu( 0L, _global, items, KParts::URLArgs(), popupFlags);
+}
+
+void KonqKfmIconView::slotMouseButtonPressed(int _button, QIconViewItem* _item, const QPoint&)
+{
+    if ( _button == RightButton && !_item )
+    {
+        // Right click on viewport
+        KFileItem * item = m_dirLister->rootItem();
+        bool delRootItem = false;
+        if ( ! item )
+        {
+            if ( m_bLoading )
+            {
+                kdDebug(1202) << "slotViewportRightClicked : still loading and no root item -> dismissed" << endl;
+                return; // too early, '.' not yet listed
+            }
+            else
+            {
+                // We didn't get a root item (e.g. over FTP)
+                // We have to create a dummy item. I tried using KonqOperations::statURL,
+                // but this was leading to a huge delay between the RMB and the popup. Bad.
+                // But KonqPopupMenu now takes care of stating before opening properties.
+                item = new KFileItem( S_IFDIR, (mode_t)-1, url() );
+                delRootItem = true;
+            }
+        }
+
+        KFileItemList items;
+        items.append( item );
+
+        KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
+
+        emit m_extension->popupMenu( 0L, QCursor::pos(), items, KParts::URLArgs(), popupFlags );
+
+        if ( delRootItem )
+            delete item; // we just created it
+    }
+}
+
+void KonqKfmIconView::slotMouseButtonClicked(int _button, QIconViewItem* _item, const QPoint& )
+{
+    if( _button == MidButton )
+        mmbClicked( _item ? static_cast<KFileIVI*>(_item)->item() : 0L );
+}
+
+void KonqKfmIconView::slotStarted()
+{
+    // Only emit started if this comes after openURL, i.e. it's not for an update.
+    // We don't want to start a spinning wheel during updates.
+    if ( m_bLoading )
+        emit started( 0 );
+
+    // An update may come in while we are still processing icons...
+    // So don't clear the list.
+    //m_mimeTypeResolver->m_lstPendingMimeIconItems.clear();
+}
+
+void KonqKfmIconView::slotCanceled()
+{
+    // Called by kfindpart. Not by kdirlister.
+    slotCanceled( m_pIconView->url() );
+}
+
+void KonqKfmIconView::slotCanceled( const KURL& url )
+{
+    // Check if this canceled() signal is about the URL we're listing.
+    // It could be about the URL we were listing, and openURL() aborted it.
+    if ( m_bLoading && url.equals( m_pIconView->url(), true ) )
+    {
+        emit canceled( QString::null );
+        m_bLoading = false;
+    }
+
+    // Stop the "refresh if busy too long" timer because a viewport
+    // update is coming.
+    if ( m_pTimeoutRefreshTimer && m_pTimeoutRefreshTimer->isActive() )
+        m_pTimeoutRefreshTimer->stop();
+
+    // See slotCompleted(). If a listing gets canceled, it doesn't emit
+    // the completed() signal, so handle that case.
+    if ( !m_pIconView->viewport()->isUpdatesEnabled() )
+    {
+        m_pIconView->viewport()->setUpdatesEnabled( true );
+        m_pIconView->viewport()->repaint();
+    }
+    if ( m_pEnsureVisible ){
+        m_pIconView->ensureItemVisible( m_pEnsureVisible );
+        m_pEnsureVisible = 0;
+    }
+}
+
+void KonqKfmIconView::slotCompleted()
+{
+    // Stop the "refresh if busy too long" timer because a viewport
+    // update is coming.
+    if ( m_pTimeoutRefreshTimer && m_pTimeoutRefreshTimer->isActive() )
+        m_pTimeoutRefreshTimer->stop();
+
+    // If updates to the viewport are still blocked (so slotNewItems() has
+    // not been called), a viewport repaint is forced.
+    if ( !m_pIconView->viewport()->isUpdatesEnabled() )
+    {
+        m_pIconView->viewport()->setUpdatesEnabled( true );
+        m_pIconView->viewport()->repaint();
+    }
+
+    // Root item ? Store root item in konqiconviewwidget (whether 0L or not)
+    m_pIconView->setRootItem( m_dirLister->rootItem() );
+
+    // only after initial listing, not after updates
+    // If we don't set a current item, the iconview has none (one more keypress needed)
+    // but it appears on focusin... qiconview bug, Reggie acknowledged it LONG ago (07-2000).
+    if ( m_bNeedSetCurrentItem )
+    {
+        m_pIconView->setCurrentItem( m_pIconView->firstItem() );
+        m_bNeedSetCurrentItem = false;
+    }
+
+    if ( m_bUpdateContentsPosAfterListing ) {
+         m_pIconView->setContentsPos( extension()->urlArgs().xOffset,
+                                      extension()->urlArgs().yOffset );
+    }
+
+    if ( m_pEnsureVisible ){
+        m_pIconView->ensureItemVisible( m_pEnsureVisible );
+        m_pEnsureVisible = 0;
+    }
+
+    m_bUpdateContentsPosAfterListing = false;
+
+    if ( !m_pIconView->firstItem() )
+	resetCount();
+
+    slotOnViewport();
+
+    // slotRenderingFinished will do it
+    m_bNeedEmitCompleted = true;
+
+    if (m_pProps->isShowingPreview())
+        m_mimeTypeResolver->start( 0 ); // We need the mimetypes asap
+    else
+    {
+        slotRenderingFinished(); // emit completed, we don't want the wheel...
+        // to keep turning while we find mimetypes in the background
+        m_mimeTypeResolver->start( 10 );
+    }
+
+    m_bLoading = false;
+
+    // Disable cut icons if any
+    slotClipboardDataChanged();
+}
+
+void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
+{
+    // Stop the autorefresh timer since data to display has arrived and will
+    // be drawn in moments
+    if ( m_pTimeoutRefreshTimer && m_pTimeoutRefreshTimer->isActive() )
+        m_pTimeoutRefreshTimer->stop();
+    // We need to disable graphics updates on the iconview when
+    // inserting items, or else a blank paint operation will be
+    // performed on the top-left corner for each inserted item!
+    m_pIconView->setUpdatesEnabled( false );
+    for (KFileItemListIterator it(entries); it.current(); ++it)
+    {
+        //kdDebug(1202) << "KonqKfmIconView::slotNewItem(...)" << _fileitem->url().url() << endl;
+        KFileIVI* item = new KFileIVI( m_pIconView, *it, m_pIconView->iconSize() );
+        item->setRenameEnabled( false );
+
+        KFileItem* fileItem = item->item();
+
+        if ( !m_itemsToSelect.isEmpty() ) {
+           QStringList::Iterator tsit = m_itemsToSelect.find( fileItem->name() );
+           if ( tsit != m_itemsToSelect.end() ) {
+              m_itemsToSelect.remove( tsit );
+              m_pIconView->setSelected( item, true, true );
+              if ( m_bNeedSetCurrentItem ){
+                 m_pIconView->setCurrentItem( item );
+                 if( !m_pEnsureVisible )
+                    m_pEnsureVisible = item;
+                 m_bNeedSetCurrentItem = false;
+              }
+           }
+        }
+
+        if ( fileItem->isDir() && m_pProps->isShowingDirectoryOverlays() ) {
+            showDirectoryOverlay(item);
+        }
+
+        QString key;
+
+        switch ( m_eSortCriterion )
+        {
+            case NameCaseSensitive: key = item->text(); break;
+            case NameCaseInsensitive: key = item->text().lower(); break;
+            case Size: key = makeSizeKey( item ); break;
+            case Type: key = item->item()->mimetype()+ "\008" +item->text().lower(); break; // ### slows down listing :-(
+            case Date:
+            {
+                QDateTime dayt;
+                dayt.setTime_t(item->item()->time(KIO::UDS_MODIFICATION_TIME ));
+                key = dayt.toString("yyyyMMddhhmmss");
+                break;
+            }
+            default: Q_ASSERT(0);
+        }
+
+        item->setKey( key );
+
+        //kdDebug() << "KonqKfmIconView::slotNewItems " << (*it)->url().url() << " " << (*it)->mimeTypePtr()->name() << " mimetypeknown:" << (*it)->isMimeTypeKnown() << endl;
+        if ( !(*it)->isMimeTypeKnown() )
+            m_mimeTypeResolver->m_lstPendingMimeIconItems.append( item );
+
+        m_itemDict.insert( *it, item );
+    }
+    // After filtering out updates-on-insertions we can re-enable updates
+    m_pIconView->setUpdatesEnabled( true );
+    // Locking the viewport has filtered out blanking and now, since we
+    // have some items to draw, we can restore updating.
+    if ( !m_pIconView->viewport()->isUpdatesEnabled() )
+        m_pIconView->viewport()->setUpdatesEnabled( true );
+    KonqDirPart::newItems( entries );
+}
+
+void KonqKfmIconView::slotDeleteItem( KFileItem * _fileitem )
+{
+    // new in 3.5.5
+#ifdef KPARTS_BROWSEREXTENSION_HAS_ITEMS_REMOVED
+    KFileItemList list;
+    list.append( _fileitem );
+    emit m_extension->itemsRemoved( list );
+#else
+#error "Your kdelibs doesn't have KParts::BrowserExtension::itemsRemoved, please update it to at least 3.5.5"
+#endif
+
+    if ( _fileitem == m_dirLister->rootItem() )
+    {
+        m_pIconView->stopImagePreview();
+        m_pIconView->setRootItem( 0L );
+        return;
+    }
+
+    //kdDebug(1202) << "KonqKfmIconView::slotDeleteItem(...)" << endl;
+    // we need to find out the iconcontainer item containing the fileitem
+    KFileIVI * ivi = m_itemDict[ _fileitem ];
+    // It can be that we know nothing about this item, e.g. because it's filtered out
+    // (by default: dot files). KDirLister still tells us about it when it's modified, since
+    // it doesn't know if we showed it before, and maybe its mimetype changed so we
+    // might have to hide it now.
+    if (ivi)
+    {
+        m_pIconView->stopImagePreview();
+        KonqDirPart::deleteItem( _fileitem );
+
+        m_pIconView->takeItem( ivi );
+        m_mimeTypeResolver->m_lstPendingMimeIconItems.remove( ivi );
+        m_itemDict.remove( _fileitem );
+        if (m_paOutstandingOverlays.first() == ivi) // Being processed?
+           m_paOutstandingOverlaysTimer->start(20, true); // Restart processing...
+
+        m_paOutstandingOverlays.remove(ivi);
+        delete ivi;
+    }
+}
+
+void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item)
+{
+    KFileItem* fileItem = item->item();
+
+    if ( KGlobalSettings::showFilePreview( fileItem->url() ) ) {
+        m_paOutstandingOverlays.append(item);
+        if (m_paOutstandingOverlays.count() == 1)
+        {
+           if (!m_paOutstandingOverlaysTimer)
+           {
+              m_paOutstandingOverlaysTimer = new QTimer(this);
+              connect(m_paOutstandingOverlaysTimer, SIGNAL(timeout()),
+                      SLOT(slotDirectoryOverlayStart()));
+           }
+           m_paOutstandingOverlaysTimer->start(20, true);
+        }
+    }
+}
+
+void KonqKfmIconView::slotDirectoryOverlayStart()
+{
+    do
+    {
+       KFileIVI* item = m_paOutstandingOverlays.first();
+       if (!item)
+          return; // Nothing to do
+
+       KIVDirectoryOverlay* overlay = item->setShowDirectoryOverlay( true );
+
+       if (overlay)
+       {
+          connect( overlay, SIGNAL( finished() ), this, SLOT( slotDirectoryOverlayFinished() ) );
+          overlay->start(); // Watch out, may emit finished() immediately!!
+          return; // Let it run....
+       }
+       m_paOutstandingOverlays.removeFirst();
+    } while (true);
+}
+
+void KonqKfmIconView::slotDirectoryOverlayFinished()
+{
+    m_paOutstandingOverlays.removeFirst();
+
+    if (m_paOutstandingOverlays.count() > 0)
+        m_paOutstandingOverlaysTimer->start(0, true); // Don't call directly to prevent deep recursion.
+}
+
+// see also KDesktop::slotRefreshItems
+void KonqKfmIconView::slotRefreshItems( const KFileItemList& entries )
+{
+    bool bNeedRepaint = false;
+    bool bNeedPreviewJob = false;
+    KFileItemListIterator rit(entries);
+    for (; rit.current(); ++rit)
+    {
+        KFileIVI * ivi = m_itemDict[ rit.current() ];
+        Q_ASSERT(ivi);
+        kdDebug() << "KonqKfmIconView::slotRefreshItems '" << rit.current()->name() << "' ivi=" << ivi << endl;
+        if (ivi)
+        {
+            QSize oldSize = ivi->pixmap()->size();
+            if ( ivi->isThumbnail() ) {
+                bNeedPreviewJob = true;
+                ivi->invalidateThumbnail();
+            }
+            else
+                ivi->refreshIcon( true );
+            ivi->setText( rit.current()->text() );
+            if ( rit.current()->isMimeTypeKnown() )
+                ivi->setMouseOverAnimation( rit.current()->iconName() );
+            if ( !bNeedRepaint && oldSize != ivi->pixmap()->size() )
+                bNeedRepaint = true;
+        }
+    }
+
+    if ( bNeedPreviewJob && m_pProps->isShowingPreview() )
+    {
+        m_pIconView->startImagePreview( m_pProps->previewSettings(), false );
+    }
+    else
+    {
+        // In case we replace a big icon with a small one, need to repaint.
+        if ( bNeedRepaint )
+            m_pIconView->updateContents();
+    }
+}
+
+void KonqKfmIconView::slotClear()
+{
+    resetCount();
+
+    // We're now going to update the view with new contents. To avoid
+    // meaningless paint operations (such as a clear() just before drawing
+    // fresh contents) we disable updating the viewport until we'll
+    // receive some data or a timeout timer expires.
+    m_pIconView->viewport()->setUpdatesEnabled( false );
+    if ( !m_pTimeoutRefreshTimer )
+    {
+        m_pTimeoutRefreshTimer = new QTimer( this );
+        connect( m_pTimeoutRefreshTimer, SIGNAL( timeout() ),
+                 this, SLOT( slotRefreshViewport() ) );
+    }
+    m_pTimeoutRefreshTimer->start( 700, true );
+
+    // Clear contents but don't clear graphics as updates are disabled.
+    m_pIconView->clear();
+    // If directory properties are changed, apply pending changes
+    // changes are: view background or color, iconsize, enabled previews
+    if ( m_bDirPropertiesChanged )
+    {
+        m_pProps->applyColors( m_pIconView->viewport() );
+        newIconSize( m_pProps->iconSize() );
+        m_pIconView->setPreviewSettings( m_pProps->previewSettings() );
+    }
+
+    m_mimeTypeResolver->m_lstPendingMimeIconItems.clear();
+    m_itemDict.clear();
+    // Bug in QIconview IMHO - it should emit selectionChanged()
+    // (bug reported, but code seems to be that way on purpose)
+    m_pIconView->slotSelectionChanged();
+    slotSelectionChanged();
+}
+
+void KonqKfmIconView::slotRedirection( const KURL & url )
+{
+    const QString prettyURL = url.pathOrURL();
+    emit m_extension->setLocationBarURL( prettyURL );
+    emit setWindowCaption( prettyURL );
+    m_pIconView->setURL( url );
+    m_url = url;
+}
+
+void KonqKfmIconView::slotSelectionChanged()
+{
+    // Display statusbar info, and emit selectionInfo
+    KFileItemList lst = m_pIconView->selectedFileItems();
+    emitCounts( lst, true );
+
+    bool itemSelected = lst.count()>0;
+    m_paUnselect->setEnabled( itemSelected );
+    m_paUnselectAll->setEnabled( itemSelected );
+    m_paInvertSelection->setEnabled( itemSelected );
+}
+
+void KonqKfmIconView::determineIcon( KFileIVI * item )
+{
+  // kdDebug() << "KonqKfmIconView::determineIcon " << item->item()->name() << endl;
+  //int oldSerial = item->pixmap()->serialNumber();
+
+  (void) item->item()->determineMimeType();
+
+  item->setIcon( iconSize(), item->state(), true, true );
+  item->setMouseOverAnimation( item->item()->iconName() );
+}
+
+void KonqKfmIconView::mimeTypeDeterminationFinished()
+{
+    if ( m_pProps->isShowingPreview() )
+    {
+        // TODO if ( m_url.isLocalFile() || m_bAutoPreviewRemote )
+        {
+            // We can do this only when the mimetypes are fully determined,
+            // since we only do image preview... on images :-)
+            m_pIconView->startImagePreview( m_pProps->previewSettings(), false );
+            return;
+        }
+    }
+    slotRenderingFinished();
+}
+
+void KonqKfmIconView::slotRenderingFinished()
+{
+    kdDebug(1202) << "KonqKfmIconView::slotRenderingFinished()" << endl;
+    if ( m_bNeedEmitCompleted )
+    {
+        kdDebug(1202) << "KonqKfmIconView completed() after rendering" << endl;
+        emit completed();
+        m_bNeedEmitCompleted = false;
+    }
+    if ( m_bNeedAlign )
+    {
+        m_bNeedAlign = false;
+        kdDebug(1202) << "arrangeItemsInGrid" << endl;
+        m_pIconView->arrangeItemsInGrid();
+    }
+}
+
+void KonqKfmIconView::slotRefreshViewport()
+{
+    kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl;
+    QWidget * vp = m_pIconView->viewport();
+    bool prevState = vp->isUpdatesEnabled();
+    vp->setUpdatesEnabled( true );
+    vp->repaint();
+    vp->setUpdatesEnabled( prevState );
+}
+
+bool KonqKfmIconView::doOpenURL( const KURL & url )
+{
+    // Store url in the icon view
+    m_pIconView->setURL( url );
+
+    m_bLoading = true;
+    m_bNeedSetCurrentItem = true;
+
+    // Check for new properties in the new dir
+    // enterDir returns true the first time, and any time something might
+    // have changed.
+    m_bDirPropertiesChanged = m_pProps->enterDir( url );
+
+    m_dirLister->setNameFilter( m_nameFilter );
+
+    m_dirLister->setMimeFilter( mimeFilter() );
+
+    // This *must* happen before m_dirLister->openURL because it emits
+    // clear() and QIconView::clear() calls setContentsPos(0,0)!
+    KParts::URLArgs args = m_extension->urlArgs();
+    if ( args.reload )
+    {
+        args.xOffset = m_pIconView->contentsX();
+        args.yOffset = m_pIconView->contentsY();
+        m_extension->setURLArgs( args );
+
+        m_filesToSelect.clear();
+        KFileItemList fil( selectedFileItems() );
+        for (KFileItemListIterator fi_it(fil); fi_it.current(); ++fi_it)
+            m_filesToSelect += (*fi_it)->name();
+    }
+
+    m_itemsToSelect = m_filesToSelect;
+
+    m_dirLister->setShowingDotFiles( m_pProps->isShowingDotFiles() );
+
+    m_bNeedAlign = false;
+    m_bUpdateContentsPosAfterListing = true;
+
+    m_paOutstandingOverlays.clear();
+
+    // Start the directory lister !
+    m_dirLister->openURL( url, false, args.reload );
+
+    // View properties (icon size, background, ..) will be applied into slotClear()
+    // if m_bDirPropertiesChanged is set. If so, here we update preview actions.
+    if ( m_bDirPropertiesChanged )
+    {
+      m_paDotFiles->setChecked( m_pProps->isShowingDotFiles() );
+      m_paDirectoryOverlays->setChecked( m_pProps->isShowingDirectoryOverlays() );
+      m_paEnablePreviews->setChecked( m_pProps->isShowingPreview() );
+      for ( m_paPreviewPlugins.first(); m_paPreviewPlugins.current(); m_paPreviewPlugins.next() )
+      {
+          QStringList types = QStringList::split( ',', m_paPreviewPlugins.current()->name() );
+          bool enabled = false;
+          for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
+              if ( m_pProps->isShowingPreview( *it ) )
+              {
+                  enabled = true;
+                  break;
+              }
+          m_paPreviewPlugins.current()->setChecked( enabled );
+          m_paPreviewPlugins.current()->setEnabled( m_pProps->isShowingPreview() );
+      }
+    }
+
+    const QString prettyURL = url.pathOrURL();
+    emit setWindowCaption( prettyURL );
+
+    return true;
+}
+
+void KonqKfmIconView::slotKFindOpened()
+{
+    m_dirLister->setAutoUpdate( false );
+}
+
+void KonqKfmIconView::slotKFindClosed()
+{
+    m_dirLister->setAutoUpdate( true );
+}
+
+void KonqKfmIconView::slotOnItem( QIconViewItem *item )
+{
+    emit setStatusBarText( static_cast<KFileIVI *>(item)->item()->getStatusBarInfo() );
+    emitMouseOver( static_cast<KFileIVI*>(item)->item());
+}
+
+void KonqKfmIconView::slotOnViewport()
+{
+    KFileItemList lst = m_pIconView->selectedFileItems();
+    emitCounts( lst, false );
+    emitMouseOver( 0 );
+}
+
+void KonqKfmIconView::setViewMode( const QString &mode )
+{
+    if ( mode == m_mode )
+        return;
+    // note: this should be moved to KonqIconViewWidget. It would make the code
+    // more readable :)
+
+    m_mode = mode;
+    if (mode=="MultiColumnView")
+    {
+        m_pIconView->setArrangement(QIconView::TopToBottom);
+        m_pIconView->setItemTextPos(QIconView::Right);
+    }
+    else
+    {
+        m_pIconView->setArrangement(QIconView::LeftToRight);
+        m_pIconView->setItemTextPos(QIconView::Bottom);
+    }
+
+    if ( m_bPreviewRunningBeforeCloseURL )
+    {
+        m_bPreviewRunningBeforeCloseURL = false;
+        // continue (param: false) a preview job interrupted by doCloseURL
+        m_pIconView->startImagePreview( m_pProps->previewSettings(), false );
+    }
+}
+
+void KonqKfmIconView::setupSortKeys()
+{
+    switch ( m_eSortCriterion )
+    {
+    case NameCaseSensitive:
+        m_pIconView->setCaseInsensitiveSort( false );
+        for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+            it->setKey( it->text() );
+        break;
+    case NameCaseInsensitive:
+        m_pIconView->setCaseInsensitiveSort( true );
+        for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+            it->setKey( it->text().lower() );
+        break;
+    case Size:
+        for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+            it->setKey( makeSizeKey( (KFileIVI *)it ) );
+        break;
+    case Type:
+        // Sort by Type + Name (#17014)
+        for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+            it->setKey( static_cast<KFileIVI *>( it )->item()->mimetype() + "\008" + it->text().lower() );
+        break;
+    case Date:
+    {
+        //Sorts by time of modification (#52750)
+        QDateTime dayt;
+        for ( QIconViewItem *it = m_pIconView->firstItem(); it; it = it->nextItem() )
+        {
+            dayt.setTime_t(static_cast<KFileIVI *>( it )->item()->time(KIO::UDS_MODIFICATION_TIME));
+            it->setKey(dayt.toString("yyyyMMddhhmmss"));
+        }
+        break;
+    }
+    }
+}
+
+QString KonqKfmIconView::makeSizeKey( KFileIVI *item )
+{
+    return KIO::number( item->item()->size() ).rightJustify( 20, '0' );
+}
+
+void KonqKfmIconView::disableIcons( const KURL::List & lst )
+{
+    m_pIconView->disableIcons( lst );
+}
+
+
+SpringLoadingManager *SpringLoadingManager::s_self = 0L;
+static KStaticDeleter<SpringLoadingManager> s_springManagerDeleter;
+
+SpringLoadingManager::SpringLoadingManager()
+    : m_startPart(0L)
+{
+    connect( &m_endTimer, SIGNAL( timeout() ),
+             this, SLOT( finished() ) );
+
+}
+
+SpringLoadingManager &SpringLoadingManager::self()
+{
+    if ( !s_self )
+    {
+        s_springManagerDeleter.setObject(s_self, new SpringLoadingManager());
+    }
+
+    return *s_self;
+}
+
+bool SpringLoadingManager::exists()
+{
+    return s_self!=0L;
+}
+
+
+void SpringLoadingManager::springLoadTrigger(KonqKfmIconView *view,
+                                             KFileItem *file,
+                                             QIconViewItem *item)
+{
+    if ( !file || !file->isDir() )
+        return;
+
+    // We start a new spring loading chain
+    if ( m_startPart==0L )
+    {
+        m_startURL = view->url();
+        m_startPart = view;
+    }
+
+    // Only the last part of the chain is allowed to trigger a spring load
+    // event (if a spring loading chain is in progress)
+    if ( view!=m_startPart )
+        return;
+
+
+    item->setSelected( false, true );
+    view->iconViewWidget()->visualActivate(item);
+
+    KURL url = file->url();
+
+    KParts::URLArgs args;
+    file->determineMimeType();
+    if ( file->isMimeTypeKnown() )
+        args.serviceType = file->mimetype();
+    args.trustedSource = true;
+
+    // Open the folder URL, we don't want to modify the browser
+    // history, hence the use of openURL and setLocationBarURL
+    view->openURL(url);
+    const QString prettyURL = url.pathOrURL();
+    emit view->extension()->setLocationBarURL( prettyURL );
+}
+
+void SpringLoadingManager::dragLeft(KonqKfmIconView */*view*/)
+{
+    // We leave a view maybe the user tries to cancel the current spring loading
+    if ( !m_startURL.isEmpty() )
+    {
+        m_endTimer.start(1000, true);
+    }
+}
+
+void SpringLoadingManager::dragEntered(KonqKfmIconView *view)
+{
+    // We enter a view involved in the spring loading chain
+    if ( !m_startURL.isEmpty() && m_startPart==view )
+    {
+        m_endTimer.stop();
+    }
+}
+
+void SpringLoadingManager::dragFinished(KonqKfmIconView */*view*/)
+{
+    if ( !m_startURL.isEmpty() )
+    {
+        finished();
+    }
+}
+
+
+void SpringLoadingManager::finished()
+{
+    kdDebug() << "SpringLoadManager::finished()" << endl;
+
+    KURL url = m_startURL;
+    m_startURL = KURL();
+
+    KParts::ReadOnlyPart *part = m_startPart;
+    m_startPart = 0L;
+
+    KonqKfmIconView *view = static_cast<KonqKfmIconView*>(part);
+    view->openURL(url);
+    const QString prettyURL = url.pathOrURL();
+    emit view->extension()->setLocationBarURL( prettyURL );
+
+    deleteLater();
+    s_self = 0L;
+    s_springManagerDeleter.setObject(s_self, static_cast<SpringLoadingManager*>(0L));
+}
+
+
+
+#include "konq_iconview.moc"
diff --git a/konqueror/iconview/konq_iconview.desktop b/konqueror/iconview/konq_iconview.desktop
new file mode 100644
index 000000000..2d355b771
--- /dev/null
+++ b/konqueror/iconview/konq_iconview.desktop
@@ -0,0 +1,92 @@
+[Desktop Entry]
+Type=Service
+Name=Icon View
+Name[af]=Ikoon Besigtig
+Name[ar]=عرض أيقوني
+Name[az]=Timsal Görünüşü
+Name[be]=Значкі
+Name[bg]=Преглед с икони
+Name[bn]=আইকন ভিউ
+Name[br]=Gwel Arlun
+Name[bs]=Ikone
+Name[ca]=Vista d'icones
+Name[cs]=Pohled s ikonami
+Name[csb]=Wëzdrzatk ikònów
+Name[cy]=Golwg Eicon
+Name[da]=Ikonvisning
+Name[de]=Symbolansicht
+Name[el]=Προβολή εικονιδίων
+Name[eo]=Piktogramrigardo
+Name[es]=Vista de iconos
+Name[et]=Vaade ikoonidena
+Name[eu]=Koadro txikidun ikuspegia
+Name[fa]=شمایل‌نما
+Name[fi]=Kuvakenäkymä
+Name[fr]=Icônes
+Name[fy]=Byldkaike werjefte
+Name[ga]=Amharc Deilbhíní
+Name[gl]=Vista en Iconas
+Name[he]=תצוגת סמלים
+Name[hi]=प्रतीक दृश्य
+Name[hr]=Prikaz ikona
+Name[hu]=Ikonos
+Name[id]=Tampilan Ikon
+Name[is]=Táknmyndasýn
+Name[it]=Vista a icone
+Name[ja]=アイコンビュー
+Name[ka]=ხატულებით ჩვენება
+Name[kk]=Таңбаша түрінде
+Name[km]=ទិដ្ឋភាព​រូបតំណាង
+Name[lo]=ມຸມມອງແບບໄອຄອນ
+Name[lt]=Rodyti ženkliukus
+Name[lv]=Ikonu Skatījums
+Name[mk]=Приказ со икони
+Name[mn]=Тэмдэгээр харах
+Name[ms]=Paparan Ikon
+Name[mt]=Ikoni
+Name[nb]=Ikonvisning
+Name[nds]=Lüttbildansicht
+Name[ne]=प्रतिमा दृश्य
+Name[nl]=Pictogramweergave
+Name[nn]=Ikon-vising
+Name[nso]=Pono ya Seemedi
+Name[pa]=ਆਈਕਾਨ ਝਲਕ
+Name[pl]=Widok ikon
+Name[pt]=Vista por Ícones
+Name[pt_BR]=Visão em Ícones
+Name[ro]=Vizualizare iconică
+Name[ru]=В виде значков
+Name[rw]=Igaragaza ry'Agashushondanga
+Name[se]=Govaščájeheapmi
+Name[sk]=Prehliadač ikon
+Name[sl]=Ikoniziran pogled
+Name[sr]=Приказ са иконама
+Name[sr@Latn]=Prikaz sa ikonama
+Name[sv]=Ikonvy
+Name[ta]=குறும்படக் காட்சி
+Name[te]=ప్రతిమ విక్షణ
+Name[tg]=Ба намуди нишона
+Name[th]=มุมมองแบบไอคอน
+Name[tr]=Simge Görünümü
+Name[tt]=İkonlı Küreneş
+Name[uk]=Вигляд піктограмами
+Name[uz]=Nishoncha koʻrinishida
+Name[uz@cyrillic]=Нишонча кўринишида
+Name[ven]=Mbonalelo ya aikhono
+Name[vi]=Xem kiểu Biểu tượng
+Name[wa]=Vey en imådjetes
+Name[xh]=Imboniselo Yophawu lomfanekiso
+Name[zh_CN]=图标视图
+Name[zh_TW]=圖示瀏覽
+Name[zu]=Umbukiso wophawu lwesithombe
+MimeType=inode/directory
+ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-KDE-Library=konq_iconview
+X-KDE-BrowserView-AllowAsDefault=true
+X-KDE-BrowserView-HideFromMenus=true
+X-KDE-BrowserView-Args=IconView
+X-KDE-BrowserView-ModeProperty=viewMode
+X-KDE-BrowserView-ModePropertyValue=IconView
+X-KDE-BrowserView-Built-Into=konqueror
+Icon=view_icon
+InitialPreference=10
diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h
new file mode 100644
index 000000000..7563fedcd
--- /dev/null
+++ b/konqueror/iconview/konq_iconview.h
@@ -0,0 +1,299 @@
+/*  This file is part of the KDE project
+    Copyright (C) 1998, 1999 Torben Weis <[email protected]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+*/
+
+#ifndef __konq_iconview_h__
+#define __konq_iconview_h__
+
+#include <kparts/browserextension.h>
+#include <konq_iconviewwidget.h>
+#include <konq_operations.h>
+#include <konq_dirpart.h>
+#include <kmimetyperesolver.h>
+#include <qptrdict.h>
+#include <qptrlist.h>
+#include <kfileivi.h>
+
+class KonqPropsView;
+class KFileItem;
+class KDirLister;
+class KAction;
+class KToggleAction;
+class KActionMenu;
+class QIconViewItem;
+class IconViewBrowserExtension;
+
+/**
+ * The Icon View for konqueror.
+ * The "Kfm" in the name stands for file management since it shows files :)
+ */
+class KonqKfmIconView : public KonqDirPart
+{
+  friend class IconViewBrowserExtension; // to access m_pProps
+  Q_OBJECT
+  Q_PROPERTY( bool supportsUndo READ supportsUndo )
+  Q_PROPERTY( QString viewMode READ viewMode WRITE setViewMode )
+public:
+
+  enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date };
+
+  KonqKfmIconView( QWidget *parentWidget, QObject *parent, const char *name, const QString& mode );
+  virtual ~KonqKfmIconView();
+
+  virtual const KFileItem * currentItem();
+  virtual KFileItemList selectedFileItems() {return m_pIconView->selectedFileItems();};
+
+
+  KonqIconViewWidget *iconViewWidget() const { return m_pIconView; }
+
+  bool supportsUndo() const { return true; }
+
+  void setViewMode( const QString &mode );
+  QString viewMode() const { return m_mode; }
+
+  // "Cut" icons : disable those whose URL is in lst, enable the rest
+  virtual void disableIcons( const KURL::List & lst );
+
+  // See KMimeTypeResolver
+  void mimeTypeDeterminationFinished();
+  void determineIcon( KFileIVI * item );
+  int iconSize() { return m_pIconView->iconSize(); }
+
+public slots:
+  void slotPreview( bool toggle );
+  void slotShowDirectoryOverlays();
+  void slotShowDot();
+  void slotSelect();
+  void slotUnselect();
+  void slotSelectAll();
+  void slotUnselectAll();
+  void slotInvertSelection();
+
+  void slotSortByNameCaseSensitive( bool toggle );
+  void slotSortByNameCaseInsensitive( bool toggle );
+  void slotSortBySize( bool toggle );
+  void slotSortByType( bool toggle );
+  void slotSortByDate( bool toggle );
+  void slotSortDescending();
+  void slotSortDirsFirst();
+
+protected slots:
+  // slots connected to QIconView
+  void slotReturnPressed( QIconViewItem *item );
+  void slotMouseButtonPressed(int, QIconViewItem*, const QPoint&);
+  void slotMouseButtonClicked(int, QIconViewItem*, const QPoint&);
+  void slotContextMenuRequested(QIconViewItem*, const QPoint&);
+  void slotOnItem( QIconViewItem *item );
+  void slotOnViewport();
+  void slotSelectionChanged();
+
+  // Slot used for spring loading folders
+  void slotDragHeld( QIconViewItem *item );
+  void slotDragMove( bool accepted );
+  void slotDragEntered( bool accepted );
+  void slotDragLeft();
+  void slotDragFinished();
+
+  // slots connected to the directory lister - or to the kfind interface
+  // They are reimplemented from KonqDirPart.
+  virtual void slotStarted();
+  virtual void slotCanceled();
+  void slotCanceled( const KURL& url );
+  virtual void slotCompleted();
+  virtual void slotNewItems( const KFileItemList& );
+  virtual void slotDeleteItem( KFileItem * );
+  virtual void slotRefreshItems( const KFileItemList& );
+  virtual void slotClear();
+  virtual void slotRedirection( const KURL & );
+  virtual void slotDirectoryOverlayStart();
+  virtual void slotDirectoryOverlayFinished();
+
+  /**
+   * This is the 'real' finished slot, where we emit the completed() signal
+   * after everything was done.
+   */
+  void slotRenderingFinished();
+  // (Re)Draws m_pIconView's contents. Connected to m_pTimeoutRefreshTimer.
+  void slotRefreshViewport();
+
+  // Connected to KonqDirPart
+  void slotKFindOpened();
+  void slotKFindClosed();
+
+protected:
+  virtual bool openFile() { return true; }
+  virtual bool doOpenURL( const KURL& );
+  virtual bool doCloseURL();
+
+  virtual void newIconSize( int size );
+
+  void setupSorting( SortCriterion criterion );
+
+  /** */
+  void setupSortKeys();
+
+  QString makeSizeKey( KFileIVI *item );
+
+  /** The directory lister for this URL */
+  KDirLister* m_dirLister;
+
+  /**
+   * Set to true while the constructor is running.
+   * @ref #initConfig needs to know about that.
+   */
+  bool m_bInit:1;
+
+  /**
+   * Set to true while the dirlister is running, _if_ we asked it
+   * explicitly (openURL). If it is auto-updating, this is not set to true.
+   */
+  bool m_bLoading:1;
+
+  /**
+   * Set to true if we still need to emit completed() at some point
+   * (after the loading is finished and after the visible icons have been
+   * processed)
+   */
+  bool m_bNeedEmitCompleted:1;
+
+  /**
+   * Set to true if slotCompleted needs to realign the icons
+   */
+  bool m_bNeedAlign:1;
+
+  bool m_bUpdateContentsPosAfterListing:1;
+
+  bool m_bDirPropertiesChanged:1;
+  
+  /**
+   * Set in doCloseURL and used in setViewMode to restart a preview
+   * job interrupted when switching to IconView or MultiColumnView.
+   * Hacks like this must be removed in KDE4!
+   */
+  bool m_bPreviewRunningBeforeCloseURL:1;
+
+  bool m_bNeedSetCurrentItem:1;
+  
+  KFileIVI * m_pEnsureVisible;
+  
+  QStringList m_itemsToSelect;
+  
+  SortCriterion m_eSortCriterion;
+
+  KToggleAction *m_paDotFiles;
+  KToggleAction *m_paDirectoryOverlays;
+  KToggleAction *m_paEnablePreviews;
+  QPtrList<KFileIVI> m_paOutstandingOverlays;
+  QTimer *m_paOutstandingOverlaysTimer;
+/*  KToggleAction *m_paImagePreview;
+  KToggleAction *m_paTextPreview;
+  KToggleAction *m_paHTMLPreview;*/
+  KActionMenu *m_pamPreview;
+  QPtrList<KToggleAction> m_paPreviewPlugins;
+  KActionMenu *m_pamSort;
+
+  KAction *m_paSelect;
+  KAction *m_paUnselect;
+  KAction *m_paSelectAll;
+  KAction *m_paUnselectAll;
+  KAction *m_paInvertSelection;
+
+  KToggleAction *m_paSortDirsFirst;
+
+  KonqIconViewWidget *m_pIconView;
+
+  QTimer *m_pTimeoutRefreshTimer;
+
+  QPtrDict<KFileIVI> m_itemDict; // maps KFileItem * -> KFileIVI *
+
+  KMimeTypeResolver<KFileIVI,KonqKfmIconView> * m_mimeTypeResolver;
+
+  QString m_mode;
+
+  private:
+  void showDirectoryOverlay(KFileIVI*  item);
+};
+
+class IconViewBrowserExtension : public KonqDirPartBrowserExtension
+{
+  Q_OBJECT
+  friend class KonqKfmIconView; // so that it can emit our signals
+public:
+  IconViewBrowserExtension( KonqKfmIconView *iconView );
+
+  virtual int xOffset();
+  virtual int yOffset();
+
+public slots:
+  // Those slots are automatically connected by the shell
+  void reparseConfiguration();
+  void setSaveViewPropertiesLocally( bool value );
+  void setNameFilter( const QString &nameFilter );
+
+  void refreshMimeTypes() { m_iconView->iconViewWidget()->refreshMimeTypes(); }
+
+  void rename() { m_iconView->iconViewWidget()->renameSelectedItem(); }
+  void cut() { m_iconView->iconViewWidget()->cutSelection(); }
+  void copy() { m_iconView->iconViewWidget()->copySelection(); }
+  void paste() { m_iconView->iconViewWidget()->pasteSelection(); }
+  void pasteTo( const KURL &u ) { m_iconView->iconViewWidget()->paste( u ); }
+
+  void trash();
+  void del() { KonqOperations::del(m_iconView->iconViewWidget(),
+                                   KonqOperations::DEL,
+                                   m_iconView->iconViewWidget()->selectedUrls()); }
+  void properties();
+  void editMimeType();
+
+  // void print();
+
+private:
+  KonqKfmIconView *m_iconView;
+  bool m_bSaveViewPropertiesLocally;
+};
+
+class SpringLoadingManager : public QObject
+{
+    Q_OBJECT
+private:
+    SpringLoadingManager();
+    static SpringLoadingManager *s_self;
+public:
+    static SpringLoadingManager &self();
+    static bool exists();
+
+    void springLoadTrigger(KonqKfmIconView *view, KFileItem *file,
+                           QIconViewItem *item);
+
+    void dragLeft(KonqKfmIconView *view);
+    void dragEntered(KonqKfmIconView *view);
+    void dragFinished(KonqKfmIconView *view);
+
+private slots:
+    void finished();
+
+private:
+    KURL m_startURL;
+    KParts::ReadOnlyPart *m_startPart;
+
+    // Timer allowing to know the user wants to abort the spring loading
+    // and go back to his start url (closing the opened window if needed)
+    QTimer m_endTimer;
+};
+
+
+#endif
diff --git a/konqueror/iconview/konq_iconview.rc b/konqueror/iconview/konq_iconview.rc
new file mode 100644
index 000000000..20551e0a7
--- /dev/null
+++ b/konqueror/iconview/konq_iconview.rc
@@ -0,0 +1,51 @@
+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+<kpartgui name="KonqIconView" version="13">
+<MenuBar>
+ <Menu name="edit"><text>&amp;Edit</text>
+   <Menu name="selection"><text>Selection</text>
+     <Action name="select"/>
+     <Action name="unselect"/>
+     <Separator/>
+     <Action name="selectall"/>
+     <Action name="unselectall"/>
+     <Action name="invertselection"/>
+   </Menu>
+ </Menu>
+ <Menu name="view"><text>&amp;View</text>
+  <Menu name="iconview_mode"><text>&amp;Icon Size</text>
+   <Action name="modedefault"/>
+   <Separator/>
+   <Action name="modeenormous"/>
+   <Action name="modehuge"/>
+   <Action name="modelarge"/>
+   <Action name="modemedium"/>
+   <Action name="modesmallmedium"/>
+   <Action name="modesmall"/>
+  </Menu>
+  <Menu name="iconview_sort"><text>S&amp;ort</text>
+   <Action name="sort_nc"/>
+   <Action name="sort_nci"/>
+   <Action name="sort_size"/>
+   <Action name="sort_type"/>
+   <Action name="sort_date"/>
+   <Separator/>
+   <Action name="sort_descend"/>
+   <Separator/>
+   <Action name="sort_directoriesfirst" />
+  </Menu>
+  <Action name="iconview_preview" />
+  <Action name="show_dot"/>
+  <Action name="show_directory_overlays"/>
+  <Separator/>
+  <Action name="bgsettings"/>
+ </Menu>
+</MenuBar>
+<ToolBar name="mainToolBar"><text>Iconview Toolbar</text>
+ <Separator/>
+ <Action name="incIconSize" />
+ <Action name="decIconSize" />
+</ToolBar>
+<ToolBar name="extraToolBar"><text>Iconview Extra Toolbar</text>
+ <Action name="iconview_preview_all" />
+</ToolBar>
+</kpartgui>
diff --git a/konqueror/iconview/konq_multicolumnview.desktop b/konqueror/iconview/konq_multicolumnview.desktop
new file mode 100644
index 000000000..94b6c7288
--- /dev/null
+++ b/konqueror/iconview/konq_multicolumnview.desktop
@@ -0,0 +1,92 @@
+[Desktop Entry]
+Type=Service
+Name=MultiColumn View
+Name[af]=Multi-kolom Besigtig
+Name[ar]=عرض متعدد الأعمدة
+Name[az]=Çoxlu Sütun Görünüşü
+Name[be]=Шмат слупкоў
+Name[bg]=Многоколонен преглед
+Name[bn]=মাল্টিকলাম ভিউ
+Name[br]=Gwel liesbann
+Name[bs]=Višekolonski pogled
+Name[ca]=Vista multicolumna
+Name[cs]=Vícesloupcový pohled
+Name[csb]=Wieloszpaltowi wëzdrzatk
+Name[cy]=Golwg Aml-golofn
+Name[da]=Multisøjlevisning
+Name[de]=Mehrspaltige Ansicht
+Name[el]=Προβολή πολλαπλών στηλών
+Name[eo]=Multkolumna rigardo
+Name[es]=Vista multicolumna
+Name[et]=Vaade mitme tulbana
+Name[eu]=Zutabe aniztun ikuspegia
+Name[fa]=نمای چند ستونی
+Name[fi]=Monipalstanäkymä
+Name[fr]=Multicolonne
+Name[fy]=Multykolomwerjefte
+Name[ga]=Amharc Il-cholúin
+Name[gl]=Vista en Múltiplas Colunas
+Name[he]=תצוגת טורים
+Name[hi]=अनेक-स्तम्भ दृश्य
+Name[hr]=Prikaz s više stupaca
+Name[hu]=Lista
+Name[id]=Tampilan Multi kolom
+Name[is]=Dálkskipt sýn
+Name[it]=Vista a colonne multiple
+Name[ja]=マルチカラムビュー
+Name[ka]=რამდენიმე სვეტად
+Name[kk]=Бірнеше баған
+Name[km]=ទិដ្ឋភាព​ច្រើន​ជួរឈរ
+Name[lo]=ມຸນມອງແບບຫລາຍຄໍລຳ
+Name[lt]=Rodyti keliais stulpeliais
+Name[lv]=Daudzkolonu Skatījums
+Name[mk]=Приказ со повеќе колони
+Name[mn]=Олон баганаар харах
+Name[ms]=Paparan MultiColumn
+Name[mt]=Kolonni
+Name[nb]=Flerkolonnevisning
+Name[nds]=Mehrstriepen-Ansicht
+Name[ne]=बहुविध स्तम्भ दृश्य
+Name[nl]=Multikolomweergave
+Name[nn]=Multikolonne-vising
+Name[nso]=Pono ya Kholomo ya Bontshi
+Name[pa]=ਬਹੁ-ਕਾਲਮ ਝਲਕ
+Name[pl]=Widok wielokolumnowy
+Name[pt]=Vista por Multi-colunas
+Name[pt_BR]=Visão Multicolunas
+Name[ro]=Vizualizare multicoloană
+Name[ru]=В несколько колонок
+Name[rw]=Igaragaza InkingiZitandukanye
+Name[se]=Moanábálsttá-čájeheapmi
+Name[sk]=Multi-stĺpcový pohľad
+Name[sl]=Večstolpčni pogled
+Name[sr]=Приказ са више колона
+Name[sr@Latn]=Prikaz sa više kolona
+Name[sv]=Flerkolumnsvy
+Name[ta]=பலநெடுவரிசை காட்சி
+Name[te]=ఎక్కువ నిలువవరుసల విక్షణ
+Name[tg]=Ба намуди чанд сутун
+Name[th]=มุมมองแบบหลายคอลัมน์
+Name[tr]=Çoklu Sütun Görünümü
+Name[tt]=Berniçä Asma belän
+Name[uk]=Вигляд стовпчиками
+Name[uz]=Koʻp ustun koʻrinishida
+Name[uz@cyrillic]=Кўп устун кўринишида
+Name[ven]=Mbonalelo ya kholomu dzo fhambananho
+Name[vi]=Xem kiểu Nhiều cột
+Name[wa]=Vey e colones
+Name[xh]=Imboniselo Enemihlathi emininzie
+Name[zh_CN]=多列视图
+Name[zh_TW]=多列瀏覽
+Name[zu]=Umbukiso onamakholumu amaningi
+MimeType=inode/directory
+ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-KDE-Library=konq_iconview
+X-KDE-BrowserView-AllowAsDefault=true
+X-KDE-BrowserView-HideFromMenus=true
+X-KDE-BrowserView-Args=MultiColumnView
+X-KDE-BrowserView-ModeProperty=viewMode
+X-KDE-BrowserView-ModePropertyValue=MultiColumnView
+X-KDE-BrowserView-Built-Into=konqueror
+Icon=view_multicolumn
+InitialPreference=9
diff --git a/konqueror/iconview/konq_multicolumnview.rc b/konqueror/iconview/konq_multicolumnview.rc
new file mode 100644
index 000000000..7da55beb6
--- /dev/null
+++ b/konqueror/iconview/konq_multicolumnview.rc
@@ -0,0 +1,47 @@
+<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd" >
+<kpartgui name="KonqIconView" version="11">
+<MenuBar>
+ <Menu name="edit"><text>&amp;Edit</text>
+   <Menu name="selection"><text>Selection</text>
+     <Action name="select"/>
+     <Action name="unselect"/>
+     <Separator/>
+     <Action name="selectall"/>
+     <Action name="unselectall"/>
+     <Action name="invertselection"/>
+   </Menu>
+ </Menu>
+ <Menu name="view"><text>&amp;View</text>
+  <Menu name="iconview_mode"><text>Icon Size</text>
+   <Action name="modedefault"/>
+   <Separator/>
+   <Action name="modeenormous"/>
+   <Action name="modehuge"/>
+   <Action name="modelarge"/>
+   <Action name="modemedium"/>
+   <Action name="modesmallmedium"/>
+   <Action name="modesmall"/>
+  </Menu>
+  <Menu name="iconview_sort"><text>Sort</text>
+   <Action name="sort_nc"/>
+   <Action name="sort_nci"/>
+   <Action name="sort_size"/>
+   <Action name="sort_type"/>
+   <Action name="sort_date"/>
+   <Separator/>
+   <Action name="sort_descend"/>
+   <Separator/>
+   <Action name="sort_directoriesfirst" />
+  </Menu>
+  <Action name="iconview_preview" />
+  <Action name="show_dot"/>
+  <Separator/>
+  <Action name="bgsettings"/>
+ </Menu>
+</MenuBar>
+<ToolBar name="mainToolBar"><text>Multicolumn View Toolbar</text>
+ <Separator/>
+ <Action name="incIconSize" />
+ <Action name="decIconSize" />
+</ToolBar>
+</kpartgui>