- Timestamp:
- 2016-03-14T23:06:43+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MapFrame.java
r9543 r9996 137 137 public SelectionListDialog selectionListDialog; 138 138 public PropertiesDialog propertiesDialog; 139 public MapPaintDialog mapPaintDialog; 139 140 public NotesDialog noteDialog; 140 141 … … 246 247 addToggleDialog(filterDialog = new FilterDialog()); 247 248 addToggleDialog(new ChangesetDialog(), true); 248 addToggleDialog( new MapPaintDialog());249 addToggleDialog(mapPaintDialog = new MapPaintDialog()); 249 250 addToggleDialog(noteDialog = new NotesDialog()); 250 251 toolBarToggle.setFloatable(false); -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
r9468 r9996 84 84 JLabel lblMyVersion = new JLabel(tr("My version")); 85 85 lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset")); 86 lblMyVersion.setLabelFor(mineVersionInfo); 86 87 add(lblMyVersion, gc); 87 88 … … 95 96 JLabel lblTheirVersion = new JLabel(tr("Their version")); 96 97 lblTheirVersion.setToolTipText(tr("Properties in their dataset, i.e. the server dataset")); 98 lblMyVersion.setLabelFor(theirVersionInfo); 97 99 add(lblTheirVersion, gc); 98 100 … … 106 108 gc.gridx = 5; 107 109 add(theirVersionInfo, gc); 108 109 110 } 110 111 -
trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
r9833 r9996 572 572 final JTabbedPane tabs = new JTabbedPane(); 573 573 574 tabs.add("Info", buildInfoPanel(s));575 574 JLabel lblInfo = new JLabel(tr("Info")); 575 lblInfo.setLabelFor(tabs.add("Info", buildInfoPanel(s))); 576 576 lblInfo.setFont(lblInfo.getFont().deriveFont(Font.PLAIN)); 577 577 tabs.setTabComponentAt(0, lblInfo); … … 583 583 584 584 final JPanel pSource = new JPanel(new GridBagLayout()); 585 tabs.addTab("Source", pSource);586 585 JLabel lblSource = new JLabel(tr("Source")); 586 lblSource.setLabelFor(tabs.add("Source", pSource)); 587 587 lblSource.setFont(lblSource.getFont().deriveFont(Font.PLAIN)); 588 588 tabs.setTabComponentAt(3, lblSource); … … 615 615 if (items.isEmpty()) { 616 616 JLabel lblErrors = new JLabel(tr(title)); 617 lblErrors.setLabelFor(pErrors); 617 618 lblErrors.setFont(lblInfo.getFont().deriveFont(Font.PLAIN)); 618 619 lblErrors.setEnabled(false); … … 621 622 } else { 622 623 JLabel lblErrors = new JLabel(tr(title), icon, JLabel.HORIZONTAL); 624 lblErrors.setLabelFor(pErrors); 623 625 tabs.setTabComponentAt(pos, lblErrors); 624 626 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
r8836 r9996 17 17 class UploadAndSaveProgressRenderer extends JPanel implements ProgressRenderer, PropertyChangeListener { 18 18 19 private JLabel lblTaskTitle;20 private JLabel lblCustomText;21 private JProgressBar progressBar;19 private final JLabel lblTaskTitle = new JLabel(""); 20 private final JLabel lblCustomText = new JLabel(""); 21 private final JProgressBar progressBar = new JProgressBar(JProgressBar.HORIZONTAL); 22 22 23 23 /** … … 39 39 gc.weighty = 0.0; 40 40 gc.insets = new Insets(5, 0, 0, 5); 41 add(lblTaskTitle = new JLabel(""), gc); 41 add(lblTaskTitle, gc); 42 lblTaskTitle.setLabelFor(lblCustomText); 42 43 43 gc.gridx = 0;44 44 gc.gridy = 1; 45 gc.fill = GridBagConstraints.HORIZONTAL; 46 gc.weightx = 1.0; 47 gc.weighty = 0.0; 48 gc.insets = new Insets(5, 0, 0, 5); 49 add(lblCustomText = new JLabel(""), gc); 45 add(lblCustomText, gc); 46 lblCustomText.setLabelFor(progressBar); 50 47 51 gc.gridx = 0;52 48 gc.gridy = 2; 53 gc.fill = GridBagConstraints.HORIZONTAL; 54 gc.weightx = 1.0; 55 gc.weighty = 0.0; 56 gc.insets = new Insets(5, 0, 0, 5); 57 add(progressBar = new JProgressBar(JProgressBar.HORIZONTAL), gc); 49 add(progressBar, gc); 58 50 } 59 51 … … 91 83 public void propertyChange(PropertyChangeEvent evt) { 92 84 if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) { 93 Mode mode = (Mode) evt.getNewValue(); 94 switch(mode) { 95 case EDITING_DATA: setVisible(false); break; 96 case UPLOADING_AND_SAVING: setVisible(true); break; 97 } 85 setVisible(Mode.UPLOADING_AND_SAVING.equals(evt.getNewValue())); 98 86 } 99 87 getParent().validate(); -
trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
r9575 r9996 118 118 lblWarning = new JLabel(""); 119 119 lblWarning.setVisible(false); 120 lblWarning.setLabelFor(jepMessage); 120 121 lblWarning.setIcon(ImageProvider.get("warning-small")); 121 122 lblWarning.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
r9850 r9996 388 388 p.add(label, GBC.std().insets(0, 0, 10, 0)); 389 389 addToPanelAnchor(p, default_, presetInitiallyMatches); 390 label.setLabelFor(component); 390 391 component.setToolTipText(getKeyTooltipText()); 391 392 392 393 return true; 393 394 394 } 395 395 -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
r9972 r9996 180 180 final JLabel label = new JLabel(locale_text + ':'); 181 181 label.setToolTipText(getKeyTooltipText()); 182 label.setLabelFor(value); 182 183 p.add(label, GBC.std().insets(0, 0, 10, 0)); 183 184 p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
Note:
See TracChangeset
for help on using the changeset viewer.