diff --git a/.DS_Store b/.DS_Store index 96bfa15e..cb7f92bc 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Applications.txt b/Applications.txt index aa46fdd2..55951ed8 100644 --- a/Applications.txt +++ b/Applications.txt @@ -886,7 +886,7 @@ icon="IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic", createShortcut="dock", forceDownload=true, - version=1.23, + version=1.24, resources={ { name="Localization/Russian.lang", diff --git a/Applications/MineCodeIDE/Localization/English.lang b/Applications/MineCodeIDE/Localization/English.lang index af511fc1..48c5514a 100755 --- a/Applications/MineCodeIDE/Localization/English.lang +++ b/Applications/MineCodeIDE/Localization/English.lang @@ -1,4 +1,10 @@ { + gotoCyka = "Goto", + gotoEnd = "Scroll to end", + gotoStart = "Scroll to start", + pageDown = "Page down", + pageUp = "Page up", + deleteLine = "Delete current line", cursorProperties = "Cursor properties", cursorSymbol = "Symbol", cursorColor = "Color", diff --git a/Applications/MineCodeIDE/Localization/Russian.lang b/Applications/MineCodeIDE/Localization/Russian.lang index 5f04c71b..a8d146da 100755 --- a/Applications/MineCodeIDE/Localization/Russian.lang +++ b/Applications/MineCodeIDE/Localization/Russian.lang @@ -1,4 +1,10 @@ { + gotoCyka = "Переход", + gotoEnd = "В конец", + gotoStart = "В начало", + pageDown = "На страницу ниже", + pageUp = "На страницу выше", + deleteLine = "Удалить текущую строку", cursorProperties = "Параметры курсора", cursorSymbol = "Символ", cursorColor = "Цвет", @@ -29,9 +35,9 @@ cut = "Вырезать", copy = "Копировать", paste = "Вставить", - selectAll = "Выбрать все", + selectAll = "Выделить все", edit = "Редактировать", - comment = "Комментировать код", + comment = "Комментировать", indent = "Табулировать", unindent = "Детабулировать", } \ No newline at end of file diff --git a/Applications/MineCodeIDE/MineCodeIDE.lua b/Applications/MineCodeIDE/MineCodeIDE.lua index e6b0053a..35f7316e 100755 --- a/Applications/MineCodeIDE/MineCodeIDE.lua +++ b/Applications/MineCodeIDE/MineCodeIDE.lua @@ -245,6 +245,14 @@ local function setCursorPositionToEnd() setCursorPositionAndClearSelection(unicode.len(mainWindow.codeView.lines[#mainWindow.codeView.lines]) + 1, #mainWindow.codeView.lines) end +local function pageUp() + scroll(1, mainWindow.codeView.height - 2) +end + +local function pageDown() + scroll(-1, mainWindow.codeView.height - 2) +end + local function scroll(direction, speed) if direction == 1 then if mainWindow.codeView.fromLine > speed then @@ -737,6 +745,9 @@ local function createWindow() menu:addItem(localization.unindent, false, "⇧Tab").onTouch = function() indentOrUnindent(false) end + menu:addItem(localization.deleteLine, false, "^Del").onTouch = function() + deleteLine(cursor.position.line) + end menu:addSeparator() menu:addItem(localization.selectAll, false, "^A").onTouch = function() selectAll() @@ -801,6 +812,24 @@ local function createWindow() menu:show() end + local item5 = mainWindow.topMenu:addItem(localization.gotoCyka) + item5.onTouch = function() + local menu = GUI.contextMenu(item5.x, item5.y + 1) + menu:addItem(localization.pageUp, false, "PgUp").onTouch = function() + pageUp() + end + menu:addItem(localization.pageDown, false, "PgDn").onTouch = function() + pageDown() + end + menu:addItem(localization.gotoStart, false, "Home").onTouch = function() + setCursorPositionToHome() + end + menu:addItem(localization.gotoEnd, false, "End").onTouch = function() + setCursorPositionToEnd() + end + menu:show() + end + mainWindow.topToolBar = mainWindow:addContainer(1, 2, 1, 3) mainWindow.topToolBar.backgroundPanel = mainWindow.topToolBar:addPanel(1, 1, 1, 3, config.colorScheme.topToolBar) mainWindow.titleTextBox = mainWindow.topToolBar:addTextBox(1, 1, 1, 3, 0x0, 0x0, {}, 1):setAlignment(GUI.alignment.horizontal.center, GUI.alignment.vertical.top) @@ -871,7 +900,7 @@ local function createWindow() if eventData[1] == "touch" and isClickedOnCodeArea(eventData[3], eventData[4]) then if eventData[5] == 1 then local menu = GUI.contextMenu(eventData[3], eventData[4]) - menu:addItem(localization.cut, not mainWindow.codeView.selections[1], "^C").onTouch = function() + menu:addItem(localization.cut, not mainWindow.codeView.selections[1], "^X").onTouch = function() cut() end menu:addItem(localization.copy, not mainWindow.codeView.selections[1], "^C").onTouch = function() @@ -982,10 +1011,10 @@ local function createWindow() setCursorPositionToEnd() -- Page Up elseif eventData[4] == 201 then - scroll(1, mainWindow.codeView.height - 2) + pageUp() -- Page Down elseif eventData[4] == 209 then - scroll(-1, mainWindow.codeView.height - 2) + pageDown() -- Delete elseif eventData[4] == 211 then delete()