X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/86110e2778d6ac5eb4454f58de532cabfcd75dbf..ad01ddac1a104b8f372a98db84f123fbba65e2da:/src/dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 58c33b250..2956cf6be 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -33,6 +33,7 @@
 #include <klocale.h>
 #include <kio/netaccess.h>
 #include <kio/renamedialog.h>
+#include <kio/previewjob.h>
 #include <kmimetyperesolver.h>
 #include <konq_operations.h>
 #include <kurl.h>
@@ -79,9 +80,19 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 
+    connect(m_mainWindow, SIGNAL(activeViewChanged()),
+            this, SLOT(updateActivationState()));
+
     m_urlNavigator = new UrlNavigator(url, this);
+    m_urlNavigator->setShowHiddenFiles(showHiddenFiles);
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(loadDirectory(const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
+            this, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
+    connect(m_urlNavigator, SIGNAL(activated()),
+            this, SLOT(requestActivation()));
+    connect(this, SIGNAL(contentsMoved(int, int)),
+            m_urlNavigator, SLOT(storeContentsPosition(int, int)));
 
     m_statusBar = new DolphinStatusBar(this);
 
@@ -99,6 +110,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
             this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateItemCount()));
+    connect(m_dirLister, SIGNAL(newItems(const KFileItemList&)),
+            this, SLOT(generatePreviews(const KFileItemList&)));
     connect(m_dirLister, SIGNAL(infoMessage(const QString&)),
             this, SLOT(showInfoMessage(const QString&)));
     connect(m_dirLister, SIGNAL(errorMessage(const QString&)),
@@ -165,7 +178,7 @@ const KUrl& DolphinView::url() const
 
 bool DolphinView::isActive() const
 {
-    return (mainWindow()->activeView() == this);
+    return m_mainWindow->activeView() == this;
 }
 
 void DolphinView::setMode(Mode mode)
@@ -195,15 +208,15 @@ void DolphinView::setShowPreview(bool show)
     ViewProperties props(m_urlNavigator->url());
     props.setShowPreview(show);
 
-    // TODO: wait until previews are possible with KFileItemDelegate
+    m_controller->setShowPreview(show);
 
     emit showPreviewChanged();
+    reload();
 }
 
 bool DolphinView::showPreview() const
 {
-    // TODO: wait until previews are possible with KFileItemDelegate
-    return true;
+    return m_controller->showPreview();
 }
 
 void DolphinView::setShowHiddenFiles(bool show)
@@ -217,6 +230,7 @@ void DolphinView::setShowHiddenFiles(bool show)
     props.save();
 
     m_dirLister->setShowingDotFiles(show);
+    m_urlNavigator->setShowHiddenFiles(show);
 
     emit showHiddenFilesChanged();
 
@@ -364,22 +378,22 @@ bool DolphinView::isUrlEditable() const
 
 void DolphinView::zoomIn()
 {
-    //itemEffectsManager()->zoomIn();
+    m_controller->triggerZoomIn();
 }
 
 void DolphinView::zoomOut()
 {
-    //itemEffectsManager()->zoomOut();
+    m_controller->triggerZoomOut();
 }
 
 bool DolphinView::isZoomInPossible() const
 {
-    return false; //itemEffectsManager()->isZoomInPossible();
+    return m_controller->isZoomInPossible();
 }
 
 bool DolphinView::isZoomOutPossible() const
 {
-    return false; //itemEffectsManager()->isZoomOutPossible();
+    return m_controller->isZoomOutPossible();
 }
 
 void DolphinView::setSorting(Sorting sorting)
@@ -447,7 +461,7 @@ KFileItemList DolphinView::selectedItems() const
 
     // Our view has a selection, we will map them back to the DirModel
     // and then fill the KFileItemList.
-    assert((view != 0) && (view->selectionModel() != 0));
+    Q_ASSERT((view != 0) && (view->selectionModel() != 0));
 
     const QItemSelection selection = m_proxyModel->mapSelectionToSource(view->selectionModel()->selection());
     KFileItemList itemList;
