Merge pull request #35 from cpc6128/develop

Version 3.9
cpc6128 · Apr 10, 2021 · 8d6c2c2 · 8d6c2c2
2 parents 5e21bb7 + bdc1231
commit 8d6c2c2
Show file tree

Hide file tree

Showing 21 changed files with 219 additions and 113 deletions.
diff --git a/linotte-accessibilite/pom.xml b/linotte-accessibilite/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>langagelinotte</artifactId>
         <groupId>fr.codevallee</groupId>
-        <version>3.8</version>
+        <version>3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linotte-alize/pom.xml b/linotte-alize/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>langagelinotte</artifactId>
         <groupId>fr.codevallee</groupId>
-        <version>3.8</version>
+        <version>3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linotte-dist/pom.xml b/linotte-dist/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>langagelinotte</artifactId>
         <groupId>fr.codevallee</groupId>
-        <version>3.8</version>
+        <version>3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linotte-ext/pom.xml b/linotte-ext/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>langagelinotte</artifactId>
         <groupId>fr.codevallee</groupId>
-        <version>3.8</version>
+        <version>3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/linotte-greffons/pom.xml b/linotte-greffons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>langagelinotte</artifactId>
         <groupId>fr.codevallee</groupId>
-        <version>3.8</version>
+        <version>3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>fr.codevallee</groupId>
             <artifactId>linotte-moteur</artifactId>
-            <version>3.8</version>
+            <version>3.9</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/linotte-lanceur/pom.xml b/linotte-lanceur/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>langagelinotte</artifactId>
         <groupId>fr.codevallee</groupId>
-        <version>3.8</version>
+        <version>3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,13 +15,13 @@
         <dependency>
             <groupId>fr.codevallee</groupId>
             <artifactId>linotte-moteur</artifactId>
-            <version>3.8</version>
+            <version>3.9</version>
         </dependency>
         <!-- sera corrigé quand les greffons ne dépendrons plus du moteur -->
         <dependency>
             <groupId>fr.codevallee</groupId>
             <artifactId>linotte-greffons</artifactId>
-            <version>3.8</version>
+            <version>3.9</version>
         </dependency>
 
         <dependency>

diff --git a/linotte-lanceur/src/main/java/org/linotte/frame/AtelierLinotte.java b/linotte-lanceur/src/main/java/org/linotte/frame/AtelierLinotte.java
@@ -1,17 +1,21 @@
 package org.linotte.frame;
 
-import com.formdev.flatlaf.FlatDarculaLaf;
-import com.formdev.flatlaf.FlatIntelliJLaf;
-import com.formdev.flatlaf.IntelliJTheme;
-import console.Jinotte;
+import java.awt.Frame;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+
+import org.linotte.frame.atelier.AbaqueAtelier;
 import org.linotte.frame.atelier.Atelier;
 import org.linotte.frame.gui.SplashWindow;
 import org.linotte.frame.outils.Tools;
 import org.linotte.moteur.outils.Preference;
 
-import javax.swing.*;
-import java.awt.*;
-import java.util.concurrent.atomic.AtomicReference;
+import com.formdev.flatlaf.FlatDarculaLaf;
+import com.formdev.flatlaf.FlatIntelliJLaf;
+
+import console.Jinotte;
 
 public class AtelierLinotte {
 
@@ -35,6 +39,9 @@ public static void main(String[] args) {
                 //UIManager.put("JComponent.roundRect", true);
                 //UIManager.put("JButton.buttonType", "roundRect");
                 //UIManager.put("JTabbedPane.hideTabAreaWithOneTab", true);
+                if (Preference.getIntance().petitMenu())
+                	AbaqueAtelier.theme.setPetitMenu();
+                UIManager.put( "TitlePane.menuBarEmbedded", AbaqueAtelier.theme.petitmenu );
 
                 SwingUtilities.invokeAndWait(() -> splashWindow1.set(new SplashWindow(new Frame())));
                 Atelier.initialisationFrameAtelierEtToile();

diff --git a/linotte-moteur/pom.xml b/linotte-moteur/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>langagelinotte</artifactId>
         <groupId>fr.codevallee</groupId>
-        <version>3.8</version>
+        <version>3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>fr.codevallee</groupId>
             <artifactId>linotte-alize</artifactId>
-            <version>3.8</version>
+            <version>3.9</version>
         </dependency>
         <dependency>
             <groupId>fr.codevallee</groupId>
             <artifactId>linotte-ext</artifactId>
-            <version>3.8</version>
+            <version>3.9</version>
             <scope>compile</scope>
         </dependency>
 
@@ -47,12 +47,12 @@
         <dependency>
             <groupId>com.formdev</groupId>
             <artifactId>flatlaf</artifactId>
-            <version>1.0</version>
+            <version>1.1.2</version>
         </dependency>
         <dependency>
             <groupId>com.formdev</groupId>
             <artifactId>flatlaf-swingx</artifactId>
-            <version>1.0</version>
+            <version>1.1.2</version>
         </dependency>
         <!-- version pour jdk 8 : -->
         <dependency>

diff --git a/linotte-moteur/src/main/java/org/linotte/frame/atelier/AbaqueAtelier.java b/linotte-moteur/src/main/java/org/linotte/frame/atelier/AbaqueAtelier.java
@@ -0,0 +1,24 @@
+package org.linotte.frame.atelier;
+
+import javax.swing.SwingConstants;
+
+public class AbaqueAtelier {
+
+	public static AbaqueAtelier theme = new AbaqueAtelier();
+
+	public int buttonTextHorizontale = SwingConstants.BOTTOM;
+	public int buttonTextVerticale = SwingConstants.CENTER;
+	public int taille_split_tableau = 300;
+	public int icone_taille = 32;
+	public boolean petitmenu = false;
+
+	public void setPetitMenu() {
+
+		buttonTextHorizontale = SwingConstants.TOP;
+		buttonTextVerticale = SwingConstants.RIGHT;
+		taille_split_tableau = 200;
+		icone_taille = 16;
+		petitmenu = true;
+
+	}
+}
diff --git a/linotte-moteur/src/main/java/org/linotte/frame/atelier/Atelier.java b/linotte-moteur/src/main/java/org/linotte/frame/atelier/Atelier.java
@@ -241,6 +241,7 @@ public void initialisationComposantsAtelier() throws InvocationTargetException,
     private void valeursParDefauts() {
         jMenuItemSaveWorkSpace.setSelected(getPreference(true, Preference.P_MODE_SAVE_WORKSPACE));
         jMenuItemTheme.setSelected(getPreference(false, Preference.P_DRACULA));
+        jMenuItemPetitMenu.setSelected(getPreference(false, Preference.P_PETITMENU));
         jMenuItemDebogueur.setValue(getDelaisPasApas(400));
     }