NRI : Rename MED Resources.

diff --git a/Makefile.in b/Makefile.in
index 6e0cc77cde083f124e32a36f3b4955855b6e55e6..4960aa2938fc296fd6e770e573d77b839a84347b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@ SUBDIRS = idl src
 
 RESOURCES_FILES = \
 MEDCatalog.xml \
-Med_en.xml \
+MED_en.xml \
 Data.png \
 Infos.png \
 Structure.png \

diff --git a/build_configure b/build_configure
index c70b9c22901b966bbe5af9de73c88a831b2c1ec7..4edf6f44d32945cc71e51109226ecd3f92692245 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -136,8 +136,8 @@ sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 echo  "])" >> configure.in_tmp1
 
 # delete the link created for AC_OUTPUT
-echo "" >> configure.in_tmp1
-echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+#echo "" >> configure.in_tmp1
+#echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
 \mv configure.in_tmp1 configure.in_new
 \rm  -f configure.in_tmp2 configure.in_tmp3
 

diff --git a/resources/MED_en.xml b/resources/MED_en.xml
new file mode 100644 (file)
index 0000000..f407f64
--- /dev/null
+++ b/resources/MED_en.xml
@@ -0,0 +1,46 @@
+<?xml version='1.0' encoding='us-ascii'?>
+<!DOCTYPE application PUBLIC "" "desktop.dtd">
+
+<!--  GUI customization for MED component  -->
+
+<application
+            title="MED component"
+            author="Paul RASCLE"
+            appId=" MED integrated in SALOME" >
+
+  <desktop>
+
+  <!-- ### MENUBAR ###  -->
+
+    <menubar>
+      <menu-item label-id="MED" item-id="90" pos-id="3">
+        <popup-item item-id="931" pos-id="1" label-id="Mesh selection" icon-id="" tooltip-id="read a Mesh" accel-id="" toggle-id="" execute-action=""/>
+        <popup-item item-id="932" pos-id="2" label-id="Field Selection" icon-id="" tooltip-id="read a Field" accel-id="" toggle-id="" execute-action=""/>
+        <popup-item item-id="933" pos-id="3" label-id="Explore Med File" icon-id="" tooltip-id="explore Med File" accel-id="" toggle-id="" execute-action=""/>
+       <popup-item item-id="934" pos-id="4" label-id="Dump Mesh" icon-id="" tooltip-id="dump Mesh" accel-id="" toggle-id="" execute-action=""/>
+       <popup-item item-id="935" pos-id="5" label-id="Dump SubMesh" icon-id="" tooltip-id="dump Mesh" accel-id="" toggle-id="" execute-action=""/>
+      </menu-item>
+
+    </menubar>
+
+  <!-- ### TOOLBAR ###  -->
+
+    <toolbar label-id="Mesh Generation">
+      <toolbutton-item item-id="4031" label-id="Mesh Selection" icon-id="Data.png" tooltip-id="read a Mesh" accel-id="" toggle-id="" execute-action=""/>
+      <toolbutton-item item-id="4032" label-id="Field Selection" icon-id="Infos.png" tooltip-id="read a Field" accel-id="" toggle-id="" execute-action=""/>
+      <toolbutton-item item-id="4033" label-id="Explore Med File" icon-id="Structure.png" tooltip-id="explore Med File " accel-id="" toggle-id="" execute-action=""/>
+    </toolbar>
+
+  <!-- ### POPUP MENU ###  -->
+
+    <popupmenu label-id="Popup for Viewer" context-id="" parent-id="Viewer" object-id="">
+      <popup-item item-id="8031" pos-id="" label-id="Test Popup" icon-id="" tooltip-id="Just a test for Popup" accel-id="" toggle-id="" execute-action=""/>
+    </popupmenu>
+
+    <popupmenu label-id="Popup for ObjectBrowser" context-id="" parent-id="ObjectBrowser" object-id="">
+      <popup-item item-id="9002" pos-id="" label-id="Erase" icon-id="" tooltip-id="" accel-id="Remove CL from viewer" toggle-id="" execute-action=""/>
+      <popup-item item-id="903" pos-id="" label-id="Display" icon-id="" tooltip-id="Display CL on viewer" accel-id="" toggle-id="" execute-action=""/>
+    </popupmenu>
+
+  </desktop>   
+</application>

