Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index bdc80b35909dd30068f1df5c5239d130c3d45aab..c7a06c00a9e67f9c5c22888709592cb47564f2b3 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,34 +22,34 @@
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 

-#include "dolphinview.h"
-#include "panels/panel.h"
+#include <config-baloo.h>

 
 

-#include <config-nepomuk.h>
-
-#include <kfileitemdelegate.h>

 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>

-#include <kactionmenu.h>
+#include <QIcon>
+#include <QUrl>

 
 

-#include <QtCore/QList>
+#include <QList>
+#include <QPointer>

 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 

-class KAction;

 class DolphinViewActionHandler;
 class DolphinViewActionHandler;

-class DolphinApplication;
-class DolphinSearchBox;
-class DolphinSearchOptionsConfigurator;

 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;

-class KNewMenu;
-class KTabBar;
-class KUrl;
-class QSplitter;
+class DolphinTabWidget;
+class KFileItem;
+class KFileItemList;

 class KJob;
 class KJob;

+class KNewFileMenu;
+class QToolButton;
+class QIcon;
+class PlacesPanel;
+#ifndef Q_OS_WIN
+class TerminalPanel;
+#endif

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


@@ -61,10 +61,10 @@ 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:

-    virtual ~DolphinMainWindow();
+    DolphinMainWindow();
+    ~DolphinMainWindow() override;

 
     /**
      * Returns the currently active view.
 
     /**
      * Returns the currently active view.


@@ -75,53 +75,26 @@ public:
     DolphinViewContainer* activeViewContainer() const;
 
     /**
     DolphinViewContainer* activeViewContainer() const;
 
     /**

-     * Opens each directory \p in a separate tab. If the "split view"
-     * option is enabled, 2 directories are collected within one tab.
-     */
-    void openDirectories(const QList<KUrl>& dirs);
-
-    /**
-     * Opens the directory which contains the files \p files
-     * and selects all files (implements the --select option
-     * of Dolphin).
-     */
-    void openFiles(const QList<KUrl>& files);
-
-    /**
-     * 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;

 
 

-    /**
-     * Returns the 'Show Menubar' action which can be shared with
-     * other menus (e. g. a context menu).
-     */
-    KAction* showMenuBarAction() const;
+    void setTabsToHomeIfMountPathOpen(const QString& mountPath);

 
 public slots:
     /**
 
 public slots:
     /**


@@ -141,7 +114,14 @@ public slots:
      * Inform all affected dolphin components (panels, views) of an URL
      * change.
      */
      * Inform all affected dolphin components (panels, views) of an URL
      * change.
      */

-    void changeUrl(const KUrl& url);
+    void changeUrl(const QUrl& url);
+
+    /**
+     * 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 slotTerminalDirectoryChanged(const QUrl& url);

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


@@ -157,7 +137,7 @@ 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 panel.
 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the panel.


@@ -165,20 +145,31 @@ signals:
      */
     void requestItemInfo(const KFileItem& item);
 
      */
     void requestItemInfo(const KFileItem& item);
 

+    /**
+     * Is emitted if the settings have been changed.
+     */
+    void settingsChanged();
+

 protected:
     /** @see QWidget::showEvent() */
 protected:
     /** @see QWidget::showEvent() */

-    virtual void showEvent(QShowEvent* event);
+    void showEvent(QShowEvent* event) override;

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

-    virtual void closeEvent(QCloseEvent* event);
+    void closeEvent(QCloseEvent* event) override;

 
     /** @see KMainWindow::saveProperties() */
 
     /** @see KMainWindow::saveProperties() */

-    virtual void saveProperties(KConfigGroup& group);
+    void saveProperties(KConfigGroup& group) override;

 
     /** @see KMainWindow::readProperties() */
 
     /** @see KMainWindow::readProperties() */

-    virtual void readProperties(const KConfigGroup& group);
+    void readProperties(const KConfigGroup& group) override;

 
 private slots:
 
 private slots:

+    /**
+     * Refreshes the views of the main window by recreating them according to
+     * the given Dolphin settings.
+     */
+    void refreshViews();
+

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


@@ -191,13 +182,10 @@ private slots:
 
     /**
      * 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);
 

-    /** Invoked when an action in the recent tabs menu is clicked. */
-    void restoreClosedTab(QAction* action);
-

     /** Sets the text of the 'Undo' menu action to \a text. */
     void slotUndoTextChanged(const QString& text);
 
     /** Sets the text of the 'Undo' menu action to \a text. */
     void slotUndoTextChanged(const QString& text);
 


