git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'subtree'
[fanfix.git]
/
src
/
jexer
/
TCheckBox.java
diff --git
a/src/jexer/TCheckBox.java
b/src/jexer/TCheckBox.java
index 84c2e41adf7a13d086e704b6490a13a0eccd5359..1f9a351c0c0c636c538272d372c5a3b4ef43f583 100644
(file)
--- a/
src/jexer/TCheckBox.java
+++ b/
src/jexer/TCheckBox.java
@@
-28,9
+28,13
@@
*/
package jexer;
*/
package jexer;
+import static jexer.TKeypress.kbEnter;
+import static jexer.TKeypress.kbEsc;
import static jexer.TKeypress.kbSpace;
import jexer.bits.CellAttributes;
import jexer.bits.GraphicsChars;
import static jexer.TKeypress.kbSpace;
import jexer.bits.CellAttributes;
import jexer.bits.GraphicsChars;
+import jexer.bits.MnemonicString;
+import jexer.bits.StringUtils;
import jexer.event.TKeypressEvent;
import jexer.event.TMouseEvent;
import jexer.event.TKeypressEvent;
import jexer.event.TMouseEvent;
@@
-49,9
+53,9
@@
public class TCheckBox extends TWidget {
private boolean checked = false;
/**
private boolean checked = false;
/**
- *
Label for this checkbox
.
+ *
The shortcut and checkbox label
.
*/
*/
- private
String label
;
+ private
MnemonicString mnemonic
;
/**
* If true, use the window's background color.
/**
* If true, use the window's background color.
@@
-75,9
+79,9
@@
public class TCheckBox extends TWidget {
final String label, final boolean checked) {
// Set parent and window
final String label, final boolean checked) {
// Set parent and window
- super(parent, x, y,
label.length(
) + 4, 1);
+ super(parent, x, y,
StringUtils.width(label
) + 4, 1);
-
this.label = label
;
+
mnemonic = new MnemonicString(label)
;
this.checked = checked;
setCursorVisible(true);
this.checked = checked;
setCursorVisible(true);
@@
-124,11
+128,18
@@
public class TCheckBox extends TWidget {
*/
@Override
public void onKeypress(final TKeypressEvent keypress) {
*/
@Override
public void onKeypress(final TKeypressEvent keypress) {
- if (keypress.equals(kbSpace)) {
+ if (keypress.equals(kbSpace)
+ || keypress.equals(kbEnter)
+ ) {
checked = !checked;
return;
}
checked = !checked;
return;
}
+ if (keypress.equals(kbEsc)) {
+ checked = false;
+ return;
+ }
+
// Pass to parent for the things we don't care about.
super.onKeypress(keypress);
}
// Pass to parent for the things we don't care about.
super.onKeypress(keypress);
}
@@
-143,11
+154,14
@@
public class TCheckBox extends TWidget {
@Override
public void draw() {
CellAttributes checkboxColor;
@Override
public void draw() {
CellAttributes checkboxColor;
+ CellAttributes mnemonicColor;
if (isAbsoluteActive()) {
checkboxColor = getTheme().getColor("tcheckbox.active");
if (isAbsoluteActive()) {
checkboxColor = getTheme().getColor("tcheckbox.active");
+ mnemonicColor = getTheme().getColor("tcheckbox.mnemonic.highlighted");
} else {
checkboxColor = getTheme().getColor("tcheckbox.inactive");
} else {
checkboxColor = getTheme().getColor("tcheckbox.inactive");
+ mnemonicColor = getTheme().getColor("tcheckbox.mnemonic");
}
if (useWindowBackground) {
CellAttributes background = getWindow().getBackground();
}
if (useWindowBackground) {
CellAttributes background = getWindow().getBackground();
@@
-161,7
+175,11
@@
public class TCheckBox extends TWidget {
putCharXY(1, 0, ' ', checkboxColor);
}
putCharXY(2, 0, ']', checkboxColor);
putCharXY(1, 0, ' ', checkboxColor);
}
putCharXY(2, 0, ']', checkboxColor);
- putStringXY(4, 0, label, checkboxColor);
+ putStringXY(4, 0, mnemonic.getRawLabel(), checkboxColor);
+ if (mnemonic.getScreenShortcutIdx() >= 0) {
+ putCharXY(4 + mnemonic.getScreenShortcutIdx(), 0,
+ mnemonic.getShortcut(), mnemonicColor);
+ }
}
// ------------------------------------------------------------------------
}
// ------------------------------------------------------------------------
@@
-186,4
+204,13
@@
public class TCheckBox extends TWidget {
this.checked = checked;
}
this.checked = checked;
}
+ /**
+ * Get the mnemonic string for this checkbox.
+ *
+ * @return mnemonic string
+ */
+ public MnemonicString getMnemonic() {
+ return mnemonic;
+ }
+
}
}