[Rescue-svn] SF.net SVN: rescue:[21] Rescue
Status: Beta
Brought to you by:
yuranet
Menu
▾
▴
[Rescue-svn] SF.net SVN: rescue:[21] Rescue
|
From: <yu...@us...> - 2008-12-19 03:02:00
|
Revision: 21
http://rescue.svn.sourceforge.net/rescue/?rev=21&view=rev
Author: yuranet
Date: 2008-12-19 03:01:50 +0000 (Fri, 19 Dec 2008)
Log Message:
-----------
OMG keys work
Modified Paths:
--------------
Rescue/bugs.txt
Rescue/rescue/MissionLoader.java
Rescue/rescue/RunRescue.java
Rescue/rescue/gui/Keymap.java
Rescue/rescue/gui/PrefDialog.java
Rescue/rescue/panels/InterfacePanel.java
Modified: Rescue/bugs.txt
===================================================================
--- Rescue/bugs.txt 2008-12-18 21:11:42 UTC (rev 20)
+++ Rescue/bugs.txt 2008-12-19 03:01:50 UTC (rev 21)
@@ -7,11 +7,6 @@
return;
-all actions should
-rescue.updateGUI();
-even when they r called not from the ButtonImage being pressed
-
-
add a paramiter that indicates how lickely someone is going to change there mind as to who they like
so if it is 0, then they will never change there mind as to who they like
if it is 10, then they will like anyone who helps them in any possible way
Modified: Rescue/rescue/MissionLoader.java
===================================================================
--- Rescue/rescue/MissionLoader.java 2008-12-18 21:11:42 UTC (rev 20)
+++ Rescue/rescue/MissionLoader.java 2008-12-19 03:01:50 UTC (rev 21)
@@ -420,6 +420,7 @@
text.setBorder(null);
text.setBackground( Color.BLACK );
text.setForeground( Color.WHITE );
+ text.setEditable(false);
JScrollPane textScroll = new JScrollPane(text);
textScroll.setBorder(null);
Modified: Rescue/rescue/RunRescue.java
===================================================================
--- Rescue/rescue/RunRescue.java 2008-12-18 21:11:42 UTC (rev 20)
+++ Rescue/rescue/RunRescue.java 2008-12-19 03:01:50 UTC (rev 21)
@@ -20,6 +20,9 @@
import java.awt.event.ActionEvent;
import javax.swing.Action;
+import java.awt.event.KeyEvent;
+import javax.swing.KeyStroke;
+
public class RunRescue implements Runnable,IndicatorsListener { // extends Thread
public static final String DEFAULT_MISSION = "rescuemax.xml";
@@ -114,7 +117,7 @@
public SelectAction(int type,String name,String label) {
super(label);
this.type = type;
- putValue(AbstractAction.ACTION_COMMAND_KEY,name);
+ putValue(Action.ACTION_COMMAND_KEY,name);
selectListeners.add(this);
}
public void newSelectState(int state) {
@@ -122,6 +125,7 @@
}
public void actionPerformed(ActionEvent e) {
setSelect(type);
+ updateGUI();
}
}
@@ -131,7 +135,7 @@
public EvasiveAction(int type,String name,String label) {
super(label);
this.type = type;
- putValue(AbstractAction.ACTION_COMMAND_KEY,name);
+ putValue(Action.ACTION_COMMAND_KEY,name);
evasiveListeners.add(this);
}
public void newEvasiveState(int state) {
@@ -139,6 +143,7 @@
}
public void actionPerformed(ActionEvent e) {
playerShip.setEvasive(type);
+ updateGUI();
}
}
@@ -148,55 +153,59 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"impulse_auto");
+ putValue(Action.ACTION_COMMAND_KEY,"impulse_auto");
}
public boolean isEnabled() {
return !playerShip.getAutoImpulseOn();
}
public void actionPerformed(ActionEvent e) {
playerShip.setAutoImpulseOn(true);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"impulse_man");
+ putValue(Action.ACTION_COMMAND_KEY,"impulse_man");
}
public boolean isEnabled() {
return playerShip.getAutoImpulseOn();
}
public void actionPerformed(ActionEvent e) {
playerShip.setAutoImpulseOn(false);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"impulse_up");
+ putValue(Action.ACTION_COMMAND_KEY,"impulse_up");
}
public boolean isEnabled() {
return playerShip.getImpulseFactor()<playerShip.getMaxImpulseFactor();
}
public void actionPerformed(ActionEvent e) {
playerShip.setImpulseUpDown(true);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"impulse_down");
+ putValue(Action.ACTION_COMMAND_KEY,"impulse_down");
}
public boolean isEnabled() {
return playerShip.getImpulseFactor()>0.25;
}
public void actionPerformed(ActionEvent e) {
playerShip.setImpulseUpDown(false);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"impulse_start");
+ putValue(Action.ACTION_COMMAND_KEY,"impulse_start");
}
public boolean isEnabled() {
return !playerShip.getImpulseOn();
@@ -208,55 +217,59 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"warp_auto");
+ putValue(Action.ACTION_COMMAND_KEY,"warp_auto");
}
public boolean isEnabled() {
return !playerShip.getAutoWarpOn();
}
public void actionPerformed(ActionEvent e) {
playerShip.setAutoWarpOn(true);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"warp_man");
+ putValue(Action.ACTION_COMMAND_KEY,"warp_man");
}
public boolean isEnabled() {
return playerShip.getAutoWarpOn();
}
public void actionPerformed(ActionEvent e) {
playerShip.setAutoWarpOn(false);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"warp_up");
+ putValue(Action.ACTION_COMMAND_KEY,"warp_up");
}
public boolean isEnabled() {
return playerShip.getWarpFactor()<playerShip.getMaxWarpFactor();
}
public void actionPerformed(ActionEvent e) {
playerShip.setWarpUpDown(true);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"warp_down");
+ putValue(Action.ACTION_COMMAND_KEY,"warp_down");
}
public boolean isEnabled() {
return playerShip.getWarpFactor()>1;
}
public void actionPerformed(ActionEvent e) {
playerShip.setWarpUpDown(false);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"warp_start");
+ putValue(Action.ACTION_COMMAND_KEY,"warp_start");
}
public boolean isEnabled() {
return !playerShip.getWarpOn();
@@ -269,7 +282,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"stop");
+ putValue(Action.ACTION_COMMAND_KEY,"stop");
}
public void actionPerformed(ActionEvent e) {
playerShip.stop();
@@ -280,31 +293,33 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"phaser_up");
+ putValue(Action.ACTION_COMMAND_KEY,"phaser_up");
}
public boolean isEnabled() {
return playerShip.getPhaserIntensityInt()<playerShip.getMaxPhaserIntensity();
}
public void actionPerformed(ActionEvent e) {
playerShip.setPhaserIntensityUpDown(true);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"phaser_down");
+ putValue(Action.ACTION_COMMAND_KEY,"phaser_down");
}
public boolean isEnabled() {
return playerShip.getPhaserIntensityInt()>1;
}
public void actionPerformed(ActionEvent e) {
playerShip.setPhaserIntensityUpDown(false);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"phaser_fire");
+ putValue(Action.ACTION_COMMAND_KEY,"phaser_fire");
}
public void actionPerformed(ActionEvent e) {
shipFirePhaser();
@@ -313,31 +328,33 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"torpedo_up");
+ putValue(Action.ACTION_COMMAND_KEY,"torpedo_up");
}
public boolean isEnabled() {
return playerShip.getTorpedoSalvoInt()<playerShip.getMaxTorpedoSalvo();
}
public void actionPerformed(ActionEvent e) {
playerShip.setTorpedoSalvoUpDown(true);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"torpedo_down");
+ putValue(Action.ACTION_COMMAND_KEY,"torpedo_down");
}
public boolean isEnabled() {
return playerShip.getTorpedoSalvoInt()>1;
}
public void actionPerformed(ActionEvent e) {
playerShip.setTorpedoSalvoUpDown(false);
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"torpedo_fire");
+ putValue(Action.ACTION_COMMAND_KEY,"torpedo_fire");
}
public void actionPerformed(ActionEvent e) {
shipFireTorpedo();
@@ -346,31 +363,33 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"shields_up");
+ putValue(Action.ACTION_COMMAND_KEY,"shields_up");
}
public boolean isEnabled() {
return !playerShip.getShieldsUp();
}
public void actionPerformed(ActionEvent e) {
playerShip.changeShields();
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"shields_down");
+ putValue(Action.ACTION_COMMAND_KEY,"shields_down");
}
public boolean isEnabled() {
return playerShip.getShieldsUp();
}
public void actionPerformed(ActionEvent e) {
playerShip.changeShields();
+ updateGUI();
}
});
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"tractor");
+ putValue(Action.ACTION_COMMAND_KEY,"tractor");
}
public boolean isEnabled() {
return playerShip.getTractoredShip()==null;
@@ -382,7 +401,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"tractor_off");
+ putValue(Action.ACTION_COMMAND_KEY,"tractor_off");
}
public boolean isEnabled() {
return playerShip.getTractoredShip()!=null;
@@ -394,7 +413,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"zoomin");
+ putValue(Action.ACTION_COMMAND_KEY,"zoomin");
}
public boolean isEnabled() {
return canZoom(true);
@@ -406,7 +425,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"zoomout");
+ putValue(Action.ACTION_COMMAND_KEY,"zoomout");
}
public boolean isEnabled() {
return canZoom(false);
@@ -422,7 +441,7 @@
actions.add(new AbstractAction("Beam Team Down") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"beam_down");
+ putValue(Action.ACTION_COMMAND_KEY,"beam_down");
}
public void actionPerformed(ActionEvent e) {
shipBeamDown();
@@ -431,7 +450,7 @@
actions.add(new AbstractAction("Beam Team Up") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"beam_up");
+ putValue(Action.ACTION_COMMAND_KEY,"beam_up");
}
public void actionPerformed(ActionEvent e) {
shipBeamUp();
@@ -440,7 +459,7 @@
actions.add(new AbstractAction("Dock With Starbase") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"dock");
+ putValue(Action.ACTION_COMMAND_KEY,"dock");
}
public void actionPerformed(ActionEvent e) {
shipDock();
@@ -449,7 +468,7 @@
actions.add(new AbstractAction("Board Ship") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"board");
+ putValue(Action.ACTION_COMMAND_KEY,"board");
}
public void actionPerformed(ActionEvent e) {
shipBoard();
@@ -458,7 +477,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"scan_up");
+ putValue(Action.ACTION_COMMAND_KEY,"scan_up");
}
public boolean isEnabled() {
return playerShip.getSensorScan()<playerShip.getMaxScan();
@@ -471,7 +490,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"scan_down");
+ putValue(Action.ACTION_COMMAND_KEY,"scan_down");
}
public boolean isEnabled() {
return playerShip.getSensorScan()>0;
@@ -484,7 +503,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"ships_up");
+ putValue(Action.ACTION_COMMAND_KEY,"ships_up");
}
public boolean isEnabled() {
return canScrollShips(true,true);
@@ -496,7 +515,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"ships_down");
+ putValue(Action.ACTION_COMMAND_KEY,"ships_down");
}
public boolean isEnabled() {
return canScrollShips(true,false);
@@ -508,7 +527,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"base_up");
+ putValue(Action.ACTION_COMMAND_KEY,"base_up");
}
public boolean isEnabled() {
return canScrollShips(false,true);
@@ -520,7 +539,7 @@
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"base_down");
+ putValue(Action.ACTION_COMMAND_KEY,"base_down");
}
public boolean isEnabled() {
return canScrollShips(false,false);
@@ -532,19 +551,21 @@
actions.add(new AbstractAction("Use Reserve Energy") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"reserve");
+ putValue(Action.ACTION_COMMAND_KEY,"reserve");
}
public void actionPerformed(ActionEvent e) {
playerShip.useReserve();
+ updateGUI();
}
});
actions.add(new AbstractAction("Divert Phaser Energy") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"divert");
+ putValue(Action.ACTION_COMMAND_KEY,"divert");
}
public void actionPerformed(ActionEvent e) {
playerShip.divertPhaser();
+ updateGUI();
}
});
@@ -552,7 +573,7 @@
actions.add(new AbstractAction("Heads Up Display") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"headsup");
+ putValue(Action.ACTION_COMMAND_KEY,"headsup");
}
public void actionPerformed(ActionEvent e) {
headsUpDisplay();
@@ -561,7 +582,7 @@
actions.add(new AbstractAction("Pause") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"pause");
+ putValue(Action.ACTION_COMMAND_KEY,"pause");
}
public void actionPerformed(ActionEvent e) {
pause();
@@ -570,7 +591,7 @@
actions.add(new AbstractAction("End") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"endgame");
+ putValue(Action.ACTION_COMMAND_KEY,"endgame");
}
public void actionPerformed(ActionEvent e) {
closeCurrentMission();
@@ -579,7 +600,7 @@
actions.add(new AbstractAction("Quit") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"quit");
+ putValue(Action.ACTION_COMMAND_KEY,"quit");
}
public void actionPerformed(ActionEvent e) {
System.exit(0);
@@ -588,7 +609,8 @@
actions.add(new AbstractAction("Help") {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"help");
+ putValue(Action.ACTION_COMMAND_KEY,"help");
+ putValue(Action.ACCELERATOR_KEY,KeyStroke.getKeyStroke(112, 0) ); // F1
}
public void actionPerformed(ActionEvent e) {
help();
@@ -603,7 +625,7 @@
final int value=c;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"ships_sort "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"ships_sort "+value);
}
public boolean isEnabled() {
return getShipsSort()!=value;
@@ -618,7 +640,7 @@
final int value=c;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"base_sort "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"base_sort "+value);
}
public boolean isEnabled() {
return getBaseSort()!=value;
@@ -633,7 +655,7 @@
final int value=c;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"ships_show "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"ships_show "+value);
}
public boolean isEnabled() {
return getShipsShow()!=value;
@@ -648,7 +670,7 @@
final int value=c;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"base_show "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"base_show "+value);
}
public boolean isEnabled() {
return getBaseShow()!=value;
@@ -663,13 +685,14 @@
final int value=c;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"target "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"target "+value);
}
public boolean isEnabled() {
return playerShip.getTarget()!=value;
}
public void actionPerformed(ActionEvent e) {
playerShip.setTarget(value);
+ updateGUI();
}
});
}
@@ -678,13 +701,14 @@
final int value=c;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"fix "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"fix "+value);
}
public boolean isEnabled() {
return playerShip.getFixPriority()!=value;
}
public void actionPerformed(ActionEvent e) {
playerShip.setFixPriority(value);
+ updateGUI();
}
});
}
@@ -693,13 +717,14 @@
final int value=c+1;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"warp_speed "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"warp_speed "+value);
}
public boolean isEnabled() {
return value != playerShip.getWarpFactor();
}
public void actionPerformed(ActionEvent e) {
playerShip.setWarpFactor(value);
+ updateGUI();
}
});
}
@@ -708,13 +733,14 @@
final int value=c+1;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"impulse_speed "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"impulse_speed "+value);
}
public boolean isEnabled() {
return (int)(playerShip.getImpulseFactor()*4) !=value;
}
public void actionPerformed(ActionEvent e) {
playerShip.setImpulseFactor(value);
+ updateGUI();
}
});
}
@@ -723,13 +749,14 @@
final int value=c+1;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"phaser_intensity "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"phaser_intensity "+value);
}
public boolean isEnabled() {
return playerShip.getPhaserIntensityInt()!=value;
}
public void actionPerformed(ActionEvent e) {
playerShip.setPhaserIntensity(value);
+ updateGUI();
}
});
}
@@ -738,13 +765,14 @@
final int value=c+1;
actions.add(new AbstractAction() {
{
- putValue(AbstractAction.ACTION_COMMAND_KEY,"torpedo_salvo "+value);
+ putValue(Action.ACTION_COMMAND_KEY,"torpedo_salvo "+value);
}
public boolean isEnabled() {
return playerShip.getTorpedoSalvoInt()!=value;
}
public void actionPerformed(ActionEvent e) {
playerShip.setTorpedoSalvo(value);
+ updateGUI();
}
});
}
Modified: Rescue/rescue/gui/Keymap.java
===================================================================
--- Rescue/rescue/gui/Keymap.java 2008-12-18 21:11:42 UTC (rev 20)
+++ Rescue/rescue/gui/Keymap.java 2008-12-19 03:01:50 UTC (rev 21)
@@ -8,6 +8,7 @@
import java.awt.event.KeyEvent;
import java.net.URL;
import javax.swing.Action;
+import javax.swing.KeyStroke;
// UI should have a table and a change button under it, then a save and cencel too
public class Keymap implements KeyEventDispatcher {
@@ -78,17 +79,62 @@
public boolean dispatchKeyEvent(KeyEvent e) {
+ int id = e.getID();
- System.out.println("bob "+e);
+ if (
+ (setupAction!=null && id == KeyEvent.KEY_RELEASED) ||
+ (id == KeyEvent.KEY_PRESSED)
+ ) {
- return false;
+ int keycode = e.getKeyCode();
+ int modifiers = e.getModifiers();
- }
+ // if the code itself is a modifier, then set the modifier to 0
+ if ( keycode==KeyEvent.VK_CONTROL ||
+ keycode==KeyEvent.VK_SHIFT ||
+ keycode==KeyEvent.VK_ALT ||
+ keycode==KeyEvent.VK_ALT_GRAPH ||
+ keycode==KeyEvent.VK_META) {
+ modifiers = 0;
+ }
+ KeyStroke ks = KeyStroke.getKeyStroke(keycode, modifiers);
+ if (setupAction!=null && id == KeyEvent.KEY_RELEASED) {
+ setupAction.putValue(Action.ACCELERATOR_KEY, ks );
+ setupAction = null;
+ return true;
+ }
+ else if (id == KeyEvent.KEY_PRESSED) {
+ for (int c=0;c<actions.size();c++) {
+ Action action = (Action)actions.elementAt(c);
+ KeyStroke akey = (KeyStroke)action.getValue(Action.ACCELERATOR_KEY);
+
+ if (ks.equals(akey)) {
+
+ action.actionPerformed(null);
+ return true;
+ }
+
+ }
+
+ }
+ }
+
+ return false;
+
+ }
+
+ public static Action setupAction;
+ public static void setupKeyForAction(Action action) {
+
+ setupAction = action;
+
+ }
+
}
Modified: Rescue/rescue/gui/PrefDialog.java
===================================================================
--- Rescue/rescue/gui/PrefDialog.java 2008-12-18 21:11:42 UTC (rev 20)
+++ Rescue/rescue/gui/PrefDialog.java 2008-12-19 03:01:50 UTC (rev 21)
@@ -27,13 +27,16 @@
import javax.swing.JTable;
import javax.swing.BoxLayout;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeEvent;
+
/**
* <p> About Dialog </p>
* @author Yura Mamyrin
*/
-public class PrefDialog extends JDialog implements ActionListener {
+public class PrefDialog extends JDialog implements ActionListener,PropertyChangeListener {
private RunRescue rescue;
private RescueGUI gui;
@@ -73,10 +76,15 @@
okButton.setActionCommand("ok");
okButton.addActionListener(this);
- JPanel bottomPanel = new JPanel( new BorderLayout(20,20) );
- bottomPanel.add(cancelButton,java.awt.BorderLayout.WEST);
- bottomPanel.add(okButton,java.awt.BorderLayout.EAST);
+ JButton changeButton = new JButton("Change");
+ changeButton.setActionCommand("change");
+ changeButton.addActionListener(this);
+ JPanel bottomPanel = new JPanel();
+ bottomPanel.add(cancelButton);
+ bottomPanel.add(changeButton);
+ bottomPanel.add(okButton);
+
inout = new JCheckBox("Use External Frames", rescue.getMode() );
JPanel optionsPanel = new JPanel();
@@ -114,25 +122,46 @@
rescue.setMode( inout.isSelected() );
rescue.setDelay( ((Integer)delay.getValue()).intValue() );
+ closeDialog();
}
+ else if (e.getActionCommand().equals("change")) {
+
+ Action action = getCurrentAction();
+ action.addPropertyChangeListener(this);
+ Keymap.setupKeyForAction(action);
+
+ }
else if (e.getActionCommand().equals("cancel")) {
+ closeDialog();
+
}
+
+ }
- closeDialog();
+ public void propertyChange(PropertyChangeEvent evt) {
+ Action action = getCurrentAction();
+ action.removePropertyChangeListener(this);
+ repaint();
}
+ private Action getCurrentAction() {
+
+ return (Action)rescue.getActions().elementAt( table.getSelectedRow() );
+
+ }
+
/** Closes the dialog */
private void closeDialog() {
setVisible(false);
dispose();
}
+ private JTable table;
+ private JScrollPane makeKeyTable() {
- public JScrollPane makeKeyTable() {
-
AbstractTableModel tableModel = new AbstractTableModel() {
private final String[] columnNames = { "Action", "Command", "Key" };
@@ -158,7 +187,7 @@
case 0: return action.getValue( Action.NAME );
case 1: return action.getValue( Action.ACTION_COMMAND_KEY );
- case 2: return action.getValue( Action.MNEMONIC_KEY ); // ?? ACCELERATOR_KEY
+ case 2: return action.getValue( Action.ACCELERATOR_KEY );
default: throw new RuntimeException();
}
@@ -167,10 +196,13 @@
};
+ table = new JTable(tableModel);
- return new JScrollPane(new JTable(tableModel));
+ table.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
+ return new JScrollPane(table);
+
}
}
Modified: Rescue/rescue/panels/InterfacePanel.java
===================================================================
--- Rescue/rescue/panels/InterfacePanel.java 2008-12-18 21:11:42 UTC (rev 20)
+++ Rescue/rescue/panels/InterfacePanel.java 2008-12-19 03:01:50 UTC (rev 21)
@@ -799,19 +799,14 @@
if (action!=null) {
- // can not do this as some things need to be toggled, like shields
+ // can not do this as some things need to be toggled with 1 button, like shields
//if (action.isEnabled()) {
action.actionPerformed(null);
JukeBox.play("mouseclick");
- // TODO this should be done in the action
- // so the action can be used anywhere
- list();
//}
- // else do nothing
-
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|