Merge pull request #1 from aegroto/master

Simple settings window
Nehon · Dec 16, 2016 · 7cc0826 · 7cc0826
2 parents 97e0558 + ae1a5b0
commit 7cc0826
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 .idea/
 .gradle/
 build/
+/.nb-gradle/
+.directory
diff --git a/readme.md b/readme.md
@@ -21,6 +21,7 @@ Very Basic project scaffolding tool for JME3.
        - baseDir: the directory where to create the repo.
        - projectName: the project name.
        - packageName: the new project base package.
+       - jmeVersion: the jme version code.
        - packagePath: the folder path of the package ('.' replaced with '/')
 
 3. Clean up

diff --git a/src/main/java/com/jme3/bootmonkey/ui/MainWindow.java b/src/main/java/com/jme3/bootmonkey/ui/MainWindow.java
@@ -150,15 +150,58 @@ public void run() {
                 });
                 container.add(browseFieldPanel);
 
+                /*The advanced settings frame
+                final JFrame advancedSettingsFrame=new JFrame("Advanced Settings");
+                advancedSettingsFrame.getContentPane().setLayout(new BorderLayout());
+                advancedSettingsFrame.setResizable(false);*/
+
+                /*JButton button = new JButton("Close");
+                button.addActionListener((e) -> {
+                    advancedSettingsFrame.setVisible(false);
+                });
+                advancedSettingsFrame.getContentPane().add(button, BorderLayout.SOUTH);*/
+
+                /*The advanced settings button
+                l = new JLabel("Advanced Settings: ", JLabel.TRAILING);                 
+                JButton defineButton = new JButton("Show advanced settings");
+                defineButton.addActionListener((e) -> {
+                    advancedSettingsFrame.pack();
+                    advancedSettingsFrame.setLocationRelativeTo(mainFrame);
+                    advancedSettingsFrame.setVisible(true);
+                });
+                
+                JPanel settingsPanel=new JPanel(new FlowLayout(FlowLayout.LEADING));
+                settingsPanel.add(defineButton);
+                
+                container.add(l);
+                container.add(settingsPanel);*/
+
                 //making the layout.
-                makeCompactGrid(container,
-                        5, 2, //rows, cols
+
+                //final JPanel settingsContainer = new JPanel(new SpringLayout());
+
+                l=new JLabel("JME Version code:", JLabel.TRAILING);
+                final JTextField jmeVersionField  = new JTextField(10);
+                jmeVersionField.setText("[3.1)");
+                l.setLabelFor(jmeVersionField);
+
+                container.add(l);    
+                container.add(jmeVersionField);
+
+                //mainFrame.getContentPane().add(settingsContainer, BorderLayout.SOUTH);
+
+                /*makeCompactGrid(settingsContainer,
+                        1, 2, //rows, cols
                         6, 6,        //initX, initY
-                        6, 6);       //xPad, yPad
+                        7, 7);       //xPad, yPad*/
+
+                makeCompactGrid(container,
+                        6, 2, //rows, cols
+                        5, 5,        //initX, initY
+                        7, 7);       //xPad, yPad
 
                 mainFrame.getContentPane().add(container, BorderLayout.CENTER);
-
-
+
                 //The create button
                 JButton button = new JButton("Create");
                 button.addActionListener((e) -> {
@@ -173,7 +216,7 @@ public void run() {
 
                     savePreferences(repoUrl, baseDir);
 
-                    new ProjectGenerationWorker(projectNameField, packageField, repoUrl, baseDir).execute();
+                    new ProjectGenerationWorker(projectNameField, packageField, jmeVersionField, repoUrl, baseDir).execute();
 
                 });
                 mainFrame.getContentPane().add(button, BorderLayout.SOUTH);
@@ -276,13 +319,15 @@ private class ProjectGenerationWorker extends SwingWorker<Void, Step>{
 
         Map<String, String> params;
 
-        public ProjectGenerationWorker(JTextField projectNameField, JTextField packageField, String repoUrl, String baseDir) {
+        public ProjectGenerationWorker(JTextField projectNameField, JTextField packageField, JTextField jmeVersionField, String repoUrl, String baseDir) {
             params = new HashMap<>();
             params.put("packageName", packageField.getText());
-            params.put("jmeVersion", "[3.1,)");
+            params.put("jmeVersion", jmeVersionField.getText());
             params.put("baseDir",  baseDir + "/");
             params.put("projectName", projectNameField.getText());
             params.put("templateUrl", repoUrl);
+
+            System.out.println(params.get("jmeVersion"));
         }
 
         @Override