r23236 by jghali - #15835: "Slashed Zero" needs to be automatically disabled if the font feature "Old Style" has been selected

[scribus-commit]

Author: jghali
Date: Sun Oct  6 11:19:05 2019
New Revision: 23236

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23236
Log:
#15835: "Slashed Zero" needs to be automatically disabled if the font feature "Old Style" has been selected

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

Modified: trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23236&path=/trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_fontfeatures.cpp	Sun Oct  6 11:19:05 2019
@@ -58,6 +58,7 @@
 	QStringList fontFeatures = s.split(',');
 	ContextualCheck->setChecked(true);
 	CommonCheck->setChecked(true);
+	SlashedZeroCheck->setEnabled(true);
 	for (int i = 0; i < fontFeatures.count(); i++)
 	{
 		if (fontFeatures[i] == "-clig")
@@ -141,6 +142,11 @@
 		else if (fontFeatures[i] == "+ss20")
 			StyleSet20->setChecked(true);
 	}
+	if (OldStyleRadio->isChecked())
+	{
+		SlashedZeroCheck->setChecked(false);
+		SlashedZeroCheck->setEnabled(false);
+	}
 }
 
 void PropertyWidget_FontFeatures::handleFontFeatures()