Author: jghali
Date: Thu Dec 15 18:55:07 2016
New Revision: 21654
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21654
Log:
#14477: "Replace Colours" dialog use RGB icon for LAB colours
Modified:
trunk/Scribus/scribus/ui/replacecolors.cpp
trunk/Scribus/scribus/ui/replacecolors.h
Modified: trunk/Scribus/scribus/ui/replacecolors.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21654&path=/trunk/Scribus/scribus/ui/replacecolors.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/replacecolors.cpp (original)
+++ trunk/Scribus/scribus/ui/replacecolors.cpp Thu Dec 15 18:55:07 2016
@@ -44,6 +44,7 @@
alertIcon = IconManager::instance()->loadPixmap("alert.png", true);
cmykIcon = IconManager::instance()->loadPixmap("cmyk.png", true);
rgbIcon = IconManager::instance()->loadPixmap("rgb.png", true);
+ labIcon = IconManager::instance()->loadPixmap("lab.png", true);
spotIcon = IconManager::instance()->loadPixmap("spot.png", true);
regIcon = IconManager::instance()->loadPixmap("register.png", true);
replacementTable->horizontalHeader()->setSectionsClickable(false );
@@ -175,8 +176,10 @@
paintAlert(alertIcon, pPixmap, 15, 0);
if (m_color.getColorModel() == colorModelCMYK)
paintAlert(cmykIcon, pPixmap, 30, 0);
- else
+ else if (m_color.getColorModel() == colorModelRGB)
paintAlert(rgbIcon, pPixmap, 30, 0);
+ else if (m_color.getColorModel() == colorModelLab)
+ paintAlert(labIcon, pPixmap, 30, 0);
if (m_color.isSpotColor())
paintAlert(spotIcon, pPixmap, 45, 0);
if (m_color.isRegistrationColor())
Modified: trunk/Scribus/scribus/ui/replacecolors.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=21654&path=/trunk/Scribus/scribus/ui/replacecolors.h
==============================================================================
--- trunk/Scribus/scribus/ui/replacecolors.h (original)
+++ trunk/Scribus/scribus/ui/replacecolors.h Thu Dec 15 18:55:07 2016
@@ -57,6 +57,7 @@
QPixmap alertIcon;
QPixmap cmykIcon;
QPixmap rgbIcon;
+ QPixmap labIcon;
QPixmap spotIcon;
QPixmap regIcon;
};
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
