The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index dfc171cf92d5a01e781294e477ab44eabc747e14..667e3c931408bf25ef03dfd5585c3f0a08d1a88e 100644 (file)
--- 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,7 +32,9 @@
 #include <kxmlguiwindow.h>
 #include <kactionmenu.h>
 
-#include <QtCore/QList>
+#include "views/dolphinview.h"
+
+#include <QList>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
@@ -113,7 +114,7 @@ public:
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).
      */
-    KNewFileMenu* newMenu() const;
+    KNewFileMenu* newFileMenu() const;
 
     /**
      * Returns the 'Show Menubar' action which can be shared with
@@ -246,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
      */
@@ -317,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&);
 
@@ -418,12 +419,6 @@ private slots:
      */
     void slotHandleUrlStatFinished(KJob* job);
 
-    /**
-     * setUrlAsCaption() will trigger a stat job which reports its result in
-     * this slot.
-     */
-    void slotCaptionStatFinished(KJob* job);
-
     /**
      * Is connected to the KTabBar signal receivedDropEvent.
      * Allows dragging and dropping files onto tabs.
@@ -523,7 +518,7 @@ private:
         virtual void jobError(KIO::Job* job);
     };
 
-    KNewFileMenu* m_newMenu;
+    KNewFileMenu* m_newFileMenu;
     KActionMenu* m_recentTabsMenu;
     KAction* m_showMenuBar;
     KTabBar* m_tabBar;
@@ -547,7 +542,6 @@ private:
     DolphinRemoteEncoding* m_remoteEncoding;
     QPointer<DolphinSettingsDialog> m_settingsDialog;
 
-    KJob* m_captionStatJob;
     KJob* m_lastHandleUrlStatJob;
 };
 
@@ -561,9 +555,9 @@ inline bool DolphinMainWindow::isSplit() const
     return m_viewTab[m_tabIndex].secondaryView != 0;
 }
 
-inline KNewFileMenu* DolphinMainWindow::newMenu() const
+inline KNewFileMenu* DolphinMainWindow::newFileMenu() const
 {
-    return m_newMenu;
+    return m_newFileMenu;
 }
 
 inline KAction* DolphinMainWindow::showMenuBarAction() const