X-Git-Url: http://git.nikiroo.be/?p=jvcard.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FFileList.java;h=e7632e02344514fa4ecdb8a29dc89b77d6b7f75f;hp=79f530e0604f38318d6b3283ce1dc75ce9530f88;hb=7da41ecd30228908bf2afcd07ff7943ab59d4c01;hpb=9c8baf0c360173b864683176c567757429c4fb12

diff --git a/src/be/nikiroo/jvcard/tui/panes/FileList.java b/src/be/nikiroo/jvcard/tui/panes/FileList.java
index 79f530e..e7632e0 100644
--- a/src/be/nikiroo/jvcard/tui/panes/FileList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/FileList.java
@@ -1,27 +1,26 @@
 package be.nikiroo.jvcard.tui.panes;
 
-import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
 import be.nikiroo.jvcard.Card;
-import be.nikiroo.jvcard.i18n.Trans;
-import be.nikiroo.jvcard.parsers.Format;
+import be.nikiroo.jvcard.launcher.Main;
+import be.nikiroo.jvcard.resources.StringUtils;
+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;
 
 import com.googlecode.lanterna.input.KeyType;
 
 public class FileList extends MainContentList {
-	private List<File> files;
-
-	public FileList(List<File> files) {
-		super(UiColors.Element.CONTACT_LINE,
-				UiColors.Element.CONTACT_LINE_SELECTED);
+	private List<String> files;
+	private List<Card> cards;
 
+	public FileList(List<String> files) {
 		setFiles(files);
 	}
 
@@ -31,13 +30,14 @@ public class FileList extends MainContentList {
 	 * @param files
 	 *            the new files
 	 */
-	public void setFiles(List<File> files) {
+	public void setFiles(List<String> files) {
 		clearItems();
 		this.files = files;
+		cards = new ArrayList<Card>();
 
-		// TODO
-		for (File file : files) {
-			addItem(file.getName());
+		for (String file : files) {
+			addItem(file); // TODO
+			cards.add(null);
 		}
 
 		setSelectedIndex(0);
@@ -49,10 +49,41 @@ public class FileList extends MainContentList {
 	}
 
 	@Override
-	public String getExitWarning() {
-		// TODO Auto-generated method stub
-		return null;
-	}
+	protected List<TextPart> getLabel(int index, int width, boolean selected,
+			boolean focused) {
+		// TODO: from ini file?
+		int SIZE_COL_1 = 3;
+
+		Element el = (focused && selected) ? Element.CONTACT_LINE_SELECTED
+				: Element.CONTACT_LINE;
+		Element elSep = (focused && selected) ? Element.CONTACT_LINE_SEPARATOR_SELECTED
+				: Element.CONTACT_LINE_SEPARATOR;
+
+		List<TextPart> parts = new LinkedList<TextPart>();
+
+		String count = "";
+		if (cards.get(index) != null)
+			count += cards.get(index).size();
+
+		String name = files.get(index).replaceAll("\\\\", "/");
+		int indexSl = name.lastIndexOf('/');
+		if (indexSl >= 0) {
+			name = name.substring(indexSl + 1);
+		}
+
+		name = StringUtils.sanitize(name, Main.isUnicode());
+
+		count = " " + StringUtils.padString(count, SIZE_COL_1) + " ";
+		name = " "
+				+ StringUtils.padString(name, width - SIZE_COL_1
+						- getSeparator().length()) + " ";
+
+		parts.add(new TextPart(count, el));
+		parts.add(new TextPart(getSeparator(), elSep));
+		parts.add(new TextPart(name, el));
+
+		return parts;
+	};
 
 	@Override
 	public List<KeyAction> getKeyBindings() {
@@ -63,18 +94,23 @@ public class FileList extends MainContentList {
 				Trans.StringId.KEY_ACTION_VIEW_CARD) {
 			@Override
 			public Object getObject() {
-				File file = files.get(getSelectedIndex());
-				Format format = Format.Abook;
-				String ext = file.getName();
-				if (ext.contains(".")) {
-					String tab[] = ext.split("\\.");
-					if (tab.length > 1
-							&& tab[tab.length - 1].equalsIgnoreCase("vcf")) {
-						format = Format.VCard21;
-					}
-				}
+				int index = getSelectedIndex();
+
+				if (index < 0 || index >= cards.size())
+					return null;
+
+				if (cards.get(index) != null)
+					return cards.get(index);
+
+				String file = files.get(index);
+
 				try {
-					return new Card(file, format);
+					Card card = Main.getCard(file);
+					cards.set(index, card);
+
+					invalidate();
+
+					return card;
 				} catch (IOException ioe) {
 					ioe.printStackTrace();
 					return null;
@@ -84,16 +120,4 @@ public class FileList extends MainContentList {
 
 		return actions;
 	}
-
-	@Override
-	public Mode getMode() {
-		return Mode.FILE_LIST;
-	}
-
-	@Override
-	public String getTitle() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 }