Skip to content

Commit

Permalink
2.0.9: updated cfg messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@acaldero
acaldero committed Jul 4, 2019
1 parent 1f28333 commit 8f7990c
Show file tree
Hide file tree
Showing 44 changed files with 418 additions and 412 deletions.
4 changes: 2 additions & 2 deletions devel/mk_i18nlang.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@
"Activation": "Activation",
"Interactive mode: signal value can be updated": "Interactive mode: signal value can be updated",
"Quick interactive mode: quick update of signal value": "Quick interactive mode: quick update of signal value",
"WepSIM User Interface Skin": "WepSIM User Interface Skin",
"WepSIM User Interface skin": "WepSIM User Interface skin",
"(example)": "(example)",
"Accesibility": "Accesibility",
"Active voice: external voice control": "Active voice: external voice control",
"Verbalization: textual or mathematical": "Verbalization: textual or mathematical",
"Enable all features": "Enable all features"
"WepSIM User Interface views": "WepSIM User Interface views"

} ;

Expand Down
56 changes: 28 additions & 28 deletions examples/checkpoint/tutorial_2.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element nm1",
"element": "simcore_record_glowing(\"#nm1\");\n"
"description": "Click on UI element btn_next_microinstruction1",
"element": "simcore_record_glowing(\"#btn_next_microinstruction1\");\n"
},
{
"timestamp": 855,
Expand All @@ -77,8 +77,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element nm1",
"element": "simcore_record_glowing(\"#nm1\");\n"
"description": "Click on UI element btn_next_microinstruction1",
"element": "simcore_record_glowing(\"#btn_next_microinstruction1\");\n"
},
{
"timestamp": 863,
Expand All @@ -87,8 +87,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element nm1",
"element": "simcore_record_glowing(\"#nm1\");\n"
"description": "Click on UI element btn_next_microinstruction1",
"element": "simcore_record_glowing(\"#btn_next_microinstruction1\");\n"
},
{
"timestamp": 835,
Expand All @@ -97,8 +97,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element nm1",
"element": "simcore_record_glowing(\"#nm1\");\n"
"description": "Click on UI element btn_next_microinstruction1",
"element": "simcore_record_glowing(\"#btn_next_microinstruction1\");\n"
},
{
"timestamp": 949,
Expand All @@ -107,8 +107,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element nm1",
"element": "simcore_record_glowing(\"#nm1\");\n"
"description": "Click on UI element btn_next_microinstruction1",
"element": "simcore_record_glowing(\"#btn_next_microinstruction1\");\n"
},
{
"timestamp": 856,
Expand All @@ -117,8 +117,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element nm1",
"element": "simcore_record_glowing(\"#nm1\");\n"
"description": "Click on UI element btn_next_microinstruction1",
"element": "simcore_record_glowing(\"#btn_next_microinstruction1\");\n"
},
{
"timestamp": 991,
Expand All @@ -127,8 +127,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element nm1",
"element": "simcore_record_glowing(\"#nm1\");\n"
"description": "Click on UI element btn_next_microinstruction1",
"element": "simcore_record_glowing(\"#btn_next_microinstruction1\");\n"
},
{
"timestamp": 500,
Expand Down Expand Up @@ -157,8 +157,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element ni1",
"element": "simcore_record_glowing(\"#ni1\");\n"
"description": "Click on UI element btn_next_instruction1",
"element": "simcore_record_glowing(\"#btn_next_instruction1\");\n"
},
{
"timestamp": 940,
Expand All @@ -167,8 +167,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element ni1",
"element": "simcore_record_glowing(\"#ni1\");\n"
"description": "Click on UI element btn_next_instruction1",
"element": "simcore_record_glowing(\"#btn_next_instruction1\");\n"
},
{
"timestamp": 1018,
Expand All @@ -177,8 +177,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element ni1",
"element": "simcore_record_glowing(\"#ni1\");\n"
"description": "Click on UI element btn_next_instruction1",
"element": "simcore_record_glowing(\"#btn_next_instruction1\");\n"
},
{
"timestamp": 500,
Expand Down Expand Up @@ -282,8 +282,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element qbp",
"element": "simcore_record_glowing(\"#qbp\");\n"
"description": "Click on UI element btn_run_stop",
"element": "simcore_record_glowing(\"#btn_run_stop\");\n"
},
{
"timestamp": 2617,
Expand All @@ -297,8 +297,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element rs1",
"element": "simcore_record_glowing(\"#rs1\");\n"
"description": "Click on UI element btn_reset1",
"element": "simcore_record_glowing(\"#btn_reset1\");\n"
},
{
"timestamp": 1170,
Expand Down Expand Up @@ -327,8 +327,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element qbp",
"element": "simcore_record_glowing(\"#qbp\");\n"
"description": "Click on UI element btn_run_stop",
"element": "simcore_record_glowing(\"#btn_run_stop\");\n"
},
{
"timestamp": 15000,
Expand Down Expand Up @@ -367,8 +367,8 @@
},
{
"timestamp": 0,
"description": "Click on UI element rs1",
"element": "simcore_record_glowing(\"#rs1\");\n"
"description": "Click on UI element btn_reset1",
"element": "simcore_record_glowing(\"#btn_reset1\");\n"
}
],
"tag": "Tutorial Example: execution in WepSIM",
Expand Down
2 changes: 1 addition & 1 deletion wepsim/wepsim_web_api.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
'Tutorial mode on. Use the configuration to change it.') ;
}

