Forwardport 773570:

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 806399b6de56f4ec94b96c20507e03fa12bc3dc4..bddeba7b1d42721e7e361f1932d8d670ec626b20 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -27,12 +27,14 @@
 
 #include <config-nepomuk.h>
 
 
 #include <config-nepomuk.h>
 

-#include <kxmlguiwindow.h>
+#include <kfileitemdelegate.h>
+#include <konq_fileundomanager.h>

 #include <ksortablelist.h>
 #include <ksortablelist.h>

-#include <konq_undo.h>
+#include <kxmlguiwindow.h>

 
 #include <QtCore/QList>
 
 
 #include <QtCore/QList>
 

+class DolphinViewActionHandler;

 class DolphinApplication;
 class DolphinViewContainer;
 class KNewMenu;
 class DolphinApplication;
 class DolphinViewContainer;
 class KNewMenu;


@@ -92,17 +94,16 @@ public:
      */
     KNewMenu* newMenu() const;
 
      */
     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
 public slots:
     /**
      * Handles the dropping of URLs to the given

-     * destination. A context menu with the options
-     * 'Move Here', 'Copy Here', 'Link Here' and
-     * 'Cancel' is offered to the user.
-     * @param urls        List of URLs which have been
-     *                    dropped.
-     * @param destination Destination URL, where the
-     *                    list or URLs should be moved,
-     *                    copied or linked to.
+     * destination. This is only called by the TreeViewSidebarPage.

      */
     void dropUrls(const KUrl::List& urls,
                   const KUrl& destination);
      */
     void dropUrls(const KUrl::List& urls,
                   const KUrl& destination);


@@ -153,38 +154,21 @@ signals:
     void requestItemInfo(const KFileItem& item);
 
 protected:
     void requestItemInfo(const KFileItem& item);
 
 protected:

-    /** @see QMainWindow::closeEvent */
+    /** @see QMainWindow::closeEvent() */

     virtual void closeEvent(QCloseEvent* event);
 
     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:
 
 private slots:

+    void clearStatusBar();
+

     /** Updates the 'Create New...' sub menu. */
     void updateNewMenu();
 
     /** Updates the 'Create New...' sub menu. */
     void updateNewMenu();
 

-    /**
-     * Let the user input a name for the selected item(s) and trigger
-     * a renaming afterwards.
-     */
-    void rename();
-
-    /** Moves the selected items of the active view to the trash. */
-    void moveToTrash();
-
-    /** Deletes the selected items of the active view. */
-    void deleteItems();
-

     /**
      * Opens the properties window for the selected items of the
      * active view. The properties windows shows information
     /**
      * Opens the properties window for the selected items of the
      * active view. The properties windows shows information


@@ -198,18 +182,6 @@ private slots:
      */
     void slotHandlePlacesError(const QString &message);
 
      */
     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.
     /**
      * Updates the state of the 'Undo' menu action dependent
      * from the parameter \a available.


@@ -250,14 +222,8 @@ private slots:
      */
     void invertSelection();
 
      */
     void invertSelection();
 

-    /** The current active view is switched to the icons mode. */
-    void setIconsView();
-
-    /** The current active view is switched to the details mode. */
-    void setDetailsView();
-
-    /** The current active view is switched to the column mode. */
-    void setColumnView();
+    /** The current active view is switched to a new view mode. */
+    void setViewMode(QAction *);

 
     /** The sorting of the current view should be done by the name. */
     void sortByName();
 
     /** The sorting of the current view should be done by the name. */
     void sortByName();


@@ -286,27 +252,6 @@ private slots:
     /** The sorting of the current view should be done by tags. */
     void sortByTags();
 
     /** The sorting of the current view should be done by tags. */
     void sortByTags();
 

-    /** Switches between an ascending and descending sorting order. */
-    void toggleSortOrder();
-
-    /** Switches between sorting by categories or not. */
-    void toggleSortCategorization();
-
-    /**
-     * Clears any additional information for an item except for the
-     * name and the icon.
-     */
-    void clearInfo();
-
-    /** Shows the MIME type as additional information for the item. */
-    void showMimeInfo();
-
-    /** Shows the size as additional information for the item. */
-    void showSizeInfo();
-
-    /** Shows the date as additional information for the item. */
-    void showDateInfo();
-

     /**
      * Switches between one and two views:
      * If one view is visible, it will get split into two views.
     /**
      * Switches between one and two views:
      * If one view is visible, it will get split into two views.


@@ -320,29 +265,13 @@ private slots:
     /** Stops the loading process for the current active view. */
     void stopLoading();
 
     /** Stops the loading process for the current active view. */
     void stopLoading();
 

-    /** Switches between showing a preview of the file content and showing the icon. */
-    void togglePreview();
-
-    /**
-     * Switches between showing and hiding of hidden marked files dependent
-     * from the current state of the 'Show Hidden Files' menu toggle action.
-     */
-    void toggleShowHiddenFiles();
-

     /**
     /**

-     * Toggles between showing and hiding of the filter bar dependent
-     * from the current state of the 'Show Filter Bar' menu toggle action.
+     * Toggles between showing and hiding of the filter bar

      */
      */

