X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetailsRaw.java;h=2b8e8429b3b8e869bd65c305977990180c40384f;hb=f06c81000632cfb5f525ca458f719338f55f9f66;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..2b8e842 100644 --- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java +++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java @@ -6,14 +6,17 @@ 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.ColorOption; +import be.nikiroo.jvcard.resources.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 be.nikiroo.jvcard.tui.TuiLauncher; +import be.nikiroo.utils.StringUtils; +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 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 +68,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 +78,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 +86,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(); @@ -107,8 +115,59 @@ public class ContactDetailsRaw extends MainContentList { return null; } }); - // TODO: ui - actions.add(new KeyAction(Mode.ASK_USER, 'a', Trans.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,15 +176,16 @@ public class ContactDetailsRaw extends MainContentList { @Override public String getQuestion() { // TODO i18n - return "new data (xx = yy): "; + if (name == null) + return "Data name: "; + + return null; } @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); + if (answer != null & answer.length() > 0) { + Data data = new Data(null, answer, "", null); getContact().add(data); addItem("x"); } @@ -135,7 +195,7 @@ public class ContactDetailsRaw extends MainContentList { }); // 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 +238,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 +282,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 +315,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 +331,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,9 +350,14 @@ 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(" ("); valueBuilder.append(data.getGroup()); valueBuilder.append(")"); } @@ -306,8 +372,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 +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 @@ -354,8 +420,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 +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; }