X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fmain%2FMain.java;h=5ae18c06fec294a23a4667be04a3ecb7fdc5fe24;hb=d1435b24720268f75978aadf28fd54aa1c79d3a8;hp=5a836f3d5c2dcf7ce650ea393ccd86926fe5b171;hpb=4250e93a19be59ea1635ffb2bc7494ca0a779dfc;p=jSite.git

diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index 5a836f3..5ae18c0 100644
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -74,8 +74,12 @@ import de.todesbaum.util.swing.WizardListener;
  */
 public class Main implements ActionListener, ListSelectionListener, WizardListener, NodeManagerListener, UpdateListener {
 
+	/** The logger. */
+	@SuppressWarnings("unused")
+	private static final Logger logger = Logger.getLogger(Main.class.getName());
+
 	/** The version. */
-	private static final Version VERSION = new Version(0, 7, 1);
+	private static final Version VERSION = new Version(0, 8);
 
 	/** The configuration. */
 	private Configuration configuration;
@@ -336,6 +340,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 
 		PreferencesPage preferencesPage = new PreferencesPage(wizard);
 		preferencesPage.setName("page.preferences");
+		preferencesPage.setTempDirectory(configuration.getTempDirectory());
 		pages.put(PageType.PAGE_PREFERENCES, preferencesPage);
 	}
 
@@ -368,6 +373,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		ProjectPage projectPage = (ProjectPage) pages.get(PageType.PAGE_PROJECTS);
 		configuration.setProjects(projectPage.getProjects());
 
+		PreferencesPage preferencesPage = (PreferencesPage) pages.get(PageType.PAGE_PREFERENCES);
+		configuration.setTempDirectory(preferencesPage.getTempDirectory());
+
 		return configuration.save();
 	}
 
@@ -439,6 +447,9 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	 */
 	private void optionsPreferences() {
 		showPage(PageType.PAGE_PREFERENCES);
+		optionsPreferencesAction.setEnabled(false);
+		wizard.setNextEnabled(true);
+		wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
 	}
 
 	/**
@@ -546,11 +557,19 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 			}
 			configuration.save();
 			showPage(PageType.PAGE_INSERT_PROJECT);
-			((ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT)).startInsert();
+			ProjectInsertPage projectInsertPage = (ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT);
+			String tempDirectory = ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).getTempDirectory();
+			projectInsertPage.setTempDirectory(tempDirectory);
+			projectInsertPage.startInsert();
 			nodeMenu.setEnabled(false);
+			optionsPreferencesAction.setEnabled(false);
 		} else if ("page.project.insert".equals(pageName)) {
 			showPage(PageType.PAGE_PROJECTS);
 			nodeMenu.setEnabled(true);
+			optionsPreferencesAction.setEnabled(true);
+		} else if ("page.preferences".equals(pageName)) {
+			showPage(PageType.PAGE_PROJECTS);
+			optionsPreferencesAction.setEnabled(true);
 		}
 	}