workaround no longer needed

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 29ec377445c1248241363da4e3e5a21bcd1e02b4..53b20964282e83f923ef7eb0715c6c16e8d2c7d5 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -93,6 +93,12 @@ public:
      */
     KNewMenu* newMenu() const;
 
+    /**
+     * Returns the 'Show Menubar' action which can be shared with
+     * other menus (e. g. a context menu).
+     */
+    KAction* showMenuBarAction() const;
+
 public slots:
     /**
      * Handles the dropping of URLs to the given
@@ -154,21 +160,14 @@ signals:
     void requestItemInfo(const KFileItem& item);
 
 protected:
-    /** @see QMainWindow::closeEvent */
+    /** @see QMainWindow::closeEvent() */
     virtual void closeEvent(QCloseEvent* event);
 
-    /**
-     * This method is called when it is time for the app to save its
-     * properties for session management purposes.
-     */
-    void saveProperties(KConfig*);
+    /** @see KMainWindow::saveProperties() */
+    virtual void saveProperties(KConfigGroup& group);
 
-    /**
-     * This method is called when this app is restored.  The KConfig
-     * object points to the session management config file that was saved
-     * with @ref saveProperties
-     */
-    void readProperties(KConfig*);
+    /** @see KMainWindow::readProperties() */
+    virtual void readProperties(const KConfigGroup& group);
 
 private slots:
     /** Updates the 'Create New...' sub menu. */
@@ -199,18 +198,6 @@ private slots:
      */
     void slotHandlePlacesError(const QString &message);
 
-    /**
-     * Shows the error information of the job \a job
-     * in the status bar.
-     */
-    void slotHandleJobError(KJob* job);
-
-    /**
-     * Indicates in the status bar that the delete operation
-     * of the job \a job has been finished.
-     */
-    void slotDeleteFileFinished(KJob* job);
-
     /**
      * Updates the state of the 'Undo' menu action dependent
      * from the parameter \a available.
@@ -374,6 +361,12 @@ private slots:
     /** Opens Kompare for 2 selected files. */
     void compareFiles();
 
+    /**
+     * Hides the menu bar if it is visible, makes the menu bar
+     * visible if it is hidden.
+     */
+    void toggleShowMenuBar();
+
     /** Opens the settings dialog for Dolphin. */
     void editSettings();
 
@@ -422,8 +415,8 @@ private slots:
     /** Toggles the active view if two views are shown within the main window. */
     void toggleActiveView();
 
-    /** Called when the view is renaming a file. */
-    void slotRenaming();
+    /** Called when the view is doing a file operation, like renaming, copying, moving etc. */
+    void slotDoingOperation(KonqFileUndoManager::CommandType type);
 
 private:
     DolphinMainWindow(int id);
@@ -443,9 +436,6 @@ private:
     void updateEditActions();
     void updateViewActions();
     void updateGoActions();
-    void copyUrls(const KUrl::List& source, const KUrl& dest);
-    void moveUrls(const KUrl::List& source, const KUrl& dest);
-    void linkUrls(const KUrl::List& source, const KUrl& dest);
     void clearStatusBar();
 
     /**
@@ -499,6 +489,7 @@ private:
     };
 
     KNewMenu* m_newMenu;
+    KAction* m_showMenuBar;
     QSplitter* m_splitter;
     DolphinViewContainer* m_activeViewContainer;
     int m_id;
@@ -524,6 +515,11 @@ inline KNewMenu* DolphinMainWindow::newMenu() const
     return m_newMenu;
 }
 
+inline KAction* DolphinMainWindow::showMenuBarAction() const
+{
+    return m_showMenuBar;
+}
+
 inline int DolphinMainWindow::getId() const
 {
     return m_id;