App market fix

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 luaIcon = image.load(currentScriptDirectory .. "Icons/Lua.pic")
-local fileNotExistsIcon = image.load(paths.system.icons .. "FileNotExists.pic")
+local fileNotExistsIcon = image.load(currentScriptDirectory .. "Icons/FileNotExists.pic")
-local scriptIcon = image.load(paths.system.icons .. "Script.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

Applications/Lua.app/Localizations/English.lang

@@ -0,0 +1,3 @@
+{
+	greeting = "Hello, "
+}

Applications/Lua.app/Localizations/French.lang

@@ -0,0 +1,3 @@
+{
+	greeting = "Bonjour, "
+}

Applications/Lua.app/Localizations/Russian.lang

@@ -0,0 +1,3 @@
+{
+	greeting = "Привет, "
+}

Applications/Lua.app/Localizations/Ukrainian.lang

@@ -0,0 +1,3 @@
+{
+	greeting = "Привіт, "
+}

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()

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")

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
+		"Applications/Settings.app/Localizations/Russian.lang",
-		{ path="Applications/Reinstall OS.app/Main.lua", shortcut = true },
+		"Applications/Settings.app/Localizations/English.lang",
-		"Applications/Reinstall OS.app/Icon.pic",
+		"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",

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
 

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"
 
 --------------------------------------------------------------------------------