git://git.nikiroo.be
/
jvcard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remote support ~complete (need more tests at least)
[jvcard.git]
/
src
/
be
/
nikiroo
/
jvcard
/
tui
/
MainWindow.java
diff --git
a/src/be/nikiroo/jvcard/tui/MainWindow.java
b/src/be/nikiroo/jvcard/tui/MainWindow.java
index c3277e3c0f7dc5c11a6b9f3519b3bbdeb1734870..d7cb80d8b2e624ad2b6453914c0ff13a1e878b1f 100644
(file)
--- a/
src/be/nikiroo/jvcard/tui/MainWindow.java
+++ b/
src/be/nikiroo/jvcard/tui/MainWindow.java
@@
-1,11
+1,14
@@
package be.nikiroo.jvcard.tui;
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 java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import be.nikiroo.jvcard.i18n.Trans.StringId;
+import be.nikiroo.jvcard.launcher.Main;
+import be.nikiroo.jvcard.resources.StringUtils;
+import be.nikiroo.jvcard.resources.Trans.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.KeyAction.Mode;
import be.nikiroo.jvcard.tui.UiColors.Element;
import be.nikiroo.jvcard.tui.panes.ContactDetails;
@@
-219,6
+222,16
@@
public class MainWindow extends BasicWindow {
if (contentStack.size() > 0)
prev = contentStack.remove(contentStack.size() - 1);
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;
pushContent(prev);
return removed;
@@
-407,8
+420,7
@@
public class MainWindow extends BasicWindow {
if (title.length() > 0) {
prefix = prefix + ": ";
if (title.length() > 0) {
prefix = prefix + ": ";
- title = StringUtils.sanitize(title, UiColors.getInstance()
- .isUnicode());
+ title = StringUtils.sanitize(title, Main.isUnicode());
}
String countStr = "";
}
String countStr = "";
@@
-501,7
+513,7
@@
public class MainWindow extends BasicWindow {
if (" ".equals(trans))
continue;
if (" ".equals(trans))
continue;
- String keyTrans =
Mai
n.trans(action.getKey());
+ String keyTrans =
KeyActio
n.trans(action.getKey());
Panel kPane = new Panel();
LinearLayout layout = new LinearLayout(Direction.HORIZONTAL);
Panel kPane = new Panel();
LinearLayout layout = new LinearLayout(Direction.HORIZONTAL);
@@
-609,6
+621,12
@@
public class MainWindow extends BasicWindow {
handled = true;
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);
}
if (action.onAction()) {
handleAction(action, null);
}
@@
-657,6
+675,10
@@
public class MainWindow extends BasicWindow {
case CONTACT_LIST:
if (action.getCard() != null) {
pushContent(new ContactList(action.getCard()));
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:
}
break;
case CONTACT_DETAILS: