Port to KStandardAction::DeleteFile

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index e33de4ef63410daf374aa480bdda13b8fd3243fb..d741eb21ed455aa84e1f85c05e3347c4fdc5b355 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *

  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
  *                                                                         *
  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
  *                                                                         *


@@ -22,23 +22,30 @@
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 

-#include "dolphinview.h"
-#include "sidebarpage.h"
+#include <config-baloo.h>

 
 

-#include <config-nepomuk.h>
-
-#include <kfileitemdelegate.h>
-#include <konq_fileundomanager.h>
+#include <kio/fileundomanager.h>

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

+#include <QIcon>
+#include <QUrl>
+
+#include <QList>
+#include <QPointer>

 
 

-#include <QtCore/QList>
+typedef KIO::FileUndoManager::CommandType CommandType;

 
 

-class DolphinApplication;
+class DolphinViewActionHandler;
+class DolphinSettingsDialog;

 class DolphinViewContainer;
 class DolphinViewContainer;

-class KNewMenu;
-class KUrl;
-class QSplitter;
+class DolphinRemoteEncoding;
+class DolphinTabWidget;
+class KFileItem;
+class KFileItemList;
+class KJob;
+class KNewFileMenu;
+class QToolButton;
+class QIcon;

 
 /**
  * @short Main window for Dolphin.
 
 /**
  * @short Main window for Dolphin.


@@ -50,9 +57,9 @@ class DolphinMainWindow: public KXmlGuiWindow
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")
     Q_PROPERTY(int id READ getId SCRIPTABLE true)
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")
     Q_PROPERTY(int id READ getId SCRIPTABLE true)

-    friend class DolphinApplication;

 
 public:
 
 public:

+    DolphinMainWindow();

     virtual ~DolphinMainWindow();
 
     /**
     virtual ~DolphinMainWindow();
 
     /**


@@ -64,49 +71,32 @@ public:
     DolphinViewContainer* activeViewContainer() const;
 
     /**
     DolphinViewContainer* activeViewContainer() const;
 
     /**

-     * Returns true, if the main window contains two instances
-     * of a view container. The active view constainer can be
-     * accessed by DolphinMainWindow::activeViewContainer().
+     * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
+     * 2 directories are collected within one tab.
+     * \pre \a dirs must contain at least one url.

      */
      */

-    bool isSplit() const;
+    void openDirectories(const QList<QUrl> &dirs, bool splitView);

 
     /**
 
     /**

-     * If the main window contains two instances of a view container
-     * (DolphinMainWindow::isSplit() returns true), then the
-     * two views get toggled (the right view is on the left, the left
-     * view on the right).
+     * Opens the directories which contain the files \p files and selects all files.
+     * If \a splitView is set, 2 directories are collected within one tab.
+     * \pre \a files must contain at least one url.

      */
      */

-    void toggleViews();
-
-    /** Renames the item represented by \a oldUrl to \a newUrl. */
-    void rename(const KUrl& oldUrl, const KUrl& newUrl);
-
-    /**
-     * Refreshes the views of the main window by recreating them dependent from
-     * the given Dolphin settings.
-     */
-    void refreshViews();
+    void openFiles(const QList<QUrl>& files, bool splitView);

 
     /**
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).
      */
 
     /**
      * 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;

 
 public slots:
     /**
 
 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.
+     * Pastes the clipboard data into the currently selected folder
+     * of the active view. If not exactly one folder is selected,
+     * no pasting is done at all.

      */
      */

-    void dropUrls(const KUrl::List& urls,
-                  const KUrl& destination);
+    void pasteIntoFolder();

 
     /**
      * Returns the main window ID used through DBus.
 
     /**
      * Returns the main window ID used through DBus.


@@ -114,27 +104,23 @@ public slots:
     int getId() const;
 
     /**
     int getId() const;
 
     /**

-     * Inform all affected dolphin components (sidebars, views) of an URL
+     * Implementation of the MainWindowAdaptor/QDBusAbstractAdaptor interface.
+     * Inform all affected dolphin components (panels, views) of an URL

      * change.
      */
      * change.
      */

