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;
@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,
- 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
public String getDefaultAnswer() {
Data data = getData();
if (data != null) {
- return data.getValue();
+ return data.getRawValue().replaceAll("\n", "\\\\n");
}
return null;
public String callback(String answer) {
Data data = getData();
if (data != null) {
- data.setValue(answer);
+ data.setRawValue(answer.replaceAll("\\\\n", "\n"));
return null;
}
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();
}
});
// 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;
@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
Data data = getData();
if (data != null) {
if (!answer.equals(previous)) {
- data.setTypes(stringToTypes(answer));
+ data.replaceListContent(stringToTypes(answer));
}
return null;
}
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
}
});
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;
@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;
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));
StringBuilder valueBuilder = new StringBuilder(" ");
if (!extMode) {
- valueBuilder.append(data.getValue());
+ 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());
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);
* @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
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(",", "\\,"));
}
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;
}
git://git.nikiroo.be / jvcard.git / blobdiff