diff options
| author | Holger Freyther <[email protected]> | 2006-11-29 00:02:19 +0000 |
|---|---|---|
| committer | Holger Freyther <[email protected]> | 2006-11-29 00:02:19 +0000 |
| commit | f31a541925033c2ef5e27b85c099d47791b50121 (patch) | |
| tree | 11cc728aa7d247ca5b075776c438be0f381be765 /src/generalsettingspage.cpp | |
| parent | 68e81f7280c810e26cabf6cd2897b9dc8466f458 (diff) | |
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
Diffstat (limited to 'src/generalsettingspage.cpp')
| -rw-r--r-- | src/generalsettingspage.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index d7b72aa6a..d858906cb 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -38,12 +38,13 @@ #include <kvbox.h> #include "dolphinsettings.h" -#include "dolphin.h" +#include "dolphinmainwindow.h" #include "dolphinview.h" #include "generalsettings.h" -GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) : +GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* parent) : SettingsPageBase(parent), + m_mainWindow(mainWin), m_homeUrl(0), m_startSplit(0), m_startEditable(0) @@ -158,7 +159,7 @@ void GeneralSettingsPage::selectHomeUrl() void GeneralSettingsPage::useCurrentLocation() { - const DolphinView* view = Dolphin::mainWin().activeView(); + const DolphinView* view = m_mainWindow->activeView(); m_homeUrl->setText(view->url().prettyUrl()); } |