@@ -216,8 +204,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();


@@ -235,20 +226,23 @@ private slots:
     /**
      * 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();
 

-    /**
-     * Toggles between showing and hiding of the filter bar
-     */
-    void toggleFilterBarVisibility(bool show);
+    void enableStopAction();
+    void disableStopAction();
+
+    void showFilterBar();

 
     /**
      * Toggles between edit and browse mode of the navigation bar.
 
     /**
      * Toggles between edit and browse mode of the navigation bar.


@@ -262,7 +256,12 @@ private slots:
      */
     void replaceLocation();
 
      */
     void replaceLocation();
 

-    /** Goes back on step of the URL history. */
+    /**
+     * Toggles the state of the panels between a locked and unlocked layout.
+     */
+    void togglePanelLockState();
+
+    /** 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. */


@@ -271,26 +270,20 @@ private slots:
     /** Goes up one hierarchy of the current URL. */
     void goUp();
 
     /** Goes up one hierarchy of the current URL. */
     void goUp();
 

-    /**
-     * Open the previous URL in the URL history in a new tab
-     * if the middle mouse button is clicked.
-     */
-    void goBack(Qt::MouseButtons buttons);
+    /** Changes the location to the home URL. */
+    void goHome();

 
 

-    /**
-     * Open the next URL in the URL history in a new tab
-     * if the middle mouse button is clicked.
-     */
-    void goForward(Qt::MouseButtons buttons);
+    /** Open the previous URL in the URL history in a new tab. */
+    void goBackInNewTab();

 
 

-    /**
-     * 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);
+    /** Open the next URL in the URL history in a new tab. */
+    void goForwardInNewTab();

 
 

-    /** Goes to the home URL. */
-    void goHome();
+    /** Open the URL one hierarchy above the current URL in a new tab. */
+    void goUpInNewTab();
+
+    /** * Open the home URL in a new tab. */
+    void goHomeInNewTab();

 
     /** Opens Kompare for 2 selected files. */
     void compareFiles();
 
     /** Opens Kompare for 2 selected files. */
     void compareFiles();


@@ -316,12 +309,6 @@ private slots:
      */
     void slotSelectionChanged(const KFileItemList& selection);
 
      */
     void slotSelectionChanged(const KFileItemList& selection);
 

-    /** Enables changing of tabs via mouse wheel. */
-    void slotWheelMoved(int wheelDelta);
-
-    /** Emits the signal requestItemInfo(). */
-    void slotRequestItemInfo(const KFileItem&);
-

     /**
      * Updates the state of the 'Back' and 'Forward' menu
      * actions corresponding to the current history.
     /**
      * Updates the state of the 'Back' and 'Forward' menu
      * actions corresponding to the current history.


@@ -334,17 +321,16 @@ private slots:
     /** Open a new main window. */
     void openNewMainWindow();
 
     /** Open a new main window. */
     void openNewMainWindow();
 

-    /** Opens a new view with the current URL that is part of a tab. */
-    void openNewTab();
-

     /**
     /**

-     * Opens a new tab showing the URL \a url.
+     * Opens a new view with the current URL that is part of a tab and
+     * activates it.

      */
      */

-    void openNewTab(const KUrl& url);
+    void openNewActivatedTab();

 
 

-    void activateNextTab();
-
-    void activatePrevTab();
+    /**
+     * Opens a new tab in the background showing the URL \a url.
+     */
+    void openNewTab(const QUrl& url);

 
     /**
      * Opens the selected folder in a new tab.
 
     /**
      * Opens the selected folder in a new tab.


@@ -356,9 +342,6 @@ private slots:
      */
     void openInNewWindow();
 
      */
     void openInNewWindow();
 

-    /** Toggles the active view if two views are shown within the main window. */
-    void toggleActiveView();
-

     /**
      * Indicates in the statusbar that the execution of the command \a command
      * has been finished.
     /**
      * Indicates in the statusbar that the execution of the command \a command
      * has been finished.


@@ -366,109 +349,116 @@ private slots:
     void showCommand(CommandType command);
 
     /**
     void showCommand(CommandType command);
 
     /**

-     * Activates the tab with the index \a index, which means that the current view
-     * is replaced by the view of the given tab.
+     * If the URL can be listed, open it in the current view, otherwise
+     * run it through KRun.

      */
      */

