From f31a541925033c2ef5e27b85c099d47791b50121 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 29 Nov 2006 00:02:19 +0000 Subject: Make it (almost) possible to have more than one Dolphin KMainWindow Create a DolphinApplication, holding DolphinMainWindows and update the code to use the DolphinView to get the MainWindow, or get a ptr to the MainWindow directly. Or if all windows are effected go through the DolphinApplication to update every mainwindow. The UndowManager and ProgressIndicator have a rather strange relationship and will need some more attention but as UndoManager will be killed anyway I have skipped this. More cleanup, debugging and thinking is needed. svn path=/trunk/playground/utils/dolphin/; revision=608945 --- src/urlnavigator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/urlnavigator.cpp') diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp index ae2e06cbd..bc2c5914e 100644 --- a/src/urlnavigator.cpp +++ b/src/urlnavigator.cpp @@ -51,7 +51,7 @@ #include #include "bookmarkselector.h" -#include "dolphin.h" +#include "dolphinmainwindow.h" #include "dolphinsettings.h" #include "dolphinstatusbar.h" #include "dolphinview.h" @@ -470,7 +470,7 @@ void UrlNavigator::updateContent() QToolTip::remove(m_toggleButton); QString path(url().pathOrUrl()); - const KAction* action = Dolphin::mainWin().actionCollection()->action("editable_location"); + const KAction* action = dolphinView()->mainWindow()->actionCollection()->action("editable_location"); // TODO: registry of default shortcuts QString shortcut = action? action->shortcut().toString() : "Ctrl+L"; if (m_toggleButton->isChecked()) { -- cgit v1.3