X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FModuleBase_Preferences.cpp;h=f97a9ed7f4cbabe15350fc9165530511dd40a6f8;hb=074b1d850036614d4a08999c4bc4e8630db63d2b;hp=c550b23a610825cdd4936a7a2654427507a35046;hpb=3874b57fe5aba25ff5aee2a07654fc23c1ee8eb0;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_Preferences.cpp b/src/ModuleBase/ModuleBase_Preferences.cpp index c550b23a6..f97a9ed7f 100644 --- a/src/ModuleBase/ModuleBase_Preferences.cpp +++ b/src/ModuleBase/ModuleBase_Preferences.cpp @@ -7,6 +7,10 @@ #include "ModuleBase_Preferences.h" //#include "ModuleBase_Constants.h" +#include +#include +#include + #include #include @@ -146,12 +150,14 @@ void ModuleBase_Preferences::createCustomPage(ModuleBase_IPrefMgr* thePref, int } } -//********************************************************** -//********************************************************** -//********************************************************** +/** +* Implementation of preferences manager interface +*/ class ModuleBase_PrefMgr: public ModuleBase_IPrefMgr { public: + /// Constructor + /// \param theMgr a preferences manager ModuleBase_PrefMgr(ModuleBase_PreferencesMgr* theMgr):myMgr(theMgr) {} virtual int addPreference(const QString& theLbl, int pId, @@ -254,6 +260,16 @@ void ModuleBase_PreferencesDlg::createViewerPage(int thePageId) myPreferences->setItemProperty("texture_stretch_enabled", true, bgId); myPreferences->setItemProperty("custom_enabled", false, bgId); myPreferences->setItemProperty("image_formats", aImgFiles, bgId); + + //Config_PropManager::registerProp("Visualization", "object_default_color", "Object color", + // Config_Prop::Color, "#ffffff"); + + Config_PropManager::registerProp("Visualization", "result_body_color", "Body color", + Config_Prop::Color, Model_ResultBody::DEFAULT_COLOR()); + Config_PropManager::registerProp("Visualization", "result_group_color", "Group color", + Config_Prop::Color, Model_ResultGroup::DEFAULT_COLOR()); + Config_PropManager::registerProp("Visualization", "result_construction_color", "Construction color", + Config_Prop::Color, Model_ResultConstruction::DEFAULT_COLOR()); } void ModuleBase_PreferencesDlg::createMenuPage(int thePageId) @@ -288,12 +304,12 @@ void ModuleBase_PreferencesDlg::modified(ModuleBase_Prefs& theModified) const void ModuleBase_PreferencesDlg::onDefault() { // reset main resources -#ifdef SALOME_750 // until SALOME 7.5.0 is released +//#ifdef SALOME_750 // until SALOME 7.5.0 is released QtxResourceMgr::WorkingMode aPrev = myPreferences->resourceMgr()->setWorkingMode(QtxResourceMgr::IgnoreUserValues); myPreferences->retrieve(); myPreferences->resourceMgr()->setWorkingMode(aPrev); -#endif +//#endif // reset plugin's resources ModuleBase_Preferences::resetConfig(); ModuleBase_Preferences::updateResourcesByConfig();