-    void setActiveTab(int index);
-
-    /** Closes the currently active tab. */
-    void closeTab();
+    void handleUrl(const QUrl& url);

 
     /**
 
     /**

-     * Closes the tab with the index \index and activates the tab with index - 1.
+     * handleUrl() can trigger a stat job to see if the url can actually
+     * be listed.

      */
      */

-    void closeTab(int index);
+    void slotHandleUrlStatFinished(KJob* job);

 
     /**
 
     /**

-     * Opens a context menu for the tab with the index \a index
-     * on the position \a pos.
+     * Is invoked when the write state of a folder has been changed and
+     * enables/disables the "Create New..." menu entry.

      */
      */

-    void openTabContextMenu(int index, const QPoint& pos);
+    void slotWriteStateChanged(bool isFolderWritable);

 
     /**
 
     /**

-     * Is connected to the QTabBar signal tabMoved(int from, int to).
-     * Reorders the list of tabs after a tab was moved in the tab bar
-     * and sets m_tabIndex to the new index of the current tab.
+     * 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 slotTabMoved(int from, int to);
+    void openContextMenu(const QPoint& pos,
+                         const KFileItem& item,
+                         const QUrl& url,
+                         const QList<QAction*>& customActions);

 
 

-    /**
-     * Handles a click on a places item: if the middle mouse button is
-     * clicked, a new tab is opened for \a url, otherwise the current
-     * view is replaced by \a url.
-     */
-    void handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons);
+    void updateControlMenu();
+    void updateToolBar();
+    void slotControlButtonDeleted();

 
     /**
 
     /**

-     * Is connected to the KTabBar signal testCanDecode() and adjusts
-     * the output parameter \a accept.
+     * 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 slotTestCanDecode(const QDragMoveEvent* event, bool& accept);
+    void slotPlaceActivated(const QUrl& url);

 
     /**
 
     /**

-     * Is connected with the Dolphin search box and the search configurator
-     * and triggers a Nepomuk search.
+     * 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 searchItems();
+    void activeViewChanged(DolphinViewContainer* viewContainer);
+
+    void closedTabsCountChanged(unsigned int count);

 
     /**
 
     /**

-     * Is connected to the searchbox signal 'requestSearchOptions' and
-     * takes care to show the search options.
+     * Is called if a new tab has been opened or a tab has been closed to
+     * enable/disable the tab actions.

      */
      */

-    void showSearchOptions();
+    void tabCountChanged(int count);

 
     /**
 
     /**

-     * If the URL can be listed open it in the current view, otherwise
-     * run it through KRun.
+     * Sets the window caption to url.fileName() if this is non-empty,
+     * "/" if the URL is "file:///", and url.protocol() otherwise.

      */
      */

-    void handleUrl(const KUrl& url);
+    void setUrlAsCaption(const QUrl& url);

 
     /**
 
     /**

-     * setUrlAsCaption() will trigger a stat job which reports its result in
-     * this slot.
+     * This slot is called when the user requested to unmount a removable media
+     * from the places menu

      */
      */

-    void slotCaptionStatFinished(KJob* job);
+    void slotStorageTearDownFromPlacesRequested(const QString& mountPath);

 
     /**
 
     /**

-     * Is invoked when the write state of a folder has been changed and
-     * enables/disables the "Create New..." menu entry.
+     * This slot is called when the user requested to unmount a removable media
+     * _not_ from the dolphin's places menu (from the notification area for e.g.)
+     * This slot is basically connected to each removable device's
+     * Solid::StorageAccess::teardownRequested(const QString & udi)
+     * signal through the places panel.

      */
      */

-    void slotWriteStateChanged(bool isFolderWritable);
+    void slotStorageTearDownExternallyRequested(const QString& mountPath);

 
     /**
 
     /**

-     * Opens the context menu on the current mouse position.
-     * @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.
+     * Is called when the view has finished loading the directory.

      */
      */

-    void openContextMenu(const KFileItem& item,
-                         const KUrl& url,
-                         const QList<QAction*>& customActions);
-
-private:
-    DolphinMainWindow(int id);
-    void init();
+    void slotDirectoryLoadingCompleted();

 
     /**
 
     /**

-     * 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.
+     * Is called when the user middle clicks a toolbar button.
+     *
+     * Here middle clicking Back/Forward/Up/Home will open the resulting
+     * folder in a new tab.

      */
      */

