Changeset 7483 in josm for trunk/src/org/openstreetmap
- Timestamp:
- 2014-09-02T00:23:04+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MapFrame.java
r7218 r7483 26 26 import javax.swing.AbstractButton; 27 27 import javax.swing.Action; 28 import javax.swing.BorderFactory; 28 29 import javax.swing.BoxLayout; 29 30 import javax.swing.ButtonGroup; … … 403 404 * locations. 404 405 * 405 * @param panel The container to fill. Must have a nBorderLayout.406 * @param panel The container to fill. Must have a BorderLayout. 406 407 */ 407 408 public void fillPanel(Container panel) { … … 411 412 * sideToolBar: add map modes icons 412 413 */ 413 if(Main.pref.getBoolean("sidetoolbar.mapmodes.visible", true)) { 414 toolBarActions.setAlignmentX(0.5f); 414 if (Main.pref.getBoolean("sidetoolbar.mapmodes.visible", true)) { 415 toolBarActions.setAlignmentX(0.5f); 416 toolBarActions.setBorder(null); 415 417 toolBarActions.setInheritsPopupMenu(true); 416 418 sideToolBar.add(toolBarActions); … … 425 427 * sideToolBar: add toggle dialogs icons 426 428 */ 427 if (Main.pref.getBoolean("sidetoolbar.toggledialogs.visible", true)) {429 if (Main.pref.getBoolean("sidetoolbar.toggledialogs.visible", true)) { 428 430 ((JToolBar)sideToolBar).addSeparator(new Dimension(0,18)); 429 431 toolBarToggle.setAlignmentX(0.5f); 432 toolBarToggle.setBorder(null); 430 433 toolBarToggle.setInheritsPopupMenu(true); 431 434 sideToolBar.add(toolBarToggle); … … 490 493 }); 491 494 ((JToolBar)sideToolBar).setFloatable(false); 495 sideToolBar.setBorder(BorderFactory.createEmptyBorder(0,1,0,1)); 492 496 493 497 /** -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r7135 r7483 51 51 52 52 import org.openstreetmap.josm.Main; 53 import org.openstreetmap.josm.data.SystemOfMeasurement;54 53 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; 55 54 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; 55 import org.openstreetmap.josm.data.SystemOfMeasurement; 56 56 import org.openstreetmap.josm.data.coor.CoordinateFormat; 57 57 import org.openstreetmap.josm.data.coor.LatLon; … … 299 299 // produces several events as well, which would make this 300 300 // variable true. Of course we only want the popup to show 301 // if the middle mouse button has been pressed in the first 302 // place 301 // if the middle mouse button has been pressed in the first place 303 302 boolean mouseNotMoved = oldMousePos != null 304 303 && oldMousePos.equals(ms.mousePos); … … 722 721 723 722 private final JMenuItem jumpButton = add(Main.main.menu.jumpToAct); 724 723 725 724 private final Collection<JCheckBoxMenuItem> somItems = new ArrayList<>(); 726 725 727 726 private final JSeparator separator = new JSeparator(); 728 727 … … 782 781 this.mv = mapFrame.mapView; 783 782 this.collector = new Collector(mapFrame); 784 783 785 784 // Context menu of status bar 786 785 setComponentPopupMenu(new MapStatusPopupMenu()); … … 817 816 818 817 setLayout(new GridBagLayout()); 819 setBorder(BorderFactory.createEmptyBorder( 5,5,5,5));818 setBorder(BorderFactory.createEmptyBorder(1,2,1,2)); 820 819 821 820 latText.setInheritsPopupMenu(true); … … 834 833 distText.addMouseListener(new MouseAdapter() { 835 834 private final List<String> soms = new ArrayList<>(new TreeSet<>(SystemOfMeasurement.ALL_SYSTEMS.keySet())); 836 835 837 836 @Override 838 837 public void mouseClicked(MouseEvent e) { … … 882 881 thread.start(); 883 882 } 884 883 885 884 /** 886 885 * Updates the system of measurement and displays a notification.
Note:
See TracChangeset
for help on using the changeset viewer.