Changeset 16965 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-08-29T16:38:56+02:00 (4 years ago)

Author:

simon04

Message:

fix #19731 - Imagery providers: move reload button next to activate button

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryProvidersPanel.java (modified) (7 diffs)

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -101 +102 @@
     /** The toolbar on the middle of the panel **/
     public final JToolBar middleToolbar;
-    /** The toolbar on the right of default providers **/
-    public final JToolBar defaultToolbar;
 
     // Private members
@@ -261 +260 @@
         JPanel defaultPane = new JPanel(new GridBagLayout());
         JScrollPane scrolldef = new JScrollPane(defaultTable);
-        scrolldef.setPreferredSize(new Dimension(200, 200));
         defaultPane.add(defaultFilter, GBC.eol().insets(0, 0, 0, 0).fill(GridBagConstraints.HORIZONTAL));
         defaultPane.add(scrolldef, GBC.eol().insets(0, 0, 0, 0).fill(GridBagConstraints.BOTH));
@@ -279 +277 @@
         defaultMap.setZoomControlsVisible(false);
         defaultMap.setMinimumSize(new Dimension(100, 200));
-        add(defaultMap, GBC.std().fill(GridBagConstraints.BOTH).weight(0.33, 0.6).insets(5, 0, 0, 0));
+        add(defaultMap, GBC.eol().fill(GridBagConstraints.BOTH).weight(0.33, 0.6).insets(5, 0, 0, 0));
 
         defaultTableListener = new DefListSelectionListener();
         defaultTable.getSelectionModel().addListSelectionListener(defaultTableListener);
-
-        defaultToolbar = new JToolBar(JToolBar.VERTICAL);
-        defaultToolbar.setFloatable(false);
-        defaultToolbar.setBorderPainted(false);
-        defaultToolbar.setOpaque(false);
-        defaultToolbar.add(new ReloadAction());
-        add(defaultToolbar, GBC.eol().anchor(GBC.SOUTH).insets(0, 0, 5, 0));
 
         HtmlPanel help = new HtmlPanel(tr("New default entries can be added in the <a href=\"{0}\">Wiki</a>.",
             Config.getUrls().getJOSMWebsite()+"/wiki/Maps"));
         help.enableClickableHyperlinks();
-        add(help, GBC.eol().insets(10, 0, 0, 0).fill(GBC.HORIZONTAL));
+        add(help, GBC.eol().insets(5, 0, 0, 0).fill(GBC.HORIZONTAL));
 
         ActivateAction activate = new ActivateAction();
@@ -304 +295 @@
         middleToolbar.setBorderPainted(false);
         middleToolbar.setOpaque(false);
+        middleToolbar.add(new ReloadAction());
         middleToolbar.add(btnActivate);
         add(middleToolbar, GBC.eol().anchor(GBC.CENTER).insets(5, 5, 5, 0));
@@ -309 +301 @@
         add(Box.createHorizontalGlue(), GBC.eol().fill(GridBagConstraints.HORIZONTAL));
 
-        add(new JLabel(tr("Selected entries:")), GBC.eol().insets(5, 0, 0, 0));
+        JPanel activePanel = new JPanel(new BorderLayout());
+        activePanel.add(new JLabel(tr("Selected entries:")), BorderLayout.NORTH);
         JScrollPane scroll = new JScrollPane(activeTable);
-        add(scroll, GBC.std().fill(GridBagConstraints.BOTH).span(GridBagConstraints.RELATIVE).weight(1.0, 0.4).insets(5, 0, 0, 5));
-        scroll.setPreferredSize(new Dimension(200, 200));
+        activePanel.add(scroll, BorderLayout.CENTER);
 
         activeToolbar = new JToolBar(JToolBar.VERTICAL);
@@ -322 +314 @@
         activeToolbar.add(new NewEntryAction(ImageryInfo.ImageryType.WMTS));
         activeToolbar.add(remove);
-        add(activeToolbar, GBC.eol().anchor(GBC.NORTH).insets(0, 0, 5, 5));
+        activePanel.add(activeToolbar, BorderLayout.EAST);
+        add(activePanel, GBC.eol().fill(GridBagConstraints.BOTH).weight(2.0, 0.4).insets(5, 0, 0, 5));
     }