The format(s) of the contacts list is now exported to display.properties

diff --git a/src/be/nikiroo/jvcard/Contact.java b/src/be/nikiroo/jvcard/Contact.java
index 8142c29a830c4d6dfc82c6a01f0dddc718e62c62..328993947311772e5b62af6920ea178adef6b02c 100644 (file)
--- a/src/be/nikiroo/jvcard/Contact.java
+++ b/src/be/nikiroo/jvcard/Contact.java
@@ -182,7 +182,7 @@ public class Contact {
         * The format is basically a list of field names separated by a pipe and
         * optionally parametrised. The parameters allows you to:
         * <ul>
-        * <li>@x: show only a present/not present info</li>
+        * <li>@x: (the 'x' is the letter 'x') show only a present/not present info</li>
         * <li>@n: limit the size to a fixed value 'n'</li>
         * <li>@+: expand the size of this field as much as possible</li>
         * </ul>

diff --git a/src/be/nikiroo/jvcard/resources/colors.properties b/src/be/nikiroo/jvcard/resources/colors.properties
index c57a99e9560b39f6dffc33463ba69c33fd5f24b1..3fe44b70ab07780092544d6bdace8d8f8a809900 100644 (file)
--- a/src/be/nikiroo/jvcard/resources/colors.properties
+++ b/src/be/nikiroo/jvcard/resources/colors.properties
@@ -1,7 +1,7 @@
 # application colours
 # 
 # Note that you can define a colour in one of those 3 ways:
-# - WHITE: one of the ANSI colour names, in uppercase
+# - WHITE: one of the ANSI colour names, in upper case
 # - @RRGGBB: a RGB code we will try to match using one of the 256 Terminal colours
 # - #RRGGBB: an exact RGB colour (please make sure your terminal supports this)
 # 

diff --git a/src/be/nikiroo/jvcard/resources/display.properties b/src/be/nikiroo/jvcard/resources/display.properties
new file mode 100644 (file)
index 0000000..d03d45b
--- /dev/null
+++ b/src/be/nikiroo/jvcard/resources/display.properties
@@ -0,0 +1,12 @@
+# display options configuration
+
+# The contact list format is basically a list of VCF field names
+# separated by a pipe and optionally parametrised.
+# The parameters allows you to:
+# - @x: (the 'x' is the letter 'x') show only a present/not present info
+# - @n: limit the size to a fixed value 'n'
+# - @+: expand the size of this field as much as possible
+# 
+# You can cycle through them if you have more than one
+# (in this case, separate them with a comma (',')
+CONTACT_LIST_FORMAT = NICKNAME@10|FN@+|EMAIL@30|PHOTO@x,FN@+|EMAIL@40

diff --git a/src/be/nikiroo/jvcard/resources/resources.properties b/src/be/nikiroo/jvcard/resources/resources.properties
index dce79cc066f1ed4a298258c2dbcb779f7c4da81a..14428eadd614e2a3df4f65a8176c3ac8ff0e428e 100644 (file)
--- a/src/be/nikiroo/jvcard/resources/resources.properties
+++ b/src/be/nikiroo/jvcard/resources/resources.properties
@@ -1,4 +1,6 @@
 # English translation file (UTF-8)
+# Note that any key can be doubled with a _NOUTF suffix
+# to use when the flag --noutf is passed
 
 # those 2 keys MUST be 3-characters long
 KEY_TAB = TAB

diff --git a/src/be/nikiroo/jvcard/resources/resources_en.properties b/src/be/nikiroo/jvcard/resources/resources_en.properties
index 71954602cfeae8227c72ba5300bfa02bb996e3bf..afd62a89ab8124956357aed9db3b515a4aa65259 100644 (file)
--- a/src/be/nikiroo/jvcard/resources/resources_en.properties
+++ b/src/be/nikiroo/jvcard/resources/resources_en.properties
@@ -1,4 +1,6 @@
 # default translation file (UTF-8)
+# Note that any key can be doubled with a _NOUTF suffix
+# to use when the flag --noutf is passed
 
 # those 2 keys MUST be 3-characters long
 KEY_TAB = TAB

diff --git a/src/be/nikiroo/jvcard/resources/resources_fr.properties b/src/be/nikiroo/jvcard/resources/resources_fr.properties
index 260a56b66724b1924d8b71a559cce845c9b7347e..609beafddbfc9e59aeac89d2d177ac93e50d2ee6 100644 (file)
--- a/src/be/nikiroo/jvcard/resources/resources_fr.properties
+++ b/src/be/nikiroo/jvcard/resources/resources_fr.properties
@@ -1,4 +1,7 @@
 # French translation file (UTF-8)
+# Note : les clefs peuvent être suffixées de _NOUTF
+# pour forcer une autre version quand le flag --noutf
+# est passé au programme 
 
 # les deux touches qui suivent DOIVENT faire 3 caractères de long
 KEY_TAB = TAB

diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactList.java b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
index ae1a65b2ee52ed54bc788d26614677aa67250bb1..6287a69997caf3bcee592ca394b738c83aff70f0 100644 (file)
--- a/src/be/nikiroo/jvcard/tui/panes/ContactList.java
+++ b/src/be/nikiroo/jvcard/tui/panes/ContactList.java
@@ -7,6 +7,7 @@ import java.util.List;
 import be.nikiroo.jvcard.Card;
 import be.nikiroo.jvcard.Contact;
 import be.nikiroo.jvcard.i18n.Trans;
+import be.nikiroo.jvcard.resources.Bundles;
 import be.nikiroo.jvcard.tui.KeyAction;
 import be.nikiroo.jvcard.tui.UiColors;
 import be.nikiroo.jvcard.tui.KeyAction.DataType;
@@ -20,14 +21,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);