From 43a7e2225425eeccf23a7aacd9d74df2f816bd62 Mon Sep 17 00:00:00 2001 From: Jannik Date: Fri, 11 Aug 2017 20:01:43 +0200 Subject: [PATCH] fixed loading error * fixed an issue with loading sttings when no cloudService is set --- bin/.gitignore | 1 + bin/application/CloudController.class | Bin 3302 -> 3320 bytes bin/application/Main.class | Bin 7007 -> 7086 bytes bin/application/MainWindow.fxml | 2 +- bin/application/MainWindowController.class | Bin 43656 -> 43931 bytes src/application/CloudController.java | 24 ++++++++++++--------- src/application/Main.java | 2 ++ src/application/MainWindow.fxml | 2 +- src/application/MainWindowController.java | 23 +++++++++++++++----- 9 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 bin/.gitignore diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..b42b859 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1 @@ +/application/ diff --git a/bin/application/CloudController.class b/bin/application/CloudController.class index ffeaede7457ee47d3225d4c31a3dbeddb6133023..884bd0b10e1cb0f1b98cdb9fa026b1e18b492e72 100644 GIT binary patch delta 236 zcmYk0PY%Ig5J#V?Hd2zN30l;j*ilYk#iA=)2XFv8Ya*eDg`^0HLs*C-IEph^SQsT@ zGnsk6neTmf=i!_OhB-wc4pgm4uW_Rg4vpG4k0vOPV1dpOlNB~=%52CPUEr5b`qU!&`Z&a)a`?7PuVK7JJ?qlNv{<^{Yx9{~UW delta 207 zcmYk0yAAWLVt!O!NGu<6m$V<5uxWlj~=17ARRiW){lp0nlS)$JXCA7|3GLNCq z0QDj+(38%FrbI1t`W0FC)}16GC+tiSN61AkUjGdCXRzsAC9^hlWdhf$-G%^m}C;N0D%M}Ss)B3iwV$%1`s5KKnNiaXeX1GWMDEAXI>U) z$_PaSfr30NJAzOGRHZDwps5zRSc~1Di%S=&rL8Ttlxo$AXwRL2U;U&1ynEic-~G-x z-#Kr2bHXzdofkiO{zU-e=)@^!iaOa=zPX%l0Vi5*2`CvRo%N;%R|raFSrtx&u)?O0X0b zEp}okP6>?1X`@rkvz>*h;#p(AnicEA7=qd!354`u$d2bYzCRpl4zx4}f?8Rw9sLAH z+lr<@B-a-V$^b72yeI=C#l3c%Cpen}5ssz%BDxcV?+SbmgYLL%q}z@ka7tsw`0n%j zomhn*3cM^M&$e^572#kwBE1&{UcrwE$?WW|4o7Ed!FDYoHJDYjPy&7`@H5FQqP|Y8 zM$`2`s3q#eCHz9gWg}+Ku>2CgGIrSu=vCvqeURr8UKe-+zhMfkTk{hNj1py-;c|$S z-wFI)#^Q|tr+39DaO8|Vi?;;+C=*MHOQPaW9BjF-)8`Foy0>HckmAteGvPvbA{K0Tkvy+X@ zrf^8hbCR8$Dme&gao(UW)Z(4q?bq7%KsY4GWlV8p4NDd@ATDGu>}$FsqywucMNlev z4Ba)_mQEQe4K$9qa*8u0*4pL^gt!ZoEohLO09PPd5e#=U)vOH3rqU2WImUHY*3e;s za#6;B7H+QA)=}-#Tb-Cg!v)<%`NrL1dTfNC0?L=2)FVE5OL zsdm;hpYD_1QG!aO*A)l_^r?PX3io{#c?FG;ew*~y&Qj?ff=AZf-0h9}wUFkmkyj^; zrEx4cjVEMD!3#fwsP;v)kj}z8Sl)>O$rvEuoInhS<3z|u@ zjQ-@Jtl5GpW%kx+Yq-lvRkCq&xpBsY0cnPNz-!i}JXA)Cdyw5hUnHMOUow*2MV3bL z8>Q|t(LkE4shLnzXguc0*zQg;_PE`)26WgdV4QSk3~rzmf`W3OM&M;R5gWcw*l-@shMGCVnJW6F)hJpL>37;ki-Zb%t zeq62R-HJZ^dCn*ke>sP1RsFajeLMQ_ZkaXPYU2G8M>;+-@$n+QBZbeVQIZ+MnO@lW z6se5vF-gefEV)feOE|K2qlB&biMzpxWvEGc|Ic}MV!JT0j7%(}i~DJ;OlEl>-TN#} zC_YOQOuElQX*9XQ#1fM}_Z&@CAoZG^*qk9vlOEvQDo2_$=M)sBR9UU8Avv?$qVRdTRGDL_#1BCM3+L1ii;${a+MTIfn6I+S*F zDjn!jR--$nti?)YJyt7Q5L0&IA>|O(C??h_uV9^W84oM3W4&?(8^E7?=Xbk!Nw5Gm~ zzFH-xg?qQI%*sZO9JUQ6ZR(8=a1XKhKi;a6IB!WBeT{i}*~Yvj%o`us1T#k5CN4|L zPP#*Fi&NX;)Y~O>j6*T^_EVg=H9i>2kjeITxL_a^JCKFPF$_DAk6jpz-I#zqD92t@ zVn2`00o36T8u|CD6^9YV5p?1xdeDnU_)lvajx+KE-#x|Gr*Rr50qLrxK}or!AZsE=#Z30 oiOb{U6a{vGU delta 2590 zcmZuzdw3Mp75|;t&Cc%Z4VwoE2{Di;NFF9ZsK`ZLQW2_zDpMP5XL{G~Mvv7VHst7JKC!yPrFByyhX@r_pk65l(qY#1p%|8bJ6VS@ku9q<=dX2jz8j0@*__@{aH>o^4%BkSAkqylwl*A z7k?A@JN_Xz8k1a?@u7}?%QHry6CdF}@}EZ4qzkwra8(7J5(q_NrW+r#*b)hwg$98% zorn{ba3im3Ek* z;Y#ZbhJ#jhK!w63UQHte6)C+->1R*Zsf3WB;%@D#hy~2BS<#?IgNo@k&M%b_a*Ar( z{Y9Ta)cd1m*qT^8#{;4Yfm94o_}c}IqB~?w>ck0S2)-E{d{Z#o5?L8555(B`IT|Nu zyb5!G6`9gynbEL6G&K_K@KPmB(rF^0P|iy&%o21b*73{50U79^y98BHwY->GoK+)e zvhv;;TM}7m&{S2pyJhKsOU~JZ!SW&BV7G^ws9C4E@-APoV;;?yOMR8@M*4yZW}!Uf zD|a=b(@lPP-j|)%NC81DswY$VU72S3Tg+&q*=4z@Rc53WyBcYUprEWy%VLV9fC|qkD`rT<+^#uq7^!I%42E694o0yo=Yort|sKmx{Q3EL939@13f6{ zA&Sd!=@X`YQP3Kd4j-ScUL1>rIxRC<`PKBOpf4%Eyy_jk-VttE%Z^4P9R+-4B=03R zt(SKC2jelxjt33{4#9PwnnL7ts(Aq8-7PY%3?cFN&d($Rx$^0h1(Ka6Mk zF{C+TUmwa#j$)&Y=WHCXG0w(|H}+mm?rr|;-gWFQTwvm|CiCq}2 z5Pb^KhgW#FJL4NRPAb7+$MJ0?*m&(Y-pDv(<3~-7&UgU@=CQi5%3f^DW^`-P2P z_TyYL@7DC;H#2Ut@$PZ_uC5;!lx}Mu{!;18b=tU8<{5|&Z2W7kTK!j@y~dvOz^%@F zQW96j$;oHBkCJYavd4)zz%=agvE=h?a1Qk$mqLeqw8K`li5b#gczI!%QG zQ+RO+6J<`$nD}|j3uAwiwMwVw9r+US_)b<4}w}I+O<4%Xu}cF%CJnEfaO{>qFNnd+5%XbADvndE3^)* z)Rv<=u65x-Z4DmMHX^R=#lxD7HQEV0qMgE{+M9SxJBzj22Uw?F!+M7k8ys#t?hx37 zsT{;K=&C1iH%ov|yG+w)I^V$)xZm%gdpY=O6j3eBfP)>#qdJ-iC!2OsJ>3V5x#CKk z#g|V56BNO?it{>}u3*a*G*_m7hI6y=!B*|oxI8e=mck!-N2E4 zYHU7CbNXmOZD~f-rbVThbiYlDc`|Kk<9f7n$58k%#r9)ZKdox+qxb`Ls!ODYoCNDReO7=~>q$99ax4pd<$YVkC;%x*Mc4;J$; z&JyfJ1pBZ8&!HR7V=e#KY(@{G4)FK_KQH1i4khZf03Ma7>-F;D0L3@ampPBa@B}@< zJ*TmmYrTgI47GJl)$C1p(M^l+n79?Ig)JKSxVx! zbHP=8v*EmknL0J<6w$9?7E6ni2oL#aN3xu_Llv39DJ92gXD - + \ No newline at end of file diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index c3e361ea3d16c7526ca67c5ffe45769c3053762a..d639b9d1248bbbf0eeb40033dde7ff51d8b0f7d6 100644 GIT binary patch delta 8818 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 J*013~{|Df|%yR$$ delta 8525 zcmai330&31_CIrfbLMxs{zUMCc;&JvDtZAyG#5~FK@$bsMQl;Pi(&|d;L`i&wX&=% zEhj7YT{3NP`(2eZTi$CiTWmA4wB?mnn$~MCeP@2ZE11>$;|J!Ns@GfuG{G5A}TSm%UT-!b^Re`GBp4US+F_8EWQ(3-PTqHj4(PCqWz zhkt1Bj}&_o(wy%qo?Tczsb-4KPs#`Twe_ChpBZpB|2G-aA%}iCj#VOG82l7JE#K~! z7X1|iF>20?8vnE~eujUe^Ro=Ra$A2d8vGnTFT3~eBEIK8>ih>ey??Cs6aQH*>R%*& zHTZA*cX_6N3i68vf{Yu`syjCjl_dsQGN`;}u)lorlo}TsfVzRsOD58QWueQl7+nT7 zK|@v!@QH8(n_+}pJs_Jkm&XPSj;-X=IbNp+y^1GJp3HfNI_(Wi#tw4-z_RdE16qQ|g`FHh9n)p!L9GLw4VZFjUd0MZ!%gOuj^XZkB_odap& zf>HVX$2jpC2HL3nLMP@j-~@GX;!q3f@5Fp!%P*hppQLmRGjRAN`*O<5%F0V?Nt+W# zlH9=J8AOeyxeKbQrxjN?aV*gTXHWN6*En%p3MFY&Ep-wvLE~wK)Rfm$__GpKG_Ero z^>{sl79DaWi*N_VI&lJVRL!dNS7#+Uv6vK;HpE0BrL+PoE;*zCKe0?|FiRnm8H869 z�MJMR>V?lETUd5S5}xd@HsBkqWf0vVw_{%8;HaAF^2*8CI?j?421oNb z2Hq@Z4^D`giF4KB2~g-d450-4;c{H1=3lKM{%3P(i8^sDIo`cT&y1d>Wo62Q^#-(uWK|iqxg1^T z4|@PN8(4>r%DqD}oy+kt1GnNf`Q4DzuqO;a5Keqbb{OhS-eEu(2&H3}0WO;|4KQqK zj{y;icb~j*Xs?2&4QOiP2Mh?ese=YI1L1On<8uZ+&uFKrEi$TRPKAE}<#&b?|4Esi zN={EHo>o#@P1&I3{30boMMZPs%d%-+miN$=O#NNx!NUf=hOf)gye{HRd`rh8a%Elu zf15!kd9JBP9?kQJcMW`xy!q0t~@~ zL%vwhJCSQ^b%B&`Yblmjr4OsEnO;jVqq;H8DRkL(Sie|<#??+B`360mI(16aMYxaZmRp8pX0|Xy4Ahb3H0^+@imGat@Q7GlwEDx2=wDSuHLcPRUJ)mo z4o~TxV2DJvlhQ_FgK8@(W>ER^S5kaL8$%?i5mmzN_{^y+RRiq|(Oy;!j}F71MF&H4 z6h3+1@GOz4{7RFDhmT=hWYUPVHr+)}UGxY!S~feqwx+xyJ*T$Xs+NYx64|nPM6xqe z^rrPL`p9)7vP7onZ-@c%;}PzbnPQ+J23PQ)YWk(p$Vyy%o>-*9 zvY5=LgGrrC1U+DgB|^&NF=?%riidUa5CgZhjEZN~q+e5AJbg-e>5R-ALp&mu$=Wf4 z#8R=s5G&=gV;*L8vS{oHwnO$T{FLq688>b$V=v2^qGRlc95#NlIBH-=^zHn0{4xpZ^L zc7f!{VX##EWWYx8GlTYWe|(HQasBHqanXRSIxt99(2@zwjBJ8ZM%?Cy{Q4$>mWawa9f<)(4$n~bxQ8Y;u^n;{U(ZN zdFnBS$dI>AED>>fg09EQ(-V`mM7_0i7oTKa**CmR;joga{?eN42t7&hw>QK$;#@PK zw~G+xLRg9+ez!1RBbH(4P76zK#I7>*CKlF}FgdNn+pLFDnQiFddb4J_o+TeCNoKv} z!II8=fO0aiG~U%Vud3?C+UdGJP{x%G>xh$x-^PbXSZNiR26Z!}6i~Qt{oPfva zGx?zfCV$PM-X!X6kJIGu;eN-&BF!U46>(44sJ;BC0}4GNiXSuiagV6yCyK(u!=w1e zLH?=9KlcbX|8fWaI*Nb0hyTaqzj)B&GWi7$Mj4^InXw23W=C%PUzMINU|2`V^tuVXJ6vYqUAuvzqXJhTAN zUV<>~WpHb+K%906+H0>ux^@`)YOh0%_9hf)M_`=x7Tl!04Rf@2V4?Odtkm9v4cgHF zY}MX}o!T+jr+om=YscY`_92|$E#PM!!)DV2)9qlfIqYWYQP^N3aGd*;_cv>UUj33p>}YIHYVoljEzloY@q^+$eoSF4UW z1$B_*#zEA0-8h&U5*$Je3Fc9w1Pe&8KqlXv6c~}k>!5=hN2xZ^jbl{X(v5|xjUWlt zI!PppD}%LqM@f+zi-L|a6R%YWw~-qf5wwwsjfk+3l14*8auQ*fxR+(j& zVoCd37Rye>;^BYGLmmf8iWE~2eyYcriNr`1vo~utV}kk$L}*NP{U9 zpoA-o3B_OQhIKGSr8Am#{p|-GC4ZG z1GTDw+SovCb*u|XyhGT1*2e#^f%t01*VsME7p|j~xxu%~(TUoP zl)rn4Ij~|6TW#Vd>Mm8XcF)7rxv|Bu7M}2>?RIP-;m6(hBpnXC< zfeN~DuPsrZX1Du8?K7b^m}Uknm5b|TAdawn0+7U?)gPu~~^|4k&d5NtqkBBCcYz&-`|>+ zYAnA8y77fDg5L`h`F&8y7sE_`Kg{J1z`cA4EawlxCcYFN;}63w{sd<|USYnkBdStQ@UynG`|=9^e1-^_aRM_E4K!iMw5*ciTzP2i8S za{dIH(VsubZsAX{1$;YufbU?-_)fNt?_yi{Znm8V+0%Rvdy(&DNBBPWA+Kkr_JnJ*@n?{arN%1Ya@IN;C6Aj2umvj!` z?h=5yE6Y(lMK#YHHVQCyT@21$fbMHdHKz&^rY9zaWgi3@!O9kjxKJYF~xH z{4k8?uR%F~9d6@qzythESjCUPTK*PnTmw!WyYbe4h z#?M0dF>uJ=H|0Z?dURSUN4#!Q8*wd0?qR3pqbr=3qjG0?nx|(;t}Dq6Y+^D zqD*acsP~1{D-HEdsh)@q^-fc7k7#L%_z-aB63{vXoVEDdUP^?@QVaZ+Kr1IAnWjy# z(;#<0m^APs3iQVm=ue<6|CECL8Fb;FLpJ{ca``DJ#erl8$Vv4-fa8nGc7bA;; zVst^8DaP>qVr-F?N@s9DJq`#O*LW}Qq^`~U2ReyGNZA=$Kdm5FTq~|4PkTU$xL({qm)AUq5fj8jS`H3T+~DDhfsl*W z{)KDgQ$O3kzjBRy%Cr6Z8`u8qna{eRJE1v-K@7Se9*vfeflc8m42NDAL9Ru@SZogC z(JjwC6cezW$Y^jP=Q1ZsE;+#rN|H*Gy88qvO_VM%Db$u(E#D1$t?VGPa~BMXT$Q^i zrkI*So=l?^H~n%BF^M<=DuIecC2(5ml`Lh%QjlhIq$v){FT(z%Cu&cI_Jqlp1vg^$ zl4UV5wkJIsJh?XHNvCD)i)I%3Qt8>STg;(z;8bI9ThO`%>;qwVH3hdX1-Bn~vA-3o zM62e-g<=H|C;mapU)As^@qgkL+6)dcS3bV1W0yd$Shu)+ZbZb*y@{AVH^O;ypV&ya zIJX;DcQfxEaff=mhy`>ji!-%WM9Hw_u|o%e3$FnW=0Y1B0x38YGU?mDdh>QwcEQ-t z+#cvH?uKzRcN^#`?jg!SFWVHckSGl@p{=-ARxMBJb6*zs&_caGi$1XWG|d~wOz~hL z-P^=+4}Xdj+Ant7=@DSyNT3HIB;aUhi(};*%UdU}vXs-)RIIj?8+3B4;X7z!xXJB> zVl5fQv?94~MYK#?5y{5O5i6tQs1+UY21?undFzTnti-~O6IMppWWr)(>y`1%=QNri z$QQt=#2C$DFWnwMm2q|RS9jq>+ZrNd zn|GU~WFskwjuK3ZPf5U;&R zvnFnga=f%%uG|=_y&?|D(Hk?gS8W^FOLE0VuXdQ2_HFE}y+-I+8hu^7p*(2*<`p4> z?Q+|OL|L{eUVgd372arnN>IEfS8noZ?~7xyep6@d194n_L+yv+Bbl^0Lpx!c!S>1< zH+x&26vzJ*f|T82vs|;;t9?wO2R3*1eDc>!+qcWt*2T&Zn_9@8b#Ze3rf7L%U4r(7 zc+N`6B)P86+wBy){ZA1Jiqnl5wl_)iWg-4bydb};%Lsh^m!fB`6vYNnm-8@iEk3!N(n4sS%?Jo7LH>5Z} zq&V_&#TQJS$u}R3>vM$;pu^)AT~{j9r{VvhLJw0aQn&n174#+ff2lB(iUnKZ;{VnP zhx+O)pWD)|^_i3?J;KzRrD?`=r`}8NqhBp?YXWo2 xc3X$0^zG|$EO5-%`}Otc{q-Du5P0|~K3u=1uSa~#KGp|Am?K-y)ra!1{{k8ks|5f6 diff --git a/src/application/CloudController.java b/src/application/CloudController.java index 82cd22b..069c45b 100644 --- a/src/application/CloudController.java +++ b/src/application/CloudController.java @@ -133,21 +133,25 @@ public class CloudController { public String getFolderID(String cloudService) { String folderID = ""; - if(cloudService.equals("GoogleDrive")) { - folderID = googleDriveController.getFolderID(); - } - if(cloudService.equals("Dropbox")) { - + if (cloudService != null) { + if(cloudService.equals("GoogleDrive")) { + folderID = googleDriveController.getFolderID(); + } + if(cloudService.equals("Dropbox")) { + + } } return folderID; } public void setFolderID(String folderID, String cloudService) { - if(cloudService.equals("GoogleDrive")) { - googleDriveController.setFolderID(folderID); - } - if(cloudService.equals("Dropbox")) { - + if (cloudService != null) { + if (cloudService.equals("GoogleDrive")) { + googleDriveController.setFolderID(folderID); + } + if (cloudService.equals("Dropbox")) { + + } } } } diff --git a/src/application/Main.java b/src/application/Main.java index 84873a9..e3fddc4 100644 --- a/src/application/Main.java +++ b/src/application/Main.java @@ -75,12 +75,14 @@ public class Main extends Application { gamesDBFile = new File(dirLinux + "/games.db"); localDB = new File(dirLinux+"/localRoms.db"); pictureCache= new File(dirLinux+"/picture_cache"); + pane.setPrefWidth(904); //this could be a kde plasma specific issue }else{ directory = new File(dirWin); configFile = new File(dirWin + "/config.xml"); gamesDBFile = new File(dirWin + "/games.db"); localDB = new File(dirWin+"/localRoms.db"); pictureCache= new File(dirWin+"/picture_cache"); + pane.setPrefWidth(892); } //startup checks diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 9c8f6dc..d61b2d2 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -114,4 +114,4 @@ - + \ No newline at end of file diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index e206102..dc8f343 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -973,7 +973,7 @@ public class MainWindowController { Image coverImage = new Image(coverFile.toURI().toString()); generatePosition(); - + System.out.println("add " + getxPos()); //TODO debug VBox.setLayoutX(getxPos()); VBox.setLayoutY(getyPos()); VBox.getChildren().addAll(gameTitleLabel,gameBtn); @@ -1144,10 +1144,15 @@ public class MainWindowController { } - //TODO xPosHelper based on window with + //TODO xPosHelper based on window with breite -24(windows, Linx = 36) private void generatePosition() { -// System.out.println(main.primaryStage.getWidth()); - if(xPosHelper == 4){ + int xPosHelperMax; + if(System.getProperty("os.name").equals("Linux")){ + xPosHelperMax = (int) Math.floor((main.pane.getPrefWidth() - 36) / 217); + } else { + xPosHelperMax = (int) Math.floor((main.pane.getPrefWidth() - 24) / 217); + } + if(xPosHelper == xPosHelperMax){ xPos = 17; yPos = yPos + 345; xPosHelper = 1; @@ -1155,6 +1160,10 @@ public class MainWindowController { xPos = xPos + 217; xPosHelper++; } +// System.out.println("Breit: " + main.pane.getPrefWidth()); +// System.out.println("xPosHelper: " + xPosHelper); +// System.out.println("yPos: " + yPos); +// System.out.println("xPos: " + xPos); } private void applyColor() { @@ -1227,7 +1236,11 @@ public class MainWindowController { props.setProperty("color", getColor()); props.setProperty("fullscreen", String.valueOf(isFullscreen())); props.setProperty("cloudSync", String.valueOf(cloudSync)); - props.setProperty("cloudService", getCloudService()); + if (getCloudService() == null) { + props.setProperty("cloudService", ""); + } else { + props.setProperty("cloudService", getCloudService()); + } props.setProperty("folderID", main.cloudController.getFolderID(getCloudService())); if(System.getProperty("os.name").equals("Linux")){ outputStream = new FileOutputStream(fileLinux);