From e15741c24a6c6c0a00e81583843e367dcdfaecd6 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <igor@iMac-Igor.local>
Date: Sat, 26 Jan 2019 10:20:01 +0300
Subject: [PATCH] App market fix

---
 .../App Market.app/Icons/FileNotExists.pic    | Bin 0 -> 135 bytes
 Applications/App Market.app/Icons/Lua.pic     | Bin 0 -> 200 bytes
 Applications/App Market.app/Icons/Script.pic  | Bin 0 -> 73 bytes
 Applications/App Market.app/Main.lua          |   6 +--
 Applications/Lua.app/Icon.pic                 | Bin 0 -> 272 bytes
 .../Lua.app/Localizations/English.lang        |   3 ++
 .../Lua.app/Localizations/French.lang         |   3 ++
 .../Lua.app/Localizations/Russian.lang        |   3 ++
 .../Lua.app/Localizations/Ukrainian.lang      |   3 ++
 Applications/Lua.app/Main.lua                 |  40 ++++++++++++++++++
 Applications/Picture Edit.app/Main.lua        |   4 +-
 Installer/Files.cfg                           |  33 ++++++++++-----
 Libraries/Filesystem.lua                      |   2 +-
 Libraries/Paths.lua                           |   1 +
 14 files changed, 81 insertions(+), 17 deletions(-)
 create mode 100755 Applications/App Market.app/Icons/FileNotExists.pic
 create mode 100755 Applications/App Market.app/Icons/Lua.pic
 create mode 100644 Applications/App Market.app/Icons/Script.pic
 create mode 100644 Applications/Lua.app/Icon.pic
 create mode 100644 Applications/Lua.app/Localizations/English.lang
 create mode 100644 Applications/Lua.app/Localizations/French.lang
 create mode 100644 Applications/Lua.app/Localizations/Russian.lang
 create mode 100644 Applications/Lua.app/Localizations/Ukrainian.lang
 create mode 100644 Applications/Lua.app/Main.lua

