X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=c29ba00ec36a099d5a3f118bd88e41c39aba4fca;hb=8002675fff4eaeeb292c4b1a1e4182bd999a548c;hp=5ceee7d6ba2336fa31fee9ea5b371904adf5ad01;hpb=e119a1c1a924998b9315e46c96b1c750aab1deb9;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java
index 5ceee7d..c29ba00 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 {
@@ -36,15 +39,19 @@ public class ContactDetailsRaw extends MainContentList {
 
 	@Override
 	public List<KeyAction> getKeyBindings() {
-		// TODO Auto-generated method stub
 		List<KeyAction> actions = new LinkedList<KeyAction>();
 
-		// TODO: add, remove
 		actions.add(new KeyAction(Mode.ASK_USER, KeyType.Enter,
-				StringId.DUMMY) {
+				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
@@ -79,7 +86,8 @@ public class ContactDetailsRaw extends MainContentList {
 				return "Cannot modify value";
 			}
 		});
-		actions.add(new KeyAction(Mode.ASK_USER_KEY, 'd', StringId.DUMMY) {
+		actions.add(new KeyAction(Mode.ASK_USER_KEY, 'd',
+				StringId.KEY_ACTION_DELETE) {
 			@Override
 			public Object getObject() {
 				return getSelectedData();
@@ -107,8 +115,59 @@ public class ContactDetailsRaw extends MainContentList {
 				return null;
 			}
 		});
-		// TODO: ui
-		actions.add(new KeyAction(Mode.ASK_USER, 'a', StringId.DUMMY) {
+		// TODO: ui and i18n
+		actions.add(new KeyAction(Mode.ASK_USER, 'a', StringId.KEY_ACTION_ADD) {
+			private String name;
+
+			@Override
+			public boolean onAction() {
+				new ActionListDialogBuilder()
+						.setTitle("New data")
+						.setDescription("Choose a data type")
+						.addAction("Email address", new Runnable() {
+							@Override
+							public void run() {
+								name = "EMAIL";
+							}
+						})
+						.addAction("Telephone number", new Runnable() {
+							@Override
+							public void run() {
+								name = "TEL";
+							}
+						})
+						.addAction("Birthday", new Runnable() {
+							@Override
+							public void run() {
+								name = "BDAY";
+							}
+						})
+						.addAction("[other]", new Runnable() {
+							@Override
+							public void run() {
+								name = "";
+							}
+						})
+						.build()
+						.showDialog(
+								new MultiWindowTextGUI(TuiLauncher.getScreen()));
+
+				String name = this.name;
+				this.name = null;
+
+				if (name != null) {
+					if (name.length() > 0) {
+						Data data = new Data(null, name, "", null);
+						getContact().add(data);
+						addItem("x");
+					}
+
+					return (name.length() == 0);
+				}
+
+				return false;
+			}
+
 			@Override
 			public Object getObject() {
 				return contact;
@@ -117,27 +176,20 @@ public class ContactDetailsRaw extends MainContentList {
 			@Override
 			public String getQuestion() {
 				// TODO i18n
-				return "new data (xx.group = yy): ";
+				if (name == null)
+					return "Data name: ";
+
+				return null;
 			}
 
 			@Override
 			public String callback(String answer) {
-				int indexEq = answer.indexOf('=');
-				if (indexEq >= 0) {
-					String name = answer.substring(0, indexEq).trim();
-					String value = answer.substring(indexEq + 1).trim();
-					String group = null;
-
-					int indexDt = name.indexOf('.');
-					if (indexDt >= 0) {
-						group = name.substring(indexDt + 1).trim();
-						name = name.substring(0, indexDt).trim();
-					}
-
-					Data data = new Data(null, name, value, group);
+				if (answer != null & answer.length() > 0) {
+					Data data = new Data(null, answer, "", null);
 					getContact().add(data);
 					addItem("x");
 				}
+
 				return null;
 			}
 		});
@@ -263,6 +315,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;
@@ -297,9 +350,14 @@ 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(" (");
 				valueBuilder.append(data.getGroup());
 				valueBuilder.append(")");
 			}
@@ -352,7 +410,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
@@ -398,12 +456,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;
 			}