hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ignore update platform in exporting

Browse Source
This commit is contained in:
SiboVG 2023-04-04 00:21:35 +02:00
parent 86b277e9cb
commit e7e551c090
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swing/src/net/sf/openrocket/gui/util/PreferencesExporter.java
View File

@ -55,6 +55,8 @@ public abstract class PreferencesExporter {
nodesToIgnore.add(SwingPreferences.NODE_WINDOWS); nodesToIgnore.add(SwingPreferences.NODE_WINDOWS);
nodesToIgnore.add(SwingPreferences.NODE_TABLES); nodesToIgnore.add(SwingPreferences.NODE_TABLES);
} }
keysToIgnore.add(SwingPreferences.UPDATE_PLATFORM); // Don't export platform-specific settings
} }

14
swing/src/net/sf/openrocket/gui/util/SwingPreferences.java
View File

@ -42,6 +42,7 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
public static final String NODE_WINDOWS = "windows"; public static final String NODE_WINDOWS = "windows";
public static final String NODE_TABLES = "tables"; public static final String NODE_TABLES = "tables";
public static final String UPDATE_PLATFORM = "UpdatePlatform";
private static final List<Locale> SUPPORTED_LOCALES; private static final List<Locale> SUPPORTED_LOCALES;
static { static {
@ -271,13 +272,22 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
return compdir; return compdir;
} }
/**
* Set the operating system that the software updater will use to redirect you to an installer download link.
* @param platform the operating system to use
*/
public void setUpdatePlatform(UpdatePlatform platform) { public void setUpdatePlatform(UpdatePlatform platform) {
if (platform == null) return; if (platform == null) return;
putString("UpdatePlatform", platform.name()); putString(UPDATE_PLATFORM, platform.name());
} }
/**
* Get the operating system that will be selected when asking for a software update.
* E.g. "Windows" will cause the software updater to default to letting you download a Windows installer.
* @return the operating system that is used
*/
public UpdatePlatform getUpdatePlatform() { public UpdatePlatform getUpdatePlatform() {
String p = getString("UpdatePlatform", SystemInfo.getPlatform().name()); String p = getString(UPDATE_PLATFORM, SystemInfo.getPlatform().name());
if (p == null) return null; if (p == null) return null;
return UpdatePlatform.valueOf(p); return UpdatePlatform.valueOf(p);
} }