Forwardport 773570:

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 7979b06c3f122de327ac5e181c1d708b999f7016..1ed8310a6404bc3bea0d6ee9b9dbd141b5cbbbd9 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -32,16 +32,16 @@
 #include <kcolorscheme.h>
 #include <kdirlister.h>
 #include <kfileitemdelegate.h>
 #include <kcolorscheme.h>
 #include <kdirlister.h>
 #include <kfileitemdelegate.h>

-#include <klocale.h>

 #include <kiconeffect.h>
 #include <kiconeffect.h>

+#include <klocale.h>

 #include <kio/deletejob.h>
 #include <kio/netaccess.h>
 #include <kio/previewjob.h>
 #include <kjob.h>
 #include <kmenu.h>
 #include <kmimetyperesolver.h>
 #include <kio/deletejob.h>
 #include <kio/netaccess.h>
 #include <kio/previewjob.h>
 #include <kjob.h>
 #include <kmenu.h>
 #include <kmimetyperesolver.h>

-#include <konqmimedata.h>

 #include <konq_operations.h>
 #include <konq_operations.h>

+#include <konqmimedata.h>

 #include <ktoggleaction.h>
 #include <kurl.h>
 
 #include <ktoggleaction.h>
 #include <kurl.h>
 


@@ -52,10 +52,11 @@
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"

-#include "renamedialog.h"
-#include "viewproperties.h"

 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphinsettings.h"
 #include "dolphin_generalsettings.h"

+#include "iconmanager.h"
+#include "renamedialog.h"
+#include "viewproperties.h"

 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,
 
 DolphinView::DolphinView(QWidget* parent,
                          const KUrl& url,


@@ -78,21 +79,15 @@ DolphinView::DolphinView(QWidget* parent,
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),
     m_proxyModel(proxyModel),
     m_dolphinModel(dolphinModel),
     m_dirLister(dirLister),
     m_proxyModel(proxyModel),

-    m_previewJob(0)
+    m_iconManager(0)

 {
     setFocusPolicy(Qt::StrongFocus);
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
 {
     setFocusPolicy(Qt::StrongFocus);
     m_topLayout = new QVBoxLayout(this);
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

-    QClipboard* clipboard = QApplication::clipboard();
-    connect(clipboard, SIGNAL(dataChanged()),
-            this, SLOT(updateCutItems()));
-

     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateCutItems()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateCutItems()));

-    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
-            this, SLOT(generatePreviews(const KFileItemList&)));

 
     m_controller = new DolphinController(this);
     m_controller->setUrl(url);
 
     m_controller = new DolphinController(this);
     m_controller->setUrl(url);


@@ -131,10 +126,6 @@ DolphinView::DolphinView(QWidget* parent,
 
 DolphinView::~DolphinView()
 {
 
 DolphinView::~DolphinView()
 {

-    if (m_previewJob != 0) {
-        m_previewJob->kill();
-        m_previewJob = 0;
-    }

 }
 
 const KUrl& DolphinView::url() const
 }
 
 const KUrl& DolphinView::url() const


@@ -194,16 +185,6 @@ void DolphinView::setMode(Mode mode)
 
     m_mode = mode;
 
 
     m_mode = mode;
 

-    if (isColumnViewActive()) {
-        // When changing the mode in the column view, it makes sense
-        // to go back to the root URL of the column view automatically.
-        // Otherwise there it would not be possible to turn off the column view
-        // without focusing the first column.
-        const KUrl root = rootUrl();
-        setUrl(root);
-        m_controller->setUrl(root);
-    }
-

     deleteView();
 
     const KUrl viewPropsUrl = viewPropertiesUrl();
     deleteView();
 
     const KUrl viewPropsUrl = viewPropertiesUrl();


@@ -246,7 +227,7 @@ void DolphinView::setShowPreview(bool show)
     props.setShowPreview(show);
 
     m_showPreview = show;
     props.setShowPreview(show);
 
     m_showPreview = show;

-
+    m_iconManager->setShowPreview(show);

     emit showPreviewChanged();
 
     loadDirectory(viewPropsUrl, true);
     emit showPreviewChanged();
 
     loadDirectory(viewPropsUrl, true);


@@ -419,11 +400,13 @@ QPoint DolphinView::contentsPosition() const
 void DolphinView::zoomIn()
 {
     m_controller->triggerZoomIn();
 void DolphinView::zoomIn()
 {
     m_controller->triggerZoomIn();

+    reload();

 }
 
 void DolphinView::zoomOut()
 {
     m_controller->triggerZoomOut();
 }
 
 void DolphinView::zoomOut()
 {
     m_controller->triggerZoomOut();

+    reload();

 }
 
 bool DolphinView::isZoomInPossible() const
 }
 
 bool DolphinView::isZoomInPossible() const


@@ -575,45 +558,6 @@ void DolphinView::triggerItem(const KFileItem& item)
     emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
 }
 
     emit itemTriggered(item); // caught by DolphinViewContainer or DolphinPart
 }
 

