From ea45c51cf0576226832a9e91357725473270a0a3 Mon Sep 17 00:00:00 2001 From: DieGurke <55625494+DieGurke@users.noreply.github.com> Date: Sat, 21 Dec 2019 13:18:20 +0100 Subject: [PATCH] Adjustment * Adjusted standard dark theme * Changed Save and Cancel buttons to PrimaryButtons --- src/main/java/envoy/client/Settings.java | 4 ++-- src/main/java/envoy/client/ui/settings/SettingsScreen.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/envoy/client/Settings.java b/src/main/java/envoy/client/Settings.java index 6502049..b1c0b6b 100644 --- a/src/main/java/envoy/client/Settings.java +++ b/src/main/java/envoy/client/Settings.java @@ -77,8 +77,8 @@ public class Settings { // Load standard themes not defined in the themes file themes.put("dark", - new Theme("dark", Color.black, Color.darkGray, Color.white, Color.blue, Color.white, Color.orange, Color.blue, Color.white, - 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)); themes.put("light", new Theme("light", new Color(235, 235, 235), Color.white, Color.white, Color.darkGray, Color.black, Color.orange, Color.darkGray, Color.black, Color.black)); diff --git a/src/main/java/envoy/client/ui/settings/SettingsScreen.java b/src/main/java/envoy/client/ui/settings/SettingsScreen.java index d283d6b..6655767 100644 --- a/src/main/java/envoy/client/ui/settings/SettingsScreen.java +++ b/src/main/java/envoy/client/ui/settings/SettingsScreen.java @@ -12,6 +12,7 @@ import javax.swing.*; import envoy.client.Settings; import envoy.client.event.EventBus; import envoy.client.event.ThemeChangeEvent; +import envoy.client.ui.PrimaryButton; import envoy.client.ui.Theme; import envoy.client.util.EnvoyLog; @@ -39,8 +40,8 @@ public class SettingsScreen extends JDialog { // OK and cancel buttons private final JPanel buttonPane = new JPanel(); - private final JButton okButton = new JButton("Save"); - private final JButton cancelButton = new JButton("Cancel"); + private final PrimaryButton okButton = new PrimaryButton("Save"); + private final PrimaryButton cancelButton = new PrimaryButton("Cancel"); private final Insets insets = new Insets(5, 5, 5, 5);