mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-17 10:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #50

Browse Source
This commit is contained in:
Sebastian Stenzel
2016-03-03 14:16:20 +01:00
parent f05440fe7a
commit 84ee2dfcaa
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
View File

@@ -15,7 +15,6 @@ import javax.inject.Singleton;
import org.cryptomator.ui.controllers.MainController;
import org.cryptomator.ui.settings.Localization;
import org.cryptomator.ui.util.DeferredCloser;
import org.cryptomator.ui.util.TrayIconUtil;
import dagger.Component;

18
main/ui/src/main/java/org/cryptomator/ui/util/TrayIconUtil.java → main/ui/src/main/java/org/cryptomator/ui/TrayIconUtil.java
View File

@@ -6,7 +6,7 @@
* Contributors:
* Sebastian Stenzel - initial API and implementation
*******************************************************************************/
package org.cryptomator.ui.util;
package org.cryptomator.ui;
import java.awt.AWTException;
import java.awt.Image;
@@ -30,6 +30,7 @@ import javax.swing.SwingUtilities;
import org.apache.commons.lang3.SystemUtils;
import org.cryptomator.ui.settings.Localization;
import org.cryptomator.ui.settings.Settings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,17 +38,19 @@ import javafx.application.Platform;
import javafx.stage.Stage;
@Singleton
public final class TrayIconUtil {
class TrayIconUtil {
private static final Logger LOG = LoggerFactory.getLogger(TrayIconUtil.class);
private final Stage mainWindow;
private final Localization localization;
private final Settings settings;
@Inject
public TrayIconUtil(@Named("mainWindow") Stage mainWindow, Localization localization) {
public TrayIconUtil(@Named("mainWindow") Stage mainWindow, Localization localization, Settings settings) {
this.mainWindow = mainWindow;
this.localization = localization;
this.settings = settings;
}
public void initTrayIcon(Runnable exitCommand) {
@@ -83,9 +86,9 @@ public final class TrayIconUtil {
final Image image;
if (SystemUtils.IS_OS_MAC_OSX && isMacMenuBarDarkMode()) {
image = Toolkit.getDefaultToolkit().getImage(TrayIconUtil.class.getResource("/tray_icon_white.png"));
image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon_white.png"));
} else {
image = Toolkit.getDefaultToolkit().getImage(TrayIconUtil.class.getResource("/tray_icon.png"));
image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon.png"));
}
return new TrayIcon(image, localization.getString("app.name"), popup);
@@ -108,6 +111,11 @@ public final class TrayIconUtil {
}
private void showTrayNotification(TrayIcon trayIcon) {
if (settings.getNumTrayNotifications() <= 0) {
return;
} else {
settings.setNumTrayNotifications(settings.getNumTrayNotifications() - 1);
}
final Runnable notificationCmd;
if (SystemUtils.IS_OS_MAC_OSX) {
final String title = localization.getString("tray.infoMsg.title");