Changeset 3461 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2010-08-24T10:32:50+02:00 (14 years ago)

Author:

bastiK

Message:

added gui preference for autosave; fixed #5359 - Button to delete autosaved data

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• preferences/BackupPreference.java (added)
• preferences/PreferenceDialog.java (modified) (1 diff)
• preferences/PreferenceTabbedPane.java (modified) (1 diff)
• preferences/ProjectionPreference.java (modified) (2 diffs)
• preferences/ServerAccessPreference.java (modified) (4 diffs)
• preferences/server/BackupPreferencesPanel.java (deleted)
• widgets/HtmlPanel.java (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trn;
 
 import java.awt.EventQueue;
@@ -247 +248 @@
         }
 
-        AutosaveTask autosaveTask = new AutosaveTask();
-        List<File> unsavedLayerFiles = autosaveTask.getUnsavedLayersFiles();
-        if (!unsavedLayerFiles.isEmpty()) {
-            ExtendedDialog dialog = new ExtendedDialog(
-                    Main.parent,
-                    tr("Unsaved osm data"),
-                    new String[] {tr("Restore"), tr("Cancel")}
-            );
-            dialog.setContent(tr("JOSM found {0} unsaved osm data layers. It looks like JOSM crashed last time. Do you want to restore data?",
-                    unsavedLayerFiles.size()));
-            dialog.setButtonIcons(new String[] {"ok.png", "cancel.png"});
-            dialog.showDialog();
-            if (dialog.getValue() == 1) {
-                for (OsmDataLayer layer: autosaveTask.getUnsavedLayers()) {
-                    Main.main.addLayer(layer);
+        if (AutosaveTask.PROP_AUTOSAVE_ENABLED.get()) {
+            AutosaveTask autosaveTask = new AutosaveTask();
+            List<File> unsavedLayerFiles = autosaveTask.getUnsavedLayersFiles();
+            if (!unsavedLayerFiles.isEmpty()) {
+                ExtendedDialog dialog = new ExtendedDialog(
+                        Main.parent,
+                        tr("Unsaved osm data"),
+                        new String[] {tr("Restore"), tr("Cancel"), tr("Discard")}
+                );
+                dialog.setContent(
+                        trn("JOSM found {0} unsaved osm data layer. ",
+                        "JOSM found {0} unsaved osm data layers. ", unsavedLayerFiles.size(), unsavedLayerFiles.size()) +
+                        tr("It looks like JOSM crashed last time. Do you like to restore the data?"));
+                dialog.setButtonIcons(new String[] {"ok", "cancel", "dialogs/remove"});
+                int selection = dialog.showDialog().getValue();
+                if (selection == 1) {
+                    for (OsmDataLayer layer: autosaveTask.getUnsavedLayers()) {
+                        Main.main.addLayer(layer);
+                    }
+                    AutoScaleAction.autoScale("data");
+                } else if (selection == 3) {
+                    autosaveTask.dicardUnsavedLayers();
                 }
-                AutoScaleAction.autoScale("data");
-            }
-
-
-        }
-        autosaveTask.schedule();
+            }
+            autosaveTask.schedule();
+        }
 
 

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -78 +78 @@
                     WindowGeometry.centerInWindow(
                             getParent(),
-                            new Dimension(600,800)
+                            new Dimension(700,800)
                     )
             ).applySafe(this);

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java

@@ -268 +268 @@
         settingsFactory.add(new MapPaintPreference.Factory());
         settingsFactory.add(new TaggingPresetPreference.Factory());
+        settingsFactory.add(new BackupPreference.Factory());
         if(!Main.applet) {
             settingsFactory.add(new PluginPreference.Factory());

trunk/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.tools.GBC;
 
@@ -107 +108 @@
      * This is the panel holding all projection preferences
      */
-    private JPanel projPanel = new JPanel();
+    private JPanel projPanel = new VerticallyScrollablePanel();
 
     /**

trunk/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java

@@ -36 +36 @@
     private ProxyPreferencesPanel pnlProxyPreferences;
     /** panel for backup preferences */
-    private BackupPreferencesPanel pnlBackupPreferences;
 
     /**
@@ -63 +62 @@
         pnlProxyPreferences = new ProxyPreferencesPanel();
         tpServerPreferences.add(wrapVerticallyScrollablePanel(pnlProxyPreferences));
-        pnlBackupPreferences = new BackupPreferencesPanel();
-        tpServerPreferences.add(wrapVerticallyScrollablePanel(pnlBackupPreferences));
 
         tpServerPreferences.setTitleAt(0, tr("Authentication"));
         tpServerPreferences.setTitleAt(1, tr("Proxy settings"));
-        tpServerPreferences.setTitleAt(2, tr("File backup"));
         tpServerPreferences.setToolTipTextAt(0, tr("Configure your identity and how to authenticate at the OSM server"));
         tpServerPreferences.setToolTipTextAt(1, tr("Configure whether to use a proxy server"));
-        tpServerPreferences.setToolTipTextAt(2, tr("Configure whether to create backup files"));
 
         pnl.add(tpServerPreferences, BorderLayout.CENTER);
@@ -127 +122 @@
         pnlAuthPreferences.initFromPreferences();
         pnlProxyPreferences.initFromPreferences();
-        pnlBackupPreferences.initFromPreferences();
     }
 
@@ -137 +131 @@
         pnlAuthPreferences.saveToPreferences();
         pnlProxyPreferences.saveToPreferences();
-        pnlBackupPreferences.saveToPreferences();
         return false;
     }

trunk/src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java

@@ -13 +13 @@
 
 /**
- * This panel can be used to display larger larger sections of formatted text in
+ * This panel can be used to display larger sections of formatted text in
  * HTML.
  *
@@ -61 +61 @@
     }
 
+    public HtmlPanel(String text) {
+        this();
+        setText(text);
+    }
+
     /**
      * Replies the editor pane used internally to render the HTML text.