-    void toggleFilterBarVisibility();
-
-    /** Increases the size of the current set view mode. */
-    void zoomIn();
-
-    /** Decreases the size of the current set view mode. */
-    void zoomOut();
+    void toggleFilterBarVisibility(bool show);

 
     /**
 
     /**

-     * Toggles between edit and brose mode of the navigation bar.
+     * Toggles between edit and browse mode of the navigation bar.

      */
     void toggleEditLocation();
 
      */
     void toggleEditLocation();
 


@@ -376,29 +305,23 @@ private slots:
     /** Opens Kompare for 2 selected files. */
     void compareFiles();
 
     /** 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();
 
     /** Updates the state of all 'View' menu actions. */
     void slotViewModeChanged();
 
     /** Opens the settings dialog for Dolphin. */
     void editSettings();
 
     /** Updates the state of all 'View' menu actions. */
     void slotViewModeChanged();
 

-    /** Updates the state of the 'Show preview' menu action. */
-    void slotShowPreviewChanged();
-
-    /** Updates the state of the 'Show hidden files' menu action. */
-    void slotShowHiddenFilesChanged();
-
-    /** Updates the state of the 'Categorized sorting' menu action. */
-    void slotCategorizedSortingChanged();
-

     /** Updates the state of the 'Sort by' actions. */
     void slotSortingChanged(DolphinView::Sorting sorting);
 
     /** Updates the state of the 'Sort by' actions. */
     void slotSortingChanged(DolphinView::Sorting sorting);
 

-    /** Updates the state of the 'Sort Ascending/Descending' action. */
-    void slotSortOrderChanged(Qt::SortOrder order);
-
-    /** Updates the state of the 'Additional Information' actions. */
-    void slotAdditionalInfoChanged(KFileItemDelegate::InformationList info);
+    /** Updates the state of the 'Show Full Location' action. */
+    void slotEditableStateChanged(bool editable);

 
     /**
      * Updates the state of the 'Edit' menu actions and emits
 
     /**
      * Updates the state of the 'Edit' menu actions and emits


@@ -424,6 +347,9 @@ private slots:
     /** Toggles the active view if two views are shown within the main window. */
     void toggleActiveView();
 
     /** Toggles the active view if two views are shown within the main window. */
     void toggleActiveView();
 

+    /** Called when the view is doing a file operation, like renaming, copying, moving etc. */
+    void slotDoingOperation(KonqFileUndoManager::CommandType type);
+

 private:
     DolphinMainWindow(int id);
     void init();
 private:
     DolphinMainWindow(int id);
     void init();


@@ -442,10 +368,6 @@ private:
     void updateEditActions();
     void updateViewActions();
     void updateGoActions();
     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();

 
     /**
      * Connects the signals from the created DolphinView with
 
     /**
      * Connects the signals from the created DolphinView with


@@ -478,7 +400,7 @@ private:
      * assures that all errors are shown in the status bar of Dolphin
      * instead as modal error dialog with an OK button.
      */
      * assures that all errors are shown in the status bar of Dolphin
      * instead as modal error dialog with an OK button.
      */

-    class UndoUiInterface : public KonqUndoManager::UiInterface
+    class UndoUiInterface : public KonqFileUndoManager::UiInterface

     {
     public:
         UndoUiInterface(DolphinMainWindow* mainWin);
     {
     public:
         UndoUiInterface(DolphinMainWindow* mainWin);


@@ -490,14 +412,17 @@ private:
     };
 
     KNewMenu* m_newMenu;
     };
 
     KNewMenu* m_newMenu;

+    KAction* m_showMenuBar;

     QSplitter* m_splitter;
     DolphinViewContainer* m_activeViewContainer;
     int m_id;
 
     DolphinViewContainer* m_viewContainer[SecondaryView + 1];
 
     QSplitter* m_splitter;
     DolphinViewContainer* m_activeViewContainer;
     int m_id;
 
     DolphinViewContainer* m_viewContainer[SecondaryView + 1];
 

+    DolphinViewActionHandler* m_actionHandler;
+

     /// remember pending undo operations until they are finished
     /// remember pending undo operations until they are finished

-    QList<KonqUndoManager::CommandType> m_undoCommandTypes;
+    QList<KonqFileUndoManager::CommandType> m_undoCommandTypes;

 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const


@@ -515,6 +440,11 @@ inline KNewMenu* DolphinMainWindow::newMenu() const
     return m_newMenu;
 }
 
     return m_newMenu;
 }
 

+inline KAction* DolphinMainWindow::showMenuBarAction() const
+{
+    return m_showMenuBar;
+}
+

 inline int DolphinMainWindow::getId() const
 {
     return m_id;
 inline int DolphinMainWindow::getId() const
 {
     return m_id;