From 7f1d15471f6042cd0ba4745d8186c31bfddc6caa Mon Sep 17 00:00:00 2001
From: san <san@opencascade.com>
Date: Fri, 14 Nov 2008 14:53:29 +0000
Subject: [PATCH] Re-using ParaView image files

---
 resources/LightApp.xml                |   2 +-
 resources/Makefile.am                 |   1 -
 resources/PARAVIS.png                 | Bin 2579 -> 0 bytes
 resources/SalomeApp.xml               |   2 +-
 src/PVGUI/Makefile.am                 |   8 ++++++++
 src/PVGUI/resources/PARAVIS_images.ts |  12 ++----------
 6 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100755 resources/PARAVIS.png

diff --git a/resources/LightApp.xml b/resources/LightApp.xml
index 5f9fd8bf..db2b2768 100644
--- 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 578207e2..85936883 100644
--- 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
index b0ab8de67f0eea925f55b05dc173dd7422adb71f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2579
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
A5dZ)H

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 5f9fd8bf..db2b2768 100644
--- 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 5cf4e90d..ce2b9c4c 100644
--- 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 fe70669e..32d83a1d 100644
--- 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>
-- 
2.39.2