subhra74
/
xdm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #86 from jotbyte/master 

Fixes for macOS
master
Subhra Das Gupta 2020-04-23 11:04:54 +02:00 committed by GitHub
parent 676dabf6fa 3086e41dbf
commit 2c4b7654c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/xdman/ui/components/MainWindow.java
View File

@ -913,7 +913,17 @@ public class MainWindow extends XDMFrame implements ActionListener {
private void initWindow() {
setIconImage(ImageResource.get("icon.png").getImage());
/* Set Dock icon in macOS */
try {
Taskbar.getTaskbar().setIconImage(ImageResource.get("icon.png").getImage());
} catch (final UnsupportedOperationException | SecurityException e) {
System.out.println("Error setting Dock icon");
}
/* Re-open XDM from dock on macOS */
if (XDMUtils.detectOS() == XDMUtils.MAC){
Desktop.getDesktop().addAppEventListener((AppReopenedListener) e -> XDMApp.getInstance().showMainWindow());
}
showTwitterIcon = true;
showFBIcon = true;
showGitHubIcon = true;
@ -1512,4 +1522,4 @@ public class MainWindow extends XDMFrame implements ActionListener {
// hd.start();
// }
}
}

2
app/src/main/java/xdman/ui/components/TrayHandler.java
View File

@ -111,7 +111,7 @@ public class TrayHandler {
MenuItem restoreItem = new MenuItem(StringResource.get("MSG_RESTORE"));
restoreItem.setFont(FontResource.getBigFont());
restoreItem.addActionListener(act);
addClipItem.setName("ADD_CLIP");
restoreItem.setName("RESTORE");
CheckboxMenuItem monitoringItem = new CheckboxMenuItem(StringResource.get("BROWSER_MONITORING"));
monitoringItem.addItemListener(new ItemListener() {