From: Ben Soares <b.soares@dundee.ac.uk>
Date: Fri, 12 Feb 2021 18:24:50 +0000 (+0000)
Subject: JAL-3521 High quality file icons for jalview associated files, and associated mime... 
X-Git-Tag: Release_2_11_1_4~9^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Freleases%2FRelease_2_11_1_4_debianpatches;p=jalview.git

JAL-3521 High quality file icons for jalview associated files, and associated mime-type icon references
---

diff --git a/utils/debian/debian/icons/128x128/apps/jalview-icon.png b/utils/debian/debian/icons/128x128/apps/jalview-icon.png
new file mode 100644
index 0000000..83a15fb
Binary files /dev/null and b/utils/debian/debian/icons/128x128/apps/jalview-icon.png differ
diff --git a/utils/debian/debian/icons/16x16/apps/jalview-icon.png b/utils/debian/debian/icons/16x16/apps/jalview-icon.png
new file mode 100644
index 0000000..120bbf8
Binary files /dev/null and b/utils/debian/debian/icons/16x16/apps/jalview-icon.png differ
diff --git a/utils/debian/debian/icons/16x16/mimetypes/x-jalview-file.png b/utils/debian/debian/icons/16x16/mimetypes/x-jalview-file.png
new file mode 100644
index 0000000..af2b2c3
Binary files /dev/null and b/utils/debian/debian/icons/16x16/mimetypes/x-jalview-file.png differ
diff --git a/utils/debian/debian/icons/22x22/mimetypes/x-jalview-file.png b/utils/debian/debian/icons/22x22/mimetypes/x-jalview-file.png
new file mode 100644
index 0000000..f5ac4ba
Binary files /dev/null and b/utils/debian/debian/icons/22x22/mimetypes/x-jalview-file.png differ
diff --git a/utils/debian/debian/icons/24x24/mimetypes/x-jalview-file.png b/utils/debian/debian/icons/24x24/mimetypes/x-jalview-file.png
new file mode 100644
index 0000000..7d9b615
Binary files /dev/null and b/utils/debian/debian/icons/24x24/mimetypes/x-jalview-file.png differ
diff --git a/utils/debian/debian/icons/256x256/apps/jalview-icon.png b/utils/debian/debian/icons/256x256/apps/jalview-icon.png
new file mode 100644
index 0000000..2dc68b0
Binary files /dev/null and b/utils/debian/debian/icons/256x256/apps/jalview-icon.png differ
diff --git a/utils/debian/debian/icons/32x32/apps/jalview-icon.png b/utils/debian/debian/icons/32x32/apps/jalview-icon.png
new file mode 100644
index 0000000..8f8c3f6
Binary files /dev/null and b/utils/debian/debian/icons/32x32/apps/jalview-icon.png differ
diff --git a/utils/debian/debian/icons/32x32/mimetypes/x-jalview-file.png b/utils/debian/debian/icons/32x32/mimetypes/x-jalview-file.png
new file mode 100644
index 0000000..1a6eb7c
Binary files /dev/null and b/utils/debian/debian/icons/32x32/mimetypes/x-jalview-file.png differ
diff --git a/utils/debian/debian/icons/48x48/apps/jalview-icon.png b/utils/debian/debian/icons/48x48/apps/jalview-icon.png
new file mode 100644
index 0000000..b4837fa
Binary files /dev/null and b/utils/debian/debian/icons/48x48/apps/jalview-icon.png differ
diff --git a/utils/debian/debian/icons/48x48/mimetypes/x-jalview-file.png b/utils/debian/debian/icons/48x48/mimetypes/x-jalview-file.png
new file mode 100644
index 0000000..bf482ec
Binary files /dev/null and b/utils/debian/debian/icons/48x48/mimetypes/x-jalview-file.png differ
diff --git a/utils/debian/debian/icons/512x512/apps/jalview-icon.png b/utils/debian/debian/icons/512x512/apps/jalview-icon.png
new file mode 100644
index 0000000..41b845b
Binary files /dev/null and b/utils/debian/debian/icons/512x512/apps/jalview-icon.png differ
diff --git a/utils/debian/debian/icons/512x512/mimetypes/x-jalview-file.png b/utils/debian/debian/icons/512x512/mimetypes/x-jalview-file.png
new file mode 100644
index 0000000..38edb48
Binary files /dev/null and b/utils/debian/debian/icons/512x512/mimetypes/x-jalview-file.png differ
diff --git a/utils/debian/debian/icons/64x64/apps/jalview-icon.png b/utils/debian/debian/icons/64x64/apps/jalview-icon.png
new file mode 100644
index 0000000..2490a8d
Binary files /dev/null and b/utils/debian/debian/icons/64x64/apps/jalview-icon.png differ
diff --git a/utils/debian/debian/jalview-file.png b/utils/debian/debian/jalview-file.png
deleted file mode 100644
index 1d98699..0000000
Binary files a/utils/debian/debian/jalview-file.png and /dev/null differ
diff --git a/utils/debian/debian/jalview-mime.xml b/utils/debian/debian/jalview-mime.xml
index 181fbed..757682c 100644
--- a/utils/debian/debian/jalview-mime.xml
+++ b/utils/debian/debian/jalview-mime.xml
@@ -3,139 +3,139 @@
 
   <mime-type type="application/x-jalview+xml+zip">
     <comment>Jalview File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.jvp" weight="100"/>
   </mime-type>
 
   <mime-type type="chemical/x-cif">
     <comment>CIF File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.cif" weight="40"/>
   </mime-type>
 
   <mime-type type="chemical/x-mmcif">
     <comment>mmCIF File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.mcif" weight="40"/>
     <glob pattern="*.mmcif" weight="40"/>
   </mime-type>
 
   <mime-type type="chemical/x-pdb">
     <comment>PDB File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.pdb" weight="40"/>
     <glob pattern="*.ent" weight="40"/>
   </mime-type>
 
   <mime-type type="application/x-amsa+txt">
     <comment>AMSA File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.amsa" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-jalview-annotations+text">
     <comment>Jalview Annotations File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.annotations" weight="100"/>
     <glob pattern="*.jvannotations" weight="100"/>
   </mime-type>
 
   <mime-type type="application/x-jalview-biojson+json">
     <comment>BioJSON File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.biojson" weight="100"/>
   </mime-type>
 
   <mime-type type="application/x-blc+txt">
     <comment>BLC File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.blc" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-clustal+txt">
     <comment>Clustal File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.aln" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-fasta+txt">
     <comment>Fasta File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.fa" weight="90"/>
     <glob pattern="*.fasta" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-jalview-features+text">
     <comment>Jalview Features File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.features" weight="100"/>
     <glob pattern="*.jvfeatures" weight="100"/>
   </mime-type>
 
   <mime-type type="application/x-gff2+txt">
     <comment>Generic Features Format v2 File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.gff2" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-gff3+txt">
     <comment>Generic Features Format v3 File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.gff3" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-jalview-jnet+text">
     <comment>JnetFile File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.concise" weight="100"/>
     <glob pattern="*.jnet" weight="100"/>
   </mime-type>
 
   <mime-type type="application/x-msf+txt">
     <comment>MSF File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.msf" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-pfam+txt">
     <comment>PFAM File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.pfam" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-phylip+txt">
     <comment>PHYLIP File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.phy" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-pileup+txt">
     <comment>PileUp File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.pileup" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-pir+txt">
     <comment>PIR File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.pir" weight="90"/>
   </mime-type>
 
   <mime-type type="application/rnaml+xml">
     <comment>RNAML File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.rnaml" weight="90"/>
   </mime-type>
 
   <mime-type type="application/x-jalview-scorematrix+text">
     <comment>Substitution Matrix File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.mat" weight="100"/>
   </mime-type>
 
   <mime-type type="application/x-stockholm+txt">
     <comment>Stockholm File</comment>
