From 6b43eaed577c1ac3781a4d701807c1777c829700 Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 24 May 2016 12:04:09 +0300 Subject: [PATCH] Issue #1015: The validate icon must be greyed and inactive instead of red and active Actions contain information for Status bar: SHAPER mode --- src/SHAPERGUI/SHAPERGUI.cpp | 5 +++++ src/SHAPERGUI/SHAPERGUI.h | 8 +++++++- src/XGUI/XGUI_SalomeConnector.h | 6 ++++++ src/XGUI/XGUI_Workshop.cpp | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/SHAPERGUI/SHAPERGUI.cpp b/src/SHAPERGUI/SHAPERGUI.cpp index ad4b87c42..9083a8a23 100644 --- a/src/SHAPERGUI/SHAPERGUI.cpp +++ b/src/SHAPERGUI/SHAPERGUI.cpp @@ -616,6 +616,11 @@ void SHAPERGUI::preferencesChanged(const QString& theSection, const QString& the myWorkshop->displayer()->redisplayObjects(); } +void SHAPERGUI::putInfo(const QString& theInfo, const int theMSecs) +{ + application()->putInfo(theInfo, theMSecs); +} + void SHAPERGUI::inspectSalomeModules() { QStringList aModuleNames; diff --git a/src/SHAPERGUI/SHAPERGUI.h b/src/SHAPERGUI/SHAPERGUI.h index 36e0f1ade..840074c37 100644 --- a/src/SHAPERGUI/SHAPERGUI.h +++ b/src/SHAPERGUI/SHAPERGUI.h @@ -122,7 +122,13 @@ Q_OBJECT /// Redefinition of virtual function for preferences changed event. virtual void preferencesChanged(const QString& theSection, const QString& theParam); - + + //! Shows the given text in status bar as a permanent text + //! \theInfo a string value + //! \theMsecs interval of msec milliseconds when the message will be hidden, if -1, it stays. + // If 0, default value is used, it is 3000 + virtual void putInfo(const QString& theInfo, const int theMSecs = 0); + /// \return Workshop class instance XGUI_Workshop* workshop() const { return myWorkshop; } diff --git a/src/XGUI/XGUI_SalomeConnector.h b/src/XGUI/XGUI_SalomeConnector.h index 4a4308c78..89b35ed4a 100644 --- a/src/XGUI/XGUI_SalomeConnector.h +++ b/src/XGUI/XGUI_SalomeConnector.h @@ -112,6 +112,12 @@ class XGUI_EXPORT XGUI_SalomeConnector //! Create preferences virtual void createPreferences() = 0; + + //! Shows the given text in status bar as a permanent text + //! \theInfo a string value + //! \theMsecs interval of msec milliseconds when the message will be hidden, if -1, it stays. + // If 0, default value is used, it is 3000 + virtual void putInfo(const QString& theInfo, const int theMSecs = 0) = 0; }; #endif diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index f325f3a14..442133564 100755 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -1893,7 +1893,7 @@ QList XGUI_Workshop::processHistoryList(const std::list void XGUI_Workshop::setStatusBarMessage(const QString& theMessage) { #ifdef HAVE_SALOME - //return salomeConnector()->desktop(); + salomeConnector()->putInfo(theMessage, -1); #else myMainWindow->putInfo(theMessage, -1); #endif -- 2.39.2