Changeset 1084 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2008-11-18T19:53:53+01:00 (16 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java
r1054 r1084 20 20 import org.openstreetmap.josm.gui.MapFrame; 21 21 import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener; 22 import org.openstreetmap.josm.tools.Short Cut;22 import org.openstreetmap.josm.tools.Shortcut; 23 23 24 24 public class CommandStackDialog extends ToggleDialog implements CommandQueueListener { … … 29 29 public CommandStackDialog(final MapFrame mapFrame) { 30 30 super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."), 31 Short Cut.registerShortCut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, ShortCut.GROUP_LAYER), 100);31 Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER), 100); 32 32 Main.main.undoRedo.listenerCommands.add(this); 33 33 -
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r1054 r1084 43 43 import org.openstreetmap.josm.gui.OsmPrimitivRenderer; 44 44 import org.openstreetmap.josm.gui.SideButton; 45 import org.openstreetmap.josm.tools.Short Cut;45 import org.openstreetmap.josm.tools.Shortcut; 46 46 47 47 public final class ConflictDialog extends ToggleDialog { … … 53 53 public ConflictDialog() { 54 54 super(tr("Conflict"), "conflict", tr("Merging conflicts."), 55 Short Cut.registerShortCut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")), KeyEvent.VK_C, ShortCut.GROUP_LAYER), 100);55 Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")), KeyEvent.VK_C, Shortcut.GROUP_LAYER), 100); 56 56 displaylist.setCellRenderer(new OsmPrimitivRenderer()); 57 57 displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); -
trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
r1054 r1084 38 38 import org.openstreetmap.josm.tools.GBC; 39 39 import org.openstreetmap.josm.tools.ImageProvider; 40 import org.openstreetmap.josm.tools.Short Cut;40 import org.openstreetmap.josm.tools.Shortcut; 41 41 42 42 /** … … 89 89 public HistoryDialog() { 90 90 super(tr("History"), "history", tr("Display the history of all selected items."), 91 Short Cut.registerShortCut("subwindow:history", tr("Toggle: {0}", tr("History")), KeyEvent.VK_H,92 Short Cut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150);91 Shortcut.registerShortcut("subwindow:history", tr("Toggle: {0}", tr("History")), KeyEvent.VK_H, 92 Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150); 93 93 historyPane.setVisible(false); 94 94 notLoaded.setVisible(true); -
trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
r1054 r1084 40 40 import org.openstreetmap.josm.tools.ImageProvider; 41 41 import org.openstreetmap.josm.tools.ImageProvider.OverlayPosition; 42 import org.openstreetmap.josm.tools.Short Cut;42 import org.openstreetmap.josm.tools.Shortcut; 43 43 44 44 /** … … 160 160 public LayerListDialog(MapFrame mapFrame) { 161 161 super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."), 162 Short Cut.registerShortCut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L, ShortCut.GROUP_LAYER), 100);162 Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L, Shortcut.GROUP_LAYER), 100); 163 163 instance = new JList(model); 164 164 listScrollPane = new JScrollPane(instance); -
trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
r1075 r1084 64 64 import org.openstreetmap.josm.tools.AutoCompleteComboBox; 65 65 import org.openstreetmap.josm.tools.GBC; 66 import org.openstreetmap.josm.tools.Short Cut;66 import org.openstreetmap.josm.tools.Shortcut; 67 67 68 68 /** … … 429 429 public PropertiesDialog(MapFrame mapFrame) { 430 430 super(tr("Properties/Memberships"), "propertiesdialog", tr("Properties for selected objects."), 431 Short Cut.registerShortCut("subwindow:properies", tr("Toggle: {0}", tr("Properties/Memberships")), KeyEvent.VK_P,432 Short Cut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150);431 Shortcut.registerShortcut("subwindow:properies", tr("Toggle: {0}", tr("Properties/Memberships")), KeyEvent.VK_P, 432 Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150); 433 433 434 434 // --------------------------------------- -
trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
r1054 r1084 32 32 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener; 33 33 import org.openstreetmap.josm.tools.GBC; 34 import org.openstreetmap.josm.tools.Short Cut;34 import org.openstreetmap.josm.tools.Shortcut; 35 35 36 36 /** … … 57 57 public RelationListDialog() { 58 58 super(tr("Relations"), "relationlist", tr("Open a list of all relations."), 59 Short Cut.registerShortCut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R, ShortCut.GROUP_LAYER), 150);59 Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Relations")), KeyEvent.VK_R, Shortcut.GROUP_LAYER), 150); 60 60 displaylist.setCellRenderer(new OsmPrimitivRenderer()); 61 61 displaylist.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r1054 r1084 41 41 import org.openstreetmap.josm.gui.OsmPrimitivRenderer; 42 42 import org.openstreetmap.josm.gui.SideButton; 43 import org.openstreetmap.josm.tools.Short Cut;43 import org.openstreetmap.josm.tools.Shortcut; 44 44 45 45 /** … … 78 78 public SelectionListDialog() { 79 79 super(tr("Current Selection"), "selectionlist", tr("Open a selection list window."), 80 Short Cut.registerShortCut("subwindow:selection", tr("Toggle: {0}", tr("Current Selection")), KeyEvent.VK_T, ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150);80 Shortcut.registerShortcut("subwindow:selection", tr("Toggle: {0}", tr("Current Selection")), KeyEvent.VK_T, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150); 81 81 82 82 selectionHistory = new LinkedList<Collection<? extends OsmPrimitive>>(); -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r1047 r1084 26 26 import org.openstreetmap.josm.tools.GBC; 27 27 import org.openstreetmap.josm.tools.ImageProvider; 28 import org.openstreetmap.josm.tools.Short Cut;28 import org.openstreetmap.josm.tools.Shortcut; 29 29 30 30 /** … … 40 40 public AbstractButton button; 41 41 42 private ToggleDialogAction(String name, String iconName, String tooltip, Short Cut shortCut, String prefname) {43 super(name, iconName, tooltip, short Cut, false);42 private ToggleDialogAction(String name, String iconName, String tooltip, Shortcut shortcut, String prefname) { 43 super(name, iconName, tooltip, shortcut, false); 44 44 this.prefname = prefname; 45 45 } … … 63 63 64 64 @Deprecated 65 public ToggleDialog(final String name, String iconName, String tooltip, int short Cut, int preferredHeight) {65 public ToggleDialog(final String name, String iconName, String tooltip, int shortcut, int preferredHeight) { 66 66 super(new BorderLayout()); 67 67 this.prefName = iconName; 68 ToggleDialogInit(name, iconName, tooltip, Short Cut.registerShortCut("auto:"+name, tooltip, shortCut, ShortCut.GROUP_LAYER), preferredHeight);68 ToggleDialogInit(name, iconName, tooltip, Shortcut.registerShortcut("auto:"+name, tooltip, shortcut, Shortcut.GROUP_LAYER), preferredHeight); 69 69 } 70 70 71 public ToggleDialog(final String name, String iconName, String tooltip, Short Cut shortCut, int preferredHeight) {71 public ToggleDialog(final String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight) { 72 72 super(new BorderLayout()); 73 73 this.prefName = iconName; 74 ToggleDialogInit(name, iconName, tooltip, short Cut, preferredHeight);74 ToggleDialogInit(name, iconName, tooltip, shortcut, preferredHeight); 75 75 } 76 76 77 private void ToggleDialogInit(final String name, String iconName, String tooltip, Short Cut shortCut, int preferredHeight) {77 private void ToggleDialogInit(final String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight) { 78 78 setPreferredSize(new Dimension(330,preferredHeight)); 79 action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, short Cut, iconName);79 action = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortcut, iconName); 80 80 String helpId = "Dialog/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1); 81 81 action.putValue("help", helpId.substring(0, helpId.length()-6)); -
trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
r1054 r1084 24 24 import org.openstreetmap.josm.data.osm.OsmPrimitive; 25 25 import org.openstreetmap.josm.data.osm.User; 26 import org.openstreetmap.josm.tools.Short Cut;26 import org.openstreetmap.josm.tools.Shortcut; 27 27 28 28 /** … … 52 52 public UserListDialog() { 53 53 super(tr("Authors"), "userlist", tr("Open a list of people working on the selected objects."), 54 Short Cut.registerShortCut("subwindow:authors", tr("Toggle: {0}", tr("Authors")), KeyEvent.VK_A, ShortCut.GROUP_LAYER, ShortCut.SHIFT_DEFAULT), 150);54 Shortcut.registerShortcut("subwindow:authors", tr("Toggle: {0}", tr("Authors")), KeyEvent.VK_A, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150); 55 55 56 56 data.setColumnIdentifiers(new String[]{tr("Author"),tr("# Objects"),"%"});
Note:
See TracChangeset
for help on using the changeset viewer.