Index: /trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- /trunk/src/org/openstreetmap/josm/Main.java (revision 1372) +++ /trunk/src/org/openstreetmap/josm/Main.java (revision 1373) @@ -30,4 +30,5 @@ import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask; import org.openstreetmap.josm.actions.mapmode.MapMode; +import org.openstreetmap.josm.actions.SaveAction; import org.openstreetmap.josm.actions.search.SearchAction; import org.openstreetmap.josm.data.Bounds; @@ -37,4 +38,5 @@ import org.openstreetmap.josm.data.projection.Epsg4326; import org.openstreetmap.josm.data.projection.Projection; +import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.GettingStarted; import org.openstreetmap.josm.gui.MainMenu; @@ -340,9 +342,24 @@ } if (modified) { - final String msg = uploadedModified ? "\n"+tr("Hint: Some changes came from uploading new data to the server.") : ""; - final int answer = JOptionPane.showConfirmDialog( - parent, tr("There are unsaved changes. Discard the changes and continue?")+msg, - tr("Unsaved Changes"), JOptionPane.YES_NO_OPTION); - if (answer != JOptionPane.YES_OPTION) + final String msg = uploadedModified ? "\n" + +tr("Hint: Some changes came from uploading new data to the server.") : ""; + int result = new ExtendedDialog(parent, tr("Unsaved Changes"), + new javax.swing.JLabel(tr("There are unsaved changes. Discard the changes and continue?")+msg), + new String[] {tr("Save and Exit"), tr("Discard and Exit"), tr("Cancel")}, + new String[] {"save.png", "exit.png", "cancel.png"}).getValue(); + + // Save before exiting + if(result == 1) { + Boolean savefailed = false; + for (final Layer l : map.mapView.getAllLayers()) { + if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) { + SaveAction save = new SaveAction(l); + if(!save.doSave()) + savefailed = true; + } + } + return savefailed; + } + else if(result != 2) // Cancel exiting unless the 2nd button was clicked return true; } Index: /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 1372) +++ /trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 1373) @@ -34,4 +34,8 @@ public void actionPerformed(ActionEvent e) { + doSave(); + } + + public Boolean doSave() { Layer layer = this.layer; if (layer == null && Main.map != null && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer @@ -42,10 +46,10 @@ if (!checkSaveConditions(layer)) - return; + return false; File file = getFile(layer); if (file == null) - return; + return false; save(file, layer); @@ -54,4 +58,5 @@ layer.associatedFile = file; Main.parent.repaint(); + return true; } Index: /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 1373) +++ /trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java (revision 1373) @@ -0,0 +1,131 @@ +package org.openstreetmap.josm.gui; + +import java.awt.Component; +import java.awt.Dimension; +import java.awt.event.ActionEvent; +import java.awt.event.ComponentEvent; +import java.awt.event.ComponentListener; +import java.awt.GridBagLayout; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.BorderFactory; +import javax.swing.BoundedRangeModel; +import javax.swing.InputMap; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRootPane; +import javax.swing.JScrollPane; +import javax.swing.KeyStroke; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.I18n; +import org.openstreetmap.josm.tools.ImageProvider; + + +public class ExtendedDialog extends JDialog { + private int result = 0; + private final String[] bTexts; + + /** + * Sets up the dialog. The first button is always the default. + * @param Component The parent element that will be used for position and maximum size + * @param String The text that will be shown in the window titlebar + * @param Component Any component that should be show above the buttons (e.g. JLabel) + * @param String[] The labels that will be displayed on the buttons + * @param String[] The path to the icons that will be displayed on the buttons. Path is relative to JOSM's image directory. File extensions need to be included. If a button should not have an icon pass null. + */ + public ExtendedDialog(Component parent, String title, Component content, String[] buttonTexts, String[] buttonIcons) { + super(JOptionPane.getFrameForComponent(parent), title, true); + bTexts = buttonTexts; + setupDialog(parent, title, content, buttonTexts, buttonIcons); + } + + public ExtendedDialog(Component parent, String title, Component content, String[] buttonTexts) { + super(JOptionPane.getFrameForComponent(parent), title, true); + bTexts = buttonTexts; + setupDialog(parent, title, content, buttonTexts, null); + } + + private void setupDialog(Component parent, String title, Component content, String[] buttonTexts, String[] buttonIcons) { + JButton button; + JPanel buttonsPanel = new JPanel(new GridBagLayout()); + + for(int i=0; i < bTexts.length; i++) { + Action action = new AbstractAction(bTexts[i]) { + public void actionPerformed(ActionEvent evt) { + String a = evt.getActionCommand(); + for(int i=0; i < bTexts.length; i++) + if(bTexts[i].equals(a)) { + result = i+1; + break; + } + + setVisible(false); + } + }; + + button = new JButton(action); + if(buttonIcons != null && buttonIcons[i] != null) + button.setIcon(ImageProvider.get(buttonIcons[i])); + + if(i == 0) rootPane.setDefaultButton(button); + buttonsPanel.add(button, GBC.std().insets(2,2,2,2)); + } + + JPanel cp = new JPanel(new GridBagLayout()); + cp.add(content, GBC.eol().anchor(GBC.CENTER).insets(0,10,0,0)); //fill(GBC.HORIZONTAL). + cp.add(buttonsPanel, GBC.eol().anchor(GBC.CENTER).insets(5,5,5,5)); + + JScrollPane pane = new JScrollPane(cp); + pane.setBorder(null); + setContentPane(pane); + + pack(); + + // Try to make it not larger than the parent window or at least not larger than a reasonable value + Dimension d = getSize(); + Dimension x = new Dimension(700, 500); + try { + + if(parent != null) + x = JOptionPane.getFrameForComponent(parent).getSize(); + } catch(NullPointerException e) { } + + if(x.width > 0 && d.width > x.width) d.width = x.width; + if(x.height > 0 && d.height > x.height) d.height = x.height; + setSize(d); + + setLocationRelativeTo(parent); + + setupEscListener(); + setVisible(true); + } + + /** + * @return int The selected button. The count starts with 1. + * A return value of 0 means the dialog has been closed otherwise. + */ + public int getValue() { + return result; + } + + /** + * Makes the dialog listen to ESC keypressed + */ + private void setupEscListener() { + Action actionListener = new AbstractAction() { + public void actionPerformed(ActionEvent actionEvent) { + setVisible(false); + } + }; + + rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) + .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE"); + rootPane.getActionMap().put("ESCAPE", actionListener); + } +}