diff --git a/Applications.cfg b/Applications.cfg index d6c02256..375c781c 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -785,12 +785,12 @@ }, { path="/MineOS/Applications/Calendar", - url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Calendar/Calendar.lua", + url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Calendar/Main.lua", about="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Calendar/About/", type="Application", icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Calendar/Icon.pic", createShortcut=true, - version=1.0, + version=1.01, }, { path="/MineOS/Applications/PrintImage", diff --git a/Applications/Calendar/Icon.pic b/Applications/Calendar/Icon.pic old mode 100644 new mode 100755 index cf2b3f92..fe793466 Binary files a/Applications/Calendar/Icon.pic and b/Applications/Calendar/Icon.pic differ diff --git a/Applications/Calendar/Calendar.lua b/Applications/Calendar/Main.lua old mode 100644 new mode 100755 similarity index 98% rename from Applications/Calendar/Calendar.lua rename to Applications/Calendar/Main.lua index 6146bf64..0477130f --- a/Applications/Calendar/Calendar.lua +++ b/Applications/Calendar/Main.lua @@ -280,7 +280,7 @@ local function drawCalendar(xPos, yPos, year) drawMonth(xPos, yPos, massivGoda[i].firstDayPosition, massivGoda[i].countOfDays, year, i) --Корректируем коорды xPos = xPos + constants.xSpaceBetweenMonths + 27 - if i % 4 == 0 then xPos = 2; yPos = yPos + constants.ySpaceBetweenMonths + 15 end + if i % 4 == 0 then xPos = 3; yPos = yPos + constants.ySpaceBetweenMonths + 15 end end end @@ -325,7 +325,7 @@ local function drawAll() --Очищаем экран ecs.square(1, 1, xMax, yMax, constants.backgroundColor) --Рисуем календарик - drawCalendar(2, 2, constants.programYear) + drawCalendar(3, 2, constants.programYear) --Рисуем парашу drawInfo() end @@ -362,7 +362,7 @@ while true do end drawInfo() - drawCalendar(2, 2, constants.programYear) + drawCalendar(3, 2, constants.programYear) break end