-    <icon name="jalview-file"/>
+    <generic-icon name="x-jalview-file"/>
     <glob pattern="*.sto" weight="90"/>
     <glob pattern="*.stk" weight="90"/>
   </mime-type>
diff --git a/utils/debian/file_associations_template-shared-mime-info.xml b/utils/debian/file_associations_template-shared-mime-info.xml
index 5136d0b..003423c 100644
--- a/utils/debian/file_associations_template-shared-mime-info.xml
+++ b/utils/debian/file_associations_template-shared-mime-info.xml
@@ -1,6 +1,6 @@
   <mime-type type="$$MIMETYPE$$">
     <comment>$$NAME$$ File</comment>
-    <icon name="$$ICONFILE$$"/>
+    <generic-icon name="$$ICONFILE$$"/>
 $$    <glob pattern="*.EXTENSIONS" weight="$$PRIORITY$$0"/>
 $$  </mime-type>
 
diff --git a/utils/debian/mime_types_for_debian.pl b/utils/debian/mime_types_for_debian.pl
index d6c7bf9..15e1ea1 100755
--- a/utils/debian/mime_types_for_debian.pl
+++ b/utils/debian/mime_types_for_debian.pl
@@ -141,7 +141,7 @@ for my $shortname (@ordered) {
   $MimeType .= $mimetype;
 
   my $iconfile = $a->{iconfile};
-  $iconfile = "jalview-file" unless $iconfile;
+  $iconfile = "x-jalview-file" unless $iconfile;
 
   my $primary = (! grep($_ eq $shortname, @non_primary));
   my $primarystring = $primary?"true":"false";