-void DolphinView::generatePreviews(const KFileItemList& items)
-{
-    if (m_controller->dolphinView()->showPreview()) {
-        if (m_previewJob != 0) {
-            m_previewJob->kill();
-            m_previewJob = 0;
-        }
-
-        m_previewJob = KIO::filePreview(items, 128);
-        connect(m_previewJob, SIGNAL(gotPreview(const KFileItem&, const QPixmap&)),
-                this, SLOT(replaceIcon(const KFileItem&, const QPixmap&)));
-        connect(m_previewJob, SIGNAL(finished(KJob*)),
-                this, SLOT(slotPreviewJobFinished(KJob*)));
-    }
-}
-
-void DolphinView::replaceIcon(const KFileItem& item, const QPixmap& pixmap)
-{
-    Q_ASSERT(!item.isNull());
-    if (!m_showPreview || (item.url().directory() != m_dirLister->url().path())) {
-        // the preview has been deactivated in the meanwhile or the preview
-        // job is still working on items of an older URL, hence
-        // the item is not part of the directory model anymore
-        return;
-    }
-
-    const QModelIndex idx = m_dolphinModel->indexForItem(item);
-    if (idx.isValid() && (idx.column() == 0)) {
-        const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-        if (KonqMimeData::decodeIsCutSelection(mimeData) && isCutItem(item)) {
-            KIconEffect iconEffect;
-            const QPixmap cutPixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
-            m_dolphinModel->setData(idx, QIcon(cutPixmap), Qt::DecorationRole);
-        } else {
-            m_dolphinModel->setData(idx, QIcon(pixmap), Qt::DecorationRole);
-        }
-    }
-}
-

 void DolphinView::emitSelectionChangedSignal()
 {
     emit selectionChanged(DolphinView::selectedItems());
 void DolphinView::emitSelectionChangedSignal()
 {
     emit selectionChanged(DolphinView::selectedItems());


@@ -631,7 +575,6 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
         return;
     }
 
         return;
     }
 

-    m_cutItemsCache.clear();

     m_loadingDirectory = true;
 
     m_dirLister->stop();
     m_loadingDirectory = true;
 
     m_dirLister->stop();


@@ -714,6 +657,7 @@ void DolphinView::applyViewProperties(const KUrl& url)
     const bool showPreview = props.showPreview();
     if (showPreview != m_showPreview) {
         m_showPreview = showPreview;
     const bool showPreview = props.showPreview();
     if (showPreview != m_showPreview) {
         m_showPreview = showPreview;

+        m_iconManager->setShowPreview(showPreview);

         emit showPreviewChanged();
     }
 }
         emit showPreviewChanged();
     }
 }


@@ -899,25 +843,6 @@ void DolphinView::emitContentsMoved()
     }
 }
 
     }
 }
 

-void DolphinView::updateCutItems()
-{
-    // restore the icons of all previously selected items to the
-    // original state...
-    QList<CutItem>::const_iterator it = m_cutItemsCache.begin();
-    QList<CutItem>::const_iterator end = m_cutItemsCache.end();
-    while (it != end) {
-        const QModelIndex index = m_dolphinModel->indexForUrl((*it).url);
-        if (index.isValid()) {
-            m_dolphinModel->setData(index, QIcon((*it).pixmap), Qt::DecorationRole);
-        }
-        ++it;
-    }
-    m_cutItemsCache.clear();
-
-    // ... and apply an item effect to all currently cut items
-    applyCutItemEffect();
-}
-

 void DolphinView::showHoverInformation(const KFileItem& item)
 {
     if (hasSelection() || !m_active) {
 void DolphinView::showHoverInformation(const KFileItem& item)
 {
     if (hasSelection() || !m_active) {


@@ -934,7 +859,6 @@ void DolphinView::clearHoverInformation()
     }
 }
 
     }
 }
 

