Merge branch 'master' of https://git.salome-platform.org/git/modules/yacs

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ef75654aef106c7df8ffda9b294ae5186eb3400..09e19956203576468b37ddf5ac8033b60a79f369 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,8 +29,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/adm/cmake/FindSphinx.cmake b/adm/cmake/FindSphinx.cmake
index 648d1707b98f485420265ff545969d2488fb56ca..7c9b0bfe5e17d83c86e8f208a64da1056681f89a 100644 (file)
--- a/adm/cmake/FindSphinx.cmake
+++ b/adm/cmake/FindSphinx.cmake
@@ -48,7 +48,7 @@ IF(SPHINX_EXECUTABLE)
   STRING(REGEX REPLACE ".* ([0-9.]+)$" "\\1" SPHINX_VERSION "${SPHINX_VERSION}" )
   MESSAGE(STATUS "Sphinx version is ${SPHINX_VERSION}")
   IF(SPHINX_VERSION VERSION_LESS "1.3")
-    SET(SPHINX_THEME "basic")
+    SET(SPHINX_THEME "default")
   ELSE()
     SET(SPHINX_THEME "classic")
   ENDIF()

diff --git a/adm/cmake/SalomeMacros.cmake b/adm/cmake/SalomeMacros.cmake
index 34f85786d2d062f94631dfcefe31e824c1774635..cae6cbaba793e9ad3bc88a56d88f69fc126532f6 100644 (file)
--- a/adm/cmake/SalomeMacros.cmake
+++ b/adm/cmake/SalomeMacros.cmake
@@ -944,7 +944,8 @@ MACRO(SALOME_CONFIGURE_PREPARE)
   FOREACH(_prereq IN LISTS _tmp_prereq)
     IF(${_prereq}_DIR)
       SET(_PREREQ_LIST "${_PREREQ_LIST} ${_prereq}")
-      SET(_PREREQ_DIR_LIST "${_PREREQ_DIR_LIST} \"${${_prereq}_DIR}\"")
+      FILE(TO_CMAKE_PATH ${${_prereq}_DIR} CURR_DIR)
+      SET(_PREREQ_DIR_LIST "${_PREREQ_DIR_LIST} \"${CURR_DIR}\"")
       SALOME_APPEND_LIST_OF_LIST(_PREREQ_COMPO_LIST Salome${_prereq}_COMPONENTS)
     ENDIF()
   ENDFOREACH()

diff --git a/src/genericgui/GuiExecutor.cxx b/src/genericgui/GuiExecutor.cxx
index e0b30fd191df809436ea1da06b1d800d79b15097..fb4a4e2dff00c0686f4dd438de98b8bbeaa53345 100644 (file)
--- a/src/genericgui/GuiExecutor.cxx
+++ b/src/genericgui/GuiExecutor.cxx
@@ -116,7 +116,7 @@ void GuiExecutor::startResumeDataflow(bool initialize)
   if (CORBA::is_nil(_procRef))
     {
       DEBTRACE("init _procRef");
-      _procRef = _engineRef->LoadProc(_context->getFileName().toLatin1());
+      _procRef = _engineRef->LoadProc(_context->getFileName().toUtf8());
       registerStatusObservers();
       DEBTRACE("_procRef init");
     }

diff --git a/src/genericgui/ListJobs_GUI.cxx b/src/genericgui/ListJobs_GUI.cxx
index c5113ed7f374bb17317438d39e5944e2ca3bdb42..e9f8313d51562d232af8fca1cf0ad31e5e0373ef 100644 (file)
--- a/src/genericgui/ListJobs_GUI.cxx
+++ b/src/genericgui/ListJobs_GUI.cxx
@@ -29,6 +29,13 @@
 #include "YacsTrace.hxx"
 #include "LoadState.hxx"
 
+#include <QBoxLayout>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QTimer>
+
 using namespace std;
 using namespace YACS::HMI;
 using namespace YACS::ENGINE;

diff --git a/src/genericgui/ListJobs_GUI.hxx b/src/genericgui/ListJobs_GUI.hxx
index 25b9bd42492ec7f6b1dbe7f83fc977554c8eefde..65a5e571056fa20ab29307dce75e7ed9d6634ac6 100644 (file)
--- a/src/genericgui/ListJobs_GUI.hxx
+++ b/src/genericgui/ListJobs_GUI.hxx
@@ -20,11 +20,7 @@
 #ifndef LISTJOBS_GUI_H
 #define LISTJOBS_GUI_H
 
-#include <QtCore/QtGlobal>
-#include <QtGui/QtGui>
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-#include <QtWidgets/QtWidgets>
-#endif
+#include <QWidget>
 #include "SALOME_NamingService.hxx"
 #include "SALOME_Launcher.hh"
 
@@ -39,6 +35,10 @@
 // Class for the dialog box
 // ------------------------
 
