From: abd Date: Wed, 7 Feb 2007 10:46:23 +0000 (+0000) Subject: Merging with WPDev X-Git-Tag: T4_0_a1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b0991a6e8d81d7bc2614b844fe7356931c7913d9;p=modules%2Fgui.git Merging with WPDev --- diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 index ff090e7b9..e0b0e24ae 100755 --- a/adm_local/unix/config_files/check_GUI.m4 +++ b/adm_local/unix/config_files/check_GUI.m4 @@ -27,14 +27,14 @@ if test "x${SALOME_GUI_DIR}" = "x" ; then # search Salome binaries in PATH variable AC_PATH_PROG(TEMP, $1) if test "x${TEMP}" != "x" ; then - AC_MSG_RESULT(libLightApp.so was found at : ${TEMP}) + AC_MSG_RESULT($1 was found at : ${TEMP}) SALOME_BIN_DIR=`dirname ${TEMP}` SALOME_GUI_DIR=`cd ${SALOME_BIN_DIR}/../..; pwd` fi fi fi -if test -f ${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/$1 ; then +if test -f ${SALOME_GUI_DIR}/bin/salome/$1 ; then SalomeGUI_ok=yes AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR}) @@ -58,6 +58,6 @@ AC_MSG_RESULT(for $2: ${SalomeGUI_ok}) ])dnl AC_DEFUN([CHECK_SALOME_GUI],[ - CHECK_GUI([libLightApp.so], + CHECK_GUI([SUITApp], [SALOME GUI]) -])dnl \ No newline at end of file +])dnl diff --git a/adm_local/unix/config_files/check_corba_in_GUI.m4 b/adm_local/unix/config_files/check_corba_in_GUI.m4 index 20be4514f..381bf3b7d 100755 --- a/adm_local/unix/config_files/check_corba_in_GUI.m4 +++ b/adm_local/unix/config_files/check_corba_in_GUI.m4 @@ -4,7 +4,7 @@ #------------------------------------------------------------ AC_DEFUN([CHECK_CORBA_IN_GUI],[ - CHECK_GUI([libSalomeApp.so], + CHECK_GUI([SALOME_Session_Server], [CORBA SALOME GUI]) CORBA_IN_GUI=${SalomeGUI_ok} AC_SUBST(CORBA_IN_GUI) diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4 index 7be124e24..e07ead615 100644 --- a/adm_local/unix/config_files/check_pyqt.m4 +++ b/adm_local/unix/config_files/check_pyqt.m4 @@ -49,6 +49,16 @@ if test "x$pyqt_uic_ok" == "xno"; then fi fi fi +if test "x$pyqt_uic_ok" == "xno"; then + dnl try in $PATH + AC_PATH_PROG(PYUIC, pyuic) + if test "x$PYUIC" != x; then + PYQTDIR=$PYUIC + PYQTDIR=`dirname $PYQTDIR` + PYQTDIR=`dirname $PYQTDIR` + pyqt_uic_ok=yes + fi +fi if test "x$pyqt_uic_ok" == "xno"; then dnl try ${SIPDIR} if test "x${SIPDIR}" != "x"; then @@ -106,8 +116,8 @@ if test "x${PYQTDIR}" != "x"; then fi fi if test "x$pyqt_lib_ok" == "xno"; then - dnl try {PYQTDIR}/lib - if test -d {PYQTDIR}/lib; then + dnl try ${PYQTDIR}/lib + if test -d ${PYQTDIR}/lib; then AC_CHECK_FILE(${PYQTDIR}/lib/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) if test "x$pyqt_lib_ok" == "xyes"; then PYQT_LIBS="-L${PYQTDIR}/lib -lqtcmodule" @@ -120,8 +130,8 @@ if test "x${PYQTDIR}" != "x"; then fi fi if test "x$pyqt_lib_ok" == "xno"; then - dnl try {PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages - if test -d {PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages; then + dnl try ${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages + if test -d ${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages; then AC_CHECK_FILE(${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) if test "x$pyqt_lib_ok" == "xyes"; then PYQT_LIBS="-L${PYQTDIR}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/site-packages -lqtcmodule" @@ -220,6 +230,17 @@ if test "x$pyqt_sips_ok" == "xno"; then fi fi fi +if test "x$pyqt_sips_ok" == "xno"; then + dnl try ${PYQTDIR}/share/sip/qt + if test "x${PYQTDIR}" != "x"; then + if test -d ${PYQTDIR}/share/sip/qt ; then + AC_CHECK_FILE(${PYQTDIR}/share/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) + if test "x$pyqt_sips_ok" == "xyes"; then + PYQT_SIPS="${PYQTDIR}/share/sip/qt" + fi + fi + fi +fi if test "x$pyqt_sips_ok" == "xno"; then dnl try ${SIPDIR}/sip if test "x${SIPDIR}" != "x"; then diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4 index 83af9a907..0a087529c 100644 --- a/adm_local/unix/config_files/check_sip.m4 +++ b/adm_local/unix/config_files/check_sip.m4 @@ -44,11 +44,20 @@ else SIP_VERS=v4_old ;; 4.2*) SIP_VERS=v4_new ;; + 4.3*) + SIP_VERS=v4_new ;; + 4.4*) + SIP_VERS=v4_new ;; *) AC_MSG_RESULT(sip version $version not supported) SIP_VERS=unsupported ;; esac + if test "x$SIPDIR" = "x" ; then + SIPDIR=`dirname $SIP` + SIPDIR=`dirname $SIPDIR` + fi + sip_ok=no dnl Search sip.h file if test "x$SIPDIR" != "x" ; then diff --git a/configure.in.base b/configure.in.base index b9e3aa93a..4d1127770 100644 --- a/configure.in.base +++ b/configure.in.base @@ -23,8 +23,8 @@ AC_CANONICAL_HOST PACKAGE=salome AC_SUBST(PACKAGE) -VERSION=3.2.2 -XVERSION=0x030202 +VERSION=3.2.4 +XVERSION=0x030204 AC_SUBST(VERSION) AC_SUBST(XVERSION) diff --git a/doc/salome/gui/GUI/pics/ppref1.png b/doc/salome/gui/GUI/pics/ppref1.png new file mode 100755 index 000000000..dd91013ce Binary files /dev/null and b/doc/salome/gui/GUI/pics/ppref1.png differ diff --git a/doc/salome/gui/GUI/pics/ppref2.png b/doc/salome/gui/GUI/pics/ppref2.png new file mode 100755 index 000000000..5a15f0e93 Binary files /dev/null and b/doc/salome/gui/GUI/pics/ppref2.png differ diff --git a/doc/salome/gui/GUI/pics/ppref3.png b/doc/salome/gui/GUI/pics/ppref3.png new file mode 100755 index 000000000..767c5cf1e Binary files /dev/null and b/doc/salome/gui/GUI/pics/ppref3.png differ diff --git a/doc/salome/gui/GUI/pics/pref33.png b/doc/salome/gui/GUI/pics/pref33.png index 74ea331b4..bdc9b7643 100755 Binary files a/doc/salome/gui/GUI/pics/pref33.png and b/doc/salome/gui/GUI/pics/pref33.png differ diff --git a/doc/salome/gui/GUI/post-pro_preferences.htm b/doc/salome/gui/GUI/post-pro_preferences.htm index 801ff8756..107abc609 100755 --- a/doc/salome/gui/GUI/post-pro_preferences.htm +++ b/doc/salome/gui/GUI/post-pro_preferences.htm @@ -15,40 +15,45 @@ if (navigator.appName !="Netscape")