r20480 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Wed Oct 21 17:42:01 UTC 2015


Author: jghali
Date: Wed Oct 21 17:42:01 2015
New Revision: 20480

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20480
Log:
fix layer blend mode not being preserved on language change

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

Modified: trunk/Scribus/scribus/ui/layers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20480&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp	(original)
+++ trunk/Scribus/scribus/ui/layers.cpp	Wed Oct 21 17:42:01 2015
@@ -635,6 +635,10 @@
 {
 	setWindowTitle( tr( "Layers" ) );
 	textLabel1->setText( tr( "Blend Mode:" ) );
+
+	int  oldBlendMode = blendMode->currentIndex();
+	bool blendModeBlocked = blendMode->blockSignals(true);
+
 	blendMode->clear();
 	blendMode->addItem( tr("Normal"));
 	blendMode->addItem( tr("Darken"));
@@ -652,6 +656,10 @@
 	blendMode->addItem( tr("Saturation"));
 	blendMode->addItem( tr("Color"));
 	blendMode->addItem( tr("Luminosity"));
+
+	blendMode->setCurrentIndex(oldBlendMode);
+	blendMode->blockSignals(blendModeBlocked);
+
 	textLabel2->setText( tr( "Opacity:" ) );
 	opacitySpinBox->setSuffix( tr(" %"));
 	Table->horizontalHeaderItem(6)->setText( tr("Name"));




More information about the scribus-commit mailing list