X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a46551d63efd09b34fe33766533f6f5333737f22..74bf01c3fdb68cdb865ea700b89188ff2f9f2a73:/src/dolphinview.cpp

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index bcbb637ad..47c98f03f 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -84,6 +84,7 @@ DolphinView::DolphinView(DolphinMainWindow* mainWindow,
             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&)),
@@ -229,6 +230,7 @@ void DolphinView::setShowHiddenFiles(bool show)
     props.save();
 
     m_dirLister->setShowingDotFiles(show);
+    m_urlNavigator->setShowHiddenFiles(show);
 
     emit showHiddenFilesChanged();
 
@@ -376,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)
@@ -620,6 +622,10 @@ void DolphinView::loadDirectory(const KUrl& url)
 
 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
@@ -700,10 +706,11 @@ void DolphinView::generatePreviews(const KFileItemList& items)
 
 void DolphinView::showPreview(const KFileItem* item, const QPixmap& pixmap)
 {
-    const QModelIndex idx = m_dirModel->indexForItem(item);
-    Q_ASSERT(idx.isValid());
-    Q_ASSERT(idx.column() == 0);
-    m_dirModel->setData(idx, pixmap, Qt::DecorationRole);
+    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()
@@ -890,7 +897,7 @@ void DolphinView::openContextMenu(const QPoint& pos)
     KFileItem* item = 0;
 
     const QModelIndex index = itemView()->indexAt(pos);
-    if (index.isValid()) {
+    if (isValidNameIndex(index)) {
         item = fileItem(index);
     }
 
@@ -903,7 +910,7 @@ void DolphinView::dropUrls(const KUrl::List& urls,
 {
     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()) {
@@ -985,10 +992,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);
 
@@ -1022,4 +1025,9 @@ QAbstractItemView* DolphinView::itemView() const
     return m_iconsView;
 }
 
+bool DolphinView::isValidNameIndex(const QModelIndex& index) const
+{
+    return index.isValid() && (index.column() == KDirModel::Name);
+}
+
 #include "dolphinview.moc"