From: Niki Roo Date: Sat, 7 May 2016 13:24:35 +0000 (+0200) Subject: Sliders in note panel X-Git-Tag: v1.1~1 X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=8002675fff4eaeeb292c4b1a1e4182bd999a548c;p=jvcard.git Sliders in note panel --- diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java index 2ea8a97..a221f6b 100644 --- a/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java +++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetails.java @@ -9,8 +9,8 @@ import be.nikiroo.jvcard.Data; import be.nikiroo.jvcard.TypeInfo; import be.nikiroo.jvcard.resources.StringUtils; 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.DisplayOption; import be.nikiroo.jvcard.resources.enums.StringId; import be.nikiroo.jvcard.tui.ImageTextControl; import be.nikiroo.jvcard.tui.KeyAction; @@ -22,9 +22,10 @@ import com.googlecode.lanterna.TerminalSize; import com.googlecode.lanterna.gui2.BorderLayout; import com.googlecode.lanterna.gui2.Borders; import com.googlecode.lanterna.gui2.Direction; -import com.googlecode.lanterna.gui2.Label; import com.googlecode.lanterna.gui2.LinearLayout; import com.googlecode.lanterna.gui2.Panel; +import com.googlecode.lanterna.gui2.TextBox; +import com.googlecode.lanterna.gui2.TextBox.Style; import com.googlecode.lanterna.input.KeyType; public class ContactDetails extends MainContent { @@ -34,7 +35,7 @@ public class ContactDetails extends MainContent { private Image image; private boolean fullscreenImage; private Panel infoPanel; - private Label note; + private TextBox note; // from .properties file: private int labelSize = -1; @@ -66,8 +67,12 @@ public class ContactDetails extends MainContent { notePanel.addComponent(UiColors.createLabel( ColorOption.VIEW_CONTACT_NOTES_TITLE, "Notes:")); - note = UiColors.createLabel(ColorOption.VIEW_CONTACT_NORMAL, ""); + // 10000x10000 is probably enough or "max" + note = new TextBox(new TerminalSize(10000, 10000), Style.MULTI_LINE); + note.setReadOnly(true); notePanel.addComponent(note); + note.setVerticalFocusSwitching(false); + note.setHorizontalFocusSwitching(false); setContact(contact); diff --git a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java index 08c0e4a..c29ba00 100644 --- a/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java +++ b/src/be/nikiroo/jvcard/tui/panes/ContactDetailsRaw.java @@ -357,7 +357,7 @@ public class ContactDetailsRaw extends MainContentList { valueBuilder.append(data.getValue().replaceAll("\n", "\\\\n")); } if (data.getGroup() != null && data.getGroup().length() > 0) { - valueBuilder.append("("); + valueBuilder.append(" ("); valueBuilder.append(data.getGroup()); valueBuilder.append(")"); }