Ticket #24016: correlation_gui_01.patch

File correlation_gui_01.patch, 2.7 KB (added by StephaneP, 18 months ago)
  • src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

    diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
    index c2b7c4bda..abbc341a8 100644
    a b public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode  
    612612
    613613        gbc = GBC.eol();
    614614        gbc.gridx = 0;
    615         gbc.gridy = y;
     615        gbc.gridy = y++;
    616616        panelTf.add(cbShowThumbs, gbc);
    617617
    618618        gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 12, 0, 0);
    619619        sepDirectionPosition = new JSeparator(SwingConstants.HORIZONTAL);
     620        gbc.gridy = y++;
    620621        panelTf.add(sepDirectionPosition, gbc);
    621622
    622623        gbc = GBC.eol();
    623624        gbc.gridwidth = 3;
     625        gbc.gridy = y++;
    624626        pDirectionPosition = ImageDirectionPositionPanel.forGpxTrace();
    625627        panelTf.add(pDirectionPosition, gbc);
    626628
    627         expertChanged(ExpertToggleAction.isExpert());
    628 
    629         final JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
    630         statusBar.setBorder(BorderFactory.createLoweredBevelBorder());
     629        final JPanel statusPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 10, 10));
     630        statusPanel.setBorder(BorderFactory.createLoweredBevelBorder());
    631631        statusBarText = new JLabel(" ");
    632         statusBarText.setFont(statusBarText.getFont().deriveFont(Font.PLAIN, 8));
    633         statusBar.add(statusBarText);
     632        statusBarText.setFont(statusBarText.getFont().deriveFont(Font.PLAIN, 12));
     633        statusPanel.add(statusBarText);
     634
     635        gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 18, 0, 0);
     636        gbc.gridy = y++;
     637        panelTf.add(new JSeparator(SwingConstants.HORIZONTAL), gbc);
     638
     639        gbc = GBC.eol();
     640        gbc.gridy = y++;
     641        panelTf.add(new JLabel(tr("Correlation Status:")));
     642
     643        gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL);
     644        gbc.gridy = y;
     645        panelTf.add(statusPanel, gbc);
     646
     647        expertChanged(ExpertToggleAction.isExpert());
    634648
    635649        RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(yLayer);
    636650        pDirectionPosition.addFocusListenerOnComponent(repaintTheMap);
    public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode  
    645659        pDirectionPosition.addItemListenerOnComponents(statusBarUpdaterWithRepaint);
    646660
    647661        outerPanel = new JPanel(new BorderLayout());
    648         outerPanel.add(statusBar, BorderLayout.PAGE_END);
    649662
    650663        if (!GraphicsEnvironment.isHeadless()) {
    651664            forEachLayer(CorrelateGpxWithImages::closeDialog);