git://git.nikiroo.be
/
jvcard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New option: save/load contacts' photos
[jvcard.git]
/
src
/
be
/
nikiroo
/
jvcard
/
tui
/
panes
/
ContactList.java
diff --git
a/src/be/nikiroo/jvcard/tui/panes/ContactList.java
b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
index 2e6db5259f19185b030dc577f0cf98d7dd47b2b6..600f90ca9931bfc8b108b99c00ee88e5cff92023 100644
(file)
--- a/
src/be/nikiroo/jvcard/tui/panes/ContactList.java
+++ b/
src/be/nikiroo/jvcard/tui/panes/ContactList.java
@@
-7,12
+7,12
@@
import java.util.List;
import be.nikiroo.jvcard.Card;
import be.nikiroo.jvcard.Contact;
import be.nikiroo.jvcard.Data;
import be.nikiroo.jvcard.Card;
import be.nikiroo.jvcard.Contact;
import be.nikiroo.jvcard.Data;
-import be.nikiroo.jvcard.
i18n.Trans
;
+import be.nikiroo.jvcard.
launcher.Main
;
import be.nikiroo.jvcard.resources.Bundles;
import be.nikiroo.jvcard.resources.Bundles;
+import be.nikiroo.jvcard.resources.Trans;
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.KeyAction;
import be.nikiroo.jvcard.tui.KeyAction.DataType;
import be.nikiroo.jvcard.tui.KeyAction.Mode;
-import be.nikiroo.jvcard.tui.UiColors;
import be.nikiroo.jvcard.tui.UiColors.Element;
import com.googlecode.lanterna.input.KeyType;
import be.nikiroo.jvcard.tui.UiColors.Element;
import com.googlecode.lanterna.input.KeyType;
@@
-56,7
+56,7
@@
public class ContactList extends MainContentList {
if (card != null) {
for (Contact c : card) {
if (filter == null
if (card != null) {
for (Contact c : card) {
if (filter == null
- || c.toString(format).toLowerCase()
+ || c.toString(format
, "|"
).toLowerCase()
.contains(filter.toLowerCase())) {
addItem("x");
contacts.add(c);
.contains(filter.toLowerCase())) {
addItem("x");
contacts.add(c);
@@
-92,7
+92,8
@@
public class ContactList extends MainContentList {
List<KeyAction> actions = new LinkedList<KeyAction>();
// TODO ui
List<KeyAction> actions = new LinkedList<KeyAction>();
// TODO ui
- actions.add(new KeyAction(Mode.ASK_USER, 'a', Trans.StringId.DUMMY) {
+ actions.add(new KeyAction(Mode.ASK_USER, 'a',
+ Trans.StringId.KEY_ACTION_ADD) {
@Override
public Object getObject() {
return card;
@Override
public Object getObject() {
return card;
@@
-100,8
+101,7
@@
public class ContactList extends MainContentList {
@Override
public String getQuestion() {
@Override
public String getQuestion() {
- // TODO i18n
- return "new contact name: ";
+ return Main.trans(Trans.StringId.ASK_USER_CONTACT_NAME);
}
@Override
}
@Override
@@
-125,8
+125,13
@@
public class ContactList extends MainContentList {
@Override
public String getQuestion() {
@Override
public String getQuestion() {
- // TODO i18n
- return "Delete contact? [Y/N]";
+ Contact contact = getSelectedContact();
+ String contactName = "null";
+ if (contact != null)
+ contactName = "" + contact.getPreferredDataValue("FN");
+
+ return Main.trans(Trans.StringId.CONFIRM_USER_DELETE_CONTACT,
+ contactName);
}
@Override
}
@Override
@@
-138,8
+143,12
@@
public class ContactList extends MainContentList {
return null;
}
return null;
}
- // TODO i18n
- return "Cannot delete contact";
+ String contactName = "null";
+ if (contact != null)
+ contactName = "" + contact.getPreferredDataValue("FN");
+
+ return Main.trans(Trans.StringId.ERR_CANNOT_DELETE_CONTACT,
+ contactName);
}
return null;
}
return null;
@@
-254,7
+263,7
@@
public class ContactList extends MainContentList {
width -= 2; // dirty mark space
String[] array = contact.toStringArray(format, getSeparator(), " ",
width -= 2; // dirty mark space
String[] array = contact.toStringArray(format, getSeparator(), " ",
- width,
UiColors.getInstance()
.isUnicode());
+ width,
Main
.isUnicode());
if (contact.isDirty()) {
parts.add(new TextPart(" ", el));
if (contact.isDirty()) {
parts.add(new TextPart(" ", el));