X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=5a616b918fd7b3f5804185351dcca97f6cb2b5ae;hb=ed91f27a4f628ec59b0e85cdbb0319287c503f9d;hp=c47776025f7f17e1d0d32842d0e78b068c8621ec;hpb=88eb81220498dc5b3199bad2d1de6970b55ceaed;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
index c477760..5a616b9 100644
--- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
@@ -13,7 +13,10 @@ 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.TuiLauncher;
 
+import com.googlecode.lanterna.gui2.MultiWindowTextGUI;
+import com.googlecode.lanterna.gui2.dialogs.ActionListDialogBuilder;
 import com.googlecode.lanterna.input.KeyType;
 
 public class ContactDetailsRaw extends MainContentList {
@@ -42,7 +45,13 @@ public class ContactDetailsRaw extends MainContentList {
 				StringId.KEY_ACTION_EDIT_FIELD) {
 			@Override
 			public Object getObject() {
-				return getSelectedData();
+				Data data = getSelectedData();
+				if (data != null && data.getB64Key() != -1) {
+					setMessage("Cannot modify binary values in RAW mode", true);
+					data = null;
+				}
+
+				return data;
 			}
 
 			@Override
@@ -108,6 +117,41 @@ public class ContactDetailsRaw extends MainContentList {
 		});
 		// TODO: ui
 		actions.add(new KeyAction(Mode.ASK_USER, 'a', StringId.KEY_ACTION_ADD) {
+			@Override
+			public boolean onAction() {
+				try{
+				new ActionListDialogBuilder()
+						.setTitle("Action List Dialog")
+						.setDescription("Choose an item")
+						.addAction("First Item", new Runnable() {
+							@Override
+							public void run() {
+								// Do 1st thing...
+							}
+						})
+						.addAction("Second Item", new Runnable() {
+							@Override
+							public void run() {
+								// Do 2nd thing...
+							}
+						})
+						.addAction("Third Item", new Runnable() {
+							@Override
+							public void run() {
+								// Do 3rd thing...
+							}
+						})
+						.build()
+						.showDialog(
+								new MultiWindowTextGUI(TuiLauncher.getScreen()));
+				
+				return true;
+				}catch(Exception e){
+					e.printStackTrace();
+					throw e;
+				}
+			}
+
 			@Override
 			public Object getObject() {
 				return contact;
@@ -262,6 +306,7 @@ public class ContactDetailsRaw extends MainContentList {
 	@Override
 	protected List<TextPart> getLabel(int index, int width, boolean selected,
 			boolean focused) {
+
 		// TODO: from ini file?
 		int SIZE_COL_1 = 15;
 		int SIZE_COL_2_OPT = 10;
@@ -296,7 +341,12 @@ public class ContactDetailsRaw extends MainContentList {
 
 		StringBuilder valueBuilder = new StringBuilder(" ");
 		if (!extMode) {
-			valueBuilder.append(data.getValue().replaceAll("\n", "\\\\n"));
+			if (data.getB64Key() != -1) {
+				// TODO: i18n
+				valueBuilder.append("<BKey " + data.getB64Key() + ">");
+			} else {
+				valueBuilder.append(data.getValue().replaceAll("\n", "\\\\n"));
+			}
 			if (data.getGroup() != null && data.getGroup().length() > 0) {
 				valueBuilder.append("(");
 				valueBuilder.append(data.getGroup());
@@ -351,7 +401,7 @@ public class ContactDetailsRaw extends MainContentList {
 	 * @param data
 	 *            the {@link Data} from which to take the {@link TypeInfo}s
 	 * @param builder
-	 *            an optional {@link StringBuilder} to append the serialized
+	 *            an optional {@link StringBuilder} to append the serialised
 	 *            version to
 	 * 
 	 * @return the given {@link StringBuilder} or a new one if the given one is
@@ -397,12 +447,29 @@ public class ContactDetailsRaw extends MainContentList {
 			}
 
 			if (previous != '\\' && car == ',') {
-				String[] tab = value.substring(done, index).split("\\:");
-				infos.add(new TypeInfo( //
-						tab[0].replaceAll("\\,", ",").replaceAll("\\:", ":")
-								.trim(), //
-						tab[1].replaceAll("\\,", ",").replaceAll("\\:", ":")
-								.trim()));
+				String subValue = value.substring(done, index);
+				int indexColumn = subValue.indexOf(':');
+				while (indexColumn > 0
+						&& subValue.charAt(indexColumn - 1) == '\\') {
+					if (indexColumn == subValue.length() - 1) {
+						indexColumn = -1;
+					} else {
+						indexColumn = subValue.indexOf(':', indexColumn + 1);
+					}
+				}
+
+				String n = "";
+				String v = "";
+				if (indexColumn >= 0) {
+					n = subValue.substring(0, indexColumn).trim();
+					v = subValue.substring(indexColumn + 1)
+							.replaceAll("\\\\:", ":").trim();
+				} else {
+					n = subValue.trim();
+				}
+
+				infos.add(new TypeInfo(n, v));
+
 				done = index + 1;
 			}