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
oops
[fanfix.git]
/
src
/
jexer
/
TRadioButton.java
diff --git
a/src/jexer/TRadioButton.java
b/src/jexer/TRadioButton.java
index b4170ba82cbd579494e2967f0055e5ecedfe09ac..e3d98a985329a52dfbd18769212045e8561b68d8 100644
(file)
--- a/
src/jexer/TRadioButton.java
+++ b/
src/jexer/TRadioButton.java
@@
-30,12
+30,17
@@
package jexer;
import jexer.bits.CellAttributes;
import jexer.bits.GraphicsChars;
import jexer.bits.CellAttributes;
import jexer.bits.GraphicsChars;
+import jexer.bits.MnemonicString;
import jexer.event.TKeypressEvent;
import jexer.event.TMouseEvent;
import static jexer.TKeypress.*;
/**
* TRadioButton implements a selectable radio button.
import jexer.event.TKeypressEvent;
import jexer.event.TMouseEvent;
import static jexer.TKeypress.*;
/**
* TRadioButton implements a selectable radio button.
+ *
+ * If the user clicks or presses space on this button, it is selected.
+ *
+ * If the user presses escape on this button, it is unselected.
*/
public class TRadioButton extends TWidget {
*/
public class TRadioButton extends TWidget {
@@
-49,9
+54,9
@@
public class TRadioButton extends TWidget {
private boolean selected = false;
/**
private boolean selected = false;
/**
- *
Label for this radio button
.
+ *
The shortcut and radio button label
.
*/
*/
- private
String label
;
+ private
MnemonicString mnemonic
;
/**
* ID for this radio button. Buttons start counting at 1 in the
/**
* ID for this radio button. Buttons start counting at 1 in the
@@
-78,7
+83,7
@@
public class TRadioButton extends TWidget {
// Set parent and window
super(parent, x, y, label.length() + 4, 1);
// Set parent and window
super(parent, x, y, label.length() + 4, 1);
-
this.label = label
;
+
mnemonic = new MnemonicString(label)
;
this.id = id;
setCursorVisible(true);
this.id = id;
setCursorVisible(true);
@@
-114,10
+119,8
@@
public class TRadioButton extends TWidget {
public void onMouseDown(final TMouseEvent mouse) {
if ((mouseOnRadioButton(mouse)) && (mouse.isMouse1())) {
// Switch state
public void onMouseDown(final TMouseEvent mouse) {
if ((mouseOnRadioButton(mouse)) && (mouse.isMouse1())) {
// Switch state
- selected = !selected;
- if (selected) {
- ((TRadioGroup) getParent()).setSelected(this);
- }
+ selected = true;
+ ((TRadioGroup) getParent()).setSelected(this);
}
}
}
}
@@
-130,9
+133,16
@@
public class TRadioButton extends TWidget {
public void onKeypress(final TKeypressEvent keypress) {
if (keypress.equals(kbSpace)) {
public void onKeypress(final TKeypressEvent keypress) {
if (keypress.equals(kbSpace)) {
- selected = !selected;
- if (selected) {
- ((TRadioGroup) getParent()).setSelected(this);
+ selected = true;
+ ((TRadioGroup) getParent()).setSelected(this);
+ return;
+ }
+
+ if (keypress.equals(kbEsc)) {
+ TRadioGroup parent = (TRadioGroup) getParent();
+ if (parent.requiresSelection == false) {
+ selected = false;
+ parent.setSelected(0);
}
return;
}
}
return;
}
@@
-151,11
+161,14
@@
public class TRadioButton extends TWidget {
@Override
public void draw() {
CellAttributes radioButtonColor;
@Override
public void draw() {
CellAttributes radioButtonColor;
+ CellAttributes mnemonicColor;
if (isAbsoluteActive()) {
radioButtonColor = getTheme().getColor("tradiobutton.active");
if (isAbsoluteActive()) {
radioButtonColor = getTheme().getColor("tradiobutton.active");
+ mnemonicColor = getTheme().getColor("tradiobutton.mnemonic.highlighted");
} else {
radioButtonColor = getTheme().getColor("tradiobutton.inactive");
} else {
radioButtonColor = getTheme().getColor("tradiobutton.inactive");
+ mnemonicColor = getTheme().getColor("tradiobutton.mnemonic");
}
putCharXY(0, 0, '(', radioButtonColor);
}
putCharXY(0, 0, '(', radioButtonColor);
@@
-165,7
+178,11
@@
public class TRadioButton extends TWidget {
putCharXY(1, 0, ' ', radioButtonColor);
}
putCharXY(2, 0, ')', radioButtonColor);
putCharXY(1, 0, ' ', radioButtonColor);
}
putCharXY(2, 0, ')', radioButtonColor);
- putStringXY(4, 0, label, radioButtonColor);
+ putStringXY(4, 0, mnemonic.getRawLabel(), radioButtonColor);
+ if (mnemonic.getShortcutIdx() >= 0) {
+ putCharXY(4 + mnemonic.getShortcutIdx(), 0,
+ mnemonic.getShortcut(), mnemonicColor);
+ }
}
// ------------------------------------------------------------------------
}
// ------------------------------------------------------------------------
@@
-203,4
+220,13
@@
public class TRadioButton extends TWidget {
return id;
}
return id;
}
+ /**
+ * Get the mnemonic string for this button.
+ *
+ * @return mnemonic string
+ */
+ public MnemonicString getMnemonic() {
+ return mnemonic;
+ }
+
}
}