I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Un-static part 1

Browse Source 
Replace TrayManager.getInstance() with constructor
Pass Main to TrayManager
Create WindowHandler in TrayManager
Pass WindowHandler to RegisteredFrames
Only create ItoopieHostnameVerifier once, in gui/Main
Pass gui/Main to SettingsFrame
Pass gui/Main to ItoopieHostnameVerifier and CertificateGui
Sync on lock in ItoopieHostnameVerifier.clearRecentlyDenied()
Comment out some main() and other test code
Make some fields non-static
Remove some static initializers
Start gui/Main before the tray icon
Fixed the tray icon on Gnome with a delay in TrayManager
This commit is contained in:
zzz
2022-01-11 11:05:00 -05:00
parent 0498ea69ea
commit 25dd896d26
10 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/net/i2p/itoopie/gui/TrayManager.java
View File

@ -28,45 +28,44 @@ import net.i2p.itoopie.util.IsJar;
*/
public class TrayManager {
private static TrayManager instance = null;
///The tray area, or null if unsupported
protected SystemTray tray = null;
protected SystemTray tray;
///Our tray icon, or null if unsupported
protected TrayIcon trayIcon = null;
protected TrayIcon trayIcon;
private final net.i2p.itoopie.Main main;
/**
* Instantiate tray manager.
*/
protected TrayManager() {}
public static synchronized TrayManager getInstance() {
if(instance == null) {
instance = new TrayManager();
}
return instance;
public TrayManager(net.i2p.itoopie.Main m) {
main = m;
}
/**
* Add the tray icon to the system tray and start everything up.
*/
public synchronized void startManager() {
final WindowHandler windowHandler = new WindowHandler();
windowHandler.toggleFrames();
// so the tray icon works right on Gnome
try { Thread.sleep(500); } catch (InterruptedException ie) {}
SwingUtilities.invokeLater(new Runnable(){
public void run(){
if(SystemTray.isSupported()) {
final Image img = IconLoader.getTrayImage();
tray = SystemTray.getSystemTray();
trayIcon = new TrayIcon(IconLoader.getTrayImage(), "itoopie", getMainMenu());
trayIcon = new TrayIcon(img, "itoopie", getMainMenu());
trayIcon.setImageAutoSize(true); //Resize image to fit the system tray
try {
tray.add(trayIcon);
} catch (AWTException e) { e.printStackTrace(); }
trayIcon.addMouseListener(new MouseAdapter(){
@Override
public void mouseClicked(MouseEvent arg0) {
WindowHandler.toggleFrames();
windowHandler.toggleFrames();
}
});
try {
tray.add(trayIcon);
} catch (AWTException e) {}
}
}
});
@ -106,7 +105,7 @@ public class TrayManager {
@Override
protected Object doInBackground() throws Exception {
Main.beginShutdown();
main.beginShutdown();
return null;
}
}.execute();