Changeset 9224 in josm

Timestamp:

2015-12-30T22:58:48+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12260 - adjust colors contrast in preferences tables (imagery, shortcuts, advanced preferences)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• gui/dialogs/LayerListDialog.java (modified) (1 diff)
• gui/preferences/advanced/PreferencesTable.java (modified) (4 diffs)
• gui/preferences/imagery/ImageryPreference.java (modified) (4 diffs)
• gui/preferences/shortcut/PrefJPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -50 +50 @@
 import javax.json.JsonWriter;
 import javax.swing.JOptionPane;
-import javax.swing.UIManager;
 import javax.xml.XMLConstants;
 import javax.xml.stream.XMLInputFactory;
@@ -1012 +1011 @@
     public synchronized Color getColor(String colName, Color def) {
         return getColor(colName, null, def);
-    }
-
-    public synchronized Color getUIColor(String colName) {
-        return UIManager.getColor(colName);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -1115 +1115 @@
                 }
                 if (c == null) {
-                    c = Main.pref.getUIColor(isSelected ? "Table.selectionForeground" : "Table.foreground");
+                    c = UIManager.getColor(isSelected ? "Table.selectionForeground" : "Table.foreground");
                 }
                 label.setForeground(c);

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/PreferencesTable.java

@@ -24 +24 @@
 import javax.swing.JRadioButton;
 import javax.swing.JTable;
+import javax.swing.UIManager;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.DefaultTableModel;
@@ -34 +35 @@
 import org.openstreetmap.josm.data.Preferences.StringSetting;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
@@ -298 +300 @@
 
     private static class SettingCellRenderer extends DefaultTableCellRenderer {
-        private final Color backgroundColor = Main.pref.getUIColor("Table.background");
+        private final Color backgroundColor = UIManager.getColor("Table.background");
         private final Color changedColor = Main.pref.getColor(
                          marktr("Advanced Background: Changed"),
                          new Color(200, 255, 200));
-        private final Color foregroundColor = Main.pref.getUIColor("Table.foreground");
         private final Color nonDefaultColor = Main.pref.getColor(
                             marktr("Advanced Background: NonDefault"),
@@ -319 +320 @@
                     display, isSelected, hasFocus, row, column);
 
-            label.setBackground(backgroundColor);
-            if (isSelected) {
-                label.setForeground(foregroundColor);
-            }
+            GuiHelper.setBackgroundReadable(label, backgroundColor);
             if (pe.isChanged()) {
-                label.setBackground(changedColor);
+                GuiHelper.setBackgroundReadable(label, changedColor);
             } else if (!pe.isDefault()) {
-                label.setBackground(nonDefaultColor);
+                GuiHelper.setBackgroundReadable(label, nonDefaultColor);
             }
 

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -37 +37 @@
 import javax.swing.JTable;
 import javax.swing.JToolBar;
+import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -62 +63 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
 import org.openstreetmap.josm.tools.GBC;
@@ -248 +250 @@
                 JLabel label = (JLabel) super.getTableCellRendererComponent(
                         table, value, isSelected, hasFocus, row, column);
-                label.setBackground(Main.pref.getUIColor("Table.background"));
-                if (isSelected) {
-                    label.setForeground(Main.pref.getUIColor("Table.foreground"));
-                }
+                GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
                 if (value != null) { // Fix #8159
                     String t = value.toString();
                     for (ImageryInfo l : layers) {
                         if (l.getExtendedUrl().equals(t)) {
-                            label.setBackground(Main.pref.getColor(
+                            GuiHelper.setBackgroundReadable(label, Main.pref.getColor(
                                     marktr("Imagery Background: Default"),
                                     new Color(200, 255, 200)));
@@ -279 +278 @@
                 JLabel label = (JLabel) super.getTableCellRendererComponent(
                         table, info.getName(), isSelected, hasFocus, row, column);
-                label.setBackground(Main.pref.getUIColor("Table.background"));
-                if (isSelected) {
-                    label.setForeground(Main.pref.getUIColor("Table.foreground"));
-                }
+                GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
                 label.setToolTipText(info.getToolTipText());
                 return label;

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -33 +33 @@
 import javax.swing.RowFilter;
 import javax.swing.SwingConstants;
+import javax.swing.UIManager;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
@@ -44 +45 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -169 +171 @@
             JLabel label = (JLabel) super.getTableCellRendererComponent(
                 table, name ? sc.getLongText() : sc.getKeyText(), isSelected, hasFocus, row, column);
-            label.setBackground(Main.pref.getUIColor("Table.background"));
-            if (isSelected) {
-                label.setForeground(Main.pref.getUIColor("Table.foreground"));
-            }
+            GuiHelper.setBackgroundReadable(label, UIManager.getColor("Table.background"));
             if (sc.isAssignedUser()) {
-                label.setBackground(Main.pref.getColor(
+                GuiHelper.setBackgroundReadable(label, Main.pref.getColor(
                         marktr("Shortcut Background: User"),
                         new Color(200, 255, 200)));
             } else if (!sc.isAssignedDefault()) {
-                label.setBackground(Main.pref.getColor(
+                GuiHelper.setBackgroundReadable(label, Main.pref.getColor(
                         marktr("Shortcut Background: Modified"),
                         new Color(255, 255, 200)));