First big step to make it possible that the DolphinView can be embedded as KPart into Konqueror (discussed with David Faure). A lot of refactoring of the DolphinView has been done:

- The DolphinView does not contain the URL navigator, the filterbar and the statusbar anymore. Those widgets have been moved to DolphinViewContainer.
- The DolphinView does not contain any reference to the main window anymore.

Currently there are some minor regressions (the statusbar shows less informations, renaming has been deactivated), but they will get fixed during the next days. Also still a lot of interface cleanups must be done, but let's just do it step by step...

svn path=/trunk/KDE/kdebase/apps/; revision=672692

1 files changed, 14 insertions, 10 deletions

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 6838b61b0..c4e303be3 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -32,6 +32,7 @@
 #include <QtCore/QList>
 
 class DolphinApplication;
+class DolphinViewContainer;
 class KNewMenu;
 class KUrl;
 class QSplitter;
@@ -52,20 +53,20 @@ public:
     virtual ~DolphinMainWindow();
 
     /**
-        * 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 setActiveView(DolphinView* view);
+     * 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 setActiveView(DolphinViewContainer* view);
 
     /**
      * Returns the currently active view. See
      * DolphinMainWindow::setActiveView() for more details.
      */
-    DolphinView* activeView() const
+    DolphinViewContainer* activeViewContainer() const
     {
-        return m_activeView;
+        return m_activeViewContainer;
     }
 
     /** Renames the item represented by \a oldUrl to \a newUrl. */
@@ -406,6 +407,9 @@ private slots:
     /** Open a new main window. */
     void openNewMainWindow();
 
+    /** Toggles the active view if two views are shown within the main window. */
+    void toggleActiveView();
+
 private:
     DolphinMainWindow(int id);
     void init();
@@ -468,10 +472,10 @@ class UndoUiInterface : public KonqUndoManager::UiInterface
 
     KNewMenu* m_newMenu;
     QSplitter* m_splitter;
-    DolphinView* m_activeView;
+    DolphinViewContainer* m_activeViewContainer;
     int m_id;
 
-    DolphinView* m_view[SecondaryIdx + 1];
+    DolphinViewContainer* m_viewContainer[SecondaryIdx + 1];
 
     /// remember pending undo operations until they are finished
     QList<KonqUndoManager::CommandType> m_undoCommandTypes;