From 026832e3f78c32eb315004d4979aa0f3df0e5aa7 Mon Sep 17 00:00:00 2001 From: ChococookieOS Date: Sun, 20 Oct 2019 17:14:52 +0200 Subject: [PATCH] Removed NativeHook From being used in Linux Versions --- QuickLaunch/bin/.gitignore | 17 +- QuickLaunch/bin/guis/SettingGui$1.class | Bin 1871 -> 0 bytes QuickLaunch/bin/guis/SettingGui$2.class | Bin 1871 -> 0 bytes QuickLaunch/bin/guis/SettingGui$3.class | Bin 1418 -> 0 bytes QuickLaunch/bin/guis/SettingGui.class | Bin 3202 -> 0 bytes .../mod_quicklaunch/ShortcutWindow$1$1.class | Bin 1159 -> 0 bytes .../mod_quicklaunch/ShortcutWindow$1.class | Bin 2405 -> 0 bytes .../mod_quicklaunch/ShortcutWindow$2.class | Bin 1161 -> 0 bytes .../mod_quicklaunch/ShortcutWindow$3.class | Bin 2123 -> 0 bytes .../mod_quicklaunch/ShortcutWindow$4.class | Bin 1871 -> 0 bytes .../mod_quicklaunch/ShortcutWindow$5.class | Bin 1900 -> 0 bytes QuickLaunch/src/basics/BasicGuiApp.java | 8 +- QuickLaunch/src/guis/SettingGui.java | 158 +++++++++--------- QuickLaunch/src/main/KeyChecker.java | 24 +-- 14 files changed, 88 insertions(+), 119 deletions(-) delete mode 100644 QuickLaunch/bin/guis/SettingGui$1.class delete mode 100644 QuickLaunch/bin/guis/SettingGui$2.class delete mode 100644 QuickLaunch/bin/guis/SettingGui$3.class delete mode 100644 QuickLaunch/bin/guis/SettingGui.class delete mode 100644 QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1$1.class delete mode 100644 QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1.class delete mode 100644 QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$2.class delete mode 100644 QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$3.class delete mode 100644 QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$4.class delete mode 100644 QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$5.class 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 23383ee188c83ebd09a08c93d83e65554b20e9bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1871 zcmaJ>ZBrXn6n<_JSV)&9ypp$XI`P_fl|vwKOFEW4TA8;1TG zKlXE-78pC@_}O3L7yp5yp1Ye0B(*zHhW={P4vdnJ z(srw>O*=EKA;FN|;|JVuxLY+gD|^C}8oC*-sMXy=LmUWK8Y}9(#$C%1K0~*x*+J$u zAr{&o=NJYLxRVK@LuM*XDLr?Z;aZ`E7ns5ohUvM|_Z(v>+$XQ@dE2$+0>gB+1M{t} z6Wa`lWzQ15U`XlE(4$8EI(m^zB91{F7cj&S&nnYY!FI()bH5_|GOsv-VW8ld+}Y;7 zt>&%8gknfs+GEK~t5|DcB8XJ>b!btR7ENh;ZkVgNiERy68AkTG?HZ+;=S#CG?}?|& zHDT6;pTrmjdvOErXc(s;Dm<{wz*tfrD$Qb}q2pcLWax41KvK#m?fr!i>=a}!iTCh< zhW8n+dVbZ|bGft+M9uT+#;W60xKlEHAzU3^MrcGRh5wL^Y@yx1E}m9A z?psEOIZ;#RPU@Ias6*VcI&8YA?bKr>aT_0Lpbj|GX62eMxTWJ`%rJBXjt~thVs>2t z&*C!;pE6uO?aI6>h3_{TQdld8rf8@n>$szenrisAD@&4_^|H@RYJxG$>6phC44T6O zm2n1^*YG9rKZPtw@~bX2ZO2lzSj4i1rE@Vx7COGh3PDj%H^t^I!*Dh~5f(iXOk_oM zSiq|4vo&SWxvz*VU|q*O6sV-qi~J~g**BtX;J$`UhOxJZM#nemIE|!M7Kbv461Fsy z87}Q}msf@VTIt1Ts$&}uBYR2;6(m7aND*CO?=p=3e=n1Gg1Sj}Lezkr-Atm034$Cy zL;X!vBfGw^SVi7wDQ%=pL#OKD43}H{JLHuliJLmEV3Z+Q@|wOW?%GPtsnhH2L*>lS zTe7R9i>6Pz`7`lFcir51*5T=`dv5;x)>&~c5Ruf1YdT&)ZB!Jp=2;r{XtC`+WYF_2 ziFcWLF%SX9DegG^yAVsK)m;Uo2h>ePT8Y#D0(9E#qtPA2!j)8R@+B_jrd}eQJI26s z+KOSA-rZyfYN$)}R!%?)Be+aoDilUrFn=IHKVa(>#&(Wzt@typpCB`Jg4{Fo58>7c zjA!WCxOIe2re5Il*iZlbnR|isD=h4&`3b%{#@!?2k5G)}56CwYqU4^_A;YA&>!jLv z7}RVS`zGPi!!jOW9gner?@`8+kVGyDv_*nK#<$p^ z6M9f2k4HrN23b5Nk2roHN_~j`g<%b2YZ_(~=|y7wq{VuIjALZdo16R%KOUjdo;Fem dZ7Y)mtZ*c-8-A;(g{w9OQKymWG?iR>{sp$&)baoT diff --git a/QuickLaunch/bin/guis/SettingGui$2.class b/QuickLaunch/bin/guis/SettingGui$2.class deleted file mode 100644 index f99bc664cafc7ed20397797752293f8ad27eb398..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1871 zcmaJ>TUQ%Z6#h;U7)XaE+)4{AMH@8)>a>Vx1yP_BLK9GvqIjRo9Fif!Oq@BB1zvuO zkA1GI1(sdQ<#T_DFa86Uy3b51kkn3A=FBENlfahW=_``C5q! zVL8>cz{<=hNHC=L^ro)ax>MD*Dtp`z3c4At$kW{ejW@X?v{m_D*B#U59z(aNS$^gg zc`UTKoM#wp>UPGDE}5+aLb%Qh!?i-opKox7YliCx&$YGXP)=6e3zlPvMTXni4xcYI zo!n+fthgrc1w%@Of*$$Ruc8;pB;puUaREaN@vKx$6)cBu2KyE6mGz3v83qcjq1)TK zXUTo*Fd-2VmiAaOGcwj%m2&Gm#4i2M9- zrN)gq_mUXHU@xxY6$KL%L`C;4!`GJOLZw-1G*rBb8w@?RMQtY^Gl^TEHoJYU&B`^8>!ymgFw4;8+nhJ3h}jM4 zcnc!y#9v@7$D;GP#W1UFX?4Bn7QR&hrbHP!GeN0fwa)XSc3P!o({Ud005XHab2 zml>9hbilWE8HTg@$*|}VVInQ6 z!y?vXpRG%cPPqiOhz%9@QJ|6vH?pJTWnbuR6CWwqViWqu%%DB*#E zGQ*{P-O;Pud(QM?v{kW2y-Vec}G{(mnMdHlLTGa+ig&Tb}B#5mP> z;tcc`RgLue!eSNmMvG}9Z5%pfkIrzpg};MdNus!+;tEC?k|j6r41Uj&Y)+kyw>PCR zLvP8d5-$Rer1>-PMYC@HJnHcF)|^{7FFH%^MFNsqbqw3}sf~(U)Lc`+9v!yLLk2bP z5P4Uq7k%zyg5r+TzYDQ+TFxpUJs>9)aV1Xw3s6bgM_+dk3r|wHsVBIYn|^|H?id4) zNEE{`y}L;fsN)j7r4f+A2rkn~g~Djd%^yh64|wntV>`#VR{RCyC&)~nAomdcL%4YY z?IC(LZyw?8>Bo34_VYh~<{l&c6pK4@e}WH>aqkHEBNU_kCuExmz2qLzCBwwHabj&e z3~DZn-6dQNT*P-6fJf(obOM@nP28aU6b`Y1@3Da&u!$d0#!n%LToh;v1ci*xutPWW zpoq`$1;M^f8eifoy6bC#)Q9+A7*;U0u3#>aULw@rv`|lya*R}Zb5pI du~bRG48J&b!?lW9cxqvgk_)N~%@11X`4=mt)~x^l diff --git a/QuickLaunch/bin/guis/SettingGui$3.class b/QuickLaunch/bin/guis/SettingGui$3.class deleted file mode 100644 index 97dd6fc76e1bd6c279b76251a008dda03d82f1e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1418 zcmah}+foxj5IsXemc&&8gm6&=G-who3*tQ(1>~jys*Li$+prnK;<8I+Hz_{B2QTHP zNC{FtSU&qvmOYb=1gMf!Wu~X6FK147@9#f9ege3Qbqy^H9p$R!8AajymQ!A;TB&Ib zVTSk)uW`fXPT5%B+7YI&A;QonwQu(gQ4@}DEXZ}4J0)9G7$W|*<)tPmV&P2497B7J z+bOS}WNOacXBaF5u{={a!Z2OOuei1`zb(vnWN^l3TKPm~EXVTm46oAXa$FGZg6qr% zLwMdTi74ppIyAINsZ&Q3F)1Zl+@v=p zfDw%97?VcbWTa~KX3sBiKQNRQ6FLmZkM8lB2>Qy4VhYq)cZi-X?pda1%*l=VZFX-@ zr)Ipz5Z&dLQ}hWK(cK`zlV?L|b27*S9S`xSVJusx*;utwQLecda(JR)hB7wTItisC zkEaZ6^ay3m(DRS_dOy~K$O^ZrS}^oCAf2yGvwQuvQ8NwC8G27mO;b^0)L4r;u3>=6 zRdlNrQ%KUOs{-DLp9$$q?=4zohx^qE-L5Dk&BK{HjZI|_26N{0Ra5p{UJluUW7@7q zv%f0*ZMURhm6T@&n2NdLIHEFdbI%hVh6s0v{;deb<8oGjc&D5cwbPu?_a#Js9hb@K z3Q2jiAWVBAJ9>!r?AReXvg3#7%6>=pSJJnjm(~bb1MksCtFGh(`f-&`Op+AD5@g*% zy5a0MbR6OOF;XOTDJgr5@dHdA;QkRFp9D@4RNw;v`-lWSp$DJo5noiIWIb4rh{EC- zX2IgKlyWXenF&%xv!lN-e}sjT&~?o8X`}=aRTxW3TE>dnU*M(E7LddmNwVhhmGt`y Dy{=ks diff --git a/QuickLaunch/bin/guis/SettingGui.class b/QuickLaunch/bin/guis/SettingGui.class deleted file mode 100644 index 905675da4cdc2ac7e258dd8b6d014a7a41d73d69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3202 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 W;|c9al5GXcWaY?b)2@f+PvaM9$Q@Sz diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$1.class deleted file mode 100644 index 0e431ffa4664476fb06b8c14d5691ba4f0b568d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2405 zcma)7>sA|86#fnbhD=9ELoc*Sx!WXY1B#*zQX<3>8!i$If?6CVhh*q5W9LFkz17PP zpTH;Z0dy@4Rn~I#x4-puT<$Y7Kq4!}WX+tJefHUxZ-0Bwpa1;+2Y_*WFQJ8@Z^tTc z-1l_to}qfCR!tYHmhEbuyQ-UI>%q{Nga|`yTisRDhH6&Qi<{eAb0xGhToKZ(hiSgc zO*fqr_c_%p8{B4ScdNQHG)fK%&-RcZ-AUcl-6@8_#97M85<_IhD)T59o>L&9Lq;n) z6+{tZXiW%(&Vp|81#f4Q+bim(!5QKOOH+-KYU|=X6h=gd30tdzK*1X z1Vfk4k;dp0q%cAibM!}41*%S7Mh{*QK5h_3%~Q_g1Jk1l#_%c~Rm)|Di}gVTM9d`D zMF`^xUdJ1xSK+SE%O~rC4K;=9Hx;~vn+)e1?&iw68_*+?SWlLsRJ%z9Z-a;!bHXlI zwk%h`$8hzi?vBPyPPpt@o|_hX85z@fM?#hW4!LnkN5KqciLn&klFhf~xL&DJpoGY5 z`*ij(HKc%l8gmNrc#jk*zIw$-Vpae$je>%CEKmYuX{M?hWt*D}!-*hYYDUd63~Ep! zr9-{yaC=we7*b`4;e11g3)D*Iu#8a&MWRu-*W88x=>r8NtTM=sW|Ol3p8iI7G>eF5 z8R_D&3Zb-yk0h)!^frWWT2;Zv_=N0>6v+;a6;aaT3G7bmtEF4uE(*)vT6zdssO z7z%d8m}+xe)pi9REd`(Xk}XT~Xc)Emv$T$F!ECLcG7OCHh}ZEuNROse=(}+wlWz$R zPPlo>qD-T7Pr*f8IvGe~472|y^)t|+nB=16*&2UW7jw9)@#}I!5P>0D)GMaydNyg~ z>+%Zw_J~WN^ zs^f46eFRJ^U2R~onE2FClSb%@Qmax2($hFv=ufSi8u=AU>HyFGLT@cNPxp4x0VWWq zyW&5~=)whhBR1nwV1Z4L-ByzQo!W=;1eXudvv!EywRnHL{{Vxbw1$^rgVh7PTtj*_ zl$~rv$~C<96g`m|CWLe!nQ*D$)&=CW8g3s8?u6&Ug)E217k|V1E%2@HW2J@K8If zm5O!X5k3!(4bv)W)FyKH*;n{);Y4vG_`=`&5?}f2*LdtpyYUUaqo+6-7G}gx3zmNY DzyNs5 diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$2.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$2.class deleted file mode 100644 index 844773146e7a3d4508be46847cbcc7fff9538c9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1161 zcmah|YflqV5IwgKmac1C0eLA{p=w)@MZ{N1NC?45QuISjjV4N#?X|tQ+>QG{{aGej z6F(R}`=g9=@3x_s2%GGE%*>uSXJ+>IpP#<~tmBD+6hrCAZ|{GMh5NyCV(E76X4elQ zH;!Hj+4et`*9>GBiiggzV|$M5*e?zaxf>Z6VVF_Y_n&Qk%w=TnsP&m6+a3=XMxw3= z%d3>2aejt6#cl{GqD_Xy%052*{G=${O`EjJRr)Y|LSmWgT18kk|2 zKVP+lYq-uZ+Tl^t<&r2)R;mN!P+4qkubY@h$-oWL(9b*MwQv&)3^_tc+Ql$61QR(O zZYPeqf$|W9_B7RMViC73+)>rbx}F~rm8@e{aD%#XP zwHj2(zzW0k|H^1mXICv;#Uz8-^y9$gPlamY_}S51Q2@lFDLT@L;(#J{HILyrtq+(b z5;TMUjBcED4XfKE@`W9#${}QDk4Ig=f+lHg+EnpJ9X3O@y_lhB^)WIIVZC-_ujd8?sva?|M>TpUjdwj zW1xd!xbBv3-fGy^N=-Bzt7;ajuBWVqx?wwI_x9+dfjC3&vRD&lO*j?v^5U|zlz~o$ z!&KjX0yLwwdP%LEt> zav11JB8DE01bP`_DQ(b`vmIGz)EA|9O)S-3@f?O3l3H=0 zp_J=T%w|a6l8!Vj*HNBZGedPIi4lw%ILRTSFV!VatX6G{VW0(4c%wiC zi_kg4Vd?}EqFfFW&|zNUco~zSmy+$J)vCcih&68(9e7%&vauB?--aTqCRrd)N;Iw9I@V! z>x!Yj>0w7RW(*VnBo<_Qx>XnVir^6RHuHia^Q5Ak6h(x`# zpt*H}%0H`T7%nf5d#)01_qn(Nz6B`;OgE$hKmqlCg&@8*}DW_;dpq&Hg= zzAt?YQyMY)9{}s^)#Hz5d5r!E=mfii$=-nu`XWH`xp#`rz5LPOoY3$y9MXA z@J4iP3vX^>rf?5Kr+>yJh6l*!PqpkXlkh6T-R-~b!4IVrvJ~BoJz2;Po-m|FDHfnq zAWVQdA?jcdE=}ZBOyCw~;Guv9mas;r20p_&zNGa#e2(w&1%9B@2EM{?_! z-}p8_I~^h#p-tH0BYaGFFHy}t!A(N^VQcp(ML&fRZus1;TeW8`0RB9R_{0I`YkZc5PPA+XhkkH HiRkwqYZ@N$ diff --git a/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$4.class b/QuickLaunch/bin/mod_quicklaunch/ShortcutWindow$4.class deleted file mode 100644 index 9dc083c7619b200400cc33ff4c419fcf3023b5e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1871 zcmah~-*XdH6#i~fx-?yAY=J^4B|wxUMHZ#nVoJ5G0itQC1XIBuc)PhxE^K#k_oj%? zK0Bk}_{@{f&Ol&v#=%GZn;iAr-AyN{g=S`V@7{Cv-0ytnJ12kr^Xu;brqDEyV90EE z^;=)HqZ)u!hwyQNm8Tlel|rwsHlq;K<0ZaLg-SXb9>3tJiJXE>sF*T1&J zrf`*2()TOetvkYJ=vPe{WY5t7m6xATWH_+NovhvReG1SyK43Ul2~TY)=~(l=&+k`c zpvb*{R=QHnG0fz4i@jrne2t-R(W{FAFbtV6uvf2MF)@Ht3Q3HZ7{mdFWKO#dRirDH zTN`V_zs}bj!7yC$Z0^*!FZFx8*{2g`IJpa??3B)+8PddXEEgi&;&9$p(sM&5i}~6B z#xY^w7{kQNIW%z`8HQBAH^o9rDbJDQ$*BTUs&Tz*;yuihpomP; zb*>z{b~RMdz#_wm7lA5K_3p25m(pB7$;2gGW*F49iQARBC@xLZrd8!jw?XAtK-t6x z+T9@c6|R~o%%GwrzQk}kBE9FEsA)oMag=;bXK~fU3O=GNc)hN(=<7#p)M*D^Wl(S80*L<8XDb#XJC>pa^6=}+`hBK@5a3~x+RV1t4@O$_?!ya zGljYWrl_fJnK*(mQd%|C_9dzNccepFG~>?d01N|F*>JgP`Q%ale{Q|FLj>`#o9#7q zAt=sKvk#SA+wlUb#*$D?udbP2C)hE6+vK7rj#+kH;V(Ko2tyLmTjN&jo zX_#Xy4)Z7Z>A>rS$JqZEN1x$D8>gd}*V{Npt8^RZlNW!+v|j&)nH$>r4DXD$G4~t` zZM?sI8@BPBqQVj-y}DYB@vsQsZev^JWS+F%M*!R_XfEZywl?k2W6 z<5OpRXT}E}8D|XQuhF3abjIP?Kfyo6LF>7jL>fBK%-r3x_nv#t`M&d=n?L{k?GFH_ z!4-rU1}jeS@~2hPShe)3ZIrcq*>QcN>Mxmg(fKSfqCjSdUe#;5X6bfGJGXL`8@_^W zhJG=7WliHXZu{D_c+To}(c&&cw_i5B#3>4pdwPU1@*OvA)1PFBCwFsB6&U1{X#)PXrQrRfG{`kdnfoH)q;>zFJw~?s5>nU1#LnzosB;hP^fs;~fp0Q0kV+u$Y$DWk# zwC%g=3%boC(C~_iS8?~l-sCWmnR9?^gobo0~XGMbVs(24M z61~U$1(#o$Xk(kd9Z@3Gt{pG;3<0nwxK~36(L0hJ-h`UIi)VhJ zuMnQ4XE*r(-(Vj-)xeIR5BuqhIt2%sC$JKo*hO= zy!=%IS!q%lmFxe9ipkAb1GF}`A;mXj7Ly-sy1Dh2z$XRx<_Qh(EupOwf?LGTcZBmc z&3;dp&kso9M~vVn%;0BaX>FPOE@2ZjG_Z!d_!9SU9ry7y*>(IL@H9!R5f?3_QCS%u2i7HA4&I+Y4`vfsL6Iz>1W{-D{Ra@O() { - - - 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); } });