Use capitalized KDE includes

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 830dc5e74084f7f6c7d31fcb46e5b36e46fa32ce..86aefe959d776ee7d4b5762bc24b8ba1df8b9857 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
-#include <kprotocolmanager.h>
+#include <KProtocolManager>
 
 #include <QtGui/QApplication>
 #include <QtGui/QKeyEvent>
@@ -27,23 +27,23 @@
 #include <QtCore/QTimer>
 #include <QtGui/QScrollBar>
 
-#include <kdesktopfile.h>
-#include <kfileitemdelegate.h>
-#include <kfileplacesmodel.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kiconeffect.h>
-#include <kio/netaccess.h>
-#include <kio/previewjob.h>
-#include <kmenu.h>
+#include <KDesktopFile>
+#include <KFileItemDelegate>
+#include <KFilePlacesModel>
+#include <KGlobalSettings>
+#include <KLocale>
+#include <KIconEffect>
+#include <KIO/NetAccess>
+#include <KIO/PreviewJob>
+#include <KMenu>
 #include <knewmenu.h>
 #include <konqmimedata.h>
 #include <konq_operations.h>
-#include <kshell.h>
-#include <kurl.h>
-#include <kurlcombobox.h>
-#include <kurlnavigator.h>
-#include <krun.h>
+#include <KShell>
+#include <KUrl>
+#include <KUrlComboBox>
+#include <KUrlNavigator>
+#include <KRun>
 
 #include "dolphin_generalsettings.h"
 #include "dolphinmainwindow.h"
@@ -53,8 +53,6 @@
 #include "statusbar/dolphinstatusbar.h"
 #include "views/dolphincolumnview.h"
 #include "views/dolphindetailsview.h"
-#include "views/dolphindirlister.h"
-#include "views/dolphinsortfilterproxymodel.h"
 #include "views/draganddrophelper.h"
 #include "views/dolphiniconsview.h"
 #include "views/dolphinmodel.h"
@@ -100,59 +98,23 @@ DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
     connect(m_searchBox, SIGNAL(search(QString)), this, SLOT(startSearching(QString)));
     connect(m_searchBox, SIGNAL(returnPressed(QString)), this, SLOT(requestFocus()));
 
