r19521 by jghali - #12719: Illogical behaviour of Extended Image Properties dialog with multi-layered PSD files

[scribus-commit]

Author: jghali
Date: Sun Sep 21 21:34:59 2014
New Revision: 19521

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19521
Log:
#12719: Illogical behaviour of Extended Image Properties dialog with multi-layered PSD files

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

Modified: trunk/Scribus/scribus/ui/extimageprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19521&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp (original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp Sun Sep 21 21:34:59 2014
@@ -304,6 +304,9 @@
 	connect(cancelButton, SIGNAL(clicked()), this, SLOT(leaveCancel()));
 	if (info->layerInfo.count() != 0)
 	{
+		layerTable->selectionModel()->clearSelection();
+		opacitySpinBox->setEnabled(false);
+		blendMode->setEnabled(false);
 		connect(layerTable, SIGNAL(cellClicked(int, int)), this, SLOT(selLayer(int)));
 		connect(opacitySpinBox, SIGNAL(valueChanged(double)), this, SLOT(changedLayer()));
 		connect(blendMode, SIGNAL(activated(int)), this, SLOT(changedLayer()));
@@ -418,6 +421,9 @@
 
 void ExtImageProps::selLayer(int layer)
 {
+	opacitySpinBox->setEnabled(true);
+	blendMode->setEnabled(true);
+
 	disconnect(opacitySpinBox, SIGNAL(valueChanged(double)), this, SLOT(changedLayer()));
 	disconnect(blendMode, SIGNAL(activated(int)), this, SLOT(changedLayer()));
 	if ((currentItem->pixm.imgInfo.isRequest) && (currentItem->pixm.imgInfo.RequestProps.contains(layerTable->rowCount() - layer - 1)))