+class QPushButton;
+class QTableWidget;
+class QTableWidgetItem;
+class QTimer;
 
 namespace YACS
 {

diff --git a/src/salomegui/Yacsgui.cxx b/src/salomegui/Yacsgui.cxx
index 9d040d07cbea2538c3420c70e07a73e4adcedecf..c9625b16de37e36bd8656880306ca55398d89322 100644 (file)
--- a/src/salomegui/Yacsgui.cxx
+++ b/src/salomegui/Yacsgui.cxx
@@ -42,6 +42,7 @@
 #include <SUIT_DataObject.h>
 
 #include <SALOME_LifeCycleCORBA.hxx>
+#include <QDir>
 #include <QInputDialog>
 #include <QIcon>
 #include <cassert>

diff --git a/src/salomegui/Yacsgui_Resource.cxx b/src/salomegui/Yacsgui_Resource.cxx
index 769008cedeb991c062782d25c56c316e85738da7..0d32531774a04b2896389d62d225574049a99997 100644 (file)
--- a/src/salomegui/Yacsgui_Resource.cxx
+++ b/src/salomegui/Yacsgui_Resource.cxx
@@ -50,11 +50,11 @@ bool Yacsgui_Resource::booleanValue(const QString& name, const bool def) const {
   return _resource->booleanValue(RESOURCE_YACS, name, def);
 }
 
-QFont Yacsgui_Resource::fontValue(const QString& name, const QFont def) const {
+QFont Yacsgui_Resource::fontValue(const QString& name, const QFont& def) const {
   return _resource->fontValue(RESOURCE_YACS, name, def);
 }
 
-QColor Yacsgui_Resource::colorValue(const QString& name, const QColor def) const {
+QColor Yacsgui_Resource::colorValue(const QString& name, const QColor& def) const {
   return _resource->colorValue(RESOURCE_YACS, name, def);
 }
 
@@ -69,7 +69,7 @@ QColor Yacsgui_Resource::colorValue(const QString& name, const int h, const int
   return colorValue(name, col);
 }
 
-QString Yacsgui_Resource::stringValue(const QString& name, const QString def) const {
+QString Yacsgui_Resource::stringValue(const QString& name, const QString& def) const {
   return _resource->stringValue(RESOURCE_YACS, name, def);
 }
 
@@ -88,15 +88,15 @@ void Yacsgui_Resource::setValue( const QString& name, const bool val ) {
     _resource->setValue(RESOURCE_YACS, name, val);
 }
 
-void Yacsgui_Resource::setValue( const QString& name, const QFont val ) {
+void Yacsgui_Resource::setValue( const QString& name, const QFont& val ) {
     _resource->setValue(RESOURCE_YACS, name, val);
 }
 
-void Yacsgui_Resource::setValue( const QString& name, const QColor val ) {
+void Yacsgui_Resource::setValue( const QString& name, const QColor& val ) {
     _resource->setValue(RESOURCE_YACS, name, val);
 }
 
-void Yacsgui_Resource::setValue( const QString& name, const QString val ) {
+void Yacsgui_Resource::setValue( const QString& name, const QString& val ) {
     _resource->setValue(RESOURCE_YACS, name, val);
 }
 

diff --git a/src/salomegui/Yacsgui_Resource.hxx b/src/salomegui/Yacsgui_Resource.hxx
index 9a6e5bd64842a0205f41857a0630a32af848866a..e79362965a4237172638eb331fd6d262822fc7c6 100644 (file)
--- a/src/salomegui/Yacsgui_Resource.hxx
+++ b/src/salomegui/Yacsgui_Resource.hxx
@@ -20,13 +20,14 @@
 #ifndef _SALOMEGUI_RESOURCE_HXX_
 #define _SALOMEGUI_RESOURCE_HXX_
 
-#include <QtGui>
+#include <QColor>
+#include <QFont>
+#include <QString>
 
 class Yacsgui;
 class SUIT_ResourceMgr;
 
-
-class Yacsgui_Resource 
+class Yacsgui_Resource
 {
   public:
     Yacsgui_Resource(SUIT_ResourceMgr* r);
@@ -35,21 +36,21 @@ class Yacsgui_Resource
     virtual void preferencesChanged();
 
   protected:
-    int     integerValue( const QString& name, const int    def = 0          ) const;
-    double  doubleValue ( const QString& name, const double def = 0          ) const;
-    bool    booleanValue( const QString& name, const bool   def = false      ) const;
-    QFont   fontValue   ( const QString& name, const QFont  def = QFont()    ) const;
-    QColor  colorValue  ( const QString& name, const QColor def = QColor()   ) const;
-    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c       ) const;
+    int     integerValue( const QString& name, const int     def = 0          ) const;
+    double  doubleValue ( const QString& name, const double  def = 0          ) const;
+    bool    booleanValue( const QString& name, const bool    def = false      ) const;
+    QFont   fontValue   ( const QString& name, const QFont&  def = QFont()    ) const;
+    QColor  colorValue  ( const QString& name, const QColor& def = QColor()   ) const;
+    QColor  colorValue  ( const QString& name, const Qt::GlobalColor c        ) const;
     QColor  colorValue  ( const QString& name, const int h, const int s, const int v) const;
-    QString stringValue ( const QString& name, const QString def = QString() ) const;
+    QString stringValue ( const QString& name, const QString& def = QString() ) const;
 
     void setValue( const QString& name, const int     val );
     void setValue( const QString& name, const double  val );
     void setValue( const QString& name, const bool    val );
-    void setValue( const QString& name, const QFont   val );
-    void setValue( const QString& name, const QColor  val );
-    void setValue( const QString& name, const QString val );
+    void setValue( const QString& name, const QFont&   val );
+    void setValue( const QString& name, const QColor&  val );
+    void setValue( const QString& name, const QString& val );
 
   protected:
     SUIT_ResourceMgr* _resource;