lbt/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DTG: Fix systray menu redraw on Mac;

Browse Source 
Switch to AWT by default on Mac;
Hide DTG enable form on Mac until we fix headless override in i2prouter
This commit is contained in:
zzz
2016-05-20 14:43:15 +00:00
parent 18b61e7036
commit 101d0691f0
5 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java
View File

@@ -372,8 +372,10 @@ class InternalTrayManager extends TrayManager {
}
PopupMenu awt = trayIcon.getPopupMenu();
if (awt != null) {
awt.remove(0);
awt.insert(status, 0);
MenuItem item = awt.getItem(0);
String oldStatus = item.getLabel();
if (!status.equals(oldStatus))
item.setLabel(status);
}
if (_browserItem != null)
_browserItem.setEnabled(!imminent);

3
apps/desktopgui/src/net/i2p/desktopgui/Main.java
View File

@@ -63,7 +63,8 @@ public class Main implements RouterApp {
*/
private synchronized void startUp() throws Exception {
final TrayManager trayManager;
boolean useSwing = _appContext.getProperty(PROP_SWING, !SystemVersion.isWindows());
boolean useSwingDefault = !(SystemVersion.isWindows() || SystemVersion.isMac());
boolean useSwing = _appContext.getProperty(PROP_SWING, useSwingDefault);
if (_context != null)
trayManager = new InternalTrayManager(_context, this, useSwing);
else

5
apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
View File

@@ -202,7 +202,10 @@ public class ConfigServiceHandler extends FormHandler {
public boolean shouldShowSystray() {
return !
(RouterConsoleRunner.DAEMON_USER.equals(System.getProperty("user.name")) ||
(SystemVersion.isWindows() && _context.hasWrapper() && WrapperManager.isLaunchedAsService()));
(SystemVersion.isWindows() && _context.hasWrapper() && WrapperManager.isLaunchedAsService()) ||
// headless=true is forced in i2prouter script to prevent useless dock icon;
// must fix this first
SystemVersion.isMac());
}
/**