Adapt to new konsole api

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index dc05ef3ea3627d6cf8df73501dfcb47c2b4deaa2..4c4102e8bda2f3bec5cf72a23ce76478b205fc19 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -60,8 +60,13 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(setSortIndicatorOrder(Qt::SortOrder)));
 
-    connect(this, SIGNAL(clicked(const QModelIndex&)),
-            controller, SLOT(triggerItem(const QModelIndex&)));
+    if (KGlobalSettings::singleClick()) {
+        connect(this, SIGNAL(clicked(const QModelIndex&)),
+                controller, SLOT(triggerItem(const QModelIndex&)));
+    } else {
+        connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
+                controller, SLOT(triggerItem(const QModelIndex&)));
+    }
     connect(this, SIGNAL(activated(const QModelIndex&)),
             controller, SLOT(triggerItem(const QModelIndex&)));
 
@@ -85,8 +90,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
 }
 
 DolphinDetailsView::~DolphinDetailsView()
-{
-}
+{}
 
 bool DolphinDetailsView::event(QEvent* event)
 {
@@ -117,6 +121,10 @@ bool DolphinDetailsView::event(QEvent* event)
         if (!settings->showGroup()) {
             hideColumn(KDirModel::Group);
         }
+
+        if (!settings->showType()) {
+            hideColumn(KDirModel::Type);
+        }
     }
 
     return QTreeView::event(event);
@@ -186,9 +194,9 @@ void DolphinDetailsView::zoomIn()
         DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
         // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {
-            case K3Icon::SizeSmall:  settings->setIconSize(K3Icon::SizeMedium); break;
-            case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break;
-            default: Q_ASSERT(false); break;
+        case K3Icon::SizeSmall:  settings->setIconSize(K3Icon::SizeMedium); break;
+        case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeLarge); break;
+        default: Q_ASSERT(false); break;
         }
         updateDecorationSize();
     }
@@ -200,9 +208,9 @@ void DolphinDetailsView::zoomOut()
         DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
         // TODO: get rid of K3Icon sizes
         switch (settings->iconSize()) {
-            case K3Icon::SizeLarge:  settings->setIconSize(K3Icon::SizeMedium); break;
-            case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break;
-            default: Q_ASSERT(false); break;
+        case K3Icon::SizeLarge:  settings->setIconSize(K3Icon::SizeMedium); break;
+        case K3Icon::SizeMedium: settings->setIconSize(K3Icon::SizeSmall); break;
+        default: Q_ASSERT(false); break;
         }
         updateDecorationSize();
     }