new jvl_file svg, png, ico and icns files, and changed references to Jalview-Launch...

diff --git a/utils/install4j/auto_file_associations-i4j8.pl b/utils/install4j/auto_file_associations-i4j8.pl
index f281469..31a4afa 100755 (executable)
--- a/utils/install4j/auto_file_associations-i4j8.pl
+++ b/utils/install4j/auto_file_associations-i4j8.pl
@@ -39,7 +39,7 @@ my $add_associations = {
   annotations => {shortname=>"annotations",name=>"Jalview Annotations",extensions=>["annotations","jvannotations"]},
   mmcif => {shortname=>"mmcif",name=>"CIF",extensions=>["cif"]},
   mmcif2 => {shortname=>"mmcif2",name=>"mmCIF",extensions=>["mcif","mmcif"]},
-  jvl => {shortname=>"jvl",name=>"Jalview Launch",extensions=>["jvl"],iconfile=>"Jalview-Launch"},
+  jvl => {shortname=>"jvl",name=>"Jalview Launch",extensions=>["jvl"],iconfile=>"jvl_file"},
   jnet => {shortname=>"jnet",name=>"JnetFile",extensions=>["concise","jnet"]},
   scorematrix => {shortname=>"scorematrix",name=>"Substitution Matrix",extensions=>["mat"]},
 };

diff --git a/utils/install4j/file_associations_auto-Info_plist.xml b/utils/install4j/file_associations_auto-Info_plist.xml
index 2196a6a..0b927a8 100644 (file)
--- a/utils/install4j/file_associations_auto-Info_plist.xml
+++ b/utils/install4j/file_associations_auto-Info_plist.xml
@@ -28,7 +28,7 @@
 <key>CFBundleTypeName</key>
 <string>Jalview Launch File</string>
 <key>CFBundleTypeIconFile</key>
-<string>Jalview-Launch.icns</string>
+<string>jvl_file.icns</string>
 <key>CFBundleTypeRole</key>
 <string>Editor</string>
 <key>CFBundleTypeMIMETypes</key>

diff --git a/utils/install4j/file_associations_auto-install4j8.xml b/utils/install4j/file_associations_auto-install4j8.xml
index a4bdc49..b995078 100644 (file)
--- a/utils/install4j/file_associations_auto-install4j8.xml
+++ b/utils/install4j/file_associations_auto-install4j8.xml
@@ -66,7 +66,7 @@
                       <property name="launcherId" type="string">JALVIEW</property>
                       <property name="macIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>Jalview-Launch.icns</string>
+                          <string>jvl_file.icns</string>
                         </object>
                       </property>
                       <property name="macRole" type="enum" class="com.install4j.runtime.beans.actions.desktop.MacAssociationRole" value="EDITOR" />
@@ -75,13 +75,13 @@
                       <property name="unix" type="boolean" value="true" />
                       <property name="unixIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>Jalview-Launch.png</string>
+                          <string>jvl_file.png</string>
                         </object>
                       </property>
                       <property name="unixMimeType" type="string">application/x-jalview-jvl+text</property>
                       <property name="windowsIconFile">
                         <object class="com.install4j.api.beans.ExternalFile">
-                          <string>Jalview-Launch.ico</string>
+                          <string>jvl_file.ico</string>
                         </object>
                       </property>
                     </serializedBean>

diff --git a/utils/install4j/install4j8_template.install4j b/utils/install4j/install4j8_template.install4j
index b0828eb..e4e2193 100644 (file)
--- a/utils/install4j/install4j8_template.install4j
+++ b/utils/install4j/install4j8_template.install4j
@@ -1287,7 +1287,7 @@ return console.askYesNo(message, true);
         <file name=".background/jalview_dmg_background.png" file="${compiler:JALVIEW_DIR}/${compiler:MACOS_DMG_BG_IMAGE}" />
         <file name=".DS_Store" file="${compiler:JALVIEW_DIR}/${compiler:MACOS_DMG_DS_STORE}" />
         <file name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/Jalview-File.icns" file="${compiler:JALVIEW_DIR}/${compiler:INSTALL4J_UTILS_DIR}/Jalview-File.icns" />
