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

diff --git a/src/de/todesbaum/jsite/main/Main.java b/src/de/todesbaum/jsite/main/Main.java
index df64ff9..5ae18c0 100644
--- a/src/de/todesbaum/jsite/main/Main.java
+++ b/src/de/todesbaum/jsite/main/Main.java
@@ -79,7 +79,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 	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;
@@ -340,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);
 	}
 
@@ -372,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();
 	}
 
@@ -445,6 +449,7 @@ public class Main implements ActionListener, ListSelectionListener, WizardListen
 		showPage(PageType.PAGE_PREFERENCES);
 		optionsPreferencesAction.setEnabled(false);
 		wizard.setNextEnabled(true);
+		wizard.setNextName(I18n.getMessage("jsite.wizard.next"));
 	}
 
 	/**
@@ -552,16 +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);
-			String tempDirectory = ((PreferencesPage) pages.get(PageType.PAGE_PREFERENCES)).getTempDirectory();
-			((ProjectInsertPage) pages.get(PageType.PAGE_INSERT_PROJECT)).setTempDirectory(tempDirectory);
 		}
 	}