-    void changeUrl(const KUrl& url);
+    void changeUrl(const QUrl& url);

 
     /**
 
     /**

-     * Inform all affected dolphin components that a selection change is
-     * requested.
+     * The current directory of the Terminal Panel has changed, probably because
+     * the user entered a 'cd' command. This slot calls changeUrl(url) and makes
+     * sure that the panel keeps the keyboard focus.

      */
      */

-    void changeSelection(const KFileItemList& selection);
+    void slotTerminalDirectoryChanged(const QUrl& url);

 
     /** Stores all settings and quits Dolphin. */
     void quit();
 
 signals:
 
     /** Stores all settings and quits Dolphin. */
     void quit();
 
 signals:

-    /**
-     * Is send if the active view has been changed in
-     * the split view mode.
-     */
-    void activeViewChanged();
-

     /**
      * Is sent if the selection of the currently active view has
      * been changed.
     /**
      * Is sent if the selection of the currently active view has
      * been changed.


@@ -145,75 +131,52 @@ signals:
      * Is sent if the url of the currently active view has
      * been changed.
      */
      * Is sent if the url of the currently active view has
      * been changed.
      */

-    void urlChanged(const KUrl& url);
+    void urlChanged(const QUrl& url);

 
     /**
 
     /**

-     * Is emitted if information of an item is requested to be shown e. g. in the sidebar.
+     * Is emitted if information of an item is requested to be shown e. g. in the panel.

      * If item is null, no item information request is pending.
      */
     void requestItemInfo(const KFileItem& item);
 
      * If item is null, no item information request is pending.
      */
     void requestItemInfo(const KFileItem& item);
 

-protected:
-    /** @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.
+     * Is emitted if the settings have been changed.

      */
      */

-    void saveProperties(KConfig*);
+    void settingsChanged();

 
 

-    /**
-     * 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*);
-
-private slots:
-    /** Updates the 'Create New...' sub menu. */
-    void updateNewMenu();
+protected:
+    /** @see QWidget::showEvent() */
+    virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;

 
 

-    /**
-     * Let the user input a name for the selected item(s) and trigger
-     * a renaming afterwards.
-     */
-    void rename();
+    /** @see QMainWindow::closeEvent() */
+    virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;

 
 

-    /** Moves the selected items of the active view to the trash. */
-    void moveToTrash();
+    /** @see KMainWindow::saveProperties() */
+    virtual void saveProperties(KConfigGroup& group) Q_DECL_OVERRIDE;

 
 

-    /** Deletes the selected items of the active view. */
-    void deleteItems();
+    /** @see KMainWindow::readProperties() */
+    virtual void readProperties(const KConfigGroup& group) Q_DECL_OVERRIDE;

 
 

+private slots:

     /**
     /**

-     * Opens the properties window for the selected items of the
-     * active view. The properties windows shows information
-     * like name, size and permissions.
+     * Refreshes the views of the main window by recreating them according to
+     * the given Dolphin settings.

      */
      */

-    void properties();
+    void refreshViews();

 
 

-    /**
-     * Shows the error information from the places model
-     * in the status bar.
-     */
-    void slotHandlePlacesError(const QString &message);
+    void clearStatusBar();

 
 

-    /**
-     * Shows the error information of the job \a job
-     * in the status bar.
-     */
-    void slotHandleJobError(KJob* job);
+    /** Updates the 'Create New...' sub menu. */
+    void updateNewMenu();

 
 

-    /**
-     * Indicates in the status bar that the delete operation
-     * of the job \a job has been finished.
-     */
-    void slotDeleteFileFinished(KJob* job);
+    void createDirectory();
+
+    /** Shows the error message in the status bar of the active view. */
+    void showErrorMessage(const QString& message);

 
     /**
      * Updates the state of the 'Undo' menu action dependent
 
     /**
      * Updates the state of the 'Undo' menu action dependent

-     * from the parameter \a available.
+     * on the parameter \a available.

      */
     void slotUndoAvailable(bool available);
 
      */
     void slotUndoAvailable(bool available);
 


