Knoppen aan het PanelDevice toegevoegd om naar de vorige en volgende applicatie te gaan.

This commit is contained in:
Bram Veenboer
2011-06-09 13:11:41 +00:00
parent ba01c51701
commit 954bd90f1e
6 changed files with 24 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
java/resource/icons/up.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -21,6 +21,7 @@ public class JIntellitypeEventMapCycle extends EventMapCycle {
mimis.add( mimis.add(
new Hotkey(Key.NEXT), new Hotkey(Key.NEXT),
new Task(Target.MIMIS, Action.NEXT)); new Task(Target.MIMIS, Action.NEXT));
add(mimis);
/* Player */ /* Player */
player = new EventMap(); player = new EventMap();
@@ -39,5 +40,6 @@ public class JIntellitypeEventMapCycle extends EventMapCycle {
player.add( player.add(
new Hotkey(Modifier.CTRL | Modifier.SHIFT | Modifier.WIN, 'p'), new Hotkey(Modifier.CTRL | Modifier.SHIFT | Modifier.WIN, 'p'),
new Task(Target.APPLICATION, Action.PREVIOUS)); new Task(Target.APPLICATION, Action.PREVIOUS));
add(player);
} }
} }

View File

@@ -25,11 +25,13 @@ public class Panel extends JFrame implements HoldButtonListener {
protected PanelDevice panelDevice; protected PanelDevice panelDevice;
protected ClassLoader classLoader; protected ClassLoader classLoader;
protected HoldButton upButton;
protected HoldButton previousButton; protected HoldButton previousButton;
protected HoldButton rewindButton; protected HoldButton rewindButton;
protected HoldButton stopButton; protected HoldButton stopButton;
protected ToggleButton playPauseToggleButton; protected ToggleButton playPauseToggleButton;
protected HoldButton forwardButton; protected HoldButton forwardButton;
protected HoldButton downButton;
protected HoldButton nextButton; protected HoldButton nextButton;
protected HoldButton volumeDownButton; protected HoldButton volumeDownButton;
protected ToggleButton muteToggleButton; protected ToggleButton muteToggleButton;
@@ -75,11 +77,13 @@ public class Panel extends JFrame implements HoldButtonListener {
} }
protected void createControls() { protected void createControls() {
upButton = getButton("icons/up.png", "Go to previous application");
nextButton = getButton("icons/next.png", "Go to next track");
previousButton = getButton("icons/previous.png", "Go to previous track"); previousButton = getButton("icons/previous.png", "Go to previous track");
rewindButton = getButton("icons/rewind.png", "Skip backward"); rewindButton = getButton("icons/rewind.png", "Skip backward");
playPauseToggleButton = getToggleButton("icons/play.png", "icons/pause.png", "Play/pause"); playPauseToggleButton = getToggleButton("icons/play.png", "icons/pause.png", "Play/pause");
forwardButton = getButton("icons/forward.png", "Skip forward"); forwardButton = getButton("icons/forward.png", "Skip forward");
nextButton = getButton("icons/next.png", "Go to next track"); downButton = getButton("icons/down.png", "Go to next application");
volumeDownButton = getButton("icons/volumeDown.png", "Decrease volume"); volumeDownButton = getButton("icons/volumeDown.png", "Decrease volume");
muteToggleButton = getToggleButton("icons/mute.png", "icons/unmute.png", "Toggle Mute"); muteToggleButton = getToggleButton("icons/mute.png", "icons/unmute.png", "Toggle Mute");
volumeUpButton = getButton("icons/volumeUp.png", "Increase volume"); volumeUpButton = getButton("icons/volumeUp.png", "Increase volume");
@@ -98,6 +102,7 @@ public class Panel extends JFrame implements HoldButtonListener {
JPanel upperControlPanel = new JPanel(); JPanel upperControlPanel = new JPanel();
controlPanel.add(upperControlPanel, BorderLayout.NORTH); controlPanel.add(upperControlPanel, BorderLayout.NORTH);
upperControlPanel.add(upButton);
upperControlPanel.add(previousButton); upperControlPanel.add(previousButton);
upperControlPanel.add(rewindButton); upperControlPanel.add(rewindButton);
upperControlPanel.add(playPauseToggleButton); upperControlPanel.add(playPauseToggleButton);
@@ -106,6 +111,7 @@ public class Panel extends JFrame implements HoldButtonListener {
JPanel lowerControlPanel = new JPanel(); JPanel lowerControlPanel = new JPanel();
controlPanel.add(lowerControlPanel, BorderLayout.SOUTH); controlPanel.add(lowerControlPanel, BorderLayout.SOUTH);
lowerControlPanel.add(downButton);
lowerControlPanel.add(repeatButton); lowerControlPanel.add(repeatButton);
lowerControlPanel.add(volumeDownButton); lowerControlPanel.add(volumeDownButton);
lowerControlPanel.add(muteToggleButton); lowerControlPanel.add(muteToggleButton);
@@ -137,6 +143,10 @@ public class Panel extends JFrame implements HoldButtonListener {
panelDevice.buttonPressed(PanelButton.REPEAT); panelDevice.buttonPressed(PanelButton.REPEAT);
} else if (button.equals(shuffleButton)) { } else if (button.equals(shuffleButton)) {
panelDevice.buttonPressed(PanelButton.SHUFFLE); panelDevice.buttonPressed(PanelButton.SHUFFLE);
} else if (button.equals(upButton)) {
panelDevice.buttonPressed(PanelButton.UP);
} else if (button.equals(downButton)) {
panelDevice.buttonPressed(PanelButton.DOWN);
} }
} }
@@ -163,6 +173,10 @@ public class Panel extends JFrame implements HoldButtonListener {
panelDevice.buttonReleased(PanelButton.REPEAT); panelDevice.buttonReleased(PanelButton.REPEAT);
} else if (button.equals(shuffleButton)) { } else if (button.equals(shuffleButton)) {
panelDevice.buttonReleased(PanelButton.SHUFFLE); panelDevice.buttonReleased(PanelButton.SHUFFLE);
} else if (button.equals(upButton)) {
panelDevice.buttonReleased(PanelButton.UP);
} else if (button.equals(downButton)) {
panelDevice.buttonReleased(PanelButton.DOWN);
} }
} }

