- The selection changed timer only needs to be created for a DolphinView instance.

- Set the extensions mode inside the ViewExtensionsFactory.

svn path=/trunk/KDE/kdebase/apps/; revision=1017461

2 files changed, 9 insertions, 9 deletions

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 6db79452c..09b4f3e16 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -151,6 +151,12 @@ DolphinView::DolphinView(QWidget* parent,
     connect(&DolphinNewMenuObserver::instance(), SIGNAL(itemCreated(const KUrl&)),
             this, SLOT(observeCreatedItem(const KUrl&)));
 
+    m_selectionChangedTimer = new QTimer(this);
+    m_selectionChangedTimer->setSingleShot(true);
+    m_selectionChangedTimer->setInterval(300);
+    connect(m_selectionChangedTimer, SIGNAL(timeout()),
+            this, SLOT(emitSelectionChangedSignal()));
+
     applyViewProperties();
     m_topLayout->addWidget(m_viewAccessor.itemView());
 }
@@ -1324,12 +1330,6 @@ void DolphinView::createView()
 
     m_controller->setItemView(view);
 
-    m_selectionChangedTimer = new QTimer(this);
-    m_selectionChangedTimer->setSingleShot(true);
-    m_selectionChangedTimer->setInterval(300);
-    connect(m_selectionChangedTimer, SIGNAL(timeout()),
-            this, SLOT(emitSelectionChangedSignal()));
-
     // When changing the view mode, the selection is lost due to reinstantiating
     // a new item view with a custom selection model. Pass the ownership of the
     // selection model to DolphinView, so that it can be shared by all item views.
@@ -1340,8 +1340,6 @@ void DolphinView::createView()
     }
     m_selectionModel->setParent(this);
 
-    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
-
     m_versionControlObserver = new VersionControlObserver(view);
     connect(m_versionControlObserver, SIGNAL(infoMessage(const QString&)),
             this, SIGNAL(infoMessage(const QString&)));
diff --git a/src/viewextensionsfactory.cpp b/src/viewextensionsfactory.cpp
index 833ccda15..0f51489bc 100644
--- a/src/viewextensionsfactory.cpp
+++ b/src/viewextensionsfactory.cpp
@@ -45,7 +45,9 @@ ViewExtensionsFactory::ViewExtensionsFactory(QAbstractItemView* view,
     m_selectionManager(0),
     m_autoScroller(0),
     m_fileItemDelegate(0)
-{
+{   
+    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
+
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 
     // initialize tooltips