diff --git a/src/dorkbox/systemTray/SystemTray.java b/src/dorkbox/systemTray/SystemTray.java
index eacab9e5..0992c8df 100644
--- a/src/dorkbox/systemTray/SystemTray.java
+++ b/src/dorkbox/systemTray/SystemTray.java
@@ -28,12 +28,12 @@ import java.net.URL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import dorkbox.systemTray.linux.AppIndicatorTray;
import dorkbox.systemTray.linux.GnomeShellExtension;
-import dorkbox.systemTray.linux.GtkSystemTray;
import dorkbox.systemTray.linux.jna.AppIndicator;
import dorkbox.systemTray.linux.jna.Gtk;
-import dorkbox.systemTray.swing.SwingSystemTray;
+import dorkbox.systemTray.swing._AppIndicatorTray;
+import dorkbox.systemTray.swing._GtkStatusIconTray;
+import dorkbox.systemTray.swing._SwingTray;
import dorkbox.systemTray.util.ImageUtils;
import dorkbox.systemTray.util.JavaFX;
import dorkbox.systemTray.util.Swt;
@@ -42,6 +42,7 @@ import dorkbox.util.CacheUtil;
import dorkbox.util.IO;
import dorkbox.util.OS;
import dorkbox.util.Property;
+import dorkbox.util.SwingUtil;
import dorkbox.util.process.ShellProcessBuilder;
@@ -104,7 +105,7 @@ class SystemTray extends Menu {
*
* This is an advanced feature, and it is recommended to leave at 0.
*/
- public static int FORCE_TRAY_TYPE = 0;
+ public static int FORCE_TRAY_TYPE = 2;
@Property
/**
@@ -280,19 +281,19 @@ class SystemTray extends Menu {
if (SystemTray.FORCE_TRAY_TYPE == SystemTray.TYPE_GTK_STATUSICON) {
try {
- trayType = GtkSystemTray.class;
+ trayType = _GtkStatusIconTray.class;
} catch (Throwable e1) {
if (DEBUG) {
- logger.error("Cannot initialize GtkSystemTray", e1);
+ logger.error("Cannot initialize _GtkStatusIconTray", e1);
}
}
}
else if (SystemTray.FORCE_TRAY_TYPE == SystemTray.TYPE_APP_INDICATOR) {
try {
- trayType = AppIndicatorTray.class;
+ trayType = _AppIndicatorTray.class;
} catch (Throwable e1) {
if (DEBUG) {
- logger.error("Cannot initialize AppIndicatorTray", e1);
+ logger.error("Cannot initialize _AppIndicatorTray", e1);
}
}
}
@@ -335,16 +336,26 @@ class SystemTray extends Menu {
if (DEBUG) {
logger.debug("Currently using the '{}' desktop", XDG);
+
+// Properties properties = System.getProperties();
+// for (Map.Entry