From c4f586590cbe80eaaad6b7daf1964bc3e260c7e2 Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sun, 5 Jun 2016 13:18:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=95=D0=B1=D0=B0=D1=82=D1=8C=20=D1=82=D1=83?= =?UTF-8?q?=D1=82=20=D0=B6=D0=B5=D1=81=D1=82=D0=BA=D0=BE=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=85=D1=83=D0=B9,=20=D1=84=D1=83=D1=83=D1=83=D1=83=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Applications.txt | 247 +++++++++++----------- Applications/3DPrint/About/English.txt | 2 +- Applications/3DPrint/About/Russian.txt | 2 +- Applications/AppMarket/AppMarket.lua | 12 +- Applications/Calendar/About/English.txt | 2 +- Applications/FlappyBird/About/English.txt | 1 + Applications/FlappyBird/About/Russian.txt | 1 + Applications/RayWalk/About/English.txt | 1 + Applications/RayWalk/About/Russian.txt | 1 + Applications/VK/About/English.txt | 1 + Applications/VK/About/Russian.txt | 1 + Applications/Weather/About/English.txt | 1 + Applications/Weather/About/Russian.txt | 1 + 13 files changed, 145 insertions(+), 128 deletions(-) create mode 100644 Applications/FlappyBird/About/English.txt create mode 100644 Applications/FlappyBird/About/Russian.txt create mode 100644 Applications/RayWalk/About/English.txt create mode 100644 Applications/RayWalk/About/Russian.txt create mode 100644 Applications/VK/About/English.txt create mode 100644 Applications/VK/About/Russian.txt create mode 100644 Applications/Weather/About/English.txt create mode 100644 Applications/Weather/About/Russian.txt diff --git a/Applications.txt b/Applications.txt index a842a313..f08d21bb 100644 --- a/Applications.txt +++ b/Applications.txt @@ -7,7 +7,7 @@ ["url"]="IgorTimofeev/OpenComputers/master/MineOS/OS.lua", ["type"]="Script", ["forceDownload"]=true, - ["version"]=3.0, + ["version"]=3.1, }, { ["name"]="MineOS/Pictures/Dayeneris.pic", @@ -409,6 +409,7 @@ ["name"]="bin/get.lua", ["url"]="IgorTimofeev/OpenComputers/master/Applications/get.lua", ["type"]="Script", + ["forceDownload"]=true, ["version"]=1.0, }, { @@ -460,7 +461,129 @@ ["forceDownload"]=true, ["version"]=1.0, }, - ----------------------------------------------------- Приложения без ресурсов -------------------------------------------------------------------------- + ----------------------------------------------------- Приложения -------------------------------------------------------------------------- + { + ["name"]="MineOS/Applications/VK", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/VK/VK.lua", + ["about"]="IgorTimofeev/OpenComputers/master/Applications/VK/About/", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/VK/Icon.pic", + ["createShortcut"]="dock", + ["version"]=1.1, + ["resources"]={ + { + ["name"]="VKLogo.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/VK/VKLogo.pic", + }, + }, + }, + { + ["name"]="MineOS/Applications/Weather", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Weather.lua", + ["about"]="IgorTimofeev/OpenComputers/master/Applications/Weather/About/", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Icon.pic", + ["createShortcut"]="desktop", + ["version"]=1.1, + ["resources"]={ + { + ["name"]="Cloudy.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Cloudy.pic", + }, + { + ["name"]="Cloudy.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Cloudy.pic", + }, + { + ["name"]="Rainy.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Rainy.pic", + }, + { + ["name"]="Snowy.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Snowy.pic", + }, + { + ["name"]="Stormy.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Stormy.pic", + }, + { + ["name"]="Sunny.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Sunny.pic", + }, + { + ["name"]="SunnyWithClouds.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/SunnyWithClouds.pic", + }, + }, + }, + { + ["name"]="MineOS/Applications/3DPrint", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/3DPrint/3DPrint.lua", + ["about"]="IgorTimofeev/OpenComputers/master/Applications/3DPrint/About/", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/3DPrint/Icon.pic", + ["createShortcut"]="desktop", + ["version"]=1.1, + }, + { + ["name"]="MineOS/Applications/FlappyBird", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/FlappyBird/FlappyBird.lua", + ["about"]="IgorTimofeev/OpenComputers/master/Applications/FlappyBird/About/", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/FlappyBird/Icon.pic", + ["createShortcut"]="desktop", + ["version"]=1.1, + ["resources"]={ + { + ["name"]="Flappy.pic", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/FlappyBird/Flappy.pic", + }, + }, + }, + { + ["name"]="MineOS/Applications/RayWalk", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayWalk.lua", + ["about"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/About/", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic", + ["createShortcut"]="desktop", + ["version"]=1.1, + ["resources"]={ + { + ["name"]="Day.scene", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Day.scene", + }, + { + ["name"]="Night.scene", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Night.scene", + }, + }, + }, + { + ["name"]="MineOS/Applications/Calendar", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Calendar/Calendar.lua", + ["about"]="IgorTimofeev/OpenComputers/master/Applications/Calendar/About/", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Calendar/Icon.pic", + ["createShortcut"]="dock", + ["version"]=1.0, + }, + { + ["name"]="MineOS/Applications/Snake", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Snake/Snake.lua", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Snake/Icon.pic", + ["createShortcut"]="desktop", + ["version"]=1.0, + }, + { + ["name"]="MineOS/Applications/Palette", + ["url"]="IgorTimofeev/OpenComputers/master/Applications/Palette/Palette.lua", + ["type"]="Application", + ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Palette/Icon.pic", + ["createShortcut"]="desktop", + ["version"]=1.0, + }, { ["name"]="MineOS/Applications/AppMarket", ["url"]="IgorTimofeev/OpenComputers/master/Applications/AppMarket/AppMarket.lua", @@ -503,14 +626,6 @@ ["createShortcut"]="desktop", ["version"]=1.0, }, - { - ["name"]="MineOS/Applications/Palette", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Palette/Palette.lua", - ["type"]="Application", - ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Palette/Icon.pic", - ["createShortcut"]="desktop", - ["version"]=1.0, - }, { ["name"]="MineOS/Applications/Radio", ["url"]="IgorTimofeev/OpenComputers/master/Applications/Radio/Radio.lua", @@ -538,15 +653,6 @@ ["createShortcut"]="desktop", ["version"]=1.0, }, - { - ["name"]="MineOS/Applications/3DPrint", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/3DPrint/3DPrint.lua", - ["about"]="IgorTimofeev/OpenComputers/master/Applications/3DPrint/About/", - ["type"]="Application", - ["icon"]="IgorTimofeev/OpenComputers/master/Applications/3DPrint/Icon.pic", - ["createShortcut"]="desktop", - ["version"]=1.0, - }, { ["name"]="MineOS/Applications/ForceAdmin", ["url"]="IgorTimofeev/OpenComputers/master/Applications/ForceAdmin/ForceAdmin.lua", @@ -661,23 +767,6 @@ ["createShortcut"]="desktop", ["version"]=1.0, }, - { - ["name"]="MineOS/Applications/Calendar", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Calendar/Calendar.lua", - ["about"]="IgorTimofeev/OpenComputers/master/Applications/Calendar/About/", - ["type"]="Application", - ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Calendar/Icon.pic", - ["createShortcut"]="dock", - ["version"]=1.0, - }, - { - ["name"]="MineOS/Applications/Snake", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Snake/Snake.lua", - ["type"]="Application", - ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Snake/Icon.pic", - ["createShortcut"]="desktop", - ["version"]=1.0, - }, { ["name"]="MineOS/Applications/CodeDoor", ["url"]="IgorTimofeev/OpenComputers/master/Applications/CodeDoor/CodeDoor.lua", @@ -800,7 +889,6 @@ ["type"]="Script", ["version"]=1.0, }, - ----------------------------------------------------- Приложения с ресурсами -------------------------------------------------------------------------- { ["name"]="MineOS/Applications/Stargate", ["url"]="IgorTimofeev/OpenComputers/master/Applications/Stargate/Stargate.lua", @@ -819,21 +907,6 @@ }, }, }, - { - ["name"]="MineOS/Applications/VK", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/VK/VK.lua", - ["type"]="Application", - ["icon"]="IgorTimofeev/OpenComputers/master/Applications/VK/Icon.pic", - ["createShortcut"]="dock", - ["forceDownload"]=true, - ["version"]=1.0, - ["resources"]={ - { - ["name"]="VKLogo.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/VK/VKLogo.pic", - }, - }, - }, { ["name"]="MineOS/Applications/TurretControl", ["url"]="IgorTimofeev/OpenComputers/master/Applications/TurretControl/TurretControl.lua", @@ -849,20 +922,6 @@ }, }, }, - { - ["name"]="MineOS/Applications/FlappyBird", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/FlappyBird/FlappyBird.lua", - ["type"]="Application", - ["icon"]="IgorTimofeev/OpenComputers/master/Applications/FlappyBird/Icon.pic", - ["createShortcut"]="desktop", - ["version"]=1.0, - ["resources"]={ - { - ["name"]="Flappy.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/FlappyBird/Flappy.pic", - }, - }, - }, { ["name"]="MineOS/Applications/Crossword", ["url"]="IgorTimofeev/OpenComputers/master/Applications/Crossword/Crossword.lua", @@ -935,60 +994,4 @@ }, }, }, - { - ["name"]="MineOS/Applications/RayWalk", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/RayWalk.lua", - ["type"]="Application", - ["icon"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic", - ["createShortcut"]="desktop", - ["version"]=1.0, - ["resources"]={ - { - ["name"]="Day.scene", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Day.scene", - }, - { - ["name"]="Night.scene", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Night.scene", - }, - }, - }, - { - ["name"]="MineOS/Applications/Weather", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Weather.lua", - ["type"]="Application", - ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Icon.pic", - ["createShortcut"]="desktop", - ["version"]=1.0, - ["resources"]={ - { - ["name"]="Cloudy.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Cloudy.pic", - }, - { - ["name"]="Cloudy.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Cloudy.pic", - }, - { - ["name"]="Rainy.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Rainy.pic", - }, - { - ["name"]="Snowy.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Snowy.pic", - }, - { - ["name"]="Stormy.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Stormy.pic", - }, - { - ["name"]="Sunny.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/Sunny.pic", - }, - { - ["name"]="SunnyWithClouds.pic", - ["url"]="IgorTimofeev/OpenComputers/master/Applications/Weather/SunnyWithClouds.pic", - }, - }, - }, } diff --git a/Applications/3DPrint/About/English.txt b/Applications/3DPrint/About/English.txt index 46ef0568..e4597a20 100644 --- a/Applications/3DPrint/About/English.txt +++ b/Applications/3DPrint/About/English.txt @@ -1 +1 @@ -Это профессиональный инструмент для создания и распечатки 3D-моделей на 3D-принтере на любой вкус. Поддерживает все возможные функции принтера без исключения. Для работы требуется сам принтер и, по желанию, голографический проектор 2 уровня. \ No newline at end of file +This is a professional tool for the creating and printing models using 3D-printer. It supports all the features of the printer. It requires the printer itself, and, if desired, a holographic projector 2 level. \ No newline at end of file diff --git a/Applications/3DPrint/About/Russian.txt b/Applications/3DPrint/About/Russian.txt index 46ef0568..26c56000 100644 --- a/Applications/3DPrint/About/Russian.txt +++ b/Applications/3DPrint/About/Russian.txt @@ -1 +1 @@ -Это профессиональный инструмент для создания и распечатки 3D-моделей на 3D-принтере на любой вкус. Поддерживает все возможные функции принтера без исключения. Для работы требуется сам принтер и, по желанию, голографический проектор 2 уровня. \ No newline at end of file +Это профессиональный инструмент для создания и распечатки моделей на 3D-принтере. Поддерживает все возможные функции принтера без исключения. Для работы требуется сам принтер и, по желанию, голографический проектор 2 уровня. \ No newline at end of file diff --git a/Applications/AppMarket/AppMarket.lua b/Applications/AppMarket/AppMarket.lua index 40840495..dcd00a27 100644 --- a/Applications/AppMarket/AppMarket.lua +++ b/Applications/AppMarket/AppMarket.lua @@ -18,10 +18,11 @@ for library in pairs(libraries) do if not _G[library] then _G[library] = require local obj = {} local sizes = {} local colors = { - topBar = 0xDDDDDD, main = 0xFFFFFF, - topBarElementText = 0x444444, + topBar = 0xDDDDDD, + topBarText = 0x555555, topBarElement = 0xCCCCCC, + topBarElementText = 0x555555, statusBar = 0xDDDDDD, statusBarText = 0x888888, appName = 0x262626, @@ -78,7 +79,7 @@ local function calculateSizes() end local function drawTopBar() - obj.topBarButtons = GUI.toolbar(sizes.x, sizes.y, sizes.width, sizes.topBarHeight, 2, currentTopBarElement, colors.topBar, colors.topBarElementText, colors.topBarElement, colors.topBarElementText, table.unpack(topBarElements)) + obj.topBarButtons = GUI.toolbar(sizes.x, sizes.y, sizes.width, sizes.topBarHeight, 2, currentTopBarElement, colors.topBar, colors.topBarText, colors.topBarElement, colors.topBarElementText, table.unpack(topBarElements)) obj.windowActionButtons = GUI.windowActionButtons(sizes.x + 1, sizes.y) end @@ -327,6 +328,11 @@ end -- buffer.start() -- buffer.clear(0xFF8888) +local args = {...} +if args[1] == "open" then + if args[2] and tonumber(args[2]) then currentTopBarElement = tonumber(args[2]) end +end + calculateSizes() flush() loadOldApplications() diff --git a/Applications/Calendar/About/English.txt b/Applications/Calendar/About/English.txt index f29f8362..806abe4b 100644 --- a/Applications/Calendar/About/English.txt +++ b/Applications/Calendar/About/English.txt @@ -1 +1 @@ -Calendar - простая программа, не нуждающаяся в особом представлении. Красивый интерфейс позволяет легко узнать день недели конкретной даты любого года. \ No newline at end of file +Calendar - a simple program that needs no special introduction. The beautiful interface makes it easy to find out the day of the week a particular date every year. \ No newline at end of file diff --git a/Applications/FlappyBird/About/English.txt b/Applications/FlappyBird/About/English.txt new file mode 100644 index 00000000..c429d08d --- /dev/null +++ b/Applications/FlappyBird/About/English.txt @@ -0,0 +1 @@ +Popular game now right on your computer in Minecraft! Enjoy incredible graphics and butthurts from frequent deaths. \ No newline at end of file diff --git a/Applications/FlappyBird/About/Russian.txt b/Applications/FlappyBird/About/Russian.txt new file mode 100644 index 00000000..c852d1ab --- /dev/null +++ b/Applications/FlappyBird/About/Russian.txt @@ -0,0 +1 @@ +Популярная игра теперь прямо в вашем компьютере в Minecraft! Наслаждайтесь невероятной графикой и баттхертами от частых смертей. \ No newline at end of file diff --git a/Applications/RayWalk/About/English.txt b/Applications/RayWalk/About/English.txt new file mode 100644 index 00000000..a11a0d7c --- /dev/null +++ b/Applications/RayWalk/About/English.txt @@ -0,0 +1 @@ +This application demonstrates the power of our double buffering library and the power of RayEngine engine that renders graphics like a DOOM and Wolfenstein. \ No newline at end of file diff --git a/Applications/RayWalk/About/Russian.txt b/Applications/RayWalk/About/Russian.txt new file mode 100644 index 00000000..829e4e49 --- /dev/null +++ b/Applications/RayWalk/About/Russian.txt @@ -0,0 +1 @@ +Это приложение - вершина графических возможностей OpenComputers! Оно демонстрирует всю мощь нашей библиотеки двойной буферизации и игрового движка RayEngine, ползволяющего рендерить графику на уровне Wolfenstein и DOOM. \ No newline at end of file diff --git a/Applications/VK/About/English.txt b/Applications/VK/About/English.txt new file mode 100644 index 00000000..8b049711 --- /dev/null +++ b/Applications/VK/About/English.txt @@ -0,0 +1 @@ +This is a standalone client for VK.com social network. It allows you to communicate with your friends, view their profiles and basic information, read the news feed, and listen to audio. \ No newline at end of file diff --git a/Applications/VK/About/Russian.txt b/Applications/VK/About/Russian.txt new file mode 100644 index 00000000..dc55052e --- /dev/null +++ b/Applications/VK/About/Russian.txt @@ -0,0 +1 @@ +Полноценный клиент для сайта VK.com, позволяющий общаться с вашими друзьями, просматривать основную информацию их профилей, читать новостную ленту, а также прослушивать аудиозаписи. \ No newline at end of file diff --git a/Applications/Weather/About/English.txt b/Applications/Weather/About/English.txt new file mode 100644 index 00000000..ba2a8a70 --- /dev/null +++ b/Applications/Weather/About/English.txt @@ -0,0 +1 @@ +Explore weather information directly from Minecraft world! Just enter the name of the city and enjoy a pleasant interface that decorates any home. \ No newline at end of file diff --git a/Applications/Weather/About/Russian.txt b/Applications/Weather/About/Russian.txt new file mode 100644 index 00000000..31b9dabb --- /dev/null +++ b/Applications/Weather/About/Russian.txt @@ -0,0 +1 @@ +Просматривайте информацию о погоде прямо из мира Minecraft! Просто введите название города и наслаждайтесь приятным интерфейсом, украшающим любое жилище. \ No newline at end of file