suppession doc, ajout des ressources qt utiles pour la personnalisation de noms,...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fefbf8e9a34784c48d6233a540319cd80273ca4..63c53ccb476de98741d7fe80d8fba5c19ad9f68c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,9 +104,9 @@ ENDIF()
 SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH "Install path: SALOME Python scripts")
 
 # Specific to SALOME:
-SET(SALOME_SALOME_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/salome" CACHE PATH "Install path: SALOME SALOME specific data")
-SET(SALOME_SALOME_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME SALOME gui documentation")
-SET(SALOME_SALOME_HTML_STATIC_PATH "${SALOME_SALOME_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME SALOME html static data")
+SET(SALOME_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/salome" CACHE PATH "Install path: SALOME SALOME specific data")
+SET(SALOME_INSTALL_DOC_GUI "${SALOME_INSTALL_DOC}/gui/${PROJECT_NAME_UC}" CACHE PATH "Install path: SALOME SALOME gui documentation")
+SET(SALOME_HTML_STATIC_PATH "${SALOME_INSTALL_DOC_GUI}/_static" CACHE PATH "Install path: SALOME SALOME html static data")
 
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_PYTHON)
 

diff --git a/README b/README
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d3735fe0ba6ea7c395e13898692263c36583a392 100644 (file)
--- a/README
+++ b/README
@@ -0,0 +1,2 @@
+This module contains a minimal SALOME profile.
+

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index e4e01554e6c9c953688cd04805eaa6f5769667d3..e2987b4e111fac3755670200643d113ab94fe87e 100644 (file)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -17,20 +17,26 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- resources ---
-SET(SALOME_PROFILE_RESOURCES_FILES
+SET(SALOME_RESOURCES_FILES
   app_icon.png
   splash.png
   about.png
   icon_about.png
   app_logo.png
 )
+SET(_ts_RESOURCES
+  LightApp_images.ts
+  LightApp_msg_en.ts
+  LightApp_msg_fr.ts
+  LightApp_msg_ja.ts
+) 
 
 # --- rules ---
-INSTALL(FILES ${SALOME_PROFILE_RESOURCES_FILES} DESTINATION ${SALOME_SALOME_INSTALL_RES_DATA})
+INSTALL(FILES ${SALOME_RESOURCES_FILES} DESTINATION ${SALOME_INSTALL_RES_DATA})
+QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_INSTALL_RES_DATA}")
 
 # --- config ---
-SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SALOME_INSTALL_RES_DATA})
-
-# --- sub-directories ---
-ADD_SUBDIRECTORY( doc )
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_INSTALL_RES_DATA})

diff --git a/resources/LightApp_images.ts b/resources/LightApp_images.ts
new file mode 100644 (file)
index 0000000..ee44bfc
--- /dev/null
+++ b/resources/LightApp_images.ts
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="en_US">
+<context>
+    <name>@default</name>
+    <message>
+        <source>APP_DEFAULT_ICO</source>
+        <translation>app_icon.png</translation>
+    </message>
+    <message>
+        <source>ICO_ABOUT</source>
+        <translation>icon_about.png</translation>
+    </message>
+    <message>
+        <source>ABOUT</source>
+        <translation>about.png</translation>
+    </message>
+    <message>
+        <source>APP_BASE_LOGO</source>
+        <translation>app_logo.png</translation>
+    </message>
+</context>
+</TS>

diff --git a/resources/LightApp_msg_en.ts b/resources/LightApp_msg_en.ts
new file mode 100644 (file)
index 0000000..2d19d64
--- /dev/null
+++ b/resources/LightApp_msg_en.ts
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="en_US">
+<context>
+    <name>@default</name>
+    <message>
+        <source>ABOUT_COPYRIGHT</source>
+        <translation>Copyright (C)</translation>
+    </message>
+    <message>
+        <source>ABOUT_CAPTION</source>
+        <translation>About SALOME</translation>
+    </message>
+    <message>
+        <source>APP_NAME</source>
+        <translation>SALOME </translation>
+    </message>
+    <message>
+        <source>APP_VERSION</source>
+        <translation>8.4.0</translation>
+    </message>
+    <message>
+        <source>ABOUT_LICENSE</source>
+        <translation>License description</translation>
+    </message>
+    <message>
+        <source>ABOUT_VERSION</source>
+        <translation>Version 8.4.0</translation>
+    </message>
+    <message>
+        <source>ABOUT_TITLE</source>
+        <translation>SALOME</translation>
+    </message>
+</context>
+</TS>

diff --git a/resources/LightApp_msg_fr.ts b/resources/LightApp_msg_fr.ts
new file mode 100644 (file)
index 0000000..68f70bc
--- /dev/null
+++ b/resources/LightApp_msg_fr.ts
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="fr_FR">
+<context>
+    <name>@default</name>
+    <message>
+        <source>ABOUT_COPYRIGHT</source>
+        <translation>Copyright (C)</translation>
+    </message>
+    <message>
+        <source>ABOUT_CAPTION</source>
+        <translation>A propos de SALOME</translation>
+    </message>
+    <message>
+        <source>APP_NAME</source>
+        <translation>SALOME </translation>
+    </message>
+    <message>
+        <source>APP_VERSION</source>
+        <translation>8.4.0</translation>
+    </message>
+    <message>
+        <source>ABOUT_LICENSE</source>
+        <translation>Description de la licence</translation>
+    </message>
+    <message>
+        <source>ABOUT_VERSION</source>
+        <translation>Version 8.4.0</translation>
+    </message>
+    <message>
+        <source>ABOUT_TITLE</source>
+        <translation>SALOME</translation>
+    </message>
+</context>
+</TS>

diff --git a/resources/LightApp_msg_ja.ts b/resources/LightApp_msg_ja.ts
new file mode 100644 (file)
index 0000000..3650350
--- /dev/null
+++ b/resources/LightApp_msg_ja.ts
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="ja" sourcelanguage="en">
+  <context>
+    <name>@default</name>
+    <message>
+      <source>ABOUT_COPYRIGHT</source>
+      <translation>Copyright (C)</translation>
+    </message>
+    <message>
+      <source>ABOUT_CAPTION</source>
+      <translation>About SALOME</translation>
+    </message>
+    <message>
+      <source>APP_NAME</source>
+      <translation>SALOME </translation>
+    </message>
+    <message>
+      <source>APP_VERSION</source>
+      <translation>8.4.0</translation>
+    </message>
+    <message>
+      <source>ABOUT_LICENSE</source>
+      <translation>License description</translation>
+    </message>
+    <message>
+      <source>ABOUT_VERSION</source>
+      <translation>Version 8.4.0</translation>
+    </message>
+    <message>
+      <source>ABOUT_TITLE</source>
+      <translation>SALOME</translation>
+    </message>
+  </context>
+</TS>

diff --git a/resources/doc/CMakeLists.txt b/resources/doc/CMakeLists.txt
deleted file mode 100644 (file)
index 4198235..0000000
--- a/resources/doc/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# --- scripts ---
-
-# scripts / static
-SET(_bin_DOCUMENTS
-   sample.pdf
-)
-
-INSTALL(FILES ${_bin_DOCUMENTS} DESTINATION ${SALOME_SALOME_INSTALL_DOC_GUI})

diff --git a/resources/doc/README b/resources/doc/README
deleted file mode 100644 (file)
index babce17..0000000
--- a/resources/doc/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains binaries of SALOME's documentation

diff --git a/resources/doc/sample.pdf b/resources/doc/sample.pdf
deleted file mode 100644 (file)
index 1f3b08f..0000000
Binary files a/resources/doc/sample.pdf and /dev/null differ