← Back to branch summary

~smaioli/azureus/ubuntu-experimental

« back to all changes in this revision

Viewing changes to org/gudy/azureus2/ui/systray/SystemTraySWT.java

Merged Vuze 4.2.0.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
org/gudy/azureus2/ui/systray/SystemTraySWT.java
25
25
import org.eclipse.swt.SWT;
26
26
import org.eclipse.swt.events.MenuEvent;
27
27
import org.eclipse.swt.events.MenuListener;
 
28
import org.eclipse.swt.graphics.Image;
28
29
import org.eclipse.swt.widgets.*;
29
30
 
30
31
import org.gudy.azureus2.core3.download.DownloadManager;
43
44
import com.aelitis.azureus.ui.common.updater.UIUpdatableAlways;
44
45
import com.aelitis.azureus.ui.swt.UIFunctionsManagerSWT;
45
46
import com.aelitis.azureus.ui.swt.UIFunctionsSWT;
 
47
import com.aelitis.azureus.ui.swt.imageloader.ImageLoader;
46
48
 
47
49
/**
48
50
 * @author Olivier Chalouhi
61
63
        TrayItem trayItem;
62
64
 
63
65
        Menu menu;
 
66
        
 
67
        Image imgAzureus;
 
68
        Image imgAzureusGray;
 
69
        Image imgAzureusWhite;
64
70
 
65
71
        public SystemTraySWT() {
66
72
                uiFunctions = UIFunctionsManagerSWT.getUIFunctionsSWT();
68
74
 
69
75
                tray = display.getSystemTray();
70
76
                trayItem = new TrayItem(tray, SWT.NULL);
71
 
 
72
 
                if(!Constants.isOSX) {
73
 
                        trayItem.setImage(ImageRepository.getImage("azureus"));
 
77
                
 
78
                ImageLoader imageLoader = ImageLoader.getInstance();
 
79
                if (Constants.isOSX) {
 
80
                        imgAzureusGray = imageLoader.getImage("azureus_grey");
 
81
                        imgAzureusWhite = imageLoader.getImage("azureus_white");
 
82
                        trayItem.setImage(imgAzureusGray);
74
83
                } else {
75
 
                        trayItem.setImage(ImageRepository.getImage("azureus_grey"));
 
84
                        imgAzureus = imageLoader.getImage("azureus");
 
85
                        trayItem.setImage(imgAzureus);
76
86
                }
 
87
 
77
88
                trayItem.setVisible(true);
78
89
 
79
90
                menu = new Menu(uiFunctions.getMainShell(), SWT.POP_UP);
82
93
 
83
94
                        public void menuHidden(MenuEvent _menu) {
84
95
                                if(Constants.isOSX) {
85
 
                                        trayItem.setImage(ImageRepository.getImage("azureus_grey"));
 
96
                                        trayItem.setImage(imgAzureusGray);
86
97
                                }
87
98
                        }
88
99
                });
117
128
                                                lastTime = now;
118
129
                                        }
119
130
                                } else if (Constants.isOSX) {
120
 
                                        trayItem.setImage(ImageRepository.getImage("azureus_white"));
 
131
                                        trayItem.setImage(imgAzureusWhite);
121
132
                                        menu.setVisible(true);
122
133
                                }
123
134
                        }
288
299
                                if (trayItem != null && !trayItem.isDisposed()) {
289
300
                                        trayItem.dispose();
290
301
                                }
 
302
 
 
303
                                ImageLoader imageLoader = ImageLoader.getInstance();
 
304
                                if (Constants.isOSX) {
 
305
                                        imageLoader.releaseImage("azureus_grey");
 
306
                                        imageLoader.releaseImage("azureus_white");
 
307
                                } else {
 
308
                                        imageLoader.releaseImage("azureus");
 
309
                                }
291
310
                        }
292
311
                });
293
312
        }