Update of the patch from Filip Brcic for browsing through ZIP and TAR files. One...

[dolphin.git] / src / dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index abb0e9f86d554661592c95ff6397d9153a2c705a..3927d9c6d10749177b8e6a281889ed669b1265fd 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -33,6 +33,7 @@
 #include <klocale.h>
 #include <kio/netaccess.h>
 #include <kio/renamedialog.h>
 #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>
 #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);
 
     m_topLayout->setSpacing(0);
     m_topLayout->setMargin(0);
 

+    connect(m_mainWindow, SIGNAL(activeViewChanged()),
+            this, SLOT(updateActivationState()));
+

     m_urlNavigator = new UrlNavigator(url, this);
     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(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);
 
 
     m_statusBar = new DolphinStatusBar(this);
 


@@ -99,6 +110,8 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
             this, SLOT(updateStatusBar()));
     connect(m_dirLister, SIGNAL(completed()),
             this, SLOT(updateItemCount()));
             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&)),
     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
 {
 
 bool DolphinView::isActive() const
 {

-    return (mainWindow()->activeView() == this);
+    return m_mainWindow->activeView() == this;

 }
 
 void DolphinView::setMode(Mode mode)
 }
 
 void DolphinView::setMode(Mode mode)


@@ -195,15 +208,15 @@ void DolphinView::setShowPreview(bool show)
     ViewProperties props(m_urlNavigator->url());
     props.setShowPreview(show);
 
     ViewProperties props(m_urlNavigator->url());
     props.setShowPreview(show);
 

-    // TODO: wait until previews are possible with KFileItemDelegate
+    m_controller->setShowPreview(show);

 
     emit showPreviewChanged();
 
     emit showPreviewChanged();

+    reload();

 }
 
 bool DolphinView::showPreview() const
 {
 }
 
 bool DolphinView::showPreview() const
 {

-    // TODO: wait until previews are possible with KFileItemDelegate
-    return true;
+    return m_controller->showPreview();

 }
 
 void DolphinView::setShowHiddenFiles(bool show)
 }
 
 void DolphinView::setShowHiddenFiles(bool show)


@@ -217,6 +230,7 @@ void DolphinView::setShowHiddenFiles(bool show)
     props.save();
 
     m_dirLister->setShowingDotFiles(show);
     props.save();
 
     m_dirLister->setShowingDotFiles(show);

+    m_urlNavigator->setShowHiddenFiles(show);

 
     emit showHiddenFilesChanged();
 
 
     emit showHiddenFilesChanged();
 


@@ -364,22 +378,22 @@ bool DolphinView::isUrlEditable() const
 
 void DolphinView::zoomIn()
 {
 
 void DolphinView::zoomIn()
 {

-    //itemEffectsManager()->zoomIn();
+    m_controller->triggerZoomIn();

 }
 
 void DolphinView::zoomOut()
 {
 }
 
 void DolphinView::zoomOut()
 {

-    //itemEffectsManager()->zoomOut();
+    m_controller->triggerZoomOut();

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

-    return false; //itemEffectsManager()->isZoomInPossible();
+    return m_controller->isZoomInPossible();

 }
 
 bool DolphinView::isZoomOutPossible() const
 {
 }
 
 bool DolphinView::isZoomOutPossible() const
 {

-    return false; //itemEffectsManager()->isZoomOutPossible();
+    return m_controller->isZoomOutPossible();

 }
 
 void DolphinView::setSorting(Sorting sorting)
 }
 
 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.
 
     // 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;
 
     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) {
     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) {
 
         KFileItem* item = m_dirModel->itemForIndex(*it);
         if (item != 0) {


@@ -554,11 +568,6 @@ void DolphinView::reload()
     startDirLister(m_urlNavigator->url(), true);
 }
 
     startDirLister(m_urlNavigator->url(), true);
 }
 

-void DolphinView::declareViewActive()
-{
-    mainWindow()->setActiveView( this );
-}
-

 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);
 void DolphinView::mouseReleaseEvent(QMouseEvent* event)
 {
     QWidget::mouseReleaseEvent(event);


@@ -599,7 +608,11 @@ void DolphinView::loadDirectory(const KUrl& url)
         emit sortOrderChanged(sortOrder);
     }
 
         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);
 
     startDirLister(url);
     emit urlChanged(url);


