Changeset 101d069


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • apps/desktopgui/src/net/i2p/desktopgui/InternalTrayManager.java

    r18b61e7 r101d069  
    373373        PopupMenu awt = trayIcon.getPopupMenu();
    374374        if (awt != null) {
    375             awt.remove(0);
    376             awt.insert(status, 0);
     375            MenuItem item = awt.getItem(0);
     376            String oldStatus = item.getLabel();
     377            if (!status.equals(oldStatus))
     378                item.setLabel(status);
    377379        }
    378380        if (_browserItem != null)
  • apps/desktopgui/src/net/i2p/desktopgui/Main.java

    r18b61e7 r101d069  
    6464    private synchronized void startUp() throws Exception {
    6565        final TrayManager trayManager;
    66         boolean useSwing = _appContext.getProperty(PROP_SWING, !SystemVersion.isWindows());
     66        boolean useSwingDefault = !(SystemVersion.isWindows() || SystemVersion.isMac());
     67        boolean useSwing = _appContext.getProperty(PROP_SWING, useSwingDefault);
    6768        if (_context != null)
    6869            trayManager = new InternalTrayManager(_context, this, useSwing);
  • apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java

    r18b61e7 r101d069  
    203203        return !
    204204            (RouterConsoleRunner.DAEMON_USER.equals(System.getProperty("user.name")) ||
    205              (SystemVersion.isWindows() && _context.hasWrapper() && WrapperManager.isLaunchedAsService()));
     205             (SystemVersion.isWindows() && _context.hasWrapper() && WrapperManager.isLaunchedAsService()) ||
     206             // headless=true is forced in i2prouter script to prevent useless dock icon;
     207             // must fix this first
     208             SystemVersion.isMac());
    206209    }
    207210
  • history.txt

    r18b61e7 r101d069  
     12016-05-20 zzz
     2 * DesktopGui:
     3   - Fix systray menu redraw on Mac;
     4   - Switch to AWT by default on Mac;
     5   - Hide DTG enable on Mac until we fix dock
     6
     72016-05-19 zzz
     8 * Config files, eepsite help: Add path information for OS X
     9   and Windows as a service. (ticket #1495)
     10
     112016-05-12 zzz
     12 * NTP:
     13   - Don't put random data in zeroed fields
     14   - Increase random data in originate timestamp from 1 byte to 2 bytes
     15   - Verify originate timestamp to prevent injection
     16   - Verify received packet size
     17 * SSU:
     18   - If configured with a hostname, bind to all v4/v6
     19     addresses found for that hostname.
     20   - Fix binding if more than one IP or host was configured.
     21
     222016-05-09 zzz
     23 * Console:
     24   - Fix escaping of search URLs on /confighome
     25   - Fix HTML error on /configui
     26 * DesktopGui: Add 9 new translations
     27 * i2psnark: Limit cases when we display tracker errors;
     28   include host name of tracker when we do
     29
     302016-05-08 zzz
     31 * Console: Fix UTF-8 passwords, partial fix for usernames
     32
    1332016-05-07 zzz
    234 * Build:
  • router/java/src/net/i2p/router/RouterVersion.java

    r18b61e7 r101d069  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 11;
     21    public final static long BUILD = 12;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.