Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #14274 from huffman/feat/silence-defaults-in-script-log

Browse source 
Add optional default scripts log suppression to the script debug window
This commit is contained in:
Jeff Clinton 2018-10-25 08:50:25 -07:00 committed by GitHub
commit 736dc47934
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
scripts/developer/debugging/debugWindow.js
View file

@ -19,6 +19,23 @@ if (scripts.length >= 2) {
return; return;
} }
var SUPPRESS_DEFAULT_SCRIPTS_MENU_NAME = "Developer"
var SUPPRESS_DEFAULT_SCRIPTS_ITEM_NAME = "Suppress messages from default scripts in Debug Window";
var DEBUG_WINDOW_SUPPRESS_DEFAULTS_SCRIPTS = 'debugWindowSuppressDefaultScripts';
var suppressDefaultScripts = Settings.getValue(DEBUG_WINDOW_SUPPRESS_DEFAULTS_SCRIPTS, false)
Menu.addMenuItem({
menuName: SUPPRESS_DEFAULT_SCRIPTS_MENU_NAME,
menuItemName: SUPPRESS_DEFAULT_SCRIPTS_ITEM_NAME,
isCheckable: true,
isChecked: suppressDefaultScripts
});
Menu.menuItemEvent.connect(function(menuItem) {
if (menuItem === SUPPRESS_DEFAULT_SCRIPTS_ITEM_NAME) {
suppressDefaultScripts = Menu.isOptionChecked(SUPPRESS_DEFAULT_SCRIPTS_ITEM_NAME);
}
});
// Set up the qml ui // Set up the qml ui
var qml = Script.resolvePath('debugWindow.qml'); var qml = Script.resolvePath('debugWindow.qml');
@ -61,17 +78,24 @@ window.visibleChanged.connect(function() {
window.closed.connect(function () { Script.stop(); }); window.closed.connect(function () { Script.stop(); });
function shouldLogMessage(scriptFileName) {
return !suppressDefaultScripts
|| (scriptFileName !== "defaultScripts.js" && scriptFileName != "controllerScripts.js");
}
var getFormattedDate = function() { var getFormattedDate = function() {
var date = new Date(); var date = new Date();
return date.getMonth() + "/" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); return date.getMonth() + "/" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
}; };
var sendToLogWindow = function(type, message, scriptFileName) { var sendToLogWindow = function(type, message, scriptFileName) {
var typeFormatted = ""; if (shouldLogMessage(scriptFileName)) {
if (type) { var typeFormatted = "";
typeFormatted = type + " - "; if (type) {
typeFormatted = type + " - ";
}
window.sendToQml("[" + getFormattedDate() + "] " + "[" + scriptFileName + "] " + typeFormatted + message);
} }
window.sendToQml("[" + getFormattedDate() + "] " + "[" + scriptFileName + "] " + typeFormatted + message);
}; };
ScriptDiscoveryService.printedMessage.connect(function(message, scriptFileName) { ScriptDiscoveryService.printedMessage.connect(function(message, scriptFileName) {
@ -95,6 +119,10 @@ ScriptDiscoveryService.clearDebugWindow.connect(function() {
}); });
Script.scriptEnding.connect(function () { Script.scriptEnding.connect(function () {
Settings.setValue(DEBUG_WINDOW_SUPPRESS_DEFAULTS_SCRIPTS,
Menu.isOptionChecked(SUPPRESS_DEFAULT_SCRIPTS_ITEM_NAME));
Menu.removeMenuItem(SUPPRESS_DEFAULT_SCRIPTS_MENU_NAME, SUPPRESS_DEFAULT_SCRIPTS_ITEM_NAME);
var geometry = JSON.stringify({ var geometry = JSON.stringify({
x: window.position.x, x: window.position.x,
y: window.position.y, y: window.position.y,