Skip to content

add a text to explicit buttons who modify the page size #484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Noars merged 2 commits into from
May 20, 2025
Merged

add a text to explicit buttons who modify the page size #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b269ba8
add a text to explicit buttons who modify the page size
PillouMatou May 19, 2025
b9fbdcb
Merge branch 'master' into FixParametersIssue
PillouMatou May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/app/components/keyboard/keyboard.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@
padding: 0 0 0 0;
}

.descriptionPlacement {
top: 25%;
position: relative;
}

.editionSettings .gridSettings .inputSize {
width: 40px;
height: 40px;
Expand Down Expand Up @@ -264,4 +269,4 @@ app-usertoolbar {
.editSettingsButton:hover .tooltiptext {
visibility: visible;
cursor: pointer;
}
}
7 changes: 5 additions & 2 deletions src/app/components/keyboard/keyboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
<!-- </div>-->

<!-- input fields for column and row size, have to be changed with a button number incrementer -->

<div class="gridSettings">
<div class="gridSettingsImage floatLeft centerText "
[ngStyle]="{'background-image':'url(assets/icons/colomns.svg)'}">
Expand All @@ -179,10 +180,12 @@
<input class="inputSize floatLeft centerText" value="{{this.boardService.getGapSize()}}" type="number" min="0"
(change)="onKeyGap($event)" max="50">
</div>

<div class="floatRight descriptionPlacement">
<label>{{multilinguism.translate("CurrentPageDimensions")}}:</label>
</div>
</div>

<!--*ngIf="!this.userToolBarService.edit"-->


<!--<app-edition [ngStyle]="{'position': 'absolute', 'top': this.userToolBarService.edit ? 'calc( 50% - 1.5cm )' :'100%'}" style="width: 100%; transition: top 0.5s"></app-edition>-->
<!--<app-edition [ngStyle]="{'position': 'absolute', 'top': this.userToolBarService.edit ? 'calc( 50% - 1.5cm )' :'100%'}" style="width: 100%; transition: top 0.5s"></app-edition>-->
31 changes: 16 additions & 15 deletions src/assets/multilinguism.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
{ "id" : "chooseTitleFormat", "FR" : "Choisissez le format du titre", "EN" : "Choose title format" },
{ "id" : "chooseNumberOfColumns", "FR" : "Choisissez le nombre de colonnes", "EN" : "Choose the number of columns" },
{ "id" : "chooseNumberOfLines", "FR" : "Choisissez le nombre de lignes", "EN" : "Choose the number of rows" },
{ "id" : "chooseGapBetweenPictograms", "FR" : "Choisissez l'écart entre les pictogrammes'", "EN" : "Choose the gap between pictograms" },
{ "id" : "chooseGapBetweenPictograms", "FR" : "Choisissez l'écart entre les pictogrammes", "EN" : "Choose the gap between pictograms" },
{ "id" : "gridDimensions", "FR" : "Dimensions de la grille", "EN" : "Grid dimensions" },
{ "id" : "backgroundTheme", "FR" : "Thème du fond", "EN" : "Background theme" },
{ "id" : "chooseTheColor", "FR" : "Choisissez la couleur", "EN" : "Choose the color" },
Expand Down Expand Up @@ -163,19 +163,19 @@
{ "id" : "VoulezVousVraimentSupprimerLaGrille?", "FR" : "Voulez vous vraiment supprimer la grille?", "EN" : "Do you really want to delete the grid?"},
{ "id" : "clearGrid", "FR" : "Vider la grille", "EN" : "Clear the grid"},
{ "id" : "validate", "FR" : "Valider", "EN" : "Validate"},
{ "id": "Print", "FR" : "Exporter", "EN" : "Export"},
{ "id": "Header", "FR" : "En-tête", "EN" : "Header"},
{ "id": "Footer", "FR" : "Pied de page", "EN" : "Footer"},
{ "id": "enableHeader", "FR" : "Activer l'en-tête", "EN" : "Enable header "},
{ "id": "enableFooter", "FR" : "Activer le pied de page", "EN" : "Enable footer "},
{ "id": "addPageName", "FR" : "Ajouter le nom de la page", "EN" : "Add page name "},
{ "id": "addVersion", "FR" : "Ajouter la version d'AugCom", "EN" : "Add version of AugCom "},
{ "id": "text", "FR" : "Texte", "EN" : "Text"},
{ "id": "image", "FR" : "Image", "EN" : "Image"},
{ "id": "textHeader", "FR" : "Texte pour l'en-tête ", "EN" : "Text for header "},
{ "id": "imageHeader", "FR" : "Image pour l'en-tête ", "EN" : "Image for header "},
{ "id": "textFooter", "FR" : "Texte pour le pied de page ", "EN" : "Text for footer "},
{ "id": "imageFooter", "FR" : "Image pour le pied de page ", "EN" : "Image for footer "},
{ "id" : "Print", "FR" : "Exporter", "EN" : "Export"},
{ "id" : "Header", "FR" : "En-tête", "EN" : "Header"},
{ "id" : "Footer", "FR" : "Pied de page", "EN" : "Footer"},
{ "id" : "enableHeader", "FR" : "Activer l'en-tête", "EN" : "Enable header "},
{ "id" : "enableFooter", "FR" : "Activer le pied de page", "EN" : "Enable footer "},
{ "id" : "addPageName", "FR" : "Ajouter le nom de la page", "EN" : "Add page name "},
{ "id" : "addVersion", "FR" : "Ajouter la version d'AugCom", "EN" : "Add version of AugCom "},
{ "id" : "text", "FR" : "Texte", "EN" : "Text"},
{ "id" : "image", "FR" : "Image", "EN" : "Image"},
{ "id" : "textHeader", "FR" : "Texte pour l'en-tête ", "EN" : "Text for header "},
{ "id" : "imageHeader", "FR" : "Image pour l'en-tête ", "EN" : "Image for header "},
{ "id" : "textFooter", "FR" : "Texte pour le pied de page ", "EN" : "Text for footer "},
{ "id" : "imageFooter", "FR" : "Image pour le pied de page ", "EN" : "Image for footer "},
{ "id" : "nameEmpty", "FR" : "Veuillez remplir le nom", "EN" : "Please fill the name"},
{ "id" : "userGuide", "FR" : "Guide de AugCom", "EN" : "AugCom Guide"},
{ "id" : "PrimaryUse", "FR" : "Utilisation primaire de AugCom", "EN" : "Primary use of AugCom"},
Expand Down Expand Up @@ -384,6 +384,7 @@
{ "id" : "mute", "FR": "Couper le volume", "EN": "Mute"},
{ "id" : "path", "FR": "Chemin", "EN": "Path"},
{ "id" : "titlePage", "FR": "Titre de la page", "EN": "Title of the page"},
{ "id" : "visualisationPath", "FR": "Visualisation du chemin", "EN": "Path visualization"}
{ "id" : "visualisationPath", "FR": "Visualisation du chemin", "EN": "Path visualization"},
{ "id" : "CurrentPageDimensions", "FR": "Dimensions de la page courante", "EN": "Dimensions of current page"}
]
}