Changeset 4289


Ignore:
Timestamp:
08/06/08 12:28:54 (12 years ago)
Author:
curtis
Message:

Add logos for OME and Bio-Formats to About dialog boxes.

Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.properties

    r4265 r4289  
    108108                         ome-java.jar 
    109109formats.files          = loci/formats/** 
    110 formats.resources      = loci/formats/*.txt 
     110formats.resources      = loci/formats/*.txt \ 
     111                         loci/formats/bio-formats-logo.png 
    111112 
    112113### LOCI Plugins for ImageJ ### 
     
    116117loci-plugins.source      = loci/plugins/*.java \ 
    117118                           loci/plugins/config/*.java 
     119loci-plugins.classpath   = bio-formats.jar 
    118120loci-plugins.files       = loci/plugins/* \ 
    119121                           loci/plugins/config/* 
     
    124126### OME I/O ### 
    125127 
    126 ome-io.jar                = ome-io.jar 
    127 ome-io.main               = loci.ome.io.OMEWriter 
    128 ome-io.source             = loci/ome/io/**/*.java 
    129 ome-io.files              = loci/ome/io/** 
     128ome-io.jar       = ome-io.jar 
     129ome-io.main      = loci.ome.io.OMEWriter 
     130ome-io.source    = loci/ome/io/**/*.java 
     131ome-io.classpath = bio-formats.jar 
     132ome-io.files     = loci/ome/io/** 
     133ome-io.resources = loci/ome/io/ome-logo.png 
    130134 
    131135### OME Plugins for ImageJ ### 
    132136 
    133 ome-plugins.jar           = ome_plugins.jar 
    134 ome-plugins.main          = loci.plugins.ome.About 
    135 ome-plugins.source        = loci/plugins/ome/*.java 
    136 ome-plugins.files         = loci/plugins/ome/* 
    137 ome-plugins.extra-root    = loci/plugins/ome 
    138 ome-plugins.extra-files   = plugins.config 
     137ome-plugins.jar         = ome_plugins.jar 
     138ome-plugins.main        = loci.plugins.ome.About 
     139ome-plugins.source      = loci/plugins/ome/*.java 
     140ome-plugins.classpath   = loci_plugins.jar \ 
     141                          ome-io.jar 
     142ome-plugins.files       = loci/plugins/ome/* 
     143ome-plugins.extra-root  = loci/plugins/ome 
     144ome-plugins.extra-files = plugins.config 
    139145 
    140146### VisBio ### 
     
    216222### JVMLink ### 
    217223 
    218 jvmlink.jar       = jvmlink.jar 
    219 jvmlink.main      = loci.jvmlink.JVMLinkServer 
    220 jvmlink.source    = loci/jvmlink/**/*.java 
    221 jvmlink.files     = loci/formats/DataTools*.class \ 
    222                     loci/formats/ReflectException*.class \ 
    223                     loci/formats/ReflectedUniverse*.class \ 
    224                     loci/jvmlink/*.class 
     224jvmlink.jar    = jvmlink.jar 
     225jvmlink.main   = loci.jvmlink.JVMLinkServer 
     226jvmlink.source = loci/jvmlink/**/*.java 
     227jvmlink.files  = loci/formats/DataTools*.class \ 
     228                 loci/formats/ReflectException*.class \ 
     229                 loci/formats/ReflectedUniverse*.class \ 
     230                 loci/jvmlink/*.class 
    225231 
    226232### OME Notes ### 
  • trunk/build.xml

    r4284 r4289  
    596596  <target name="copy-source" depends="init, 
    597597    copy-resources-formats, copy-resources-loci-plugins, 
     598    copy-resources-ome-io, 
    598599    copy-resources-visbio, copy-resources-checks, 
    599600    copy-resources-ome-notes, copy-resources-ome-editor"> 
     
    687688      <manifest> 
    688689        <attribute name="Main-Class" value="${loci-plugins.main}"/> 
     690        <attribute name="Class-Path" value="${loci-plugins.classpath}"/> 
    689691      </manifest> 
    690692    </jar> 
     
    695697 
    696698  <!-- OME I/O --> 
     699 
     700  <target name="copy-resources-ome-io"> 
     701    <copy todir="${classes.dir}" preservelastmodified="true"> 
     702      <fileset dir="${src.dir}" includes="${ome-io.resources}"/> 
     703    </copy> 
     704  </target> 
    697705 
    698706  <target name="style-ome-io" depends="copy-source" 
     
    717725      <manifest> 
    718726        <attribute name="Main-Class" value="${ome-io.main}"/> 
    719         <!--<attribute name="Class-Path" value="${ome-io.classpath}"/>--> 
     727        <attribute name="Class-Path" value="${ome-io.classpath}"/> 
    720728      </manifest> 
    721729    </jar> 
     
    754762      <manifest> 
    755763        <attribute name="Main-Class" value="${ome-plugins.main}"/> 
     764        <attribute name="Class-Path" value="${ome-plugins.classpath}"/> 
    756765      </manifest> 
    757766    </jar> 
  • trunk/loci/plugins/About.java

    r4265 r4289  
    2626package loci.plugins; 
    2727 
     28import javax.swing.ImageIcon; 
    2829import javax.swing.JOptionPane; 
     30import ij.plugin.PlugIn; 
     31import loci.formats.IFormatHandler; 
    2932 
    3033/** 
     
    3538 * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/loci/plugins/About.java">SVN</a></dd></dl> 
    3639 */ 
    37 public final class About { 
     40public final class About implements PlugIn { 
    3841 
    39   private About() { } 
     42  // -- PlugIn API methods -- 
     43 
     44  public void run(String arg) { 
     45    about(); 
     46  } 
     47 
     48  // -- Static utility methods -- 
    4049 
    4150  public static void about() { 
     
    5564      "<br><b>Stack Colorizer</b> and <b>Stack Slicer</b>" + 
    5665      "<br>Author: Melissa Linkert"; 
    57     JOptionPane.showMessageDialog(null, 
    58       msg, "LOCI Plugins for ImageJ", JOptionPane.INFORMATION_MESSAGE); 
     66    ImageIcon bioFormatsLogo = new ImageIcon( 
     67      IFormatHandler.class.getResource("bio-formats-logo.png")); 
     68    JOptionPane.showMessageDialog(null, msg, "LOCI Plugins for ImageJ", 
     69      JOptionPane.INFORMATION_MESSAGE, bioFormatsLogo); 
    5970  } 
     71 
     72  // -- Main method -- 
    6073 
    6174  public static void main(String[] args) { 
  • trunk/loci/plugins/LociImporter.java

    r4265 r4289  
    6565    canceled = false; 
    6666    success = false; 
    67     if ("about".equals(arg)) About.about(); 
    68     else { 
    69       if (!Checker.checkJava() || !Checker.checkImageJ()) return; 
    70       HashSet missing = new HashSet(); 
    71       Checker.checkLibrary(Checker.BIO_FORMATS, missing); 
    72       Checker.checkLibrary(Checker.OME_JAVA_XML, missing); 
    73       if (!Checker.checkMissing(missing)) return; 
    74       new Importer(this).run(arg); 
    75     } 
     67    if (!Checker.checkJava() || !Checker.checkImageJ()) return; 
     68    HashSet missing = new HashSet(); 
     69    Checker.checkLibrary(Checker.BIO_FORMATS, missing); 
     70    Checker.checkLibrary(Checker.OME_JAVA_XML, missing); 
     71    if (!Checker.checkMissing(missing)) return; 
     72    new Importer(this).run(arg); 
    7673  } 
    7774 
  • trunk/loci/plugins/ome/About.java

    r4265 r4289  
    2525package loci.plugins.ome; 
    2626 
     27import javax.swing.ImageIcon; 
    2728import javax.swing.JOptionPane; 
     29import ij.plugin.PlugIn; 
     30import loci.ome.io.OMEReader; 
    2831 
    2932/** 
     
    3437 * <a href="https://skyking.microscopy.wisc.edu/svn/java/trunk/loci/plugins/ome/About.java">SVN</a></dd></dl> 
    3538 */ 
    36 public final class About { 
     39public final class About implements PlugIn { 
    3740 
    38   private About() { } 
     41  // -- Runnable API methods -- 
     42 
     43  public void run(String arg) { 
     44    about(); 
     45  } 
     46 
     47  // -- Static utility methods -- 
    3948 
    4049  public static void about() { 
     
    4756      "<br>Authors: Melissa Linkert, Philip Huettl" + 
    4857      "<br><i>http://www.loci.wisc.edu/ome/ome-plugins.html</i>"; 
    49     JOptionPane.showMessageDialog(null, 
    50       msg, "OME Plugins for ImageJ", JOptionPane.INFORMATION_MESSAGE); 
     58    ImageIcon omeLogo = new ImageIcon( 
     59      OMEReader.class.getResource("ome-logo.png")); 
     60    JOptionPane.showMessageDialog(null, msg, "OME Plugins for ImageJ", 
     61      JOptionPane.INFORMATION_MESSAGE, omeLogo); 
    5162  } 
     63 
     64  // -- Main method -- 
    5265 
    5366  public static void main(String[] args) { 
  • trunk/loci/plugins/ome/plugins.config

    r4265 r4289  
    2323Plugins>OME, "Download from OME or OMERO", loci.plugins.LociImporter("location=[OME server]") 
    2424Plugins>OME, "Upload to OME", loci.plugins.ome.LociUploader("") 
     25 
     26Help>About Plugins, "OME Plugins...", loci.plugins.ome.About("") 
  • trunk/loci/plugins/plugins.config

    r4265 r4289  
    4141Plugins>LOCI, "LOCI Plugins Shortcut Window", loci.plugins.ShortcutPanel("") 
    4242 
    43 Help>About Plugins, "LOCI Plugins...", loci.plugins.LociImporter("about") 
     43Help>About Plugins, "LOCI Plugins...", loci.plugins.About("") 
Note: See TracChangeset for help on using the changeset viewer.