Update copyrights

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 4598b92..bdcab7b
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/SalomePYLIGHTConfig.cmake.in b/SalomePYLIGHTConfig.cmake.in
index 9dd0ec5ec52127b435bc601b7673ecda9a15ff22..ecab085c9158610b4989b830bfb833a79f322aa6 100644 (file)
--- a/SalomePYLIGHTConfig.cmake.in
+++ b/SalomePYLIGHTConfig.cmake.in
@@ -5,7 +5,7 @@
 #
 
 ###############################################################
-# Copyright (C) 2007-2016  OPEN CASCADE
+# Copyright (C) 2007-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index b01f446..86651de
--- a/adm_local/CMakeLists.txt
+++ b/adm_local/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 1165879..2a5cf05
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/cmake_files/FindSalomePYLIGHT.cmake b/adm_local/cmake_files/FindSalomePYLIGHT.cmake
index 3d7b2eeeffc242247fe9a4c4d84b4842cc3f9857..8fac33ff82f6aea01896d89fc728a71701ef1e86 100644 (file)
--- a/adm_local/cmake_files/FindSalomePYLIGHT.cmake
+++ b/adm_local/cmake_files/FindSalomePYLIGHT.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  OPEN CASCADE
+# Copyright (C) 2007-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index cdd76eb..e9d023c
--- a/adm_local/unix/CMakeLists.txt
+++ b/adm_local/unix/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 3a29b83..635444a
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ b/adm_local/unix/config_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/check_PYLIGHT.m4 b/adm_local/unix/config_files/check_PYLIGHT.m4
old mode 100755 (executable)
new mode 100644 (file)
index 790e6dc..930cea2
--- a/adm_local/unix/config_files/check_PYLIGHT.m4
+++ b/adm_local/unix/config_files/check_PYLIGHT.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016  OPEN CASCADE
+# Copyright (C) 2009-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index 9466426cc0551deee64fab976808cf676f3b1f93..a0712ca95ade1c3d96c30455c581a9236ae71039 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/bin/VERSION.in b/bin/VERSION.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index c2ce8d6..6aa1246
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,10 +21,9 @@ SET(PYLIGHT_RESOURCES_FILES
   PYLIGHT_line_icon.png
   PYLIGHT_paragraph_icon.png
   PYLIGHT.png
-  LightApp.xml
-  PYLIGHT_en.xml
+  SalomeApp.xml
   queen.txt
 )
 
 INSTALL(FILES ${PYLIGHT_RESOURCES_FILES} DESTINATION ${SALOME_PYLIGHT_INSTALL_RES_DATA})
-SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_PYLIGHT_INSTALL_RES_DATA})
\ No newline at end of file
+SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/LightApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/LightApp.xml INSTALL ${SALOME_PYLIGHT_INSTALL_RES_DATA})

diff --git a/resources/LightApp.xml b/resources/LightApp.xml
deleted file mode 100644 (file)
index 660c3aa..0000000
--- a/resources/LightApp.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-  Copyright (C) 2009-2016  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
-
--->
-<document>
-  <section name="PYLIGHT">
-    <!-- Major module parameters -->
-    <parameter name="name"    value="PyLight"/>
-    <parameter name="icon"    value="PYLIGHT.png"/>
-    <parameter name="library" value="SalomePyQtGUILight"/>
-  </section>
-  
-  <section name="resources">
-    <!-- Module resources -->
-    <parameter name="PYLIGHT" value="${PYLIGHT_ROOT_DIR}/share/salome/resources/pylight"/>
-  </section>
-  
-</document>

