Skip to content

Commit

Permalink
nnn
Browse files Browse the repository at this point in the history
  • Loading branch information
nagolove committed Jun 18, 2021
1 parent 93fdca5 commit ba44b69
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 27 deletions.
14 changes: 9 additions & 5 deletions nback.lua
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,16 @@ function Nback:createSetupMenu()
})


fullStr = 'fullStr'

print("------", tonumber(expositionList[activeExpositionItem]))
print("------", i18n("setupMenu.expTime_plural_stub", {
count = tonumber(expositionList[activeExpositionItem]),
}))












Expand Down
16 changes: 10 additions & 6 deletions nback.tl
Original file line number Diff line number Diff line change
Expand Up @@ -314,12 +314,16 @@ function Nback:createSetupMenu()
})

--XXX костыль
fullStr = 'fullStr'

print("------", tonumber(expositionList[activeExpositionItem]))
print("------", i18n("setupMenu.expTime_plural_stub", {
count = tonumber(expositionList[activeExpositionItem])
}))
--if not fullStr then
--print('fullStr', fullStr)
--os.exit()
--end
--fullStr = 'fullStr'

--print("------", tonumber(expositionList[activeExpositionItem]))
--print("------", i18n("setupMenu.expTime_plural_stub", {
--count = tonumber(expositionList[activeExpositionItem])
--}))

--print("------", i18n("setupMenu.expTime_plural", {
--count = tonumber(expositionList[activeExpositionItem])
Expand Down
10 changes: 5 additions & 5 deletions setupmenu.lua
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local string = _tl_compat and _tl_compat.string or string
local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local string = _tl_compat and _tl_compat.string or string; require("love")
require("common")

local g = love.graphics

SetupMenu = {Rect = {}, ItemHandler = {}, }






require("love")
require("common")

local g = love.graphics

SetupMenu = {Rect = {}, ItemHandler = {}, }



Expand Down
22 changes: 11 additions & 11 deletions setupmenu.tl
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
--
-- * уровень н-назад
-- * временя паузы
-- * длина раунда
--
-- * вывод расчетного значения времени раунда(Почему "раунд"? Бокс что-ли?
-- Попробуй заменить на время концентрации

require "love"
require "common"

Expand All @@ -22,9 +14,15 @@ global type SetupMenu = record
end

record ItemHandler
oninit: function(): {any}, boolean, boolean
onleft: function(): {any}, boolean, boolean
onright: function(): {any}, boolean, boolean
-- функция возвращает что угодно(содержимое поля),
-- первый-ли элемент списка, последний-ли элеменет списка.
type OnAction = function(): {any}, boolean, boolean
--oninit: function(): {any}, boolean, boolean
--onleft: function(): {any}, boolean, boolean
--onright: function(): {any}, boolean, boolean
oninit: OnAction
onleft: OnAction
onright: OnAction
onselect: function(ItemHandler)

content: {string}
Expand All @@ -48,6 +46,8 @@ global type SetupMenu = record
markerColor: {number}
activeMarkerColor: {number}
inactiveMarkerColor: {number}

-- что за флаг?
freeze: boolean

new: function(love.graphics.Font, {number}): SetupMenu
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ba44b69

Please sign in to comment.