Changeset 6357 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2013-11-02T21:28:24+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #5382 - add an option to display a notification at each autosave (disabled by default)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/AutosaveTask.java (modified) (4 diffs)
• gui/Notification.java (modified) (1 diff)
• gui/preferences/map/BackupPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -34 +34 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.OsmExporter;
 import org.openstreetmap.josm.io.OsmImporter;
@@ -67 +69 @@
     public static final IntegerProperty PROP_INTERVAL = new IntegerProperty("autosave.interval", 5 * 60);
     public static final IntegerProperty PROP_INDEX_LIMIT = new IntegerProperty("autosave.index-limit", 1000);
+    /** Defines if a notification should be displayed after each autosave */
+    public static final BooleanProperty PROP_NOTIFICATION = new BooleanProperty("autosave.notification", false);
 
     private static class AutosaveLayerInfo {
@@ -205 +209 @@
                 }
                 changedDatasets.clear();
+                if (PROP_NOTIFICATION.get() && !layersInfo.isEmpty()) {
+                    displayNotification();
+                }
             } catch (Throwable t) {
                 // Don't let exception stop time thread
@@ -212 +219 @@
             }
         }
+    }
+
+    protected void displayNotification() {
+        GuiHelper.runInEDT(new Runnable() {
+            @Override
+            public void run() {
+                new Notification(tr("Your work has been saved automatically."))
+                .setDuration(Notification.TIME_SHORT)
+                .show();
+            }
+        });
     }
 

trunk/src/org/openstreetmap/josm/gui/Notification.java

@@ -58 +58 @@
     private String helpTopic;
 
+    /**
+     * Constructs a new {@code Notification} without content.
+     */
     public Notification() {
         duration = NotificationManager.defaultNotificationTime;
     }
 
+    /**
+     * Constructs a new {@code Notification} with the given textual content.
+     * @param msg The text to display
+     */
     public Notification(String msg) {
         this();

trunk/src/org/openstreetmap/josm/gui/preferences/map/BackupPreference.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.gui.widgets.JosmTextField;
 
 public class BackupPreference implements SubPreferenceSetting {
@@ -36 +36 @@
     }
     private static final BooleanProperty PROP_KEEP_BACKUP = new BooleanProperty("save.keepbackup", false);
+    private JCheckBox notification;
     private JCheckBox keepBackup;
     private JCheckBox autosave;
@@ -84 +85 @@
             GBC.eop().fill(GBC.HORIZONTAL).insets(5,0,0,0));
 
+        panel.add(new JSeparator(), GBC.eop().fill(GBC.HORIZONTAL));
+
+        notification = new JCheckBox(tr("Notification at each save"));
+        notification.setSelected(AutosaveTask.PROP_NOTIFICATION.get());
+        notification.setToolTipText(tr("When saving, display a small notification"));
+        panel.add(notification, GBC.eop());
+        
         ActionListener autosaveEnabled = new ActionListener(){
             @Override
@@ -113 +121 @@
         restartRequired |= AutosaveTask.PROP_INTERVAL.parseAndPut(autosaveInterval.getText());
         AutosaveTask.PROP_FILES_PER_LAYER.parseAndPut(backupPerLayer.getText());
+        AutosaveTask.PROP_NOTIFICATION.put(notification.isSelected());
         return restartRequired;
     }