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/dolphinsettingsdialog.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/dolphinsettingsdialog.cpp') diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp index e3561af48..9cfee7d4e 100644 --- a/src/dolphinsettingsdialog.cpp +++ b/src/dolphinsettingsdialog.cpp @@ -24,19 +24,21 @@ #include "generalsettingspage.h" #include "viewsettingspage.h" #include "bookmarkssettingspage.h" -#include "dolphin.h" +#include "dolphinapplication.h" +#include "dolphinmainwindow.h" //Added by qt3to4: #include -DolphinSettingsDialog::DolphinSettingsDialog() : - KPageDialog() +DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) : + KPageDialog(), + m_mainWindow(mainWindow) { setFaceType( List); setCaption(i18n("Dolphin Preferences")); setButtons(Ok|Apply|Cancel); setDefaultButton(Ok); - m_generalSettingsPage = new GeneralSettingsPage(this); + m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this); KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage, i18n("General")); generalSettingsFrame->setIcon(KIcon("exec")); @@ -66,7 +68,7 @@ void DolphinSettingsDialog::applySettings() m_generalSettingsPage->applySettings(); m_viewSettingsPage->applySettings(); m_bookmarksSettingsPage->applySettings(); - Dolphin::mainWin().refreshViews(); + DolphinApplication::app()->refreshMainWindows(); } #include "dolphinsettingsdialog.moc" -- cgit v1.3