diff --git a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html
index 382026b7d5b71fb711b731b0b7cdc45d3fc5e0aa..24f7cf6e795b52f4243cdd39691b8a0deac1971b 100755
--- a/Frontend Angular 4/src/app/layout/matefun/matefun.component.html
+++ b/Frontend Angular 4/src/app/layout/matefun/matefun.component.html
@@ -13,10 +13,21 @@
[disabled]="!archivo.editable || archivo.estado=='Corregido' || archivo.estado == 'Entregado'"
*ngIf="archivo" [(ngModel)]="archivo.nombre" (keyup)="archivoModificado()" placeholder='{{ "i18n.msg.file.fileName" | translate }}' />
+ <button
+ style="margin-left: 5px; float: right;"
+ id="shortcutsPopover"
+ class="btn btn-sm btn-secondary"
+ placement="bottom"
+ [ngbPopover]=shortcutsPopoverContent
+ #popover="ngbPopover"
+ popoverTitle='{{ "i18n.object.shortcuts" | translate | titleCase }}'
+ tiggers="click">
+ <i class="fa fa-keyboard-o"></i>
+ </button>
<button
id="downloadFileButton"
(click)="downloadFile()"
- style="margin-left: 10px; float: right;"
+ style="margin-left: 5px; float: right;"
class="btn btn-sm btn-secondary"
placement="bottom"
ngbPopover='{{ "i18n.action.export" | translate | titleCase }} (Ctrl+E)'
@@ -25,7 +36,7 @@
<i class="fa fa-download "></i>
</button>
<button
- style="margin-left: 10px; float: right;"
+ style="margin-left: 5px; float: right;"
id="popover" class="btn btn-sm btn-secondary"
placement="bottom"
[ngbPopover]=popoverContent
@@ -35,7 +46,7 @@
<i class="fa fa-gear"></i>
</button>
<div
- style="margin-left: 10px; float: right;"
+ style="margin-left: 5px; float: right;"
ngbPopover='{{ "i18n.action.save" | translate | titleCase }} {{ "i18n.object.file" | translate | titleCase }} (Ctrl+G)'
triggers="mouseenter:mouseleave"
placement="bottom" >
@@ -44,7 +55,7 @@
</button>
</div>
<button
- style="margin-left: 10px; float: right;"
+ style="margin-left: 5px; float: right;"
(click)="reiniciarInterprete()"
class="btn btn-sm btn-secondary"
ngbPopover='{{ "i18n.action.restart" | translate | titleCase }} {{ "i18n.object.interpreter" | translate | titleCase }} (Ctrl+R)'
@@ -53,7 +64,7 @@
<i class="fa fa-refresh"></i>
</button>
<button
- style="margin-left: 10px; float: right;"
+ style="margin-left: 5px; float: right;"
(click)="runCode()"
class="btn btn-sm btn-secondary"
ngbPopover='{{ "i18n.action.load" | translate | titleCase }} {{ "i18n.object.program" | translate | titleCase }} (Ctrl+P)'
@@ -99,8 +110,8 @@
</label>
<br>
<label>
- <input type="checkbox" style="width: 15px; display: inline-block;" name="hintsCheck" class="form-control form-control-sm" [(ngModel)]=hintsCheck (change)="changeHints()">
- Mostrar sugerencias de autocompletar
+ <input type="checkbox" style="width: 15px; display: inline-block;" name="hintsCheck" class="form-control form-control-sm" [(ngModel)]=hintsCheck>
+ {{ "i18n.msg.codemirror.showHints" | translate }}
</label>
</div>
<div class="form-group">
@@ -111,13 +122,13 @@
<ng-template #shortcutsPopoverContent style="width: 15em">
<div style="width: 15em">
<div class="form-group">
- <label><b>Ctrl+P</b> Ejecutar el código</label>
- <label><b>Ctrl+A</b> Nuevo archivo</label>
- <label><b>Ctrl+O</b> Abrir menú de opciones</label>
- <label><b>Ctrl+E</b> Exportar archivo puntual</label>
- <label><b>Ctrl+R</b> Reiniciar intérprete</label>
- <label><b>Ctrl+G</b> Guardar archivo</label>
- <label><b>Ctrl+Space</b> Autocompletar</label>
+ <label><b>Ctrl+P</b> {{ "i18n.shortcuts.runCode" | translate }}</label>
+ <label><b>Ctrl+A</b> {{ "i18n.shortcuts.newFile" | translate }}</label>
+ <label><b>Ctrl+O</b> {{ "i18n.shortcuts.openMenu" | translate }}</label>
+ <label><b>Ctrl+E</b> {{ "i18n.shortcuts.exportFile" | translate }}</label>
+ <label><b>Ctrl+R</b> {{ "i18n.shortcuts.restartInterpreter" | translate }}</label>
+ <label><b>Ctrl+G</b> {{ "i18n.shortcuts.saveFile" | translate }}</label>
+ <label><b>Ctrl+Space</b> {{ "i18n.shortcuts.autocomplete" | translate }}</label>
</div>
</div>
</ng-template>
diff --git a/Frontend Angular 4/src/assets/i18n/en.json b/Frontend Angular 4/src/assets/i18n/en.json
index b17520e99da90e36a4c68c47d5e9ddf78c734b1f..8f76022709bffc931f834bacf1ad76db48c90226 100644
--- a/Frontend Angular 4/src/assets/i18n/en.json
+++ b/Frontend Angular 4/src/assets/i18n/en.json
@@ -30,6 +30,7 @@
},
"object" : {
"settings" : "settings",
+ "shortcuts" : "shortcuts",
"theme" : "theme",
"name" : "name",
"descr" : "description",
@@ -71,7 +72,8 @@
"fontSize" : "Font Size",
"functionWarnings": "Show warnings of use of functions",
"infixOperatorsWarnings" : "Show warnings of use of infix operators",
- "cursorPosition" : "Cursor position"
+ "cursorPosition" : "Cursor position",
+ "showHints" : "Show autocomplete hints"
},
"figure" : {
"multiPlot" : "Multi graph",
@@ -116,6 +118,15 @@
"group" : {
"select" : "Select a group"
}
+ },
+ "shortcuts" : {
+ "runCode" : "Execute the code",
+ "newFile" : "New file",
+ "openMenu" : "Open options menu",
+ "exportFile" : "Export point file",
+ "restartInterpreter" : "Restart interpreter",
+ "saveFile" : "Save File",
+ "autocomplete" : "Autocomplete"
}
}
-}
\ No newline at end of file
+}
diff --git a/Frontend Angular 4/src/assets/i18n/es.json b/Frontend Angular 4/src/assets/i18n/es.json
index 57bab4c88684168a9507744abd2ef1d92cb82245..28025c3f2824299a006c8a3eabb502b0af3332af 100644
--- a/Frontend Angular 4/src/assets/i18n/es.json
+++ b/Frontend Angular 4/src/assets/i18n/es.json
@@ -30,6 +30,7 @@
},
"object" : {
"settings" : "configuración",
+ "shortcuts" : "atajos",
"name" : "nombre",
"descr" : "descripción",
"user" : "usuario",
@@ -71,7 +72,8 @@
"fontSize" : "Tamaño de fuente",
"functionWarnings": "Mostrar advertencias de uso de funciones",
"infixOperatorsWarnings" : "Mostrar advertencias de uso de operadores infijos",
- "cursorPosition" : "Posición del cursor"
+ "cursorPosition" : "Posición del cursor",
+ "showHints" : "Mostrar sugerencias de autocompletar"
},
"figure" : {
"multiPlot" : "Multi gráfica",
@@ -116,6 +118,15 @@
"group" : {
"select" : "Seleccione un grupo"
}
+ },
+ "shortcuts" : {
+ "runCode" : "Ejecutar el código",
+ "newFile" : "Nuevo archivo",
+ "openMenu" : "Abrir menú de opciones",
+ "exportFile" : "Exportar archivo puntual",
+ "restartInterpreter" : "Reiniciar intérprete",
+ "saveFile" : "Guardar archivo",
+ "autocomplete" : "Autocompletar"
}
}
-}
\ No newline at end of file
+}