From f2cd0f2a56451765fa249f9e02ff12c30ca36970 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <Branislav Stojkovic@Bancika-PC>
Date: Wed, 26 Dec 2018 22:28:21 +0100
Subject: [PATCH] Revert unintentional change for MacOs for "command" and
 "control" keys for zooming and selection

---
 diylc/diylc-swing/build.xml                   |   2 +-
 diylc/diylc-swing/lib/diylc-core.jar          | Bin 248429 -> 248429 bytes
 diylc/diylc-swing/library/main.jar            | Bin 454891 -> 454891 bytes
 .../swing/plugins/canvas/CanvasPlugin.java    |   9 +++++----
 diylc/diylc-swing/update.xml                  |  18 +++++++++++++++++-
 5 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml
index 559c0f48..0a3d1c0f 100644
--- a/diylc/diylc-swing/build.xml
+++ b/diylc/diylc-swing/build.xml
@@ -7,7 +7,7 @@
 	<property name="jar.dir" value="${build.dir}/jar" />
 	<property name="report.dir" value="${build.dir}/junitreport" />
 	<property name="main.class" value="org.diylc.DIYLCStarter" />
-	<property name="diylc.version" value="3.46.0" />
+	<property name="diylc.version" value="3.46.1" />
 
 	<property name="classes.dir" value="${build.dir}/temp/${ant.project.name}/classes" />
 	<property name="test.classes.dir" value="${build.dir}/temp/${ant.project.name}/test.classes" />
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index b601d29f6b4b2ffc90888bdb90c3cc60d3410bdc..21cf81dae6f72a79eb1b0513ffd1504ce472b70a 100644
GIT binary patch
delta 4259
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

delta 4259
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

diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 1dc7ccd165fee02750556ac12e941e17e52b0e96..99a59bdd2e7daf6af4b5a351e8af3aa66b50bcdd 100644
GIT binary patch
delta 3968
zcmY*bdst5C7T<fn`+X~^ToNgxB4spgQ)m#zWyWJrk_=MEko#jA<B}0_dpL*0ccyJR
zE-57;>0*Z{L@1<jjruB=M1wKL?YNx1*81i==ltWh-*x$|wSMn<zdWvWd0gw#G;jn{
zn@EziB(2Ta+_bZ@CTDZ+IAwLt<`Osfx1p0^F*TQa01T1)DQj~~OBJt#3}I!;lAFNs
ziQ;A2nQvoilx^VnN)7<%tqcZOs`LSHR=u=tXN9o+pK3;;KlnPcffVVbJ#pk#|JRWz
zmHC154(m%ay#RvLu0}gKvFgs|fF4f43~-TisR}sclQKK|H93hR$4|=Ye_N3xE=;lW
zJ#q&6yj8&8ubYQ8U_|d>cuw~>A@=W=j9446(Fy$DhxBa%cp&_s4dCRNtzh7s1@j{n
zz^Vo7S_4ksIMfa>GqJ!Ha88<?HQ-N~MFOyYo<9RzoIeW`%DH#a0sViT|3rmzt4n4)
zzr6n33eJzJ<FU@thD5Ztc|HrztKaoOo)aG*LLEKbRt|zj^ncsQV<1u=?IdRch5oUf
z{3W^uyUBr2RR6iN{CCLK-9MAFo5II6e>o5O);D}5&xZoKJVuUC?AIE~1w?PjHZ_-|
zqaCzCXSj=&R3x|1w~dvvnnT>ENI4wY56+Oyt-un$OrDIEXDj45C$Oy0WLvDaF;TX|
zk8RuK7Z|f8Nq&SM%TnZB_~D)=k82BA(M9qRwD_Ku>so@P%?)`HS{B}t2Y}qV{!I30
z0Ux&&B^;Ui35A5%WUa*0kWH1{m{nr0taFCoAa7$K;UnQwB^}cT_E%~YJD9dH<JP^K
z#-2EtHobGzl8y^2J#e7HkSS!avK9xb`c@f^1m2UB_vrG9P{y|b%Gkw9FuJZUQNqyW
zw@gV#i+P1&<q9zmw<$Fa@Nr?kl82WSo2RtH;G}%T8uiaOr6l9WsEdlR(nfGfxsqfL
zA4AQ`IJ9i9Q#LplFH`UGTq%V0(i>kZYdGH87qb?9nc^Tx-Q7*`?_9L37-p>{*)y)~
zED<jHsSnBl>>$dX(N3Ih%^GkyGTj-zW&KbW_C0Mt=aLSiG7L=$IBh_As<6>Eo)@nA
zysj)4XY=gAWSrl7IGc@Y_j4c%Mc0!ttQbFXL)b4Ix*R=`y~MG<n#x)<1Ixr8nGaT9
zAHx!fa0N5rv`6FEE_8)$WkaZ+x@j>{eVHV!6IxLS>!AH~N!aRDiEJpU(s2iyg%t5g
ztQ6V94zb@+%fJG*3uFE$WbIYdX+~t?%ID6K<n61)rm7a9mKQKb&0H>o9#+iW;m%B~
zW-pO7xRyP@Df-s48TgUf$Tp*^&r?>9v%9}yv(XawhIwPb{CBJ;1~<xTQ9Bqpv%Tty
zPq*w-)g8Ng>Z|(VEqeA<TVR%dfcl=82dSNKQ6qxYwpe261l0{?+3}rv4Vf3rRKu)r
zrgcBE)A3xAe4F5XnF3ieE#{_ZrMpF`i5Oe3P$iALqtycV;n5$&sPpgwLle}u0)H~6
z99ebXg)B+)*<Umc+MP;auWQ>?0l$v=&YkKcZ1jDyx)2*(kg6WSC*ob8E=5b)33Z7J
zRPd-&7og>rJL)hjRr^9+jFyS7)LoeM!H$=p1SO8#mWGM&_w3*=B&p0+3o<J%T354h
z)E!*;V2m5<!M(797*FnJgVRS>G<IBRB}rNKTGUwXstu?yCjY%F-+;O;@5Se0%_n_$
z1+9Q%sB?0#lkrr#YnNLy7rmiBUxM9C8_T^=oVfA434SC_;!7~wDV#eaUyn$>2rU^i
zxF1?-=W)waKX6C1L`8GUOFD9Sbzo<sH!lZm^Iq<$jlVBi>s^-e&oM4y6(`NA*YH1a
zylWfy56C`z6TglY_XKWPt*yKxDI}G+d$=0UGmg;;*E|$Wwe=5$y*8&_SZnP!avNPF
z@pee$nan3+u{C=wLcG|=8<Dy$+fqIvkFUm<2L-$W_vPp*9*yaKXSf@>Ld$qDKCX6E
zd_THM%{&P=a&80fhMT?P1&;vN;aB_v;#+<KFRSQ1r(eSJ&cYRUzrKUGfh<LxgagK0
z=`76j+}|vGz1_N{B=zj1h1W6{?U}RjFwH)~y(Qkay7*3XxsN2h4%6J`3TNGGpm^*9
z3+Fgj41)hLXral%-&j{|OR^Yf{9I~RlSOwxks^A5Js?F40*p-&-$4B36!A6Szfy&(
z=C@mX28XG;#VEks-6Gf$<f?h53Mi!or;1^KM#gZ!2dN_Pzd>WuC}?Gx7z)PoX<`JR
z(;iBiyhj8;`5k-2w}5Z<h%ta8(?uj;Ub>hF*kZ2;1B}`$#sik_6%zoxGQ@Pi_zW={
z@O=jPL-!G1_C65~_LloaDAb*^-{3K@bicuCp!WeI&cIa%$baVm+5Iz(Jj0%tDP{ul
zgJLq^w1Xl7u;d`cyJb;atOe_`D1X2q@^3w4^l8MuI7B?**~C+rO+4;7bdJrTxGD?!
z=NfYud8S-31@Kia^*t_6OoDT69>q61EM~xY$zek;1M3bOdKfrD7t;W<b@IFBlYe!-
z_zvt1`QmSY-y9KBG46<%1L$^?FzzVTeSXx?)v$*jqy8@(Bc7fGl()42&k4uLJ^MJx
zQFfft{7(?3ouKx4A&nJYD8>P;UPy8|7E%84BD#)B3;LZTzJ!w`=hKrUThJ+Lv+$Id
z3p`y<lZ<hv#b`L2PZQ4<#l)LhOm#mNiy-iiIYW!Q=M0_So)IBn4?1hujn|QOmUv#B
zr7^=wi051h$=2l@)%(Xen(NUyl6CZXl1D#JacwV<jLR<2x%L9h?O!U!LcL9;#QV0C
z{9$Djf3l3O&-)_H9ea`L)Lf+N54c46|GY$cyu3vHjJr&D_%h|UD;M*iPFy+l_eVMD
zF!BoZk$Q#dH>;rf^D9X2s};oK`zzhwu3w4I`YP3ryh?S?U8R0~u2KFb3qHR__HoxO
z{amN`HaF;A=HIZ?xj}J#Zjx?EH!(ip7L}WRi^`q3WwdF$;_j73n1Nd>=~_NiQrxuL
zG~R{VwEdsoA$y_)<tp+=R#BNtRg~{rP3LXZw1#i0X$=C+)NZz!&Nel44O42!UR*<Y
zKD9L7hFbF9uO(Ug*O9F0b<|JuyM#;bQeU-q=~a%nM?5+As2}J1BuC7BlKs(r;t6>`
z{$mfw-@cyYURh5v-mRzkzJ5sdeGe(lp@I61Y9PMq2I3q3i0u0wQ6H@yQy(#pX`ZUb
z)bFrHnrmkxUE5m=hWtkH$A2T9_D?8o@e^9F3Jdx?C0*A)rF*P@O8N|VMt>qUKNA!F
E10|?L4gdfE

delta 3968
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
W-PBC?Sl>+g40%R>BDOsflm7#W?itAd

diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
index bc5cb4d7..1422ea08 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
@@ -47,6 +47,7 @@ import javax.swing.SwingUtilities;
 import org.apache.log4j.Logger;
 import org.diylc.appframework.miscutils.ConfigurationManager;
 import org.diylc.appframework.miscutils.IConfigListener;
+import org.diylc.appframework.miscutils.Utils;
 import org.diylc.common.BadPositionException;
 import org.diylc.common.EventType;
 import org.diylc.common.IComponentTransformer;
@@ -140,7 +141,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
         
         @Override
         public void mouseClicked(MouseEvent e) {
-          plugInPort.mouseClicked(e.getPoint(), e.getButton(), e.isControlDown(), e.isShiftDown(), e.isAltDown(),
+          plugInPort.mouseClicked(e.getPoint(), e.getButton(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown(),
               e.getClickCount());
         }
 
@@ -199,7 +200,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 
         @Override
         public void keyPressed(KeyEvent e) {
-          if (plugInPort.keyPressed(e.getKeyCode(), e.isControlDown(), e.isShiftDown(), e.isAltDown())) {
+          if (plugInPort.keyPressed(e.getKeyCode(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown())) {
             e.consume();
           }
         }
@@ -210,7 +211,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
         @Override
         public void mouseMoved(MouseEvent e) {
           canvasPanel.setCursor(plugInPort.getCursorAt(e.getPoint()));
-          plugInPort.mouseMoved(e.getPoint(), e.isControlDown(), e.isShiftDown(), e.isAltDown());
+          plugInPort.mouseMoved(e.getPoint(), Utils.isMac() ? e.isMetaDown() : e.isControlDown(), e.isShiftDown(), e.isAltDown());
         }
       });
     }
@@ -246,7 +247,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
 
           boolean wheelZoom = ConfigurationManager.getInstance().readBoolean(IPlugInPort.WHEEL_ZOOM_KEY, false);
 
-          if (wheelZoom || e.isControlDown()) {
+          if (wheelZoom || Utils.isMac() ? e.isMetaDown() : e.isControlDown()) {
 
             Point mousePos = getCanvasPanel().getMousePosition(true);
 
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index 9e152832..5f6e3dd2 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -2035,7 +2035,7 @@
 				<minor>46</minor>
 				<build>0</build>
 			</versionNumber>
-			<releaseDate>2018-12-25 00:00:00.000 CET</releaseDate>
+			<releaseDate>2018-12-26 00:00:00.000 CET</releaseDate>
 			<name></name>
 			<changes>	
 				<org.diylc.appframework.update.Change>
@@ -2068,6 +2068,22 @@
 				</org.diylc.appframework.update.Change>							
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>		
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>3</major>
+				<minor>46</minor>
+				<build>1</build>
+			</versionNumber>
+			<releaseDate>2018-12-26 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>					
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>Revert unintentional change for MacOs for "command" and "control" keys for zooming and selection</description>
+				</org.diylc.appframework.update.Change>							
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>			
 	</a>
 </java.util.Arrays_-ArrayList>