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

code polish

Browse Source
This commit is contained in:
nathan 2016-12-26 00:18:42 +01:00
parent c0b3e9260c
commit 849304467c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,6 @@ class Extension {
gsettings.start(); gsettings.start();
String output = ShellProcessBuilder.getOutput(byteArrayOutputStream); String output = ShellProcessBuilder.getOutput(byteArrayOutputStream);
// String output = "'background-logo@fedorahosted.org', 'zyx', 'abs'";
// now we have to enable us if we aren't already enabled // now we have to enable us if we aren't already enabled
@ -104,10 +103,6 @@ class Extension {
String installedExtensions = stringBuilder.toString(); String installedExtensions = stringBuilder.toString();
if (SystemTray.DEBUG) {
logger.debug("Installed extensions are: {}", installedExtensions);
}
// now just split the extensions into a list so it is easier to manage // now just split the extensions into a list so it is easier to manage
String[] split = installedExtensions String[] split = installedExtensions
@ -132,6 +127,10 @@ class Extension {
} }
} }
if (SystemTray.DEBUG) {
logger.debug("Installed extensions are: {}", strings);
}
return strings; return strings;
} }
@ -163,9 +162,9 @@ class Extension {
logger.debug("Setting installed extensions to: {}", stringBuilder.toString()); logger.debug("Setting installed extensions to: {}", stringBuilder.toString());
} }
// gsettings set org.gnome.shell enabled-extensions "['SystemTray@dorkbox']" // gsettings set org.gnome.shell enabled-extensions "['SystemTray@Dorkbox']"
// gsettings set org.gnome.shell enabled-extensions "['background-logo@fedorahosted.org']" // gsettings set org.gnome.shell enabled-extensions "['background-logo@fedorahosted.org']"
// gsettings set org.gnome.shell enabled-extensions "['background-logo@fedorahosted.org', 'SystemTray@dorkbox']" // gsettings set org.gnome.shell enabled-extensions "['background-logo@fedorahosted.org', 'SystemTray@Dorkbox']"
final ShellProcessBuilder setGsettings = new ShellProcessBuilder(outputStream); final ShellProcessBuilder setGsettings = new ShellProcessBuilder(outputStream);
setGsettings.setExecutable("gsettings"); setGsettings.setExecutable("gsettings");
setGsettings.addArgument("set"); setGsettings.addArgument("set");
@ -204,9 +203,9 @@ class Extension {
* @return true if that extension is installed * @return true if that extension is installed
*/ */
public static public static
boolean isTopIconsInstalled() { boolean isInstalled() {
List<String> enabledExtensions = getEnabledExtensions(); List<String> enabledExtensions = getEnabledExtensions();
return enabledExtensions.contains("topIcons@adel.gadllah@gmail.com"); return enabledExtensions.contains("topIcons@adel.gadllah@gmail.com") || enabledExtensions.contains(UID);
} }
@ -372,7 +371,9 @@ class Extension {
logger.debug("Enabling extension in gnome-shell"); logger.debug("Enabling extension in gnome-shell");
enabledExtensions.add(UID); if (!enabledExtensions.contains(UID)) {
enabledExtensions.add(UID);
}
setEnabledExtensions(enabledExtensions); setEnabledExtensions(enabledExtensions);
restartShell(); restartShell();