New launcher class to start all 3 modes:

[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 ae1a65b2ee52ed54bc788d26614677aa67250bb1..73c6a84c65e8de094dbdb2afffd8b01277180986 100644 (file)
--- a/src/be/nikiroo/jvcard/tui/panes/ContactList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
@@ -6,9 +6,11 @@ import java.util.List;
 
 import be.nikiroo.jvcard.Card;
 import be.nikiroo.jvcard.Contact;
-import be.nikiroo.jvcard.i18n.Trans;
+import be.nikiroo.jvcard.Data;
+import be.nikiroo.jvcard.launcher.Main;
+import be.nikiroo.jvcard.resources.Bundles;
+import be.nikiroo.jvcard.resources.Trans;
 import be.nikiroo.jvcard.tui.KeyAction;
-import be.nikiroo.jvcard.tui.UiColors;
 import be.nikiroo.jvcard.tui.KeyAction.DataType;
 import be.nikiroo.jvcard.tui.KeyAction.Mode;
 import be.nikiroo.jvcard.tui.UiColors.Element;
@@ -20,14 +22,18 @@ public class ContactList extends MainContentList {
        private List<Contact> contacts;
        private String filter;
 
-       private List<String> formats = new LinkedList<String>();
-       private int selectedFormat = -1;
-       private String format = "";
+       private List<String> formats;
+       private int selectedFormat;
+       private String format;
 
        public ContactList(Card card) {
-               // TODO: should get that in an INI file
-               formats.add("NICKNAME@3|FN@+|EMAIL@30");
-               formats.add("FN@+|EMAIL@40");
+               formats = new LinkedList<String>();
+               for (String format : Bundles.getBundle("display")
+                               .getString("CONTACT_LIST_FORMAT").split(",")) {
+                       formats.add(format);
+               }
+
+               selectedFormat = -1;
                switchFormat();
 
                setCard(card);
@@ -48,12 +54,11 @@ public class ContactList extends MainContentList {
                this.contacts = new LinkedList<Contact>();
 
                if (card != null) {
-                       for (int i = 0; i < card.size(); i++) {
-                               Contact c = card.get(i);
+                       for (Contact c : card) {
                                if (filter == null
                                                || c.toString(format).toLowerCase()
                                                                .contains(filter.toLowerCase())) {
-                                       addItem("[contact line]");
+                                       addItem("x");
                                        contacts.add(c);
                                }
                        }
@@ -86,12 +91,29 @@ public class ContactList extends MainContentList {
        public List<KeyAction> getKeyBindings() {
                List<KeyAction> actions = new LinkedList<KeyAction>();
 
-               // TODO add
-               actions.add(new KeyAction(Mode.CONTACT_DETAILS_RAW, 'e',
-                               Trans.StringId.KEY_ACTION_EDIT_CONTACT) {
+               // TODO ui
+               actions.add(new KeyAction(Mode.ASK_USER, 'a', Trans.StringId.DUMMY) {
                        @Override
                        public Object getObject() {
-                               return getSelectedContact();
+                               return card;
+                       }
+
+                       @Override
+                       public String getQuestion() {
+                               // TODO i18n
+                               return "new contact name: ";
+                       }
+
+                       @Override
+                       public String callback(String answer) {
+                               if (answer.length() > 0) {
+                                       List<Data> datas = new LinkedList<Data>();
+                                       datas.add(new Data(null, "FN", answer, null));
+                                       getCard().add(new Contact(datas));
+                                       addItem("x");
+                               }
+
+                               return null;
                        }
                });
                actions.add(new KeyAction(Mode.ASK_USER_KEY, 'd',
@@ -112,6 +134,7 @@ public class ContactList extends MainContentList {
                                if (answer.equalsIgnoreCase("y")) {
                                        Contact contact = getSelectedContact();
                                        if (contact != null && contact.delete()) {
+                                               removeItem("x");
                                                return null;
                                        }
 
@@ -231,7 +254,7 @@ public class ContactList extends MainContentList {
                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));