r14658 by cbradney - Adjust parents of new prefs panes, dont quit when prefs dialog is open

[scribus-commit]

Revision: 14658
Author: cbradney
Date: 2010-02-07T23:52:11.073917Z
Commit message: Adjust parents of new prefs panes, dont quit when prefs dialog is open

Changeset: 
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/ui/preferencesdialog.cpp

Diffs:
Index: scribus/ui/preferencesdialog.cpp
===================================================================
--- scribus/ui/preferencesdialog.cpp	(revision 14657)
+++ scribus/ui/preferencesdialog.cpp	(revision 14658)
@@ -31,49 +31,49 @@
 	setupListWidget();
 	while (prefsStackWidget->currentWidget()!=0)
 		prefsStackWidget->removeWidget(prefsStackWidget->currentWidget());
-	prefs_UserInterface = new Prefs_UserInterface(this);
+	prefs_UserInterface = new Prefs_UserInterface(prefsStackWidget);
 	addItem( tr("User Interface"), loadIcon("scribus.png"), prefs_UserInterface);
-	prefs_Paths = new Prefs_Paths(this);
+	prefs_Paths = new Prefs_Paths(prefsStackWidget);
 	addItem( tr("Paths"), loadIcon("tools.png"), prefs_Paths);
-	prefs_DocumentSetup = new Prefs_DocumentSetup(this);
+	prefs_DocumentSetup = new Prefs_DocumentSetup(prefsStackWidget);
 	addItem( tr("Document Setup"), loadIcon("scribusdoc.png"), prefs_DocumentSetup);
-	prefs_Guides = new Prefs_Guides(this);
+	prefs_Guides = new Prefs_Guides(prefsStackWidget);
 	addItem( tr("Guides"), loadIcon("guides.png"), prefs_Guides);
-	prefs_Typography = new Prefs_Typography(this);
+	prefs_Typography = new Prefs_Typography(prefsStackWidget);
 	addItem( tr("Typography"), loadIcon("typography.png"), prefs_Typography);
-	prefs_ItemTools = new Prefs_ItemTools(this);
+	prefs_ItemTools = new Prefs_ItemTools(prefsStackWidget);
 	addItem( tr("Item Tools"), loadIcon("tools.png"), prefs_ItemTools);
-	prefs_OperatorTools = new Prefs_OperatorTools(this);
+	prefs_OperatorTools = new Prefs_OperatorTools(prefsStackWidget);
 	addItem( tr("Operator Tools"), loadIcon("tools.png"), prefs_OperatorTools);
-	prefs_Hyphenator = new Prefs_Hyphenator(this);
+	prefs_Hyphenator = new Prefs_Hyphenator(prefsStackWidget);
 	addItem( tr("Hyphenator"), loadIcon("hyphenate.png"), prefs_Hyphenator);
-	prefs_Fonts = new Prefs_Fonts(this);
+	prefs_Fonts = new Prefs_Fonts(prefsStackWidget);
 	addItem( tr("Fonts"), loadIcon("font.png"), prefs_Fonts);
-	prefs_ColorManagement = new Prefs_ColorManagement(this);
+	prefs_ColorManagement = new Prefs_ColorManagement(prefsStackWidget);
 	addItem( tr("Color Management"), loadIcon("blend.png"), prefs_ColorManagement);
-	prefs_Printer = new Prefs_Printer(this);
+	prefs_Printer = new Prefs_Printer(prefsStackWidget);
 	addItem( tr("Printer"), loadIcon("printer.png"), prefs_Printer);
-	prefs_PDFExport = new Prefs_PDFExport(this);
+	prefs_PDFExport = new Prefs_PDFExport(prefsStackWidget);
 	addItem( tr("PDF Export"), loadIcon("acroread32.png"), prefs_PDFExport);
-	prefs_PreflightVerifier = new Prefs_PreflightVerifier(this);
+	prefs_PreflightVerifier = new Prefs_PreflightVerifier(prefsStackWidget);
 	addItem( tr("Preflight Verifier"), loadIcon("checkdoc.png"), prefs_PreflightVerifier);
-	prefs_DocumentItemAttributes = new Prefs_DocumentItemAttributes(this);
+	prefs_DocumentItemAttributes = new Prefs_DocumentItemAttributes(prefsStackWidget);
 	addItem( tr("Document Item Attributes"), loadIcon("docattributes.png"), prefs_DocumentItemAttributes);
-	prefs_TableOfContents = new Prefs_TableOfContents(this);
+	prefs_TableOfContents = new Prefs_TableOfContents(prefsStackWidget);
 	addItem( tr("Tables of Contents"), loadIcon("tabtocindex.png"), prefs_TableOfContents);
-	prefs_KeyboardShortcuts = new Prefs_KeyboardShortcuts(this);
+	prefs_KeyboardShortcuts = new Prefs_KeyboardShortcuts(prefsStackWidget);
 	addItem( tr("Keyboard Shortcuts"), loadIcon("key_bindings.png"), prefs_KeyboardShortcuts);
-	prefs_Scrapbook = new Prefs_Scrapbook(this);
+	prefs_Scrapbook = new Prefs_Scrapbook(prefsStackWidget);
 	addItem( tr("Scrapbook"), loadIcon("scrap.png"), prefs_Scrapbook);
-	prefs_Display = new Prefs_Display(this);
+	prefs_Display = new Prefs_Display(prefsStackWidget);
 	addItem( tr("Display"), loadIcon("screen.png"), prefs_Display);
-	prefs_ExternalTools = new Prefs_ExternalTools(this);
+	prefs_ExternalTools = new Prefs_ExternalTools(prefsStackWidget);
 	addItem( tr("External Tools"), loadIcon("externaltools.png"), prefs_ExternalTools);
-	prefs_Miscellaneous = new Prefs_Miscellaneous(this);
+	prefs_Miscellaneous = new Prefs_Miscellaneous(prefsStackWidget);
 	addItem( tr("Miscellaneous"), loadIcon("misc.png"), prefs_Miscellaneous);
-	prefs_Plugins = new Prefs_Plugins(this);
+	prefs_Plugins = new Prefs_Plugins(prefsStackWidget);
 	addItem( tr("Plugins"), loadIcon("plugins.png"), prefs_Plugins);
-	prefs_ImageCache = new Prefs_ImageCache(this);
+	prefs_ImageCache = new Prefs_ImageCache(prefsStackWidget);
 	addItem( tr("Image Cache"), loadIcon("tools.png"), prefs_ImageCache);
 
 	arrangeIcons();
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 14657)
+++ scribus/scribus.cpp	(revision 14658)
@@ -1591,8 +1591,9 @@
 {
 	//Do not quit if Preferences or new doc window is open
 	Preferences *prefsWin = findChild<Preferences *>(QString::fromLocal8Bit("PreferencesWindow"));
+	PreferencesDialog *prefsDialog = findChild<PreferencesDialog *>(QString::fromLocal8Bit("PreferencesDialog"));
 	NewDoc *newDocWin = findChild<NewDoc *>(QString::fromLocal8Bit("NewDocumentWindow"));
-	if (prefsWin!=NULL || newDocWin!=NULL)
+	if (prefsWin!=NULL || prefsDialog!=NULL || newDocWin!=NULL)
 	{
 		ce->ignore();
 		return;