@@ -609,6 +622,10 @@ void DolphinView::loadDirectory(const KUrl& url)
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {
 
 void DolphinView::triggerItem(const QModelIndex& index)
 {

+    if (!isValidNameIndex(index)) {
+        return;
+    }
+

     const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
     if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
         // items are selected by the user, hence don't trigger the
     const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
     if ((modifier & Qt::ShiftModifier) || (modifier & Qt::ControlModifier)) {
         // items are selected by the user, hence don't trigger the


@@ -621,18 +638,40 @@ void DolphinView::triggerItem(const QModelIndex& index)
         return;
     }
 
         return;
     }
 

+    // Prefer the local path over the URL. This assures that the
+    // volume space information is correct. Assuming that the URL is media:/sda1,
+    // and the local path is /windows/C: For the URL the space info is related
+    // to the root partition (and hence wrong) and for the local path the space
+    // info is related to the windows partition (-> correct).
+    const QString localPath(item->localPath());
+    KUrl url;
+    if (localPath.isEmpty()) {
+        url = item->url();
+    }
+    else {
+        url = localPath;
+    }
+

     if (item->isDir()) {
     if (item->isDir()) {

-        // Prefer the local path over the URL. This assures that the
-        // volume space information is correct. Assuming that the URL is media:/sda1,
-        // and the local path is /windows/C: For the URL the space info is related
-        // to the root partition (and hence wrong) and for the local path the space
-        // info is related to the windows partition (-> correct).
-        const QString localPath(item->localPath());
-        if (localPath.isEmpty()) {
-            setUrl(item->url());
+        setUrl(url);
+    }
+    else if (item->isFile()) {
+        // allow to browse through ZIP and tar files
+        KMimeType::Ptr mime = item->mimeTypePtr();
+        if (mime->is("application/x-zip")) {
+            url.setProtocol("zip");
+            setUrl(url);
+        }
+        else if (mime->is("application/x-tar") ||
+                 mime->is("application/x-tarz") ||
+                 mime->is("application/x-tbz") ||
+                 mime->is("application/x-tgz") ||
+                 mime->is("application/x-tzo")) {
+            url.setProtocol("tar");
+            setUrl(url);

         }
         else {
         }
         else {

-            setUrl(KUrl(localPath));
+            item->run();

         }
     }
     else {
         }
     }
     else {


@@ -650,7 +689,7 @@ void DolphinView::updateProgress(int percent)
 void DolphinView::updateItemCount()
 {
     if (m_showProgress) {
 void DolphinView::updateItemCount()
 {
     if (m_showProgress) {

-        m_statusBar->setProgressText(QString::null);
+        m_statusBar->setProgressText(QString());

         m_statusBar->setProgress(100);
         m_showProgress = false;
     }
         m_statusBar->setProgress(100);
         m_showProgress = false;
     }


@@ -678,6 +717,24 @@ void DolphinView::updateItemCount()
     QTimer::singleShot(0, this, SLOT(restoreContentsPos()));
 }
 
     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;
 void DolphinView::restoreContentsPos()
 {
     int index = 0;


@@ -862,7 +919,7 @@ void DolphinView::openContextMenu(const QPoint& pos)
     KFileItem* item = 0;
 
     const QModelIndex index = itemView()->indexAt(pos);
     KFileItem* item = 0;
 
     const QModelIndex index = itemView()->indexAt(pos);

-    if (index.isValid()) {
+    if (isValidNameIndex(index)) {

         item = fileItem(index);
     }
 
         item = fileItem(index);
     }
 


@@ -875,7 +932,7 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 {
     KFileItem* directory = 0;
     const QModelIndex index = itemView()->indexAt(pos);
 {
     KFileItem* directory = 0;
     const QModelIndex index = itemView()->indexAt(pos);

-    if (index.isValid()) {
+    if (isValidNameIndex(index)) {

         KFileItem* item = fileItem(index);
         assert(item != 0);
         if (item->isDir()) {
         KFileItem* item = fileItem(index);
         assert(item != 0);
         if (item->isDir()) {


@@ -886,9 +943,16 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 
     const KUrl& destination = (directory == 0) ? url() :
                                                  directory->url();
 
     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);
 }
 
     m_mainWindow->dropUrls(urls, destination);
 }
 

+

 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());
 void DolphinView::updateSorting(DolphinView::Sorting sorting)
 {
     ViewProperties props(url());


@@ -909,6 +973,16 @@ void DolphinView::updateSortOrder(Qt::SortOrder order)
     emit sortOrderChanged(order);
 }
 
     emit sortOrderChanged(order);
 }
 

+void DolphinView::emitContentsMoved()
+{
+    emit contentsMoved(contentsX(), contentsY());
+}
+
+void DolphinView::updateActivationState()
+{
+    m_urlNavigator->setActive(isActive());
+}
+

 void DolphinView::createView()
 {
     // delete current view
 void DolphinView::createView()
 {
     // delete current view


@@ -940,15 +1014,15 @@ void DolphinView::createView()
     view->setModel(m_proxyModel);
     view->setSelectionMode(QAbstractItemView::ExtendedSelection);
 
     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);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
             m_controller, SLOT(indicateSelectionChange()));
     new KMimeTypeResolver(view, m_dirModel);
     m_topLayout->insertWidget(1, view);
 
     connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
             m_controller, SLOT(indicateSelectionChange()));

+    connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));
+    connect(view->horizontalScrollBar(), SIGNAL(valueChanged(int)),
+            this, SLOT(emitContentsMoved()));

 }
 
 void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
 }
 
 void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)


@@ -966,11 +1040,16 @@ void DolphinView::selectAll(QItemSelectionModel::SelectionFlags flags)
 
 QAbstractItemView* DolphinView::itemView() const
 {
 
 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;
     }
     return m_iconsView;
 }
 
     if (m_detailsView != 0) {
         return m_detailsView;
     }
     return m_iconsView;
 }
 

+bool DolphinView::isValidNameIndex(const QModelIndex& index) const
+{
+    return index.isValid() && (index.column() == KDirModel::Name);
+}
+

 #include "dolphinview.moc"
 #include "dolphinview.moc"