X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2FMainWindow.java;h=617d8a521eb692e17f103f56ddb9bf9f6ba0ab4f;hb=d5260eeb873fcf2ef9855dedcd9e2a3a3a990582;hp=236289904a07297401e35754a8f0d1babc98e12e;hpb=7da41ecd30228908bf2afcd07ff7943ab59d4c01;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/MainWindow.java b/src/be/nikiroo/jvcard/tui/MainWindow.java
index 2362899..617d8a5 100644
--- a/src/be/nikiroo/jvcard/tui/MainWindow.java
+++ b/src/be/nikiroo/jvcard/tui/MainWindow.java
@@ -1,19 +1,21 @@
 package be.nikiroo.jvcard.tui;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
 import be.nikiroo.jvcard.launcher.Main;
-import be.nikiroo.jvcard.resources.StringUtils;
-import be.nikiroo.jvcard.resources.Trans.StringId;
+import be.nikiroo.jvcard.resources.ColorOption;
+import be.nikiroo.jvcard.resources.StringId;
 import be.nikiroo.jvcard.tui.KeyAction.Mode;
-import be.nikiroo.jvcard.tui.UiColors.Element;
 import be.nikiroo.jvcard.tui.panes.ContactDetails;
 import be.nikiroo.jvcard.tui.panes.ContactDetailsRaw;
 import be.nikiroo.jvcard.tui.panes.ContactList;
 import be.nikiroo.jvcard.tui.panes.MainContent;
+import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.Version;
 
 import com.googlecode.lanterna.TerminalSize;
 import com.googlecode.lanterna.gui2.BasicWindow;
