Ticket #24016: correlation_gui_mockup-4.patch

File correlation_gui_mockup-4.patch, 2.4 KB (added by StephaneP, 3 months ago)

patch base on mockup 4

  • TabularUnified 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 f40d7280ef..a47b4bb734 100644
    a b public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode  
    616616
    617617        gbc = GBC.eol();
    618618        gbc.gridx = 0;
    619         gbc.gridy = y;
     619        gbc.gridy = y++;
    620620        panelTf.add(cbShowThumbs, gbc);
    621621
    622622        gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(0, 12, 0, 0);
    623623        sepDirectionPosition = new JSeparator(SwingConstants.HORIZONTAL);
     624        gbc.gridy = y++;
    624625        panelTf.add(sepDirectionPosition, gbc);
    625626
    626627        gbc = GBC.eol();
    627628        gbc.gridwidth = 3;
     629        gbc.gridy = y++;
    628630        pDirectionPosition = ImageDirectionPositionPanel.forGpxTrace();
    629631        panelTf.add(pDirectionPosition, gbc);
    630632
    631         expertChanged(ExpertToggleAction.isExpert());
    632 
    633         final JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
    634         statusBar.setBorder(BorderFactory.createLoweredBevelBorder());
     633        final JPanel statusPanel = new JPanel(new FlowLayout(FlowLayout.CENTER, 10, 10));
     634        statusPanel.setBorder(BorderFactory.createLoweredBevelBorder());
    635635        statusBarText = new JLabel(" ");
    636         statusBarText.setFont(statusBarText.getFont().deriveFont(Font.PLAIN, 8));
    637         statusBar.add(statusBarText);
     636        statusBarText.setFont(statusBarText.getFont().deriveFont(Font.PLAIN, 12));
     637        statusPanel.add(statusBarText);
     638
     639        gbc = GBC.eol().fill(GridBagConstraints.HORIZONTAL).insets(20, 12, 20, 0);
     640        gbc.gridy = y;
     641        panelTf.add(statusPanel, gbc);
     642
     643        expertChanged(ExpertToggleAction.isExpert());
    638644
    639645        RepaintTheMapListener repaintTheMap = new RepaintTheMapListener(yLayer);
    640646        pDirectionPosition.addFocusListenerOnComponent(repaintTheMap);
    public class CorrelateGpxWithImages extends AbstractAction implements ExpertMode  
    649655        pDirectionPosition.addItemListenerOnComponents(statusBarUpdaterWithRepaint);
    650656
    651657        outerPanel = new JPanel(new BorderLayout());
    652         outerPanel.add(statusBar, BorderLayout.PAGE_END);
    653658
    654659        if (!GraphicsEnvironment.isHeadless()) {
    655660            forEachLayer(CorrelateGpxWithImages::closeDialog);