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
Fix ClassCastException
[fanfix.git]
/
src
/
jexer
/
menu
/
TMenu.java
diff --git
a/src/jexer/menu/TMenu.java
b/src/jexer/menu/TMenu.java
index a0a978651511e2a93d04151870c4cf236c278d6e..c4a11df23d6f38b51aa071be0dbd4ff93cf10e7d 100644
(file)
--- a/
src/jexer/menu/TMenu.java
+++ b/
src/jexer/menu/TMenu.java
@@
-3,7
+3,7
@@
*
* The MIT License (MIT)
*
*
* The MIT License (MIT)
*
- * Copyright (C) 201
6
Kevin Lamonte
+ * Copyright (C) 201
7
Kevin Lamonte
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@
-28,6
+28,8
@@
*/
package jexer.menu;
*/
package jexer.menu;
+import java.util.ResourceBundle;
+
import jexer.TApplication;
import jexer.TKeypress;
import jexer.TWidget;
import jexer.TApplication;
import jexer.TKeypress;
import jexer.TWidget;
@@
-44,6
+46,11
@@
import static jexer.TKeypress.*;
*/
public final class TMenu extends TWindow {
*/
public final class TMenu extends TWindow {
+ /**
+ * Translated strings.
+ */
+ private static final ResourceBundle i18n = ResourceBundle.getBundle(TMenu.class.getName());
+
/**
* If true, this is a sub-menu. Note package private access.
*/
/**
* If true, this is a sub-menu. Note package private access.
*/
@@
-97,6
+104,9
@@
public final class TMenu extends TWindow {
public static final int MID_HELP_ACTIVE_FILE = 45;
public static final int MID_ABOUT = 46;
public static final int MID_HELP_ACTIVE_FILE = 45;
public static final int MID_ABOUT = 46;
+ // Other
+ public static final int MID_REPAINT = 50;
+
/**
* Public constructor.
*
/**
* Public constructor.
*
@@
-113,9
+123,6
@@
public final class TMenu extends TWindow {
super(parent, label, x, y, parent.getScreen().getWidth(),
parent.getScreen().getHeight());
super(parent, label, x, y, parent.getScreen().getWidth(),
parent.getScreen().getHeight());
- // My parent constructor added me as a window, get rid of that
- parent.closeWindow(this);
-
// Setup the menu shortcut
mnemonic = new MnemonicString(label);
setTitle(mnemonic.getRawLabel());
// Setup the menu shortcut
mnemonic = new MnemonicString(label);
setTitle(mnemonic.getRawLabel());
@@
-388,89
+395,93
@@
public final class TMenu extends TWindow {
switch (id) {
case MID_EXIT:
switch (id) {
case MID_EXIT:
- label =
"E&xit"
;
+ label =
i18n.getString("menuExit")
;
key = kbAltX;
break;
case MID_SHELL:
key = kbAltX;
break;
case MID_SHELL:
- label =
"O&S Shell"
;
+ label =
i18n.getString("menuShell")
;
break;
case MID_OPEN_FILE:
break;
case MID_OPEN_FILE:
- label =
"&Open"
;
+ label =
i18n.getString("menuOpen")
;
key = kbAltO;
break;
case MID_CUT:
key = kbAltO;
break;
case MID_CUT:
- label =
"Cu&t"
;
+ label =
i18n.getString("menuCut")
;
key = kbCtrlX;
break;
case MID_COPY:
key = kbCtrlX;
break;
case MID_COPY:
- label =
"&Copy"
;
+ label =
i18n.getString("menuCopy")
;
key = kbCtrlC;
break;
case MID_PASTE:
key = kbCtrlC;
break;
case MID_PASTE:
- label =
"&Paste"
;
+ label =
i18n.getString("menuPaste")
;
key = kbCtrlV;
break;
case MID_CLEAR:
key = kbCtrlV;
break;
case MID_CLEAR:
- label =
"C&lear"
;
+ label =
i18n.getString("menuClear")
;
// key = kbDel;
break;
case MID_TILE:
// key = kbDel;
break;
case MID_TILE:
- label =
"&Tile"
;
+ label =
i18n.getString("menuWindowTile")
;
break;
case MID_CASCADE:
break;
case MID_CASCADE:
- label =
"C&ascade"
;
+ label =
i18n.getString("menuWindowCascade")
;
break;
case MID_CLOSE_ALL:
break;
case MID_CLOSE_ALL:
- label =
"Cl&ose All"
;
+ label =
i18n.getString("menuWindowCloseAll")
;
break;
case MID_WINDOW_MOVE:
break;
case MID_WINDOW_MOVE:
- label =
"&Size/Move"
;
+ label =
i18n.getString("menuWindowMove")
;
key = kbCtrlF5;
break;
case MID_WINDOW_ZOOM:
key = kbCtrlF5;
break;
case MID_WINDOW_ZOOM:
- label =
"&Zoom"
;
+ label =
i18n.getString("menuWindowZoom")
;
key = kbF5;
break;
case MID_WINDOW_NEXT:
key = kbF5;
break;
case MID_WINDOW_NEXT:
- label =
"&Next"
;
+ label =
i18n.getString("menuWindowNext")
;
key = kbF6;
break;
case MID_WINDOW_PREVIOUS:
key = kbF6;
break;
case MID_WINDOW_PREVIOUS:
- label =
"&Previous"
;
+ label =
i18n.getString("menuWindowPrevious")
;
key = kbShiftF6;
break;
case MID_WINDOW_CLOSE:
key = kbShiftF6;
break;
case MID_WINDOW_CLOSE:
- label =
"&Close"
;
+ label =
i18n.getString("menuWindowClose")
;
key = kbCtrlW;
break;
case MID_HELP_CONTENTS:
key = kbCtrlW;
break;
case MID_HELP_CONTENTS:
- label =
"&Contents"
;
+ label =
i18n.getString("menuHelpContents")
;
break;
case MID_HELP_INDEX:
break;
case MID_HELP_INDEX:
- label =
"&Index"
;
+ label =
i18n.getString("menuHelpIndex")
;
key = kbShiftF1;
break;
case MID_HELP_SEARCH:
key = kbShiftF1;
break;
case MID_HELP_SEARCH:
- label =
"&Topic search"
;
+ label =
i18n.getString("menuHelpSearch")
;
key = kbCtrlF1;
break;
case MID_HELP_PREVIOUS:
key = kbCtrlF1;
break;
case MID_HELP_PREVIOUS:
- label =
"&Previous topic"
;
+ label =
i18n.getString("menuHelpPrevious")
;
key = kbAltF1;
break;
case MID_HELP_HELP:
key = kbAltF1;
break;
case MID_HELP_HELP:
- label =
"&Help on help"
;
+ label =
i18n.getString("menuHelpHelp")
;
break;
case MID_HELP_ACTIVE_FILE:
break;
case MID_HELP_ACTIVE_FILE:
- label =
"Active &file..."
;
+ label =
i18n.getString("menuHelpActive")
;
break;
case MID_ABOUT:
break;
case MID_ABOUT:
- label = "&About...";
+ label = i18n.getString("menuHelpAbout");
+ break;
+
+ case MID_REPAINT:
+ label = i18n.getString("menuRepaintDesktop");
break;
default:
break;
default: