dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Renamed OsUtil -> OSUtil

Browse Source
This commit is contained in:
nathan 2016-12-28 21:43:36 +01:00
parent 8dfd2d3317
commit 88707b5786
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dorkbox/systemTray/SystemTray.java
View File

@ -57,7 +57,7 @@ import dorkbox.systemTray.util.SystemTrayFixes;
import dorkbox.util.CacheUtil; import dorkbox.util.CacheUtil;
import dorkbox.util.IO; import dorkbox.util.IO;
import dorkbox.util.OS; import dorkbox.util.OS;
import dorkbox.util.OsUtil; import dorkbox.util.OSUtil;
import dorkbox.util.Property; import dorkbox.util.Property;
import dorkbox.util.SwingUtil; import dorkbox.util.SwingUtil;
import dorkbox.util.process.ShellProcessBuilder; import dorkbox.util.process.ShellProcessBuilder;
@ -446,7 +446,7 @@ class SystemTray {
// BLEH. if gnome-shell is running, IT'S REALLY GNOME! // BLEH. if gnome-shell is running, IT'S REALLY GNOME!
// we must ALWAYS do this check!! // we must ALWAYS do this check!!
boolean isReallyGnome = OsUtil.Linux.DesktopEnv.isGnome(); boolean isReallyGnome = OSUtil.Linux.DesktopEnv.isGnome();
if (isReallyGnome) { if (isReallyGnome) {
if (DEBUG) { if (DEBUG) {
@ -476,7 +476,7 @@ class SystemTray {
trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon);
} }
else if ("kde".equalsIgnoreCase(XDG)) { else if ("kde".equalsIgnoreCase(XDG)) {
if (OsUtil.Linux.isFedora()) { if (OSUtil.Linux.isFedora()) {
// Fedora KDE requires GtkStatusIcon // Fedora KDE requires GtkStatusIcon
trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon);
} else { } else {
@ -508,7 +508,7 @@ class SystemTray {
} }
if ("gnome".equalsIgnoreCase(GDM)) { if ("gnome".equalsIgnoreCase(GDM)) {
if (OsUtil.Linux.isArch()) { if (OSUtil.Linux.isArch()) {
if (DEBUG) { if (DEBUG) {
logger.debug("Running Arch Linux."); logger.debug("Running Arch Linux.");
} }
@ -525,7 +525,7 @@ class SystemTray {
// are we fedora? If so, what version? // are we fedora? If so, what version?
// now, what VERSION of fedora? 23/24/25/? don't have AppIndicator installed, so we have to use GtkStatusIcon // now, what VERSION of fedora? 23/24/25/? don't have AppIndicator installed, so we have to use GtkStatusIcon
if (OsUtil.Linux.isFedora()) { if (OSUtil.Linux.isFedora()) {
if (DEBUG) { if (DEBUG) {
logger.debug("Running Fedora"); logger.debug("Running Fedora");
} }
@ -533,7 +533,7 @@ class SystemTray {
// 23 is gtk, 24/25 is gtk (but also wrong size unless we adjust it. ImageUtil automatically does this) // 23 is gtk, 24/25 is gtk (but also wrong size unless we adjust it. ImageUtil automatically does this)
trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon);
} }
else if (OsUtil.Linux.isUbuntu()) { else if (OSUtil.Linux.isUbuntu()) {
// so far, because of the interaction between gnome3 + ubuntu, the GtkStatusIcon miraculously works. // so far, because of the interaction between gnome3 + ubuntu, the GtkStatusIcon miraculously works.
trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon);
} else { } else {
@ -701,7 +701,7 @@ class SystemTray {
} }
if (OsUtil.Linux.isArch()) { if (OSUtil.Linux.isArch()) {
// arch linux is fun! // arch linux is fun!
if (isTrayType(trayType, TrayType.AppIndicator)) { if (isTrayType(trayType, TrayType.AppIndicator)) {

8
src/dorkbox/systemTray/gnomeShell/Extension.java
View File

@ -35,7 +35,7 @@ import java.util.List;
import dorkbox.systemTray.SystemTray; import dorkbox.systemTray.SystemTray;
import dorkbox.util.IO; import dorkbox.util.IO;
import dorkbox.util.OsUtil; import dorkbox.util.OSUtil;
import dorkbox.util.Property; import dorkbox.util.Property;
import dorkbox.util.process.ShellProcessBuilder; import dorkbox.util.process.ShellProcessBuilder;
@ -214,7 +214,7 @@ class Extension {
*/ */
public static public static
void install() { void install() {
if (!ENABLE_EXTENSION_INSTALL || !OsUtil.Linux.DesktopEnv.isGnome()) { if (!ENABLE_EXTENSION_INSTALL || !OSUtil.Linux.DesktopEnv.isGnome()) {
return; return;
} }
@ -222,7 +222,7 @@ class Extension {
boolean hasSystemTray; boolean hasSystemTray;
// should just be 3.14.1 or 3.20 or similar // should just be 3.14.1 or 3.20 or similar
String gnomeVersion = OsUtil.Linux.DesktopEnv.getGnomeVersion(); String gnomeVersion = OSUtil.Linux.DesktopEnv.getGnomeVersion();
if (gnomeVersion == null) { if (gnomeVersion == null) {
return; return;
} }
@ -382,7 +382,7 @@ class Extension {
public static public static
void unInstall() { void unInstall() {
if (!ENABLE_EXTENSION_INSTALL || !OsUtil.Linux.DesktopEnv.isGnome()) { if (!ENABLE_EXTENSION_INSTALL || !OSUtil.Linux.DesktopEnv.isGnome()) {
return; return;
} }

10
src/dorkbox/systemTray/util/ImageUtils.java
View File

@ -51,7 +51,7 @@ import dorkbox.util.FileUtil;
import dorkbox.util.IO; import dorkbox.util.IO;
import dorkbox.util.LocationResolver; import dorkbox.util.LocationResolver;
import dorkbox.util.OS; import dorkbox.util.OS;
import dorkbox.util.OsUtil; import dorkbox.util.OSUtil;
import dorkbox.util.SwingUtil; import dorkbox.util.SwingUtil;
import dorkbox.util.process.ShellProcessBuilder; import dorkbox.util.process.ShellProcessBuilder;
@ -73,7 +73,7 @@ class ImageUtils {
if (SystemTray.AUTO_TRAY_SIZE) { if (SystemTray.AUTO_TRAY_SIZE) {
if (OS.isWindows()) { if (OS.isWindows()) {
int[] version = OsUtil.Windows.getVersion(); int[] version = OSUtil.Windows.getVersion();
// if windows 8.1/10 - default size is x2 // if windows 8.1/10 - default size is x2
@ -155,14 +155,14 @@ class ImageUtils {
String XDG = System.getenv("XDG_CURRENT_DESKTOP"); String XDG = System.getenv("XDG_CURRENT_DESKTOP");
if (XDG == null) { if (XDG == null) {
// Check if plasmashell is running, if it is -- then we are most likely KDE // Check if plasmashell is running, if it is -- then we are most likely KDE
double plasmaVersion = OsUtil.Linux.DesktopEnv.getPlasmaVersion(); double plasmaVersion = OSUtil.Linux.DesktopEnv.getPlasmaVersion();
if (plasmaVersion > 0) { if (plasmaVersion > 0) {
XDG = "kde"; XDG = "kde";
} }
} }
if ("kde".equalsIgnoreCase(XDG)) { if ("kde".equalsIgnoreCase(XDG)) {
double plasmaVersion = OsUtil.Linux.DesktopEnv.getPlasmaVersion(); double plasmaVersion = OSUtil.Linux.DesktopEnv.getPlasmaVersion();
// 1 = 16 // 1 = 16
// 2 = 32 // 2 = 32
@ -222,7 +222,7 @@ class ImageUtils {
} }
// fedora 23+ has a different size for the indicator (NOT default 16px) // fedora 23+ has a different size for the indicator (NOT default 16px)
int fedoraVersion = OsUtil.Linux.getFedoraVersion(); int fedoraVersion = OSUtil.Linux.getFedoraVersion();
if (trayScalingFactor == 0 && fedoraVersion >= 23) { if (trayScalingFactor == 0 && fedoraVersion >= 23) {
if (SystemTray.DEBUG) { if (SystemTray.DEBUG) {
SystemTray.logger.debug("Adjusting tray/menu scaling for FEDORA " + fedoraVersion); SystemTray.logger.debug("Adjusting tray/menu scaling for FEDORA " + fedoraVersion);