From 47243f438070b4b63bc49e6ed5f314ec1276eea7 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Fri, 6 Jan 2017 22:18:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D1=82-=D0=B2=D0=BE=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store          | Bin 18436 -> 18436 bytes
 Applications.txt   |   4 ++--
 lib/MineOSCore.lua |  17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 5443a0185dbb5a5827e3d92b73df3b0d89f9cc36..f3ea6c470b66f785a26958520adb2bf038377831 100644
GIT binary patch
delta 594
zcmXw#&1(}u7{>Rh*3QC6C#|K)h^$F5IW&z?;@3uPszsx1Q8a2GRgBq<Zj&aZ8^5a1
zgHenJsSaWVFN#z_{9>tk6utNd6g&w9kK)mb;K%GH&SBtvpZ9%ceouW4^*OxW$<Qr!
zF-M%<5Sv|6)um46>+%OU9XIkdbF6AuMawkUB55k?0-WbuW$&~pZ-WqTAsFH`V_P#O
z%eMx@5lS;9t70&_W!fL5{8%}E#w;^KZLY;PQGVirIc;0j3L8-q&F+@1lxGXo$w{+P
zvweuRhV>-pr`)GU^LFjflv$DA`b>xz3j5ni%i_B)S@^1aQ+_Bvm0!wl<&W|g1U=}5
z9|43A!$!oh1G|yJ5cXgMhj9c)k-<q6V4{e#n8GE@;0mtdI&R|*?n2-pp5p~x;uYTG
zBR+{nSGGe-A2`@ahs7X!BpTflBG?|Dm6@##hA3r<4{nZb9gb)kYm?y-uk4R%l&$b0
za#cyMv34&Ex0KkFt@Pq@OFb#oRWg<4?qEt<5f|9A8jeUS5S8?$O3R8oVt&p3Tnq`x
zw-0GaH;OSFM;1AZOTr?~VFD$TaUK_O*`uuE25zE(Taxk~?qePg@EA|9fTwtdH*m0s
kw|IvSF1MriTti19zCF5r^ENS{rybhM`~Eka0sYJBe|Kq*r2qf`

delta 507
zcmXYtOHWf#6h`k#OgKl6_7(x#N@8srL{mrsZLmTFO^Q;{NfoqeEZmDJ_Mx;8U(tc}
zQAZ?)XiPM|qA^Z<RN`Z#{sAW>CXO8ISQDM-rDd`QYiED!%P!ARp5tYoNsI0`t1DEK
zYSCXhJlgMBb9qrF^XZ(u=rY}n%IjM%%>{APN|)@Bf|Z%f*j8=h^ZGUjky_%rr)_7}
zu?qM?(oBnFF>`)7Vw2h|&7w@6%H)?%!>Uu5mOPkEkK5ULT9@h(W<rk6+8d{fnL@r!
zqpDZ93CppGLM~_LOT`-2TiRNi9si&ZhnM_=mStNaIB?0Yf4X-}d^5fqKa5|-Z{v^g
z*Z7A(vI>Ql06{`T*iMW-`q@Q-eeCA|Nse)x6QnuGY0glj#6_-hjS4r>+~pqkdB6+a
z@tzO5(m2-8x@YgOOU3n0^P#S+ozgSyZ7z@VFBMQB>1I)yhJM~YzA`R_Nxj~DQz8{1
z$^dbO7<Tj{9AcCsq?`hijy%H@S!S5!Ea$jD*(q_I8?_Si+~PKOc*J9#@RVn~;x%tr
q;4L5d#OG?P`3fT1-5d6A?TPBn*icoi^938WMY<i*Rqcp<UHu<2mw$)=

diff --git a/Applications.txt b/Applications.txt
index 621bbe8a..4677d348 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -8,7 +8,7 @@
     about="IgorTimofeev/OpenComputers/master/MineOS/About/",
     type="Script",
     forceDownload=true,
-    version=3.32,
+    version=3.33,
   },
   {
     name="MineOS/Pictures/Raspberry.pic",
@@ -271,7 +271,7 @@
     name="lib/MineOSCore.lua",
     url="IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
     type="Library",
-    version=1.26,
+    version=1.27,
   },
   {
     name="lib/advancedLua.lua",
diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua
index 6f6345f3..cade4dcb 100755
--- a/lib/MineOSCore.lua
+++ b/lib/MineOSCore.lua
@@ -246,6 +246,7 @@ function MineOSCore.analyseIconFormat(iconObject)
 
 			iconObject.iconImage.image = shortcutIconObject.iconImage.image
 			iconObject.launch = shortcutIconObject.launch
+			iconObject.isDirectory = shortcutIconObject.isDirectory
 
 			shortcutIconObject = nil
 		elseif iconObject.format == ".cfg" or iconObject.format == ".config" then
@@ -605,6 +606,8 @@ function MineOSCore.iconLeftClick(iconObject, eventData)
 		if iconObject.format == ".app" then
 			iconObject.launch()
 			computer.pushSignal("MineOSCore", "updateFileList")
+		elseif iconObject.isShortcut then
+			computer.pushSignal("MineOSCore", "changeWorkpath", iconObject.shortcutPath)
 		else
 			computer.pushSignal("MineOSCore", "changeWorkpath", iconObject.path)
 		end
@@ -633,6 +636,18 @@ function MineOSCore.iconRightClick(icon, eventData)
 				{MineOSCore.localization.contextMenuAddToDock},
 				{MineOSCore.localization.contextMenuDelete}
 			):show()
+		elseif icon.isShortcut then
+			action = GUI.contextMenu(eventData[3], eventData[4],
+				{MineOSCore.localization.contextMenuEdit},
+				{MineOSCore.localization.contextMenuShowContainingFolder},
+				"-",
+				{MineOSCore.localization.contextMenuCut},
+				{MineOSCore.localization.contextMenuCopy},
+				{MineOSCore.localization.contextMenuRename},
+				"-",
+				{MineOSCore.localization.contextMenuAddToDock},
+				{MineOSCore.localization.contextMenuDelete}
+			):show()
 		else
 			action = GUI.contextMenu(eventData[3], eventData[4],
 				{MineOSCore.localization.contextMenuCut},
@@ -700,6 +715,8 @@ function MineOSCore.iconRightClick(icon, eventData)
 		ecs.prepareToExit()
 		MineOSCore.safeLaunch("/bin/edit.lua", icon.path)
 		computer.pushSignal("MineOSCore", "updateFileListAndBufferTrueRedraw")
+	elseif action == MineOSCore.localization.contextMenuShowContainingFolder then
+		computer.pushSignal("MineOSCore", "changeWorkpath", fs.path(icon.shortcutPath))
 	elseif action == MineOSCore.localization.contextMenuEditInPhotoshop then
 		MineOSCore.safeLaunch("MineOS/Applications/Photoshop.app/Photoshop.lua", "open", icon.path)
 		computer.pushSignal("MineOSCore", "updateFileList")