changes for maxosx

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@2921 ee4ac58c-ac51-4696-9907-e4b3aa274f04

etc/feature_keys_gff

@@ -30,7 +30,7 @@ signal_peptide      ID Name Alias Parent Note colour color
 matches             ID Name Alias Parent Note Target Gap Derives_from Dbxref Ontology_term colour color
 nucleotide_match    ID Name Alias Parent Note Target Gap Derives_from Dbxref Ontology_term gff_source gff_seqname score colour color
 translated_nucleotide_match    ID Name Alias Parent Note Target Gap Derives_from Dbxref Ontology_term colour color
-protein_match       ID Name Alias Parent Note Target Gap Derives_from Dbxref Ontology_term colour color cluster
+protein_match       ID Name Alias Parent Note Target Gap Derives_from Dbxref Ontology_term colour color cluster gff_source gff_seqname score
 sequence_difference ID Name Alias Parent Note Target Gap Derives_from Dbxref Ontology_term colour color
 repeat_region       ID Name Alias Parent Note Target Gap Derives_from Dbxref Ontology_term colour color
 direct_repeat       ID Name Alias Parent Note Target Gap Derives_from Dbxref Ontology_term colour color

etc/qualifier_types_gff

@@ -28,7 +28,7 @@ Name             no         text
 Alias            no         text
 Parent           no         text
 Note             no         "text"
-Product          no         "text" 
+product          no         "text" 
 description      no         text
 Ontology_term    no         text
 gff_source       no         text
@@ -40,8 +40,11 @@ Derives_from     no         text
 Dbxref           no         "text"
 polypeptide      no         text
 polypeptide_domain no       text
+pseudo           no         text
 colour           no         text
 color            no         text
+cluster          no         text
 mass             no         text
 isoelectric      no         text
 charge           no         text
+source           no         text

etc/results_to_netscape

@@ -17,12 +17,12 @@ then
 elif [ -f "/usr/bin/mozilla" ]
 then
   NETSCAPE=/usr/bin/mozilla
-elif [ -f "/Applications/Camino.app/Contents/MacOS/Camino" ]
-then
-  NETSCAPE=/Applications/Camino.app/Contents/MacOS/Camino
 elif [ -f "/Applications/Safari.app/Contents/MacOS/Safari" ]
 then
   NETSCAPE=/Applications/Safari.app/Contents/MacOS/Safari
+elif [ -f "/Applications/Camino.app/Contents/MacOS/Camino" ]
+then
+  NETSCAPE=/Applications/Camino.app/Contents/MacOS/Camino
 fi
 
 
@@ -224,13 +224,15 @@ echo "rm -f $new_file > /dev/null 2>&1" | at now + 12 hours
 
 # MAC OS X => Safari browser
 # The command then is the following
-# if $NETSCAPE $new_file
-
+if [ -f "/Applications/Safari.app/Contents/MacOS/Safari" ]
+then
+  if $NETSCAPE $new_file
+  then
+    exit 0
+  fi
 # For Netscape or mozilla
-#
 # Use openURL($new_file, new-tab) to get new-tab
-#
-if $NETSCAPE -remote "openURL($new_file)"
+elif $NETSCAPE -remote "openURL($new_file)"
 then
     exit 0
 else