r16997 by fschmid - Fixed Bug 10282: "masterpage window doesnt remember its position"

[scribus-commit]

Author: fschmid
Date: Sun Nov 20 18:47:03 2011
New Revision: 16997

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16997
Log:
Fixed Bug 10282: "masterpage window doesnt remember its position"

Modified:
    trunk/Scribus/scribus/ui/masterpagepalette.cpp
    trunk/Scribus/scribus/ui/masterpagepalette.h

Modified: trunk/Scribus/scribus/ui/masterpagepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16997&path=/trunk/Scribus/scribus/ui/masterpagepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/masterpagepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/masterpagepalette.cpp Sun Nov 20 18:47:03 2011
@@ -33,12 +33,7 @@
 #include "selection.h"
 #include "util_icon.h"
 
-MasterPagesPalette::MasterPagesPalette( QWidget* parent, ScribusDoc *pCurrentDoc, ScribusView *pCurrentView, QString masterPageName)
-#if QT_VERSION >= 0x040500
-	: QDialog( parent, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint)
-#else
-	: QDialog( parent, Qt::Tool | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowSystemMenuHint | Qt::WindowType(0x08000000))
-#endif
+MasterPagesPalette::MasterPagesPalette( QWidget* parent, ScribusDoc *pCurrentDoc, ScribusView *pCurrentView, QString masterPageName) : ScrPaletteBase( parent, "MasterPages", false, 0 )
 {
 	setAttribute(Qt::WA_DeleteOnClose);
 	setModal(false);
@@ -112,6 +107,7 @@
 void MasterPagesPalette::closeEvent(QCloseEvent *closeEvent)
 {
 	emit finished();
+	hide();
 	closeEvent->accept();
 }
 

Modified: trunk/Scribus/scribus/ui/masterpagepalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16997&path=/trunk/Scribus/scribus/ui/masterpagepalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/masterpagepalette.h (original)
+++ trunk/Scribus/scribus/ui/masterpagepalette.h Sun Nov 20 18:47:03 2011
@@ -7,8 +7,6 @@
 #ifndef MUSTERPAGES_H
 #define MUSTERPAGES_H
 
-#include <QDialog>
-
 class QCloseEvent;
 class QHBoxLayout;
 class QListWidget;
@@ -17,13 +15,14 @@
 class QVBoxLayout;
 
 #include "scribusapi.h"
+#include "scrpalettebase.h"
 class ScribusDoc;
 class ScribusView;
 
 
 /*! \brief A dialog to manage/edit Master Pages
 */
-class SCRIBUS_API MasterPagesPalette : public QDialog
+class SCRIBUS_API MasterPagesPalette : public ScrPaletteBase
 {
 	Q_OBJECT