Skip to content

Commit

Permalink
Texte anglais, mise à jour du XLS pour les Ex Ex
Browse files Browse the repository at this point in the history
  • Loading branch information
Etsuna committed Jul 23, 2019
1 parent 84bb1e6 commit 23064ce
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 58 deletions.
79 changes: 43 additions & 36 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>HatsuneMikuSongsGenerator</groupId>
<artifactId>HatsuneMiku</artifactId>
<version>2.0</version>
<version>2.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down
44 changes: 31 additions & 13 deletions src/main/java/Main.form
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="MainPanel">
<grid id="27dc6" binding="mainJpanel" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<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="692" height="174"/>
<xy x="20" y="20" width="712" height="184"/>
</constraints>
<properties>
<background color="-1"/>
Expand All @@ -16,7 +16,7 @@
<children>
<component id="477a7" class="javax.swing.JButton" binding="generateButton">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<font name="Nirmala UI Semilight" size="16" style="1"/>
Expand All @@ -26,7 +26,7 @@
<grid id="366e0" binding="checkboxPanel" layout-manager="GridLayoutManager" row-count="1" column-count="7" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<background color="-1"/>
Expand Down Expand Up @@ -104,7 +104,7 @@
<grid id="5b1fe" binding="fieldJpanel" layout-manager="GridLayoutManager" row-count="1" column-count="8" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<background color="-1"/>
Expand All @@ -124,7 +124,7 @@
<text value=""/>
</properties>
</component>
<component id="5c82" class="javax.swing.JLabel">
<component id="5c82" class="javax.swing.JLabel" binding="fieldNumberSongs">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
Expand All @@ -136,15 +136,15 @@
<verticalTextPosition value="0"/>
</properties>
</component>
<component id="a803e" class="javax.swing.JLabel">
<component id="a803e" class="javax.swing.JLabel" binding="labelLevelMin">
<constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<background color="-16777216"/>
<font name="Nirmala UI Semilight" size="16" style="1"/>
<foreground color="-16777216"/>
<text value="Level Minimal"/>
<text value="Level Minimum"/>
</properties>
</component>
<component id="913bc" class="javax.swing.JComboBox" binding="comboBox1" default-binding="true">
Expand Down Expand Up @@ -177,15 +177,15 @@
</model>
</properties>
</component>
<component id="204da" class="javax.swing.JLabel">
<component id="204da" class="javax.swing.JLabel" binding="labelMaxLevel">
<constraints>
<grid row="0" column="5" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<background color="-16777216"/>
<font name="Nirmala UI Semilight" size="16" style="1"/>
<foreground color="-16777216"/>
<text value="Level Maximal"/>
<text value="Level Maximum"/>
</properties>
</component>
<component id="a8c43" class="javax.swing.JComboBox" binding="comboBox2" default-binding="true">
Expand Down Expand Up @@ -233,7 +233,7 @@
</grid>
<component id="93c84" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="0" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<background color="-16449539"/>
Expand All @@ -244,17 +244,35 @@
</component>
<component id="a4e97" class="javax.swing.JLabel">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
<grid row="4" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<font name="Segoe UI Light" size="11"/>
<foreground color="-16777216"/>
<horizontalTextPosition value="2"/>
<text value="Dev : Etsuna_ Version : 2.0 "/>
<text value="Dev : Etsuna_ Version : 2.1 "/>
<verticalAlignment value="1"/>
<verticalTextPosition value="0"/>
</properties>
</component>
<component id="2f2b2" class="javax.swing.JComboBox" binding="comboLanguage">
<constraints>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<background color="-1"/>
<foreground color="-16777216"/>
<model>
<item value="Français"/>
<item value="English"/>
</model>
</properties>
</component>
<hspacer id="3d0b">
<constraints>
<grid row="4" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
</children>
</grid>
</form>
Loading

0 comments on commit 23064ce

Please sign in to comment.