Adjustment

* Adjusted standard dark theme
* Changed Save and Cancel buttons to PrimaryButtons
This commit is contained in:
DieGurke 2019-12-21 13:18:20 +01:00
parent 732c8d1d20
commit ea45c51cf0
2 changed files with 5 additions and 4 deletions

View File

@ -77,8 +77,8 @@ public class Settings {
// Load standard themes not defined in the themes file // Load standard themes not defined in the themes file
themes.put("dark", themes.put("dark",
new Theme("dark", Color.black, Color.darkGray, Color.white, Color.blue, Color.white, Color.orange, Color.blue, Color.white, new Theme("dark", Color.black, Color.darkGray, Color.white, new Color(165, 60, 232), Color.white, Color.orange, Color.blue,
Color.white)); Color.white, Color.white));
themes.put("light", themes.put("light",
new Theme("light", new Color(235, 235, 235), Color.white, Color.white, Color.darkGray, Color.black, Color.orange, Color.darkGray, new Theme("light", new Color(235, 235, 235), Color.white, Color.white, Color.darkGray, Color.black, Color.orange, Color.darkGray,
Color.black, Color.black)); Color.black, Color.black));

View File

@ -12,6 +12,7 @@ import javax.swing.*;
import envoy.client.Settings; import envoy.client.Settings;
import envoy.client.event.EventBus; import envoy.client.event.EventBus;
import envoy.client.event.ThemeChangeEvent; import envoy.client.event.ThemeChangeEvent;
import envoy.client.ui.PrimaryButton;
import envoy.client.ui.Theme; import envoy.client.ui.Theme;
import envoy.client.util.EnvoyLog; import envoy.client.util.EnvoyLog;
@ -39,8 +40,8 @@ public class SettingsScreen extends JDialog {
// OK and cancel buttons // OK and cancel buttons
private final JPanel buttonPane = new JPanel(); private final JPanel buttonPane = new JPanel();
private final JButton okButton = new JButton("Save"); private final PrimaryButton okButton = new PrimaryButton("Save");
private final JButton cancelButton = new JButton("Cancel"); private final PrimaryButton cancelButton = new PrimaryButton("Cancel");
private final Insets insets = new Insets(5, 5, 5, 5); private final Insets insets = new Insets(5, 5, 5, 5);