diff --git a/Applications.txt b/Applications.txt index 16821ccf..6c87ac83 100644 --- a/Applications.txt +++ b/Applications.txt @@ -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, }, diff --git a/Applications/AppMarket/Icon.pic b/Applications/AppMarket/Icon.pic index 2edec1f0..4573a17d 100644 Binary files a/Applications/AppMarket/Icon.pic and b/Applications/AppMarket/Icon.pic differ diff --git a/Installer/Installer.lua b/Installer/Installer.lua index 742e4c90..a4e49df9 100644 --- a/Installer/Installer.lua +++ b/Installer/Installer.lua @@ -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 --Автозагрузка diff --git a/MineOS/OS.lua b/MineOS/OS.lua index a4684c31..6b503c03 100644 --- a/MineOS/OS.lua +++ b/MineOS/OS.lua @@ -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 diff --git a/MineOS/Wallpapers/Nettle.pic b/MineOS/Wallpapers/Nettle.pic new file mode 100644 index 00000000..40c06cd1 Binary files /dev/null and b/MineOS/Wallpapers/Nettle.pic differ diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua index fc826383..ece2e4fc 100644 --- a/lib/MineOSCore.lua +++ b/lib/MineOSCore.lua @@ -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)