-    void setActiveViewContainer(DolphinViewContainer* view);
+    void slotToolBarActionMiddleClicked(QAction *action);

 
 

+private:

     void setupActions();
     void setupDockWidgets();
     void updateEditActions();
     void updateViewActions();
     void updateGoActions();
 
     void setupActions();
     void setupDockWidgets();
     void updateEditActions();
     void updateViewActions();
     void updateGoActions();
 

+    void createControlButton();
+    void deleteControlButton();
+

     /**
     /**

-     * Adds the tab[\a index] to the closed tab menu's list of actions.
+     * 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.

      */
      */

-    void rememberClosedTab(int index);
+    bool addActionToMenu(QAction* action, QMenu* menu);

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


@@ -486,27 +476,18 @@ private:
      */
     void updateSplitAction();
 
      */
     void updateSplitAction();
 

-    /** Returns the name of the tab for the URL \a url. */
-    QString tabName(const KUrl& url) const;
-

     bool isKompareInstalled() const;
 
     bool isKompareInstalled() const;
 

-    void createSecondaryView(int tabIndex);
-
-    /**
-     * Helper method for saveProperties() and readProperties(): Returns
-     * the property string for a tab with the index \a tabIndex and
-     * the property \a property.
-     */
-    QString tabProperty(const QString& property, int tabIndex) const;
-

     /**
     /**

-     * Sets the window caption to url.fileName() if this is non-empty,
-     * "/" if the URL is "file:///", and url.protocol() otherwise.
+     * 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.

      */
      */

-    void setUrlAsCaption(const KUrl& url);
-
-    QString squeezedText(const QString& text) const;
+    void createPanelAction(const QIcon &icon,
+                           const QKeySequence& shortcut,
+                           QAction* dockAction,
+                           const QString& actionName);

 
 private:
     /**
 
 private:
     /**


@@ -518,37 +499,30 @@ private:
     {
     public:
         UndoUiInterface();
     {
     public:
         UndoUiInterface();

-        virtual ~UndoUiInterface();
-        virtual void jobError(KIO::Job* job);
+        ~UndoUiInterface() override;
+        void jobError(KIO::Job* job) override;

     };
 
     };
 

-    KNewMenu* m_newMenu;
-    KActionMenu* m_recentTabsMenu;
-    KAction* m_showMenuBar;
-    KTabBar* m_tabBar;
+    KNewFileMenu* m_newFileMenu;
+    DolphinTabWidget* m_tabWidget;

     DolphinViewContainer* m_activeViewContainer;
     DolphinViewContainer* m_activeViewContainer;

-    QVBoxLayout* m_centralWidgetLayout;
-    DolphinSearchBox* m_searchBox;
-    DolphinSearchOptionsConfigurator* m_searchOptionsConfigurator;

     int m_id;
 
     int m_id;
 

-    struct ViewTab
-    {
-        ViewTab() : isPrimaryViewActive(true), primaryView(0), secondaryView(0), splitter(0) {}
-        bool isPrimaryViewActive;
-        DolphinViewContainer* primaryView;
-        DolphinViewContainer* secondaryView;
-        QSplitter* splitter;
-    };
-
-    int m_tabIndex;
-    QList<ViewTab> m_viewTab;
-

     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
     QPointer<DolphinSettingsDialog> m_settingsDialog;
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
     QPointer<DolphinSettingsDialog> m_settingsDialog;
 

-    KJob* m_captionStatJob;
+    // Members for the toolbar menu that is shown when the menubar is hidden:
+    QToolButton* m_controlButton;
+    QTimer* m_updateToolBarTimer;
+
+    KIO::Job* m_lastHandleUrlStatJob;
+
+#ifndef Q_OS_WIN
+    TerminalPanel* m_terminalPanel;
+#endif
+    PlacesPanel* m_placesPanel;
+    bool m_tearDownFromPlacesRequested;

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


@@ -556,19 +530,9 @@ inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
     return m_activeViewContainer;
 }
 
     return m_activeViewContainer;
 }
 

-inline bool DolphinMainWindow::isSplit() const
-{
-    return m_viewTab[m_tabIndex].secondaryView != 0;
-}
-
-inline KNewMenu* DolphinMainWindow::newMenu() const
-{
-    return m_newMenu;
-}
-
-inline KAction* DolphinMainWindow::showMenuBarAction() const
+inline KNewFileMenu* DolphinMainWindow::newFileMenu() const

 {
 {

-    return m_showMenuBar;
+    return m_newFileMenu;

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