X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=2de99192050af84249affc547dbaa5a073e596d7;hb=bed9375363fbded799b41b7a09b120189592fb54;hp=d3bd18d1d39fe9f3580b99b3fe526d1fbfeb1655;hpb=26d2bd0591901a8d52bd24802a8d6827d0e9b833;p=jvcard.git diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java index d3bd18d..2de9919 100644 --- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java +++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java @@ -6,13 +6,13 @@ import java.util.List; import be.nikiroo.jvcard.Contact; import be.nikiroo.jvcard.Data; import be.nikiroo.jvcard.TypeInfo; -import be.nikiroo.jvcard.i18n.Trans; +import be.nikiroo.jvcard.launcher.Main; +import be.nikiroo.jvcard.resources.StringUtils; +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.StringUtils; -import be.nikiroo.jvcard.tui.UiColors; -import be.nikiroo.jvcard.tui.UiColors.Element; import com.googlecode.lanterna.input.KeyType; @@ -36,15 +36,19 @@ public class ContactDetailsRaw extends MainContentList { @Override public List getKeyBindings() { - // TODO Auto-generated method stub List actions = new LinkedList(); - // TODO: add, remove actions.add(new KeyAction(Mode.ASK_USER, KeyType.Enter, - Trans.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 @@ -61,7 +65,7 @@ public class ContactDetailsRaw extends MainContentList { public String getDefaultAnswer() { Data data = getData(); if (data != null) { - return data.getValue(); + return data.getRawValue().replaceAll("\n", "\\\\n"); } return null; @@ -71,7 +75,7 @@ public class ContactDetailsRaw extends MainContentList { public String callback(String answer) { Data data = getData(); if (data != null) { - data.setValue(answer); + data.setRawValue(answer.replaceAll("\\\\n", "\n")); return null; } @@ -79,7 +83,8 @@ public class ContactDetailsRaw extends MainContentList { return "Cannot modify value"; } }); - actions.add(new KeyAction(Mode.ASK_USER_KEY, 'd', Trans.StringId.DUMMY) { + actions.add(new KeyAction(Mode.ASK_USER_KEY, 'd', + StringId.KEY_ACTION_DELETE) { @Override public Object getObject() { return getSelectedData(); @@ -108,7 +113,7 @@ public class ContactDetailsRaw extends MainContentList { } }); // TODO: ui - actions.add(new KeyAction(Mode.ASK_USER, 'a', Trans.StringId.DUMMY) { + actions.add(new KeyAction(Mode.ASK_USER, 'a', StringId.KEY_ACTION_ADD) { @Override public Object getObject() { return contact; @@ -117,25 +122,33 @@ public class ContactDetailsRaw extends MainContentList { @Override public String getQuestion() { // TODO i18n - return "new data (xx = yy): "; + return "new data (xx.group = yy): "; } @Override public String callback(String answer) { - if (answer.length() > 0 && answer.contains("=")) { - String[] tab = answer.split("="); - Data data = new Data(null, tab[0].trim(), tab[1].trim(), - null); + 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); getContact().add(data); addItem("x"); } - return null; } }); // TODO: use a real UI for this, not a simple text box (a list or // something, maybe a whole new pane?) - actions.add(new KeyAction(Mode.ASK_USER, 't', Trans.StringId.DUMMY) { + actions.add(new KeyAction(Mode.ASK_USER, 't', StringId.DUMMY) { private String previous; @Override @@ -178,7 +191,7 @@ public class ContactDetailsRaw extends MainContentList { return "Cannot modify value"; } }); - actions.add(new KeyAction(Mode.ASK_USER, 'g', Trans.StringId.DUMMY) { + actions.add(new KeyAction(Mode.ASK_USER, 'g', StringId.DUMMY) { private String previous; @Override @@ -222,7 +235,7 @@ public class ContactDetailsRaw extends MainContentList { } }); actions.add(new KeyAction(Mode.NONE, KeyType.Tab, - Trans.StringId.KEY_ACTION_SWITCH_FORMAT) { + StringId.KEY_ACTION_SWITCH_FORMAT) { @Override public boolean onAction() { extMode = !extMode; @@ -255,6 +268,7 @@ public class ContactDetailsRaw extends MainContentList { @Override protected List getLabel(int index, int width, boolean selected, boolean focused) { + // TODO: from ini file? int SIZE_COL_1 = 15; int SIZE_COL_2_OPT = 10; @@ -270,12 +284,12 @@ public class ContactDetailsRaw extends MainContentList { if (data == null) return parts; - Element el = (focused && selected) ? Element.CONTACT_LINE_SELECTED - : Element.CONTACT_LINE; - Element elSep = (focused && selected) ? Element.CONTACT_LINE_SEPARATOR_SELECTED - : Element.CONTACT_LINE_SEPARATOR; - Element elDirty = (focused && selected) ? Element.CONTACT_LINE_DIRTY_SELECTED - : Element.CONTACT_LINE_DIRTY; + ColorOption el = (focused && selected) ? ColorOption.CONTACT_LINE_SELECTED + : ColorOption.CONTACT_LINE; + ColorOption elSep = (focused && selected) ? ColorOption.CONTACT_LINE_SEPARATOR_SELECTED + : ColorOption.CONTACT_LINE_SEPARATOR; + ColorOption elDirty = (focused && selected) ? ColorOption.CONTACT_LINE_DIRTY_SELECTED + : ColorOption.CONTACT_LINE_DIRTY; if (data.isDirty()) { parts.add(new TextPart(" ", el)); @@ -289,7 +303,12 @@ public class ContactDetailsRaw extends MainContentList { StringBuilder valueBuilder = new StringBuilder(" "); if (!extMode) { - valueBuilder.append(data.getValue()); + if (data.getB64Key() != -1) { + // TODO: i18n + valueBuilder.append(""); + } else { + valueBuilder.append(data.getValue().replaceAll("\n", "\\\\n")); + } if (data.getGroup() != null && data.getGroup().length() > 0) { valueBuilder.append("("); valueBuilder.append(data.getGroup()); @@ -306,8 +325,8 @@ public class ContactDetailsRaw extends MainContentList { value = valueBuilder.toString(); - name = StringUtils.sanitize(name, UiColors.getInstance().isUnicode()); - value = StringUtils.sanitize(value, UiColors.getInstance().isUnicode()); + name = StringUtils.sanitize(name, Main.isUnicode()); + value = StringUtils.sanitize(value, Main.isUnicode()); name = StringUtils.padString(name, SIZE_COL_1); group = StringUtils.padString(group, SIZE_COL_2_OPT); @@ -344,7 +363,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 @@ -354,8 +373,7 @@ public class ContactDetailsRaw extends MainContentList { if (builder == null) builder = new StringBuilder(); - for (int indexType = 0; indexType < data.size(); indexType++) { - TypeInfo type = data.get(indexType); + for (TypeInfo type : data) { if (builder.length() > 1) builder.append(", "); builder.append(type.getName().replaceAll(",", "\\,")); @@ -391,12 +409,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; }