merge with dev

rtgui/editorpanel.cc

@@ -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;
@@ -205,17 +204,16 @@ private:
 
     void prepareSoftProofingBox ()
     {
-        Gtk::Image *softProofImage = Gtk::manage (new RTImage ("softProof.png"));
+        Gtk::Image *softProofImage = Gtk::manage (new RTImage ("gamut-softproof.png"));
         softProofImage->set_padding (0, 0);
         softProof.add (*softProofImage);
         softProof.set_relief (Gtk::RELIEF_NONE);
         softProof.set_tooltip_markup (M ("SOFTPROOF_TOOLTIP"));
 
         softProof.set_active (false);
-        softProof.set_sensitive (canSProof);
         softProof.show ();
 
-        Gtk::Image *spGamutCheckImage = Gtk::manage (new RTImage ("spGamutCheck.png"));
+        Gtk::Image *spGamutCheckImage = Gtk::manage (new RTImage ("gamut-warning.png"));
         spGamutCheckImage->set_padding (0, 0);
         spGamutCheck.add (*spGamutCheckImage);
         spGamutCheck.set_relief (Gtk::RELIEF_NONE);
@@ -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)

rtgui/navigator.cc

@@ -38,6 +38,8 @@ Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(opt
     mbox->set_name("Navigator");
     previewWindow = Gtk::manage (new PreviewWindow ());
     mbox->pack_start (*previewWindow, Gtk::PACK_SHRINK, 2);
+    dimension = Gtk::manage (new Gtk::Label ());
+    mbox->pack_start (*dimension, Gtk::PACK_SHRINK, 2);
     position = Gtk::manage (new Gtk::Label ());
     mbox->pack_start (*position, Gtk::PACK_SHRINK, 2);
 
@@ -207,10 +209,9 @@ Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(opt
 void Navigator::setInvalid (int fullWidth, int fullHeight)
 {
     if (fullWidth > 0 && fullHeight > 0) {
-        position->set_text (Glib::ustring::compose (M("NAVIGATOR_XY_FULL"), fullWidth, fullHeight));
-    } else {
-        position->set_text (M("NAVIGATOR_XY_NA"));
+        dimension->set_text (Glib::ustring::compose (M("NAVIGATOR_XY_FULL"), fullWidth, fullHeight));
     }
+    position->set_text (M("NAVIGATOR_XY_NA"));
 
     R->set_text (M("NAVIGATOR_NA"));
     G->set_text (M("NAVIGATOR_NA"));

rtgui/navigator.h

@@ -37,6 +37,7 @@ private:
     void cycleUnitsHSV (GdkEventButton *event);
 
 protected:
+    Gtk::Label* dimension;
     Gtk::Label* position;
     Gtk::Label *R, *G, *B;
     Gtk::Label *H, *S, *V;