From: san <san@opencascade.com>
Date: Fri, 14 Nov 2008 14:53:29 +0000 (+0000)
Subject: Re-using ParaView image files
X-Git-Tag: PARAVIS_TEST~14
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7f1d15471f6042cd0ba4745d8186c31bfddc6caa;p=modules%2Fparavis.git

Re-using ParaView image files
---

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 b0ab8de6..00000000
Binary files a/resources/PARAVIS.png and /dev/null differ
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>