C0d3v/Quicklaunch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed NativeHook From being used in Linux Versions

Browse Source
This commit is contained in:
ChococookieOS
2019-10-20 17:14:52 +02:00
parent fc768ab36f
commit 026832e3f7
14 changed files with 88 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
QuickLaunch/src/basics/BasicGuiApp.java
View File

@@ -17,6 +17,7 @@ import javafx.stage.WindowEvent;
import main.KeyChecker;
import main.ModLoader;
import main.Start;
import manager.OperatingSystem;
import manager.SettingManager;
import scenes.MainScene;
import update.Updater;
@@ -36,6 +37,12 @@ public class BasicGuiApp extends Application{
ml.addMods();
ml.initMods();
if(SettingManager.getOperatingSystem() == OperatingSystem.WINDOWS) {
registerNativeHoook();
}
}
private void registerNativeHoook() {
try {
GlobalScreen.registerNativeHook();
} catch (NativeHookException e) {
@@ -49,7 +56,6 @@ public class BasicGuiApp extends Application{
GlobalScreen.addNativeKeyListener(listener);
}
public void start(Stage primaryStage) throws Exception {
mainStage = primaryStage;

158
QuickLaunch/src/guis/SettingGui.java
View File

@@ -1,6 +1,5 @@
package guis;
import org.jnativehook.GlobalScreen;
import basics.BasicGuiApp;
@@ -11,19 +10,19 @@ import javafx.scene.control.CheckBox;
import javafx.scene.layout.AnchorPane;
import javafx.scene.text.Text;
import main.ShortcutKeyChecker;
import manager.OperatingSystem;
import manager.ResourceManager;
import manager.SettingManager;
public class SettingGui extends AnchorPane{
public class SettingGui extends AnchorPane {
AnchorPane settingPane;
public SettingGui(){
public SettingGui() {
this.setPrefWidth(300);
this.setPrefHeight(185);
this.setStyle("-fx-background-color: rgba(240, 240, 240, 1);");
/////////////////////////////////////////////////////////////////////////////
Text setting1 = new Text("Load File.txt on startup:");
setting1.setFont(ResourceManager.getFontSmall());
@@ -31,7 +30,7 @@ public class SettingGui extends AnchorPane{
setting1.setLayoutY(20);
setting1.prefWidth(170);
setting1.prefHeight(30);
final CheckBox setting1Box = new CheckBox();
setting1Box.setLayoutX(180);
setting1Box.setLayoutY(7);
@@ -40,14 +39,14 @@ public class SettingGui extends AnchorPane{
setting1Box.setSelected(SettingManager.isLoadFileOnBoot());
///////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
Text setting3 = new Text("Check for updates on startup:");
setting3.setFont(ResourceManager.getFontSmall());
setting3.setLayoutX(10);
setting3.setLayoutY(100);
setting3.prefWidth(220);
setting3.prefHeight(30);
final CheckBox setting3Box = new CheckBox();
setting3Box.setLayoutX(230);
setting3Box.setLayoutY(87);
@@ -56,77 +55,80 @@ public class SettingGui extends AnchorPane{
setting3Box.setSelected(SettingManager.isCheckUptdateOnBoot());
/////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////
Text setting4 = new Text("QuickLaunch shortcut:");
setting4.setFont(ResourceManager.getFontSmall());
setting4.setLayoutX(10);
setting4.setLayoutY(128);
setting4.prefWidth(180);
setting4.prefHeight(30);
if (SettingManager.getOperatingSystem() == OperatingSystem.WINDOWS) {
Text setting4 = new Text("QuickLaunch shortcut:");
setting4.setFont(ResourceManager.getFontSmall());
setting4.setLayoutX(10);
setting4.setLayoutY(128);
setting4.prefWidth(180);
setting4.prefHeight(30);
final Button setting4button1 = new Button("key1");
if(!(SettingManager.getKey1() == -1)){
setting4button1.setText(SettingManager.getKey1()+"");
}
setting4button1.setFont(ResourceManager.getFontSmall());
setting4button1.setLayoutX(10);
setting4button1.setLayoutY(145);
setting4button1.prefWidth(40);
setting4button1.prefHeight(24);
setting4button1.setOnAction(new EventHandler<ActionEvent>() {
public void handle(ActionEvent event) {
ShortcutKeyChecker skc = new ShortcutKeyChecker();
GlobalScreen.removeNativeKeyListener(BasicGuiApp.listener);
GlobalScreen.addNativeKeyListener(skc);
while(skc.lastKey == -1){
try {
Thread.sleep(100);
} catch (InterruptedException e1) {
e1.printStackTrace();
}
}
setting4button1.setText(skc.lastKey+"");
SettingManager.setKey1(skc.lastKey);
GlobalScreen.removeNativeKeyListener(skc);
GlobalScreen.addNativeKeyListener(BasicGuiApp.listener);
final Button setting4button1 = new Button("key1");
if (!(SettingManager.getKey1() == -1)) {
setting4button1.setText(SettingManager.getKey1() + "");
}
});
final Button setting4button2 = new Button("key2");
if(!(SettingManager.getKey2() == -1)){
setting4button2.setText(SettingManager.getKey2()+"");
}
setting4button2.setFont(ResourceManager.getFontSmall());
setting4button2.setLayoutX(95);
setting4button2.setLayoutY(145);
setting4button2.prefWidth(40);
setting4button2.prefHeight(24);
setting4button2.setOnAction(new EventHandler<ActionEvent>() {
setting4button1.setFont(ResourceManager.getFontSmall());
setting4button1.setLayoutX(10);
setting4button1.setLayoutY(145);
setting4button1.prefWidth(40);
setting4button1.prefHeight(24);
setting4button1.setOnAction(new EventHandler<ActionEvent>() {
public void handle(ActionEvent event) {
ShortcutKeyChecker skc = new ShortcutKeyChecker();
GlobalScreen.removeNativeKeyListener(BasicGuiApp.listener);
GlobalScreen.addNativeKeyListener(skc);
while(skc.lastKey == -1){
try {
Thread.sleep(100);
} catch (InterruptedException e1) {
e1.printStackTrace();
public void handle(ActionEvent event) {
ShortcutKeyChecker skc = new ShortcutKeyChecker();
GlobalScreen.removeNativeKeyListener(BasicGuiApp.listener);
GlobalScreen.addNativeKeyListener(skc);
while (skc.lastKey == -1) {
try {
Thread.sleep(100);
} catch (InterruptedException e1) {
e1.printStackTrace();
}
}
setting4button1.setText(skc.lastKey + "");
SettingManager.setKey1(skc.lastKey);
GlobalScreen.removeNativeKeyListener(skc);
GlobalScreen.addNativeKeyListener(BasicGuiApp.listener);
}
setting4button2.setText(skc.lastKey+"");
SettingManager.setKey2(skc.lastKey);
GlobalScreen.removeNativeKeyListener(skc);
GlobalScreen.addNativeKeyListener(BasicGuiApp.listener);
});
final Button setting4button2 = new Button("key2");
if (!(SettingManager.getKey2() == -1)) {
setting4button2.setText(SettingManager.getKey2() + "");
}
});
setting4button2.setFont(ResourceManager.getFontSmall());
setting4button2.setLayoutX(95);
setting4button2.setLayoutY(145);
setting4button2.prefWidth(40);
setting4button2.prefHeight(24);
setting4button2.setOnAction(new EventHandler<ActionEvent>() {
public void handle(ActionEvent event) {
ShortcutKeyChecker skc = new ShortcutKeyChecker();
GlobalScreen.removeNativeKeyListener(BasicGuiApp.listener);
GlobalScreen.addNativeKeyListener(skc);
while (skc.lastKey == -1) {
try {
Thread.sleep(100);
} catch (InterruptedException e1) {
e1.printStackTrace();
}
}
setting4button2.setText(skc.lastKey + "");
SettingManager.setKey2(skc.lastKey);
GlobalScreen.removeNativeKeyListener(skc);
GlobalScreen.addNativeKeyListener(BasicGuiApp.listener);
}
});
this.getChildren().add(setting4);
this.getChildren().add(setting4button1);
this.getChildren().add(setting4button2);
}
/////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
Button exit = new Button("Done");
exit.setFont(ResourceManager.getFontSmall());
exit.setLayoutX(230);
@@ -135,25 +137,21 @@ public class SettingGui extends AnchorPane{
exit.prefHeight(24);
exit.setOnAction(new EventHandler<ActionEvent>() {
public void handle(ActionEvent event) {
SettingManager.setLoadFileOnBoot(setting1Box.isSelected());
SettingManager.setCheckUptdateOnBoot(setting3Box.isSelected());
SettingManager.saveSettings();
BasicGuiApp.mainStage.setScene(BasicGuiApp.mainScene);
}
});
this.getChildren().add(setting1);
this.getChildren().add(setting1Box);
this.getChildren().add(setting3);
this.getChildren().add(setting3Box);
this.getChildren().add(setting4);
this.getChildren().add(setting4button1);
this.getChildren().add(setting4button2);
this.getChildren().add(exit);
}
}

24
QuickLaunch/src/main/KeyChecker.java
View File

@@ -7,7 +7,6 @@ import org.jnativehook.keyboard.NativeKeyListener;
import basics.BasicGuiApp;
import guis.MainGui;
import javafx.application.Platform;
import manager.OperatingSystem;
import manager.SettingManager;
public class KeyChecker implements NativeKeyListener{
@@ -30,32 +29,13 @@ public class KeyChecker implements NativeKeyListener{
//Workaround because toFront() does not work and makes window active
Platform.runLater(new Runnable() {
public void run() {
if(SettingManager.getOperatingSystem() == OperatingSystem.LINUX) {
BasicGuiApp.mainStage.setIconified(true);
BasicGuiApp.mainStage.setIconified(false);
BasicGuiApp.mainStage.toFront();
BasicGuiApp.mainStage.requestFocus();
MainGui.inputField.requestFocus();
}
else if(SettingManager.getOperatingSystem() == OperatingSystem.WINDOWS) {
public void run() {
BasicGuiApp.mainStage.setAlwaysOnTop(true);
BasicGuiApp.mainStage.setAlwaysOnTop(false);
BasicGuiApp.mainStage.requestFocus();
MainGui.inputField.requestFocus();
BasicGuiApp.mainStage.setIconified(true);
BasicGuiApp.mainStage.setIconified(false);
}
else if(SettingManager.getOperatingSystem() == OperatingSystem.OSX) {
BasicGuiApp.mainStage.setIconified(true);
BasicGuiApp.mainStage.setIconified(false);
BasicGuiApp.mainStage.toFront();
BasicGuiApp.mainStage.requestFocus();
MainGui.inputField.requestFocus();
}
BasicGuiApp.mainStage.setIconified(false);
}
});