TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2025-12-20 02:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add wallpapers catalog to market

Browse Source
This commit is contained in:
Smok1e 2024-01-29 15:45:33 +03:00
parent 99abd11ed4
commit 4af2e006f1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Applications/App Market.app/Main.lua
View File

@ -32,6 +32,7 @@ local categories = {
{ icon = "🎸", name = localization.categoryApplications }, { icon = "🎸", name = localization.categoryApplications },
{ icon = "📖", name = localization.categoryLibraries }, { icon = "📖", name = localization.categoryLibraries },
{ icon = "˃.", name = localization.categoryScripts }, { icon = "˃.", name = localization.categoryScripts },
{ icon = "⛵", name = localization.categoryWallpapers },
} }
local orderDirections = { local orderDirections = {
@ -43,6 +44,7 @@ local downloadPaths = {
paths.system.applications, paths.system.applications,
paths.system.libraries, paths.system.libraries,
"/", "/",
paths.system.wallpapers
} }
local licenses = { local licenses = {
@ -446,7 +448,8 @@ end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
local function getApplicationPathFromVersions(versionsPath) local function getApplicationPathFromVersions(versionsPath)
return versionsPath:gsub("%.app/Main%.lua", ".app") -- return versionsPath:gsub("%.app/Main%.lua", ".app")
return versionsPath:match("%.[awlp]+/Main%.lua") and filesystem.path(versionsPath) or versionsPath
end end
local function getDependencyPath(mainFilePath, dependency) local function getDependencyPath(mainFilePath, dependency)
@ -484,6 +487,8 @@ local function download(publication)
if not filesystemChooserPath then if not filesystemChooserPath then
if publication.category_id == 1 then if publication.category_id == 1 then
filesystemChooserPath = downloadPaths[publication.category_id] .. publication.publication_name .. ".app" filesystemChooserPath = downloadPaths[publication.category_id] .. publication.publication_name .. ".app"
elseif publication.category_id == 4 then
filesystemChooserPath = downloadPaths[publication.category_id] .. publication.publication_name .. ".wlp"
else else
filesystemChooserPath = downloadPaths[publication.category_id] .. publication.path filesystemChooserPath = downloadPaths[publication.category_id] .. publication.path
end end
@ -500,7 +505,7 @@ local function download(publication)
tree.items = {} tree.items = {}
tree.fromItem = 1 tree.fromItem = 1
mainFilePath = filesystemChooser.path .. (publication.category_id == 1 and "/Main.lua" or "") mainFilePath = filesystemChooser.path .. (((publication.category_id == 1 or publication.category_id == 4) and "/Main.lua") or "")
-- Вот тута будет йоба-древо -- Вот тута будет йоба-древо
local dependencyTree = {} local dependencyTree = {}
@ -552,7 +557,7 @@ local function download(publication)
end end
local shortcutSwitchAndLabel = container.layout:addChild(GUI.switchAndLabel(1, 1, 44, 6, 0x66DB80, 0x0, 0xE1E1E1, 0x878787, localization.createShortcut .. ":", true)) local shortcutSwitchAndLabel = container.layout:addChild(GUI.switchAndLabel(1, 1, 44, 6, 0x66DB80, 0x0, 0xE1E1E1, 0x878787, localization.createShortcut .. ":", true))
shortcutSwitchAndLabel.hidden = publication.category_id == 2 shortcutSwitchAndLabel.hidden = publication.category_id == 2 or publication.category_id == 4
container.layout:addChild(GUI.button(1, 1, 44, 3, 0x696969, 0xFFFFFF, 0x0, 0xFFFFFF, localization.download)).onTouch = function() container.layout:addChild(GUI.button(1, 1, 44, 3, 0x696969, 0xFFFFFF, 0x0, 0xFFFFFF, localization.download)).onTouch = function()
container.layout:removeChildren(2) container.layout:removeChildren(2)
@ -1742,7 +1747,7 @@ editPublication = function(initialPublication, initialCategoryID)
iconUrlInput.onInputFinished, nameInput.onInputFinished, mainUrlInput.onInputFinished, mainPathInput.onInputFinished, descriptionInput.onInputFinished = checkFields, checkFields, checkFields, checkFields, checkFields iconUrlInput.onInputFinished, nameInput.onInputFinished, mainUrlInput.onInputFinished, mainPathInput.onInputFinished, descriptionInput.onInputFinished = checkFields, checkFields, checkFields, checkFields, checkFields
categoryComboBox.onItemSelected = function() categoryComboBox.onItemSelected = function()
iconHint.hidden = categoryComboBox.selectedItem > 1 iconHint.hidden = categoryComboBox.selectedItem ~= 1 and categoryComboBox.selectedItem ~= 4
iconUrlInput.hidden = iconHint.hidden iconUrlInput.hidden = iconHint.hidden
pathHint.hidden = not iconHint.hidden pathHint.hidden = not iconHint.hidden
@ -1760,7 +1765,7 @@ editPublication = function(initialPublication, initialCategoryID)
table.insert(dependencies, dependenciesLayout.comboBox:getItem(i).dependency) table.insert(dependencies, dependenciesLayout.comboBox:getItem(i).dependency)
end end
if categoryComboBox.selectedItem == 1 then if categoryComboBox.selectedItem == 1 or categoryComboBox.selectedItem == 4 then
table.insert(dependencies, { table.insert(dependencies, {
source_url = iconUrlInput.text, source_url = iconUrlInput.text,
path = "Icon.pic" path = "Icon.pic"
@ -1774,7 +1779,7 @@ editPublication = function(initialPublication, initialCategoryID)
token = user.token, token = user.token,
name = nameInput.text, name = nameInput.text,
source_url = mainUrlInput.text, source_url = mainUrlInput.text,
path = categoryComboBox.selectedItem == 1 and "Main.lua" or mainPathInput.text, path = (categoryComboBox.selectedItem == 1 or categoryComboBox.selectedItem == 4) and "Main.lua" or mainPathInput.text,
description = descriptionInput.text, description = descriptionInput.text,
license_id = licenseComboBox.selectedItem, license_id = licenseComboBox.selectedItem,
dependencies = dependencies, dependencies = dependencies,