Changeset 16960 in josm

Timestamp:

2020-08-29T13:33:25+02:00 (4 years ago)

Author:

simon04

Message:

see #8334 - Add advanced option to scale the table font

Advanced preference keys gui.scale.table.*

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/LayerListDialog.java (modified) (2 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (2 diffs)
• gui/dialogs/relation/SelectionTable.java (modified) (2 diffs)
• gui/download/PlaceSelection.java (modified) (2 diffs)
• gui/history/NodeListViewer.java (modified) (2 diffs)
• gui/history/RelationMemberListViewer.java (modified) (2 diffs)
• gui/history/TagInfoViewer.java (modified) (2 diffs)
• gui/history/VersionTable.java (modified) (2 diffs)
• gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (1 diff)
• gui/layer/imagery/WMTSLayerSelection.java (modified) (2 diffs)
• gui/preferences/SourceEditor.java (modified) (1 diff)
• gui/preferences/advanced/AbstractTableListEditor.java (modified) (2 diffs)
• gui/preferences/advanced/ListEditor.java (modified) (2 diffs)
• gui/preferences/advanced/PreferencesTable.java (modified) (2 diffs)
• gui/preferences/display/ColorPreference.java (modified) (2 diffs)
• gui/preferences/imagery/CacheSettingsPanel.java (modified) (2 diffs)
• gui/preferences/imagery/ImageryPreference.java (modified) (2 diffs)
• gui/preferences/imagery/ImageryProvidersPanel.java (modified) (2 diffs)
• gui/preferences/projection/CodeSelectionPanel.java (modified) (2 diffs)
• gui/preferences/shortcut/PrefJPanel.java (modified) (2 diffs)
• gui/util/TableHelper.java (modified) (3 diffs)
• gui/widgets/JosmTable.java (modified) (2 diffs)
• io/remotecontrol/AddTagsDialog.java (modified) (1 diff)

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

@@ -210 +210 @@
         //
         layerList = new LayerList(model);
+        TableHelper.setFont(layerList, getClass());
         layerList.setSelectionModel(selectionModel);
         layerList.addMouseListener(new PopupMenuHandler());
@@ -919 +920 @@
             Icon icon = layer.getIcon();
             if (layerList != null && icon != null) {
-                layerList.setRowHeight(idx, Math.max(16, icon.getIconHeight()));
+                layerList.setRowHeight(idx, Math.max(layerList.getRowHeight(), icon.getIconHeight()));
             }
             selectionModel.setSelectionInterval(idx, idx);

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -315 +315 @@
     private void buildTagsTable() {
         // setting up the tags table
+        TableHelper.setFont(tagTable, getClass());
         tagData.setColumnIdentifiers(new String[]{tr("Key"), tr("Value")});
         tagTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -339 +340 @@
 
     private void buildMembershipTable() {
+        TableHelper.setFont(membershipTable, getClass());
         membershipData.setColumnIdentifiers(new String[]{tr("Member Of"), tr("Role"), tr("Position")});
         membershipTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTable.java

@@ -9 +9 @@
 import javax.swing.ListSelectionModel;
 import javax.swing.SwingUtilities;
+
+import org.openstreetmap.josm.gui.util.TableHelper;
 
 /**
@@ -32 +34 @@
 
     protected void build() {
+        TableHelper.setFont(this, getClass());
         setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         addMouseListener(new DoubleClickAdapter());

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -51 +51 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -144 +145 @@
         columnmodel = new NamedResultTableColumnModel();
         tblSearchResults = new JTable(model, columnmodel);
+        TableHelper.setFont(tblSearchResults, DownloadDialog.class);
         tblSearchResults.setSelectionModel(selectionModel);
         JScrollPane scrollPane = new JScrollPane(tblSearchResults);

trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.history.History;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 
@@ -41 +42 @@
         final NodeListTableColumnModel columnModel = new NodeListTableColumnModel();
         final JTable table = new JTable(tableModel, columnModel);
+        TableHelper.setFont(table, getClass());
         tableModel.addTableModelListener(new ReversedChangeListener(table, columnModel, tr("The nodes of this way are in reverse order")));
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 
@@ -32 +33 @@
         final RelationMemberTableColumnModel columnModel = new RelationMemberTableColumnModel();
         final JTable table = new JTable(tableModel, columnModel);
+        TableHelper.setFont(table, getClass());
         tableModel.addTableModelListener(new ReversedChangeListener(
                 table, columnModel, tr("The members of this relation are in reverse order")));

trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java

@@ -25 +25 @@
 import org.openstreetmap.josm.gui.dialogs.properties.HelpTagAction;
 import org.openstreetmap.josm.gui.dialogs.properties.TaginfoAction;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 
@@ -67 +68 @@
         TagTableModel tagTableModel = model.getTagTableModel(pointInTime);
         JTable table = new JTable(tagTableModel, new TagTableColumnModel());
+        TableHelper.setFont(table, getClass());
         table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());

trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.io.XmlWriter;
@@ -69 +70 @@
         setShowGrid(false);
         setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
+        TableHelper.setFont(this, getClass());
         GuiHelper.setBackgroundReadable(this, UIManager.getColor("Button.background"));
         setIntercellSpacing(new Dimension(6, 0));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -318 +318 @@
             super(model);
             this.content = content;
+            TableHelper.setFont(this, getClass());
         }
 

trunk/src/org/openstreetmap/josm/gui/layer/imagery/WMTSLayerSelection.java

@@ -24 +24 @@
 
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.Layer;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.tools.GBC;
@@ -96 +97 @@
         list = new JTable(
                 new AbstractTableModelExtension(layers));
+        TableHelper.setFont(list, getClass());
         list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         list.setAutoCreateRowSorter(true);

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -338 +338 @@
         iconPathsModel = new IconPathTableModel(selectionModel);
         tblIconPaths = new JTable(iconPathsModel);
+        TableHelper.setFont(tblIconPaths, getClass());
         tblIconPaths.setSelectionModel(selectionModel);
         tblIconPaths.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);

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

@@ -23 +23 @@
 import javax.swing.table.TableCellEditor;
 
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
@@ -55 +56 @@
         tableModel = newTableModel();
         table = new JTable(tableModel);
+        TableHelper.setFont(table, PreferencesTable.class);
         setContent(build(), false);
     }

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

@@ -16 +16 @@
 import javax.swing.table.AbstractTableModel;
 
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.spi.preferences.ListSetting;
@@ -51 +52 @@
         p.add(new JLabel(tr("Key: {0}", entry.getKey())), GBC.eol().insets(0, 0, 5, 0));
         JTable table = new JTable(model);
+        TableHelper.setFont(table, getClass());
         table.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
         table.setTableHeader(null);

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

@@ -31 +31 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.spi.preferences.ListListSetting;
@@ -59 +60 @@
         getColumnModel().getColumn(1).setCellEditor(new SettingCellEditor());
 
+        TableHelper.setFont(this, getClass());
         addMouseListener(new MouseAdapter() {
             @Override public void mouseClicked(MouseEvent e) {

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -53 +53 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.advanced.PreferencesTable;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.FilterField;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -307 +309 @@
 
         colors = new JTable(tableModel);
+        TableHelper.setFont(colors, PreferencesTable.class);
         colors.setAutoCreateRowSorter(true);
         FilterField colorFilter = new FilterField().filter(colors, tableModel);

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

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.layer.WMTSLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.ButtonColumn;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
@@ -147 +148 @@
     private static JTable getTableForCache(final CacheAccess<String, BufferedImageCacheEntry> cache, final TableModel tableModel) {
         final JTable ret = new JTable(tableModel);
+        TableHelper.setFont(ret, CacheSettingsPanel.class);
 
         ButtonColumn buttonColumn = new ButtonColumn(

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

@@ -41 +41 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Logging;
@@ -198 +199 @@
                 }
             };
+            TableHelper.setFont(list, getClass());
             JScrollPane scroll = new JScrollPane(list);
             add(scroll, GBC.eol().fill(GridBagConstraints.BOTH));

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

@@ -62 +62 @@
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.FilterField;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -224 +225 @@
             }
         };
+        TableHelper.setFont(activeTable, getClass());
         activeTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
 
         defaultModel = new ImageryDefaultLayerTableModel();
         defaultTable = new JTable(defaultModel);
+        TableHelper.setFont(defaultTable, getClass());
         defaultTable.setAutoCreateRowSorter(true);
         defaultFilter = new FilterField().filter(defaultTable, defaultModel);

trunk/src/org/openstreetmap/josm/gui/preferences/projection/CodeSelectionPanel.java

@@ -22 +22 @@
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.preferences.projection.CodeProjectionChoice.CodeComparator;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.tools.GBC;
@@ -97 +98 @@
 
         table = new JTable(model);
+        TableHelper.setFont(table, getClass());
         table.setAutoCreateRowSorter(true);
         JScrollPane scroll = new JScrollPane(table);

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

@@ -41 +41 @@
 import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.util.TableHelper;
 import org.openstreetmap.josm.gui.widgets.FilterField;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -194 +195 @@
 
         // This is the list of shortcuts:
+        TableHelper.setFont(shortcutTable, getClass());
         shortcutTable.setModel(model);
         shortcutTable.getSelectionModel().addListSelectionListener(action);

trunk/src/org/openstreetmap/josm/gui/util/TableHelper.java

@@ -3 +3 @@
 
 import java.awt.Component;
+import java.awt.Font;
 import java.util.stream.IntStream;
 
@@ -14 +15 @@
 
 import org.openstreetmap.josm.gui.dialogs.IEnabledStateUpdating;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -162 +164 @@
         selectionModel.setValueIsAdjusting(false);
     }
+
+    /**
+     * Sets the table font size based on the font scaling from the preferences
+     * @param table the table
+     * @param parent the parent component used for determining the preference key
+     * @see JTable#setFont(Font)
+     * @see JTable#setRowHeight(int)
+     */
+    public static void setFont(JTable table, Class<? extends Component> parent) {
+        double fontFactor = Config.getPref().getDouble("gui.scale.table.font",
+                Config.getPref().getDouble("gui.scale.table." + parent.getSimpleName() + ".font", 1.0));
+        if (fontFactor == 1.0) {
+            return;
+        }
+        Font font = table.getFont();
+        table.setFont(font.deriveFont((float) (font.getSize2D() * fontFactor)));
+        // need to setRowHeight, see comment in javax.swing.plaf.basic.BasicTableUI.installDefaults
+        table.setRowHeight((int) (table.getRowHeight() * fontFactor));
+    }
 }

trunk/src/org/openstreetmap/josm/gui/widgets/JosmTable.java

@@ -17 +17 @@
 import javax.swing.table.TableModel;
 
+import org.openstreetmap.josm.gui.util.TableHelper;
+
 /**
  * Generic table offering custom cell navigation features.
@@ -34 +36 @@
     protected JosmTable(TableModel dm, TableColumnModel cm, ListSelectionModel sm) {
         super(dm, cm, sm);
+        TableHelper.setFont(this, getClass());
     }
 

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -194 +194 @@
         };
 
+        TableHelper.setFont(propertyTable, getClass());
         propertyTable.setAutoCreateRowSorter(true);
         propertyTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);