X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2FTuiLauncher.java;h=52d244dafe9af65a4596aafb7b68307d02bdbde9;hb=10dd1e387d6a1834596ae70f48cf905d7b302131;hp=066ba315c4be651db64e51a181850ec3d36d98b8;hpb=7da41ecd30228908bf2afcd07ff7943ab59d4c01;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/TuiLauncher.java b/src/be/nikiroo/jvcard/tui/TuiLauncher.java
index 066ba31..52d244d 100644
--- a/src/be/nikiroo/jvcard/tui/TuiLauncher.java
+++ b/src/be/nikiroo/jvcard/tui/TuiLauncher.java
@@ -7,10 +7,7 @@ import be.nikiroo.jvcard.tui.panes.FileList;
 
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.TextColor;
-import com.googlecode.lanterna.gui2.DefaultWindowManager;
-import com.googlecode.lanterna.gui2.EmptySpace;
 import com.googlecode.lanterna.gui2.MultiWindowTextGUI;
-import com.googlecode.lanterna.gui2.Window;
 import com.googlecode.lanterna.screen.Screen;
 import com.googlecode.lanterna.screen.TerminalScreen;
 import com.googlecode.lanterna.terminal.DefaultTerminalFactory;
@@ -21,11 +18,15 @@ import com.googlecode.lanterna.terminal.Terminal;
  * Starting the TUI.
  * 
  * @author niki
- *
+ * 
  */
 public class TuiLauncher {
+	static private Screen screen;
+
+	private Boolean textMode;
+	private List<String> files;
+
 	/**
-	 * Start the TUI program.
 	 * 
 	 * @param textMode
 	 *            TRUE to force text mode, FALSE to force the Swing terminal
@@ -33,28 +34,21 @@ public class TuiLauncher {
 	 * @param files
 	 *            the files to show at startup
 	 * 
-	 * @throws IOException
-	 *             in case of IO error
 	 */
-	static public void start(Boolean textMode, List<String> files)
-			throws IOException {
-		Window win = new MainWindow(new FileList(files));
-		TuiLauncher.start(textMode, win);
+	public TuiLauncher(Boolean textMode, List<String> files) {
+		this.textMode = textMode;
+		this.files = files;
 	}
 
 	/**
 	 * Start the TUI program.
 	 * 
-	 * @param textMode
-	 *            TRUE to force text mode, FALSE to force the Swing terminal
-	 *            emulator, null to automatically determine the best choice
-	 * @param win
-	 *            the window to show at start
+	 * 
 	 * 
 	 * @throws IOException
 	 *             in case of IO error
 	 */
-	static public void start(Boolean textMode, Window win) throws IOException {
+	public void start() throws IOException {
 		Terminal terminal = null;
 
 		DefaultTerminalFactory factory = new DefaultTerminalFactory();
@@ -67,25 +61,34 @@ public class TuiLauncher {
 			terminal = factory.createTerminalEmulator();
 		}
 
-		if (win instanceof MainWindow) {
-			final MainWindow mwin = (MainWindow) win;
-			mwin.refresh(terminal.getTerminalSize());
-			terminal.addResizeListener(new ResizeListener() {
-				@Override
-				public void onResized(Terminal terminal, TerminalSize newSize) {
-					mwin.refresh(newSize);
-				}
-			});
-		}
+		final MainWindow win = new MainWindow(new FileList(files));
+		win.refresh(terminal.getTerminalSize());
+		terminal.addResizeListener(new ResizeListener() {
+			@Override
+			public void onResized(Terminal terminal, TerminalSize newSize) {
+				win.refresh(newSize);
+			}
+		});
 
-		Screen screen = new TerminalScreen(terminal);
+		screen = new TerminalScreen(terminal);
 		screen.startScreen();
 
 		// Create gui and start gui
 		MultiWindowTextGUI gui = new MultiWindowTextGUI(screen,
-				new DefaultWindowManager(), new EmptySpace(TextColor.ANSI.BLUE));
-		gui.addWindowAndWait(win);
+				TextColor.ANSI.BLUE);
+
+		gui.setTheme(UiColors.getCustomTheme());
 
+		gui.addWindowAndWait(win);
 		screen.stopScreen();
 	}
+
+	/**
+	 * Return the used {@link Screen}.
+	 * 
+	 * @return the {@link Screen}
+	 */
+	static public Screen getScreen() {
+		return screen;
+	}
 }