X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/e5eae108ca4511be9dae5f8bb4a4e1fbb0d89c7a..39f89141b06c:/src/dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index bdc80b359..667e3c931 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -22,7 +22,6 @@
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 
-#include "dolphinview.h"
 #include "panels/panel.h"
 
 #include <config-nepomuk.h>
@@ -33,19 +32,19 @@
 #include <kxmlguiwindow.h>
 #include <kactionmenu.h>
 
-#include <QtCore/QList>
+#include "views/dolphinview.h"
+
+#include <QList>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class KAction;
 class DolphinViewActionHandler;
 class DolphinApplication;
-class DolphinSearchBox;
-class DolphinSearchOptionsConfigurator;
 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
-class KNewMenu;
+class KNewFileMenu;
 class KTabBar;
 class KUrl;
 class QSplitter;
@@ -115,7 +114,7 @@ public:
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).
      */
-    KNewMenu* newMenu() const;
+    KNewFileMenu* newFileMenu() const;
 
     /**
      * Returns the 'Show Menubar' action which can be shared with
@@ -216,6 +215,9 @@ private slots:
     /** Pastes the clipboard data to the active view. */
     void paste();
 
+    /** Replaces the URL navigator by a search box to find files. */
+    void find();
+
     /**
      * Updates the text of the paste action dependent from
      * the number of items which are in the clipboard.
@@ -245,6 +247,9 @@ private slots:
     /** Stops the loading process for the current active view. */
     void stopLoading();
 
+    void enableStopAction();
+    void disableStopAction();
+
     /**
      * Toggles between showing and hiding of the filter bar
      */
@@ -316,9 +321,6 @@ private slots:
      */
     void slotSelectionChanged(const KFileItemList& selection);
 
-    /** Enables changing of tabs via mouse wheel. */
-    void slotWheelMoved(int wheelDelta);
-
     /** Emits the signal requestItemInfo(). */
     void slotRequestItemInfo(const KFileItem&);
 
@@ -405,18 +407,6 @@ private slots:
      */
     void slotTestCanDecode(const QDragMoveEvent* event, bool& accept);
 
-    /**
-     * Is connected with the Dolphin search box and the search configurator
-     * and triggers a Nepomuk search.
-     */
-    void searchItems();
-
-    /**
-     * Is connected to the searchbox signal 'requestSearchOptions' and
-     * takes care to show the search options.
-     */
-    void showSearchOptions();
-
     /**
      * If the URL can be listed open it in the current view, otherwise
      * run it through KRun.
@@ -424,10 +414,16 @@ private slots:
     void handleUrl(const KUrl& url);
 
     /**
-     * setUrlAsCaption() will trigger a stat job which reports its result in
-     * this slot.
+     * handleUrl() can trigger a stat job to see if the url can actually
+     * be listed.
+     */
+    void slotHandleUrlStatFinished(KJob* job);
+
+    /**
+     * Is connected to the KTabBar signal receivedDropEvent.
+     * Allows dragging and dropping files onto tabs.
      */
-    void slotCaptionStatFinished(KJob* job);
+    void tabDropEvent(int tab, QDropEvent* event);
 
     /**
      * Is invoked when the write state of a folder has been changed and
@@ -522,14 +518,12 @@ private:
         virtual void jobError(KIO::Job* job);
     };
 
-    KNewMenu* m_newMenu;
+    KNewFileMenu* m_newFileMenu;
     KActionMenu* m_recentTabsMenu;
     KAction* m_showMenuBar;
     KTabBar* m_tabBar;
     DolphinViewContainer* m_activeViewContainer;
     QVBoxLayout* m_centralWidgetLayout;
-    DolphinSearchBox* m_searchBox;
-    DolphinSearchOptionsConfigurator* m_searchOptionsConfigurator;
     int m_id;
 
     struct ViewTab
@@ -548,7 +542,7 @@ private:
     DolphinRemoteEncoding* m_remoteEncoding;
     QPointer<DolphinSettingsDialog> m_settingsDialog;
 
-    KJob* m_captionStatJob;
+    KJob* m_lastHandleUrlStatJob;
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
@@ -561,9 +555,9 @@ inline bool DolphinMainWindow::isSplit() const
     return m_viewTab[m_tabIndex].secondaryView != 0;
 }
 
-inline KNewMenu* DolphinMainWindow::newMenu() const
+inline KNewFileMenu* DolphinMainWindow::newFileMenu() const
 {
-    return m_newMenu;
+    return m_newFileMenu;
 }
 
 inline KAction* DolphinMainWindow::showMenuBarAction() const