This commit is contained in:
@@ -7,7 +7,7 @@ import javax.swing.JButton;
|
||||
import javax.swing.JFrame;
|
||||
|
||||
import pm.event.Task;
|
||||
import pm.task.TaskManager;
|
||||
import pm.event.EventManager;
|
||||
import pm.value.Action;
|
||||
import pm.value.Target;
|
||||
|
||||
@@ -158,42 +158,42 @@ public class GUIDeviceUI extends JFrame {
|
||||
}
|
||||
|
||||
protected void playAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.PLAY, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.PLAY, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void pauseAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.PAUSE, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.PAUSE, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void resumeAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.RESUME, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.RESUME, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void nextAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.NEXT, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.NEXT, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void previousAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.PREVIOUS, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.PREVIOUS, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void forwardAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.FORWARD, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.FORWARD, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void rewindAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.REWIND, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.REWIND, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void muteAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.MUTE, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.MUTE, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void volumeUpAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.VOLUME_UP, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.VOLUME_UP, Target.APPLICATION));
|
||||
}
|
||||
|
||||
protected void volumeDownAction(ActionEvent e) {
|
||||
TaskManager.add(new Task(Action.VOLUME_DOWN, Target.APPLICATION));
|
||||
EventManager.add(new Task(Action.VOLUME_DOWN, Target.APPLICATION));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import java.util.LinkedList;
|
||||
import java.util.Queue;
|
||||
|
||||
import pm.exception.ButtonException;
|
||||
import pm.exception.StateException;
|
||||
|
||||
import de.hardcode.jxinput.Axis;
|
||||
import de.hardcode.jxinput.Button;
|
||||
|
||||
@@ -4,13 +4,13 @@ import pm.Button;
|
||||
import pm.device.javainput.DirectionButton;
|
||||
import pm.device.javainput.JavaInputDevice;
|
||||
import pm.event.Task;
|
||||
import pm.event.task.Continuous;
|
||||
import pm.event.task.Dynamic;
|
||||
import pm.exception.button.UnknownButtonException;
|
||||
import pm.exception.button.UnknownDirectionException;
|
||||
import pm.exception.device.DeviceInitialiseException;
|
||||
import pm.macro.state.Hold;
|
||||
import pm.macro.state.Press;
|
||||
import pm.task.Continuous;
|
||||
import pm.task.Dynamic;
|
||||
import pm.value.Action;
|
||||
import pm.value.Target;
|
||||
import de.hardcode.jxinput.event.JXInputButtonEvent;
|
||||
|
||||
@@ -4,17 +4,15 @@ import java.util.ArrayList;
|
||||
|
||||
import com.melloware.jintellitype.JIntellitype;
|
||||
|
||||
import pm.macro.state.Press;
|
||||
import pm.Button;
|
||||
import pm.value.Key;
|
||||
|
||||
public class Hotkey extends Press {
|
||||
public class Hotkey implements Button {
|
||||
protected static ArrayList<Hotkey> hotkeyList;
|
||||
protected static JIntellitype jit;
|
||||
|
||||
public Hotkey(int modifier, int keycode) {
|
||||
super(null); // Todo: nettere oplossing zoeken / controleren op null
|
||||
int id = hotkeyList.size();
|
||||
button = new Modifier(id);
|
||||
jit.registerHotKey(id, modifier, keycode);
|
||||
hotkeyList.add(this);
|
||||
}
|
||||
|
||||
@@ -8,15 +8,12 @@ import com.melloware.jintellitype.JIntellitype;
|
||||
|
||||
import pm.Device;
|
||||
import pm.event.Task;
|
||||
import pm.exception.StateException;
|
||||
import pm.exception.button.UnknownButtonException;
|
||||
import pm.exception.device.DeviceExitException;
|
||||
import pm.exception.device.DeviceInitialiseException;
|
||||
import pm.macro.state.Hold;
|
||||
import pm.macro.state.Press;
|
||||
import pm.macro.state.Release;
|
||||
import pm.task.Continuous;
|
||||
import pm.value.Action;
|
||||
import pm.value.Command;
|
||||
import pm.value.Key;
|
||||
import pm.value.Target;
|
||||
|
||||
@@ -48,32 +45,38 @@ public class JIntellitypeDevice extends Device implements HotkeyListener, Intell
|
||||
add(
|
||||
new Hotkey(Modifier.CTRL | Modifier.WIN, 'x'),
|
||||
new Task(Action.EXIT, Target.MAIN));
|
||||
add(
|
||||
/*add(
|
||||
new Hotkey(Modifier.CTRL | Modifier.WIN, 't'),
|
||||
new Task(Action.TEST, Target.MAIN));
|
||||
add(
|
||||
new Hotkey(Modifier.CTRL | Modifier.WIN, 'r'),
|
||||
new Hotkey(Modifier.CTRL | Modifier.WIN, 's'),
|
||||
new Continuous(Action.REPEAT, Target.APPLICATIONS, 500));
|
||||
new Continuous(Action.REPEAT, Target.APPLICATIONS, 500));*/
|
||||
}
|
||||
|
||||
protected void add(Hotkey hotkey, Task task) {
|
||||
add(new Press(hotkey), task);
|
||||
}
|
||||
|
||||
public void onIntellitype(int command) {
|
||||
CommandButton commandButton;
|
||||
try {
|
||||
commandButton = CommandButton.create(command);
|
||||
System.out.println(commandButton);
|
||||
add(new Press(commandButton));
|
||||
add(new Release(commandButton));
|
||||
} catch (UnknownButtonException e) {}
|
||||
} catch (UnknownButtonException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public void onHotKey(int id) {
|
||||
Hotkey hotkey = hotkeyList.get(id);
|
||||
add(hotkeyList.get(id));
|
||||
add(new Release(hotkey.getButton()));
|
||||
add(new Press(hotkey));
|
||||
add(new Release(hotkey));
|
||||
}
|
||||
|
||||
public void exit() {
|
||||
public void exit() throws DeviceExitException {
|
||||
super.exit();
|
||||
jit.removeHotKeyListener(this);
|
||||
jit.removeIntellitypeListener(this);
|
||||
jit.cleanUp();
|
||||
|
||||
@@ -5,8 +5,8 @@ import java.util.Scanner;
|
||||
|
||||
import pm.Listener;
|
||||
import pm.event.Task;
|
||||
import pm.event.EventManager;
|
||||
import pm.exception.task.TaskNotSupportedException;
|
||||
import pm.task.TaskManager;
|
||||
import pm.value.Action;
|
||||
import pm.value.Target;
|
||||
|
||||
@@ -23,7 +23,7 @@ public class InputListener extends Listener {
|
||||
String string = input.next().toUpperCase();
|
||||
if(string != null) {
|
||||
try {
|
||||
TaskManager.add(
|
||||
EventManager.add(
|
||||
new Task(Action.valueOf(string), Target.APPLICATION));
|
||||
} catch(IllegalArgumentException e) {}
|
||||
}
|
||||
|
||||
@@ -8,13 +8,13 @@ import pm.Button;
|
||||
import pm.Device;
|
||||
import pm.device.wiimote.gesture.GestureDevice;
|
||||
import pm.event.Task;
|
||||
import pm.event.task.Continuous;
|
||||
import pm.event.task.Dynamic;
|
||||
import pm.exception.button.UnknownButtonException;
|
||||
import pm.exception.device.DeviceInitialiseException;
|
||||
import pm.macro.state.Hold;
|
||||
import pm.macro.state.Press;
|
||||
import pm.macro.state.Release;
|
||||
import pm.task.Continuous;
|
||||
import pm.task.Dynamic;
|
||||
import pm.value.Action;
|
||||
import pm.value.Target;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user