From faee1ea9c1cd8b11093fdc0b1b1056c91fa7a696 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Thu, 19 Oct 2017 02:37:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9B=D1=83=D1=87=D1=88=D0=B5=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B7=D0=B4=D0=BD=D0=BE,=20=D1=87=D0=B5=D0=BC=20=D0=BD=D0=B8?= =?UTF-8?q?=D0=BA=D0=BE=D0=B3=D0=B4=D0=B0,=20=D0=B1=D0=B8=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications.cfg | 4 ++-- Applications/Calendar/Icon.pic | Bin 165 -> 165 bytes .../Calendar/{Calendar.lua => Main.lua} | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 Applications/Calendar/Icon.pic rename Applications/Calendar/{Calendar.lua => Main.lua} (98%) mode change 100644 => 100755 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 cf2b3f92bd1424a3a9121757fb23836dc001775c..fe7934661de21ea863ed5e2a2342e71e2fd95c6e GIT binary patch literal 165 zcmXYpxeb6o3!O#Bz++aOvPcu(THD45b$gPhqW-6!;caA E07_^in~E{&iP5lcmF-* GM#+CxCK;>% 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