r16560 by fschmid - Fixed problems when switching document windows with the new ScDockWindows code. Seems to appear only with Qt-4.72

[scribus-commit]

Author: fschmid
Date: Sat Apr  9 10:02:48 2011
New Revision: 16560

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16560
Log:
Fixed problems when switching document windows with the new ScDockWindows code. Seems to appear only with Qt-4.72

Modified:
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/propertiespalette.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16560&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Apr  9 10:02:48 2011
@@ -3046,6 +3046,7 @@
 		scrActions["itemAttachTextToPath"]->setEnabled(false);
 		scrActions["itemCombinePolygons"]->setEnabled(false);
 	}
+
 	if (docSelectionCount != 0)
 	{
 		actionManager->setPDFActions(view);
@@ -3128,8 +3129,8 @@
 		actionManager->connectNewSelectionActions(view, doc);
 // 		propertiesPalette->handleSelectionChanged();
 	}
-	else
-		propertiesPalette->handleSelectionChanged();
+//	else
+//		propertiesPalette->handleSelectionChanged();
 
 	PluginManager& pluginManager(PluginManager::instance());
 	QStringList pluginNames(pluginManager.pluginNames(false));
@@ -4022,6 +4023,8 @@
 		else
 			w->show();
 		view->show();
+		// Seems to fix crash on loading
+		ActWin = NULL;
 		newActWin(w->getSubWin());
 		doc->setCurrentPage(doc->DocPages.at(0));
 		view->cmsToolbarButton->setChecked(doc->HasCMS);

Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16560&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Sat Apr  9 10:02:48 2011
@@ -75,13 +75,13 @@
 	m_haveItem = false;
 	m_unitRatio = 1.0;
 
-	//setObjectName(QString::fromLocal8Bit("PropertiesPalette"));
+	setObjectName(QString::fromLocal8Bit("PropertiesPalette"));
 	setSizePolicy( QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum));
 
-	MpalLayout = new QVBoxLayout();
-	MpalLayout->setMargin(5);
-	MpalLayout->setSpacing(1);
-	setLayout(MpalLayout);
+//	MpalLayout = new QVBoxLayout();
+//	MpalLayout->setMargin(5);
+//	MpalLayout->setSpacing(1);
+//	setLayout(MpalLayout);
 
 	QFont f(font());
 	f.setPointSize(f.pointSize()-1);
@@ -175,7 +175,7 @@
 	pageLayout_7->addWidget( Tpal );
 	idTransparencyItem = TabStack->addItem(page_7, "&Transparency" );
 
-	MpalLayout->addWidget( TabStack );
+//	MpalLayout->addWidget( TabStack );
 
 	setWidget( TabStack );