From ae95766fbd575700aec01d220bf865d80dbc2f75 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sat, 8 Apr 2017 10:52:01 +0200 Subject: [PATCH] linux support --- bin/application/MainWindowController.class | Bin 26890 -> 26890 bytes bin/application/dbController.class | Bin 11298 -> 11748 bytes bin/application/playGame.class | Bin 3770 -> 4205 bytes src/application/MainWindowController.java | 6 +++--- src/application/dbController.java | 11 ++++++++--- src/application/playGame.java | 15 +++++++++++++-- 6 files changed, 24 insertions(+), 8 deletions(-) diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 8a6ad3309f03eb95b5ea9e621c2bdfa218da3ec3..597437a198881acbc12b23d1fec63d7dacfe0a40 100644 GIT binary patch delta 35 qcmeCW#MpI-af30thzTbHBSSt9gDHbP2SXtv1G9mF`DS2D_Klxe8zB;2sk-8Wt$}rfE{nclI5#CY`G&qQZRlnc}-%wgQhYlN60=V+jxdJm`xwFQ%p*(9+5|cL~SiBwi+o@X_Eilq{rj;Q^*AzrKOMf0kJ21U6 z!aytL_DM37L{)?lxh4@yqHiD5?QUbvZsu8D)0<)!3G%mS_nQ6`3y9tF=)0CMv!@7O zX+xSm^-%YmL`4gFTwO}CXB#SoD#G4rj#g?FZ7i`e&CDbRScYkoBss+DV0MUbc#0!5 zxKbReA;oV9SHM9IxI*3}r?ewY6C^Vb@|uApXUKXQ*b3OSC7j}HM$?z%9NCKS4#z+3 zB_*1AT7hrcP65YbetI*7XEj*C7B&l%8O%swi-sg?irej0){4fm8R54DsfFVmyFqNn zXi6r~cLx_$n!%9AiEibRHpZ=x8A@`+Cg{=^uVW7mo1vU=m=A}wS#3;MS=XvsV`fFT zrd`HX-fw0k`JD(Kuqz3sk)6cXr4tuX+xUZ-Qdgq#tGz8x3+7#yAxkRx3W6*6*Y{1x z7+Ibxf|(w>4Iwk=cGPIk-3)r2=Lk1MsFM7V8BC##*mQBdqvHmJ_!Sa&y~fe=!d)~aPeue zTsW!~@acqO=DEOMN;Yn()WsHA%fN8$SlW^#TsST;9!a5J+QI~Fm(;xJ_C{5cYwCey7Hh4)ol%Yd3pQ6jjuQLUl zhga-N7>&#??Klp2RA*j79Hr}*Q1(Av#QCyMw`+Wy)znp>t6onabcO8tUOG#44%InQ zM`DVO=YXQ~=&y6-7+%0VqR+}pn1jfFqu8}MX{Xt)!LeZ^&W^RK>HGiYFv(6Lox>$$ zT~nVe;MMBd6_6pgl2yBhD1J5w&G~&e(z7J<1vw|}!#l$HDpXivehxp*O3(g<-qOKR z{9Cg70v67x8HK%FJNXB-w$MtvD6i^P>8<9xg!ZILli?$sxwbnF!AZ}x-~LCC75S<` z$q0JnUburRD?4||YvpdsZMu{Eqm^N16uVrVyT}Z^Hq$;4514Mz`Z7hX%sA+V!3;z= z)q`$Q$c^+ld^e{tor#nP6gm@W=TOMEWHu!`vECNTC6(pzpiHS-^2z2QzT*JDs~#-s zk$LzUEp`@_nF072L=i*s4;ID{W}%D`j9`um^%}_|YHF{WR70^}l)JCjn1W8C>J5@$ z9(uF0`~Y`>#jY5|ZWzmal(V~P>s_Gq;?b@TcvMX+F39=I6~5!rfj*bJu)4U+EEMJ< z^k*+&EEbI3g3(7XO4Z@wi9BgDXMT7kI?dlt_y-98K;a)G{DXymh{O(+*kKY|Cj8a< KDbYgX$NvFjaWqYx}dUB50+pvCF|CzaS zfA@ahcklhpZ|3w(n-_V9KHaqkz*Ri8-K(4&w&N-1c`|3mR=42^-`v#IRkgak&C3|8 zbXF3jYFMPyWw4rKl_xOS6XSS;HM~mA2~5tJz%S^$hA5VxVhOsImU=EwGj<~3Nwg-~ z;)`3C`Z$T#>6}dDb#}K@uc~RTUfS7SUDw%sXM4OOVQ>nsS4F{T?mAA>IaRdb>fE3j)dfTF_&`;&gG5jR4_X0D+DWT-+Y4$ z@I2vei+8jnmU*~H?AcB2ajVEHF<&)!lZ~ben(g)Q7Q(14YOoa-)z?`?9xhf3Lggh* zgchy!VjPV_)$`}g^s*DTdbxsk>P!$3du?@fYkN~mytT8s-oDpMO)I%d&C9iNdiZsn zcM&7i_Q*)n;2OIwTX;iHSKO9ykHI9rp@woB%x@8nu8tNj<|85(e#byF?;|Qz(3z*! zI78};)05}nTEban2a1Yy1|Q^iRWdv~_B{d~J|qnqYXkq#z!4nvv4jsB{1J8w?Xsp7 zv!(kU{zUydJbJ{VL^xBLEqu<@)y?s)L~Cb<&d1cayc%v&@w{sFcwU1`mt8e&$NPD; zbUx`}zl!Bw%iZes{IbFxK4&1rJu;ut`uh5^1zz@W(BM8kub#=T%z1$?>3mUm)V}<% zY_ONPUwxE6&HVz048Ef3hTrCVotUKVD9BfX!!5q4J|5o9w^T<#)b);}Mb(&si0Uf{ z@Z^rY1q*Y$&XdSN7|`xkMI~m{?A+-CsL!31!kkADDBp>qozyL7FO011vz%g#PUB(1 za;s$}#mP$N03(Aev~*KXbCmdVdU@K+Nwb(3lt+)Ws&O~wH=3RluN**QKW+)LEQO{N z;{DVt?*J<-pXp0+oMo7X=}qx!YnVAK%-S@+sKJru4I0v{7chSY$nOXW)@&OqX@kuZ zFw-COnEn(SWFd=f`JY9p9UtaG;k4-+WhKm;GvV2w6vmqFY|yQCkUtZ#B)gc#77bRQ zmzp4%0aqG*8dAKi{G#2@WLz30t6{bZR4-0s?5~NPG1|r0&CW(M5Oim<`+3IzyRD!Z zOmX!F=&oLPGWLX!8H|KNd?=(X8sOblu9+L=H!t?CpZA*16u+G-fK6r~i)Bkq^8Tz= z>Er+(SZJ5>KZ7sETCPhKm@d07K{MdY$h!z_20WSPFxQ9q{S<#-2GSTHHhg+EQ`dT_ z%bu}H+P;Ebge`Yw;m7uZJB5F3hZ7UER;`VXWbe55!t;g;_l*)!B1i8ATq)PIY{Xp{ zfjx*~FUDdJHQ0xVcoEa_5?b&wy0IVYZ~$8{gl%{Q{WyrhBwodF9HIkb8-ZglfQ{)|6|j&(f7Ur2@rTey=?iRHyM_OX{w!-sx8&0q2v$sXhr z+`?aBm|Y5gEgnB-BpJaW97aGY>*H4TAt?22_U5rzz4DmKg zZV?10J9Mx8RS}OIl~B?Jx7?$<+0!_3RAE1VYdP(=bFbwxUF8nP$Wcu3cMDBdiU&-m z)O>*=Up4@6R)l>lKsTPl7N))1*5!xD}JSfAo)kXQLSPlUwgu70i`iqcAMyVTx?Esmw<`3)Eee#p*!C^^W8Gz4FJ3BPT8)ye)Hx zU6@5(tkxVQ{G&0RV}!RzFp34EL@+K_kHlv3-3 UTP3;Gk~>cLoAp0RM>PKFKbzb>*Z=?k diff --git a/bin/application/playGame.class b/bin/application/playGame.class index 65c81c22ad5cdfef08add9988b62d1df976d1ed7..4e905569f72eb58106cc252d5e70d62f49420d0b 100644 GIT binary patch delta 2157 zcmah~2~<>782;{T@6GcGI5MaxI*2GBN~WL!f&!)}DlSQynIk-g!C7$TjiOd#R$6K< z-4;z-ES2`cXdJO9D_hJK+gG#IvTQ%6bE=d5ZypF*=XBHGvbaN?cWx(H{1k@Eg+ngB|krk2y>po}$K&+5a%QUmx6dV`7~>f%%F>Y26J)SwRCGdSEUs6o)q>3V z0!kQqbuQ?8OG0i>jS>)1MnucqKE)wn0xpta#U#epn3K}xO6ZGn8B;Jo&#+YShAN$E zod&FsF%8rCA>-HuA}Ser+V=VpbBm zMuvh~2BSZul1{ozZhuZC$*2;k;`A0ss6)K~H$%^uSRKoG`nrrIqzr@xZHvbz!3)0t zA7$1l?W~Ybb$b;V4Oq&L8PX*U6_lYO#EVTMQY9?M3IUDhY@)_jD?vi7#45hWG-%}2 zxJJMls-yGZX{4BpYjGVltJdT92N+BlWtn9X*5L*L*Ym$jDWleFR_abt&!HSDJ)`Uc!V#%JhO~OvxDd3I{-C_ov*jTMJsBXVc#$AYGh>yuOTXj}1nGoZOjR(PM1O-3O!{U!n2%->6XJXUcieyTg*)^#LJq+xQJI640SR4 zzpAs6v#&eiNu~QUakjs5OB~a>d27^jaz)yU& zlx6xwqinYJ;+w4kKPqht8#cg%ZUCE-)q?m4k}I-WF%XC%EsD$%J(#l{^|p~w}0@u*(z$oU?F56`t*f7omyZ)Ew z@{YadZ_WNUkMqB=`%s-7fh!76nBIYWYaeR_%c`j0(dHy`s*;E+yotEVyFQB5oALz8 zy~of9)<&_xE-cCuwYgo4Vk-r2&KlZ^+hck)LCTld~%t~-~`}-ak(UUIi z#pq2>8$=|d2T~BWV*vde$VMuvNcj0k!!=09S_}rq5VRqKe3pq*g!mc5@dt7kZ~-%8 z1nZ3pSq9zyxyWV3C}w4JZUT7b5LDedhYMCkXa8wSD;#s@Sq#(H3Z;ZH0~ rquGaqHsB+COz$KbeL=A=aT0yMi4DKS_c)CoXi>Xdek7;;ia!4U<#rDJ delta 1652 zcmZux>04A)82{b5!##KITw#D2d>A2zeN(4GFhC#?7ZPOAB7?|z@H&jng2Q0YHbRSL zMbT-qoieGcl%jFOv^|T=(ro+CQ~d#b_CrtEdznF`r)Qoy=RNO!e!utJKOIw<%Je@| zrvNO+FB8fkLzY5PIYXI%zmniNE1 z6zF+V`JRN-G8wlBNbJ;GT1H04Qn!QBbfSyl)_J#U2?n~gzCIPVVJn|Z$SvKD9tJlB z&mqu6mr~)u4gm?-BWI^fb;U(p8!80$yTxQGn&YHWe>pj31E;rC0G9 z!$JP5yih!Zaeh(GlipNu7;o`xQ<=RM@2IH5pp2se3_Ubf6?j)4hxhm{Q&!UZ0z{w3 zuizMtGer5ADaSIUPZ8@QthIrVj1Tw)Q@ivjK4TqXmU$uJc`@m71Rd>EcZD&{=+LZi`K;*n?Tr>5l*6*k}by>l;IqGF07QIlb$?bNAYR2%T#JV9wJI?;v1GhZhz`^B8}_QiPnF($JKIiQ62TtbvBC2E$TgK+91 z+=g*2fm}L6l!I`lo5YFACHhX1%|QP7I7N~;gS7-hnef>i(j diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 3baa3f9..5b634c8 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -148,8 +148,8 @@ public class MainWindowController { private String selectedGameTitleID; private String selectedGameTitle; private String color; - private String version = "0.1.3"; - private String buildNumber = "002"; + private String version = "0.1.4"; + private String buildNumber = "007"; @SuppressWarnings("unused") private String versionName = ""; private int xPos = -200; @@ -193,7 +193,7 @@ public class MainWindowController { romTextField.setText(romPath); colorPicker.setValue(Color.valueOf(getColor())); fullscreenToggleBtn.setSelected(isFullscreen()); - edit.setDisable(true); + edit.setDisable(true); applyColor(); } diff --git a/src/application/dbController.java b/src/application/dbController.java index c21f0fe..8316499 100644 --- a/src/application/dbController.java +++ b/src/application/dbController.java @@ -222,9 +222,14 @@ public class dbController { BufferedImage originalImage = ImageIO.read(new URL(rs.getString(6)));//change path to where file is located int type = originalImage.getType() == 0 ? BufferedImage.TYPE_INT_ARGB : originalImage.getType(); BufferedImage resizeImagePNG = resizeImage(originalImage, type, 400, 600); - ImageIO.write(resizeImagePNG, "png", new File(pictureCache+"\\"+rs.getString(3)+".png")); //change path where you want it saved - coverPath = pictureCache+"\\"+rs.getString(3)+".png"; - + if(System.getProperty("os.name").equals("Linux")) { + ImageIO.write(resizeImagePNG, "png", new File(pictureCache+"/"+rs.getString(3)+".png")); //change path where you want it saved + coverPath = pictureCache+"/"+rs.getString(3)+".png"; + } else { + ImageIO.write(resizeImagePNG, "png", new File(pictureCache+"\\"+rs.getString(3)+".png")); //change path where you want it saved + coverPath = pictureCache+"\\"+rs.getString(3)+".png"; + } + addRom(rs.getString(2), coverPath, file.getCanonicalPath(), rs.getString(1), rs.getString(3), rs.getString(5),"","0"); } } diff --git a/src/application/playGame.java b/src/application/playGame.java index 105f4a0..70ee9b9 100644 --- a/src/application/playGame.java +++ b/src/application/playGame.java @@ -16,6 +16,7 @@ public class playGame extends Thread{ public void run(){ String selectedGameTitleID = mainWindowController.getSelectedGameTitleID(); + String executeComand; long startTime; long endTime; int timePlayedNow; @@ -28,11 +29,21 @@ public class playGame extends Thread{ startTime = System.currentTimeMillis(); try{ if(mainWindowController.isFullscreen()){ - p = Runtime.getRuntime().exec(mainWindowController.getCemuPath()+"\\Cemu.exe -f -g \""+mainWindowController.getGameExecutePath()+"\""); + if(System.getProperty("os.name").equals("Linux")){ + executeComand = "wine "+mainWindowController.getCemuPath()+"/Cemu.exe -f -g \""+mainWindowController.getGameExecutePath()+"\""; + } else { + executeComand = mainWindowController.getCemuPath()+"\\Cemu.exe -f -g \""+mainWindowController.getGameExecutePath()+"\""; + } }else{ - p = Runtime.getRuntime().exec(mainWindowController.getCemuPath()+"\\Cemu.exe -g \""+mainWindowController.getGameExecutePath()+"\""); + if(System.getProperty("os.name").equals("Linux")){ + executeComand = "wine "+mainWindowController.getCemuPath()+"/Cemu.exe -g \""+mainWindowController.getGameExecutePath()+"\""; + } else { + executeComand = mainWindowController.getCemuPath()+"\\Cemu.exe -g \""+mainWindowController.getGameExecutePath()+"\""; + } } + System.out.println(executeComand); + p = Runtime.getRuntime().exec(executeComand); p.waitFor(); endTime = System.currentTimeMillis(); timePlayedNow = (int) Math.floor(((endTime - startTime)/1000/60));