wepsim_execute_toggle_play('#qbp', (mode == 'tutorial')) ;
wepsim_execute_toggle_play('#btn_run_stop', (mode == 'tutorial')) ;

// add if recording
simcore_record_append_new('Run',
Expand Down
8 changes: 4 additions & 4 deletions wepsim/wepsim_web_classic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -505,19 +505,19 @@ <h6 class="text-secondary mb-1">Tutorial</h6>

<div class="row row pl-2 pr-3">
<div class="btn-toolbar btn-block" role="toolbar">
<button id="rs1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
<button id="btn_reset1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
class="btn btn-light col"
onclick="wsweb_execution_reset();
return false;"><em class="fa fa-power-off"></em><strong><br/><span data-langkey='Reset'>Reset</span></strong></button>
<button id="nm1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
<button id="btn_next_microinstruction1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
class="btn btn-light col"
onclick="wsweb_execution_microinstruction();
return false;"><em class="fa fa-step-forward"></em><strong><br/><span class="d-none d-sm-inline-flex" data-langkey='microInstruction'>&#181;Instruction</span><span class="d-sm-none">&#181;Instr.</span></strong></button>
<button id="ni1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
<button id="btn_next_instruction1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
class="btn btn-light col"
onclick="wsweb_execution_instruction();
return false;"><em class="fa fa-fast-forward"></em><strong><br/><span class="d-none d-sm-inline-flex" data-langkey='Instruction'>Instruction</span><span class="d-sm-none">Instr.</span></strong></button>
<button id="qbp" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
<button id="btn_run_stop" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
class="btn btn-light col"
onclick="wsweb_execution_run();
return false;"><em class="fa fa-play"></em><strong><br/><span data-langkey='Run'>Run</span></strong></button>
Expand Down
8 changes: 4 additions & 4 deletions wepsim/wepsim_web_compact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -481,19 +481,19 @@ <h6 class="text-secondary mb-1"><span data-langkey="Help">Help</span></h6>

<div class="row row pl-2 pr-3">
<div class="btn-toolbar btn-block" role="toolbar">
<button id="rs1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
<button id="btn_reset1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
class="btn btn-light col"
onclick="wsweb_execution_reset();
return false;"><em class="fa fa-power-off"></em><strong><br/><span data-langkey='Reset'>Reset</span></strong></button>
<button id="nm1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
<button id="btn_next_microinstruction1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
class="btn btn-light col"
onclick="wsweb_execution_microinstruction();
return false;"><em class="fa fa-step-forward"></em><strong><br/><span class="d-none d-sm-inline-flex" data-langkey='microInstruction'>&#181;Instruction</span><span class="d-sm-none">&#181;Instr.</span></strong></button>
<button id="ni1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
<button id="btn_next_instruction1" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
class="btn btn-light col"
onclick="wsweb_execution_instruction();
return false;"><em class="fa fa-fast-forward"></em><strong><br/><span class="d-none d-sm-inline-flex" data-langkey='Instruction'>Instruction</span><span class="d-sm-none">Instr.</span></strong></button>
<button id="qbp" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
<button id="btn_run_stop" style="background-color: #CCCCCC; border-color:white; border-width:1 1 1 1px;"
class="btn btn-light col"
onclick="wsweb_execution_run();
return false;"><em class="fa fa-play"></em><strong><br/><span data-langkey='Run'>Run</span></strong></button>
Expand Down
16 changes: 10 additions & 6 deletions wepsim/wepsim_web_simulator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,16 @@
function wepsim_view_onlyasm_on ( )
{
$(".multi-collapse-2").collapse("show") ;
$("#slider_cpucu").hide() ;
$("#slider_cpucu").addClass('d-none') ;

$("#tab26").hide() ;
$("#tab21").hide() ;
$("#tab26").addClass('d-none') ;
$("#tab21").addClass('d-none') ;
$("#tab24").click() ;

inputfirm.setOption('readOnly', true) ;
$("#btn_micro1").addClass('d-none') ;
$("#btn_next_microinstruction1").addClass('d-none') ;
$("#s5b_16").addClass('d-none') ;

// return ok
return true ;
Expand All @@ -112,13 +114,15 @@
function wepsim_view_onlyasm_off ( )
{
$(".multi-collapse-2").collapse("show") ;
$("#slider_cpucu").show() ;
$("#slider_cpucu").removeClass('d-none') ;

$("#tab26").show() ;
$("#tab21").show() ;
$("#tab26").removeClass('d-none') ;
$("#tab21").removeClass('d-none') ;

inputfirm.setOption('readOnly', false) ;
$("#btn_micro1").removeClass('d-none') ;
$("#btn_next_microinstruction1").removeClass('d-none') ;
$("#s5b_16").removeClass('d-none') ;

// return ok
return true ;
Expand Down
100 changes: 51 additions & 49 deletions wepsim_core/wepsim_config_commands.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,57 @@
description: "<span data-langkey='Notification speed: time before disapear'>Notification speed: time before disapear</span>"
});

/*
ws_config.push({
id: "select8",
type: "General",
level: "actual",
code_cfg: "<div class='form-group m-0'>" +
" <select name='select8' id='select8' class='form-control form-control-sm custom-select'" +
" aria-label='User Interface for WepSIM' " +
" onchange=\"var opt = $(this).find('option:selected');" +
" var optValue = opt.val();" +
" update_cfg('ws_skin_ui', optValue);" +
" window.removeEventListener('beforeunload', wepsim_confirm_exit);" +
" window.location='wepsim-' + optValue + '.html';" +
" return false;\"" +
" data-native-menu='false'>" +
" <option value='classic'>Classic</option>" +
" <option value='compact'>Compact</option>" +
" </select>" +
"</div>",
code_init: function() {
$('#select8').val(get_cfg('ws_skin_ui'));
},
description: "<span data-langkey='WepSIM User Interface skin'>WepSIM User Interface skin</span>"
});
*/

ws_config.push({
id: "select9",
type: "General",
level: "actual",
code_cfg: "<div class='form-group m-0'>" +
" <select name='select9' id='select9' class='form-control form-control-sm custom-select'" +
" aria-label='User Interface set of features for WepSIM' " +
" onchange=\"var opt = $(this).find('option:selected');" +
" var optValue = opt.val();" +
" update_cfg('ws_skin_user', optValue);" +
" wepsim_restoreview(optValue);" +
" return false;\"" +
" data-native-menu='false'>" +
" <option value='only_asm:of:only_frequent:on'>Student</option>" +
" <option value='only_asm:on:only_frequent:on'>Student - assembly only</option>" +
" <option value='only_asm:of:only_frequent:of'>Teacher</option>" +
" <option value='only_asm:on:only_frequent:of'>Teacher - assembly only</option>" +
" </select>" +
"</div>",
code_init: function() {
$('#select9').val(get_cfg('ws_skin_user'));
},
description: "<span data-langkey='WepSIM User Interface views'>WepSIM User Interface views</span>"
});

ws_config.push({
id: "radio12",
type: "Execution",
Expand Down Expand Up @@ -471,52 +522,3 @@
description: "<span data-langkey='Verbalization: textual or mathematical'>Verbalization: textual or mathematical</span>"
});

ws_config.push({
id: "select8",
type: "Accesibility",
level: "actual",
code_cfg: "<div class='form-group m-0'>" +
" <select name='select8' id='select8' class='form-control form-control-sm custom-select'" +
" aria-label='User Interface for WepSIM' " +
" onchange=\"var opt = $(this).find('option:selected');" +
" var optValue = opt.val();" +
" update_cfg('ws_skin_ui', optValue);" +
" window.removeEventListener('beforeunload', wepsim_confirm_exit);" +
" window.location='wepsim-' + optValue + '.html';" +
" return false;\"" +
" data-native-menu='false'>" +
" <option value='classic'>Classic</option>" +
" <option value='compact'>Compact</option>" +
" </select>" +
"</div>",
code_init: function() {
$('#select8').val(get_cfg('ws_skin_ui'));
},
description: "<span data-langkey='WepSIM User Interface Skin'>WepSIM User Interface Skin</span>"
});

ws_config.push({
id: "select9",
type: "Accesibility",
level: "actual",
code_cfg: "<div class='form-group m-0'>" +
" <select name='select9' id='select9' class='form-control form-control-sm custom-select'" +
" aria-label='User Interface set of features for WepSIM' " +
" onchange=\"var opt = $(this).find('option:selected');" +
" var optValue = opt.val();" +
" update_cfg('ws_skin_user', optValue);" +
" wepsim_restoreview(optValue);" +
" return false;\"" +
" data-native-menu='false'>" +
" <option value='only_asm:on:only_frequent:of'>Assembly only</option>" +
" <option value='only_asm:on:only_frequent:on'>Assembly & Frequent only</option>" +
" <option value='only_asm:of:only_frequent:of'>All</option>" +
" <option value='only_asm:of:only_frequent:on'>Frequent only</option>" +
" </select>" +
"</div>",
code_init: function() {
$('#select9').val(get_cfg('ws_skin_user'));
},
description: "<span data-langkey='Enable all features'>Enable all features</span>"
});

Loading

0 comments on commit 8f7990c

Please sign in to comment.