X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Fjvcard%2Ftui%2Fpanes%2FContactDetails.java;h=2ea8a9724b80cf6ac777cb37fc75ea08ae7f328c;hb=7671a2499e6f0d6c8e0765b36c18c1e89bc457c5;hp=4cbbdf7d38e2e27a6264880123c647d3fd2f7410;hpb=3634193b7a8927e68a3ae3d38fff4f6bd36c4ee5;p=jvcard.git diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java index 4cbbdf7..2ea8a97 100644 --- a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java +++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java @@ -1,21 +1,17 @@ package be.nikiroo.jvcard.tui.panes; import java.awt.Image; -import java.io.ByteArrayInputStream; import java.util.LinkedList; import java.util.List; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import javax.imageio.ImageIO; -import javax.xml.bind.DatatypeConverter; import be.nikiroo.jvcard.Contact; import be.nikiroo.jvcard.Data; import be.nikiroo.jvcard.TypeInfo; -import be.nikiroo.jvcard.resources.Bundles; import be.nikiroo.jvcard.resources.StringUtils; -import be.nikiroo.jvcard.resources.Trans; +import be.nikiroo.jvcard.resources.bundles.DisplayBundle; +import be.nikiroo.jvcard.resources.enums.DisplayOption; +import be.nikiroo.jvcard.resources.enums.ColorOption; +import be.nikiroo.jvcard.resources.enums.StringId; import be.nikiroo.jvcard.tui.ImageTextControl; import be.nikiroo.jvcard.tui.KeyAction; import be.nikiroo.jvcard.tui.KeyAction.DataType; @@ -39,10 +35,20 @@ public class ContactDetails extends MainContent { private boolean fullscreenImage; private Panel infoPanel; private Label note; - ResourceBundle map; + + // from .properties file: + private int labelSize = -1; + private String infoFormat = ""; + + // public ContactDetails(Contact contact) { - map = Bundles.getBundle("display"); + // Get the .properties info: + DisplayBundle map = new DisplayBundle(); + labelSize = map.getInteger(DisplayOption.CONTACT_DETAILS_LABEL_WIDTH, + -1); + infoFormat = map.getString(DisplayOption.CONTACT_DETAILS_INFO); + // BorderLayout blayout = new BorderLayout(); setLayoutManager(blayout); @@ -58,9 +64,9 @@ public class ContactDetails extends MainContent { Panel notePanel = new Panel(); notePanel.setLayoutManager(new LinearLayout(Direction.HORIZONTAL)); - notePanel.addComponent(UiColors.Element.VIEW_CONTACT_NOTES_TITLE - .createLabel("Notes:")); - note = UiColors.Element.VIEW_CONTACT_NORMAL.createLabel(""); + notePanel.addComponent(UiColors.createLabel( + ColorOption.VIEW_CONTACT_NOTES_TITLE, "Notes:")); + note = UiColors.createLabel(ColorOption.VIEW_CONTACT_NORMAL, ""); notePanel.addComponent(note); setContact(contact); @@ -86,36 +92,12 @@ public class ContactDetails extends MainContent { infoPanel.removeAllComponents(); String name = contact.getPreferredDataValue("FN"); - if (name == null || name.length() == 0) { - // TODO format it ourself - name = contact.getPreferredDataValue("N"); - } - - infoPanel.addComponent(UiColors.Element.VIEW_CONTACT_NAME - .createLabel(name)); - infoPanel.addComponent(UiColors.Element.VIEW_CONTACT_NORMAL - .createLabel("")); + infoPanel.addComponent(UiColors.createLabel( + ColorOption.VIEW_CONTACT_NAME, name)); + infoPanel.addComponent(UiColors.createLabel( + ColorOption.VIEW_CONTACT_NORMAL, "")); // List of infos: - int labelSize = -1; - try { - labelSize = Integer.parseInt(map - .getString("CONTACT_DETAILS_LABEL_WIDTH")); - - } catch (NumberFormatException e) { - e.printStackTrace(); - labelSize = -1; - } catch (MissingResourceException e) { - labelSize = -1; - } - - String infoFormat = ""; - try { - infoFormat = map.getString("CONTACT_DETAILS_INFO"); - } catch (MissingResourceException e) { - e.printStackTrace(); - } - String[] infos = infoFormat.split("\\|"); for (String info : infos) { // # - "=FIELD" will take the preferred value for this field @@ -134,8 +116,8 @@ public class ContactDetails extends MainContent { all = true; if (all || hl || info.contains("=")) { - UiColors.Element el = hl ? UiColors.Element.VIEW_CONTACT_HIGHLIGHT - : UiColors.Element.VIEW_CONTACT_NORMAL; + ColorOption el = hl ? ColorOption.VIEW_CONTACT_HIGHLIGHT + : ColorOption.VIEW_CONTACT_NORMAL; int index = info.indexOf('='); if (index < 0) @@ -149,48 +131,47 @@ public class ContactDetails extends MainContent { String field = info.substring(index + 1); if (all) { + Data pref = contact.getPreferredData(field); for (Data data : contact.getData(field)) { - if (data.isPreferred()) { - infoPanel - .addComponent(el.createLabel(StringUtils - .padString(label, labelSize) - + contact - .getPreferredDataValue(field))); + if (data == pref) { + infoPanel.addComponent(UiColors.createLabel(el, + StringUtils.padString(label, labelSize) + + data.toString())); } else { - infoPanel - .addComponent(UiColors.Element.VIEW_CONTACT_NORMAL.createLabel(StringUtils - .padString(label, labelSize) - + contact - .getPreferredDataValue(field))); + infoPanel.addComponent(UiColors.createLabel( + ColorOption.VIEW_CONTACT_NORMAL, + StringUtils.padString(label, labelSize) + + data.toString())); } } } else { - infoPanel.addComponent(el.createLabel(StringUtils - .padString(label, labelSize) - + contact.getPreferredDataValue(field))); + String val = contact.getPreferredDataValue(field); + if (val == null) + val = ""; + infoPanel.addComponent(UiColors.createLabel(el, + StringUtils.padString(label, labelSize) + val)); } } else { String label = info; - infoPanel.addComponent(UiColors.Element.VIEW_CONTACT_NORMAL - .createLabel(StringUtils - .padString(label, labelSize))); + infoPanel.addComponent(UiColors.createLabel( + ColorOption.VIEW_CONTACT_NORMAL, + StringUtils.padString(label, labelSize))); } } // end of list - infoPanel.addComponent(UiColors.Element.VIEW_CONTACT_NORMAL - .createLabel("")); + infoPanel.addComponent(UiColors.createLabel( + ColorOption.VIEW_CONTACT_NORMAL, "")); String notes = contact.getPreferredDataValue("NOTE"); if (notes == null) notes = ""; - note.setText(notes.replaceAll("\\\\n", "\n")); + note.setText(notes); Data photo = contact.getPreferredData("PHOTO"); if (photo != null) { TypeInfo encoding = null; - for (int index = 0; index < photo.size(); index++) { - TypeInfo info = photo.get(index); + for (TypeInfo info : photo) { if (info.getName() != null) { if (info.getName().equalsIgnoreCase("ENCODING")) encoding = info; @@ -203,10 +184,7 @@ public class ContactDetails extends MainContent { && encoding.getValue().equalsIgnoreCase("b")) { try { - image = ImageIO.read(new ByteArrayInputStream( - DatatypeConverter.parseBase64Binary(photo - .getValue()))); - image.toString(); + image = StringUtils.toImage(photo.getValue()); } catch (Exception e) { System.err.println("Cannot parse image for contact: " + contact.getPreferredDataValue("UID")); @@ -228,7 +206,7 @@ public class ContactDetails extends MainContent { List actions = new LinkedList(); actions.add(new KeyAction(Mode.NONE, KeyType.Tab, - Trans.StringId.KEY_ACTION_SWITCH_FORMAT) { + StringId.KEY_ACTION_SWITCH_FORMAT) { @Override public boolean onAction() { if (txtImage != null) { @@ -238,8 +216,7 @@ public class ContactDetails extends MainContent { return false; } }); - actions.add(new KeyAction(Mode.NONE, 'i', - Trans.StringId.KEY_ACTION_INVERT) { + actions.add(new KeyAction(Mode.NONE, 'i', StringId.KEY_ACTION_INVERT) { @Override public boolean onAction() { if (txtImage != null) { @@ -250,7 +227,7 @@ public class ContactDetails extends MainContent { } }); actions.add(new KeyAction(Mode.NONE, 'f', - Trans.StringId.KEY_ACTION_FULLSCREEN) { + StringId.KEY_ACTION_FULLSCREEN) { @Override public boolean onAction() { fullscreenImage = !fullscreenImage; @@ -260,7 +237,7 @@ public class ContactDetails extends MainContent { }); // TODO: add "normal" edit actions.add(new KeyAction(Mode.CONTACT_DETAILS_RAW, 'r', - Trans.StringId.KEY_ACTION_EDIT_CONTACT_RAW) { + StringId.KEY_ACTION_EDIT_CONTACT_RAW) { @Override public Object getObject() { return contact; @@ -319,7 +296,7 @@ public class ContactDetails extends MainContent { } else { // TODO: configure size? int w = getSize().getColumns() - 40; - int h = getSize().getRows() - 5; + int h = getSize().getRows() - 9; if (w <= 0 || h <= 0) return null;