Merge remote branch 'origin/V7_8_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38ba1dcf39ca12d72f32ad5aaad28c1475a54ab3..a18df5e6eae2cded9517411a323c44bb25a93b16 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,12 +27,12 @@ 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 8)
+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})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Find KERNEL
 # ===========
@@ -90,9 +90,12 @@ ENDIF(EXISTS ${GUI_ROOT_DIR})
 ##
 ## From GUI:
 ##
-# Qt4
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
-INCLUDE(${QT_USE_FILE})
+# Qt
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()

diff --git a/src/PYHELLOGUI/CMakeLists.txt b/src/PYHELLOGUI/CMakeLists.txt
index 1bda2deebb4c2dbb69900a65697fd1c1385bca58..58b87b1d5fa60c711d955952284935a86e7367fc 100755 (executable)
--- a/src/PYHELLOGUI/CMakeLists.txt
+++ b/src/PYHELLOGUI/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # additional include directories
 INCLUDE_DIRECTORIES(
@@ -44,4 +44,4 @@ SET(_ts_RESOURCES
 # --- rules ---
 
 SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON})
-QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYHELLO_INSTALL_RES_DATA}")
\ No newline at end of file
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_PYHELLO_INSTALL_RES_DATA}")

diff --git a/src/PYHELLOGUI/PYHELLOGUI.py b/src/PYHELLOGUI/PYHELLOGUI.py
index 3a9d2299eb9d33455455198cb7c63b96e425a34e..887d43d4ebdd37a26a99801e424105a1e1d7a3a3 100644 (file)
--- a/src/PYHELLOGUI/PYHELLOGUI.py
+++ b/src/PYHELLOGUI/PYHELLOGUI.py
@@ -27,8 +27,7 @@
 #
 import traceback
 import os
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from qtsalome import *
 
 from PYHELLO_utils import *
 
@@ -398,7 +397,7 @@ class MyDialog( QDialog ):
         self.setModal( modal )
         self.setWindowTitle( "HELLO!" )
         vb = QVBoxLayout( self )
-        vb.setMargin( 8 )
+        vb.setContentsMargins( 8, 8, 8, 8 )
 
         hb0 = QHBoxLayout( self )
         label = QLabel( "Prenom: ", self )
@@ -411,16 +410,15 @@ class MyDialog( QDialog ):
         hb1 = QHBoxLayout( self )
         bOk = QPushButton( "&OK", self )
         bOk.setIcon( sgPyQt.loadIcon( 'PYHELLO', 'ICO_HANDSHAKE' ) )
-        self.connect( bOk, SIGNAL( 'clicked()' ), self, SLOT( 'accept()' ) )
+        bOk.clicked.connect(self.accept)
         hb1.addWidget( bOk )
         
         hb1.addStretch( 10 )
         
         bCancel = QPushButton( "&Cancel", self )
         bCancel.setIcon( sgPyQt.loadIcon( 'PYHELLO', 'ICO_STOP' ) )
-        self.connect( bCancel, SIGNAL( 'clicked()' ), self, SLOT( 'close()' ) )
+        bCancel.clicked.connect(self.close)
         hb1.addWidget( bCancel )
-        
         vb.addLayout( hb1 )
         pass
     
@@ -450,7 +448,7 @@ def ShowHELLO():
 ###
 def CreateObject():
     global __objectid__
-    default_name = str( sgPyQt.stringSetting( "PYHELLO", "def_obj_name", GUIcontext.DEFAULT_NAME ).trimmed() )
+    default_name = str( sgPyQt.stringSetting( "PYHELLO", "def_obj_name", GUIcontext.DEFAULT_NAME ) ).strip()
     try:
         if sgPyQt.action( GUIcontext.OPTION_3_ID ).isChecked():
             # request object name from the user
@@ -460,7 +458,7 @@ def CreateObject():
                                              QLineEdit.Normal,
                                              default_name )
             if not ok: return
-            name = str( name.trimmed() )
+            name = str( name ).strip()
         elif sgPyQt.action( GUIcontext.OPTION_2_ID ).isChecked():
             # generate object name
             __objectid__  = __objectid__ + 1
@@ -548,7 +546,7 @@ def Rename():
                                              "Enter object name:",
                                              QLineEdit.Normal,
                                              sobj.GetName() )
-            name = str( name.trimmed() )
+            name = str( name ).strip()
             if not ok or not name: return
             attr = builder.FindOrCreateAttribute( sobj, "AttributeName" )
             attr.SetValue( name )
@@ -561,7 +559,7 @@ def Rename():
 # Display password stored in the preferences
 ###
 def Password():
-  passwd = str( sgPyQt.stringSetting( "PYHELLO", "Password", GUIcontext.DEFAULT_PASSWD ).trimmed() )
+  passwd = str( sgPyQt.stringSetting( "PYHELLO", "Password", GUIcontext.DEFAULT_PASSWD ) ).strip()
   QMessageBox.information(sgPyQt.getDesktop(),
                           "Password",
                           passwd)