X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FFileList.java;h=da589aa009c58e5b3940aefde28cc020db1811bc;hb=e119a1c1a924998b9315e46c96b1c750aab1deb9;hp=7065aaf679a6a0290c1ec7de401a716dd7a736bf;hpb=5ad0e17e7fea1c602cb2638a006424af9c7e33e8;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/FileList.java b/src/be/nikiroo/jvcard/tui/panes/FileList.java
index 7065aaf..da589aa 100644
--- a/src/be/nikiroo/jvcard/tui/panes/FileList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/FileList.java
@@ -12,11 +12,11 @@ import be.nikiroo.jvcard.launcher.CardResult.MergeCallback;
 import be.nikiroo.jvcard.launcher.Main;
 import be.nikiroo.jvcard.parsers.Format;
 import be.nikiroo.jvcard.resources.StringUtils;
-import be.nikiroo.jvcard.resources.Trans;
+import be.nikiroo.jvcard.resources.enums.ColorOption;
+import be.nikiroo.jvcard.resources.enums.StringId;
 import be.nikiroo.jvcard.tui.KeyAction;
 import be.nikiroo.jvcard.tui.KeyAction.DataType;
 import be.nikiroo.jvcard.tui.KeyAction.Mode;
-import be.nikiroo.jvcard.tui.UiColors.Element;
 
 import com.googlecode.lanterna.input.KeyType;
 
@@ -63,10 +63,10 @@ public class FileList extends MainContentList {
 		// TODO: from ini file?
 		int SIZE_COL_1 = 3;
 
-		Element el = (focused && selected) ? Element.CONTACT_LINE_SELECTED
-				: Element.CONTACT_LINE;
-		Element elSep = (focused && selected) ? Element.CONTACT_LINE_SEPARATOR_SELECTED
-				: Element.CONTACT_LINE_SEPARATOR;
+		ColorOption el = (focused && selected) ? ColorOption.CONTACT_LINE_SELECTED
+				: ColorOption.CONTACT_LINE;
+		ColorOption elSep = (focused && selected) ? ColorOption.CONTACT_LINE_SEPARATOR_SELECTED
+				: ColorOption.CONTACT_LINE_SEPARATOR;
 
 		List<TextPart> parts = new LinkedList<TextPart>();
 
@@ -104,7 +104,7 @@ public class FileList extends MainContentList {
 
 		// TODO del, save...
 		actions.add(new KeyAction(Mode.CONTACT_LIST, KeyType.Enter,
-				Trans.StringId.KEY_ACTION_VIEW_CARD) {
+				StringId.KEY_ACTION_VIEW_CARD) {
 			private Object obj = null;
 
 			@Override
@@ -211,6 +211,10 @@ public class FileList extends MainContentList {
 
 	@Override
 	public String wakeup() throws IOException {
+		String s = super.wakeup();
+		if (s != null)
+			return s;
+
 		if (merger != null) {
 			if (!merger.mergeTargetFile.exists()) {
 				throw new IOException("Merge cancelled");