Re-using ParaView image files

diff --git a/resources/LightApp.xml b/resources/LightApp.xml
index 5f9fd8bf11542ef755f989a3b776da79440a0f1b..db2b2768b1df57b8f6e6168f45878962cdb0494a 100644 (file)
--- a/resources/LightApp.xml
+++ b/resources/LightApp.xml
@@ -2,7 +2,7 @@
   <section name="PARAVIS">
     <!-- Major module parameters -->
     <parameter name="name" value="ParaViS"/>
-    <parameter name="icon" value="PARAVIS.png"/>
+    <parameter name="icon" value="pqAppIcon22.png"/>
   </section>
   <section name="resources">
     <!-- Module resources -->

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 578207e26bf1f014fbfbe695f05ea13324504ec5..85936883f52e102b3e8576072fca023e74350b27 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -26,6 +26,5 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 dist_salomeres_DATA = \
-       PARAVIS.png \
        LightApp.xml \
        SalomeApp.xml

diff --git a/resources/PARAVIS.png b/resources/PARAVIS.png
deleted file mode 100755 (executable)
index b0ab8de..0000000
Binary files a/resources/PARAVIS.png and /dev/null differ

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 5f9fd8bf11542ef755f989a3b776da79440a0f1b..db2b2768b1df57b8f6e6168f45878962cdb0494a 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -2,7 +2,7 @@
   <section name="PARAVIS">
     <!-- Major module parameters -->
     <parameter name="name" value="ParaViS"/>
-    <parameter name="icon" value="PARAVIS.png"/>
+    <parameter name="icon" value="pqAppIcon22.png"/>
   </section>
   <section name="resources">
     <!-- Module resources -->

diff --git a/src/PVGUI/Makefile.am b/src/PVGUI/Makefile.am
index 5cf4e90dd0d3defd97009c833e2c8bb442b9cf95..ce2b9c4c507311a6ffb76e3a6dcb11c51ef17936 100644 (file)
--- a/src/PVGUI/Makefile.am
+++ b/src/PVGUI/Makefile.am
@@ -68,3 +68,11 @@ libPARAVIS_la_LDFLAGS = \
 nodist_salomeres_DATA = \
            PARAVIS_images.qm \
            PARAVIS_msg_en.qm
+
+# Copying ParaView icons to a convenient location
+install-data-local:
+       @echo
+       @echo "Copying ParaView icons to $(salomeresdir)..."
+       @cp -f $(PVHOME)/src/Qt/Components/Resources/Icons/*.png $(salomeresdir)
+       @echo "Copying done"
+       @echo

diff --git a/src/PVGUI/resources/PARAVIS_images.ts b/src/PVGUI/resources/PARAVIS_images.ts
index fe70669e4b23065e7f1c465a6f43685a4ac6f793..32d83a1d3cf082afb7854e517b124b94652e6617 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_images.ts
+++ b/src/PVGUI/resources/PARAVIS_images.ts
@@ -2,16 +2,8 @@
 <context>
     <name>@default</name>
     <message>
-        <source>ICON_LIGHT</source>
-        <translation>LIGHT.png</translation>
-    </message>
-    <message>
-        <source>ICON_LINE</source>
-        <translation>line_icon.png</translation>
-    </message>
-    <message>
-        <source>ICON_PARAGRAPH</source>
-        <translation>paragraph_icon.png</translation>
+        <source>ICON_PARAVIS</source>
+        <translation>pqAppIcon22.png</translation>
     </message>
 </context>
 </TS>