TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-09 12:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Багфиксы FTP

Browse Source
This commit is contained in:
Igor Timofeev 2017-09-23 00:01:29 +03:00
parent ebb8f70bbc
commit 150ad5ad15
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Applications.cfg
View File

@ -5,7 +5,7 @@
about="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/MineOS/About/",
type="Script",
forceDownload=true,
version=3.85,
version=3.86,
},
{
path="/MineOS/Pictures/MoonTouch.pic",
@ -223,7 +223,7 @@
path="/lib/MineOSCore.lua",
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
type="Library",
version=1.86,
version=1.87,
},
{
path="/lib/MineOSNetwork.lua",
@ -488,7 +488,7 @@
icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Finder/Icon.pic",
createShortcut="dock",
forceDownload=true,
version=1.19,
version=1.20,
},
{
path="/MineOS/Applications/3DTest",

8
Applications/Finder/Main.lua
View File

@ -18,7 +18,6 @@ local scrollTimerID
local favourites = {
{text = "Root", path = "/"},
{text = "Desktop", path = MineOSCore.paths.desktop},
{text = "Downloads", path = MineOSCore.paths.downloads},
{text = "Applications", path = MineOSCore.paths.applications},
{text = "Pictures", path = MineOSCore.paths.pictures},
{text = "System", path = MineOSCore.paths.system},
@ -111,7 +110,6 @@ end
local function sidebarItemOnTouch(object, eventData)
if eventData[5] == 0 then
addWorkpath(object.path)
window.iconField.yOffset = 2
window.iconField:updateFileList()
mainContainer:draw()
@ -175,9 +173,13 @@ window.iconField = window:addChild(
MineOSCore.paths.desktop
)
)
local oldSetWorkPath = window.iconField.setWorkpath
window.iconField.setWorkpath = function(...)
window.iconField.yOffset = 2
oldSetWorkPath(...)
end
window.iconField.launchers.directory = function(icon)
addWorkpath(icon.path)
window.iconField:updateFileList()
mainContainer:draw()
buffer.draw()
end

1
MineOS/OS.lua
View File

@ -855,7 +855,6 @@ end
createOSWindow()
changeResolution()
changeWallpaper()
MineOSCore.OSMainContainer.iconField:updateFileList()
MineOSCore.OSUpdateTimezone()
MineOSCore.OSUpdateDate()
login()

6
lib/MineOSCore.lua
View File

@ -304,9 +304,6 @@ end
function MineOSCore.iconLaunchers.directory(icon)
icon.parent.parent:setWorkpath(icon.path)
icon.parent.parent:updateFileList()
icon:getFirstParent():draw()
buffer.draw()
end
function MineOSCore.iconLaunchers.shortcut(icon)
@ -336,7 +333,7 @@ function MineOSCore.iconLaunchers.showPackageContent(icon)
end
function MineOSCore.iconLaunchers.showContainingFolder(icon)
icon.parent.parent:setWorkpath(icon.shortcutPath)
icon.parent.parent:setWorkpath(fs.path(icon.shortcutPath))
icon.parent.parent:updateFileList()
icon:getFirstParent():draw()
buffer.draw()
@ -417,6 +414,7 @@ local function getCykaIconPosition(iconField)
end
local function iconFieldUpdateFileList(iconField)
-- GUI.error(debug.traceback())
iconField.fileList = fs.sortedList(iconField.workpath, MineOSCore.OSSettings.sortingMethod or "type", MineOSCore.OSSettings.showHiddenFiles)
iconField:update()