diff --git a/rtdata/languages/default b/rtdata/languages/default index 9b8b32ad6..db3f40f18 100644 --- a/rtdata/languages/default +++ b/rtdata/languages/default @@ -599,8 +599,8 @@ NAVIGATOR_NA; -- NAVIGATOR_R;R: NAVIGATOR_S;S: NAVIGATOR_V;V: -NAVIGATOR_XY_FULL;Width = %1, Height = %2 -NAVIGATOR_XY_NA;x = n/a, y = n/a +NAVIGATOR_XY_FULL;Width: %1, Height: %2 +NAVIGATOR_XY_NA;x: --, y: -- OPTIONS_DEFIMG_MISSING;The default profile for non-raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. OPTIONS_DEFRAW_MISSING;The default profile for raw photos could not be found or is not set.\n\nPlease check your profiles' directory, it may be missing or damaged.\n\nDefault internal values will be used. PARTIALPASTE_BASICGROUP;Basic Settings diff --git a/rtgui/navigator.cc b/rtgui/navigator.cc index 6ec226d97..1c2910551 100644 --- a/rtgui/navigator.cc +++ b/rtgui/navigator.cc @@ -81,28 +81,43 @@ Navigator::Navigator () { LAB_L->set_alignment(Gtk::ALIGN_RIGHT); // set font family and size -/* R->modify_font(Pango::FontDescription("monospace 8")); - G->modify_font(Pango::FontDescription("monospace 8")); - B->modify_font(Pango::FontDescription("monospace 8")); - H->modify_font(Pango::FontDescription("monospace 8")); - S->modify_font(Pango::FontDescription("monospace 8")); - V->modify_font(Pango::FontDescription("monospace 8")); - LAB_A->modify_font(Pango::FontDescription("monospace 8")); - LAB_B->modify_font(Pango::FontDescription("monospace 8")); - LAB_L->modify_font(Pango::FontDescription("monospace 8")); + Glib::ustring fontname; - lR->modify_font(Pango::FontDescription("monospace 8")); - lG->modify_font(Pango::FontDescription("monospace 8")); - lB->modify_font(Pango::FontDescription("monospace 8")); - lH->modify_font(Pango::FontDescription("monospace 8")); - lS->modify_font(Pango::FontDescription("monospace 8")); - lV->modify_font(Pango::FontDescription("monospace 8")); - lLAB_A->modify_font(Pango::FontDescription("monospace 8")); - lLAB_B->modify_font(Pango::FontDescription("monospace 8")); - lLAB_L->modify_font(Pango::FontDescription("monospace 8")); +#ifdef WIN32 + fontname = "Lucida Sans Typewriter"; +#endif - position->modify_font(Pango::FontDescription("monospace 8")); -*/ +#ifdef __linux__ + fontname = "DejaVu Sans Mono"; +#endif + +#ifdef __APPLE__ + fontname="Menlo"; +#endif + + if (fontname!=""){ + R->modify_font(Pango::FontDescription(fontname)); + G->modify_font(Pango::FontDescription(fontname)); + B->modify_font(Pango::FontDescription(fontname)); + H->modify_font(Pango::FontDescription(fontname)); + S->modify_font(Pango::FontDescription(fontname)); + V->modify_font(Pango::FontDescription(fontname)); + LAB_A->modify_font(Pango::FontDescription(fontname)); + LAB_B->modify_font(Pango::FontDescription(fontname)); + LAB_L->modify_font(Pango::FontDescription(fontname)); + + lR->modify_font(Pango::FontDescription(fontname)); + lG->modify_font(Pango::FontDescription(fontname)); + lB->modify_font(Pango::FontDescription(fontname)); + lH->modify_font(Pango::FontDescription(fontname)); + lS->modify_font(Pango::FontDescription(fontname)); + lV->modify_font(Pango::FontDescription(fontname)); + lLAB_A->modify_font(Pango::FontDescription(fontname)); + lLAB_B->modify_font(Pango::FontDescription(fontname)); + lLAB_L->modify_font(Pango::FontDescription(fontname)); + + position->modify_font(Pango::FontDescription(fontname)); + } // setup the tables Gtk::Table* table0 = Gtk::manage (new Gtk::Table (1, 3)); //rows, cols The main table container @@ -192,7 +207,7 @@ void Navigator::pointerMoved (bool validPos, Glib::ustring profile, int x, int y if (!validPos) setInvalid (x,y); else { - position->set_text (Glib::ustring::compose ("x = %1, y = %2", x, y)); + position->set_text (Glib::ustring::compose ("x: %1, y: %2", x, y)); R->set_text (Glib::ustring::format(std::fixed, std::setprecision(1), r*100.f/255.f) + Glib::ustring("%")); G->set_text (Glib::ustring::format(std::fixed, std::setprecision(1), g*100.f/255.f) + Glib::ustring("%"));