Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2017-01-06 20:12:12 +01:00
38 changed files with 1117 additions and 968 deletions

View File

@@ -229,8 +229,10 @@ private:
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);
#endif
}
spGamutCheck.set_sensitive(softProof.get_sensitive() && softProof.get_active());