-

 void DolphinView::createView()
 {
     deleteView();
 void DolphinView::createView()
 {
     deleteView();


@@ -980,6 +904,9 @@ void DolphinView::createView()
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     new KMimeTypeResolver(view, m_dolphinModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     new KMimeTypeResolver(view, m_dolphinModel);

+    m_iconManager = new IconManager(view, m_proxyModel);
+    m_iconManager->setShowPreview(m_showPreview);
+

     m_topLayout->insertWidget(1, view);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
     m_topLayout->insertWidget(1, view);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),


@@ -1002,6 +929,7 @@ void DolphinView::deleteView()
         m_detailsView = 0;
         m_columnView = 0;
         m_fileItemDelegate = 0;
         m_detailsView = 0;
         m_columnView = 0;
         m_fileItemDelegate = 0;

+        m_iconManager = 0;

     }
 }
 
     }
 }
 


@@ -1034,42 +962,6 @@ bool DolphinView::isCutItem(const KFileItem& item) const
     return false;
 }
 
     return false;
 }
 

-void DolphinView::applyCutItemEffect()
-{
-    const QMimeData* mimeData = QApplication::clipboard()->mimeData();
-    if (!KonqMimeData::decodeIsCutSelection(mimeData)) {
-        return;
-    }
-
-    KFileItemList items(m_dirLister->items());
-    KFileItemList::const_iterator it = items.begin();
-    const KFileItemList::const_iterator end = items.end();
-    while (it != end) {
-        const KFileItem item = *it;
-        if (isCutItem(item)) {
-            const QModelIndex index = m_dolphinModel->indexForItem(item);
-            const QVariant value = m_dolphinModel->data(index, Qt::DecorationRole);
-            if (value.type() == QVariant::Icon) {
-                const QIcon icon(qvariant_cast<QIcon>(value));
-                QPixmap pixmap = icon.pixmap(128, 128);
-
-                // remember current pixmap for the item to be able
-                // to restore it when other items get cut
-                CutItem cutItem;
-                cutItem.url = item.url();
-                cutItem.pixmap = pixmap;
-                m_cutItemsCache.append(cutItem);
-
-                // apply icon effect to the cut item
-                KIconEffect iconEffect;
-                pixmap = iconEffect.apply(pixmap, KIconLoader::Desktop, KIconLoader::DisabledState);
-                m_dolphinModel->setData(index, QIcon(pixmap), Qt::DecorationRole);
-            }
-        }
-        ++it;
-    }
-}
-

 KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection)
 {
     KToggleAction* iconsView = actionCollection->add<KToggleAction>("icons");
 KToggleAction* DolphinView::iconsModeAction(KActionCollection* actionCollection)
 {
     KToggleAction* iconsView = actionCollection->add<KToggleAction>("icons");


@@ -1133,19 +1025,14 @@ void DolphinView::renameSelectedItems()
             Q_ASSERT(newName.contains('#'));
 
             // iterate through all selected items and rename them...
             Q_ASSERT(newName.contains('#'));
 
             // iterate through all selected items and rename them...

-            const int replaceIndex = newName.indexOf('#');
-            Q_ASSERT(replaceIndex >= 0);

             int index = 1;
             int index = 1;

-
-            KFileItemList::const_iterator it = items.begin();
-            const KFileItemList::const_iterator end = items.end();
-            while (it != end) {
-                const KUrl& oldUrl = (*it).url();
+            foreach (KFileItem item, items) {
+                const KUrl& oldUrl = item.url();

                 QString number;
                 number.setNum(index++);
 
                 QString number;
                 number.setNum(index++);
 

-                QString name(newName);
-                name.replace(replaceIndex, 1, number);
+                QString name = newName;
+                name.replace('#', number);

 
                 if (oldUrl.fileName() != name) {
                     KUrl newUrl = oldUrl;
 
                 if (oldUrl.fileName() != name) {
                     KUrl newUrl = oldUrl;


@@ -1153,7 +1040,6 @@ void DolphinView::renameSelectedItems()
                     KonqOperations::rename(this, oldUrl, newUrl);
                     emit doingOperation(KonqFileUndoManager::RENAME);
                 }
                     KonqOperations::rename(this, oldUrl, newUrl);
                     emit doingOperation(KonqFileUndoManager::RENAME);
                 }

-                ++it;

             }
         }
     } else {
             }
         }
     } else {


@@ -1212,12 +1098,6 @@ void DolphinView::slotDeleteFileFinished(KJob* job)
     }
 }
 
     }
 }
 

-void DolphinView::slotPreviewJobFinished(KJob* job)
-{
-    Q_ASSERT(job == m_previewJob);
-    m_previewJob = 0;
-}
-

 void DolphinView::cutSelectedItems()
 {
     QMimeData* mimeData = new QMimeData();
 void DolphinView::cutSelectedItems()
 {
     QMimeData* mimeData = new QMimeData();