Correction Difficulté et syntaxe

Etsuna · Jul 23, 2019 · 1396143 · 1396143
1 parent 23064ce
commit 1396143
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 46 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>HatsuneMikuSongsGenerator</groupId>
     <artifactId>HatsuneMiku</artifactId>
-    <version>2.1</version>
+    <version>2.2</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/src/main/java/Main.form b/src/main/java/Main.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="mainJpanel" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="1" left="1" bottom="1" right="1"/>
     <constraints>
-      <xy x="20" y="20" width="712" height="184"/>
+      <xy x="20" y="20" width="768" height="184"/>
     </constraints>
     <properties>
       <background color="-1"/>
@@ -144,7 +144,7 @@
               <background color="-16777216"/>
               <font name="Nirmala UI Semilight" size="16" style="1"/>
               <foreground color="-16777216"/>
-              <text value="Level Minimum"/>
+              <text value="Difficulté Minimale"/>
             </properties>
           </component>
           <component id="913bc" class="javax.swing.JComboBox" binding="comboBox1" default-binding="true">
@@ -185,7 +185,7 @@
               <background color="-16777216"/>
               <font name="Nirmala UI Semilight" size="16" style="1"/>
               <foreground color="-16777216"/>
-              <text value="Level Maximum"/>
+              <text value="Difficulté Maximale"/>
             </properties>
           </component>
           <component id="a8c43" class="javax.swing.JComboBox" binding="comboBox2" default-binding="true">
@@ -250,7 +250,7 @@
           <font name="Segoe UI Light" size="11"/>
           <foreground color="-16777216"/>
           <horizontalTextPosition value="2"/>
-          <text value="Dev : Etsuna_ Version : 2.1    "/>
+          <text value="Dev : Etsuna_ Version : 2.2    "/>
           <verticalAlignment value="1"/>
           <verticalTextPosition value="0"/>
         </properties>

diff --git a/src/main/java/MainPanel.java b/src/main/java/MainPanel.java
@@ -30,7 +30,7 @@ public class MainPanel {
     private JLabel fieldNumberSongs;
     private JLabel labelLevelMin;
     private JLabel labelMaxLevel;
-    private String labeldifficuly;
+    private String labeldifficuly = "Difficulté";
     private boolean breakSwitch = true;
 
     public static void main(String[] args) {
@@ -56,16 +56,16 @@ public void actionPerformed(ActionEvent e) {
                 if (comboSelectedValue.equals("Français")) {
                     generateButton.setText("Générer");
                     fieldNumberSongs.setText("Nombre de musique");
-                    labelLevelMin.setText("Level Minimum");
-                    labelMaxLevel.setText("Level Maximum");
+                    labelLevelMin.setText("Difficulté Minimale");
+                    labelMaxLevel.setText("Difficulté Maximale");
                     labeldifficuly = "Difficulté";
                 }
 
                 if (comboSelectedValue.equals("English")) {
                     generateButton.setText("Generate");
                     fieldNumberSongs.setText("Number of music");
-                    labelLevelMin.setText("Minimum level");
-                    labelMaxLevel.setText("Maximum level");
+                    labelLevelMin.setText("Minimum Difficulty");
+                    labelMaxLevel.setText("Maximum Difficulty");
                     labeldifficuly = "Difficulty";
                 }