View File

@@ -14,5 +14,7 @@ public enum PanelButton implements Button {
MUTE, MUTE,
VOLUME_UP, VOLUME_UP,
REPEAT, REPEAT,
SHUFFLE; SHUFFLE,
UP,
DOWN;
} }

View File

@@ -14,12 +14,14 @@ public class PanelEventMapCycle extends EventMapCycle {
public PanelEventMapCycle() { public PanelEventMapCycle() {
/* Player */ /* Player */
player = new EventMap(); player = new EventMap();
player.add(new Press(PanelButton.UP), new Task(Target.MIMIS, Action.PREVIOUS));
player.add(new Press(PanelButton.PREVIOUS), new Task(Target.APPLICATION, Action.PREVIOUS)); player.add(new Press(PanelButton.PREVIOUS), new Task(Target.APPLICATION, Action.PREVIOUS));
player.add(new Press(PanelButton.REWIND), new Task(Target.APPLICATION, Action.REWIND)); player.add(new Press(PanelButton.REWIND), new Task(Target.APPLICATION, Action.REWIND));
player.add(new Press(PanelButton.STOP), new Task(Target.APPLICATION, Action.STOP)); player.add(new Press(PanelButton.STOP), new Task(Target.APPLICATION, Action.STOP));
player.add(new Press(PanelButton.PAUSE), new Task(Target.APPLICATION, Action.PAUSE)); player.add(new Press(PanelButton.PAUSE), new Task(Target.APPLICATION, Action.PAUSE));
player.add(new Press(PanelButton.PLAY), new Task(Target.APPLICATION, Action.PLAY)); player.add(new Press(PanelButton.PLAY), new Task(Target.APPLICATION, Action.PLAY));
player.add(new Press(PanelButton.FORWARD), new Task(Target.APPLICATION, Action.FORWARD)); player.add(new Press(PanelButton.FORWARD), new Task(Target.APPLICATION, Action.FORWARD));
player.add(new Press(PanelButton.DOWN), new Task(Target.MIMIS, Action.NEXT));
player.add(new Press(PanelButton.NEXT), new Task(Target.APPLICATION, Action.NEXT)); player.add(new Press(PanelButton.NEXT), new Task(Target.APPLICATION, Action.NEXT));
player.add(new Press(PanelButton.VOLUME_DOWN), new Task(Target.APPLICATION, Action.VOLUME_DOWN)); player.add(new Press(PanelButton.VOLUME_DOWN), new Task(Target.APPLICATION, Action.VOLUME_DOWN));
player.add(new Press(PanelButton.MUTE), new Task(Target.APPLICATION, Action.MUTE)); player.add(new Press(PanelButton.MUTE), new Task(Target.APPLICATION, Action.MUTE));