From 453e46773d4649eca82c81bdb82c50aa5ebda156 Mon Sep 17 00:00:00 2001 From: ana Date: Wed, 19 Oct 2011 09:29:34 +0000 Subject: [PATCH] comit mistake --- src/LightApp/LightApp_Application.cxx | 7 ++----- src/LightApp/resources/LightApp.xml | 4 ++-- src/LightApp/resources/LightApp_msg_en.ts | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx index f6401978f..bf1eac254 100644 --- a/src/LightApp/LightApp_Application.cxx +++ b/src/LightApp/LightApp_Application.cxx @@ -87,7 +87,6 @@ #include #include #include -#include #include @@ -2199,10 +2198,6 @@ void LightApp_Application::createPreferences( LightApp_Preferences* pref ) pref->setItemProperty( "strings", aValuesList, legendPosition ); pref->setItemProperty( "indexes", anIndicesList, legendPosition ); - pref->addPreference( tr( "PREF_FONT" ), plot2dGroup, LightApp_Preferences::Font, "Plot2d", "LegendFont" ); - - pref->addPreference( tr( "PREF_FONT_COLOR" ), plot2dGroup, LightApp_Preferences::Color, "Plot2d", "LegendColor" ); - int curveType = pref->addPreference( tr( "PREF_CURVE_TYPE" ), plot2dGroup, LightApp_Preferences::Selector, "Plot2d", "CurveType" ); aValuesList.clear(); @@ -3673,3 +3668,5 @@ bool LightApp_Application::renameAllowed( const QString& /*entry*/) const { bool LightApp_Application::renameObject( const QString& entry, const QString& ) { return false; } + + diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml index b5be16a2a..c843ec60a 100644 --- a/src/LightApp/resources/LightApp.xml +++ b/src/LightApp/resources/LightApp.xml @@ -169,8 +169,6 @@ - - @@ -232,3 +230,5 @@ + + diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts index 1400b9c76..de7135bb0 100644 --- a/src/LightApp/resources/LightApp_msg_en.ts +++ b/src/LightApp/resources/LightApp_msg_en.ts @@ -478,10 +478,6 @@ The changes will be applied on the next application session. PREF_FONT Font - - PREF_FONT_COLOR - Legend font color - PREF_LEFT Left @@ -822,3 +818,5 @@ File does not exist + + -- 2.39.2