@@ -455,7 +469,7 @@ KFileItemList DolphinView::selectedItems() const
     const QModelIndexList indexList = selection.indexes();
     QModelIndexList::const_iterator end = indexList.end();
     for (QModelIndexList::const_iterator it = indexList.begin(); it != end; ++it) {
-        assert((*it).isValid());
+        Q_ASSERT((*it).isValid());
 
         KFileItem* item = m_dirModel->itemForIndex(*it);
         if (item != 0) {
@@ -554,11 +568,6 @@ void DolphinView::reload()
     startDirLister(m_urlNavigator->url(), true);
 }
 
-void DolphinView::declareViewActive()
-{
-    mainWindow()->setActiveView( this );
-}
-
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
@@ -599,7 +608,11 @@ void DolphinView::loadDirectory(const KUrl& url)
         emit sortOrderChanged(sortOrder);
     }
 
-    // TODO: handle previews (props.showPreview())
+    const bool showPreview = props.showPreview();
+    if (showPreview != m_controller->showPreview()) {
+        m_controller->setShowPreview(showPreview);
+        emit showPreviewChanged();
+    }
 
     startDirLister(url);
     emit urlChanged(url);
@@ -650,7 +663,7 @@ void DolphinView::updateProgress(int percent)
 void DolphinView::updateItemCount()
 {
     if (m_showProgress) {
-        m_statusBar->setProgressText(QString::null);
+        m_statusBar->setProgressText(QString());
         m_statusBar->setProgress(100);
         m_showProgress = false;
     }
@@ -678,6 +691,24 @@ void DolphinView::updateItemCount()
     QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
 }
 
+void DolphinView::generatePreviews(const KFileItemList& items)
+{
+    if (m_controller->showPreview()) {
+        KIO::PreviewJob* job = KIO::filePreview(items, 128);
+        connect(job, SIGNAL(gotPreview(const KFileItem*, const QPixmap&)),
+                this, SLOT(showPreview(const KFileItem*, const QPixmap&)));
+    }
+}
+
+void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap)
+{
+    Q_ASSERT(item != 0);
+    const QModelIndex idx = m_dirModel->indexForItem(*item);
+    if (idx.isValid() && (idx.column() == 0)) {
+        m_dirModel->setData(idx, pixmap, Qt::DecorationRole);
+    }
+}
+
 void DolphinView::restoreContentsPos()
 {
     int index = 0;
@@ -886,9 +917,16 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 
     const KUrl& destination = (directory == 0) ? url() :
                                                  directory->url();
+    dropUrls(urls, destination);
+}
+
+void DolphinView::dropUrls(const KUrl::List& urls,
+                           const KUrl& destination)
+{
     m_mainWindow->dropUrls(urls, destination);
 }
 
+
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());
@@ -914,6 +952,11 @@ void DolphinView::emitContentsMoved()
     emit contentsMoved(contentsX(), contentsY());
 }
 
+void DolphinView::updateActivationState()
+{
+    m_urlNavigator->setActive(isActive());
+}
+
 void DolphinView::createView()
 {
     // delete current view
@@ -945,10 +988,6 @@ void DolphinView::createView()
     view->setModel(m_proxyModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
-    KFileItemDelegate* delegate = new KFileItemDelegate(this);
-    delegate->setAdditionalInformation(KFileItemDelegate::FriendlyMimeType);
-    view->setItemDelegate(delegate);
-
     new KMimeTypeResolver(view, m_dirModel);
     m_topLayout->insertWidget(1, view);
 
@@ -975,7 +1014,7 @@ void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
 
 QAbstractItemView* DolphinView::itemView() const
 {
-    assert((m_iconsView == 0) || (m_detailsView == 0));
+    Q_ASSERT((m_iconsView == 0) || (m_detailsView == 0));
     if (m_detailsView != 0) {
         return m_detailsView;
     }