X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactList.java;h=370aba7cd5adf2e98177ef2d8cc86701c250c15d;hb=0b0b2b0ff1f5e21f7b0feb955b4b54855fb3d508;hp=3a943f900610a75a56cec552be84eff1d7f4d5d0;hpb=fae07ea7af01c64ca1a858db75a615555318d5e2;p=jvcard.git

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactList.java b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
index 3a943f9..370aba7 100644
--- a/src/be/nikiroo/jvcard/tui/panes/ContactList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
@@ -4,11 +4,13 @@ import java.util.LinkedList;
 import java.util.List;
 
 import be.nikiroo.jvcard.Card;
+import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.i18n.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;
 
 import com.googlecode.lanterna.input.KeyType;
 
@@ -53,8 +55,10 @@ public class ContactList extends MainContentList {
 	@Override
 	public String getExitWarning() {
 		if (card != null && card.isDirty()) {
-			return "Some of your contact information is not saved";
+			//TODO: save? [y/n] instead
+			return "Some of your contact information is not saved; ignore? [Y/N]";
 		}
+		
 		return null;
 	}
 
@@ -63,6 +67,17 @@ public class ContactList extends MainContentList {
 		List<KeyAction> actions = new LinkedList<KeyAction>();
 
 		// TODO del, save...
+		// TODO: remove
+		actions.add(new KeyAction(Mode.NONE, 'd', Trans.StringId.DUMMY) {
+			@Override
+			public boolean onAction() {
+				//TODO dummy action
+				int index = getSelectedIndex();
+				Contact c = card.getContacts().get(index);
+				c.updateFrom(c);
+				return false;
+			}
+		});
 		actions.add(new KeyAction(Mode.CONTACT_DETAILS, 'e',
 				Trans.StringId.KEY_ACTION_EDIT_CONTACT) {
 			@Override
@@ -103,14 +118,45 @@ public class ContactList extends MainContentList {
 
 	@Override
 	public String getTitle() {
-		// TODO Auto-generated method stub
+		if (card != null) {
+			return card.getName();
+		}
+
 		return null;
 	}
 
 	@Override
-	protected String getLabel(int index, int width) {
+	protected List<TextPart> getLabel(int index, int width, boolean selected,
+			boolean focused) {
+		Contact c = card.getContacts().get(index);
+
+		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;
+
+		width -= 2; // dirty mark space
+
 		// we could use: " ", "┃", "│"...
-		return card.getContacts().get(index).toString(format, " ┃ ", width);
+		String[] array = c.toStringArray(format, "┃", " ", width);
+
+		List<TextPart> parts = new LinkedList<TextPart>();
+		if (c.isDirty()) {
+			parts.add(new TextPart(" ", el));
+			parts.add(new TextPart("*", elDirty));
+		} else {
+			parts.add(new TextPart("  ", elSep));
+		}
+
+		boolean separator = false;
+		for (String str : array) {
+			parts.add(new TextPart(str, (separator ? elSep : el)));
+			separator = !separator;
+		}
+
+		return parts;
 	}
 
 	private void switchFormat() {