cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 04:22:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Vueui based modular computers (#5249)

Browse Source 
Fixes up VueUi not tested functions and badly designed data push flow.
Port main screen in VueUI
Port configuration
Port device management
This commit is contained in:
Karolis
2019-10-02 21:51:20 +03:00
committed by Erki
parent 4c1e686e27
commit e480d924de
27 changed files with 458 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/_program.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/modular_computer/initial_data()
return get_header_data()
return list("_PC" = get_header_data())
/obj/item/modular_computer/update_layout()
return TRUE
code/modules/modular_computers/file_system/programs/antagonist/dos.dm
+1 -1
View File
@@ -48,7 +48,7 @@
var/list/data = list()
if(!istype(PRG))
return
data = PRG.get_header_data()
data = list("_PC" = PRG.get_header_data())
if(PRG.error)
data["error"] = PRG.error
code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
+1 -1
View File
@@ -63,7 +63,7 @@
if(!istype(PRG))
return
data = PRG.get_header_data()
data = list("_PC" = PRG.get_header_data())
data["armed"] = PRG.armed
code/modules/modular_computers/file_system/programs/generic/news_browser.dm
+1 -1
View File
@@ -93,7 +93,7 @@
var/datum/computer_file/program/newsbrowser/PRG
var/list/data = list()
if(program)
data = program.get_header_data()
data = list("_PC" = program.get_header_data())
PRG = program
else
return
code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm
+1 -1
View File
@@ -188,7 +188,7 @@
var/list/data = list()
if(program)
data = program.get_header_data()
data = list("_PC" = program.get_header_data())
var/datum/computer_file/program/chatclient/C = program
if(!istype(C))
code/modules/modular_computers/file_system/programs/generic/nttransfer.dm
+1 -1
View File
@@ -98,7 +98,7 @@ var/global/nttransfer_uid = 0
if(!istype(PRG))
return
var/list/data = program.get_header_data()
var/list/data = list("_PC" = program.get_header_data())
if(PRG.error)
data["error"] = PRG.error
code/modules/modular_computers/file_system/programs/system/client_manager.dm
+76 -25
View File
@@ -13,11 +13,81 @@
size = 4
available_on_ntnet = 0
requires_ntnet = 0
nanomodule_path = /datum/nano_module/program/clientmanager/
var/_dev_type = 1 //1 - Company Device ,2 - Private device
var/_dev_preset = "civilian"
var/_error_message = null
/datum/computer_file/program/clientmanager/ui_interact(mob/user)
var/datum/vueui/ui = SSvueui.get_open_ui(user, src)
if (!ui)
ui = new /datum/vueui/modularcomputer(user, src, "mcomputer-system-manager", 575, 700, "NTOS Client Manager")
ui.open()
/datum/computer_file/program/clientmanager/vueui_transfer(oldobj)
SSvueui.transfer_uis(oldobj, src, "mcomputer-system-manager", 575, 700, "NTOS Client Manager")
return TRUE
// Gaters data for ui
/datum/computer_file/program/clientmanager/vueui_data_change(var/list/data, var/mob/user, var/datum/vueui/ui)
. = ..()
data = . || data || list()
// Gather data for computer header
var/headerdata = get_header_data(data["_PC"])
if(headerdata)
data["_PC"] = headerdata
. = data
if(!computer)
return
VUEUI_SET_CHECK_IFNOTSET(data["device_type"], 0, ., data)
VUEUI_SET_CHECK_IFNOTSET(data["device_preset"], "", ., data)
VUEUI_SET_CHECK(data["enrollment_status"], computer.enrolled, ., data)
VUEUI_SET_CHECK(data["ntnet_status"], ntnet_global.check_function(NTNET_SOFTWAREDOWNLOAD), ., data)
LAZYINITLIST(data["presets"])
for (var/datum/modular_computer_app_presets/p in ntnet_global.available_software_presets)
if(p.available)
LAZYINITLIST(data["presets"][p.name])
VUEUI_SET_CHECK(data["presets"][p.name]["name"], p.display_name, ., data)
VUEUI_SET_CHECK(data["presets"][p.name]["description"], p.description, ., data)
/datum/computer_file/program/clientmanager/Topic(href, href_list)
if(..())
return 1
if(href_list["enroll"])
if(ntnet_global.check_function(NTNET_SOFTWAREDOWNLOAD))
if(href_list["enroll"]["type"] == 1)
enroll_company_device(href_list["enroll"]["preset"])
return 1
if(href_list["enroll"]["type"] == 2)
enroll_private_device()
return 1
return 0
//Set´s up the computer with the file manager and the downloader and removes the lock
/datum/computer_file/program/clientmanager/proc/enroll_private_device()
if(!computer)
return 0
computer.enrolled = 2 // private devices
computer.hard_drive.store_file(new /datum/computer_file/program/filemanager())
computer.hard_drive.store_file(new /datum/computer_file/program/ntnetdownload())
return 1
//Set´s up the programs from the preset
/datum/computer_file/program/clientmanager/proc/enroll_company_device(var/preset)
if(!computer)
return 0
for (var/datum/modular_computer_app_presets/prs in ntnet_global.available_software_presets)
if(prs.name == preset && prs.available == 1)
var/list/prs_programs = prs.return_install_programs()
for (var/datum/computer_file/program/prog in prs_programs)
computer.hard_drive.store_file(prog)
computer.enrolled = 1 // enroll as company device after finding matching preset and storing software
return 1
return 0
/*
/datum/nano_module/program/clientmanager
name = "NTOS Client Manager"
var/obj/item/modular_computer/movable = null
@@ -48,35 +118,15 @@
_error_message = "NTNET unavailable. Unable to enroll device"
return 0
//Set´s up the computer with the file manager and the downloader and removes the lock
/datum/computer_file/program/clientmanager/proc/enroll_private_device()
if(!computer)
return 0
computer.enrolled = 2 // private devices
computer.hard_drive.store_file(new/datum/computer_file/program/filemanager())
computer.hard_drive.store_file(new/datum/computer_file/program/ntnetdownload())
return 1
//Set´s up the programs from the preset
/datum/computer_file/program/clientmanager/proc/enroll_company_device()
if(!computer || !_dev_type || !_dev_preset)
return 0
for (var/datum/modular_computer_app_presets/prs in ntnet_global.available_software_presets)
if(prs.name == _dev_preset && prs.available == 1)
var/list/prs_programs = prs.return_install_programs()
for (var/datum/computer_file/program/prog in prs_programs)
computer.hard_drive.store_file(prog)
computer.enrolled = 1 // enroll as company device after finding matching preset and storing software
return 1
return 0
/datum/nano_module/program/clientmanager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
var/list/data = list()
if(program)
movable = program.computer
data = program.get_header_data()
data = list("_PC" = program.get_header_data())
if(!istype(movable))
movable = null
@@ -112,3 +162,4 @@
ui.auto_update_layout = 1
ui.set_initial_data(data)
ui.open()
*/
code/modules/modular_computers/file_system/programs/system/configurator.dm
+38 -46
View File
@@ -13,51 +13,43 @@
size = 4
available_on_ntnet = 0
requires_ntnet = 0
nanomodule_path = /datum/nano_module/program/computer_configurator/
/datum/nano_module/program/computer_configurator
name = "NTOS Computer Configuration Tool"
var/obj/item/modular_computer/movable = null
/datum/nano_module/program/computer_configurator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
if(program)
movable = program.computer
if(!istype(movable))
movable = null
// No computer connection, we can't get data from that.
if(!movable)
return 0
var/list/data = list()
if(program)
data = program.get_header_data()
var/list/hardware = movable.get_all_components()
data["disk_size"] = movable.hard_drive.max_capacity
data["disk_used"] = movable.hard_drive.used_capacity
data["power_usage"] = movable.last_power_usage
data["battery_exists"] = movable.battery_module ? 1 : 0
if(movable.battery_module)
data["battery_rating"] = movable.battery_module.battery.maxcharge
data["battery_percent"] = round(movable.battery_module.battery.percent())
var/list/all_entries[0]
for(var/obj/item/weapon/computer_hardware/H in hardware)
all_entries.Add(list(list(
"name" = H.name,
"desc" = H.desc,
"enabled" = H.enabled,
"critical" = H.critical,
"powerusage" = H.power_usage
)))
data["hardware"] = all_entries
ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
/datum/computer_file/program/computerconfig/ui_interact(mob/user)
var/datum/vueui/ui = SSvueui.get_open_ui(user, src)
if (!ui)
ui = new(user, src, ui_key, "laptop_configuration.tmpl", "NTOS Configuration Utility", 575, 700, state = state)
ui.auto_update_layout = 1
ui.set_initial_data(data)
ui.open()
ui = new /datum/vueui/modularcomputer(user, src, "mcomputer-system-config", 575, 700, "NTOS Configuration Utility")
ui.open()
/datum/computer_file/program/computerconfig/vueui_transfer(oldobj)
SSvueui.transfer_uis(oldobj, src, "mcomputer-system-config", 575, 700, "NTOS Configuration Utility")
return TRUE
// Gaters data for ui
/datum/computer_file/program/computerconfig/vueui_data_change(var/list/data, var/mob/user, var/datum/vueui/ui)
. = ..()
data = . || data || list()
// Gather data for computer header
var/headerdata = get_header_data(data["_PC"])
if(headerdata)
data["_PC"] = headerdata
. = data
if(!computer)
return
var/list/hardware = computer.get_all_components()
VUEUI_SET_CHECK(data["disk_size"], computer.hard_drive.max_capacity, ., data)
VUEUI_SET_CHECK(data["disk_used"], computer.hard_drive.used_capacity, ., data)
VUEUI_SET_CHECK(data["power_usage"], computer.last_power_usage, ., data)
if(!computer.battery_module)
VUEUI_SET_CHECK(data["battery"], 0, ., data)
else
LAZYINITLIST(data["battery"])
VUEUI_SET_CHECK(data["battery"]["rating"], computer.battery_module.battery.maxcharge, ., data)
VUEUI_SET_CHECK(data["battery"]["percent"], round(computer.battery_module.battery.percent()), ., data)
LAZYINITLIST(data["hardware"])
for(var/obj/item/weapon/computer_hardware/H in hardware)
LAZYINITLIST(data["hardware"][H.name])
for(var/v in list("name", "desc", "enabled", "critical", "power_usage"))
VUEUI_SET_CHECK(data["hardware"][H.name][v], H.vars[v], ., data)
code/modules/modular_computers/file_system/programs/system/file_browser.dm
+1 -1
View File
@@ -183,7 +183,7 @@
/datum/nano_module/program/computer_filemanager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
var/list/data = host.initial_data()
var/datum/computer_file/program/filemanager/PRG
//var/list/data = program.get_header_data()
//var/list/data = list("_PC" = program.get_header_data())
PRG = program
var/obj/item/weapon/computer_hardware/hard_drive/HDD
code/modules/modular_computers/file_system/programs/system/ntdownloader.dm
+1 -1
View File
@@ -153,7 +153,7 @@
if(!prog || !istype(prog))
return
if(program)
data = program.get_header_data()
data = list("_PC" = program.get_header_data())
// This IF cuts on data transferred to client, so i guess it's worth it.
if(prog.downloaderror) // Download errored. Wait until user resets the program.