diff --git a/Applications.cfg b/Applications.cfg index 657d216b..40170b6b 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -4,7 +4,7 @@ url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/OS.lua", type="Script", forceDownload=true, - version=4.08, + version=4.09, }, { path="/MineOS/Pictures/MoonTouch.pic", @@ -65,14 +65,14 @@ url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Localization/Russian.lang", type="Script", forceDownload=true, - version=1.38, + version=1.39, }, { path="/MineOS/System/Localization/English.lang", url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Localization/English.lang", type="Script", forceDownload=true, - version=1.38, + version=1.39, }, ----------------------------------------------------- Ассоциация говна -------------------------------------------------------------------------- { diff --git a/Localization/English.lang b/Localization/English.lang index 466dd9c3..fd10f447 100755 --- a/Localization/English.lang +++ b/Localization/English.lang @@ -7,7 +7,7 @@ networkState = "Enable network mode", networkComputers = "Network PCs options", networkComputersNotFound = "Computers not fount", - networkName = "Network name", + networkName = "Name of this PC", networkSearchRadius = "Searching radius", openWith = "Open with", select = "Choose application…", diff --git a/Localization/Russian.lang b/Localization/Russian.lang index 4274b2d0..d0f6950a 100755 --- a/Localization/Russian.lang +++ b/Localization/Russian.lang @@ -7,7 +7,7 @@ networkState = "Включить сетевой режим", networkComputers = "Параметры удаленных ПК", networkComputersNotFound = "Компьютеры в сети не обнаружены", - networkName = "Имя компьютера", + networkName = "Имя данного ПК", networkSearchRadius = "Радиус обнаружения", openWith = "Открыть с помощью", select = "Выбрать программу…", diff --git a/OS.lua b/OS.lua index e4295e07..27fce839 100755 --- a/OS.lua +++ b/OS.lua @@ -545,7 +545,6 @@ local function createOSWindow() 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 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 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 @@ -553,6 +552,9 @@ local function createOSWindow() 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)) 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)) @@ -604,7 +606,7 @@ local function createOSWindow() if #networkNameInput.text > 0 then MineOSCore.properties.network.name = networkNameInput.text MineOSCore.saveProperties() - + MineOSNetwork.broadcastComputerState(MineOSCore.properties.network.enabled) end end