TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2025-12-20 02:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Чуть попизже шоб выглядело

Browse Source
This commit is contained in:
igor 2017-11-17 05:42:50 +03:00
parent f2373a541f
commit e07309fa75
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Applications.cfg
View File

@ -4,7 +4,7 @@
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/OS.lua", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/OS.lua",
type="Script", type="Script",
forceDownload=true, forceDownload=true,
version=4.08, version=4.09,
}, },
{ {
path="/MineOS/Pictures/MoonTouch.pic", path="/MineOS/Pictures/MoonTouch.pic",
@ -65,14 +65,14 @@
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Localization/Russian.lang", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Localization/Russian.lang",
type="Script", type="Script",
forceDownload=true, forceDownload=true,
version=1.38, version=1.39,
}, },
{ {
path="/MineOS/System/Localization/English.lang", path="/MineOS/System/Localization/English.lang",
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Localization/English.lang", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Localization/English.lang",
type="Script", type="Script",
forceDownload=true, forceDownload=true,
version=1.38, version=1.39,
}, },
----------------------------------------------------- Ассоциация говна -------------------------------------------------------------------------- ----------------------------------------------------- Ассоциация говна --------------------------------------------------------------------------
{ {

2
Localization/English.lang
View File

@ -7,7 +7,7 @@
networkState = "Enable network mode", networkState = "Enable network mode",
networkComputers = "Network PCs options", networkComputers = "Network PCs options",
networkComputersNotFound = "Computers not fount", networkComputersNotFound = "Computers not fount",
networkName = "Network name", networkName = "Name of this PC",
networkSearchRadius = "Searching radius", networkSearchRadius = "Searching radius",
openWith = "Open with", openWith = "Open with",
select = "Choose application…", select = "Choose application…",

2
Localization/Russian.lang
View File

@ -7,7 +7,7 @@
networkState = "Включить сетевой режим", networkState = "Включить сетевой режим",
networkComputers = "Параметры удаленных ПК", networkComputers = "Параметры удаленных ПК",
networkComputersNotFound = "Компьютеры в сети не обнаружены", networkComputersNotFound = "Компьютеры в сети не обнаружены",
networkName = "Имя компьютера", networkName = "Имя данного ПК",
networkSearchRadius = "Радиус обнаружения", networkSearchRadius = "Радиус обнаружения",
openWith = "Открыть с помощью", openWith = "Открыть с помощью",
select = "Выбрать программу…", select = "Выбрать программу…",

6
OS.lua
View File

@ -545,7 +545,6 @@ local function createOSWindow()
local container = MineOSInterface.addUniversalContainer(MineOSInterface.mainContainer, MineOSCore.localization.network) local container = MineOSInterface.addUniversalContainer(MineOSInterface.mainContainer, MineOSCore.localization.network)
local insertModemTextBox = container.layout:addChild(GUI.textBox(1, 1, 36, 1, nil, 0x555555, {MineOSCore.localization.networkModemNotAvailable}, 1, 0, 0, true, true)) local insertModemTextBox = container.layout:addChild(GUI.textBox(1, 1, 36, 1, nil, 0x555555, {MineOSCore.localization.networkModemNotAvailable}, 1, 0, 0, true, true))
local networkNameInput = container.layout:addChild(GUI.input(1, 1, 36, 3, 0xE1E1E1, 0x666666, 0x666666, 0xE1E1E1, 0x2D2D2D, MineOSCore.properties.network.name or "", MineOSCore.localization.networkName))
local stateSwitchAndLabel = container.layout:addChild(GUI.switchAndLabel(1, 1, 36, 8, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x888888, MineOSCore.localization.networkState .. ":", MineOSCore.properties.network.enabled)) local stateSwitchAndLabel = container.layout:addChild(GUI.switchAndLabel(1, 1, 36, 8, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x888888, MineOSCore.localization.networkState .. ":", MineOSCore.properties.network.enabled))
local signalStrengthSlider = container.layout:addChild(GUI.slider(1, 1, 36, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x888888, 0, 512, MineOSCore.properties.network.signalStrength, false, MineOSCore.localization.networkSearchRadius ..": ", "")) local signalStrengthSlider = container.layout:addChild(GUI.slider(1, 1, 36, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x888888, 0, 512, MineOSCore.properties.network.signalStrength, false, MineOSCore.localization.networkSearchRadius ..": ", ""))
signalStrengthSlider.roundValues = true signalStrengthSlider.roundValues = true
@ -553,6 +552,9 @@ local function createOSWindow()
container.layout:addChild(GUI.object(1, 1, 1, 1)) container.layout:addChild(GUI.object(1, 1, 1, 1))
container.layout:addChild(GUI.label(1, 1, container.width, 1, 0xE1E1E1, MineOSCore.localization.networkName):setAlignment(GUI.alignment.horizontal.center, GUI.alignment.vertical.top))
local networkNameInput = container.layout:addChild(GUI.input(1, 1, 36, 3, 0xE1E1E1, 0x666666, 0x666666, 0xE1E1E1, 0x2D2D2D, MineOSCore.properties.network.name or ""))
container.layout:addChild(GUI.label(1, 1, container.width, 1, 0xE1E1E1, MineOSCore.localization.networkComputers):setAlignment(GUI.alignment.horizontal.center, GUI.alignment.vertical.top)) container.layout:addChild(GUI.label(1, 1, container.width, 1, 0xE1E1E1, MineOSCore.localization.networkComputers):setAlignment(GUI.alignment.horizontal.center, GUI.alignment.vertical.top))
local comboBox = container.layout:addChild(GUI.comboBox(1, 1, 36, 3, 0xE1E1E1, 0x2D2D2D, 0x444444, 0x999999)) local comboBox = container.layout:addChild(GUI.comboBox(1, 1, 36, 3, 0xE1E1E1, 0x2D2D2D, 0x444444, 0x999999))
local allowReadAndWriteSwitchAndLabel = container.layout:addChild(GUI.switchAndLabel(1, 1, 36, 8, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x888888, MineOSCore.localization.networkAllowReadAndWrite .. ":", false)) local allowReadAndWriteSwitchAndLabel = container.layout:addChild(GUI.switchAndLabel(1, 1, 36, 8, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x888888, MineOSCore.localization.networkAllowReadAndWrite .. ":", false))
@ -604,7 +606,7 @@ local function createOSWindow()
if #networkNameInput.text > 0 then if #networkNameInput.text > 0 then
MineOSCore.properties.network.name = networkNameInput.text MineOSCore.properties.network.name = networkNameInput.text
MineOSCore.saveProperties() MineOSCore.saveProperties()
MineOSNetwork.broadcastComputerState(MineOSCore.properties.network.enabled) MineOSNetwork.broadcastComputerState(MineOSCore.properties.network.enabled)
end end
end end