This commit is contained in:
CDeenen
2020-11-24 18:48:25 +01:00
parent 8f1a5271dd
commit 0ae6336f52
19 changed files with 52 additions and 182 deletions

View File

@@ -46,8 +46,7 @@ export class CombatTracker{
else {
streamDeck.setIcon(0,context,src,background);
streamDeck.setTitle(txt,context);
}
}
}
else {
streamDeck.setIcon(0,context,src,background);
@@ -63,8 +62,6 @@ export class CombatTracker{
streamDeck.setIcon(0,context,src,background);
streamDeck.setTitle(txt,context);
}
}
else if (mode == 2){

View File

@@ -72,10 +72,6 @@ export class playlistConfigForm extends FormApplication {
* @param {*} formData
*/
async _updateObject(event, formData) {
// await game.settings.set(MODULE.moduleName,'selectedPlaylists', formData["selectedPlaylist"]);
// await game.settings.set(MODULE.moduleName,'playlistMethod',formData["playMethod"]);
// await game.settings.set(MODULE.moduleName,'numberOfPlaylists',formData["plNum"]);
// await game.settings.set(MODULE.moduleName,'selectedPlaylistMode',formData["playlistMethod"]);
}
@@ -228,19 +224,7 @@ export class macroConfigForm extends FormApplication {
* @param {*} formData
*/
async _updateObject(event, formData) {
/*
await game.settings.set(MODULE.moduleName,'macroSettings',{
macros: formData["macros"],
color: formData["colorPicker"],
args: formData["args"]
});
let furnace = game.modules.get("furnace");
if (furnace != undefined && furnace.active)
await game.settings.set(MODULE.moduleName,'macroArgs', formData["args"]);
if (MODULE.enableModule)
macroControl.updateAll();
*/
}
activateListeners(html) {
@@ -284,7 +268,6 @@ export class soundboardConfigForm extends FormApplication {
constructor(data, options) {
super(data, options);
this.data = data;
//this.soundData = {};
this.playlists = [];
this.updatePlaylist = false;
this.update = false;
@@ -330,18 +313,6 @@ export class soundboardConfigForm extends FormApplication {
return {soundData: this.data};
}
this.settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
/*
let selectedSounds = this.settings.sounds;
let colorOn = this.settings.colorOn;
let colorOff = this.settings.colorOff;
let mode = this.settings.mode;
let volume = this.settings.volume;
let img = this.settings.img;
let name = this.settings.name;
let selectedPlaylists = this.settings.selectedPlaylists;
let src = this.settings.src;
*/
let playlists = [];
playlists.push({id:"none",name:game.i18n.localize("MaterialDeck.None")});
playlists.push({id:"FP",name:game.i18n.localize("MaterialDeck.FilePicker")})
@@ -434,32 +405,7 @@ export class soundboardConfigForm extends FormApplication {
* @param {*} formData
*/
async _updateObject(event, formData) {
/*
let length = formData["sounds"].length;
let img = [];
let soundSrc = []
for (let i=0; i<length; i++){
let name = "img"+(i+1);
let src = formData[name];
img[i] = src;
name = "src"+(i+1);
src = formData[name];
soundSrc[i] = src;
}
await game.settings.set(MODULE.moduleName,'soundboardSettings',{
selectedPlaylists: formData["playlist"],
sounds: formData["sounds"],
colorOn: formData["colorOn"],
colorOff: formData["colorOff"],
mode: formData["mode"],
img: img,
volume: formData["volume"],
name: formData["namebox"],
src: soundSrc
});
*/
}
async activateListeners(html) {
@@ -475,23 +421,21 @@ export class soundboardConfigForm extends FormApplication {
const volume = html.find("input[name='volume']");
nameField.on("change",event => {
let id = event.target.id.replace('name','');
let id = event.target.id.replace('name','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].name=event.target.value;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
//console.log('settings',settings);
this.settings.name[id-1]=event.target.value;
this.settings.name[id]=event.target.value;
this.updateSettings(this.settings);
});
if (playlistSelect.length > 0) {
playlistSelect.on("change", event => {
let id = event.target.id.replace('playlists','');
let id = event.target.id.replace('playlists','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].selectedPlaylist=event.target.value;
let selectedPlaylist;
@@ -516,93 +460,85 @@ export class soundboardConfigForm extends FormApplication {
this.data[j].dataThis[i].styleFP=styleFP;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
this.settings.selectedPlaylists[id-1]=event.target.value;
this.settings.selectedPlaylists[id]=event.target.value;
this.updateSettings(this.settings);
});
}
soundSelect.on("change", event => {
let id = event.target.id.replace('soundSelect','');
let id = event.target.id.replace('soundSelect','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].sound=event.target.value;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
this.settings.sounds[id-1]=event.target.value;
this.settings.sounds[id]=event.target.value;
this.updateSettings(this.settings);
});
soundFP.on("change",event => {
let id = event.target.id.replace('srcPath','');
let id = event.target.id.replace('srcPath','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].srcPath=event.target.value;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
this.settings.src[id-1]=event.target.value;
this.settings.src[id]=event.target.value;
this.updateSettings(this.settings);
});
imgFP.on("change",event => {
let id = event.target.id.replace('imgPath','');
let id = event.target.id.replace('imgPath','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].imgPath=event.target.value;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
this.settings.img[id-1]=event.target.value;
this.settings.img[id]=event.target.value;
this.updateSettings(this.settings);
});
onCP.on("change",event => {
let id = event.target.id.replace('colorOn','');
let id = event.target.id.replace('colorOn','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].colorOn=event.target.value;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
this.settings.colorOn[id-1]=event.target.value;
this.settings.colorOn[id]=event.target.value;
this.updateSettings(this.settings);
});
offCP.on("change",event => {
let id = event.target.id.replace('colorOff','');
let id = event.target.id.replace('colorOff','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].colorOff=event.target.value;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
this.settings.colorOff[id-1]=event.target.value;
this.settings.colorOff[id]=event.target.value;
this.updateSettings(this.settings);
});
playMode.on("change",event => {
let id = event.target.id.replace('playmode','');
let id = event.target.id.replace('playmode','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].mode=event.target.value;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
this.settings.mode[id-1]=event.target.value;
this.settings.mode[id]=event.target.value;
this.updateSettings(this.settings);
});
volume.on("change",event => {
let id = event.target.id.replace('volume','');
let id = event.target.id.replace('volume','')-1;
let j = Math.floor(id/this.jMax);
let i = id % this.jMax-1;
let i = id % this.jMax;
this.data[j].dataThis[i].volume=event.target.value;
this.update = true;
//let settings = game.settings.get(MODULE.moduleName,'soundboardSettings');
this.settings.volume[id-1]=event.target.value;
this.settings.volume[id]=event.target.value;
this.updateSettings(this.settings);
});
}

View File

@@ -7,7 +7,6 @@ export class Move{
keyPress(settings){
if (canvas.scene == null) return;
//console.log('move',settings)
let dir = settings.dir;
let mode = settings.mode;
if (mode == undefined) mode = 0;

View File

@@ -169,7 +169,6 @@ export class OtherControls{
if (settings.displaySceneIcon) src = scene.img;
if (scene.active) name += "\n(Active)";
}
}
else if (func == 1) { //all scenes
let scene = game.scenes.apps[1].entities.find(p=>p.data.name == name);
@@ -217,7 +216,6 @@ export class OtherControls{
//////////////////////////////////////////////////////////////////////////////////////////
updateControl(settings,context){
//if (canvas.scene == null) return;
let control = settings.control;
if (control == undefined) control = 0;
@@ -664,7 +662,6 @@ export class OtherControls{
let ringOnColor = settings.onRing;
if (ringOnColor == undefined) ringOnColor = '#00FF00';
if (compendium.rendered) ringColor = ringOnColor;
else ringColor = ringOffColor;
@@ -703,8 +700,6 @@ export class OtherControls{
let ringOnColor = settings.onRing;
if (ringOnColor == undefined) ringOnColor = '#00FF00';
if (journal.sheet.rendered) ringColor = ringOnColor;
else ringColor = ringOffColor;
@@ -719,7 +714,7 @@ export class OtherControls{
const journal = game.journal.entries.find(p=>p.name == name);
if (journal == undefined) return;
//if (journal.sheet.rendered) journal.close();
journal.render(true);
}
}

View File

@@ -143,7 +143,6 @@ export class PlaylistControl{
const mode = settings.playlistMode[playlistNr];
if (mode == 0) playing[i].stopAll();
}
}
}
@@ -227,7 +226,4 @@ export class PlaylistControl{
await playlist.updateEmbeddedEntity("PlaylistSound", {_id: track._id, playing: play});
playlist.update({playing: play});
}
}

View File

@@ -177,6 +177,5 @@ export class SoundboardControl{
this.activeSounds[soundNr] = false;
}
this.updateAll();
}
}

View File

@@ -61,7 +61,6 @@ export class StreamDeck{
}
return false;
}
/*
* Get syllables of a word. Taken from: https://stackoverflow.com/a/49407494
@@ -171,8 +170,6 @@ export class StreamDeck{
}
setImage(image,context){
//var image = "data:image/svg+xml;charset=utf8,<?xml version=\"1.0\" encoding=\"iso-8859-1\"?><!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --><svg version=\"1.1\" id=\"Capa_1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" x=\"0px\" y=\"0px\" viewBox=\"0 0 288 288\" style=\"enable-background:new 0 0 288 288;\" xml:space=\"preserve\"> <style> .text { font-family: sans-serif; fill: red; font-size: 10em; } </style><g> <text x=\"0px\" y=\"100px\" class=\"text\">GPUUTILIZATION</text></g></svg>";
var json = {
target: "SD",
event: "setImage",
@@ -269,7 +266,6 @@ export class StreamDeck{
getImage(data){
if (data == undefined)
return;
//console.log('image',data)
const context = data.context;
var url = data.url;
const format = data.format;

View File

@@ -16,7 +16,6 @@ export class TokenControl{
}
pushData(tokenId,settings,context,ring=0,ringColor='#000000'){
//console.log('token',settings);
let name = false;
let icon = false;
let stats = settings.stats;