Open the meta data configuration dialog modeless

[dolphin.git] / src / viewextensionsfactory.cpp

diff --git a/src/viewextensionsfactory.cpp b/src/viewextensionsfactory.cpp
index a6555ae0be792b56f9b8701583cc41895ef9ee41..6bcc3a7c8e739155d2c56829146f04288cbde4e5 100644 (file)
--- a/src/viewextensionsfactory.cpp
+++ b/src/viewextensionsfactory.cpp
@@ -28,7 +28,7 @@
 #include "selectionmanager.h"
 #include "settings/dolphinsettings.h"
 #include "tooltips/tooltipmanager.h"
-#include "versioncontrolobserver.h"
+#include "versioncontrol/versioncontrolobserver.h"
 
 #include "dolphin_generalsettings.h"
 
@@ -63,6 +63,7 @@ ViewExtensionsFactory::ViewExtensionsFactory(QAbstractItemView* view,
     }
 
     // initialize preview generator
+    Q_ASSERT(view->iconSize().isValid());
     m_previewGenerator = new KFilePreviewGenerator(view);
     m_previewGenerator->setPreviewShown(controller->dolphinView()->showPreview());
     connect(controller, SIGNAL(zoomLevelChanged(int)),
@@ -111,10 +112,6 @@ ViewExtensionsFactory::ViewExtensionsFactory(QAbstractItemView* view,
     connect(dolphinView, SIGNAL(sortFoldersFirstChanged(bool)),
             this, SLOT(slotSortFoldersFirstChanged(bool)));
 
-    // inform the controller about selection changes
-    connect(view->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
-            controller, SLOT(emitSelectionChanged()));
-
     // Give the view the ability to auto-expand its directories on hovering
     // (the column view takes care about this itself). If the details view
     // uses expandable folders, the auto-expanding should be used always.
@@ -215,7 +212,7 @@ void ViewExtensionsFactory::slotSortFoldersFirstChanged(bool foldersFirst)
 
 void ViewExtensionsFactory::slotNameFilterChanged(const QString& nameFilter)
 {
-    proxyModel()->setFilterRegExp(nameFilter);
+    proxyModel()->setFilterFixedString(nameFilter);
 }
 
 void ViewExtensionsFactory::slotRequestVersionControlActions(const KFileItemList& items)