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

Вот-вот

Browse Source
This commit is contained in:
Igor Timofeev 2017-01-06 22:18:11 +03:00
parent 14f15d22dd
commit 47243f4380
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

4
Applications.txt
View File

@ -8,7 +8,7 @@
about="IgorTimofeev/OpenComputers/master/MineOS/About/",
type="Script",
forceDownload=true,
version=3.32,
version=3.33,
},
{
name="MineOS/Pictures/Raspberry.pic",
@ -271,7 +271,7 @@
name="lib/MineOSCore.lua",
url="IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
type="Library",
version=1.26,
version=1.27,
},
{
name="lib/advancedLua.lua",

17
lib/MineOSCore.lua
View File

@ -246,6 +246,7 @@ function MineOSCore.analyseIconFormat(iconObject)
iconObject.iconImage.image = shortcutIconObject.iconImage.image
iconObject.launch = shortcutIconObject.launch
iconObject.isDirectory = shortcutIconObject.isDirectory
shortcutIconObject = nil
elseif iconObject.format == ".cfg" or iconObject.format == ".config" then
@ -605,6 +606,8 @@ function MineOSCore.iconLeftClick(iconObject, eventData)
if iconObject.format == ".app" then
iconObject.launch()
computer.pushSignal("MineOSCore", "updateFileList")
elseif iconObject.isShortcut then
computer.pushSignal("MineOSCore", "changeWorkpath", iconObject.shortcutPath)
else
computer.pushSignal("MineOSCore", "changeWorkpath", iconObject.path)
end
@ -633,6 +636,18 @@ function MineOSCore.iconRightClick(icon, eventData)
{MineOSCore.localization.contextMenuAddToDock},
{MineOSCore.localization.contextMenuDelete}
):show()
elseif icon.isShortcut then
action = GUI.contextMenu(eventData[3], eventData[4],
{MineOSCore.localization.contextMenuEdit},
{MineOSCore.localization.contextMenuShowContainingFolder},
"-",
{MineOSCore.localization.contextMenuCut},
{MineOSCore.localization.contextMenuCopy},
{MineOSCore.localization.contextMenuRename},
"-",
{MineOSCore.localization.contextMenuAddToDock},
{MineOSCore.localization.contextMenuDelete}
):show()
else
action = GUI.contextMenu(eventData[3], eventData[4],
{MineOSCore.localization.contextMenuCut},
@ -700,6 +715,8 @@ function MineOSCore.iconRightClick(icon, eventData)
ecs.prepareToExit()
MineOSCore.safeLaunch("/bin/edit.lua", icon.path)
computer.pushSignal("MineOSCore", "updateFileListAndBufferTrueRedraw")
elseif action == MineOSCore.localization.contextMenuShowContainingFolder then
computer.pushSignal("MineOSCore", "changeWorkpath", fs.path(icon.shortcutPath))
elseif action == MineOSCore.localization.contextMenuEditInPhotoshop then
MineOSCore.safeLaunch("MineOS/Applications/Photoshop.app/Photoshop.lua", "open", icon.path)
computer.pushSignal("MineOSCore", "updateFileList")