Skip to content

Commit

Permalink
Some fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
nagolove committed Apr 10, 2020
1 parent ed8f96b commit a881fff
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Compiled Lua sources
luac.out
*.apk
*.sh
*.keystore

# luarocks build files
*.src.rock
Expand Down
2 changes: 2 additions & 0 deletions locales/en.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
twoDays = "two days ago",
threeDays = "three days ago",
fourDays = "four days ago",
fiveDays = "five days ago",
sixDays = "six days ago",
lastWeek = "last week",
lastTwoWeek = "last two week",
lastMonth = "last month",
Expand Down
2 changes: 2 additions & 0 deletions locales/ru.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
twoDays = "два дня назад",
threeDays = "три дня назад",
fourDays = "четыре дня назад",
fiveDays = "пять дней назад",
sixDays = "шесть дней назад",
lastWeek = "на прошлой неделе",
lastTwoWeek = "две недели назад",
lastMonth = "в прошлом месяце",
Expand Down
4 changes: 2 additions & 2 deletions main.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
onAndroid = love.system.getOS() == "Android" or false
useKeyboard = true
--[[preventiveFirstRun = true]]
preventiveFirstRun = false
preventiveFirstRun = true
--preventiveFirstRun = false
onAndroid = true

require "common"
Expand Down
16 changes: 8 additions & 8 deletions pviewer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ function pviewer:makeList()

local str
for k, v in pairs(self.data) do
--[[local str = compareDates(os.date("*t"), v.date)]]
if k == 1 then
str = "-- " .. tostring(k) .. string.format(" (%d) ..", #self.data)
else
str = "-- " .. tostring(k) .. " .."
end
str = compareDates(os.date("*t"), v.date)
--if k == 1 then
--str = "-- " .. tostring(k) .. string.format(" (%d) ..", #self.data)
--else
--str = "-- " .. tostring(k) .. " .."
--end
local item = self.list:add(str)
item.data = v
item.color = pallete.levelColors[v.level]
Expand Down Expand Up @@ -107,8 +107,8 @@ function pviewer:enter()
end

-------------------------------------------
--__MORE_DATA__ = false
__MORE_DATA__ = true
__MORE_DATA__ = false
--__MORE_DATA__ = true
if __MORE_DATA__ then
local tmp = {}
for i = 1, 6 do
Expand Down
7 changes: 1 addition & 6 deletions pviewer_list.lua
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,6 @@ function List:mousereleased(x, y, b, it)
end

function List:mousemoved(x, y, dx, dy)
--if inside(x, y, self.x + 2, self.y + 1, self.width - 3, self.height - 3) then
--local tx, ty = x - self.x, y + self:getOffset() - self.y
--local index = math.floor((ty / self.sum_item_height) * self.items.n)
--self.hoveritem = index + 1
--end
end

function List:touchpressed(id, x, y)
Expand All @@ -144,7 +139,7 @@ end

function List:draw()
love.graphics.setLineWidth(1)
love.graphics.setLineStyle("rough")
--love.graphics.setLineStyle("rough")
love.graphics.setColor(self.windowcolor)

--love.graphics.setScissor(self.x, self.y, self.width, self.height)
Expand Down

0 comments on commit a881fff

Please sign in to comment.