@@ -225,7 +188,7 @@ private slots:
 
     /**
      * Copies all selected items to the clipboard and marks
 
     /**
      * Copies all selected items to the clipboard and marks

-     * the items as cutted.
+     * the items as cut.

      */
     void cut();
 
      */
     void cut();
 


@@ -235,8 +198,11 @@ private slots:
     /** Pastes the clipboard data to the active view. */
     void paste();
 
     /** 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
+     * Updates the text of the paste action dependent on

      * the number of items which are in the clipboard.
      */
     void updatePasteAction();
      * the number of items which are in the clipboard.
      */
     void updatePasteAction();


@@ -251,112 +217,45 @@ private slots:
      */
     void invertSelection();
 
      */
     void invertSelection();
 

-    /** 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 size. */
-    void sortBySize();
-
-    /** The sorting of the current view should be done by the date. */
-    void sortByDate();
-
-    /** The sorting of the current view should be done by the permissions. */
-    void sortByPermissions();
-
-    /** The sorting of the current view should be done by the owner. */
-    void sortByOwner();
-
-    /** The sorting of the current view should be done by the group. */
-    void sortByGroup();
-
-    /** The sorting of the current view should be done by the type. */
-    void sortByType();
-
-    /** The sorting of the current view should be done by the rating. */
-    void sortByRating();
-
-    /** 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();
-
-    /** Switches between showing the size as additional information for the item or not. */
-    void toggleSizeInfo();
-
-    /** Switchtes between showing the date as additional information for the item or not. */
-    void toggleDateInfo();
-
-    /** Switchtes between showing the permissions as additional information for the item or not. */
-    void togglePermissionsInfo();
-
-    /** Switchtes between showing the owner as additional information for the item or not. */
-    void toggleOwnerInfo();
-
-    /** Switchtes between showing the group as additional information for the item or not. */
-    void toggleGroupInfo();
-
-    /** Switches between showing the MIME type as additional information for the item or not. */
-    void toggleMimeInfo();
-

     /**
      * 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.

-     * If already two views are visible, the nonactivated view gets closed.
+     * If already two views are visible, the active view gets closed.

      */
     void toggleSplitView();
 
      */
     void toggleSplitView();
 

-    /** Reloads the current active view. */
+    /** Dedicated action to open the stash:/ ioslave in split view. */
+    void toggleSplitStash();
+
+    /** Reloads the currently active view. */

     void reloadView();
 
     void reloadView();
 

-    /** Stops the loading process for the current active view. */
+    /** Stops the loading process for the currently active view. */

     void stopLoading();
 
     void stopLoading();
 

-    /** Switches between showing a preview of the file content and showing the icon. */
-    void togglePreview();
+    void enableStopAction();
+    void disableStopAction();

 
 

-    /**
-     * Switches between showing and hiding of hidden marked files dependent
-     * from the current state of the 'Show Hidden Files' menu toggle action.
-     */
-    void toggleShowHiddenFiles();
+    void showFilterBar();

 
     /**
 
     /**

-     * Toggles between showing and hiding of the filter bar dependent
-     * from the current state of the 'Show Filter Bar' menu toggle action.
-     */
-    void toggleFilterBarVisibility();
-
-    /** Increases the size of the current set view mode. */
-    void zoomIn();
-
-    /** Decreases the size of the current set view mode. */
-    void zoomOut();
-
-    /**
-     * Toggles between edit and brose mode of the navigation bar.
+     * Toggles between edit and browse mode of the navigation bar.

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

-     * Switches to the edit mode of the navigation bar. If the edit mode is
+     * Switches to the edit mode of the navigation bar and selects
+     * the whole URL, so that it can be replaced by the user. If the edit mode is

      * already active, it is assured that the navigation bar get focused.
      */
      * already active, it is assured that the navigation bar get focused.
      */

