Changeset 101d069

Timestamp:

May 20, 2016 2:43:15 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

3afe04d

Parents:

18b61e7

Message:

DTG: Fix systray menu redraw on Mac;
Switch to AWT by default on Mac;
Hide DTG enable form on Mac until we fix headless override in i2prouter

Files:

• apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java (modified) (1 diff)
• apps/desktopgui/src/net/i2p/desktopgui/Main.java (modified) (1 diff)
• apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java (modified) (1 diff)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java

@@ -373 +373 @@
         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)

apps/desktopgui/src/net/i2p/desktopgui/Main.java

@@ -64 +64 @@
     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);

apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java

@@ -203 +203 @@
         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());
     }
 

history.txt

@@ +1 @@
+2016-05-20 zzz
+ * DesktopGui:
+   - Fix systray menu redraw on Mac;
+   - Switch to AWT by default on Mac;
+   - Hide DTG enable on Mac until we fix dock
+
+2016-05-19 zzz
+ * Config files, eepsite help: Add path information for OS X
+   and Windows as a service. (ticket #1495)
+
+2016-05-12 zzz
+ * NTP:
+   - Don't put random data in zeroed fields
+   - Increase random data in originate timestamp from 1 byte to 2 bytes
+   - Verify originate timestamp to prevent injection
+   - Verify received packet size
+ * SSU:
+   - If configured with a hostname, bind to all v4/v6
+     addresses found for that hostname.
+   - Fix binding if more than one IP or host was configured.
+
+2016-05-09 zzz
+ * Console:
+   - Fix escaping of search URLs on /confighome
+   - Fix HTML error on /configui
+ * DesktopGui: Add 9 new translations
+ * i2psnark: Limit cases when we display tracker errors;
+   include host name of tracker when we do
+
+2016-05-08 zzz
+ * Console: Fix UTF-8 passwords, partial fix for usernames
+
 2016-05-07 zzz
  * Build:

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 11;
+    public final static long BUILD = 12;
 
     /** for example "-test" */