From bd0ac373b3c820d3a9a667a8b6d1a5ff85f31dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87elik=20K=C3=B6seo=C4=9Flu?= Date: Mon, 20 Apr 2015 20:45:29 +0300 Subject: [PATCH 01/30] It compiles! --- .idea/misc.xml | 109 ---- .idea/workspace.xml | 607 ++++++++++-------- .../litera/Data/AudioLibrary.class | Bin 393 -> 0 bytes .../litera/Data/EncryptionManager.class | Bin 1702 -> 0 bytes .../litera/Data/LocalDataManager$1.class | Bin 638 -> 0 bytes .../litera/Data/LocalDataManager.class | Bin 7579 -> 0 bytes .../litera/Data/ServerDataManager.class | Bin 1074 -> 0 bytes .../litera/Defaults/Defaults.class | Bin 2795 -> 0 bytes .../minerva/AudioController.class | Bin 3585 -> 0 bytes .../ProjectLitera/minerva/Controller$1.class | Bin 2820 -> 0 bytes .../ProjectLitera/minerva/Controller.class | Bin 14998 -> 0 bytes .../ProjectLitera/minerva/Main$1.class | Bin 1187 -> 0 bytes .../ProjectLitera/minerva/Main$2.class | Bin 1191 -> 0 bytes .../ProjectLitera/minerva/Main.class | Bin 3003 -> 0 bytes .../ProjectLitera/minerva/Note.class | Bin 1243 -> 0 bytes .../ProjectLitera/minerva/minerva.fxml | 1 - .../ProjectLitera/minerva/options.fxml | 2 +- .../ProjectLitera/minerva/options2.fxml | 2 +- src/litera/Data/EncryptionManager.java | 30 +- src/litera/Data/ServerDataManager.java | 68 +- src/minerva/Controller.java | 103 ++- src/minerva/Main.java | 41 +- src/minerva/minerva.fxml | 14 +- 23 files changed, 430 insertions(+), 547 deletions(-) delete mode 100644 out/production/ProjectLitera/litera/Data/AudioLibrary.class delete mode 100644 out/production/ProjectLitera/litera/Data/EncryptionManager.class delete mode 100644 out/production/ProjectLitera/litera/Data/LocalDataManager$1.class delete mode 100644 out/production/ProjectLitera/litera/Data/LocalDataManager.class delete mode 100644 out/production/ProjectLitera/litera/Data/ServerDataManager.class delete mode 100644 out/production/ProjectLitera/litera/Defaults/Defaults.class delete mode 100644 out/production/ProjectLitera/minerva/AudioController.class delete mode 100644 out/production/ProjectLitera/minerva/Controller$1.class delete mode 100644 out/production/ProjectLitera/minerva/Controller.class delete mode 100644 out/production/ProjectLitera/minerva/Main$1.class delete mode 100644 out/production/ProjectLitera/minerva/Main$2.class delete mode 100644 out/production/ProjectLitera/minerva/Main.class delete mode 100644 out/production/ProjectLitera/minerva/Note.class mode change 100755 => 100644 src/litera/Data/ServerDataManager.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 2297392..559d9eb 100755 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,33 +1,5 @@ - - - - - - - - - @@ -42,90 +14,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7306b79..13016ac 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,11 +7,28 @@ + + + + + + + + + + + + + + + + - - + + + @@ -29,53 +46,49 @@ - - - - + - - + + - - - + + - - + + - - + + - - + + - - + + - - + + @@ -84,48 +97,91 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + @@ -296,101 +353,93 @@ - - - - - - - - - - - - - + + + - - + - - - - - + - + + - - - - - - - true + + + @@ -429,31 +478,18 @@ - - - - - - - - + - - - + + - - - - + + - - - + + + + + + @@ -662,9 +722,11 @@ - + @@ -677,23 +739,16 @@ - - - - - - - - + - + @@ -701,18 +756,17 @@ - + - - + @@ -722,22 +776,24 @@ - + - + + + - + - + @@ -745,7 +801,7 @@ - + @@ -753,32 +809,31 @@ - + - + - + - - + @@ -786,32 +841,31 @@ - + - + - + - - + @@ -819,32 +873,31 @@ - + - + - + - - + @@ -852,32 +905,31 @@ - + - + - + - - + @@ -885,160 +937,132 @@ - + - + - + - - + - + - - + - + - - + - + - + - - + - + - - - - - - - - - - - - - - - + - + - + - + - - - - - - - - - - - + @@ -1046,7 +1070,7 @@ - + @@ -1054,47 +1078,74 @@ - + - + - - - + + + + + - + - - - + + + + + - + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + diff --git a/out/production/ProjectLitera/litera/Data/AudioLibrary.class b/out/production/ProjectLitera/litera/Data/AudioLibrary.class deleted file mode 100644 index 00473d098daa6892526bb06fc507fe9e897574da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmZ`!Jx{|h5Pg^CgND$ig#od#6_D`4R)mB=Oc4yA?oMjJl}V6EkovQjkQn#@{3yiP zFccvy`R?Akd++Rz&$o8~N7zcy!zjTx!6qR-*0pX=2))VPj1ZnRb43^yx>lFnL#gbI zEDbZ`qN${rNvj?HA;b1wKM{5cqg!RAIG3#yr`=pPg)XhM%PBiP8o4BlCdEQNOQ9Qa zp^cjQWw%@r2ERLm^t$P6rQ93~SN#s1M}`m)Vf(+Ogxs$(vc3~nN zLc}p?NZxD6g`V&%Qhlb41uI=nnDBd2SF(Tng*H_8T$5fB*BxUjSC{Qyf!x6vbC@M6s;maSW4K ziDESl1#2q4mi{Mk==es?p2o3`4He(UF@a}MJXi6ZbZyFroQk}PErAK!wY+ZIcUta_ z-4z&nofC*`IIiPA69}c!2LejIRksBaCC9b*j*n`#S21f%dXlAay=SZbM)pReEE-GmWO{HjJKgJw57Td6v^Y zv^{}a!R~t_V9+x1ft$#&j%|6i9}t=yj_I^*%P3!Lm$_nmqA!A7zo;d7U0y-Ty_CHg z3-2vEP>v9Slqbr*X}#Sw+kp~Po~}AmQQiyOM1TD;Q*^^>_SKG;TgRSdZ#z=k=@H46 zq&gaAa9dz%vrsk)`JA!8lP|CCoAo*+)KI`Sm6ve?QAP=CxP@unEg>Y@3xUa@6FnI< zyhKsM_t?=;!mf%v4X?1@556LRh99n}YIAF=xJP*X>a}Y45kc;Xz}^3ClcB?}YHw`I z7Z`8Ye$nmtrfX5C^nbR^K!ZVJ%%ooDMsGIgad`& zj-$V~yl9ST2{T$A`?JkIggwOWs(7X(tr2r@p3QQd2C~Mmggn43Uy3O{A_8%F`J5@7 zvy*7=aAj~59K)G2h+jAv!zZ+nz?s0OoNK)Re1^MR#qc@q(IXF^5KQ5?lpH%psPq9! z^;d+Gku#{fS!MAQv25lP@l%YSL)&|JQp%p~uQ13EYnZ_@^E{SMGa0Nh?;0bXu==NXgpErK zB)1-e+kFOUGFS{4EM8);Jj~#&WDv!}!R7rNs1MY1{m*DMq`#|F75%VM4eL&&8qqtI zs;U<&)u^255q*v=sUDG0#8EkR(?ZRc80jr88^9F IqHhewzugme`~Uy| diff --git a/out/production/ProjectLitera/litera/Data/LocalDataManager$1.class b/out/production/ProjectLitera/litera/Data/LocalDataManager$1.class deleted file mode 100644 index 0f80db0798247dabe1187d94c705036f9c5d0eb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 638 zcmaJ;$w~u35PhA+(PT6xnz-*C5(P)Wi$uH_1tG?R;z3WHNgG=x)6&xleuv;!c=4j( z!4L4G#Og`F<&c5tT3^+xs?V?Y4*=U($smP^3??zwR_H#xt0-wdlZI3?*}}J1euHVKpLUBSL23z zG0tkoJmhVmSGTIvmHWQ9H4OQ3{f6IjPb%+F2BKQIpx~7XT0%37{EabWPSu_Eh0SCr z{;#}YD-rjD&<|83!}hT-*Q(`U&c!?yTnxZ*u;^k5%MA1VNivMa!~!0+y_4pR@QH2V zH&oX(R6M(hOM{)ug7TN#s;W olajy>_$daLx(PinrD7C$f+bOi^T#kwGKC^a)Ch#JG5ZaE0|jb{B>(^b diff --git a/out/production/ProjectLitera/litera/Data/LocalDataManager.class b/out/production/ProjectLitera/litera/Data/LocalDataManager.class deleted file mode 100644 index 914d1ccc45b384a340d18cac6d638a92c56a1875..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7579 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 HU+lpzoxZJR diff --git a/out/production/ProjectLitera/litera/Defaults/Defaults.class b/out/production/ProjectLitera/litera/Defaults/Defaults.class deleted file mode 100644 index b8e34cb17b4cec2856ad3eac10216eb95f1e7a07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2795 zcmZ{l_jl7)6vwX;lPHT3po}gjT|f(NCQzKTvMt*pvYgs-LZGcH%g?bAMM`Cv0Ns1< zJ?Z|v@I%k(Iqe_NKdPr+Sx)?D=t-peKHqoWee3$_?|=UIi-;!a*M90Jx0lvMda955 z$m^p9`9Z50v@Qm%jb6IcOP2*2*kHEluCaMznF%zkt{4}Mm~A-Av7+x;&hi<7hLWz+ z@D0abFzhB1=}KpmYBhX;_FlNzumOi{Xs*vRV-16z#-O$kPBoA$>E&cTmy@)VNY4l~ zn9R>Fb(Ci@@w`;j<&N|moJv|M-%*~2QjmG&1%d8Rw4z+l%h`NEIiJ^bNi7#jDi`NP zY*bQ}j8<0VG`EPC1lkwsNmj_G_MCvlE%VQFdXvYeK3iptIZ zwm^GY9Yy6lxA}K)WQn|*>P+=+Fg;F5Np`gNFc?QI7gR;#2EUK(7WINMC+pclzLd#! zMtmU9L99*AK-YrkYMwj557C>Dl5;oj{YaqQDLE~bRK1+YgkuFd+{&ujrC7sc4vVcD zmgC2guI+kA$}Ru&mjCYd(acK)DN~TC^4%gh-!l zS0_dKe7ia&(ihv+X_3A}BDb#K+_`cwC#kAPU*QfyX;b-Hp#GN9_V@-rmlo&blv2ux z^zEjDDit!aNZ)lrw3VyeJZ8_)Q?^rh)ff#8zRTsu%f!Sv{ z4d(fE*R!r*(T43cgEJmjX*PVTcG+e%L>Ouleqy*SBvqR|Yq^f@P3KzEwoz!ph$YAM zstl8a<$q78=6S8ha;k_ZP_Ntc!`48}_0|l(V!P%lwo=2A9DEwu&4zU)*g(a#tH?i` zt!x(u68QS)d7 zAKZR?nvc^V8lXW!Tu>M71S5UXK16#seHgr#;rJ-{7{~X6AK*ARhZ7vfzz=df1|H{l0zAp_ z6nL8Bli*Vvp9Vj~@fmQO;~DTQ#}9)a;aCErlCbN%#$oE~?|*(-M2gLOV!uIM52M!ir>X4L(f~C`kFppVYO~J=|Tq mPLXT0<2vFaloPPm(Cq7sJ diff --git a/out/production/ProjectLitera/minerva/AudioController.class b/out/production/ProjectLitera/minerva/AudioController.class deleted file mode 100644 index 7945e75093ff617b35063acef0a59aa3b74f6549..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3585 zcmb_fS$ES`5dP#OmT?3LW(#Wr1nPtkg?$NIHXzg?fFa;O7sXZ*C9)JOIV`0+-RVwu z=)S%7oHkH;=;>1*diu~`)YI=uvSSj5^3Vs*y>~Qswr^%6|M}0I-vDgI4^gZ|&m645 zktiNPLhO14IVwn>Aje{q>=#c@#~`6UhL9i?f>fekh@6Y!Q9KsK<9I^IX;BO!Eh7`f z0_ZY^qF96;L55|FL@*}9j366<6@eYWcocOwUyU3bA>+!(%b1XHK|)1NPfJ*t7}X}U zp^K`M)-7F4+m@TNO|>KMy0+COVd;syS0mE)#%iHqaf;}XK@5!-fj2_buo%pt?%ex7$vHEi`D&%6`fV_1f}k3Pj4`zh9G zXDC*aFf9FOK0B!APHMC*4BBbU?ALOJI0wv1cf_DGOA}d&=O#3@J)be`PCpP+&ryF= zs5dmzxJ)G*;=XxHchyrT5^eq|?;56hLU-(ZF0FUutqdI#zSN4?gqy;&h`Z>1;l6}9 zx!@k%ST?&l2@6dvJDAZLrrc@Ryp_dLq$b+pgp0wDDfu9kDY`O&Cws;!2H-r)sfR z!P9s~!LxXdjOY1#fxoN#y{KR#T4cPW;AOlb<5jV~rr>p4lktXvH}MuLtI!2r9+=8u zUBTO60Co2~5pe_=Qt%Gml@Oopc|-R_SGOD@$xE)zY}d@-C_NTyw$s!cM`!U=d-56;Q_YIEfX_q||#NzdHPoZc0-dkRXv&@_z%#QAM8ICVn86RlmQ2Q94(EhaAE>v}t zqwQ06{)i@8O~Us0to_^QwN$a}Jq?GwYofQSX}QnxTSmgFa^?!c!l^a5A;?WZJ`?0~ z2`fy4_-JaE=4z@pV#KajvseX$Euv*I9xxJ`gV|9ST}7Xd+AimX-}{A!tg1rtr>2pF z`O|cWDH9pi-K0pYgvIeR#G5O;&;!?`q$mBgQEQZNhL|YKaGqmsDiiSwG}bmWXF{P%N|SBlIGz zrYRyW)#BG;TjKx+tuta@=o{CqF3xV7<-e|ou0OAW0H@_$#uo~{#5W2Kim}iwNS7e( zg6zRw32UZW%djTwFo3(}9=gs_=3>@gQ&3-^jIz|XX8JaPVD2dTLHH>E4MjyC;-P{kxFxK>vBYgMp@ z1HK%rp{6^C0F#&_gn5V-4plr<7Y<<_l)^#gVXk+W@~}n7GHnqCTFb=MF=_QoS)A{| zZS=bXZRkTM&fydcob@89_q`1wq2JhvU0!sf*iHFRZAcV-5S_{BLbS1#j?Vi7^TZ*=yUZwd~n%{Ik^Q^=}gf~P$N4bjs qU3L6_WMC=2!ngRE>v8h8qKc4K5Ym(EIDdDhxJwmx1I680ocb4@jZWME diff --git a/out/production/ProjectLitera/minerva/Controller$1.class b/out/production/ProjectLitera/minerva/Controller$1.class deleted file mode 100644 index 5678d3001199c60e741a80fb9b1881486f037aff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2820 zcmb7G>vI!T6#s1#*mS$l5TOOcTCmWxrQNh30HOiGYY1Wk#SBzD<)z% zFTOJ|%!==`f_Wi^i!z>z;dvP^DA*x1wc|wr^OAx~U^21_S)t3w$>1_BOW5em8E#if z!q)V>VR2`HX%n{PIkstXXPEdShGlr8655lE1bSv9L?`SVm(ZG~{b!2vS?-);S(7M< zw5>C9hB<~m=%$Rv z^s7^>5PG~hW8^L76&(u6rS&+mF>t-IdW!Ju|Bh4WjT*F&BG4x5$v$OG8cg_Ek~UnA zQ(BGGYznhLI7Z3XMMvi+43V6z)ifUv!6C|VOE+zoa%PHqb2gPoUd0>?6_21x#a>)d zaTTVDc~~lJ6lA=t!htKpQ&Gf%iV_x8T*Gx0ui#Y`uiV?^H&ncZn=;;3@eU~8 z+t;Sgc+oI(+>sE^*?MuFTi!s)F+85^R`D+0lMw0d8CLN=ZmReIA5vjbhUM&%gkAT` zF)B1x%o%pt$U4lqCSkitpbpcHF^_3uH7pe$;bRq_;8Pj5RD33^jIXs)ML!0pSJbzP zuEAB}K?Ei276|u^71dHb8pTSq9fO(1b&6GAkhL0}R69SN4okY|8KySPT|cPfMJs3W zVUaSCq+j4n*SSlrEk(`k9?k0_=?TS#gjhV;v(kso*d7--6Y>WIKiRkk)@K{JefdxV zM?#Csy_4R&8LYO2=c#Q|!scDI!SP#z2-6g^SYD(?%w-EaK-f~X#5c63<|wJu5XHGF zP)+pVi$YG$b1y*I)5wl{d0lz4wwnApDi8O4k_Cvs}QgPQ|K~cvhR`*%^bE z$lu$;gsJ06XePUlTY0)=gdL4h0zToikZ{%ETSM_R4SQ!JWy>mBOq=C|*;I>EZmdw? z7F|RA4Slw@P{ML1Lt>sCv>b;GouV~eTB#j$M2KWIzG`0m&=*50ok-U#4kp#6L;t`gV zLKGW_x77PJqzWQmptFK#u-H(>Mp{%L&k91Mg4k?-1kT_h_ zKimLXX#OJ|g#Qo%FbW?IFEyd*A)H|L>dMvA@kO$KTH%$oyvB%)IyJy*F>( zya{jq=f%TBv`oHMPEU(fT&(8eJ$@8ta;?En-C_;b8o5}ji6);|=cjUU7Pr^?L^FTS z_K6MrZSjd#{%-V%HvYEz#3uf3_K6PuZt;n8_`8*hZCsqoMWtlHiHSj7y#xX3Rq zW_%Us0F6rmq+7Mi0#s?$-WQ#{+-tXff_cQDP zO*~jm=ZJ?i@e!YRn8!Zi7mtd^n1{!i-bb0<6F%`Vp8X_C=qaCg+9y8l6VLd>vp%t3 z6VLg?^O|_UPgjU+*_nwWP%vTr2gI;n9274y{16u}`NhlPuqIydQ$noqiC6jinqPcE ze9|Xg=fcaQG)d5c-%}j#*9?T zOre=d55>$aiA1c+ND4Z+e-YXu?^+NyS%Sb%S@Fur(Sn-3bh6?lXE^8Th*twRR(J3JT_< ziy1?SOggm29l_FooK5DvBMgPata+#8&vUfJ!?s4vy_hyOoitLt8|}Fa6jWwLqUi*b zJvD#&Ub8E-&Fpe!GQo{TpSi^xOs|WYu}A@*4n21S2v#V9j+`p7Y$oost0HF11X>TM zGSRQh#~CuAJCQVdpvHKlF%e57+oRzI=5zZu&W<1SQp_-OH zSWj}m2yq*8CdKj1muz#|?1MeKb{dAn&9GuK)Yb)K8Zcn{JO}g3JEA>tBb`YC`3i^0 zqtB>ULqahl-V^G8(Z+k~Rs)L$>9@l^1Wj%UC;CFEOgse8o@knN!aYnXnriIDL=(Dz zi=}b1co!!XV{4-+W(qxJ_0f1Vy;@L7&AhFGN*faqpdHhKWpB*%b(zU6Jdn3*B5cIA z8p$ZPZD47-H;Sc?ccs*5xqz6-yWh{4qu7=gVgCFYYbkLv9Xe-oOP$rqq@%IWW;2z@ zB*V~qJQ6eOn2joS3hSZ}8>lkJtO|BEA!k0;m$c`B1Isu=#n1_=>_{8oJ*`H+&2?EK z-ZU6Z!`^$$v~9!8IJAzn)XXcCxgZ~GvxA+Vpt<%+yhb`eSCFB0sJ_(VvMKmesS(bR`CrZlFM)V|&o$jzWqW{RJL6mM|hMM#{0@F6Bkn znP#L5GJs-XYl-AmBbI?rTyFyRB5OIW7wht(Aog$O(HE;`4Om2!YsqAjav zBE;HMx-IQS&DE#V1IfpXzOINdD`z#cmYe}MGJ?NoydUmvgE`bR0EsD#qfD*}8sTV1 zj4V#!bWC$8C_JGCwRv;sUC&q8T^#3%;^5^_q&cvJ6>08ODnM{heCTP#!OO6zcxSXg z$?WDPD=UB++%web!R9MXCK3?I1ZRYGdbS(v+t58Kl~(>^yxY%h_!!G~NVW`Xu4S}M zgJDy--a5n=#hE)5{+w0Y*qcbe&v=bQ;bsG{`@ldkZ7(ejhQx}EUW{!}Xfm*vB2Z|# z2o!p%c6DzF$g-K%L?&hC3}D2`Sumz3a%j5B(K8z?+ z9i#pZb(XQQ!`tTASj4B7PM@LA>hx)PL#MCMS9SU|{YIzn&|5lvkG`+dce%Eoo`aOs zVW*Cm2ItgnN+vlFYwjLg8I4rCp*TYA>fl}@6~yrnjK(iO>|sV$2E)B(cux?qVUT0% zAn(lJTw5`V*k809(|c!)JPnjn9pzZG||L?kt)OjcIO z(PK0@rb?9QvPzECWI&hW8PJnC1&XIWO<4%g9iPL4g_1aA;u5L7A(LKQpIN}pMu}po) zg4Tx^-RkGU=Fx-K`%4qa}M=OBDxKcvg8 za+@yCm7Tb!Sl$F-zv~GQ+2`$IgqsDIcN~jFF6^*D6s}qq#T8MyAO@T@Eq)B6+bc-zzWC<)u9LGKO6)-)Emw?%C?OJK&z=u9elk zNS#-U_!i>1uLoBJt9AMZ{Sy&Lb)8PH(I*5=T-ZIhFgI|ay0WYcYV!TMyh1kV@=E$X z?0~QSs!ONe(mR;OQZI~!b$OM%8ezo%XIRw1r^#z{d9A#Tx99b`yn)v-&YtWIlW}cx zpt;~!lQ-(}CV8_iZ;`j+iieB?-{y7s0oml4pb}yoTr!p0booJfyDslw#ucd%QME^q zBV%P<-YGw%%e&-feIgIWnp&2b7!-#O=_%X?%Q!h8jWZQFU1rS>$f&B~)_ z@?KruC+`PWo>WXw8JZc<&mL0uH5J^r zM&k*{pjBMSo8mplK5+0?Jan`A5q6#I8 zx;D0XM@yvmxc7Wuqd<5M1EyH?=f1fHo6&QqZ&_ z3_G`f9Euy7I(KQwbC+9m(VH6!Emoa)G!mUkA<%ClPDqr8C!?yvXS5;*wl0Zuwo1L74L1+qdc;piiqxEKNn}JakM}2!;B%8lDO=AQ z!x_QpPP}HMjgSgF)}q#G#Nni{MqkPpQ2B0^Idgn2qpaim@o00<3}@0N5{6b<@dQ(m zn5rku3o~Xay$v55+}z?Yql$dkk)2yBS#LGIGSzCQf;e|?!_sq9w2!5+IcV*Pk&1y z-UI7Vw%Ufsa9qCia5r|05BSeYnkKT`Y-np>*m>cn6+~iT2zmMp2y}yOUY_{XPN=J+ z)*4@TRH5gYCD0oE{U&Fr7Z$VH0z?L9eKibWnZw}G9zVK+3cfRne{Nh!@#wr9!qq}Jbmm+ zvE$W7@G$2XD$K%)q^lwv)2_WAQ&5y+aC6~3blW%M;p2MvP>_EQBq5 z`9(OC8>fOuJE883QW3v5ShUV+1-2ePQoRYjVnHJI*oirPdk0&g@V00?!s91-2C0=; z9c;~vunqfnEneCZa5l4Z9C}CE63#uhRANz$R;Y>RI%jKH{$mJ-ZXeto9+n|*%f2zQ z9S@MO2AEnOC|mcKd@%NEKM#t*l}(J8sVLsi-TWoH-b_l92X*d)hsY|8L`0bj{!Cg9LyEKjhTLKS3|Z6y7?P?5FeEDrU`Seyfcg2sLFomV zHuQZ%)xSx8&dI7eo*{^;Ci5c%+H)`lZxSeffK~`!f$yl=161~`8vZs)RyI*J9YLvE z1L%kJBeVqln0|s1lS>AuluBR`SMMinAC0elo_udmlUy8XWq2pAiu?&sVoW^oARyd8*(Ky3t ztVE-Z8}&f23XRoH<2`7c=?t5WMuXFsoTW8cYCJ@1J7J(rSz3p=Vm~pXXYru*05@+# zarQR0-V$Q#eTZsMZl_7K1IyV-O>`d0^C?BU=z7{s4^o(hDT1wJ($A=u{)eJsJY68> z(;l&g`b8UED7H{W7&IW_v{zhAgW_5m5_ix=;vu>O^e+{kpv%Np>2mQS{IcOYbdC5I z-6ehWgq%QGSxs-q5PezJ(_6Bc-j-YGr%2NNS6(bC^#(dPQQSw{Uz2>MWZK8^!}l8`jxwZS7HzHpQ-z)WIqM*FH0M;)RLuEK!$0fl8aDs z8O`(r|9{|!3j5Os9!r!6H*16vQ!w&z$LN&wtnJAatYeStc`&t&{`W@$S< zQ|)T$lfYxy&KyXW#3KAEZV10-y99DtNzmhnA8u^8wo~$)}N5sC(?fEgYE63g}GB#k#C zck!0GcGs5Lz5*f-?99@6SvnucM{{$R+pOZ|ZnqiWrr|cnbF<5BPUL3TYUY$yjU|!T zK%+zp6xK>J#YS3+tKRYHdxq(PVcOHtSqebR3m64Jp9e5Z@tj#sq)}jM2Y$zSC!H+LqmVeCR-v5}UIYD$ z{tcq#*yaDR8QF$e%*Z?}6#uYc4pE}>0QCnh%u*8cQuqYYD6*8v(tz4RUJZq*MnpVB z=Fxu{UzOz8)FyHnbjjwq9NG|B+MA`peFQ7qJWNA2=pbDrX&*t}B{pQ3E@o%e>~Ut+ zWBQVIE&XvOeH62uD;rKrS6c*jtF5TIntC0XXMCdlTE}PsOCO1r%AEfvF zALxCTDiNW~hOOu5&2j0?ap~b&VAFdE3T3~u6ZBSP>HV+L6|DG7Gy%IWIFicmm zey`5y7t^kBOyJtw5T*U=ES%Tpj+dzjj|fp$1>&wTh`ClE=GsEv#9{Mo#j$ehIB=|h z30w(3O9lEW>>Udbg`2d`uXsIJVdWPEMl2Il(!-Dq`q*im}` zzkgDJkaP?lv!~#hK8TlY7M{h*440J|E-Mp9vJ$jd!L7??@He=h;Hh{rnot9 zOO|duKp$v@XTR-L`ryVxbUSv<9V<(xl2vUg-(pY*CTpvQb`4V6+Bg{CA;NTUEeI27;!%6=s zwVKrs{8%`hF`^1WoIV| zCMKV#74vOOxg^E&G>SuY&z%ID_6Q($l0q!tBt?}^EJO%jnBgeRMUKqnhzy52IV2X_ zlc%duL^$6{c&>Givgd-#65I|fGIh3nX|>a~BO))(rM3GsixALhxLCXed-sWDxL#O@ z7TcbnthN(Zm}4NKXV-3-T|D<5mdfZyCTZ_823*6csw-y%(dv4OLWyF9D8+2OaP4^ zjGz5c#%C`rJ(R>=I=eGF^E|UNv%h|S{{dhbl@u&I&?0MM5IGZh6ik?yH!+8YT3yhp zt<|D|l1bM^14{;$4LlM^w`C)9?7K(O|6B`YT?vd;4`o|^{A34OwAPC*7?YY|cYpk)ykg z{Sc4RN++sRT*O^IjY06fNTk!ciU3!ZlrOE1|51$b^g4GHBqGajzHkbWpFc$+{}p{- zc$C06wl_@+ZVQLE;R_!WsJO-!QP-vl+Bq zp)IxBqZ*1bnPqMnWckQ@l(}=t9HwvwBE3$^=?>)*33XzreBmd|GhFRK#zD2h_eVD diff --git a/out/production/ProjectLitera/minerva/Main$2.class b/out/production/ProjectLitera/minerva/Main$2.class deleted file mode 100644 index 9e10c039b8248e53fdd77cc567e248b5ba05f931..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1191 zcmah}TTc@~6#k|ytX&5v7eQ1+vCy(bmYdgdwO}-9@u7yu^3-*;})pTE9+2e5+eG$eAoF*}#f{M*^9as%KAq_eA+0tD&lCfsyjDYN_`h?0|JUvK9q;!y`AyE(r9O zPh3y?EoE1f>+#8|>$%~&z;yod(N#dRdjhFaM95{shLYu*(HwSNO^}0GnKz!cC@E$*E?;7cBRn_^iE5AVUdIA z(YzIy{Ex4|*acj4#f~x3Rk!A;u;~-&ZiHjkl~=Rh92{#WEOwB)uDyyv^jAAa!PNn- zQ#xj~(exet(&d!WT7OsR3*_o?nQ zRzB4|u4?z3ac7cwUd@^gtB$X=_bxJRlSw&_4rmA$XbcDc8n#(-80zE`PcBVcphJR4 z<+m@x?#FoXFCbEHU$ujp~k(c3l| ze@xfNl#Yq|qc|*zt$-PN=rLjLf-r{(+=a+&5#eN;aGB^hth8150rMQ!W618nHh}J&LnS1l0Lrym*ogd diff --git a/out/production/ProjectLitera/minerva/Main.class b/out/production/ProjectLitera/minerva/Main.class deleted file mode 100644 index a8e2b7b3317f0873e7f4c02acdfd45a6e60be39c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3003 zcmb7G`BT(p7=D64mXHx#5i6w@Tdc5H1N73;S{1Nr7o~uAtqr>$OEjBc5)gV?+uHlS z@B2P%JMGHoOs7A0`Zsm@d`Vyf#ZJ4-eEGgN@AH1ody+r?y7(J_8}VZe+OSV9gBsd# zw}v4Mr!b;nKMrU(h(jt4r*K5WQQV{ASoOB2iQ}(&+u7g4jfPs>D_o?rgS>_mgo-f@&C#Kdre;yxmr}vGG`65uD^zk$^cdEY4a;#vhf@N*(2NYEHx_P0XE^9er z?__aQcq8VhO-VZI=1lv5=~?m|3oCboE`;LeqegMYIR%oggIr7 zO&b&xgfT4F9(j*G;aNq~n+YWf8kW){8_#uVX4U-LoN$COXnMj4c#YOSof8v*j)nlkHk|_R^em?kURr5-1=3x)#A~{2o5j(**&0%B?b@Q?szvM%T29_Q z-9IHSmp)XSW?Y))xrH7kbx6?6<%I9Ic6N3%f^7@K)Yr~LR7`iurK_ylC3VX{zFx5i zC~3AGZFg|lROGKMV9`xK3A{Vq|tw4CDigP-i#8dQZf%>on$@`wx@eH2T@f@Dl z@q%1lgh4aOQfcjynlI^i8LupU)ve=IDXrhZ8t?K9tj?W|~wU=*1 zeqA{-VIeD68@pysOxRY=l$B;|FYn_}MRhh`i@Z|8BI&+S88Zc`f(XK1B&MxBQJ$fY zwOm)m#Co-a3<*C>t%7T!Vq93$ksU__#{Qu!jWou5WnPV)hX%4)*USr#ondoRHZq4u z5{a17$b3G_Eld6!9V1pC3vAU=OxO-h<#tIFPETK->=lU*OJl)M2=zj7G!&>bU^%;l zRTyW?D%(P6Z6rNt<%4kw{c-oSg7u4fVqq7S=gbO%_c;UZq%Q_NwxVDZ*3J_ZvX_mp zqj#B3-WFcSBLV93%tAqM9)FH6lGGDOLgY05QbF~2XhcqqD6$-U3B|c9*wG=YuusKH4bDi4jI)Uffj1I4Jo&ISn zQ1O+HukoFZ?byM(Di^QiOt~k8kqw6_JJuXCbAjv4D5x!#Pbz+(t*q;woSabbXR@MV z15vX_A@f@!&7MTx#A7`nSpXcFnGi|!|Nb(%^53z^zKJdOnzlX64ECrv&+`07K$h|+ z9xzc)FJKt^jdd)ncK+wD;2-CBxZ_agGX+Hsb*`N}ZO1b1fV#{DEXyqa6%}$(ehL9y zT$fXUuThB=s6iUtJn0bxH}ES5+~0(od5tvpJIzb|dov|ermIS*o`p)`Ku5Z!1g+x| zY7cL0fZl-R7f@fqijD@POK9L@RSBy*O1NU9~NV60YQ-IXqld!rG3DxEd&- zrOYnF4&s0y7_ zGaHUEo#zR!Aef((;dON(ypb|MWqf1??L!qJFmocRLUqgFvSIo$WJ*~?8aydRx zMO8(7$RfKW_%a+8fa&`H9jahLGkiAj+$=rhZ%y>TH~1dk@-)t~#9Gujfs?TR25)-G A@Bjb+ diff --git a/out/production/ProjectLitera/minerva/Note.class b/out/production/ProjectLitera/minerva/Note.class deleted file mode 100644 index f30bf3fa36b47a4de0ab9e0f24edffbe615f3ca3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1243 zcmZ`%OK;Oa5dPNA%ZZzWl7zIhK+7YE8)^#NK)qB&MT!Dat0Hl8k|lMO*p=h*_)i=F z5g~El2k@g1Gi$4f68EyRJ3HTFX7}&E-+ur+$Fn>PJTj0&gO{d(7A)TF@Y3exaTdE- z*aA7v4`tUGOM%tSx%1JnM~*kNkHf(AhA-&;EF6!zR3lJuCx>1?_;L}-fq-}~U@-W= zANhg6xx6UB0&AfCyH{2I!G?z7(Gp$pB)PX-B52cRl z$?oO2Cxa8GH&U+szB4*?0+-KmG8LY=6M&Z{it}vWOSDLM5s|2Q^8CY+&XijFFi`(Cbk=G2X6j#sYl|S|`gT8#_a>E9*@A6Zb zSj7_)c@#{TC}go`;wj1|Zt${#qKOj9BtJg|f%5E`-}KI9KNKLF)OVdPl1vGt-yOX^ zIm8xy9fST@8XC*ePGe;iNl!(RRFOd|gm(B!aiFodC`*Dz_8C_Y=YCMetrC_<{2G F@IS3;#LEBx diff --git a/out/production/ProjectLitera/minerva/minerva.fxml b/out/production/ProjectLitera/minerva/minerva.fxml index 4c4f221..c32872c 100755 --- a/out/production/ProjectLitera/minerva/minerva.fxml +++ b/out/production/ProjectLitera/minerva/minerva.fxml @@ -73,7 +73,6 @@ - ')"); + } + @Override // This method is called by the FXMLLoader when initialization is complete public void initialize(URL fxmlFileLocation, ResourceBundle resources) { @@ -93,7 +108,6 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) assert underlineToggleButton != null : "fx:id=\"underline\" was not injected: check your FXML file 'minerva.fxml'."; assert strikethroughToggleButton != null : "fx:id=\"strikethrough\" was not injected: check your FXML file 'minerva.fxml'."; assert insertOrderedListToggleButton != null : "fx:id=\"insertOrderedList\" was not injected: check your FXML file 'minerva.fxml'."; - assert insertUnorderedListToggleButton != null : "fx:id=\"insertUnorderedList\" was not injected: check your FXML file 'minerva.fxml'."; // Editor and Pane assert noteListScrollPane != null : "fx:id=\"noteListScrollPane\" was not injected: check your FXML file 'minerva.fxml'."; @@ -119,7 +133,6 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) underlineToggleButton.setOnAction(event -> addStyle(Defaults.UNDERLINE_COMMAND, null)); strikethroughToggleButton.setOnAction(event -> addStyle(Defaults.STRIKETHROUGH_COMMAND, null)); insertOrderedListToggleButton.setOnAction(event -> addStyle(Defaults.NUMBERS_COMMAND, null)); - insertUnorderedListToggleButton.setOnAction(event -> addStyle(Defaults.BULLETS_COMMAND, null)); // Listeners for Style buttons editor.addEventHandler(MouseEvent.MOUSE_PRESSED, event -> buttonFeedback()); @@ -244,8 +257,8 @@ public void changed(ObservableValue observable, String oldValu editor.getEngine().loadContent(currentNote.getHtmlNote()); editor.getEngine().executeScript("document.write('" + currentNote.getHtmlNote() + "');"); - JSObject win = (JSObject) editor.getEngine().executeScript("window"); - win.setMember("audioLibrary", new AudioLibrary()); + //JSObject win = (JSObject) editor.getEngine().executeScript("window"); + //win.setMember("audioLibrary", new AudioLibrary()); noteNameTextField.setText(newValue); } @@ -268,13 +281,6 @@ public void changed(ObservableValue observable, String oldValu loadLastNote(); } - // Saves the current note on exit - public static void onExit() - { - currentNote.setHtmlNote(webPage.getHtml(webPage.getMainFrame())); - LocalDataManager.saveNote(currentNote); - } - // Returns the string version of the page private String getWebViewContent() { @@ -334,24 +340,5 @@ private void buttonFeedback() underlineToggleButton.setSelected(webPage.queryCommandState(Defaults.UNDERLINE_COMMAND)); strikethroughToggleButton.setSelected(webPage.queryCommandState(Defaults.STRIKETHROUGH_COMMAND)); insertOrderedListToggleButton.setSelected(webPage.queryCommandState(Defaults.NUMBERS_COMMAND)); - insertUnorderedListToggleButton.setSelected(webPage.queryCommandState(Defaults.BULLETS_COMMAND)); - } - - /** - * @param c Color to be converted - * @return String containing Hex representation of the color - * @description converts the Color object c to a Hex representation of th color - */ - private static String colorValueToHex(Color c) - { - return String.format((Locale) null, "#%02x%02x%02x", - Math.round(c.getRed() * 255), - Math.round(c.getGreen() * 255), - Math.round(c.getBlue() * 255)); - } - - public static void addAudio(File file) - { - webPage.executeScript(webPage.getMainFrame(), "document.write('')"); } } \ No newline at end of file diff --git a/src/minerva/Main.java b/src/minerva/Main.java index 1bf7d38..a86f401 100755 --- a/src/minerva/Main.java +++ b/src/minerva/Main.java @@ -1,21 +1,23 @@ package minerva; import javafx.application.Application; -import javafx.event.EventHandler; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; -import javafx.scene.input.MouseEvent; -import javafx.stage.Modality; import javafx.stage.Stage; -import javafx.stage.StageStyle; -import javafx.stage.Window; import litera.Data.LocalDataManager; public class Main extends Application { private double xOffset = 0; private double yOffset = 0; + + public static void main(String[] args) throws Exception + { + LocalDataManager.setOS_FILE_PATH(); + launch(args); + } + @Override public void start(Stage primaryStage) throws Exception { @@ -24,35 +26,24 @@ public void start(Stage primaryStage) throws Exception primaryStage.setScene(new Scene(root, 800, 600)); primaryStage.setMinHeight(576); primaryStage.setMinWidth(720); - primaryStage.show(); - root.setOnMousePressed(new EventHandler() - { - @Override - public void handle(MouseEvent event) - { - xOffset = primaryStage.getX() - event.getScreenX(); - yOffset = primaryStage.getY() - event.getScreenY(); - } + //DragMove support + root.setOnMousePressed(event -> { + xOffset = primaryStage.getX() - event.getScreenX(); + yOffset = primaryStage.getY() - event.getScreenY(); }); - root.setOnMouseDragged(new EventHandler() { - @Override - public void handle(MouseEvent event) { - primaryStage.setX(event.getScreenX() + xOffset); - primaryStage.setY(event.getScreenY() + yOffset); - } + root.setOnMouseDragged(event -> { + primaryStage.setX(event.getScreenX() + xOffset); + primaryStage.setY(event.getScreenY() + yOffset); }); + //End of DragMove support + //Stage Closing event handler primaryStage.setOnCloseRequest(we -> { System.out.println("Stage is closing"); Controller.onExit(); System.out.println("Closed!"); }); } - - public static void main(String[] args) throws Exception { - LocalDataManager.setOS_FILE_PATH(); - launch(args); - } } \ No newline at end of file diff --git a/src/minerva/minerva.fxml b/src/minerva/minerva.fxml index 4c4f221..b3c2848 100755 --- a/src/minerva/minerva.fxml +++ b/src/minerva/minerva.fxml @@ -1,13 +1,14 @@ - - - - + + - - + + + @@ -73,7 +74,6 @@ - - ')"); + webPage.executeScript(webPage.getMainFrame(), "document.write('')"); } @Override // This method is called by the FXMLLoader when initialization is complete @@ -133,6 +132,7 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) addAudioButton.setOnAction(event -> { try { + addAudio(); FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../litera/Multimedia/audio.fxml")); fxmlLoader.setController(new AudioController()); Parent root = fxmlLoader.load(); @@ -205,16 +205,16 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) addNoteButton.setOnAction(event -> { noteListScrollPaneItems.add(LocalDataManager.createNewNote()); - noteListScrollPane.getSelectionModel().select(noteListScrollPane.getItems().size() - 1); + noteListView.getSelectionModel().select(noteListView.getItems().size() - 1); }); deleteNoteButton.setOnAction(event -> { - LocalDataManager.moveToTrash((noteListScrollPane.getSelectionModel().getSelectedItems())); - noteListScrollPaneItems.remove(noteListScrollPane.getSelectionModel().getSelectedItem().toString()); - noteListScrollPane.getSelectionModel().select(noteListScrollPane.getItems().size() - 1); + LocalDataManager.moveToTrash(( noteListView.getSelectionModel().getSelectedItems() )); + noteListScrollPaneItems.remove(noteListView.getSelectionModel().getSelectedItem().toString()); + noteListView.getSelectionModel().select(noteListView.getItems().size() - 1); }); - noteListScrollPane.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() + noteListView.getSelectionModel().selectedItemProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable, String oldValue, String newValue) @@ -257,6 +257,7 @@ public void changed(ObservableValue observable, String oldValu // Start up of the program populateNoteListbox(); loadLastNote(); + } // Returns the string version of the page @@ -266,7 +267,7 @@ private String getWebViewContent() } /** - * @param command some commands are located in the Defaults class + * @param command some commands are located in the Defaults class * @param commandComplement Color commands may go here * @description adds style to the selected text. It is a low-level function. Not much to say here. */ @@ -292,7 +293,7 @@ private boolean populateNoteListbox() noteList = LocalDataManager.getNoteNames(LocalDataManager.getLocalNotesFilePath()); } noteListScrollPaneItems = FXCollections.observableArrayList(noteList); - noteListScrollPane.setItems(noteListScrollPaneItems); + noteListView.setItems(noteListScrollPaneItems); return true; } @@ -303,8 +304,8 @@ private boolean populateNoteListbox() private boolean loadLastNote() { String lastNoteName = LocalDataManager.getLastNote(); - if ( noteListScrollPane.getItems().contains(lastNoteName) ) ; - noteListScrollPane.getSelectionModel().select(lastNoteName); + if ( noteListView.getItems().contains(lastNoteName) ) ; + noteListView.getSelectionModel().select(lastNoteName); return true; } diff --git a/src/litera/MainFrame/minerva.fxml b/src/litera/MainFrame/minerva.fxml index 2efe4fb..5c80455 100755 --- a/src/litera/MainFrame/minerva.fxml +++ b/src/litera/MainFrame/minerva.fxml @@ -1,8 +1,7 @@ - - + @@ -10,7 +9,7 @@ style="-fx-background-color: #99B4D1;" xmlns="http://javafx.com/javafx/8" fx:controller="litera.MainFrame.Controller"> - @@ -33,7 +32,7 @@ - + @@ -45,6 +44,8 @@ + + @@ -63,33 +64,105 @@ - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + diff --git a/src/litera/Multimedia/video.fxml b/src/litera/Multimedia/video.fxml index a479ec6..9e0dbda 100755 --- a/src/litera/Multimedia/video.fxml +++ b/src/litera/Multimedia/video.fxml @@ -4,7 +4,8 @@ + prefHeight="40.0" prefWidth="119.0" style="-fx-background-color: #99B4D1;" xmlns="http://javafx.com/javafx/8" + fx:controller="litera.Multimedia.AudioController"> From 0a23fe0cb4acc5d6cee18736084335f3b658395f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87elik=20K=C3=B6seo=C4=9Flu?= Date: Thu, 23 Apr 2015 17:11:37 +0300 Subject: [PATCH 09/30] Delete and Recovery to be implemented soon --- src/litera/Icons/20px20px.png | Bin 0 -> 591 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100755 src/litera/Icons/20px20px.png diff --git a/src/litera/Icons/20px20px.png b/src/litera/Icons/20px20px.png new file mode 100755 index 0000000000000000000000000000000000000000..34044db411135b4103281f2ae5e50d5f5401d664 GIT binary patch literal 591 zcmV-V0Ni$|NuX$~rw{Catotaa&bI-Zw`99})&i9<#P>__8h>%iRk0ZE< z{n(a6zT+*%F%c27{WX1QC`n3bGp4Oh_C&;|qN7pF4r}qXkkLK7!w)QG|2|yBI?P}g z-F}vhQg)+wgDwUmVxcOnl+plxVhb)s#H0SVfl}<1tS9ThAR-nqnavZ$Z)Lz8S^r+e z{hh%xoGLn-rJ$*-H!g>iD?5kNMRvfNVqmM)`hv?CX|-DaI-Sm|D!@*sQ)@T!4owVZ z`$gtnU+&^QW~*pckUtU8?H~CyM$xMXypf-UWdIwQ@CTYT1n-vYX69&7dYCWx8^xlG zVMERCJ#4~tv`blCz(jtZv%;MyS1{XWaRB$QB+Qh+ZKBydD zIq+fb6!?he_<&!z+S@Z<+l7I Date: Thu, 23 Apr 2015 17:13:20 +0300 Subject: [PATCH 10/30] New icons are here... --- .idea/workspace.xml | 231 +++++++++++++--------- src/litera/Icons/Microphone-03-16 (2).png | Bin 0 -> 1108 bytes src/litera/Icons/Picture-Frame-16.png | Bin 0 -> 1108 bytes src/litera/Icons/audio.png | Bin 0 -> 386 bytes src/litera/Icons/bold.png | Bin 0 -> 1108 bytes src/litera/Icons/italic.png | Bin 0 -> 1108 bytes src/litera/Icons/orderedList.png | Bin 0 -> 12053 bytes src/litera/Icons/picture.png | Bin 0 -> 242 bytes src/litera/Icons/strikethrough.png | Bin 0 -> 6917 bytes src/litera/Icons/trash.png | Bin 0 -> 1257 bytes src/litera/Icons/underline.png | Bin 0 -> 1108 bytes src/litera/Icons/video.png | Bin 0 -> 183 bytes src/litera/MainFrame/Controller.java | 14 +- src/litera/MainFrame/Main.java | 38 ++++ src/litera/MainFrame/Note.java | 7 +- src/litera/MainFrame/minerva.fxml | 2 +- 16 files changed, 184 insertions(+), 108 deletions(-) create mode 100755 src/litera/Icons/Microphone-03-16 (2).png create mode 100755 src/litera/Icons/Picture-Frame-16.png create mode 100755 src/litera/Icons/audio.png create mode 100755 src/litera/Icons/bold.png create mode 100755 src/litera/Icons/italic.png create mode 100644 src/litera/Icons/orderedList.png create mode 100755 src/litera/Icons/picture.png create mode 100644 src/litera/Icons/strikethrough.png create mode 100755 src/litera/Icons/trash.png create mode 100755 src/litera/Icons/underline.png create mode 100755 src/litera/Icons/video.png diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 71abc9e..7a743ef 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,12 +6,22 @@ - - + + + + + + + + + + + + + + - - @@ -38,8 +48,8 @@ - - + + @@ -49,6 +59,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106,12 +155,13 @@ @@ -236,6 +286,28 @@ - @@ -710,13 +794,13 @@ - + - + @@ -745,58 +829,16 @@ - - - - file://$PROJECT_DIR$/src/litera/MainFrame/Controller.java - 118 - - - - file://$PROJECT_DIR$/src/litera/MainFrame/Controller.java - 119 - - - - file://$PROJECT_DIR$/src/litera/MainFrame/Controller.java - 120 - - - - file://$PROJECT_DIR$/src/litera/MainFrame/Controller.java - 121 - - - - file://$PROJECT_DIR$/src/litera/MainFrame/Controller.java - 122 - - - - file://$PROJECT_DIR$/src/litera/MainFrame/Controller.java - 124 - - - - file://$PROJECT_DIR$/src/litera/MainFrame/Controller.java - 123 - - - - @@ -805,18 +847,6 @@ - - - - - - - - - - - - @@ -1155,14 +1185,6 @@ - - - - - - - - @@ -1176,8 +1198,8 @@ - - + + @@ -1200,16 +1222,24 @@ - + - - + + + + + + + + + + @@ -1221,28 +1251,43 @@ - + - - + + + + - + - - - + + + + + + + + + + + + + + + + - - + + diff --git a/src/litera/Icons/Microphone-03-16 (2).png b/src/litera/Icons/Microphone-03-16 (2).png new file mode 100755 index 0000000000000000000000000000000000000000..dc602a5cfa8b04e94d3578b3443df1c6d4784387 GIT binary patch literal 1108 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 literal 0 HcmV?d00001 diff --git a/src/litera/Icons/picture.png b/src/litera/Icons/picture.png new file mode 100755 index 0000000000000000000000000000000000000000..f5950d4bf6f590692b4df38c973c0cc6ff30a1e7 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngd!2~4hUtHV)q!^2X+?^QKos)S9a~60+76UaL24TkI`72U@g6*Czjv*SscY6)_Tm%IiHi|3?D&S!+V!VFw z#aE%NhZyf1Q2lZ$HgZz$o4iNc|A&57(>H!#bl&(~Q1$z@TfO()con6c%%dohJZE-e zv0jV8bN{>5;azopr053XR!~g&Q literal 0 HcmV?d00001 diff --git a/src/litera/Icons/strikethrough.png b/src/litera/Icons/strikethrough.png new file mode 100644 index 0000000000000000000000000000000000000000..754fe43e37f280ca1b728c354770bdf5166138a8 GIT binary patch literal 6917 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 literal 0 HcmV?d00001 diff --git a/src/litera/Icons/underline.png b/src/litera/Icons/underline.png new file mode 100755 index 0000000000000000000000000000000000000000..5f5ea2c57e0d61f07c4ecd95b1ca941ce8318fe8 GIT binary patch literal 1108 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKV3GE8aSX8#WE5a|{~IVen1G9m zOPZ6D(|;Itc6L4)6ci){QpK5C9G^pvE|m7)TDMMwmouYAO@Z6?>tEyah(vX(0PANGvZej|rv@ zFC85n&F1dzo&(gp7N~J8kevtg1_xeERFeeyw*+Ww6&}oo*D|29zk>Xa2g~6#fbNpz Wd&{rnPhW5rWU;5KpUXO@geCw-eTcpQ literal 0 HcmV?d00001 diff --git a/src/litera/Icons/video.png b/src/litera/Icons/video.png new file mode 100755 index 0000000000000000000000000000000000000000..097356df08e3b57d631421918d958fb3c0be94cb GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngd!2~4hUtHV)q!^2X+?^QKos)S9a~60+76UaL24TkI`72U@fmdKI;Vst01j+BJ^%m! literal 0 HcmV?d00001 diff --git a/src/litera/MainFrame/Controller.java b/src/litera/MainFrame/Controller.java index d16ef78..1c91553 100755 --- a/src/litera/MainFrame/Controller.java +++ b/src/litera/MainFrame/Controller.java @@ -56,6 +56,8 @@ public class Controller implements Initializable private ColorPicker foregroundColorPicker, notePadColorPicker; @FXML private WebView editor; + @FXML + private ContextMenu trashContextMenu; private ObservableList noteListScrollPaneItems, trashListScrollPaneItems; private boolean isChanged; @@ -110,12 +112,13 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) String[] trashNoteList = LocalDataManager.getNoteNames(LocalDataManager.getLocalTrashFilePath()); trashListScrollPaneItems = FXCollections.observableArrayList(trashNoteList); trashNoteListView.setItems(trashListScrollPaneItems); + trashContextMenu.show(Main.getPrimaryStage()); }); optionsButton.setOnAction(event -> { try { - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../litera/Options/options.fxml")); + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../Options/options.fxml")); Parent root = fxmlLoader.load(); Stage stage = new Stage(); stage.initModality(Modality.APPLICATION_MODAL); @@ -133,7 +136,7 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) try { addAudio(); - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../litera/Multimedia/audio.fxml")); + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../Multimedia/audio.fxml")); fxmlLoader.setController(new AudioController()); Parent root = fxmlLoader.load(); Stage stage = new Stage(); @@ -170,7 +173,7 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) addImageButton.setOnAction(event -> { try { - FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../litera/Multimedia/video.fxml")); + FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("../Multimedia/video.fxml")); Parent root = fxmlLoader.load(); Stage stage = new Stage(); stage.initModality(Modality.APPLICATION_MODAL); @@ -197,7 +200,6 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) Color newValue = notePadColorPicker.getValue(); if ( newValue != null ) { - webPage.executeScript(webPage.getMainFrame(), "document.body.style.backgroundColor = \"" + colorValueToHex(newValue) + "\";"); borderPane.setStyle("-fx-background-color: " + colorValueToHex(newValue)); notePadColorPicker.hide(); } @@ -230,10 +232,6 @@ public void changed(ObservableValue observable, String oldValu * While evaluating this statement, the note gets loaded into the currentNote object.*/ currentNote = LocalDataManager.getNote(newValue); editor.getEngine().loadContent(currentNote.getHtmlNote()); - - //JSObject win = (JSObject) editor.getEngine().executeScript("window"); - //win.setMember("audioLibrary", new AudioController()); - noteNameTextField.setText(newValue); } }); diff --git a/src/litera/MainFrame/Main.java b/src/litera/MainFrame/Main.java index 9af57ce..a9c6c26 100755 --- a/src/litera/MainFrame/Main.java +++ b/src/litera/MainFrame/Main.java @@ -11,6 +11,7 @@ public class Main extends Application { private double xOffset = 0; private double yOffset = 0; + private static Stage primaryStage; public static void main(String[] args) throws Exception { @@ -18,9 +19,43 @@ public static void main(String[] args) throws Exception launch(args); } + public static Stage getPrimaryStage() + { + return primaryStage; + } + @Override public void start(Stage primaryStage) throws Exception { + Main.primaryStage = primaryStage; + Parent root = FXMLLoader.load(getClass().getResource("minerva.fxml")); + primaryStage.setTitle("Project Litera"); + primaryStage.setScene(new Scene(root, 800, 600)); + primaryStage.setMinHeight(576); + primaryStage.setMinWidth(720); + primaryStage.show(); + + //DragMove support + root.setOnMousePressed(event -> { + xOffset = primaryStage.getX() - event.getScreenX(); + yOffset = primaryStage.getY() - event.getScreenY(); + }); + root.setOnMouseDragged(event -> { + primaryStage.setX(event.getScreenX() + xOffset); + primaryStage.setY(event.getScreenY() + yOffset); + }); + //End of DragMove support + + //Stage Closing event handler + primaryStage.setOnCloseRequest(we -> { + System.out.println("Stage is closing"); + Controller.onExit(); + System.out.println("Closed!"); + }); + } @Override + public void start(Stage primaryStage) throws Exception + { + Main.primaryStage = primaryStage; Parent root = FXMLLoader.load(getClass().getResource("minerva.fxml")); primaryStage.setTitle("Project Litera"); primaryStage.setScene(new Scene(root, 800, 600)); @@ -45,5 +80,8 @@ public void start(Stage primaryStage) throws Exception Controller.onExit(); System.out.println("Closed!"); }); + }public static Stage getPrimaryStage() + { + return primaryStage; } } \ No newline at end of file diff --git a/src/litera/MainFrame/Note.java b/src/litera/MainFrame/Note.java index 13a3afd..1d30dc2 100755 --- a/src/litera/MainFrame/Note.java +++ b/src/litera/MainFrame/Note.java @@ -8,7 +8,7 @@ public class Note { private String noteName, htmlNote; private boolean isPasswordEncrypted; - private Color noteColor, notePadColor; + private Color notePadColor; public Note(String noteName, String htmlNote) { @@ -42,11 +42,6 @@ public boolean isPasswordEncrypted() return isPasswordEncrypted; } - public Color getNoteColor() - { - return noteColor; - } - public Color getNotePadColor() { return notePadColor; diff --git a/src/litera/MainFrame/minerva.fxml b/src/litera/MainFrame/minerva.fxml index 5c80455..85c1a54 100755 --- a/src/litera/MainFrame/minerva.fxml +++ b/src/litera/MainFrame/minerva.fxml @@ -37,7 +37,7 @@ - + From 41394db3a146f5e2c170dae571a4ca1c5401d8f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87elik=20K=C3=B6seo=C4=9Flu?= Date: Thu, 23 Apr 2015 17:13:46 +0300 Subject: [PATCH 11/30] New icons are here... --- src/litera/MainFrame/Main.java | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/src/litera/MainFrame/Main.java b/src/litera/MainFrame/Main.java index a9c6c26..ce3fe22 100755 --- a/src/litera/MainFrame/Main.java +++ b/src/litera/MainFrame/Main.java @@ -52,7 +52,36 @@ public void start(Stage primaryStage) throws Exception Controller.onExit(); System.out.println("Closed!"); }); - } @Override + } +@Override + public void start(Stage primaryStage) throws Exception + { + Main.primaryStage = primaryStage; + Parent root = FXMLLoader.load(getClass().getResource("minerva.fxml")); + primaryStage.setTitle("Project Litera"); + primaryStage.setScene(new Scene(root, 800, 600)); + primaryStage.setMinHeight(576); + primaryStage.setMinWidth(720); + primaryStage.show(); + + //DragMove support + root.setOnMousePressed(event -> { + xOffset = primaryStage.getX() - event.getScreenX(); + yOffset = primaryStage.getY() - event.getScreenY(); + }); + root.setOnMouseDragged(event -> { + primaryStage.setX(event.getScreenX() + xOffset); + primaryStage.setY(event.getScreenY() + yOffset); + }); + //End of DragMove support + + //Stage Closing event handler + primaryStage.setOnCloseRequest(we -> { + System.out.println("Stage is closing"); + Controller.onExit(); + System.out.println("Closed!"); + }); + }@Override public void start(Stage primaryStage) throws Exception { Main.primaryStage = primaryStage; From 1912b69b85a7cc13477af6fafd012c7acb45365c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87elik=20K=C3=B6seo=C4=9Flu?= Date: Sat, 25 Apr 2015 13:07:27 +0300 Subject: [PATCH 12/30] Trash dem all --- src/litera/Data/LocalDataManager.java | 13 +++++++---- src/litera/MainFrame/Controller.java | 19 +++++++++++---- src/litera/MainFrame/Main.java | 33 +-------------------------- src/litera/MainFrame/minerva.fxml | 4 ++-- 4 files changed, 26 insertions(+), 43 deletions(-) diff --git a/src/litera/Data/LocalDataManager.java b/src/litera/Data/LocalDataManager.java index 717d5e1..4376e26 100755 --- a/src/litera/Data/LocalDataManager.java +++ b/src/litera/Data/LocalDataManager.java @@ -20,6 +20,9 @@ /* * change log: + * 25/04/2015 + * Trash was finally implemented. + * * 23/04/2015 * New comments were added * Shortened some of the code (Thanks to my RubberDuck) @@ -317,14 +320,14 @@ public static File addAudio(File file, Note n) * @return * @description moves the selected notes to trash when the |-| button is clicked */ - public static boolean moveToTrash(ObservableList selectedNotes) + public static boolean moveNotes(ObservableList selectedNotes, boolean isMovingToTrash) { - directoryExists(OS_TRASH_FILE_PATH); //creates the trash directory if it does not exist + directoryExists(isMovingToTrash ? OS_TRASH_FILE_PATH : OS_NOTES_FILE_PATH); //creates the trash directory if it does not exist for ( Object s : selectedNotes ) { - System.out.println("Trying to delete: " + s); - Path source = Paths.get(OS_NOTES_FILE_PATH + s); - Path destination = Paths.get((OS_TRASH_FILE_PATH) + s); + System.out.println("Trying to move: " + s); + Path source = Paths.get((isMovingToTrash ? OS_NOTES_FILE_PATH : OS_TRASH_FILE_PATH) + s); + Path destination = Paths.get((isMovingToTrash ? OS_TRASH_FILE_PATH : OS_NOTES_FILE_PATH) + s); try { Files.move(source, destination, StandardCopyOption.REPLACE_EXISTING); diff --git a/src/litera/MainFrame/Controller.java b/src/litera/MainFrame/Controller.java index 1c91553..e48d763 100755 --- a/src/litera/MainFrame/Controller.java +++ b/src/litera/MainFrame/Controller.java @@ -9,6 +9,7 @@ import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; +import javafx.geometry.Side; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.*; @@ -58,6 +59,8 @@ public class Controller implements Initializable private WebView editor; @FXML private ContextMenu trashContextMenu; + @FXML + private MenuItem recoverMenuItem, deleteMenuItem; private ObservableList noteListScrollPaneItems, trashListScrollPaneItems; private boolean isChanged; @@ -110,9 +113,17 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) // Button Listeners for Bottom Toolbar trashButton.setOnAction(event -> { String[] trashNoteList = LocalDataManager.getNoteNames(LocalDataManager.getLocalTrashFilePath()); - trashListScrollPaneItems = FXCollections.observableArrayList(trashNoteList); - trashNoteListView.setItems(trashListScrollPaneItems); - trashContextMenu.show(Main.getPrimaryStage()); + trashNoteListView.setItems(FXCollections.observableArrayList(trashNoteList)); + trashContextMenu.show(trashButton, Side.RIGHT, -20, -20); //show the trash menu on left click at the correct location + }); + + recoverMenuItem.setOnAction(event -> { + LocalDataManager.moveNotes(trashNoteListView.getSelectionModel().getSelectedItems(), false); + populateNoteListbox(); + }); + + deleteMenuItem.setOnAction(event -> { + LocalDataManager.deleteNote(trashNoteListView.getSelectionModel().getSelectedItems()); }); optionsButton.setOnAction(event -> { @@ -211,7 +222,7 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) }); deleteNoteButton.setOnAction(event -> { - LocalDataManager.moveToTrash(( noteListView.getSelectionModel().getSelectedItems() )); + LocalDataManager.moveNotes(noteListView.getSelectionModel().getSelectedItems(), true); noteListScrollPaneItems.remove(noteListView.getSelectionModel().getSelectedItem().toString()); noteListView.getSelectionModel().select(noteListView.getItems().size() - 1); }); diff --git a/src/litera/MainFrame/Main.java b/src/litera/MainFrame/Main.java index a9c6c26..b4305f6 100755 --- a/src/litera/MainFrame/Main.java +++ b/src/litera/MainFrame/Main.java @@ -9,9 +9,9 @@ public class Main extends Application { + private static Stage primaryStage; private double xOffset = 0; private double yOffset = 0; - private static Stage primaryStage; public static void main(String[] args) throws Exception { @@ -52,36 +52,5 @@ public void start(Stage primaryStage) throws Exception Controller.onExit(); System.out.println("Closed!"); }); - } @Override - public void start(Stage primaryStage) throws Exception - { - Main.primaryStage = primaryStage; - Parent root = FXMLLoader.load(getClass().getResource("minerva.fxml")); - primaryStage.setTitle("Project Litera"); - primaryStage.setScene(new Scene(root, 800, 600)); - primaryStage.setMinHeight(576); - primaryStage.setMinWidth(720); - primaryStage.show(); - - //DragMove support - root.setOnMousePressed(event -> { - xOffset = primaryStage.getX() - event.getScreenX(); - yOffset = primaryStage.getY() - event.getScreenY(); - }); - root.setOnMouseDragged(event -> { - primaryStage.setX(event.getScreenX() + xOffset); - primaryStage.setY(event.getScreenY() + yOffset); - }); - //End of DragMove support - - //Stage Closing event handler - primaryStage.setOnCloseRequest(we -> { - System.out.println("Stage is closing"); - Controller.onExit(); - System.out.println("Closed!"); - }); - }public static Stage getPrimaryStage() - { - return primaryStage; } } \ No newline at end of file diff --git a/src/litera/MainFrame/minerva.fxml b/src/litera/MainFrame/minerva.fxml index 85c1a54..0e056a6 100755 --- a/src/litera/MainFrame/minerva.fxml +++ b/src/litera/MainFrame/minerva.fxml @@ -44,8 +44,8 @@ - - + + From f4b7469a5221158d43fdc252dc72eed9c8fb6950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87elik=20K=C3=B6seo=C4=9Flu?= Date: Sat, 25 Apr 2015 15:58:24 +0300 Subject: [PATCH 13/30] Colors! --- .idea/workspace.xml | 417 +++++++++++++++----------- src/litera/Data/LocalDataManager.java | 83 ++++- src/litera/Defaults/Defaults.java | 3 + src/litera/MainFrame/Controller.java | 6 + 4 files changed, 329 insertions(+), 180 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7a743ef..b9d3b08 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,22 +6,10 @@ - - - - - - - - - - - - + - - - + + @@ -45,13 +33,17 @@ - + - - + + + + + + @@ -59,31 +51,50 @@ + + + + + + + + + + - + - + - - + + - + + + + + + + + + + @@ -154,14 +165,14 @@ @@ -201,7 +212,6 @@ - @@ -237,54 +247,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -304,47 +266,7 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -352,6 +274,7 @@ + @@ -389,6 +312,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -735,7 +771,8 @@ - + + 1429551929907 @@ -773,34 +810,45 @@ - - - + - - + - + - + @@ -808,6 +856,7 @@ + @@ -831,14 +880,15 @@ - - @@ -861,6 +911,8 @@ + + @@ -876,7 +928,6 @@ - @@ -884,9 +935,7 @@ - - - + @@ -896,7 +945,6 @@ - @@ -921,6 +969,10 @@ + + + + @@ -955,6 +1007,10 @@ + + + + @@ -989,6 +1045,10 @@ + + + + @@ -1023,6 +1083,10 @@ + + + + @@ -1042,6 +1106,10 @@ + + + + @@ -1061,6 +1129,10 @@ + + + + @@ -1087,6 +1159,10 @@ + + + + @@ -1136,17 +1212,6 @@ - - - - - - - - - - - @@ -1157,23 +1222,10 @@ - - - - - - - - - - - - - @@ -1181,7 +1233,6 @@ - @@ -1217,7 +1268,7 @@ - + @@ -1226,9 +1277,6 @@ - - - @@ -1240,17 +1288,6 @@ - - - - - - - - - - - @@ -1267,10 +1304,6 @@ - - - - @@ -1279,23 +1312,53 @@ - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + diff --git a/src/litera/Data/LocalDataManager.java b/src/litera/Data/LocalDataManager.java index 4376e26..894a4fb 100755 --- a/src/litera/Data/LocalDataManager.java +++ b/src/litera/Data/LocalDataManager.java @@ -10,7 +10,6 @@ import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.Arrays; - /** * the Local Data Manager class for Litera. Manages local data & encryption * all functions are made as efficient as possible. prove otherwise, and your code will replace mine :) (please do it) @@ -51,6 +50,7 @@ public class LocalDataManager private static String OS_NOTES_FILE_PATH; private static String OS_TRASH_FILE_PATH; private static String OS_OPTIONS_FILE_PATH; + private static String OS_STYLE_FILE_PATH; /** * @return true if operating system is supported by Litera @@ -73,6 +73,7 @@ else if ( osName.indexOf("Windows") != -1 ) //what if we changed user.name to us OS_NOTES_FILE_PATH = OS_FILE_PATH + "Notes/"; OS_TRASH_FILE_PATH = OS_FILE_PATH + "Trash/"; OS_OPTIONS_FILE_PATH = OS_FILE_PATH + "Options/"; + OS_STYLE_FILE_PATH = OS_FILE_PATH + "Style/"; System.out.println("Default OS FilePath: " + OS_FILE_PATH); System.out.println("Default note directory FilePath:" + OS_NOTES_FILE_PATH); System.out.println("Default trash directory FilePath: " + OS_TRASH_FILE_PATH); @@ -108,6 +109,35 @@ public static boolean saveNote(Note n) } } + public static boolean saveNoteCSS(Note n, String hexColor) + { + try + { + directoryExists(OS_STYLE_FILE_PATH); + FileWriter fw = new FileWriter(OS_STYLE_FILE_PATH + n.getNoteName().replaceAll(" ", "_") + ".css"/* ,true (to append)*/); + fw.write(Defaults.COLOR_SCHEME_CSS_1 + hexColor + Defaults.COLOR_SCHEME_CSS_2); + fw.close(); + return true; + } + catch ( NullPointerException nullPtrException ) + { + System.err.println(nullPtrException.toString() + " :cannot save a null note. How did it even get here?"); + return false; + } + catch ( Exception ioe ) + { + System.err.println("IOException: " + ioe.getMessage()); + return false; + } + } + + public static File getNoteCSS(Note n) + { + File f = new File(OS_STYLE_FILE_PATH + n.getNoteName().replaceAll(" ", "_") + ".css"); + System.out.println(f.exists()); + return f; + } + /** * @param n the Note object to change the name for * @param name new name for the note @@ -152,16 +182,63 @@ public static boolean deleteNote(ObservableList selectedNotes) { try { - Files.delete(Paths.get(OS_TRASH_FILE_PATH + s)); + delete(new File(OS_TRASH_FILE_PATH + s)); } catch ( Exception e ) { - System.out.println("Permanent deletion error!"); + System.out.println(e.toString()); } } return true; } + /** + * credit - http://www.mkyong.com/java/how-to-delete-directory-in-java/ + * + * @param file + * @throws IOException + */ + public static void delete(File file) throws IOException + { + + if ( file.isDirectory() ) + { + + //directory is empty, then delete it + if ( file.list().length == 0 ) + { + file.delete(); + System.out.println("Directory is deleted : " + file.getAbsolutePath()); + } + else + { + //list all the directory contents + String files[] = file.list(); + + for ( String temp : files ) + { + //construct the file structure + File fileDelete = new File(file, temp); + + //recursive delete + delete(fileDelete); + } + //check the directory again, if empty then delete it + if ( file.list().length == 0 ) + { + file.delete(); + System.out.println("Directory is deleted : " + file.getAbsolutePath()); + } + } + } + else + { + //if file, then delete it + file.delete(); + System.out.println("File is deleted : " + file.getAbsolutePath()); + } + } + /** * gets note names as a String[]. Checks if the application directory exists before trying to retrieve note names * @return the String[] which contains notes or if the note directory doesn't even exist, returns null diff --git a/src/litera/Defaults/Defaults.java b/src/litera/Defaults/Defaults.java index 095e650..f338320 100755 --- a/src/litera/Defaults/Defaults.java +++ b/src/litera/Defaults/Defaults.java @@ -30,4 +30,7 @@ public class Defaults public static final String FOREGROUND_COLOR_COMMAND = "forecolor"; public static final String BACKGROUND_COLOR_COMMAND = "backcolor"; + + public static final String COLOR_SCHEME_CSS_1 = ".list-cell:filled:selected:focused,.list-cell:filled:selected {-fx-background-color:"; + public static final String COLOR_SCHEME_CSS_2 = ";-fx-text-fill: white;}.list-cell:filled:hover {-fx-background-color: #d2d2d2;-fx-text-fill: white;}"; } diff --git a/src/litera/MainFrame/Controller.java b/src/litera/MainFrame/Controller.java index e48d763..8e3e0b7 100755 --- a/src/litera/MainFrame/Controller.java +++ b/src/litera/MainFrame/Controller.java @@ -211,6 +211,7 @@ public void initialize(URL fxmlFileLocation, ResourceBundle resources) Color newValue = notePadColorPicker.getValue(); if ( newValue != null ) { + LocalDataManager.saveNoteCSS(currentNote, colorValueToHex(newValue)); borderPane.setStyle("-fx-background-color: " + colorValueToHex(newValue)); notePadColorPicker.hide(); } @@ -238,12 +239,14 @@ public void changed(ObservableValue observable, String oldValu LocalDataManager.saveNote(currentNote); isChanged = false; //checked via webPage listeners } + /* Gets the selected note from the notes directory * If LocalDataManager can't find the file, returns null. Either this is the first run or the user messed up with Litera directory. * While evaluating this statement, the note gets loaded into the currentNote object.*/ currentNote = LocalDataManager.getNote(newValue); editor.getEngine().loadContent(currentNote.getHtmlNote()); noteNameTextField.setText(newValue); + noteListView.getStylesheets().add("file:" + LocalDataManager.getNoteCSS(currentNote)); } }); @@ -315,6 +318,9 @@ private boolean loadLastNote() String lastNoteName = LocalDataManager.getLastNote(); if ( noteListView.getItems().contains(lastNoteName) ) ; noteListView.getSelectionModel().select(lastNoteName); + System.out.println(noteListView.getStylesheets()); + noteListView.getStylesheets().clear(); + noteListView.getStylesheets().add("file:" + LocalDataManager.getNoteCSS(currentNote)); return true; } From 45666fc039e313b2e489f83926fce40b8b1d8206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87elik=20K=C3=B6seo=C4=9Flu?= Date: Sat, 25 Apr 2015 16:31:52 +0300 Subject: [PATCH 14/30] Colors! --- .idea/workspace.xml | 91 ++++++++++++---------------- src/litera/MainFrame/Controller.java | 3 +- src/litera/MainFrame/minerva.fxml | 4 +- style/listView.css | 8 +-- 4 files changed, 44 insertions(+), 62 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b9d3b08..bc9d3b5 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,10 +6,10 @@ - + - - + + @@ -33,11 +33,11 @@ - + - - + + @@ -55,7 +55,7 @@ - + @@ -73,10 +73,10 @@ - + - + @@ -170,9 +170,9 @@ @@ -248,28 +248,6 @@