-    void editLocation();
+    void replaceLocation();

 
     /**
 
     /**

-     * Opens the view properties dialog, which allows to modify the properties
-     * of the currently active view.
+     * Toggles the state of the panels between a locked and unlocked layout.

      */
      */

-    void adjustViewProperties();
+    void togglePanelLockState();

 
 

-    /** Goes back on step of the URL history. */
+    /** Goes back one step of the URL history. */

     void goBack();
 
     /** Goes forward one step of the URL history. */
     void goBack();
 
     /** Goes forward one step of the URL history. */


@@ -365,38 +264,49 @@ private slots:
     /** Goes up one hierarchy of the current URL. */
     void goUp();
 
     /** Goes up one hierarchy of the current URL. */
     void goUp();
 

-    /** Goes to the home URL. */
+    /** Changes the location to the home URL. */

     void goHome();
 
     void goHome();
 

-    /** Opens KFind for the current shown directory. */
-    void findFile();
-
-    /** Opens Kompare for 2 selected files. */
-    void compareFiles();
+    /**
+     * Open the previous URL in the URL history in a new tab
+     * if the middle mouse button is clicked.
+     */
+    void goBack(Qt::MouseButtons buttons);

 
 

-    /** Opens the settings dialog for Dolphin. */
-    void editSettings();
+    /**
+     * Open the next URL in the URL history in a new tab
+     * if the middle mouse button is clicked.
+     */
+    void goForward(Qt::MouseButtons buttons);

 
 

-    /** Updates the state of all 'View' menu actions. */
-    void slotViewModeChanged();
+    /**
+     * Open the URL one hierarchy above the current URL in a new tab
+     * if the middle mouse button is clicked.
+     */
+    void goUp(Qt::MouseButtons buttons);

 
 

-    /** Updates the state of the 'Show preview' menu action. */
-    void slotShowPreviewChanged();
+    /**
+     * Open the home URL in a new tab
+     */
+    void goHome(Qt::MouseButtons buttons);

 
 

-    /** Updates the state of the 'Show hidden files' menu action. */
-    void slotShowHiddenFilesChanged();
+    /** Opens Kompare for 2 selected files. */
+    void compareFiles();

 
 

-    /** Updates the state of the 'Categorized sorting' menu action. */
-    void slotCategorizedSortingChanged();
+    /**
+     * Hides the menu bar if it is visible, makes the menu bar
+     * visible if it is hidden.
+     */
+    void toggleShowMenuBar();

 
 

-    /** Updates the state of the 'Sort by' actions. */
-    void slotSortingChanged(DolphinView::Sorting sorting);
+    /** Opens a terminal window for the current location. */
+    void openTerminal();

 
 

-    /** Updates the state of the 'Sort Ascending/Descending' action. */
-    void slotSortOrderChanged(Qt::SortOrder order);
+    /** Opens the settings dialog for Dolphin. */
+    void editSettings();

 
 

-    /** 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


@@ -404,14 +314,11 @@ private slots:
      */
     void slotSelectionChanged(const KFileItemList& selection);
 
      */
     void slotSelectionChanged(const KFileItemList& selection);
 

-    /** Emits the signal requestItemInfo(). */
-    void slotRequestItemInfo(const KFileItem&);
-

     /**
      * Updates the state of the 'Back' and 'Forward' menu
     /**
      * Updates the state of the 'Back' and 'Forward' menu

-     * actions corresponding the the current history.
+     * actions corresponding to the current history.

      */
      */

-    void slotHistoryChanged();
+    void updateHistory();

 
     /** Updates the state of the 'Show filter bar' menu action. */
     void updateFilterBarAction(bool show);
 
     /** Updates the state of the 'Show filter bar' menu action. */
     void updateFilterBarAction(bool show);


@@ -419,39 +326,129 @@ private slots:
     /** Open a new main window. */
     void openNewMainWindow();
 
     /** Open a new main window. */
     void openNewMainWindow();
 

