Suggest values from gameSettings.xml in the collection notes (when no…

…t already set)
FSGModding · Nov 12, 2022 · c976d07 · c976d07
1 parent 2bb4508
commit c976d07
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/modAssist_main.js b/modAssist_main.js
@@ -138,6 +138,7 @@ let countMods     = 0
 let modHubList    = {}
 let modHubVersion = {}
 let lastFolderLoc = null
+let lastGameSettings = {}
 
 
 const ignoreList = [
@@ -459,14 +460,14 @@ function createSavegameWindow(collection) {
 function createNotesWindow(collection) {
 	if ( windows.notes ) {
 		windows.notes.focus()
-		windows.notes.webContents.send('fromMain_collectionName', collection, modList[collection].name, modNote.store)
+		windows.notes.webContents.send('fromMain_collectionName', collection, modList[collection].name, modNote.store, lastGameSettings)
 		return
 	}
 
 	windows.notes = createSubWindow({ parent : 'main', preload : 'notesWindow', maximize : mcStore.get('detail_window_max') })
 
 	windows.notes.webContents.on('did-finish-load', async (event) => {
-		event.sender.send('fromMain_collectionName', collection, modList[collection].name, modNote.store)
+		event.sender.send('fromMain_collectionName', collection, modList[collection].name, modNote.store, lastGameSettings)
 		if ( devDebug ) { windows.notes.webContents.openDevTools() }
 	})
 
@@ -993,6 +994,12 @@ function parseSettings({disable = null, newFolder = null, userName = null, serve
 		gameSettingsXML = XMLParser.parse(XMLString)
 		overrideActive  = gameSettingsXML.gameSettings.modsDirectoryOverride['@_active']
 		overrideFolder  = gameSettingsXML.gameSettings.modsDirectoryOverride['@_directory']
+		lastGameSettings = {
+			username : gameSettingsXML.gameSettings.onlinePresenceName || '',
+			password : gameSettingsXML.gameSettings.joinGame['@_password'] || '',
+			server   : gameSettingsXML.gameSettings.joinGame['@_serverName'] || '',
+		}
+
 	} catch (e) {
 		log.log.danger(`Could not read game settings ${e}`, 'game-settings')
 	}

diff --git a/renderer/renderJS/notes_ui.js b/renderer/renderJS/notes_ui.js
@@ -31,15 +31,20 @@ window.l10n.receive('fromMain_getText_return', (data) => {
 })
 window.l10n.receive('fromMain_l10n_refresh', () => { processL10N() })
 
-window.mods.receive('fromMain_collectionName', (collection, collectionName, allNotes) => {
+window.mods.receive('fromMain_collectionName', (collection, collectionName, allNotes, lastGameSettings) => {
 	thisCollection = collection
 	fsgUtil.byId('collection_name').innerHTML = collectionName
 
 	fsgUtil.query('input').forEach((element) => {
 		let thisValue = ''
+
+		let thisPlaceholder = lastGameSettings[element.id.replace('notes_', '')]
 		if ( typeof allNotes[collection] !== 'undefined' ) {
-			thisValue = allNotes[collection][element.id]
+			thisValue       = allNotes[collection][element.id]
+			thisPlaceholder = ( typeof thisValue !== 'undefined' ) ? '' : thisPlaceholder
 		}
+
+		element.placeholder = ( typeof thisPlaceholder !== 'undefined' ) ? thisPlaceholder : ''
 		element.value =  ( typeof thisValue !== 'undefined' ) ? thisValue : ''
 	})