TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-06 03:02:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

гм

Browse Source
This commit is contained in:
Igor Timofeev 2016-06-03 12:08:06 +03:00
parent 9753de15eb
commit c2a21777c2
6 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Applications.txt
View File

@ -22,8 +22,8 @@
["version"]=1.0,
},
{
["name"]="MineOS/Pictures/Harp.pic",
["url"]="IgorTimofeev/OpenComputers/master/MineOS/Wallpapers/Harp.pic",
["name"]="MineOS/Pictures/Nettle.pic",
["url"]="IgorTimofeev/OpenComputers/master/MineOS/Wallpapers/Nettle.pic",
["type"]="Wallpaper",
["version"]=1.0,
},

BIN
Applications/AppMarket/Icon.pic
View File

Binary file not shown.

2
Installer/Installer.lua
View File

@ -386,7 +386,7 @@ end
--Создаем базовые обои рабочего стола
if downloadWallpapers then
ecs.createShortCut(desktopPath .. "Pictures.lnk", picturesPath)
ecs.createShortCut("MineOS/System/OS/Wallpaper.lnk", picturesPath .. "Girl.pic")
ecs.createShortCut("MineOS/System/OS/Wallpaper.lnk", picturesPath .. "Nettle.pic")
end
--Автозагрузка

2
MineOS/OS.lua
View File

@ -444,7 +444,7 @@ while true do
if clickedAtEmptyArea then
for _, icon in pairs(obj.DesktopIcons) do
if icon:isClicked(eventData[3], eventData[4]) then
if MineOSCore.iconClick(icon, eventData, colors.selection, colors.iconsSelectionTransparency, 0xFFFFFF, 0.2, showFileFormat, {method = getFileListAndDrawAll, arguments = {}}, {method = getFileListAndDrawAll, arguments = {true}}, {method = function() MineOSCore.safeLaunch("Finder.lua", "open", icon.path) end, arguments = {icon.path}}) then return end
if MineOSCore.iconClick(icon, eventData, colors.selection, colors.iconsSelectionTransparency, 0xFFFFFF, 0.2, showFileFormat, {method = getFileListAndDrawAll, arguments = {}}, {method = getFileListAndDrawAll, arguments = {true}}, {method = function() MineOSCore.safeLaunch("Finder.lua", "open", icon.path) end, arguments = {}}) then return end
clickedAtEmptyArea = false
break
end

BIN
MineOS/Wallpapers/Nettle.pic Normal file
View File

Binary file not shown.

2
lib/MineOSCore.lua
View File

@ -155,7 +155,7 @@ function MineOSCore.launchIcon(path, translate)
MineOSCore.safeLaunch(path .. "/" .. ecs.hideFileFormat(fs.name(path)) .. ".lua")
--Если это папка
elseif (fileFormat == "" or fileFormat == nil) and isDirectory then
MineOSCore.safeLaunch("MineOS/Applications/Finder.app/Finder.lua " .. path)
MineOSCore.safeLaunch("MineOS/Applications/Finder.app/Finder.lua", "open", path)
--Если это обычный луа файл - т.е. скрипт
elseif fileFormat == ".lua" or fileFormat == nil then
buffer.clear(MineOSCore.colors.background)