-    /** Toggles the active view if two views are shown within the main window. */
-    void toggleActiveView();
+    /**
+     * Opens a new view with the current URL that is part of a tab and
+     * activates it.
+     */
+    void openNewActivatedTab();

 
 

-private:
-    DolphinMainWindow(int id);
-    void init();
+    /**
+     * Opens a new tab in the background showing the URL \a url.
+     */
+    void openNewTab(const QUrl& url);

 
     /**
 
     /**

-     * Activates the given view, which means that
-     * all menu actions are applied to this view. When
-     * having a split view setup, the nonactive view
-     * is usually shown in darker colors.
+     * Opens the selected folder in a new tab.
+     */
+    void openInNewTab();
+
+    /**
+     * Opens the selected folder in a new window.
+     */
+    void openInNewWindow();
+
+    /**
+     * Indicates in the statusbar that the execution of the command \a command
+     * has been finished.
+     */
+    void showCommand(CommandType command);
+
+    /**
+     * If the URL can be listed, open it in the current view, otherwise
+     * run it through KRun.
+     */
+    void handleUrl(const QUrl& url);
+
+    /**
+     * handleUrl() can trigger a stat job to see if the url can actually
+     * be listed.
+     */
+    void slotHandleUrlStatFinished(KJob* job);
+
+    /**
+     * Is invoked when the write state of a folder has been changed and
+     * enables/disables the "Create New..." menu entry.
+     */
+    void slotWriteStateChanged(bool isFolderWritable);
+
+    /**
+     * Opens the context menu on the current mouse position.
+     * @pos           Position in screen coordinates.
+     * @item          File item context. If item is null, the context menu
+     *                should be applied to \a url.
+     * @url           URL which contains \a item.
+     * @customActions Actions that should be added to the context menu,
+     *                if the file item is null.

      */
      */

-    void setActiveViewContainer(DolphinViewContainer* view);
+    void openContextMenu(const QPoint& pos,
+                         const KFileItem& item,
+                         const QUrl& url,
+                         const QList<QAction*>& customActions);

 
 

+    void updateControlMenu();
+    void updateToolBar();
+    void slotControlButtonDeleted();
+
+    /**
+     * Is called if the user clicked an item in the Places Panel.
+     * Reloads the view if \a url is the current URL already, and changes the
+     * current URL otherwise.
+     */
+    void slotPlaceActivated(const QUrl& url);
+
+    /**
+     * Is called if the another view has been activated by changing the current
+     * tab or activating another view in split-view mode.
+     *
+     * Activates the given view, which means that all menu actions are applied
+     * to this view. When having a split view setup, the nonactive view is
+     * usually shown in darker colors.
+     */
+    void activeViewChanged(DolphinViewContainer* viewContainer);
+
+    void closedTabsCountChanged(unsigned int count);
+
+    /**
+     * Is called if a new tab has been opened or a tab has been closed to
+     * enable/disable the tab actions.
+     */
+    void tabCountChanged(int count);
+
+    /**
+     * Sets the window caption to url.fileName() if this is non-empty,
+     * "/" if the URL is "file:///", and url.protocol() otherwise.
+     */
+    void setUrlAsCaption(const QUrl& url);
+
+    /**
+     * Is called when the view has finished loading the directory.
+     */
+    void slotDirectoryLoadingCompleted();
+
+private:

     void setupActions();
     void setupDockWidgets();
     void setupActions();
     void setupDockWidgets();

-    void updateHistory();

     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();
+
+    void createControlButton();
+    void deleteControlButton();
+
+    /**
+     * Adds the action \p action to the menu \p menu in
+     * case if it has not added already to the toolbar.
+     * @return True if the action has been added to the menu.
+     */
+    bool addActionToMenu(QAction* action, QMenu* menu);

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

-     * the index \a viewIndex with the corresponding slots of
+     * the DolphinViewContainer \a container with the corresponding slots of

      * the DolphinMainWindow. This method must be invoked each
      * time a DolphinView has been created.
      */
      * the DolphinMainWindow. This method must be invoked each
      * time a DolphinView has been created.
      */