diff --git a/resources/LightApp.xml.in b/resources/LightApp.xml.in
new file mode 100644 (file)
index 0000000..1e2651f
--- /dev/null
+++ b/resources/LightApp.xml.in
@@ -0,0 +1,13 @@
+<document>
+  <section name="PYLIGHT">
+    <!-- Major module parameters -->
+    <parameter name="name"    value="PyLight"/>
+    <parameter name="icon"    value="PYLIGHT.png"/>
+    <parameter name="version" value="@SALOMEPYLIGHT_VERSION@"/>
+    <parameter name="library" value="SalomePyQtGUILight"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="PYLIGHT" value="%PYLIGHT_ROOT_DIR%/share/salome/resources/pylight"/>
+  </section>
+</document>

diff --git a/resources/PYLIGHT.png b/resources/PYLIGHT.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/PYLIGHT_en.xml b/resources/PYLIGHT_en.xml
deleted file mode 100644 (file)
index 71a7e16..0000000
--- a/resources/PYLIGHT_en.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='us-ascii'?>
-<!--
-  Copyright (C) 2009-2016  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
-
--->
-<!DOCTYPE application PUBLIC "" "desktop.dtd">
-<application title="PYHELLO component" date="9/12/2001" author="C Caremoli" appId="PYHELLO" >
-<desktop>
-
-
-
-<!-- ### POPUP MENUS ###  -->
-<popupmenu label-id="Popup for ObjectBrowser" context-id="ObjectBrowser" parent-id="" object-id="1010">
-   <popup-item item-id="961" pos-id="" label-id="Remove lines" icon-id="" tooltip-id="Remove selected lines" accel-id="" toggle-id="" execute-action="961"/>
-</popupmenu>
-
-</desktop>
-</application>

diff --git a/resources/PYLIGHT_line_icon.png b/resources/PYLIGHT_line_icon.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/PYLIGHT_paragraph_icon.png b/resources/PYLIGHT_paragraph_icon.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
new file mode 100644 (file)
index 0000000..276f164
--- /dev/null
+++ b/resources/SalomeApp.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE document>
+<document>
+  <import name="LightApp"/>
+</document>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
deleted file mode 100644 (file)
index 77558af..0000000
--- a/resources/SalomeApp.xml.in
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  Copyright (C) 2009-2016  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
-
--->
-<document>
-  <section name="PYLIGHT">
-    <!-- Major module parameters -->
-    <parameter name="name"    value="PyLight"/>
-    <parameter name="icon"    value="PYLIGHT.png"/>
-    <parameter name="version" value="@SALOMEPYLIGHT_VERSION@"/>
-    <parameter name="library" value="SalomePyQtGUILight"/>
-  </section>
-  
-  <section name="resources">
-    <!-- Module resources -->
-    <parameter name="PYLIGHT" value="%PYLIGHT_ROOT_DIR%/share/salome/resources/pylight"/>
-  </section>
-  
-</document>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index ca6946b..4dcad07
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/PYLIGHTGUI/CMakeLists.txt b/src/PYLIGHTGUI/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 809c066..2d0dbad
--- a/src/PYLIGHTGUI/CMakeLists.txt
+++ b/src/PYLIGHTGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  OPEN CASCADE
+# Copyright (C) 2013-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/PYLIGHTGUI/PYLIGHTGUI.py b/src/PYLIGHTGUI/PYLIGHTGUI.py
index 565c22a7b6ceb655dc93cc8d2af89da42498cdb3..bd761d3823a7e31543e6cdbe6731b721af446f00 100644 (file)
--- a/src/PYLIGHTGUI/PYLIGHTGUI.py
+++ b/src/PYLIGHTGUI/PYLIGHTGUI.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016  OPEN CASCADE
+# Copyright (C) 2009-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/PYLIGHTGUI/PYLIGHT_DataModel.py b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
index 37ba1b3132e90372b7c7c0230b60ab5546070866..d19b3f7d0fd5a81e44610a7484a53b0919ffbdd8 100644 (file)
--- a/src/PYLIGHTGUI/PYLIGHT_DataModel.py
+++ b/src/PYLIGHTGUI/PYLIGHT_DataModel.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2016  OPEN CASCADE
+# Copyright (C) 2009-2019  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public