diff --git a/Motus/Main.qml b/Motus/Main.qml
index 88ae3109622787447d6f8e2f5ca5ece6bdb2ef68..2e6091c498b67a9619c1a61ddbefaf9a0c9491ba 100644
--- a/Motus/Main.qml
+++ b/Motus/Main.qml
@@ -425,7 +425,11 @@ Window {
langageButton2.rectangleColor = "#7a7a7a";
langageButton.rectangleColor = "green";
choosebutton._textText = "Générer un mot";
- text_langue.text = "Language";
+ text_langue.text = "Langage";
+ text_choix_nb_lettres.text = "Nombre de lettres";
+ text_stats.text = "Statistiques"
+ text_abandon.text = "Abandonner"
+ numberLetterBtn.firstItemText = "5";
}
}
}
@@ -445,6 +449,10 @@ Window {
langageButton.rectangleColor = "#7a7a7a";
choosebutton._textText = "Generate a word";
text_langue.text = "Language";
+ text_choix_nb_lettres.text = "Number of letters";
+ text_stats.text = "Statistics"
+ text_abandon.text = "Abandon"
+ numberLetterBtn.firstItemText = "5";
}
}
}
@@ -579,15 +587,16 @@ Window {
anchors.horizontalCenter: parent.horizontalCenter
Text {
- id: _text
+ id: text_abandon
color: "#ffffff"
- text: qsTr("Abandonner")
+ text: qsTr("Abandon")
anchors.left: parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
font.pixelSize: 25
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
+ anchors.horizontalCenterOffset: 0
anchors.horizontalCenter: parent.horizontalCenter
font.family: "Tahoma"
MouseArea {
@@ -853,7 +862,7 @@ Window {
anchors.horizontalCenter: parent.horizontalCenter
}
Rectangle {
- id: abandon_rect
+ id: rect_stats
width: 250
height: 100
color: "#323232"
@@ -863,9 +872,9 @@ Window {
anchors.horizontalCenter: parent.horizontalCenter
Text {
- id: text_abandon
+ id: text_stats
color: "#ffffff"
- text: qsTr("Statistiques")
+ text: qsTr("Statistics")
anchors.left: parent.left
anchors.top: parent.top
anchors.bottom: parent.bottom
diff --git a/README.md b/README.md
index 948ce55b0c267d6d236ef3bc6564efd09cbb20e5..24696661a054673f4fcc5d0cf034641d5bbcdba3 100644
--- a/README.md
+++ b/README.md
@@ -1,93 +1,64 @@
-# Momomotus
+# Motus
+Le **Motus** est un jeu de lettres, inspiré du célèbre jeu télévisé.
+Le but est de **deviner un mot secret** en un nombre limité de tentatives, et ce dans un **temps imparti**.
+---
-## Getting started
+## Fonctionnalités
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
+### Avant de démarrer une partie
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
+- **Choix de la langue** : Des boutons permettent de choisir la langue (anglais et français), et mettent à jour l'interface dans la langue choisie
+- **Choix du nombre de lettres** : Un autre bouton permet de choisir le nombre de lettres (entre 4 et 12) dont est composé le prochain mot à deviner. La difficulté à trouver le mot étant d'autant plus élevée que son nombre de lettres est grand, le nombre d'essais autorisé pour trouver le mot en dépend :
+ - 4 lettres : 5 essais
+ - 5-6 lettres : 6 essais
+ - 7-8 lettres : 7 essais
+ - 9-12 lettres : 8 essais
-## Add your files
+### Lancer la partie
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
+- **Génération aléatoire** d’un mot respectant les critères choisis via le bouton correspondant
-```
-cd existing_repo
-git remote add origin https://gitlab.ec-lyon.fr/ppouchet/momomotus.git
-git branch -M main
-git push -uf origin main
-```
+### Saisie et interactions
-## Integrate with your tools
+- Pour taper un mot, il suffit d'utiliser le clavier de l'ordinateur ou de cliquer sur le clavier virtuel affiché
+- Les lettres s’affichent automatiquement sur la rangée correspondant au numéro de l’essai en cours
+- Lorsqu’un mot est validé, son appartenance au dictionnaire de la langue choisie est vérifiée :
+ - S'il n'appartient pas au dictionnaire, le mot tapé est affiché en rouge, et n'est pas validé
+ - Sinon, il est validé et :
+ - Une lettre est affichée en jaune si elle est présente dans le mot mais mal placée
+ - Elle est affichée en vert si elle est bien placée
+ - Le clavier virtuel est mis à jour pour sauvegarder les couleurs des lettres déjà essayées, une touche de ce clavier est :
+ - verte si la lettre a déjà bien été placée
+ - jaune si elle a été placée, qu'elle est présente dans le mot mais n'a jamais été bien placée
+ - sans couleur si elle a déjà été placée, mais qu'elle n'est pas présente dans le mot
-- [ ] [Set up project integrations](https://gitlab.ec-lyon.fr/ppouchet/momomotus/-/settings/integrations)
+### Règles de la partie
-## Collaborate with your team
+- **Minuteur intégré** : le temps commence à s'écouler dès que le mot est généré, le minuteur est de 2 minutes
+- **Victoire** si le mot est trouvé à temps
+- **Défaite** si :
+ - le joueur abandonne en cliquant sur le bouton dédié
+ - le nombre maximal de tentatives est atteint
+ - le temps est écoulé
+ Dans tous les cas de défaite, le mot à trouver est révélé à la fin de la partie
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
+### Statistiques
-## Test and Deploy
+?????????????????????????????????????????????????????????????????????????????????????????????????????
-Use the built-in continuous integration in GitLab.
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-***
+## Compilation et lancement
-# Editing this README
+### Via Qt Creator
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
+1. Ouvrir le fichier ``CMakeLists.txt` avec Qt Creator
+2. Configurer un kit de compilation (Qt Desktop avec CMake), si besoin, cocher la case "Exécuter dans un terminal" dans Projets -> Exécuter
+3. Lancer la compilation puis l'exécution depuis l'environnement
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-## Name
-Choose a self-explaining name for your project.
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+---