diff --git a/resources/Med_en.xml b/resources/Med_en.xml
deleted file mode 100644 (file)
index f407f64..0000000
--- a/resources/Med_en.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version='1.0' encoding='us-ascii'?>
-<!DOCTYPE application PUBLIC "" "desktop.dtd">
-
-<!--  GUI customization for MED component  -->
-
-<application
-            title="MED component"
-            author="Paul RASCLE"
-            appId=" MED integrated in SALOME" >
-
-  <desktop>
-
-  <!-- ### MENUBAR ###  -->
-
-    <menubar>
-      <menu-item label-id="MED" item-id="90" pos-id="3">
-        <popup-item item-id="931" pos-id="1" label-id="Mesh selection" icon-id="" tooltip-id="read a Mesh" accel-id="" toggle-id="" execute-action=""/>
-        <popup-item item-id="932" pos-id="2" label-id="Field Selection" icon-id="" tooltip-id="read a Field" accel-id="" toggle-id="" execute-action=""/>
-        <popup-item item-id="933" pos-id="3" label-id="Explore Med File" icon-id="" tooltip-id="explore Med File" accel-id="" toggle-id="" execute-action=""/>
-       <popup-item item-id="934" pos-id="4" label-id="Dump Mesh" icon-id="" tooltip-id="dump Mesh" accel-id="" toggle-id="" execute-action=""/>
-       <popup-item item-id="935" pos-id="5" label-id="Dump SubMesh" icon-id="" tooltip-id="dump Mesh" accel-id="" toggle-id="" execute-action=""/>
-      </menu-item>
-
-    </menubar>
-
-  <!-- ### TOOLBAR ###  -->
-
-    <toolbar label-id="Mesh Generation">
-      <toolbutton-item item-id="4031" label-id="Mesh Selection" icon-id="Data.png" tooltip-id="read a Mesh" accel-id="" toggle-id="" execute-action=""/>
-      <toolbutton-item item-id="4032" label-id="Field Selection" icon-id="Infos.png" tooltip-id="read a Field" accel-id="" toggle-id="" execute-action=""/>
-      <toolbutton-item item-id="4033" label-id="Explore Med File" icon-id="Structure.png" tooltip-id="explore Med File " accel-id="" toggle-id="" execute-action=""/>
-    </toolbar>
-
-  <!-- ### POPUP MENU ###  -->
-
-    <popupmenu label-id="Popup for Viewer" context-id="" parent-id="Viewer" object-id="">
-      <popup-item item-id="8031" pos-id="" label-id="Test Popup" icon-id="" tooltip-id="Just a test for Popup" accel-id="" toggle-id="" execute-action=""/>
-    </popupmenu>
-
-    <popupmenu label-id="Popup for ObjectBrowser" context-id="" parent-id="ObjectBrowser" object-id="">
-      <popup-item item-id="9002" pos-id="" label-id="Erase" icon-id="" tooltip-id="" accel-id="Remove CL from viewer" toggle-id="" execute-action=""/>
-      <popup-item item-id="903" pos-id="" label-id="Display" icon-id="" tooltip-id="Display CL on viewer" accel-id="" toggle-id="" execute-action=""/>
-    </popupmenu>
-
-  </desktop>   
-</application>

diff --git a/src/MEDGUI/MED_icons.po b/src/MEDGUI/MED_icons.po
new file mode 100644 (file)
index 0000000..e1121dc
--- /dev/null
+++ b/src/MEDGUI/MED_icons.po
@@ -0,0 +1,12 @@
+# This is a Qt message file in .po format.  Each msgid starts with
+# a scope.  This scope should *NOT* be translated - eg. translating
+# from French to English, "Foo::Bar" would be translated to "Pub",
+# not "Foo::Pub".
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2001-06-14 09:11:49 PM CEST\n"
+"PO-Revision-Date: YYYY-MM-DD\n"
+"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+

diff --git a/src/MEDGUI/MED_msg_en.po b/src/MEDGUI/MED_msg_en.po
new file mode 100644 (file)
index 0000000..429a86c
--- /dev/null
+++ b/src/MEDGUI/MED_msg_en.po
@@ -0,0 +1,48 @@
+# This is a Qt message file in .po format.  Each msgid starts with
+# a scope.  This scope should *NOT* be translated - eg. translating
+# from French to English, "Foo::Bar" would be translated to "Pub",
+# not "Foo::Pub".
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2001-09-21 14:31:28 METDST\n"
+"PO-Revision-Date: YYYY-MM-DD\n"
+"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+
+
+#: MedGUI.cxx:50
+msgid "MedGUI::MED_MEN_ALL_FILES"
+msgstr "All Files ( * )"
+
+#: MedGUI.cxx:167
+msgid "MedGUI::MED_MEN_IMPORT"
+msgstr "Import"
+
+#: MedGUI.cxx:49
+msgid "MedGUI::MED_MEN_IMPORT_MED"
+msgstr "MED Files ( *.med )"
+
+#: MedGUI.cxx:296
+msgid "MED_WRN_WARNING"
+msgstr "Warning"
+
+#: MedGUI.cxx:280
+msgid "MED_INF_NOTIMPL"
+msgstr "Not Implemented for this Object"
+
+#: MedGUI.cxx:298
+msgid "MED_BUT_OK"
+msgstr "OK"
+
+#: MedGUI.cxx:297
+msgid "MED_INF_NOIOR"
+msgstr "Object has no IOR"
+
+#: MedGUI.cxx:297
+msgid "MED_INF_MESHNAME"
+msgstr "Please enter the name of the mesh you want to read"
+
+#: MedGUI.cxx:297
+msgid "MED_INF_FIELDNAME"
+msgstr "Please enter the name of the field you want to read"

