diff --git a/Applications/MineCode IDE.app/Main.lua b/Applications/MineCode IDE.app/Main.lua index d26fc8f5..105b4397 100755 --- a/Applications/MineCode IDE.app/Main.lua +++ b/Applications/MineCode IDE.app/Main.lua @@ -1344,7 +1344,7 @@ local function createEditOrRightClickMenu(menu) selectAndPasteColor() end - local subMenu = menu:addSubMenu(localization.convertCase) + local subMenu = menu:addSubMenuItem(localization.convertCase) subMenu:addItem(localization.toUpperCase, false, "^▲").onTouch = function() convertCase("upper") @@ -1587,7 +1587,7 @@ leftTreeView.onItemSelected = function(path) workspace:draw() end -local MineCodeContextMenu = menu:addContextMenu("MineCode", 0x0) +local MineCodeContextMenu = menu:addContextMenuItem("MineCode", 0x0) MineCodeContextMenu:addItem(localization.about).onTouch = function() local container = addBackgroundContainer(localization.about) @@ -1617,7 +1617,7 @@ MineCodeContextMenu:addItem(localization.about).onTouch = function() workspace:draw() end -local fileContextMenu = menu:addContextMenu(localization.file) +local fileContextMenu = menu:addContextMenuItem(localization.file) fileContextMenu:addItem(localization.new, false, "^N").onTouch = function() newFile() workspace:draw() @@ -1660,10 +1660,10 @@ fileContextMenu:addItem(localization.launchWithArguments, false, "^F5").onTouch launchWithArgumentsWindow() end -local topMenuEdit = menu:addContextMenu(localization.edit) +local topMenuEdit = menu:addContextMenuItem(localization.edit) createEditOrRightClickMenu(topMenuEdit) -local gotoContextMenu = menu:addContextMenu(localization.gotoCyka) +local gotoContextMenu = menu:addContextMenuItem(localization.gotoCyka) gotoContextMenu:addItem(localization.pageUp, false, "PgUp").onTouch = function() pageUp() end @@ -1686,7 +1686,7 @@ gotoContextMenu:addItem(localization.gotoLine, false, "^L").onTouch = function() gotoLineWindow() end -local propertiesContextMenu = menu:addContextMenu(localization.properties) +local propertiesContextMenu = menu:addContextMenuItem(localization.properties) propertiesContextMenu:addItem(localization.colorScheme).onTouch = function() local container = GUI.addBackgroundContainer(workspace, true, false, localization.colorScheme) diff --git a/Applications/Picture Edit.app/Main.lua b/Applications/Picture Edit.app/Main.lua index 234eb44d..3144ff65 100644 --- a/Applications/Picture Edit.app/Main.lua +++ b/Applications/Picture Edit.app/Main.lua @@ -356,7 +356,7 @@ end workspace.menu:addItem("PE", 0x00B6FF) -local fileItem = workspace.menu:addContextMenu("File") +local fileItem = workspace.menu:addContextMenuItem("File") fileItem:addItem("New").onTouch = new fileItem:addSeparator() @@ -375,7 +375,7 @@ fileItem:addItem("Open").onTouch = function() end end -local fileItemSubMenu = fileItem:addSubMenu("Open recent", #config.recentFiles == 0) +local fileItemSubMenu = fileItem:addSubMenuItem("Open recent", #config.recentFiles == 0) for i = 1, #config.recentFiles do fileItemSubMenu:addItem(text.limit(config.recentFiles[i], 32, "left")).onTouch = function() loadImage(config.recentFiles[i]) diff --git a/Applications/Sample.app/Main.lua b/Applications/Sample.app/Main.lua index 4abde226..e59f9ec9 100644 --- a/Applications/Sample.app/Main.lua +++ b/Applications/Sample.app/Main.lua @@ -1,7 +1,7 @@ -- Import libraries local GUI = require("GUI") -local system = require("system") +local system = require("System") --------------------------------------------------------------------------------- @@ -14,11 +14,11 @@ local localization = system.getCurrentScriptLocalization() -- Add single cell layout to window local layout = window:addChild(GUI.layout(1, 1, window.width, window.height, 1, 1)) --- Add nice grey text object to layout +-- Add nice gray text object to layout layout:addChild(GUI.text(1, 1, 0x4B4B4B, localization.greeting .. system.getUser())) --- Customize MineOS menu for this application -local contextMenu = menu:addContextMenu("File") +-- Customize MineOS menu for this application by your will +local contextMenu = menu:addContextMenuItem("File") contextMenu:addItem("New") contextMenu:addSeparator() contextMenu:addItem("Open") diff --git a/Libraries/GUI.lua b/Libraries/GUI.lua index 60514a8b..d32b5bb5 100755 --- a/Libraries/GUI.lua +++ b/Libraries/GUI.lua @@ -4000,9 +4000,9 @@ local function contextMenuUpdate(menu) end end -local contextMenuCreate, contextMenuAddSubMenu +local contextMenuCreate, contextMenuaddSubMenuItem -contextMenuAddSubMenu = function(menu, text, disabled) +contextMenuaddSubMenuItem = function(menu, text, disabled) local item = menu:addItem(text, disabled, "►") item.subMenu = contextMenuCreate(1, 1) item.subMenu.colors = menu.colors @@ -4028,7 +4028,7 @@ contextMenuCreate = function(x, y, backgroundColor, textColor, backgroundPressed ) menu.update = contextMenuUpdate - menu.addSubMenu = contextMenuAddSubMenu + menu.addSubMenuItem = contextMenuaddSubMenuItem return menu end @@ -4343,7 +4343,7 @@ local function menuContextMenuItemOnTouch(workspace, item) workspace:draw() end -local function menuAddContextMenu(menu, ...) +local function menuAddContextMenuItem(menu, ...) local item = menu:addItem(...) item.switchMode = true @@ -4373,7 +4373,7 @@ function GUI.menu(x, y, width, backgroundColor, textColor, backgroundPressedColo } menu.passScreenEvents = false - menu.addContextMenu = menuAddContextMenu + menu.addContextMenuItem = menuAddContextMenuItem menu.addItem = menuAddItem menu.getItem = menuGetItem menu.draw = menuDraw diff --git a/Libraries/System.lua b/Libraries/System.lua index cb48121d..c32a62a3 100755 --- a/Libraries/System.lua +++ b/Libraries/System.lua @@ -67,7 +67,7 @@ function system.getDefaultUserSettings() return { localizationLanguage = "English", - timeFormat = "%d %b %Y %H:%M:%S", + timeForat = "%d %b %Y %H:%M:%S", timeRealTimestamp = true, timeTimezone = 0, @@ -706,7 +706,7 @@ local function iconOnDoubleClick(icon) end function system.uploadToPastebin(path) - local container = addBackgroundContainerWithInput(filesystem.name(path), localization.uploadToPastebin, localization.pasteName) + local container = addBackgroundContainerWithInput("", localization.uploadToPastebin, localization.pasteName) local result, reason container.panel.eventHandler = function(workspace, panel, e1) @@ -859,7 +859,7 @@ local function iconOnRightClick(icon, e1, e2, e3, e4) contextMenu:addSeparator() end - -- local subMenu = contextMenu:addSubMenu(localization.openWith) + -- local subMenu = contextMenu:addSubMenuItem(localization.openWith) -- local fileList = filesystem.sortedList(paths.system.applications, "name") -- subMenu:addItem(localization.select) -- subMenu:addSeparator() @@ -894,7 +894,7 @@ local function iconOnRightClick(icon, e1, e2, e3, e4) contextMenu:addSeparator() end - local subMenu = contextMenu:addSubMenu(localization.archive .. (#selectedIcons > 1 and " (" .. #selectedIcons .. ")" or "")) + local subMenu = contextMenu:addSubMenuItem(localization.archive .. (#selectedIcons > 1 and " (" .. #selectedIcons .. ")" or "")) local function archive(where) local itemsToArchive = {} @@ -939,7 +939,7 @@ local function iconOnRightClick(icon, e1, e2, e3, e4) end if not icon.isShortcut or #selectedIcons > 1 then - local subMenu = contextMenu:addSubMenu(localization.createShortcut) + local subMenu = contextMenu:addSubMenuItem(localization.createShortcut) subMenu:addItem(localization.inCurrentDirectory).onTouch = function() for i = 1, #selectedIcons do @@ -1132,7 +1132,7 @@ local function iconFieldBackgroundObjectEventHandler(workspace, object, e1, e2, else local contextMenu = GUI.addContextMenu(workspace, e3, e4) - local subMenu = contextMenu:addSubMenu(localization.create) + local subMenu = contextMenu:addSubMenuItem(localization.create) subMenu:addItem(localization.newFile).onTouch = function() local container = addBackgroundContainerWithInput("", localization.newFile, localization.fileName) @@ -1255,10 +1255,6 @@ local function iconFieldBackgroundObjectEventHandler(workspace, object, e1, e2, subMenu:addItem(localization.newApplication).onTouch = function() local container = addBackgroundContainerWithInput("", localization.newApplication, localization.applicationName) - - local filesystemChooser = container.layout:addChild(GUI.filesystemChooser(1, 1, 36, 3, 0xE1E1E1, 0x696969, 0x444444, 0x969696, nil, localization.open, localization.cancel, localization.iconPath, "/")) - filesystemChooser:addExtensionFilter(".pic") - filesystemChooser:moveBackward() container.panel.eventHandler = function(workspace, panel, e1) if e1 == "touch" then @@ -1284,7 +1280,7 @@ local function iconFieldBackgroundObjectEventHandler(workspace, object, e1, e2, contextMenu:addSeparator() - local subMenu = contextMenu:addSubMenu(localization.sortBy) + local subMenu = contextMenu:addSubMenuItem(localization.sortBy) local function setSortingMethod(sm) object.parent:deleteIconConfig() @@ -1527,7 +1523,7 @@ function system.addWindow(window, dontAddToDock, preserveCoordinates) window.menu = GUI.menu(1, 1, 1) window.menu.colors = desktopMenu.colors local name = filesystem.hideExtension(filesystem.name(dockPath)) - local contextMenu = window.menu:addContextMenu(name, 0x0) + local contextMenu = window.menu:addContextMenuItem(name, 0x0) contextMenu:addItem(localization.closeWindow .. " " .. name, false, "^W").onTouch = function() window:remove() @@ -2175,7 +2171,7 @@ function system.updateDesktop() desktopMenu = workspace:addChild(GUI.menu(1, 1, workspace.width, 0x0, 0x696969, 0x3366CC, 0xFFFFFF)) - local MineOSContextMenu = desktopMenu:addContextMenu("MineOS", 0x000000) + local MineOSContextMenu = desktopMenu:addContextMenuItem("MineOS", 0x000000) MineOSContextMenu:addItem(localization.aboutSystem).onTouch = function() local container = GUI.addBackgroundContainer(workspace, true, true, localization.aboutSystem) container.layout:removeChildren()