From 55d3dd583b490f6187a7166a759191285b4c28ec Mon Sep 17 00:00:00 2001
From: Igor <eliteclubsessions@gmail.com>
Date: Tue, 8 Mar 2016 17:12:55 +0300
Subject: [PATCH] aefaef

---
 Applications.txt         |   6 ++++++
 MineOS/Icons/3DModel.pic | Bin 0 -> 216 bytes
 MineOS/OS.lua            |   1 +
 lib/ECSAPI.lua           |   6 ++++++
 4 files changed, 13 insertions(+)
 create mode 100644 MineOS/Icons/3DModel.pic

diff --git a/Applications.txt b/Applications.txt
index b11babf5..2e348aab 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -86,6 +86,12 @@
   },
 
   ----------------------------------------------------- Системные иконки --------------------------------------------------------------------------
+  {
+    ["name"]="MineOS/System/OS/Icons/3DModel.pic",
+    ["url"]="IgorTimofeev/OpenComputers/master/MineOS/Icons/3DModel.pic",
+    ["type"]="Script",
+    ["version"]=1.0,
+  },
   {
     ["name"]="MineOS/System/OS/Icons/Computer.pic",
     ["url"]="IgorTimofeev/OpenComputers/master/MineOS/Icons/Computer.pic",
diff --git a/MineOS/Icons/3DModel.pic b/MineOS/Icons/3DModel.pic
new file mode 100644
index 0000000000000000000000000000000000000000..3efc9db7de7d8d60cfb52409a7126a1ed1174c3b
GIT binary patch
literal 216
zcmXwzI}XA?3`9L+?+1wkP^P7!;RFfNN>miS0xdV8ph&^RqV%~4EMe1)^=7PhyIhNA
z>w%AJS1=E<mkclyniW=X9E6f<kY50L?8I^YgUQUXjPG?xPwKcg5>_%c!b+C$xm|EP
sS})e#sbyU^uk9P0UD4`fvoUaxgI6U4M3BnJL{-zEQLEd;W;-SO0!xe~ssI20

literal 0
HcmV?d00001

diff --git a/MineOS/OS.lua b/MineOS/OS.lua
index 050b634a..1d730618 100644
--- a/MineOS/OS.lua
+++ b/MineOS/OS.lua
@@ -114,6 +114,7 @@ end
 
 --ОТРИСОВКА ИКОНОК НА РАБОЧЕМ СТОЛЕ ПО ТЕКУЩЕЙ ПАПКЕ
 local function drawDesktop()
+	obj.DesktopIcons = {}
 	currentFileList = ecs.getFileList(workPath)
 	currentFileList = ecs.sortFiles(workPath, currentFileList, sortingMethod, showHiddenFiles)
 
diff --git a/lib/ECSAPI.lua b/lib/ECSAPI.lua
index 72fa9999..d4a7ea46 100644
--- a/lib/ECSAPI.lua
+++ b/lib/ECSAPI.lua
@@ -1620,6 +1620,7 @@ local function OSIconsInit()
 		ECSAPI.OSIcons.pastebin = image.load(ECSAPI.pathToIcons .. "Pastebin.pic")
 		ECSAPI.OSIcons.fileNotExists = image.load(ECSAPI.pathToIcons .. "FileNotExists.pic")
 		ECSAPI.OSIcons.archive = image.load(ECSAPI.pathToIcons .. "Archive.pic")
+		ECSAPI.OSIcons.model3D = image.load(ECSAPI.pathToIcons .. "3DModel.pic")
 	end
 end
 
@@ -1663,6 +1664,8 @@ function ECSAPI.drawOSIcon(x, y, path, showFileFormat, nameColor)
 			icon = "pastebin"
 		elseif fileFormat == ".pkg" then
 			icon = "archive"
+		elseif fileFormat == ".3dm" then
+			icon = "model3D"
 		elseif not fs.exists(path) then
 			icon = "fileNotExists"
 		else
@@ -1720,6 +1723,9 @@ function ECSAPI.launchIcon(path, arguments)
 	--Если это фоточка
 	elseif fileFormat == ".pic" then
 		shell.execute("MineOS/Applications/Photoshop.app/Photoshop.lua open " .. path)
+	--Если это 3D-модель
+	elseif fileFormat == ".3dm" then
+		shell.execute("MineOS/Applications/3DPrint.app/3DPrint.lua open " .. path)
 	--Если это фоточка
 	elseif fileFormat == ".raw" then
 		shell.execute("MineOS/Applications/Photoshop.app/Photoshop.lua open " .. path)