moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-04 06:42:20 -05:00
Code Issues Releases Wiki Activity

SWT: improve tray init, preload image and add a delay on first message

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2338 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2015-02-15 21:53:27 +00:00
parent 28e9d6c55d
commit 1a33f0e43c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/davmail/ui/tray/SwtGatewayTray.java
View File

@ -23,6 +23,7 @@ import davmail.DavGateway;
import davmail.Settings;
import davmail.ui.AboutFrame;
import davmail.ui.SettingsFrame;
import davmail.util.IOUtil;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.lf5.LF5Appender;
@ -36,6 +37,7 @@ import org.eclipse.swt.internal.gtk.OS;
import org.eclipse.swt.widgets.*;
import javax.swing.*;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.URL;
@ -59,6 +61,7 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
private LogBrokerMonitor logBrokerMonitor;
private boolean isActive = true;
private boolean isReady;
private boolean firstMessage = true;
private final Thread mainThread = Thread.currentThread();
@ -144,6 +147,15 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
toolTip.setText(BundleMessage.format("UI_DAVMAIL_GATEWAY"));
toolTip.setMessage(message);
trayItem.setToolTip(toolTip);
// Wait for tray init 1 second on first message
if (firstMessage) {
firstMessage = false;
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
// ignore
}
}
toolTip.setVisible(true);
}
trayItem.setToolTipText(BundleMessage.format("UI_DAVMAIL_GATEWAY") + '\n' + message);
@ -166,7 +178,9 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
if (imageUrl == null) {
throw new IOException(fileName);
}
result = new Image(display, imageUrl.openStream());
byte[] imageContent = IOUtil.readFully(imageUrl.openStream());
result = new Image(display, new ByteArrayInputStream(imageContent));
} catch (IOException e) {
DavGatewayTray.warn(new BundleMessage("LOG_UNABLE_TO_LOAD_IMAGE"), e);
}