liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4366 from Beep6581/softproofing-output-profile

Browse Source 
Softproofing output profile
This commit is contained in:
Alberto Griggio
2018-02-04 22:38:36 +01:00
committed by GitHub
parent b4227e1a02 14a463102c
commit 06fedfdac7
4 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rtgui/editorpanel.cc
View File

@@ -153,7 +153,6 @@ private:
Gtk::ToggleButton softProof;
Gtk::ToggleButton spGamutCheck;
sigc::connection profileConn, intentConn, softproofConn;
bool canSProof;
Glib::ustring defprof;
rtengine::StagedImageProcessor* const& processor;
@@ -212,7 +211,6 @@ private:
softProof.set_tooltip_markup (M ("SOFTPROOF_TOOLTIP"));
softProof.set_active (false);
softProof.set_sensitive (canSProof);
softProof.show ();
Gtk::Image *spGamutCheckImage = Gtk::manage (new RTImage ("gamut-warning.png"));
@@ -301,8 +299,8 @@ private:
intentBox.setItemSensitivity (0, supportsPerceptual);
intentBox.setItemSensitivity (1, supportsRelativeColorimetric);
intentBox.setItemSensitivity (2, supportsAbsoluteColorimetric);
softProof.set_sensitive (canSProof);
spGamutCheck.set_sensitive (canSProof);
softProof.set_sensitive (true);
spGamutCheck.set_sensitive (softProof.get_active());
} else {
intentBox.setItemSensitivity (0, true);
intentBox.setItemSensitivity (1, true);
@@ -352,15 +350,9 @@ private:
void updateSoftProofParameters (bool noEvent = false)
{
if (!canSProof) {
ConnectionBlocker profileBlocker (softproofConn);
softProof.set_active (false);
softProof.set_sensitive (false);
#if !defined(__APPLE__) // monitor profile not supported on apple
} else {
softProof.set_sensitive (profileBox.get_active_row_number () > 0);
softProof.set_sensitive (profileBox.get_active_row_number () > 0);
#endif
}
spGamutCheck.set_sensitive (softProof.get_sensitive() && softProof.get_active());
@@ -390,7 +382,6 @@ private:
public:
explicit ColorManagementToolbar (rtengine::StagedImageProcessor* const& ipc) :
intentBox (Glib::ustring (), true),
canSProof (!options.rtSettings.printerProfile.empty() && options.rtSettings.printerProfile != "None"), // assuming the printer profile exist!
processor (ipc)
{
#if !defined(__APPLE__) // monitor profile not supported on apple
@@ -419,12 +410,6 @@ public:
grid->attach_next_to (spGamutCheck, Gtk::POS_RIGHT, 1, 1);
}
void canSoftProof (bool canSP)
{
canSProof = canSP;
updateSoftProofParameters();
}
void updateProcessor()
{
if (processor) {
@@ -2306,7 +2291,6 @@ void EditorPanel::tbShowHideSidePanels_managestate()
void EditorPanel::updateProfiles (const Glib::ustring &printerProfile, rtengine::RenderingIntent printerIntent, bool printerBPC)
{
colorMgmtToolBar->canSoftProof (!printerProfile.empty() && printerProfile != "None");
}
void EditorPanel::updateTPVScrollbar (bool hide)