Revision: 8281
          
http://languagetool.svn.sourceforge.net/languagetool/?rev=8281&view=rev
Author:   yakovru
Date:     2012-11-02 20:45:19 +0000 (Fri, 02 Nov 2012)
Log Message:
-----------
fix sf bug #3573078  (Tray icon too big sometimes)

Modified Paths:
--------------
    trunk/JLanguageTool/build.xml
    trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java

Added Paths:
-----------
    
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/TrayIconSmall.png

Modified: trunk/JLanguageTool/build.xml
===================================================================
--- trunk/JLanguageTool/build.xml       2012-11-02 06:27:00 UTC (rev 8280)
+++ trunk/JLanguageTool/build.xml       2012-11-02 20:45:19 UTC (rev 8281)
@@ -489,6 +489,7 @@
 
     <target name="common" depends="clean,init,build">
         <copy file="${resource.dir}/org/languagetool/resource/TrayIcon.png" 
todir="${dist.dir}/org/languagetool/resource" />
+        <copy 
file="${resource.dir}/org/languagetool/resource/TrayIconSmall.png" 
todir="${dist.dir}/org/languagetool/resource" />
         <filter filtersFile="build.properties" />
 
         <copy file="./README.txt" todir="${dist.dir}" />

Modified: trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java
===================================================================
--- trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java    
2012-11-02 06:27:00 UTC (rev 8280)
+++ trunk/JLanguageTool/src/main/java/org/languagetool/gui/Main.java    
2012-11-02 20:45:19 UTC (rev 8281)
@@ -57,6 +57,7 @@
   static final String HTML_GREY_FONT_START = "<font face='Arial,Helvetica' 
color='#666666'>";
 
   private static final String SYSTEM_TRAY_ICON_NAME = "/TrayIcon.png";
+  private static final String SYSTEM_TRAY_SMALL_ICON_NAME = 
"/TrayIconSmall.png";
   private static final String SYSTEM_TRAY_TOOLTIP = "LanguageTool";
   private static final String CONFIG_FILE = ".languagetool.cfg";
   private static final int WINDOW_WIDTH = 600;
@@ -227,7 +228,7 @@
     if (!isInTray) {
       final SystemTray tray = SystemTray.getSystemTray();
       final Image img = Toolkit.getDefaultToolkit().getImage(
-              
JLanguageTool.getDataBroker().getFromResourceDirAsUrl(SYSTEM_TRAY_ICON_NAME));
+              
JLanguageTool.getDataBroker().getFromResourceDirAsUrl((tray.getTrayIconSize().height
 > 16 ) ?  SYSTEM_TRAY_ICON_NAME : SYSTEM_TRAY_SMALL_ICON_NAME));
       final PopupMenu popup = makePopupMenu();
       try {
         final TrayIcon trayIcon = new TrayIcon(img, SYSTEM_TRAY_TOOLTIP, 
popup);

Added: 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/TrayIconSmall.png
===================================================================
(Binary files differ)


Property changes on: 
trunk/JLanguageTool/src/main/resources/org/languagetool/resource/TrayIconSmall.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits

Reply via email to