Ignore:
Timestamp:
2009-01-12T11:40:15+13:00 (15 years ago)
Author:
kjdon
Message:

updated the rtl-gli branch with files from trunk. Result of a merge 14807:18318, and fixed some conflicts. I think this is the last commit following merging the files. Haven't tried to compile yet... here goes...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gli/branches/rtl-gli/src/org/greenstone/gatherer/gui/AboutDialog.java

    r18297 r18364  
    3434import java.awt.event.*;
    3535import javax.swing.*;
     36
     37import org.greenstone.gatherer.Configuration;
    3638import org.greenstone.gatherer.Dictionary;
    3739import org.greenstone.gatherer.Gatherer;
     
    7375        upper_pane.setComponentOrientation(Dictionary.getOrientation());
    7476       
    75     ImageIcon icon = JarTools.getImage("gatherer_medium.gif");
     77    String gmedium_image = "gatherer_medium.gif";
     78    if (Configuration.fedora_info.isActive()) {
     79        gmedium_image = "fli-" + gmedium_image;
     80    }
     81
     82    ImageIcon icon = JarTools.getImage(gmedium_image);
    7683    ImageIcon scaled_icon = new ImageIcon(icon.getImage().getScaledInstance(ICON_SIZE, ICON_SIZE, Image.SCALE_DEFAULT));
    7784    JLabel icon_label = new JLabel(scaled_icon);
Note: See TracChangeset for help on using the changeset viewer.