X-Git-Url: http://git.nikiroo.be/?p=jvcard.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2FMainWindow.java;h=d7cb80d8b2e624ad2b6453914c0ff13a1e878b1f;hp=236289904a07297401e35754a8f0d1babc98e12e;hb=5ad0e17e7fea1c602cb2638a006424af9c7e33e8;hpb=e4444b0bc462544629d9e7e7ab62b96a4d9cab10

diff --git a/src/be/nikiroo/jvcard/tui/MainWindow.java b/src/be/nikiroo/jvcard/tui/MainWindow.java
index 2362899..d7cb80d 100644
--- a/src/be/nikiroo/jvcard/tui/MainWindow.java
+++ b/src/be/nikiroo/jvcard/tui/MainWindow.java
@@ -1,5 +1,6 @@
 package be.nikiroo.jvcard.tui;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
@@ -221,6 +222,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;
@@ -610,6 +621,12 @@ public class MainWindow extends BasicWindow {
 
 			handled = true;
 
+			action.getObject(); // see {@link KeyAction#getMessage()}
+			String mess = action.getMessage();
+			if (mess != null) {
+				setMessage(mess, action.isError());
+			}
+
 			if (action.onAction()) {
 				handleAction(action, null);
 			}
@@ -658,6 +675,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: