X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=src%2Ftim%2Fprune%2Ffunction%2Fsettings%2FSetDisplaySettings.java;fp=src%2Ftim%2Fprune%2Ffunction%2Fsettings%2FSetDisplaySettings.java;h=fd15a5097399cacd20ff8640954746889c045504;hp=63286c5e86dcddce24736afe427a4bfc410bcb97;hb=8b20e3e027058cdf6ff52993ee5576193d08667a;hpb=2302358503c38817e19f6e529f6c9e530aac0e86

diff --git a/src/tim/prune/function/settings/SetDisplaySettings.java b/src/tim/prune/function/settings/SetDisplaySettings.java
index 63286c5..fd15a50 100644
--- a/src/tim/prune/function/settings/SetDisplaySettings.java
+++ b/src/tim/prune/function/settings/SetDisplaySettings.java
@@ -93,8 +93,11 @@ public class SetDisplaySettings extends GenericFunction
 	private JCheckBox _antialiasCheckbox = null;
 	private JComboBox<Integer> _wpIconCombobox = null;
 	private JRadioButton[] _sizeRadioButtons = null;
+	private JRadioButton[] _windowStyleRadios = null;
 	private JButton _okButton = null;
 
+	private static final String STYLEKEY_NIMBUS = "javax.swing.plaf.nimbus.NimbusLookAndFeel";
+
 
 	/**
 	 * Constructor
@@ -176,6 +179,25 @@ public class SetDisplaySettings extends GenericFunction
 		waypointsPanel.setAlignmentX(Component.CENTER_ALIGNMENT);
 		midPanel.add(waypointsPanel);
 
+		// Panel for window style
+		JPanel windowStylePanel = new JPanel();
+		windowStylePanel.setBorder(BorderFactory.createCompoundBorder(
+			BorderFactory.createEtchedBorder(EtchedBorder.LOWERED), BorderFactory.createEmptyBorder(3, 3, 3, 3))
+		);
+		windowStylePanel.setLayout(new FlowLayout(FlowLayout.CENTER));
+		windowStylePanel.add(new JLabel(I18nManager.getText("dialog.displaysettings.windowstyle")));
+		windowStylePanel.add(Box.createHorizontalStrut(10));
+		ButtonGroup styleGroup = new ButtonGroup();
+		final String[] styleKeys = {"default", "nimbus"};
+		_windowStyleRadios = new JRadioButton[2];
+		for (int i=0; i<2; i++)
+		{
+			_windowStyleRadios[i] = new JRadioButton(
+				I18nManager.getText("dialog.displaysettings.windowstyle." + styleKeys[i]));
+			styleGroup.add(_windowStyleRadios[i]);
+			windowStylePanel.add(_windowStyleRadios[i]);
+		}
+		midPanel.add(windowStylePanel);
 		mainPanel.add(midPanel, BorderLayout.CENTER);
 
 		// button panel at bottom
@@ -221,6 +243,7 @@ public class SetDisplaySettings extends GenericFunction
 		_antialiasCheckbox.setSelected(Config.getConfigBoolean(Config.KEY_ANTIALIAS));
 		_wpIconCombobox.setSelectedIndex(Config.getConfigInt(Config.KEY_WAYPOINT_ICONS));
 		selectIconSizeRadio(Config.getConfigInt(Config.KEY_WAYPOINT_ICON_SIZE));
+		selectWindowStyleRadio(Config.getConfigString(Config.KEY_WINDOW_STYLE));
 		_dialog.setVisible(true);
 	}
 
@@ -240,6 +263,20 @@ public class SetDisplaySettings extends GenericFunction
 		}
 	}
 
+	/**
+	 * Select the corresponding radio button according to the selected style
+	 * @param inValue style string saved in Config
+	 */
+	private void selectWindowStyleRadio(String inValue)
+	{
+		int selectedRadio = 0;
+		if (inValue != null && inValue.equals(STYLEKEY_NIMBUS))
+		{
+			selectedRadio = 1;
+		}
+		_windowStyleRadios[selectedRadio].setSelected(true);
+	}
+
 	/**
 	 * @return numeric value of selected icon size according to radio buttons
 	 */
@@ -267,6 +304,8 @@ public class SetDisplaySettings extends GenericFunction
 		Config.setConfigBoolean(Config.KEY_ANTIALIAS, _antialiasCheckbox.isSelected());
 		Config.setConfigInt(Config.KEY_WAYPOINT_ICONS, _wpIconCombobox.getSelectedIndex());
 		Config.setConfigInt(Config.KEY_WAYPOINT_ICON_SIZE, getSelectedIconSize());
+		final String styleString = (_windowStyleRadios[1].isSelected() ? STYLEKEY_NIMBUS : null);
+		Config.setConfigString(Config.KEY_WINDOW_STYLE, styleString);
 		// refresh display
 		UpdateMessageBroker.informSubscribers(DataSubscriber.MAPSERVER_CHANGED);
 		_dialog.dispose();