Assure that the grid size for Icons View, Details View and Previews View has some...

svn path=/trunk/playground/utils/dolphin/; revision=607518

diff --git a/src/dolphin.cpp b/src/dolphin.cpp
index 8d2f59482d23e04d055fbb641cb8baff6ac32d81..ac1f067a4914c492e3dcfa96d994907101358c5b 100644 (file)
--- a/src/dolphin.cpp
+++ b/src/dolphin.cpp
@@ -1272,7 +1272,7 @@ void Dolphin::setupActions()
     KToggleAction* detailsView = new KToggleAction(i18n("Details"), actionCollection(), "details");
     detailsView->setShortcut(Qt::CTRL | Qt::Key_2);
     detailsView->setIcon(KIcon("view_text"));
-    connect(detailsView, SIGNAL(triggered()), this, SLOT(setIconsView()));
+    connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));
 
     KToggleAction* previewsView = new KToggleAction(i18n("Previews"), actionCollection(), "previews");
     previewsView->setShortcut(Qt::CTRL | Qt::Key_3);

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 04a63c124c445df612378678728e2eff3226a27e..e7fb31909f6b5746ac7a61d8ba2f63b56de7ba89 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -107,6 +107,7 @@ DolphinView::DolphinView(QWidget *parent,
     m_iconsView = new DolphinIconsView(this);
     connect(m_iconsView, SIGNAL(clicked(const QModelIndex&)),
             this, SLOT(triggerItem(const QModelIndex&)));
+    applyModeToView();
 
     KDirModel* model = new KDirModel();
     model->setDirLister(m_dirLister);
@@ -164,6 +165,7 @@ void DolphinView::setMode(Mode mode)
     ViewProperties props(m_urlNavigator->url());
     props.setViewMode(m_mode);
 
+    applyModeToView();
     startDirLister(m_urlNavigator->url());
 
     emit signalModeChanged();
@@ -996,4 +998,25 @@ bool DolphinView::isFilterBarVisible()
   return m_filterBar->isVisible();
 }
 
+void DolphinView::applyModeToView()
+{
+    // TODO: the following code just tries to test some QListView capabilities
+    switch (m_mode) {
+        case IconsView:
+            m_iconsView->setViewMode(QListView::IconMode);
+            m_iconsView->setGridSize(QSize(128, 64));
+            break;
+
+        case DetailsView:
+            m_iconsView->setViewMode(QListView::ListMode);
+            m_iconsView->setGridSize(QSize(256, 24));
+            break;
+
+        case PreviewsView:
+            m_iconsView->setViewMode(QListView::IconMode);
+            m_iconsView->setGridSize(QSize(128, 128));
+            break;
+    }
+}
+
 #include "dolphinview.moc"

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 46bee5bd093dc0f1985d9cca4ad93a930aa57b63..5c7fb5c2cf555aa0bb22d6b93d0c18952bd45541 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -434,6 +434,12 @@ private:
      */
     QString renameIndexPresentation(int index, int itemCount) const;
 
+    /**
+     * Applies the current view mode m_mode to the
+     * view implementation.
+     */
+    void applyModeToView();
+
     bool m_refreshing;
     bool m_showProgress;
     Mode m_mode;