Added more detection for specified tray types

This commit is contained in:
nathan 2016-09-23 13:28:23 +02:00
parent 57450fa35b
commit de46409b8f

View File

@ -32,9 +32,7 @@ import dorkbox.systemTray.SystemTray;
public public
class AppIndicator { class AppIndicator {
public static boolean isVersion3 = false; public static boolean isVersion3 = false;
private static boolean isLoaded = false; private static boolean isLoaded = false;
private static boolean LIBRARY_DEBUG = false; private static boolean LIBRARY_DEBUG = false;
/** /**
@ -55,6 +53,9 @@ class AppIndicator {
if (SystemTray.FORCE_LINUX_TYPE == SystemTray.LINUX_GTK) { if (SystemTray.FORCE_LINUX_TYPE == SystemTray.LINUX_GTK) {
// if we force GTK type system tray, don't attempt to load AppIndicator libs // if we force GTK type system tray, don't attempt to load AppIndicator libs
if (LIBRARY_DEBUG) {
logger.error("Forcing GTK tray, not using appindicator");
}
isLoaded = true; isLoaded = true;
} }
@ -208,11 +209,6 @@ class AppIndicator {
} }
} }
} }
if (!isLoaded) {
throw new RuntimeException("We apologize for this, but we are unable to determine which the appIndicator library is in use, if " +
"or even if it is in use... Please create an issue for this and include your OS type and configuration.");
}
} }
// Note: AppIndicators DO NOT support tooltips, as per mark shuttleworth. Rather stupid IMHO. // Note: AppIndicators DO NOT support tooltips, as per mark shuttleworth. Rather stupid IMHO.