diff --git a/src/MEDGUI/MED_msg_fr.po b/src/MEDGUI/MED_msg_fr.po
new file mode 100644 (file)
index 0000000..ed84d64
--- /dev/null
+++ b/src/MEDGUI/MED_msg_fr.po
@@ -0,0 +1,12 @@
+# This is a Qt message file in .po format.  Each msgid starts with
+# a scope.  This scope should *NOT* be translated - eg. translating
+# from French to English, "Foo::Bar" would be translated to "Pub",
+# not "Foo::Pub".
+msgid ""
+msgstr ""
+"Project-Id-Version: PROJECT VERSION\n"
+"POT-Creation-Date: 2001-09-21 14:31:28 METDST\n"
+"PO-Revision-Date: YYYY-MM-DD\n"
+"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+

diff --git a/src/MEDGUI/Makefile.in b/src/MEDGUI/Makefile.in
index 47b10e473402aff8e16e3d8c7ed0f4f77dc74d04..1f1cbc764fba77d8255fbfde0e460a2096bafddd 100644 (file)
--- a/src/MEDGUI/Makefile.in
+++ b/src/MEDGUI/Makefile.in
@@ -21,13 +21,13 @@ EXPORT_HEADERS=
 
 # .po files to transform in .qm
 PO_FILES = \
-           MedGUI_icons.po \
-           MedGUI_msg_fr.po \
-           MedGUI_msg_en.po \
+           MED_icons.po \
+           MED_msg_fr.po \
+           MED_msg_en.po \
 
 
 # Libraries targets
-LIB = libMedGUI.la
+LIB = libMEDGUI.la
 LIB_SRC = MedGUI.cxx  
 LIB_MOC = MedGUI.h
 
@@ -44,7 +44,7 @@ LIB_SERVER_IDL =
 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS += -lSalomeGUI -lmedmem -lMEDImpl -lMedEngine -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS += -lSalomeGUI -lmedmem -lMEDImpl -lMEDEngine -L${KERNEL_ROOT_DIR}/lib/salome
 
 
 MED.hh MEDSK.cc: MED.idl

diff --git a/src/MEDGUI/MedGUI_icons.po b/src/MEDGUI/MedGUI_icons.po
deleted file mode 100644 (file)
index e1121dc..0000000
--- a/src/MEDGUI/MedGUI_icons.po
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is a Qt message file in .po format.  Each msgid starts with
-# a scope.  This scope should *NOT* be translated - eg. translating
-# from French to English, "Foo::Bar" would be translated to "Pub",
-# not "Foo::Pub".
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2001-06-14 09:11:49 PM CEST\n"
-"PO-Revision-Date: YYYY-MM-DD\n"
-"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-

diff --git a/src/MEDGUI/MedGUI_msg_en.po b/src/MEDGUI/MedGUI_msg_en.po
deleted file mode 100644 (file)
index 429a86c..0000000
--- a/src/MEDGUI/MedGUI_msg_en.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# This is a Qt message file in .po format.  Each msgid starts with
-# a scope.  This scope should *NOT* be translated - eg. translating
-# from French to English, "Foo::Bar" would be translated to "Pub",
-# not "Foo::Pub".
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2001-09-21 14:31:28 METDST\n"
-"PO-Revision-Date: YYYY-MM-DD\n"
-"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-
-
-#: MedGUI.cxx:50
-msgid "MedGUI::MED_MEN_ALL_FILES"
-msgstr "All Files ( * )"
-
-#: MedGUI.cxx:167
-msgid "MedGUI::MED_MEN_IMPORT"
-msgstr "Import"
-
-#: MedGUI.cxx:49
-msgid "MedGUI::MED_MEN_IMPORT_MED"
-msgstr "MED Files ( *.med )"
-
-#: MedGUI.cxx:296
-msgid "MED_WRN_WARNING"
-msgstr "Warning"
-
-#: MedGUI.cxx:280
-msgid "MED_INF_NOTIMPL"
-msgstr "Not Implemented for this Object"
-
-#: MedGUI.cxx:298
-msgid "MED_BUT_OK"
-msgstr "OK"
-
-#: MedGUI.cxx:297
-msgid "MED_INF_NOIOR"
-msgstr "Object has no IOR"
-
-#: MedGUI.cxx:297
-msgid "MED_INF_MESHNAME"
-msgstr "Please enter the name of the mesh you want to read"
-
-#: MedGUI.cxx:297
-msgid "MED_INF_FIELDNAME"
-msgstr "Please enter the name of the field you want to read"

diff --git a/src/MEDGUI/MedGUI_msg_fr.po b/src/MEDGUI/MedGUI_msg_fr.po
deleted file mode 100644 (file)
index ed84d64..0000000
--- a/src/MEDGUI/MedGUI_msg_fr.po
+++ /dev/null
@@ -1,12 +0,0 @@
-# This is a Qt message file in .po format.  Each msgid starts with
-# a scope.  This scope should *NOT* be translated - eg. translating
-# from French to English, "Foo::Bar" would be translated to "Pub",
-# not "Foo::Pub".
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2001-09-21 14:31:28 METDST\n"
-"PO-Revision-Date: YYYY-MM-DD\n"
-"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-