-    void connectViewSignals(int viewIndex);
+    void connectViewSignals(DolphinViewContainer* container);

 
     /**
      * Updates the text of the split action:
 
     /**
      * Updates the text of the split action:


@@ -461,49 +458,47 @@ private:
      */
     void updateSplitAction();
 
      */
     void updateSplitAction();
 

-    /**
-     * Helper method for the slots toggleDateInfo(), toggleSizeInfo()
-     * and toggleMimeInfo(). Applies \a info dependent from the  current
-     * checked state of the action \a actionName to the file item delegate.
-     */
-    void toggleAdditionalInfo(const char* actionName,
-                              KFileItemDelegate::Information info);
+    bool isKompareInstalled() const;

 
 

-private:

     /**
     /**

-     * DolphinMainWindow supports up to two views beside each other.
+     * Creates an action for showing/hiding a panel, that is accessible
+     * in "Configure toolbars..." and "Configure shortcuts...". This is necessary
+     * as the action for toggling the dock visibility is done by Qt which
+     * is no KAction instance.

      */
      */

-    enum ViewIndex
-    {
-        PrimaryView = 0,   ///< View shown on the left side of the main window.
-        SecondaryView = 1  ///< View shown on the left side of the main window.
-    };
+    void createPanelAction(const QIcon &icon,
+                           const QKeySequence& shortcut,
+                           QAction* dockAction,
+                           const QString& actionName);

 
 

+private:

     /**
      * Implements a custom error handling for the undo manager. This
      * assures that all errors are shown in the status bar of Dolphin
      * instead as modal error dialog with an OK button.
      */
     /**
      * Implements a custom error handling for the undo manager. This
      * assures that all errors are shown in the status bar of Dolphin
      * instead as modal error dialog with an OK button.
      */

-    class UndoUiInterface : public KonqFileUndoManager::UiInterface
+    class UndoUiInterface : public KIO::FileUndoManager::UiInterface

     {
     public:
     {
     public:

-        UndoUiInterface(DolphinMainWindow* mainWin);
+        UndoUiInterface();

         virtual ~UndoUiInterface();
         virtual ~UndoUiInterface();

-        virtual void jobError(KIO::Job* job);
-
-    private:
-        DolphinMainWindow* m_mainWin;
+        virtual void jobError(KIO::Job* job) Q_DECL_OVERRIDE;

     };
 
     };
 

-    KNewMenu* m_newMenu;
-    QSplitter* m_splitter;
+    KNewFileMenu* m_newFileMenu;
+    DolphinTabWidget* m_tabWidget;

     DolphinViewContainer* m_activeViewContainer;
     int m_id;
 
     DolphinViewContainer* m_activeViewContainer;
     int m_id;
 

-    DolphinViewContainer* m_viewContainer[SecondaryView + 1];
+    DolphinViewActionHandler* m_actionHandler;
+    DolphinRemoteEncoding* m_remoteEncoding;
+    QPointer<DolphinSettingsDialog> m_settingsDialog;

 
 

-    /// remember pending undo operations until they are finished
-    QList<KonqFileUndoManager::CommandType> m_undoCommandTypes;
+    // Members for the toolbar menu that is shown when the menubar is hidden:
+    QToolButton* m_controlButton;
+    QTimer* m_updateToolBarTimer;
+
+    KIO::Job* m_lastHandleUrlStatJob;

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


@@ -511,14 +506,9 @@ inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
     return m_activeViewContainer;
 }
 
     return m_activeViewContainer;
 }
 

-inline bool DolphinMainWindow::isSplit() const
-{
-    return m_viewContainer[SecondaryView] != 0;
-}
-
-inline KNewMenu* DolphinMainWindow::newMenu() const
+inline KNewFileMenu* DolphinMainWindow::newFileMenu() const

 {
 {

-    return m_newMenu;
+    return m_newFileMenu;

 }
 
 inline int DolphinMainWindow::getId() const
 }
 
 inline int DolphinMainWindow::getId() const