force Application User Model ID for Windows Store

This commit is contained in:
Reinhard Pointner 2016-10-22 02:35:48 +08:00
parent ae21085ea5
commit d84f1783e0
5 changed files with 10 additions and 4 deletions

View File

@ -19,3 +19,6 @@
# look for fpcalc here
-Dnet.filebot.AcoustID.fpcalc="%EXEDIR%\fpcalc.exe"
# force Application User Model ID for Windows Store
-Dnet.filebot.AppUserModelID=PointPlanck.FileBot

View File

@ -246,7 +246,7 @@ public class Main {
frame.setIconImages(ResourceManager.getApplicationIcons());
} else if (isWindowsApp()) {
// Windows specific configuration
WinAppUtilities.setAppUserModelID("net.filebot.FileBot"); // support Windows 7 taskbar behaviours
WinAppUtilities.setAppUserModelID(Settings.getApplicationUserModelID()); // support Windows 7 taskbar behaviours
frame.setIconImages(ResourceManager.getApplicationIcons());
} else {
// generic Linux/FreeBSD/Solaris configuration

View File

@ -118,6 +118,10 @@ public final class Settings {
return false;
}
public static String getApplicationUserModelID() {
return System.getProperty("net.filebot.AppUserModelID", getApplicationName());
}
public static FileChooser getPreferredFileChooser() {
return FileChooser.valueOf(System.getProperty("net.filebot.UserFiles.fileChooser", "Swing"));
}

View File

@ -33,7 +33,6 @@ import javax.swing.JDialog;
import javax.swing.SwingUtilities;
import net.filebot.ResourceManager;
import net.filebot.Settings;
import net.filebot.mac.MacAppUtilities;
import net.filebot.ui.subtitle.upload.SubtitleUploadDialog;
import net.filebot.util.FileUtilities;
@ -170,7 +169,7 @@ abstract class SubtitleDropTarget extends JButton {
return false;
}
if (getSubtitleService().isAnonymous() && !Settings.isAppStore()) {
if (getSubtitleService().isAnonymous() && !isAppStore()) {
log.info(String.format("%s: Please enter your login details.", getSubtitleService().getName()));
return false;
}

View File

@ -199,7 +199,7 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
protected SubtitleRequestProcessor createRequestProcessor() {
SubtitleProvider provider = searchTextField.getSelectButton().getSelectedValue();
if (provider instanceof OpenSubtitlesClient && ((OpenSubtitlesClient) provider).isAnonymous() && !Settings.isAppStore()) {
if (provider instanceof OpenSubtitlesClient && ((OpenSubtitlesClient) provider).isAnonymous() && !isAppStore()) {
log.info(String.format("%s: Please enter your login details first.", ((OpenSubtitlesClient) provider).getName()));
// automatically open login dialog