Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add an option to not use systray

Browse Source
This commit is contained in:
Laurent Clouet
2016-04-28 19:37:05 +02:00
parent 783475b7fa
commit 718316cb38
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/sheepit/client/standalone/GuiSwing.java
View File

@@ -59,6 +59,7 @@ public class GuiSwing extends JFrame implements Gui {
private Working activityWorking; private Working activityWorking;
private Settings activitySettings; private Settings activitySettings;
private TrayIcon trayIcon; private TrayIcon trayIcon;
private boolean useSysTray;
private int framesRendered; private int framesRendered;
@@ -67,9 +68,9 @@ public class GuiSwing extends JFrame implements Gui {
private ThreadClient threadClient; private ThreadClient threadClient;
public GuiSwing() { public GuiSwing(boolean useSysTray_) {
framesRendered = 0; framesRendered = 0;
useSysTray = useSysTray_;
waitingForAuthentication = true; waitingForAuthentication = true;
} }
@@ -82,21 +83,24 @@ public class GuiSwing extends JFrame implements Gui {
e1.printStackTrace(); e1.printStackTrace();
} }
try { if (useSysTray) {
sysTray = SystemTray.getSystemTray(); try {
if (SystemTray.isSupported()) { sysTray = SystemTray.getSystemTray();
addWindowStateListener(new WindowStateListener() { if (SystemTray.isSupported()) {
public void windowStateChanged(WindowEvent e) { addWindowStateListener(new WindowStateListener() {
if (e.getNewState() == ICONIFIED) { public void windowStateChanged(WindowEvent e) {
hideToTray(); if (e.getNewState() == ICONIFIED) {
hideToTray();
}
} }
} });
}); }
}
catch (UnsupportedOperationException e) {
sysTray = null;
} }
} }
catch (UnsupportedOperationException e) {
sysTray = null;
}
URL iconUrl = getClass().getResource("/icon.png"); URL iconUrl = getClass().getResource("/icon.png");
if (iconUrl != null) { if (iconUrl != null) {

5
src/com/sheepit/client/standalone/Worker.java
View File

@@ -88,6 +88,9 @@ public class Worker {
@Option(name = "--version", usage = "Display application version", required = false, handler = VersionParameterHandler.class) @Option(name = "--version", usage = "Display application version", required = false, handler = VersionParameterHandler.class)
private VersionParameterHandler versionHandler; private VersionParameterHandler versionHandler;
@Option(name = "--no-systray", usage = "Don't use systray", required = false)
private boolean no_systray = false;
public static void main(String[] args) { public static void main(String[] args) {
new Worker().doMain(args); new Worker().doMain(args);
} }
@@ -279,7 +282,7 @@ public class Worker {
System.out.println("You should set a DISPLAY or use a text ui (with -ui " + GuiTextOneLine.type + " or -ui " + GuiText.type + ")."); System.out.println("You should set a DISPLAY or use a text ui (with -ui " + GuiTextOneLine.type + " or -ui " + GuiText.type + ").");
System.exit(3); System.exit(3);
} }
gui = new GuiSwing(); gui = new GuiSwing(no_systray == false);
break; break;
} }
Client cli = new Client(gui, config, server); Client cli = new Client(gui, config, server);