zdm/envoy
zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Merge pull request #68 from informatik-ag-ngl/f/Theme_and_ThemeSettings_Adjustment

Browse Source 
Adjustment
This commit is contained in:
Kai S. K. Engelbart 2019-12-21 15:03:43 +01:00 committed by GitHub
commit 408cda25f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/envoy/client/Settings.java
View File

@ -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));

5
src/main/java/envoy/client/ui/settings/SettingsScreen.java
View File

@ -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);