@@ -53,7 +55,7 @@ public class MainWindow extends BasicWindow {
 	 * Information about a question to ask the user and its answer.
 	 * 
 	 * @author niki
-	 *
+	 * 
 	 */
 	private class UserQuestion {
 		private boolean oneKeyAnswer;
@@ -221,6 +223,16 @@ public class MainWindow extends BasicWindow {
 		if (contentStack.size() > 0)
 			prev = contentStack.remove(contentStack.size() - 1);
 
+		if (prev != null) {
+			try {
+				String mess = prev.wakeup();
+				if (mess != null)
+					setMessage(mess, false);
+			} catch (IOException e) {
+				setMessage(e.getMessage(), true);
+			}
+		}
+
 		pushContent(prev);
 
 		return removed;
@@ -240,9 +252,9 @@ public class MainWindow extends BasicWindow {
 		if (mess != null || messagePanel.getChildCount() > 0) {
 			messagePanel.removeAllComponents();
 			if (mess != null) {
-				Element element = (error ? UiColors.Element.LINE_MESSAGE_ERR
-						: UiColors.Element.LINE_MESSAGE);
-				Label lbl = element.createLabel(" " + mess + " ");
+				ColorOption element = (error ? ColorOption.LINE_MESSAGE_ERR
+						: ColorOption.LINE_MESSAGE);
+				Label lbl = UiColors.createLabel(element, " " + mess + " ");
 				messagePanel.addComponent(lbl, LinearLayout
 						.createLayoutData(LinearLayout.Alignment.Center));
 			}
@@ -307,7 +319,7 @@ public class MainWindow extends BasicWindow {
 		llayout.setSpacing(0);
 		hpanel.setLayoutManager(llayout);
 
-		Label lbl = UiColors.Element.LINE_MESSAGE_QUESTION.createLabel(" "
+		Label lbl = UiColors.createLabel(ColorOption.LINE_MESSAGE_QUESTION, " "
 				+ question + " ");
 		text = new TextBox(new TerminalSize(getSize().getColumns()
 				- lbl.getSize().getColumns(), 1));
@@ -393,7 +405,7 @@ public class MainWindow extends BasicWindow {
 	 */
 	private void setTitle() {
 		String prefix = " " + Main.APPLICATION_TITLE + " (version "
-				+ Main.APPLICATION_VERSION + ")";
+				+ Version.getCurrentVersion() + ")";
 
 		String title = null;
 		int count = -1;
@@ -440,27 +452,24 @@ public class MainWindow extends BasicWindow {
 			super.setTitle(prefix);
 
 			Label lblPrefix = new Label(prefix);
-			UiColors.Element.TITLE_MAIN.themeLabel(lblPrefix);
+			UiColors.themeLabel(ColorOption.TITLE_MAIN, lblPrefix);
 
 			Label lblTitle = null;
 			if (title.length() > 0) {
 				lblTitle = new Label(title);
-				UiColors.Element.TITLE_VARIABLE.themeLabel(lblTitle);
+				UiColors.themeLabel(ColorOption.TITLE_VARIABLE, lblTitle);
 			}
 
-			Label lblCount = null;
-			if (countStr != null) {
-				lblCount = new Label(countStr);
-				UiColors.Element.TITLE_COUNT.themeLabel(lblCount);
-			}
+			Label lblCount = new Label(countStr);
+			UiColors.themeLabel(ColorOption.TITLE_COUNT, lblCount);
 
 			titlePanel.removeAllComponents();
 
 			titlePanel.addComponent(lblPrefix, BorderLayout.Location.LEFT);
-			if (lblTitle != null)
+			if (lblTitle != null) {
 				titlePanel.addComponent(lblTitle, BorderLayout.Location.CENTER);
-			if (lblCount != null)
-				titlePanel.addComponent(lblCount, BorderLayout.Location.RIGHT);
+			}
+			titlePanel.addComponent(lblCount, BorderLayout.Location.RIGHT);
 		}
 	}
 
@@ -509,9 +518,10 @@ public class MainWindow extends BasicWindow {
 			layout.setSpacing(0);
 			kPane.setLayoutManager(layout);
 
-			kPane.addComponent(UiColors.Element.ACTION_KEY
-					.createLabel(keyTrans));
-			kPane.addComponent(UiColors.Element.ACTION_DESC.createLabel(trans));
+			kPane.addComponent(UiColors.createLabel(ColorOption.ACTION_KEY,
+					keyTrans));
+			kPane.addComponent(UiColors.createLabel(ColorOption.ACTION_DESC,
+					trans));
 
 			actionPanel.addComponent(kPane);
 		}
@@ -523,8 +533,8 @@ public class MainWindow extends BasicWindow {
 		}
 
 		if (width > 0) {
-			actionPanel.addComponent(UiColors.Element.ACTION_DESC
-					.createLabel(StringUtils.padString("", width)));
+			actionPanel.addComponent(UiColors.createLabel(
+					ColorOption.ACTION_DESC, StringUtils.padString("", width)));
 		}
 	}
 
@@ -593,8 +603,6 @@ public class MainWindow extends BasicWindow {
 	 * 
 	 * @param key
 	 *            the key that was pressed
-	 * @param answer
-	 *            the answer given for this key
 	 * 
 	 * @return if the window handled the input
 	 */
@@ -610,7 +618,13 @@ public class MainWindow extends BasicWindow {
 
 			handled = true;
 
-			if (action.onAction()) {
+			action.getObject(); // see {@link KeyAction#getMessage()}
+			String mess = action.getMessage();
+			if (mess != null) {
+				setMessage(mess, action.isError());
+			}
+
+			if (!action.isError() && action.onAction()) {
 				handleAction(action, null);
 			}
 
@@ -623,12 +637,11 @@ public class MainWindow extends BasicWindow {
 	/**
 	 * Handle the input in case of "normal" (not "ask for answer") mode.
 	 * 
-	 * @param key
-	 *            the key that was pressed
+	 * @param action
+	 *            the key that was pressed and the action to take
 	 * @param answer
 	 *            the answer given for this key
 	 * 
-	 * @return if the window handled the input
 	 */
 	private void handleAction(KeyAction action, String answer) {
 		MainContent content = getContent();
@@ -658,6 +671,10 @@ public class MainWindow extends BasicWindow {
 		case CONTACT_LIST:
 			if (action.getCard() != null) {
 				pushContent(new ContactList(action.getCard()));
+			} else if (action.getObject() != null
+					&& action.getObject() instanceof MainContent) {
+				MainContent mergeContent = (MainContent) action.getObject();
+				pushContent(mergeContent);
 			}
 			break;
 		case CONTACT_DETAILS: