From 5fe63b5d430fca8e3916d1e33024396265b9d231 Mon Sep 17 00:00:00 2001
From: myk <myk@cardforge.org>
Date: Sun, 17 Mar 2013 08:50:44 +0000
Subject: [PATCH] add blurb to changes.txt

---
 CHANGES.txt                                   | 30 +++++++++++++++++++
 .../forge/gui/download/GuiDownloader.java     |  9 ++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index d5a05c214a1..3528b601a57 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,37 @@ Forge Beta: 03-##-2013 ver 1.3.11
 
 Release Notes:
 
+User data migration
+-------------------
+User data, like decks, saved gauntlets, and card pictures, is now stored in separate directories from the program data.  When this version of Forge is first run, it will scan the program directory for all user data and automatically migrate all the files to their new homes.  There are three defined user data directores: userDir, cacheDir, and cardPicsDir, and their locations depend on the standard paths for your operating system:
 
+    Windows:
+        userDir=%APPDATA%/Forge/
+        cacheDir=%LOCALAPPDATA%/Forge/Cache/ (or %APPDATA%/Forge/Cache/ for windows versions before the local/roaming directory split)
+    OSX:
+        userDir=$HOME/Library/Application Support/Forge/
+        cacheDir=$HOME/Library/Caches/Forge/
+    Linux:
+        userDir=$HOME/.forge/
+        cacheDir=$HOME/.cache/forge/
+
+cardPicsDir is defined as <cacheDir>/pics/cards/ by default.  If you wish to use a non-default directory, please see the forge.profile.preferences.example file located in the Forge installation directory root.  You can use this file to, for example, share the card pics directory with another program, such as Magic Workstation.
+
+For reference, here is the full list of moved directories:
+
+Old location      New location
+----------------  ----------------------
+res/decks/        <userDir>/decks/
+res/gauntlet/     <userDir>/gauntlet/
+res/layouts/      <userDir>/preferences/
+res/preferences/  <userDir>/preferences/
+res/quest/data/   <userDir>/quest/saves/
+res/pics/         <cacheDir>/pics/
+
+
+New Import Data dialog
+------------------------
+The Import Pictures dialog, accessed via the Content Downloaders submenu, has received an overhaul and has been reincarnated as the Import Data dialog.  You may recognize it from the automatic data migration procedure if you had any data to migrate when this version was first started.  Instead of just importing pictures from a previous version of Forge, it can now import any kind of Forge data whatsoever.  If you have a directory full of deck files, you can use the Import Data dialog to copy or move them to the appropriate directory.  If you have just downloaded a torrent of high-quality pics for a particular set, use the Import Data dialog to get them to the proper place.  The dialog give you a full listing of all file copy/move operations, so you can see what will happen before you click 'Start Import'.
 
 
 New Cards:
diff --git a/src/main/java/forge/gui/download/GuiDownloader.java b/src/main/java/forge/gui/download/GuiDownloader.java
index f15463cce78..9fe43964a01 100644
--- a/src/main/java/forge/gui/download/GuiDownloader.java
+++ b/src/main/java/forge/gui/download/GuiDownloader.java
@@ -172,9 +172,9 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
     private void readyToStart() {
         if (this.cards.size() == 0) {
             barProgress.setString("All items have been downloaded.");
-            btnStart.setVisible(true);
             btnStart.setText("OK");
             btnStart.addActionListener(actOK);
+            btnStart.setVisible(true);
         }
         else {
             barProgress.setMaximum(this.cards.size());
@@ -201,7 +201,6 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
 
         // Kill overlay
         SOverlayUtils.hideOverlay();
-        FOverlay.SINGLETON_INSTANCE.getPanel().removeAll();
     }
 
     protected final int getAverageTimePerObject() {
@@ -268,6 +267,10 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
                 } else {
                     sb.append(String.format("%d of %d items finished! Please close!",
                             this.card, GuiDownloader.this.cards.size()));
+                    btnStart.setText("OK");
+                    btnStart.addActionListener(actOK);
+                    btnStart.setEnabled(true);
+                    btnStart.requestFocusInWindow();
                 }
 
                 GuiDownloader.this.barProgress.setString(sb.toString());
@@ -403,7 +406,7 @@ public abstract class GuiDownloader extends DefaultBoundedRangeModel implements
             source = srcUrl;
             destination = destFile;
             //System.out.println(String.format("downloading %s to %s", srcUrl, destFile));
-            System.out.println(String.format("downloading %s", destFile));
+            System.out.println(String.format("Preparing to download %s", destFile));
         }
 
         public String getSource() {