X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTMessageBox.java;h=6f1e8a69486b05141b085bda4b841ba474aef347;hb=f433d15308b70e23280a65cef8c54002a7a971ce;hp=8ad51446893b85593161abb17585ebc688ba7f69;hpb=a2018e9964f6c58742cd1e6dd0a0c63e244a89d6;p=fanfix.git diff --git a/src/jexer/TMessageBox.java b/src/jexer/TMessageBox.java index 8ad5144..6f1e8a6 100644 --- a/src/jexer/TMessageBox.java +++ b/src/jexer/TMessageBox.java @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (C) 2017 Kevin Lamonte + * Copyright (C) 2019 Kevin Lamonte * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -30,7 +30,9 @@ package jexer; import java.util.ArrayList; import java.util.List; +import java.util.ResourceBundle; +import jexer.bits.StringUtils; import jexer.event.TKeypressEvent; import static jexer.TKeypress.*; @@ -38,10 +40,9 @@ import static jexer.TKeypress.*; * TMessageBox is a system-modal dialog with buttons for OK, Cancel, Yes, or * No. Call it like: * - *
*
* {@code - * box = application.messageBox(title, caption, + * box = messageBox(title, caption, * TMessageBox.Type.OK | TMessageBox.Type.CANCEL); * * if (box.getResult() == TMessageBox.OK) { @@ -53,6 +54,15 @@ import static jexer.TKeypress.*; */ public class TMessageBox extends TWindow { + /** + * Translated strings. + */ + private static final ResourceBundle i18n = ResourceBundle.getBundle(TMessageBox.class.getName()); + + // ------------------------------------------------------------------------ + // Constants -------------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * Message boxes have these supported types. */ @@ -78,16 +88,6 @@ public class TMessageBox extends TWindow { YESNOCANCEL }; - /** - * The type of this message box. - */ - private Type type; - - /** - * My buttons. - */ - private Listbuttons; - /** * Message boxes have these possible results. */ @@ -113,19 +113,28 @@ public class TMessageBox extends TWindow { NO }; + // ------------------------------------------------------------------------ + // Variables -------------------------------------------------------------- + // ------------------------------------------------------------------------ + /** - * Which button was clicked: OK, CANCEL, YES, or NO. + * The type of this message box. */ - private Result result = Result.OK; + private Type type; /** - * Get the result. - * - * @return the result: OK, CANCEL, YES, or NO. + * My buttons. */ - public final Result getResult() { - return result; - } + private List buttons; + + /** + * Which button was clicked: OK, CANCEL, YES, or NO. + */ + private Result result = Result.OK; + + // ------------------------------------------------------------------------ + // Constructors ----------------------------------------------------------- + // ------------------------------------------------------------------------ /** * Public constructor. The message box will be centered on screen. @@ -170,7 +179,7 @@ public class TMessageBox extends TWindow { protected TMessageBox(final TApplication application, final String title, final String caption, final Type type, final boolean yield) { - // Start as 50x50 at (1, 1). These will be changed later. + // Start as 100x100 at (1, 1). These will be changed later. super(application, title, 1, 1, 100, 100, CENTERED | MODAL); // Hang onto type so that we can provide more convenience in @@ -179,11 +188,11 @@ public class TMessageBox extends TWindow { // Determine width and height String [] lines = caption.split("\n"); - int width = title.length() + 12; + int width = StringUtils.width(title) + 12; setHeight(6 + lines.length); for (String line: lines) { - if (line.length() + 4 > width) { - width = line.length() + 4; + if (StringUtils.width(line) + 4 > width) { + width = StringUtils.width(line) + 4; } } setWidth(width); @@ -215,7 +224,7 @@ public class TMessageBox extends TWindow { setWidth(15); } buttonX = (getWidth() - 11) / 2; - buttons.add(addButton(" &OK ", buttonX, lineI, + buttons.add(addButton(i18n.getString("okButton"), buttonX, lineI, new TAction() { public void DO() { result = Result.OK; @@ -232,7 +241,7 @@ public class TMessageBox extends TWindow { setWidth(26); } buttonX = (getWidth() - 22) / 2; - buttons.add(addButton(" &OK ", buttonX, lineI, + buttons.add(addButton(i18n.getString("okButton"), buttonX, lineI, new TAction() { public void DO() { result = Result.OK; @@ -242,7 +251,7 @@ public class TMessageBox extends TWindow { ) ); buttonX += 8 + 4; - buttons.add(addButton("&Cancel", buttonX, lineI, + buttons.add(addButton(i18n.getString("cancelButton"), buttonX, lineI, new TAction() { public void DO() { result = Result.CANCEL; @@ -259,7 +268,7 @@ public class TMessageBox extends TWindow { setWidth(20); } buttonX = (getWidth() - 16) / 2; - buttons.add(addButton("&Yes", buttonX, lineI, + buttons.add(addButton(i18n.getString("yesButton"), buttonX, lineI, new TAction() { public void DO() { result = Result.YES; @@ -269,7 +278,7 @@ public class TMessageBox extends TWindow { ) ); buttonX += 5 + 4; - buttons.add(addButton("&No", buttonX, lineI, + buttons.add(addButton(i18n.getString("noButton"), buttonX, lineI, new TAction() { public void DO() { result = Result.NO; @@ -286,7 +295,7 @@ public class TMessageBox extends TWindow { setWidth(31); } buttonX = (getWidth() - 27) / 2; - buttons.add(addButton("&Yes", buttonX, lineI, + buttons.add(addButton(i18n.getString("yesButton"), buttonX, lineI, new TAction() { public void DO() { result = Result.YES; @@ -296,7 +305,7 @@ public class TMessageBox extends TWindow { ) ); buttonX += 5 + 4; - buttons.add(addButton("&No", buttonX, lineI, + buttons.add(addButton(i18n.getString("noButton"), buttonX, lineI, new TAction() { public void DO() { result = Result.NO; @@ -306,7 +315,8 @@ public class TMessageBox extends TWindow { ) ); buttonX += 4 + 4; - buttons.add(addButton("&Cancel", buttonX, lineI, + buttons.add(addButton(i18n.getString("cancelButton"), buttonX, + lineI, new TAction() { public void DO() { result = Result.CANCEL; @@ -318,19 +328,24 @@ public class TMessageBox extends TWindow { break; default: - throw new IllegalArgumentException("Invalid message box type: " + type); + throw new IllegalArgumentException("Invalid message box type: " + + type); } - // Set the secondaryThread to run me - getApplication().enableSecondaryEventReceiver(this); - if (yield) { + // Set the secondaryThread to run me + getApplication().enableSecondaryEventReceiver(this); + // Yield to the secondary thread. When I come back from the // constructor response will already be set. getApplication().yield(); } } + // ------------------------------------------------------------------------ + // TWindow ---------------------------------------------------------------- + // ------------------------------------------------------------------------ + /** * Handle keystrokes. * @@ -389,10 +404,60 @@ public class TMessageBox extends TWindow { break; default: - throw new IllegalArgumentException("Invalid message box type: " + type); + throw new IllegalArgumentException("Invalid message box type: " + + type); } super.onKeypress(keypress); } + // ------------------------------------------------------------------------ + // TMessageBox ------------------------------------------------------------ + // ------------------------------------------------------------------------ + + /** + * Get the result. + * + * @return the result: OK, CANCEL, YES, or NO. + */ + public final Result getResult() { + return result; + } + + /** + * See if the user clicked YES. + * + * @return true if the user clicked YES + */ + public final boolean isYes() { + return (result == Result.YES); + } + + /** + * See if the user clicked NO. + * + * @return true if the user clicked NO + */ + public final boolean isNo() { + return (result == Result.NO); + } + + /** + * See if the user clicked OK. + * + * @return true if the user clicked OK + */ + public final boolean isOk() { + return (result == Result.OK); + } + + /** + * See if the user clicked CANCEL. + * + * @return true if the user clicked CANCEL + */ + public final boolean isCancel() { + return (result == Result.CANCEL); + } + }