From 1b6700a4a542654b6c8735e604e3f6016973dde1 Mon Sep 17 00:00:00 2001 From: mzn Date: Fri, 28 Jul 2006 09:51:49 +0000 Subject: [PATCH] Fix for bug IPAL10053. --- src/OBJECT/SMESH_Actor.cxx | 2 +- src/SMESHGUI/SMESHGUI.cxx | 4 ++-- src/SMESHGUI/SMESH_msg_en.po | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx index 53c8758f3..114a9549b 100644 --- a/src/OBJECT/SMESH_Actor.cxx +++ b/src/OBJECT/SMESH_Actor.cxx @@ -1582,7 +1582,7 @@ void SMESH_ActorDef::UpdateScalarBar() aScalarBarLabelProp->SetFontFamilyToArial(); if( mgr->hasValue( "SMESH", "scalar_bar_label_font" ) ) { - QFont f = mgr->stringValue( "SMESH", "scalar_bar_label_font" ); + QFont f = mgr->fontValue( "SMESH", "scalar_bar_label_font" ); if( f.family() == "Arial" ) aScalarBarLabelProp->SetFontFamilyToArial(); else if( f.family() == "Courier" ) diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 18bc0d278..8fb5c12c2 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -3047,9 +3047,9 @@ void SMESHGUI::createPreferences() int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab ); int tfont = addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_title_font" ); - addPreference( tr( "SMESH_TITLE" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_title_color" ); + addPreference( tr( "PREF_TITLE_COLOR" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_title_color" ); int lfont = addPreference( tr( "SMESH_LABELS" ), fontGr, LightApp_Preferences::Font, "SMESH", "scalar_bar_label_font" ); - addPreference( tr( "SMESH_LABELS" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_label_color" ); + addPreference( tr( "PREF_LABELS_COLOR" ), fontGr, LightApp_Preferences::Color, "SMESH", "scalar_bar_label_color" ); QStringList fam; fam.append( tr( "SMESH_FONT_ARIAL" ) ); diff --git a/src/SMESHGUI/SMESH_msg_en.po b/src/SMESHGUI/SMESH_msg_en.po index 8cff58168..b8e73b45b 100644 --- a/src/SMESHGUI/SMESH_msg_en.po +++ b/src/SMESHGUI/SMESH_msg_en.po @@ -3039,6 +3039,12 @@ msgstr "Elements" msgid "SMESHGUI::PREF_COLOR" msgstr "Color" +msgid "SMESHGUI::PREF_TITLE_COLOR" +msgstr "Title color" + +msgid "SMESHGUI::PREF_LABELS_COLOR" +msgstr "Labels color" + msgid "SMESHGUI::PREF_SIZE" msgstr "Size" -- 2.39.2