diff --git a/QuickLaunch/bin/.gitignore b/QuickLaunch/bin/.gitignore index c8ccc4e..7aedd4e 100644 --- a/QuickLaunch/bin/.gitignore +++ b/QuickLaunch/bin/.gitignore @@ -1,18 +1,3 @@ -/HelveticaNeue-UltraLight.otf -/LiberationSerif-Regular.ttf -/back.png /basics/ -/edit.png -/guis/ -/icon.ico -/icon.png -/lock.png /main/ -/manager/ -/mod_quicklaunch/ -/plus.png -/save.png -/scenes/ -/trash.png -/unsaved.png -/update/ +/guis/ diff --git a/QuickLaunch/bin/guis/SettingGui$1.class b/QuickLaunch/bin/guis/SettingGui$1.class deleted file mode 100644 index 23383ee..0000000 Binary files a/QuickLaunch/bin/guis/SettingGui$1.class and /dev/null differ diff --git a/QuickLaunch/bin/guis/SettingGui$2.class b/QuickLaunch/bin/guis/SettingGui$2.class deleted file mode 100644 index f99bc66..0000000 Binary files a/QuickLaunch/bin/guis/SettingGui$2.class and /dev/null differ diff --git a/QuickLaunch/bin/guis/SettingGui$3.class b/QuickLaunch/bin/guis/SettingGui$3.class deleted file mode 100644 index 97dd6fc..0000000 Binary files a/QuickLaunch/bin/guis/SettingGui$3.class and /dev/null differ diff --git a/QuickLaunch/bin/guis/SettingGui.class b/QuickLaunch/bin/guis/SettingGui.class deleted file mode 100644 index 905675d..0000000 Binary files a/QuickLaunch/bin/guis/SettingGui.class and /dev/null differ diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1$1.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1$1.class deleted file mode 100644 index 8284eb2..0000000 Binary files a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1$1.class and /dev/null differ diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1.class deleted file mode 100644 index 0e431ff..0000000 Binary files a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1.class and /dev/null differ diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$2.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$2.class deleted file mode 100644 index 8447731..0000000 Binary files a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$2.class and /dev/null differ diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$3.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$3.class deleted file mode 100644 index 89f99fc..0000000 Binary files a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$3.class and /dev/null differ diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$4.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$4.class deleted file mode 100644 index 9dc083c..0000000 Binary files a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$4.class and /dev/null differ diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$5.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$5.class deleted file mode 100644 index e65109c..0000000 Binary files a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$5.class and /dev/null differ diff --git a/QuickLaunch/src/basics/BasicGuiApp.java b/QuickLaunch/src/basics/BasicGuiApp.java index ce89ef8..b2132bd 100644 --- a/QuickLaunch/src/basics/BasicGuiApp.java +++ b/QuickLaunch/src/basics/BasicGuiApp.java @@ -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; diff --git a/QuickLaunch/src/guis/SettingGui.java b/QuickLaunch/src/guis/SettingGui.java index c1da718..e5aaaa7 100644 --- a/QuickLaunch/src/guis/SettingGui.java +++ b/QuickLaunch/src/guis/SettingGui.java @@ -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() { - - - 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() { + setting4button1.setFont(ResourceManager.getFontSmall()); + setting4button1.setLayoutX(10); + setting4button1.setLayoutY(145); + setting4button1.prefWidth(40); + setting4button1.prefHeight(24); + setting4button1.setOnAction(new EventHandler() { - - 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() { + + 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() { - 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); } - + } diff --git a/QuickLaunch/src/main/KeyChecker.java b/QuickLaunch/src/main/KeyChecker.java index 8db3cc4..44cf84f 100644 --- a/QuickLaunch/src/main/KeyChecker.java +++ b/QuickLaunch/src/main/KeyChecker.java @@ -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); } });