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

Show UI restart warning label when font size changes

Browse Source
This commit is contained in:
SiboVG 2023-07-29 04:01:33 +02:00
parent 12265308ec
commit 1d89b9ba4f
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java
View File

@ -24,6 +24,8 @@ import javax.swing.JSpinner;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.Timer; import javax.swing.Timer;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener; import javax.swing.event.DocumentListener;
@ -54,10 +56,15 @@ import net.sf.openrocket.gui.widgets.SelectColorButton;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class GeneralPreferencesPanel extends PreferencesPanel { public class GeneralPreferencesPanel extends PreferencesPanel {
private final UITheme.Theme currentTheme;
private final int currentFontSize;
public GeneralPreferencesPanel(PreferencesDialog parent) { public GeneralPreferencesPanel(PreferencesDialog parent) {
super(parent, new MigLayout("fillx, ins 30lp n n n")); super(parent, new MigLayout("fillx, ins 30lp n n n"));
this.currentTheme = GUIUtil.getUITheme();
this.currentFontSize = preferences.getUIFontSize();
//// Language selector //// Language selector
Locale userLocale; Locale userLocale;
{ {
@ -122,6 +129,16 @@ public class GeneralPreferencesPanel extends PreferencesPanel {
lblRestartORTheme.setForeground(GUIUtil.getUITheme().getDarkWarningColor()); lblRestartORTheme.setForeground(GUIUtil.getUITheme().getDarkWarningColor());
this.add(lblRestartORTheme, "spanx, wrap para*2, growx"); this.add(lblRestartORTheme, "spanx, wrap para*2, growx");
fontSizeSpinner.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
if (fontSizeModel.getValue() == currentFontSize) {
lblRestartORTheme.setText("");
return;
}
lblRestartORTheme.setText(trans.get("generalprefs.lbl.themeRestartOR"));
}
});
themesCombo.addActionListener(new ActionListener() { themesCombo.addActionListener(new ActionListener() {
@Override @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -129,7 +146,7 @@ public class GeneralPreferencesPanel extends PreferencesPanel {
Named<UITheme.Theme> selection = (Named<UITheme.Theme>) themesCombo.getSelectedItem(); Named<UITheme.Theme> selection = (Named<UITheme.Theme>) themesCombo.getSelectedItem();
if (selection == null) return; if (selection == null) return;
UITheme.Theme t = selection.get(); UITheme.Theme t = selection.get();
if (t == GUIUtil.getUITheme()) { if (t == currentTheme) {
lblRestartORTheme.setText(""); lblRestartORTheme.setText("");
return; return;
} }

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

@ -337,9 +337,9 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
} }
private UITheme.Theme getUIThemeAsTheme() { private UITheme.Theme getUIThemeAsTheme() {
String theme = getString(net.sf.openrocket.startup.Preferences.UI_THEME, UITheme.Themes.LIGHT.name()); String themeName = getString(net.sf.openrocket.startup.Preferences.UI_THEME, UITheme.Themes.LIGHT.name());
if (theme == null) return UITheme.Themes.LIGHT; // Default theme if (themeName == null) return UITheme.Themes.LIGHT; // Default theme
return UITheme.Themes.valueOf(theme); return UITheme.Themes.valueOf(themeName);
} }
/** /**