-    DolphinDirLister* dirLister = new DolphinDirLister();
-    dirLister->setAutoUpdate(true);
-    dirLister->setMainWindow(window());
-    dirLister->setDelayedMimeTypes(true);
-
-    DolphinModel* dolphinModel = new DolphinModel(this);
-    dolphinModel->setDirLister(dirLister);  // dolphinModel takes ownership of dirLister
-    dolphinModel->setDropsAllowed(DolphinModel::DropOnDirectory);
-
-    DolphinSortFilterProxyModel* proxyModel = new DolphinSortFilterProxyModel(this);
-    proxyModel->setSourceModel(dolphinModel);
-    proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-
-    // TODO: In the case of the column view the directory lister changes. Let the DolphinView
-    // inform the container about this information for KDE SC 4.7
-    connect(dirLister, SIGNAL(clear()),
-            this, SLOT(delayedStatusBarUpdate()));
-    connect(dirLister, SIGNAL(percent(int)),
-            this, SLOT(updateProgress(int)));
-    connect(dirLister, SIGNAL(itemsDeleted(const KFileItemList&)),
-            this, SLOT(delayedStatusBarUpdate()));
-    connect(dirLister, SIGNAL(newItems(KFileItemList)),
-            this, SLOT(delayedStatusBarUpdate()));
-    connect(dirLister, SIGNAL(infoMessage(const QString&)),
-            this, SLOT(showInfoMessage(const QString&)));
-    connect(dirLister, SIGNAL(errorMessage(const QString&)),
-            this, SLOT(showErrorMessage(const QString&)));
-    connect(dirLister, SIGNAL(urlIsFileError(const KUrl&)),
-            this, SLOT(openFile(const KUrl&)));
-
-    m_view = new DolphinView(this, url, proxyModel);
-    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
-            m_urlNavigator, SLOT(setUrl(const KUrl&)));
-    connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
-            this, SLOT(showItemInfo(KFileItem)));
-    connect(m_view, SIGNAL(errorMessage(const QString&)),
-            this, SLOT(showErrorMessage(const QString&)));
-    connect(m_view, SIGNAL(infoMessage(const QString&)),
-            this, SLOT(showInfoMessage(const QString&)));
-    connect(m_view, SIGNAL(operationCompletedMessage(const QString&)),
-            this, SLOT(showOperationCompletedMessage(const QString&)));
-    connect(m_view, SIGNAL(itemTriggered(KFileItem)),
-            this, SLOT(slotItemTriggered(KFileItem)));
-    connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
-            this, SLOT(redirect(KUrl, KUrl)));
-    connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)),
-            this, SLOT(delayedStatusBarUpdate()));
-    connect(m_view, SIGNAL(startedPathLoading(KUrl)),
-            this, SLOT(slotStartedPathLoading()));
-    connect(m_view, SIGNAL(finishedPathLoading(KUrl)),
-            this, SLOT(slotFinishedPathLoading()));
-    connect(m_view, SIGNAL(writeStateChanged(bool)),
-            this, SIGNAL(writeStateChanged(bool)));
+    m_view = new DolphinView(url, this);
+    connect(m_view, SIGNAL(urlChanged(const KUrl&)),      m_urlNavigator, SLOT(setUrl(const KUrl&)));
+    connect(m_view, SIGNAL(writeStateChanged(bool)),      this, SIGNAL(writeStateChanged(bool)));
+    connect(m_view, SIGNAL(requestItemInfo(KFileItem)),   this, SLOT(showItemInfo(KFileItem)));
+    connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&)));
+    connect(m_view, SIGNAL(infoMessage(const QString&)),  this, SLOT(showInfoMessage(const QString&)));
+    connect(m_view, SIGNAL(itemTriggered(KFileItem)),     this, SLOT(slotItemTriggered(KFileItem)));
+    connect(m_view, SIGNAL(redirection(KUrl, KUrl)),      this, SLOT(redirect(KUrl, KUrl)));
+    connect(m_view, SIGNAL(startedPathLoading(KUrl)),     this, SLOT(slotStartedPathLoading()));
+    connect(m_view, SIGNAL(finishedPathLoading(KUrl)),    this, SLOT(slotFinishedPathLoading()));
+    connect(m_view, SIGNAL(itemCountChanged()),           this, SLOT(delayedStatusBarUpdate()));
+    connect(m_view, SIGNAL(pathLoadingProgress(int)),     this, SLOT(updateProgress(int)));
+    connect(m_view, SIGNAL(infoMessage(const QString&)),  this, SLOT(showInfoMessage(const QString&)));
+    connect(m_view, SIGNAL(errorMessage(const QString&)), this, SLOT(showErrorMessage(const QString&)));
+    connect(m_view, SIGNAL(urlIsFileError(const KUrl&)),  this, SLOT(openFile(const KUrl&)));
+    connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)),    this, SLOT(delayedStatusBarUpdate()));
+    connect(m_view, SIGNAL(operationCompletedMessage(const QString&)), this, SLOT(showOperationCompletedMessage(const QString&)));
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&)));
@@ -239,6 +201,10 @@ bool DolphinViewContainer::isFilterBarVisible() const
 void DolphinViewContainer::setSearchModeEnabled(bool enabled)
 {
     if (enabled == isSearchModeEnabled()) {
+        if (enabled && !m_searchBox->hasFocus()) {
+            m_searchBox->setFocus();
+            m_searchBox->selectAll();
+        }
         return;
     }
 
@@ -295,6 +261,7 @@ void DolphinViewContainer::setFilterBarVisible(bool visible)
     if (visible) {
         m_filterBar->show();
         m_filterBar->setFocus();
+        m_filterBar->selectAll();
     } else {
         closeFilterBar();
     }