Vueui based modular computers (#5249)

Fixes up VueUi not tested functions and badly designed data push flow.
Port main screen in VueUI
Port configuration
Port device management

code/modules/modular_computers/computers/modular_computer/core.dm

@@ -142,9 +142,10 @@
 /obj/item/modular_computer/proc/kill_program(var/forced = 0)
 	if(active_program)
 		active_program.kill_program(forced)
+		src.vueui_transfer(active_program)
 		active_program = null
 	var/mob/user = usr
-	if(user && istype(user))
+	if(user && istype(user) && !forced)
 		ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
 	update_icon()
 
@@ -161,12 +162,14 @@
 	return ntnet_global.add_log(text, network_card)
 
 /obj/item/modular_computer/proc/shutdown_computer(var/loud = 1)
+	SSvueui.close_uis(active_program)
 	kill_program(1)
 	for(var/datum/computer_file/program/P in idle_threads)
 		P.kill_program(1)
 		idle_threads.Remove(P)
 	if(loud)
 		visible_message("\The [src] shuts down.")
+	SSvueui.close_uis(active_program)
 	enabled = 0
 	update_icon()
 
@@ -189,6 +192,7 @@
 	idle_threads.Add(active_program)
 	active_program.program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs
 	SSnanoui.close_uis(active_program.NM ? active_program.NM : active_program)
+	src.vueui_transfer(active_program)
 	active_program = null
 	update_icon()
 	if(istype(user))
@@ -214,6 +218,8 @@
 		active_program = P
 		idle_threads.Remove(P)
 		update_icon()
+		if(!P.vueui_transfer(src))
+			SSvueui.close_uis(src)
 		return
 
 	if(idle_threads.len >= processor_unit.max_idle_programs+1)
@@ -229,6 +235,8 @@
 
 	if(P.run_program(user))
 		active_program = P
+		if(!P.vueui_transfer(src))
+			SSvueui.close_uis(src)
 		update_icon()
 	return 1
 

code/modules/modular_computers/computers/modular_computer/ui.dm

@@ -1,18 +1,17 @@
-// Operates NanoUI
-/obj/item/modular_computer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+// Opens VueUI
+/obj/item/modular_computer/ui_interact(mob/user)
+	var/datum/vueui/ui = SSvueui.get_open_ui(user, src)
 	if(!screen_on || !enabled)
 		if(ui)
 			ui.close()
-		return 0
+		return
 	if(!apc_power(0) && !battery_power(0))
 		if(ui)
 			ui.close()
-		return 0
+		return
 
 	// If we have an active program switch to it now.
 	if(active_program)
-		if(ui) // This is the main laptop screen. Since we are switching to program's UI close it for now.
-			ui.close()
 		active_program.ui_interact(user)
 		return
 
@@ -22,28 +21,36 @@
 		visible_message("\The [src] beeps three times, it's screen displaying \"DISK ERROR\" warning.")
 		return // No HDD, No HDD files list or no stored files. Something is very broken.
 
-	var/datum/computer_file/data/autorun = hard_drive.find_file_by_name("autorun")
-
-	var/list/data = get_header_data()
-
-	var/list/programs = list()
-	for(var/datum/computer_file/program/P in hard_drive.stored_files)
-		var/list/program = list()
-		program["name"] = P.filename
-		program["desc"] = P.filedesc
-		program["autorun"] = (istype(autorun) && (autorun.stored_data == P.filename)) ? 1 : 0
-		if(P in idle_threads)
-			program["running"] = 1
-		programs.Add(list(program))
-
-	data["programs"] = programs
-	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
-		ui = new(user, src, ui_key, "laptop_mainscreen.tmpl", "NTOS Main Menu", 400, 500)
-		ui.auto_update_layout = 1
-		ui.set_initial_data(data)
-		ui.open()
-		ui.set_auto_update(1)
+		ui = new /datum/vueui/modularcomputer(user, src, "mcomputer-system-main", 400, 500, "NTOS Main Menu")
+		ui.header = "modular-computer"
+	ui.open()
+
+/obj/item/modular_computer/vueui_transfer(oldobj)
+	. = FALSE
+	var/uis = SSvueui.transfer_uis(oldobj, src, "mcomputer-system-main", 400, 500, "NTOS Main Menu")
+	for(var/tui in uis)
+		var/datum/vueui/ui = tui
+		ui.auto_update_content = FALSE
+		. = TRUE
+
+// Gaters data for ui
+/obj/item/modular_computer/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
+
+	var/datum/computer_file/data/autorun = hard_drive.find_file_by_name("autorun")
+	VUEUI_SET_CHECK_IFNOTSET(data["programs"], list(), ., data)
+	for(var/datum/computer_file/program/P in hard_drive.stored_files)
+		VUEUI_SET_CHECK_IFNOTSET(data["programs"][P.filename], list(), ., data)
+		VUEUI_SET_CHECK(data["programs"][P.filename]["desc"], P.filedesc, ., data)
+		VUEUI_SET_CHECK(data["programs"][P.filename]["autorun"], (istype(autorun) && (autorun.stored_data == P.filename)), ., data)
+		VUEUI_SET_CHECK(data["programs"][P.filename]["running"], (P in idle_threads), ., data)
 
 // Handles user's GUI input
 /obj/item/modular_computer/Topic(href, href_list)
@@ -84,7 +91,8 @@
 		to_chat(user, "<span class='notice'>Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.</span>")
 
 	if( href_list["PC_runprogram"] )
-		return run_program(href_list["PC_runprogram"])
+		. = run_program(href_list["PC_runprogram"])
+		ui_interact(usr)
 
 	if( href_list["PC_setautorun"] )
 		if(!hard_drive)
@@ -102,56 +110,57 @@
 	if(.)
 		update_uis()
 
-// Function used by NanoUI's to obtain data for header. All relevant entries begin with "PC_"
-/obj/item/modular_computer/proc/get_header_data()
-	var/list/data = list()
+// Function used to obtain data for header. All relevant entries begin with "PC_"
+/obj/item/modular_computer/proc/get_header_data(data)
+	if(!data)
+		data = list()
 
 	if(battery_module)
 		switch(battery_module.battery.percent())
 			if(80 to 200) // 100 should be maximal but just in case..
-				data["PC_batteryicon"] = "batt_100.gif"
+				VUEUI_SET_CHECK(data["batteryicon"], "batt_100.gif", ., data)
 			if(60 to 80)
-				data["PC_batteryicon"] = "batt_80.gif"
+				VUEUI_SET_CHECK(data["batteryicon"], "batt_80.gif", ., data)
 			if(40 to 60)
-				data["PC_batteryicon"] = "batt_60.gif"
+				VUEUI_SET_CHECK(data["batteryicon"], "batt_60.gif", ., data)
 			if(20 to 40)
-				data["PC_batteryicon"] = "batt_40.gif"
+				VUEUI_SET_CHECK(data["batteryicon"], "batt_40.gif", ., data)
 			if(5 to 20)
-				data["PC_batteryicon"] = "batt_20.gif"
+				VUEUI_SET_CHECK(data["batteryicon"], "batt_20.gif", ., data)
 			else
-				data["PC_batteryicon"] = "batt_5.gif"
-		data["PC_batterypercent"] = "[round(battery_module.battery.percent())] %"
-		data["PC_showbatteryicon"] = 1
+				VUEUI_SET_CHECK(data["batteryicon"], "batt_5.gif", ., data)
+		VUEUI_SET_CHECK(data["batterypercent"], "[round(battery_module.battery.percent())] %", ., data)
+		data["showbatteryicon"] = 1
 	else
-		data["PC_batteryicon"] = "batt_5.gif"
-		data["PC_batterypercent"] = "N/C"
-		data["PC_showbatteryicon"] = battery_module ? 1 : 0
+		data["batteryicon"] = "batt_5.gif"
+		VUEUI_SET_CHECK(data["batterypercent"], "N/C", ., data)
+		data["showbatteryicon"] = battery_module ? 1 : 0
 
 	if(tesla_link && tesla_link.enabled && apc_powered)
-		data["PC_apclinkicon"] = "charging.gif"
+		VUEUI_SET_CHECK(data["apclinkicon"], "charging.gif", ., data)
+	else
+		VUEUI_SET_CHECK(data["apclinkicon"], "", ., data)
 
 	switch(get_ntnet_status())
 		if(0)
-			data["PC_ntneticon"] = "sig_none.gif"
+			VUEUI_SET_CHECK(data["ntneticon"], "sig_none.gif", ., data)
 		if(1)
-			data["PC_ntneticon"] = "sig_low.gif"
+			VUEUI_SET_CHECK(data["ntneticon"], "sig_low.gif", ., data)
 		if(2)
-			data["PC_ntneticon"] = "sig_high.gif"
+			VUEUI_SET_CHECK(data["ntneticon"], "sig_high.gif", ., data)
 		if(3)
-			data["PC_ntneticon"] = "sig_lan.gif"
+			VUEUI_SET_CHECK(data["ntneticon"], "sig_lan.gif", ., data)
+		else
+			VUEUI_SET_CHECK(data["ntneticon"], "", ., data)
 
+	LAZYINITLIST(data["programheaders"])
 	if(idle_threads.len)
-		var/list/program_headers = list()
 		for(var/datum/computer_file/program/P in idle_threads)
 			if(!P.ui_header)
+				if(data["programheaders"][P.filename])
+					data["programheaders"][P.filename] = null
+					. = data
 				continue
-			program_headers.Add(list(list(
-				"icon" = P.ui_header
-			)))
+			VUEUI_SET_CHECK(data["programheaders"][P.filename], P.ui_header, ., data)
 
-		data["PC_programheaders"] = program_headers
-
-	data["PC_stationtime"] = worldtime2text()
-	data["PC_hasheader"] = 1
-	data["PC_showexitprogram"] = active_program ? 1 : 0 // Hides "Exit Program" button on mainscreen
-	return data
+	VUEUI_SET_CHECK(data["showexitprogram"], !!active_program, ., data) // Hides "Exit Program" button on mainscreen

code/modules/modular_computers/file_system/program.dm

@@ -174,7 +174,6 @@
 /datum/computer_file/program/proc/get_header_data()
 	if(computer)
 		return computer.get_header_data()
-	return list()
 
 // This is performed on program startup. May be overriden to add extra logic. Remember to include ..() call. Return 1 on success, 0 on failure.
 // When implementing new program based device, use this to run the program.

code/modules/modular_computers/file_system/programs/_program.dm

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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.