diff --git a/Applications/App Market.app/Icons/FileNotExists.pic b/Applications/App Market.app/Icons/FileNotExists.pic
new file mode 100755
index 0000000000000000000000000000000000000000..beb2616dbd1f1ff881003793b83a5a795e18ab37
GIT binary patch
literal 135
zcmX}kF$#b%5Jb_;>}Iog3hyEWtUQH<AX;c)?Zq{QVD}h4GYw-lSA@`AcyL1?%Lft^
q=vqfYwg%f9QeO}hUOJ7IoQOiW{=-pAVNB<z^5_Dan^nME3j#08XcV3R

literal 0
HcmV?d00001

diff --git a/Applications/App Market.app/Icons/Lua.pic b/Applications/App Market.app/Icons/Lua.pic
new file mode 100755
index 0000000000000000000000000000000000000000..cff6913cb46641d9fec84b86a857e753600d8909
GIT binary patch
literal 200
zcmXYrF$w}f5Cpe+W_K_13m0GD4~zuC$TtWo2%;kTRo`;Sp>xLu4NXlm)M2~dmCp4`
z^dyoaIz=qvk(5?9zHxGV!@va8JA<ZJmJ!3A3l{ci!+f2IpoqL~&`ts8y}#SOo*U6+
fDWFFy)@vXcWFfO$>Y^akV|!O#;V_1b&m#T@Q1Tk!

literal 0
HcmV?d00001

diff --git a/Applications/App Market.app/Icons/Script.pic b/Applications/App Market.app/Icons/Script.pic
new file mode 100644
index 0000000000000000000000000000000000000000..8adc33606b6bd8a5239b7a48625073dcb4ea04ca
GIT binary patch
literal 73
zcmeZw_H<+8U}0onU{+vcU}RunWMgDuWn<@H;$UQA2D6yqEEYJ+4yg7wBO@bIJdp7p
H$Y2Hllw<_A

literal 0
HcmV?d00001

diff --git a/Applications/App Market.app/Main.lua b/Applications/App Market.app/Main.lua
index 20f29262..763b7c58 100644
--- a/Applications/App Market.app/Main.lua	
+++ b/Applications/App Market.app/Main.lua	
@@ -75,9 +75,9 @@ local languages = {
 
 filesystem.makeDirectory(iconCachePath)
 
-local luaIcon = image.load(paths.system.icons .. "Lua.pic")
-local fileNotExistsIcon = image.load(paths.system.icons .. "FileNotExists.pic")
-local scriptIcon = image.load(paths.system.icons .. "Script.pic")
+local luaIcon = image.load(currentScriptDirectory .. "Icons/Lua.pic")
+local fileNotExistsIcon = image.load(currentScriptDirectory .. "Icons/FileNotExists.pic")
+local scriptIcon = image.load(currentScriptDirectory .. "Icons/Script.pic")
 
 local search = ""
 local appWidth, appHeight, appHSpacing, appVSpacing, currentPage, appsPerPage, appsPerWidth, appsPerHeight = 32, 6, 2, 1, 0
diff --git a/Applications/Lua.app/Icon.pic b/Applications/Lua.app/Icon.pic
new file mode 100644
index 0000000000000000000000000000000000000000..5b15d8193dbd1b77207e29d6abddd955244ba252
GIT binary patch
literal 272
zcmXw!O$q`r42ApB%(N@d;9Ug4l~)=;&>PIs{#-#&5S+W@B4av@i@?{fkJt2kI335x
zw7Q*?1uG(XfZ?U~6Nm@ak@{-4AVf)@4H+b5+7N)GhuI+Y+mHaSBlT$+l03m_3ACgX
z!yx(paAb^<?$!gzvt`s?%tq&QgIQZv_!h5*+}fL^wyrMLnKW|i5gNkYtPhgj-RdvW
H)zJR{{UbyH

literal 0
HcmV?d00001

diff --git a/Applications/Lua.app/Localizations/English.lang b/Applications/Lua.app/Localizations/English.lang
new file mode 100644
index 00000000..dab7151d
--- /dev/null
+++ b/Applications/Lua.app/Localizations/English.lang
@@ -0,0 +1,3 @@
+{
+	greeting = "Hello, "
+}
\ No newline at end of file
diff --git a/Applications/Lua.app/Localizations/French.lang b/Applications/Lua.app/Localizations/French.lang
new file mode 100644
index 00000000..cce92ece
--- /dev/null
+++ b/Applications/Lua.app/Localizations/French.lang
@@ -0,0 +1,3 @@
+{
+	greeting = "Bonjour, "
+}
\ No newline at end of file
diff --git a/Applications/Lua.app/Localizations/Russian.lang b/Applications/Lua.app/Localizations/Russian.lang
new file mode 100644
index 00000000..42abc380
--- /dev/null
+++ b/Applications/Lua.app/Localizations/Russian.lang
@@ -0,0 +1,3 @@
+{
+	greeting = "Привет, "
+}
\ No newline at end of file
diff --git a/Applications/Lua.app/Localizations/Ukrainian.lang b/Applications/Lua.app/Localizations/Ukrainian.lang
new file mode 100644
index 00000000..7a026018
--- /dev/null
+++ b/Applications/Lua.app/Localizations/Ukrainian.lang
@@ -0,0 +1,3 @@
+{
+	greeting = "Привіт, "
+}
\ No newline at end of file
diff --git a/Applications/Lua.app/Main.lua b/Applications/Lua.app/Main.lua
new file mode 100644
index 00000000..ee893661
--- /dev/null
+++ b/Applications/Lua.app/Main.lua
@@ -0,0 +1,40 @@
+
+local GUI = require("GUI")
+local system = require("System")
+
+---------------------------------------------------------------------------------
+
+local workspace, window, menu = system.addWindow(GUI.titledWindow(1, 1, 90, 25, "Terminal", true))
+
+local localization = system.getCurrentScriptLocalization()
+
+local lines = {
+	{
+		text = (computer.getArchitecture and computer.getArchitecture() or "Lua 5.2") .. " Copyright (C) 1994-2019 Lua.org, PUC-Rio",
+		color = 0x969696,
+	}
+}
+
+local textBox = window:addChild(GUI.textBox(2, 2, 1, 1, nil, 0x3C3C3C, lines, 1, 0, 0))
+textBox.passScreenEvents = true
+
+local input = window:addChild(GUI.input(1, 1, 1, 3, 0xE1E1E1, 0x2D2D2D, 0x969696, 0xE1E1E1, 0x2D2D2D, "", "Type statement here"))
+input.historyEnabled = true
+input.onInputFinished = function()
+	
+
+	input.text = ""
+end
+
+window.onResize = function(width, height)
+	window.backgroundPanel.width, window.backgroundPanel.height = width, height
+	textBox.width, textBox.height = width - 2, height - 4
+	input.localY, input.width = height - input.height + 1, width
+end
+
+
+---------------------------------------------------------------------------------
+
+window.actionButtons:moveToFront()
+window:resize(window.width, window.height)
+workspace:draw()
diff --git a/Applications/Picture Edit.app/Main.lua b/Applications/Picture Edit.app/Main.lua
index cf3ccebf..61d61bff 100644
--- a/Applications/Picture Edit.app/Main.lua	
+++ b/Applications/Picture Edit.app/Main.lua	
@@ -403,16 +403,16 @@ local function saveImage(path)
 		local result, reason = image.save(path, window.image.data, 6)
 		if result then
 			savePath, saveItem.disabled = path, false
-			
 			addRecentFile(path)
 		else
 			GUI.alert(reason)
 		end
 	else
 		savePath, saveItem.disabled = path, false
-
 		filesystem.write(path, image.toString(window.image.data))
 	end
+
+	computer.pushSignal("system", "updateFileList")
 end
 
 local fileItem = menu:addContextMenuItem("File")
diff --git a/Installer/Files.cfg b/Installer/Files.cfg
index 0a7baf86..436344d7 100644
--- a/Installer/Files.cfg
+++ b/Installer/Files.cfg
@@ -67,25 +67,34 @@
 		"Applications/Sample.app/Localizations/English.lang",
 		"Applications/Sample.app/Localizations/French.lang",
 		"Applications/Sample.app/Localizations/Ukrainian.lang",
+		"Applications/Sample.app/Localizations/German.lang",
+		"Applications/Sample.app/Localizations/Italian.lang",
 		-- App market
 		{ path="Applications/App Market.app/Main.lua", id=164 },
 		"Applications/App Market.app/Icon.pic",
+		"Applications/App Market.app/Icons/Lua.pic",
+		"Applications/App Market.app/Icons/Script.pic",
+		"Applications/App Market.app/Icons/FileNotExists.pic",
 		"Applications/App Market.app/Localizations/Russian.lang",
 		"Applications/App Market.app/Localizations/English.lang",
 		"Applications/App Market.app/Localizations/French.lang",
 		"Applications/App Market.app/Localizations/Ukrainian.lang",
+		"Applications/App Market.app/Localizations/German.lang",
+		"Applications/App Market.app/Localizations/Italian.lang",
 		-- MineCode IDE
 		{ path="Applications/MineCode IDE.app/Main.lua", id=169 },
 		"Applications/MineCode IDE.app/Icon.pic",
-		"Applications/MineCode IDE.app/Localizations/Russian.lang",
-		"Applications/MineCode IDE.app/Localizations/English.lang",
-		"Applications/MineCode IDE.app/Localizations/French.lang",
-		"Applications/MineCode IDE.app/Localizations/Ukrainian.lang",
 		"Applications/MineCode IDE.app/Extensions/.txt/Icon.pic",
 		"Applications/MineCode IDE.app/Extensions/.cfg/Icon.pic",
 		"Applications/MineCode IDE.app/Extensions/.lang/Icon.pic",
 		"Applications/MineCode IDE.app/Extensions/.lua/Icon.pic",
 		"Applications/MineCode IDE.app/Extensions/.lua/Context menu.lua",
+		"Applications/MineCode IDE.app/Localizations/Russian.lang",
+		"Applications/MineCode IDE.app/Localizations/English.lang",
+		"Applications/MineCode IDE.app/Localizations/French.lang",
+		"Applications/MineCode IDE.app/Localizations/Ukrainian.lang",
+		"Applications/MineCode IDE.app/Localizations/German.lang",
+		"Applications/MineCode IDE.app/Localizations/Italian.lang",
 		-- Picture Edit
 		{ path="Applications/Picture Edit.app/Main.lua", id=798 },
 		"Applications/Picture Edit.app/Icon.pic",
@@ -105,10 +114,6 @@
 		-- Settings
 		{ path="Applications/Settings.app/Main.lua", id=909 },
 		"Applications/Settings.app/Icon.pic",
-		"Applications/Settings.app/Localizations/English.lang",
-		"Applications/Settings.app/Localizations/Russian.lang",
-		"Applications/Settings.app/Localizations/French.lang",
-		"Applications/Settings.app/Localizations/Ukrainian.lang",
 		"Applications/Settings.app/Modules/0_Screen/Main.lua",
 		"Applications/Settings.app/Modules/0_Screen/Icon.pic",
 		"Applications/Settings.app/Modules/1_Wallpaper/Main.lua",
@@ -129,9 +134,12 @@
 		"Applications/Settings.app/Modules/7_Time/Icon.pic",
 		"Applications/Settings.app/Modules/8_System/Main.lua",
 		"Applications/Settings.app/Modules/8_System/Icon.pic",
-		-- Reinstall OS
-		{ path="Applications/Reinstall OS.app/Main.lua", shortcut = true },
-		"Applications/Reinstall OS.app/Icon.pic",
+		"Applications/Settings.app/Localizations/Russian.lang",
+		"Applications/Settings.app/Localizations/English.lang",
+		"Applications/Settings.app/Localizations/French.lang",
+		"Applications/Settings.app/Localizations/Ukrainian.lang",
+		"Applications/Settings.app/Localizations/German.lang",
+		"Applications/Settings.app/Localizations/Italian.lang",
 	},
 	optional = {
 		{ path="Libraries/JSON.lua", id=103 },
@@ -141,6 +149,9 @@
 		{ path="Libraries/OpenComputersGL/Renderer.lua", id=338 },
 		{ path="Libraries/OpenComputersGL/Materials.lua", id=339 },
 		{ path="Libraries/Vector.lua", id=520 },
+		-- Reinstall OS
+		{ path="Applications/Reinstall OS.app/Main.lua", shortcut = true },
+		"Applications/Reinstall OS.app/Icon.pic",
 		-- 3D Print
 		{ path="Applications/3D Print.app/Main.lua", id=859, shortcut = true },
 		"Applications/3D Print.app/Icon.pic",
diff --git a/Libraries/Filesystem.lua b/Libraries/Filesystem.lua
index 3a784e16..ca7dde1f 100644
--- a/Libraries/Filesystem.lua
+++ b/Libraries/Filesystem.lua
@@ -434,7 +434,7 @@ function filesystem.list(path, sortingMethod)
 		-- Fullfill list with mounted paths if needed
 		for i = 1, #mountedProxies do
 			if path == filesystem.path(mountedProxies[i].path) then
-				table.insert(list, filesystem.name(mountedProxies[i].path) .. "/")
+				table.insert(list, filesystem.name(mountedProxies[i].path))
 			end
 		end
 
diff --git a/Libraries/Paths.lua b/Libraries/Paths.lua
index 3433fd20..296e6831 100755
--- a/Libraries/Paths.lua
+++ b/Libraries/Paths.lua
@@ -20,6 +20,7 @@ paths.system.applicationMineCodeIDE = paths.system.applications .. "MineCode IDE
 paths.system.applicationFinder = paths.system.applications .. "Finder.app/Main.lua"
 paths.system.applicationPictureEdit = paths.system.applications .. "Picture Edit.app/Main.lua"
 paths.system.applicationSettings = paths.system.applications .. "Settings.app/Main.lua"
+paths.system.applicationTerminal = paths.system.applications .. "Terminal.app/Main.lua"
 
 --------------------------------------------------------------------------------