From ae24110a85c497af01309e7e8eb6339f29e1b65c Mon Sep 17 00:00:00 2001 From: Bandie Yip Kojote Date: Thu, 10 Aug 2017 23:45:18 +0200 Subject: [PATCH] Implemented draw on mouse click (again). --- build/built-jar.properties | 2 +- .../org/bandie/circleart/CircleArtGUI.class | Bin 8846 -> 9302 bytes .../org/bandie/circleart/msgs.properties | 2 +- .../bandie/circleart/msgs_de_AT.properties | 2 +- .../bandie/circleart/msgs_de_BE.properties | 2 +- .../bandie/circleart/msgs_de_CA.properties | 2 +- .../bandie/circleart/msgs_de_CH.properties | 2 +- .../bandie/circleart/msgs_de_DE.properties | 2 +- .../bandie/circleart/msgs_en_CA.properties | 2 +- .../bandie/circleart/msgs_en_UK.properties | 2 +- .../bandie/circleart/msgs_en_US.properties | 2 +- .../bandie/circleart/msgs_fr_BE.properties | 2 +- .../bandie/circleart/msgs_fr_CA.properties | 2 +- .../bandie/circleart/msgs_fr_FR.properties | 2 +- .../bandie/circleart/msgs_nl_BE.properties | 2 +- .../bandie/circleart/msgs_nl_NL.properties | 2 +- dist/CircleArt.html | 4 +-- dist/CircleArt.jar | Bin 1106790 -> 1107031 bytes dist/CircleArt.jnlp | 2 +- nbproject/private/private.xml | 4 +++ src/org/bandie/circleart/CircleArtGUI.java | 25 +++++++++++++----- src/org/bandie/circleart/msgs.properties | 2 +- .../bandie/circleart/msgs_de_DE.properties | 2 +- .../bandie/circleart/msgs_fr_FR.properties | 2 +- .../bandie/circleart/msgs_nl_NL.properties | 2 +- 25 files changed, 44 insertions(+), 29 deletions(-) diff --git a/build/built-jar.properties b/build/built-jar.properties index 297ff73..85598c7 100644 --- a/build/built-jar.properties +++ b/build/built-jar.properties @@ -1,4 +1,4 @@ -#Thu, 10 Aug 2017 14:49:07 +0200 +#Thu, 10 Aug 2017 23:44:49 +0200 /home/bandie/NetBeansProjects/CircleArt= diff --git a/build/classes/org/bandie/circleart/CircleArtGUI.class b/build/classes/org/bandie/circleart/CircleArtGUI.class index 2adeb61562fafcf6f8a09e0b8c02652ec59ed284..a369cc16dd54b59b1ff8ba8b3f7db2c9342c7f36 100644 GIT binary patch delta 3752 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 delta 3428 zcmZWs33yc175@J>Gw;p3yd;y!Iw{JokSJIID@!yWAb}W`Kw^|_fUrm)kPHYe89)ne zpm;<$ykeRvD++A#2*w!E*!2U>h+;deG{z4s#zsVr7aq!c-sqOw+S~S$Nr*4FRTG%#a|MDX}t3i)<}& zvKJUEYq7nJ;q2gJM|KLpV%LDs>t-X&?q=cbXF$WuGYgmPk4^PjzN9?N z3%tBg&w6OlQ;UlviCTpDYb`Fe*^9lk=wpk6OQZ<=jSqFa)W%KhtNHiyvcC>tfVLFa z!tOFHE|>bS(BeRC9;C$;HfD3Mq>@8y4&{{tEe^9WAICIak;UQSFg_V!i=|lBc$Fqm zVsj)%=^IB|93xOtU6xuL+gNNAyOiJT92_nNBBd%cXUeotm)dZsCfwyx;+$@3o|&tr zo4u87rK?Gv6xCvO^e`+-sy;PaeQRcUE+GbVQzu=ys?O_Gn?2bn-OC6rl54PBi`7X_ zm&OU!Y?{llg6OJ3uC7TI$2lxxxy7s1X>U<>1+Q_ioYy)W&vJ(ow3x_pHPJWOznqgC zPG-pA6o!a)>JwLn8s+w?FMOS1DIWo-kv)bW2&UaYDTEbmAuxyCf!`iq&=A*|IjZL+HoEMw!u+y_|aCjqcBJ82#ii=CH7&Bx@iQIOx`q<9Qts^{RM~*C(^m+yk z8aZyPIEZM#B`PJUo4HgY* z`yAfSwM5`&0HqqniAdreu(;0QgR$)o`T4Ns`iR{6s2@AD{+PqZS?ll#P4!7Fp5l7K zcg3ulsa2H&Yb1M5>+ElU@ZG4zCT@24jOMY$;j_AqTeW!`pL4KJ3XNMK@jWlQ@>ox4 z5xX_^5{C^MtWiU3rx1v0(Ij0}?VNKicXF4*X13^x?{>I{doAwMzE=?))Y9}!m6V*^ zcNuPJ6K^;)qq1kImJXI+se|XS%E3wz+>aF&UvT&$Uvl^|Ry2-IUSYTn@SyrIwVkVu zhtv-Z`$Rz=b;REw=7)jn-)avcxrXYVyFj;JatN35M1e@rW<>^@3# zQjdE&7~RX%`{^T8K}L~SU)M~ZPt8&5GlmNEG4*AJQu$e1)soCD%#FqHRo22@Z#aCD zZ#y`Q*BrcpR~;O}OAZcdaX^a~wb+e44t8RfgYDR%9?tHQa)L06tE*=(m`5Dxrsn75 zsIPM@bvk<+-&I?4iX(OM?tq-jhE9fP1|(fF=IFA>m@EgpJh&onlUYw0DWfN^39J{z zfIcJ5nDJ8FA-WUafID%Q%&0RfQf~IRUa>m1u618TD8rng^4NO}G#DOLk@&k6~>D z4@d%PjWt+@2jRtSMg$MxVfe7ln2Sg7sJz{F8zbb=immc7h9^F3rq2|*!=PwPQwPVrSTPBj*Vgq@KbiiCb6X(WW>Z~JcA6Q4~}CC zo|QPpp#fV(%M$j5*oNnjEm6q>5w94g%gm4}rsYdo$3FpThhd>nR6RD(Z|jClIPE8+?lG@>CnoO1q_c%g z5uZSdBzd=Fa!;Ff^Gahh0fHmlpTJSFTXQQA?voo3iflli226=!>N*7T8Za%20vR#` zl~G6!P2Y$tnGQH(?H{+Ejr3gc2}zPIX-bzQ<)R+l(I}rR+c7}=>gJC}Ul2>GOi_Sl z;Y-;GMBFgC2ZW+Lr3s3gMgA+T~FCt#<`sA1DJ+k>#w84)@AOxiUbj|exXU6dbR^BoR)Il=pQro&4 zcj3l(E5}d$c)cT~(s5(k6x?oYB0FAh>B}RnZ;;M0I3TG7H%X0eZp0MLm2KW510;Dz z#b)4joRCrfw{Xi}ns*T7alXU15X4`_K3*LE4dpI;iLdars9O7`Rr^<~_R|@SMyuv& S)!Ol#_`U4RE(z^Cp8r2SXTU@N diff --git a/build/classes/org/bandie/circleart/msgs.properties b/build/classes/org/bandie/circleart/msgs.properties index ceca984..6fb1080 100644 --- a/build/classes/org/bandie/circleart/msgs.properties +++ b/build/classes/org/bandie/circleart/msgs.properties @@ -44,4 +44,4 @@ HELP=Help ABOUT=About DRAWING_OFF=Status: Off DRAWING_ON=Status: On -HELP_DRAWING=To switch on/off your pen, press D. +HELP_DRAWING=To switch on/off your pen permanently, press D. diff --git a/build/classes/org/bandie/circleart/msgs_de_AT.properties b/build/classes/org/bandie/circleart/msgs_de_AT.properties index 654715b..14e8970 100644 --- a/build/classes/org/bandie/circleart/msgs_de_AT.properties +++ b/build/classes/org/bandie/circleart/msgs_de_AT.properties @@ -44,4 +44,4 @@ HELP=Hilfe ABOUT=\u00dcber DRAWING_OFF=Status: Aus DRAWING_ON=Status: An -HELP_DRAWING=Ein-/Ausschalten des Stiftes durch Dr\u00fccken von D. +HELP_DRAWING=Dauerhaftes ein-/ausschalten des Stiftes durch Dr\u00fccken von D. diff --git a/build/classes/org/bandie/circleart/msgs_de_BE.properties b/build/classes/org/bandie/circleart/msgs_de_BE.properties index 654715b..14e8970 100644 --- a/build/classes/org/bandie/circleart/msgs_de_BE.properties +++ b/build/classes/org/bandie/circleart/msgs_de_BE.properties @@ -44,4 +44,4 @@ HELP=Hilfe ABOUT=\u00dcber DRAWING_OFF=Status: Aus DRAWING_ON=Status: An -HELP_DRAWING=Ein-/Ausschalten des Stiftes durch Dr\u00fccken von D. +HELP_DRAWING=Dauerhaftes ein-/ausschalten des Stiftes durch Dr\u00fccken von D. diff --git a/build/classes/org/bandie/circleart/msgs_de_CA.properties b/build/classes/org/bandie/circleart/msgs_de_CA.properties index 654715b..14e8970 100644 --- a/build/classes/org/bandie/circleart/msgs_de_CA.properties +++ b/build/classes/org/bandie/circleart/msgs_de_CA.properties @@ -44,4 +44,4 @@ HELP=Hilfe ABOUT=\u00dcber DRAWING_OFF=Status: Aus DRAWING_ON=Status: An -HELP_DRAWING=Ein-/Ausschalten des Stiftes durch Dr\u00fccken von D. +HELP_DRAWING=Dauerhaftes ein-/ausschalten des Stiftes durch Dr\u00fccken von D. diff --git a/build/classes/org/bandie/circleart/msgs_de_CH.properties b/build/classes/org/bandie/circleart/msgs_de_CH.properties index 654715b..14e8970 100644 --- a/build/classes/org/bandie/circleart/msgs_de_CH.properties +++ b/build/classes/org/bandie/circleart/msgs_de_CH.properties @@ -44,4 +44,4 @@ HELP=Hilfe ABOUT=\u00dcber DRAWING_OFF=Status: Aus DRAWING_ON=Status: An -HELP_DRAWING=Ein-/Ausschalten des Stiftes durch Dr\u00fccken von D. +HELP_DRAWING=Dauerhaftes ein-/ausschalten des Stiftes durch Dr\u00fccken von D. diff --git a/build/classes/org/bandie/circleart/msgs_de_DE.properties b/build/classes/org/bandie/circleart/msgs_de_DE.properties index 654715b..14e8970 100644 --- a/build/classes/org/bandie/circleart/msgs_de_DE.properties +++ b/build/classes/org/bandie/circleart/msgs_de_DE.properties @@ -44,4 +44,4 @@ HELP=Hilfe ABOUT=\u00dcber DRAWING_OFF=Status: Aus DRAWING_ON=Status: An -HELP_DRAWING=Ein-/Ausschalten des Stiftes durch Dr\u00fccken von D. +HELP_DRAWING=Dauerhaftes ein-/ausschalten des Stiftes durch Dr\u00fccken von D. diff --git a/build/classes/org/bandie/circleart/msgs_en_CA.properties b/build/classes/org/bandie/circleart/msgs_en_CA.properties index ceca984..6fb1080 100644 --- a/build/classes/org/bandie/circleart/msgs_en_CA.properties +++ b/build/classes/org/bandie/circleart/msgs_en_CA.properties @@ -44,4 +44,4 @@ HELP=Help ABOUT=About DRAWING_OFF=Status: Off DRAWING_ON=Status: On -HELP_DRAWING=To switch on/off your pen, press D. +HELP_DRAWING=To switch on/off your pen permanently, press D. diff --git a/build/classes/org/bandie/circleart/msgs_en_UK.properties b/build/classes/org/bandie/circleart/msgs_en_UK.properties index ceca984..6fb1080 100644 --- a/build/classes/org/bandie/circleart/msgs_en_UK.properties +++ b/build/classes/org/bandie/circleart/msgs_en_UK.properties @@ -44,4 +44,4 @@ HELP=Help ABOUT=About DRAWING_OFF=Status: Off DRAWING_ON=Status: On -HELP_DRAWING=To switch on/off your pen, press D. +HELP_DRAWING=To switch on/off your pen permanently, press D. diff --git a/build/classes/org/bandie/circleart/msgs_en_US.properties b/build/classes/org/bandie/circleart/msgs_en_US.properties index ceca984..6fb1080 100644 --- a/build/classes/org/bandie/circleart/msgs_en_US.properties +++ b/build/classes/org/bandie/circleart/msgs_en_US.properties @@ -44,4 +44,4 @@ HELP=Help ABOUT=About DRAWING_OFF=Status: Off DRAWING_ON=Status: On -HELP_DRAWING=To switch on/off your pen, press D. +HELP_DRAWING=To switch on/off your pen permanently, press D. diff --git a/build/classes/org/bandie/circleart/msgs_fr_BE.properties b/build/classes/org/bandie/circleart/msgs_fr_BE.properties index de0b9c0..8506dee 100644 --- a/build/classes/org/bandie/circleart/msgs_fr_BE.properties +++ b/build/classes/org/bandie/circleart/msgs_fr_BE.properties @@ -44,4 +44,4 @@ HELP=Aider ABOUT=\u00c0 propos de programme DRAWING_OFF=Crayon: D\u00e9sactiv\u00e9 DRAWING_ON=Crayon: Allum\u00e9 -HELP_DRAWING=Allum\u00e9/D\u00e9sactiv\u00e9 le crayon en appuyant sur la barre d'espacement. +HELP_DRAWING=Pour que allum\u00e9/d\u00e9sactiver le crayon p\u00e9renne: Pressez le D bouton. diff --git a/build/classes/org/bandie/circleart/msgs_fr_CA.properties b/build/classes/org/bandie/circleart/msgs_fr_CA.properties index de0b9c0..8506dee 100644 --- a/build/classes/org/bandie/circleart/msgs_fr_CA.properties +++ b/build/classes/org/bandie/circleart/msgs_fr_CA.properties @@ -44,4 +44,4 @@ HELP=Aider ABOUT=\u00c0 propos de programme DRAWING_OFF=Crayon: D\u00e9sactiv\u00e9 DRAWING_ON=Crayon: Allum\u00e9 -HELP_DRAWING=Allum\u00e9/D\u00e9sactiv\u00e9 le crayon en appuyant sur la barre d'espacement. +HELP_DRAWING=Pour que allum\u00e9/d\u00e9sactiver le crayon p\u00e9renne: Pressez le D bouton. diff --git a/build/classes/org/bandie/circleart/msgs_fr_FR.properties b/build/classes/org/bandie/circleart/msgs_fr_FR.properties index de0b9c0..8506dee 100644 --- a/build/classes/org/bandie/circleart/msgs_fr_FR.properties +++ b/build/classes/org/bandie/circleart/msgs_fr_FR.properties @@ -44,4 +44,4 @@ HELP=Aider ABOUT=\u00c0 propos de programme DRAWING_OFF=Crayon: D\u00e9sactiv\u00e9 DRAWING_ON=Crayon: Allum\u00e9 -HELP_DRAWING=Allum\u00e9/D\u00e9sactiv\u00e9 le crayon en appuyant sur la barre d'espacement. +HELP_DRAWING=Pour que allum\u00e9/d\u00e9sactiver le crayon p\u00e9renne: Pressez le D bouton. diff --git a/build/classes/org/bandie/circleart/msgs_nl_BE.properties b/build/classes/org/bandie/circleart/msgs_nl_BE.properties index 87a86df..5e9f981 100644 --- a/build/classes/org/bandie/circleart/msgs_nl_BE.properties +++ b/build/classes/org/bandie/circleart/msgs_nl_BE.properties @@ -44,4 +44,4 @@ HELP=Help ABOUT=Over dit programma DRAWING_OFF=Status: Af DRAWING_ON=Status: Aan -HELP_DRAWING=Je kunt de pen aan/uitschakelen door dat je D drukt. +HELP_DRAWING=Je kunt de permanent pen aan/uitschakelen door dat je D drukt. diff --git a/build/classes/org/bandie/circleart/msgs_nl_NL.properties b/build/classes/org/bandie/circleart/msgs_nl_NL.properties index 87a86df..5e9f981 100644 --- a/build/classes/org/bandie/circleart/msgs_nl_NL.properties +++ b/build/classes/org/bandie/circleart/msgs_nl_NL.properties @@ -44,4 +44,4 @@ HELP=Help ABOUT=Over dit programma DRAWING_OFF=Status: Af DRAWING_ON=Status: Aan -HELP_DRAWING=Je kunt de pen aan/uitschakelen door dat je D drukt. +HELP_DRAWING=Je kunt de permanent pen aan/uitschakelen door dat je D drukt. diff --git a/dist/CircleArt.html b/dist/CircleArt.html index a20b651..7d3a1b4 100644 --- a/dist/CircleArt.html +++ b/dist/CircleArt.html @@ -4,7 +4,7 @@ function launchApplication(jnlpfile) { dtjava.launch( { url : 'CircleArt.jnlp', - jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJDaXJjbGVBcnQuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPkNpcmNsZUFydDwvdGl0bGU+CiAgICA8dmVuZG9yPmJhbmRpZTwvdmVuZG9yPgogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPgogICAgPG9mZmxpbmUtYWxsb3dlZC8+CiAgPC9pbmZvcm1hdGlvbj4KICA8cmVzb3VyY2VzPgogICAgPGoyc2UgdmVyc2lvbj0iMS42KyIgaHJlZj0iaHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9hdXRvZGwvajJzZSIvPgogICAgPGphciBocmVmPSJDaXJjbGVBcnQuamFyIiBzaXplPSIxMTA2NzkwIiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgPC9yZXNvdXJjZXM+CiAgPGFwcGxldC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0iY29tLmphdmFmeC5tYWluLk5vSmF2YUZYRmFsbGJhY2siICBuYW1lPSJDaXJjbGVBcnQiID4KICAgIDxwYXJhbSBuYW1lPSJyZXF1aXJlZEZYVmVyc2lvbiIgdmFsdWU9IjguMCsiLz4KICA8L2FwcGxldC1kZXNjPgogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJvcmcuYmFuZGllLmNpcmNsZWFydC5DaXJjbGVBcnQiICBuYW1lPSJDaXJjbGVBcnQiIC8+CiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+Cjwvam5scD4K' + jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJDaXJjbGVBcnQuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPkNpcmNsZUFydDwvdGl0bGU+CiAgICA8dmVuZG9yPmJhbmRpZTwvdmVuZG9yPgogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPgogICAgPG9mZmxpbmUtYWxsb3dlZC8+CiAgPC9pbmZvcm1hdGlvbj4KICA8cmVzb3VyY2VzPgogICAgPGoyc2UgdmVyc2lvbj0iMS42KyIgaHJlZj0iaHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9hdXRvZGwvajJzZSIvPgogICAgPGphciBocmVmPSJDaXJjbGVBcnQuamFyIiBzaXplPSIxMTA3MDMxIiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgPC9yZXNvdXJjZXM+CiAgPGFwcGxldC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0iY29tLmphdmFmeC5tYWluLk5vSmF2YUZYRmFsbGJhY2siICBuYW1lPSJDaXJjbGVBcnQiID4KICAgIDxwYXJhbSBuYW1lPSJyZXF1aXJlZEZYVmVyc2lvbiIgdmFsdWU9IjguMCsiLz4KICA8L2FwcGxldC1kZXNjPgogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJvcmcuYmFuZGllLmNpcmNsZWFydC5DaXJjbGVBcnQiICBuYW1lPSJDaXJjbGVBcnQiIC8+CiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+Cjwvam5scD4K' }, { javafx : '8.0+' @@ -24,7 +24,7 @@ placeholder : 'javafx-app-placeholder', width : '800', height : '600', - jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJDaXJjbGVBcnQuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPkNpcmNsZUFydDwvdGl0bGU+CiAgICA8dmVuZG9yPmJhbmRpZTwvdmVuZG9yPgogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPgogICAgPG9mZmxpbmUtYWxsb3dlZC8+CiAgPC9pbmZvcm1hdGlvbj4KICA8cmVzb3VyY2VzPgogICAgPGoyc2UgdmVyc2lvbj0iMS42KyIgaHJlZj0iaHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9hdXRvZGwvajJzZSIvPgogICAgPGphciBocmVmPSJDaXJjbGVBcnQuamFyIiBzaXplPSIxMTA2NzkwIiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgPC9yZXNvdXJjZXM+CiAgPGFwcGxldC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0iY29tLmphdmFmeC5tYWluLk5vSmF2YUZYRmFsbGJhY2siICBuYW1lPSJDaXJjbGVBcnQiID4KICAgIDxwYXJhbSBuYW1lPSJyZXF1aXJlZEZYVmVyc2lvbiIgdmFsdWU9IjguMCsiLz4KICA8L2FwcGxldC1kZXNjPgogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJvcmcuYmFuZGllLmNpcmNsZWFydC5DaXJjbGVBcnQiICBuYW1lPSJDaXJjbGVBcnQiIC8+CiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+Cjwvam5scD4K' + jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPGpubHAgc3BlYz0iMS4wIiB4bWxuczpqZng9Imh0dHA6Ly9qYXZhZnguY29tIiBocmVmPSJDaXJjbGVBcnQuam5scCI+CiAgPGluZm9ybWF0aW9uPgogICAgPHRpdGxlPkNpcmNsZUFydDwvdGl0bGU+CiAgICA8dmVuZG9yPmJhbmRpZTwvdmVuZG9yPgogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPgogICAgPG9mZmxpbmUtYWxsb3dlZC8+CiAgPC9pbmZvcm1hdGlvbj4KICA8cmVzb3VyY2VzPgogICAgPGoyc2UgdmVyc2lvbj0iMS42KyIgaHJlZj0iaHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9hdXRvZGwvajJzZSIvPgogICAgPGphciBocmVmPSJDaXJjbGVBcnQuamFyIiBzaXplPSIxMTA3MDMxIiBkb3dubG9hZD0iZWFnZXIiIC8+CiAgPC9yZXNvdXJjZXM+CiAgPGFwcGxldC1kZXNjICB3aWR0aD0iODAwIiBoZWlnaHQ9IjYwMCIgbWFpbi1jbGFzcz0iY29tLmphdmFmeC5tYWluLk5vSmF2YUZYRmFsbGJhY2siICBuYW1lPSJDaXJjbGVBcnQiID4KICAgIDxwYXJhbSBuYW1lPSJyZXF1aXJlZEZYVmVyc2lvbiIgdmFsdWU9IjguMCsiLz4KICA8L2FwcGxldC1kZXNjPgogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJvcmcuYmFuZGllLmNpcmNsZWFydC5DaXJjbGVBcnQiICBuYW1lPSJDaXJjbGVBcnQiIC8+CiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+Cjwvam5scD4K' }, { javafx : '8.0+' diff --git a/dist/CircleArt.jar b/dist/CircleArt.jar index 00bfce37abdd0470cd0e7f2dcb7e28e5dc7bac76..2a5d139cf1d1ebe52f0960154a661dccb8f47e2c 100644 GIT binary patch delta 18957 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 delta 18743 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 - + diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 9bc8ed7..d20c2b3 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -4,11 +4,15 @@ file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/CircleArt.java + file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/msgs.properties file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/ObjectMath.java file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/Pen.java file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/CircleArtGUI.java file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/SettingsGUI.java file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/About.java + file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/msgs_de_AT.properties + file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/msgs_fr_BE.properties + file:/home/bandie/NetBeansProjects/CircleArt/src/org/bandie/circleart/msgs_nl_NL.properties diff --git a/src/org/bandie/circleart/CircleArtGUI.java b/src/org/bandie/circleart/CircleArtGUI.java index 668c5c3..27a2fbc 100644 --- a/src/org/bandie/circleart/CircleArtGUI.java +++ b/src/org/bandie/circleart/CircleArtGUI.java @@ -158,15 +158,16 @@ public class CircleArtGUI extends Application { root.addEventHandler(MouseEvent.MOUSE_MOVED, (MouseEvent t) -> { if (P.isOn()) { - double x = t.getSceneX(); - double y = t.getSceneY(); - drawPane.getChildren().add(new Circle(x, y, - P.getSize(x, y), - P.getColor(x, y) - ) - ); + draw(t, drawPane); } }); + + root.setOnMouseClicked(eh -> { + + draw(eh, drawPane); + + }); + Scene scene = new Scene(root); @@ -200,6 +201,16 @@ public class CircleArtGUI extends Application { } + private void draw(MouseEvent t, Pane drawPane){ + double x = t.getSceneX(); + double y = t.getSceneY(); + drawPane.getChildren().add(new Circle(x, y, + P.getSize(x, y), + P.getColor(x, y) + ) + ); + } + // Fullscreen toggle private void toggleFullscreen(Stage stage) { stage.setFullScreen(!stage.isFullScreen()); diff --git a/src/org/bandie/circleart/msgs.properties b/src/org/bandie/circleart/msgs.properties index ceca984..6fb1080 100644 --- a/src/org/bandie/circleart/msgs.properties +++ b/src/org/bandie/circleart/msgs.properties @@ -44,4 +44,4 @@ HELP=Help ABOUT=About DRAWING_OFF=Status: Off DRAWING_ON=Status: On -HELP_DRAWING=To switch on/off your pen, press D. +HELP_DRAWING=To switch on/off your pen permanently, press D. diff --git a/src/org/bandie/circleart/msgs_de_DE.properties b/src/org/bandie/circleart/msgs_de_DE.properties index 654715b..14e8970 100644 --- a/src/org/bandie/circleart/msgs_de_DE.properties +++ b/src/org/bandie/circleart/msgs_de_DE.properties @@ -44,4 +44,4 @@ HELP=Hilfe ABOUT=\u00dcber DRAWING_OFF=Status: Aus DRAWING_ON=Status: An -HELP_DRAWING=Ein-/Ausschalten des Stiftes durch Dr\u00fccken von D. +HELP_DRAWING=Dauerhaftes ein-/ausschalten des Stiftes durch Dr\u00fccken von D. diff --git a/src/org/bandie/circleart/msgs_fr_FR.properties b/src/org/bandie/circleart/msgs_fr_FR.properties index de0b9c0..8506dee 100644 --- a/src/org/bandie/circleart/msgs_fr_FR.properties +++ b/src/org/bandie/circleart/msgs_fr_FR.properties @@ -44,4 +44,4 @@ HELP=Aider ABOUT=\u00c0 propos de programme DRAWING_OFF=Crayon: D\u00e9sactiv\u00e9 DRAWING_ON=Crayon: Allum\u00e9 -HELP_DRAWING=Allum\u00e9/D\u00e9sactiv\u00e9 le crayon en appuyant sur la barre d'espacement. +HELP_DRAWING=Pour que allum\u00e9/d\u00e9sactiver le crayon p\u00e9renne: Pressez le D bouton. diff --git a/src/org/bandie/circleart/msgs_nl_NL.properties b/src/org/bandie/circleart/msgs_nl_NL.properties index 87a86df..5e9f981 100644 --- a/src/org/bandie/circleart/msgs_nl_NL.properties +++ b/src/org/bandie/circleart/msgs_nl_NL.properties @@ -44,4 +44,4 @@ HELP=Help ABOUT=Over dit programma DRAWING_OFF=Status: Af DRAWING_ON=Status: Aan -HELP_DRAWING=Je kunt de pen aan/uitschakelen door dat je D drukt. +HELP_DRAWING=Je kunt de permanent pen aan/uitschakelen door dat je D drukt.