-        <file name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/Jalview-Launch.icns" file="${compiler:JALVIEW_DIR}/${compiler:INSTALL4J_UTILS_DIR}/Jalview-Launch.icns" />
+        <file name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/Resources/jvl_file.icns" file="${compiler:JALVIEW_DIR}/${compiler:INSTALL4J_UTILS_DIR}/jvl_file.icns" />
         <symlink name="${compiler:JALVIEW_APPLICATION_NAME}.app/Contents/MacOS/${compiler:WRAPPER_LINK}" target="../Resources/app/${compiler:WRAPPER_SCRIPT_BIN_DIR}/${compiler:BASH_WRAPPER_SCRIPT}" />
       </topLevelFiles>
     </macosArchive>

diff --git a/utils/install4j/jvl_file.icns b/utils/install4j/jvl_file.icns
new file mode 100644 (file)
index 0000000..8230feb
Binary files /dev/null and b/utils/install4j/jvl_file.icns differ

diff --git a/utils/install4j/jvl_file.ico b/utils/install4j/jvl_file.ico
new file mode 100644 (file)
index 0000000..8811bc2
Binary files /dev/null and b/utils/install4j/jvl_file.ico differ

diff --git a/utils/install4j/jvl_file.png b/utils/install4j/jvl_file.png
new file mode 100644 (file)
index 0000000..56e9eae
Binary files /dev/null and b/utils/install4j/jvl_file.png differ

diff --git a/utils/install4j/jvl_file.svg b/utils/install4j/jvl_file.svg
new file mode 100644 (file)
index 0000000..c6e01be
--- /dev/null
+++ b/utils/install4j/jvl_file.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 85.33334 85.333347"
+   enable-background="new 0 0 595.238 595.238"
+   xml:space="preserve"
+   sodipodi:docname="jvl_file.svg"
+   width="85.333344"
+   height="85.333344"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="2152"
+   inkscape:window-height="1410"
+   id="namedview11"
+   showgrid="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"
+   inkscape:zoom="2.7754382"
+   inkscape:cx="42.666672"
+   inkscape:cy="42.515809"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1" />
+  <metadata
+   id="metadata41">
+    <rdf:RDF>
+      <cc:Work
+   rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+   rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+   id="defs39">
+    
+    
+    
+    
+    
+    
+  </defs>
+  <g
+   id="g4756"
+   transform="translate(4.0769397e-6,-0.15086052)"><rect
+     style="fill:#0084a9;stroke-width:1"
+     id="rect2"
+     height="20.911402"
+     width="20.91173"
+     y="32.353989"
+     x="32.057495" /><path
+     inkscape:connector-curvature="0"
+     id="polygon4"
+     d="M 0,0.30172379 0.00572055,53.26261 H 10.525655 V 10.821168 H 68.897858 L 58.376942,0.30172379 Z"
+     style="fill:#ad208e;stroke-width:1" /><path
+     inkscape:connector-curvature="0"
+     id="polygon6"
+     d="m 26.699622,26.995298 h 31.67732 L 68.897858,16.921076 H 16.62115 v 36.329112 h 10.078472 z"
+     style="fill:#f78e1e;stroke-width:1" /><polygon
+     transform="matrix(0.16344439,0,0,0.16344439,-6.339681,-5.9678396)"
+     style="fill:#009ddc;stroke-width:6.11828899"
+     id="polygon8"
+     points="137.861,494.236 202.225,558.595 560.882,558.607 560.848,234.574 496.501,234.574 496.501,494.26 " /><polygon
+     transform="matrix(0.16344439,0,0,0.16344439,-6.339681,-5.9678396)"
+     style="fill:#c1d82f;stroke-width:6.11828899"
+     id="polygon10"
+     points="457.329,234.646 395.688,234.646 395.688,395.282 38.904,395.282 100.535,456.929 457.329,456.929 " /><path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:0.1"
+     id="path32"
+     d="M 0.43525241,58.050222" /></g>
+</svg>
\ No newline at end of file