r18124 by fschmid - Fixed Bug #11407: PDF checker dont activate correct layer on frame selection, additional fixes.

[scribus-commit]

Author: fschmid
Date: Sun Feb  3 09:15:59 2013
New Revision: 18124

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18124
Log:
Fixed Bug #11407: PDF checker dont activate correct layer on frame selection, additional fixes.

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

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18124&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Feb  3 09:15:59 2013
@@ -9555,6 +9555,8 @@
 		NoFrameEdit();
 	view->Deselect(true);
 	rebuildLayersList();
+	layerPalette->rebuildList();
+	layerPalette->markActiveLayer();
 	view->updateLayerMenu();
 	view->setLayerMenuText(doc->activeLayerName());
 	view->DrawNew();

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18124&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Sun Feb  3 09:15:59 2013
@@ -554,18 +554,21 @@
 	currDoc->setLayerVisible(layerID, !currDoc->layerVisible(layerID));
 	currDoc->scMW()->showLayer();
 	currDoc->scMW()->layerPalette->rebuildList();
+	currDoc->scMW()->layerPalette->markActiveLayer();
 }
 
 void OutlinePalette::setLayerLocked(int layerID)
 {
 	currDoc->setLayerLocked(layerID, !currDoc->layerLocked(layerID));
 	currDoc->scMW()->layerPalette->rebuildList();
+	currDoc->scMW()->layerPalette->markActiveLayer();
 }
 
 void OutlinePalette::setLayerPrintable(int layerID)
 {
 	currDoc->setLayerPrintable(layerID, !currDoc->layerPrintable(layerID));
 	currDoc->scMW()->layerPalette->rebuildList();
+	currDoc->scMW()->layerPalette->markActiveLayer();
 }
 
 void OutlinePalette::slotRenameItem()
@@ -936,6 +939,8 @@
 			if (!currDoc->masterPageMode())
 				emit selectMasterPage(item->PageItemObject->OnMasterPage);
 			pgItem = item->PageItemObject;
+			currDoc->setActiveLayer(pgItem->LayerID);
+			m_MainWindow->changeLayer(currDoc->activeLayer());
 			if (item->PageItemObject->isGroup())
 				emit selectElementByItem(pgItem, false);
 			else
@@ -953,6 +958,8 @@
 		case 4:
 			pgItem = item->PageItemObject;
 			m_MainWindow->closeActiveWindowMasterPageEditor();
+			currDoc->setActiveLayer(pgItem->LayerID);
+			m_MainWindow->changeLayer(currDoc->activeLayer());
 			if (pgItem->isGroup())
 				emit selectElementByItem(pgItem, false);
 			else