Changeset 2319

Timestamp:

10/05/07 14:16:30 (1 year ago)

Author:

kmaclean

Message:

speech submission app - snapshot

Files:

• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java (modified) (37 diffs)
• Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/License.java (modified) (3 diffs)

Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/CapturePlayback.java

@@ -116 +116 @@
-    JButton uploadB;
-    JButton moreInfoB;    
+    JButton aboutB; 
-// !!!!!!
-    JButton play1;
@@ -162 +163 @@
-    License licenseObject = new License();
-    String license = licenseObject.getLicense();
+    String VFlicense = licenseObject.getVFLicense();
-// !!!!!!    
-
@@ -609 +611 @@
-    //    prompts.add(new JLabel("Prompts:"));
-        prompts.setLayout(new BoxLayout(prompts, BoxLayout.Y_AXIS));
-
-Color.blue, 1
+
+voxforgeColour, 3
-// ############ Prompt1 ####################################        
-        JPanel prompt1Panel = new JPanel(); 
-        prompt1Panel.setLayout(new FlowLayout(FlowLayout.RIGHT)); 
-        JPanel prompt1InnerPanel = new JPanel();
-Color.blue
+voxforgeColour
-        prompt1InnerPanel.add(new JLabel(this.prompt1));
-        prompt1Panel.add(prompt1InnerPanel);
@@ -626 +628 @@
-        prompt2Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));       
-        JPanel prompt2InnerPanel = new JPanel(); 
-Color.blue
+voxforgeColour
-        prompt2InnerPanel.add(new JLabel(this.prompt2));
-        prompt2Panel.add(prompt2InnerPanel);
@@ -636 +638 @@
-        prompt3Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));      
-        JPanel prompt3InnerPanel = new JPanel(); 
-Color.blue
+voxforgeColour
-        prompt3InnerPanel.add(new JLabel(this.prompt3));
-        prompt3Panel.add(prompt3InnerPanel);
@@ -646 +648 @@
-        prompt4Panel.setLayout(new FlowLayout(FlowLayout.RIGHT)); 
-        JPanel prompt4InnerPanel = new JPanel(); 
-Color.blue
+voxforgeColour
-        prompt4InnerPanel.add(new JLabel(this.prompt4));
-        prompt4Panel.add(prompt4InnerPanel);     
@@ -656 +658 @@
-        prompt5Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));     
-        JPanel prompt5InnerPanel = new JPanel(); 
-Color.blue
+voxforgeColour
-        prompt5InnerPanel.add(new JLabel(this.prompt5));
-        prompt5Panel.add(prompt5InnerPanel);
@@ -667 +669 @@
-        prompt6Panel.setLayout(new FlowLayout(FlowLayout.RIGHT)); 
-        JPanel prompt6InnerPanel = new JPanel();
-Color.blue
+voxforgeColour
-        prompt6InnerPanel.add(new JLabel(this.prompt6));
-        prompt6Panel.add(prompt6InnerPanel);
@@ -678 +680 @@
-        prompt7Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));       
-        JPanel prompt7InnerPanel = new JPanel(); 
-Color.blue
+voxforgeColour
-        prompt7InnerPanel.add(new JLabel(this.prompt7));
-        prompt7Panel.add(prompt7InnerPanel);
@@ -688 +690 @@
-        prompt8Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));      
-        JPanel prompt8InnerPanel = new JPanel(); 
-Color.blue
+voxforgeColour
-        prompt8InnerPanel.add(new JLabel(this.prompt8));
-        prompt8Panel.add(prompt8InnerPanel);
@@ -698 +700 @@
-        prompt9Panel.setLayout(new FlowLayout(FlowLayout.RIGHT)); 
-        JPanel prompt9InnerPanel = new JPanel(); 
-Color.blue
+voxforgeColour
-        prompt9InnerPanel.add(new JLabel(this.prompt9));
-        prompt9Panel.add(prompt9InnerPanel);     
@@ -708 +710 @@
-        prompt10Panel.setLayout(new FlowLayout(FlowLayout.RIGHT));     
-        JPanel prompt10InnerPanel = new JPanel(); 
-Color.blue
+voxforgeColour
-        prompt10InnerPanel.add(new JLabel(this.prompt10));
-        prompt10Panel.add(prompt10InnerPanel);
@@ -747 +749 @@
-         JPanel moreInfoButtonPanel = new JPanel();
-   //      moreInfoButtonPanel.setBorder(new EmptyBorder(25,0,35,0));
-/or GPL, click this button
+ GPL, click here
-         moreInfoB = addButton("More Information", moreInfoButtonPanel, true); 
-         p2.add(moreInfoButtonPanel);   
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        add(p2);
-    }
@@ -1064 +1083 @@
-//Temp hidden                loadB.setEnabled(false);
-                uploadB.setEnabled(false);
-
+
+
-                playB.setEnabled(false);
-                pausB.setEnabled(true);
@@ -1077 +1097 @@
-//Temp hidden                loadB.setEnabled(true);
-                uploadB.setEnabled(true);
-
+
+
-                playB.setEnabled(true);
-                pausB.setEnabled(false);
@@ -1104 +1125 @@
-            capt1.setText("Stop");
-            moreInfoB.setEnabled(false);  
+            aboutB.setEnabled(false); 
-        } else {
-            lines.removeAllElements();  
@@ -1112 +1134 @@
-            capt1.setText("Record");
-            moreInfoB.setEnabled(true);  
+            aboutB.setEnabled(true); 
-            capt2.setEnabled(true);
-        }
@@ -1132 +1155 @@
-              capt2.setText("Stop");
-              moreInfoB.setEnabled(false);
+              aboutB.setEnabled(false); 
-          } else {
-              lines.removeAllElements();  
@@ -1139 +1163 @@
-              play2.setEnabled(true);
-              capt2.setText("Record");
-
+
+
-              capt3.setEnabled(true);
-          }
@@ -1159 +1184 @@
-              // !!!!!!
-              capt3.setText("Stop");
-
+
+
-          } else {
-              lines.removeAllElements();  
@@ -1167 +1193 @@
-              play3.setEnabled(true);
-              capt3.setText("Record");
-
+
+
-              capt4.setEnabled(true);
-
@@ -1189 +1216 @@
-              capt4.setText("Stop");
-              moreInfoB.setEnabled(false);  
-
-
+
-          } else {
-              lines.removeAllElements();  
@@ -1198 +1224 @@
-              play4.setEnabled(true);
-              capt4.setText("Record");
-
+
+
-              capt5.setEnabled(true);
-
@@ -1219 +1246 @@
-              // !!!!!!
-              capt5.setText("Stop");
-
+
+
-          } else {
-              lines.removeAllElements();  
@@ -1227 +1255 @@
-              play5.setEnabled(true);
-              capt5.setText("Record");
-
+
+
-              capt6.setEnabled(true);
-
@@ -1249 +1278 @@
-              capt6.setText("Stop");
-              moreInfoB.setEnabled(false);  
-
+
-          } else {
-              lines.removeAllElements();  
@@ -1257 +1286 @@
-              play6.setEnabled(true);
-              capt6.setText("Record");
-
+
+
-              capt7.setEnabled(true);
-
-          }
-        } 
@@ -1279 +1308 @@
-                capt7.setText("Stop");
-                moreInfoB.setEnabled(false);  
-
+               aboutB.setEnabled(false);  
-            } else {
-                lines.removeAllElements();  
@@ -1287 +1316 @@
-                play7.setEnabled(true);
-                capt7.setText("Record");
-
+
+
-                capt8.setEnabled(true);
-                
@@ -1310 +1340 @@
-                capt8.setText("Stop");
-                moreInfoB.setEnabled(false);  
-
-
+
-            } else {
-                lines.removeAllElements();  
@@ -1319 +1348 @@
-                play8.setEnabled(true);
-                capt8.setText("Record");
-
+
+
-                capt9.setEnabled(true);
-            }
@@ -1340 +1370 @@
-                capt9.setText("Stop");
-                moreInfoB.setEnabled(false); 
-
+
-            } else {
-                lines.removeAllElements();  
@@ -1349 +1379 @@
-                capt9.setText("Record");
-                moreInfoB.setEnabled(true);  
+                aboutB.setEnabled(true); 
-                capt10.setEnabled(true);
-
-            }
-          } 
@@ -1370 +1400 @@
-                capt10.setText("Stop");
-                moreInfoB.setEnabled(false);  
-
+  aboutB.setEnabled(false); 
-            } else {
-                lines.removeAllElements();  
@@ -1379 +1409 @@
-                capt10.setText("Record");
-                moreInfoB.setEnabled(true);  
+                aboutB.setEnabled(true); 
-                uploadB.setEnabled(true);
-            }
@@ -1491 +1522 @@
-                    "More info on Copyright and GPL license", JOptionPane.PLAIN_MESSAGE);
-        }
+        else if (obj.equals(aboutB)) {
+            JTextArea textArea = new JTextArea(VFlicense);
+            textArea.setLineWrap(true);
+            textArea.setWrapStyleWord(true);
+            JScrollPane areaScrollPane = new JScrollPane(textArea);
+            areaScrollPane.setVerticalScrollBarPolicy(
+                        JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
+            areaScrollPane.setPreferredSize(new Dimension(600, 600));
+ 
+           JOptionPane.showMessageDialog(this, areaScrollPane, 
+                   "More info on Copyright and GPL license", JOptionPane.PLAIN_MESSAGE);
+       }
-    }
-
@@ -1528 +1571 @@
-        }
-
-n
+
-        try {
-            audioInputStream.reset();

Trunk/SpeechSubmission/VFSpeechSubmission/java/src/speechrecorder/License.java

@@ -4 +4 @@
-        String licenseFAQ;
-        String licenseNotice;
+        String VFlicenseNotice;
-        String gplLicense;
-        
@@ -46 +47 @@
-                        + System.getProperty("line.separator");
-                
+                VFlicenseNotice =  
+                  "VoxForge SpeechSubmission Application - allows a user to record their speech and  " + System.getProperty("line.separator")
+                + " upload the recorded audio to the VoxForge server, so that it can be" + System.getProperty("line.separator") 
+                + "incorporated into the VoxForge Speech Corpus and used in the creation of " + System.getProperty("line.separator") 
+                + "GPL acoustic models." + System.getProperty("line.separator") + System.getProperty("line.separator")
+
+                + "Copyright (C) 2007  VoxForge" + System.getProperty("line.separator") + System.getProperty("line.separator")
+                
+            + "This program is free software: you can redistribute it and/or modify" + System.getProperty("line.separator")
+                + "them under the terms of the GNU General Public License as published by" + System.getProperty("line.separator")
+                + "the Free Software Foundation, either version 3 of the License, or" + System.getProperty("line.separator")
+                + "(at your option) any later version." + System.getProperty("line.separator")
+                 + System.getProperty("line.separator")
+                + "This program is distributed in the hope that it will be useful," + System.getProperty("line.separator")
+                + "but WITHOUT ANY WARRANTY; without even the implied warranty of" + System.getProperty("line.separator")
+                + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the" + System.getProperty("line.separator")
+                + "GNU General Public License for more details." + System.getProperty("line.separator")
+                 + System.getProperty("line.separator")
+                + "You should have received a copy of the GNU General Public License" + System.getProperty("line.separator")
+                + "along with these files.  If not, see <http://www.gnu.org/licenses/>." + System.getProperty("line.separator")
+                + System.getProperty("line.separator");
+                
-                gplLicense = "                   GNU GENERAL PUBLIC LICENSE" + System.getProperty("line.separator")
-                        + "                       Version 3, 29 June 2007" + System.getProperty("line.separator")
@@ -739 +762 @@
-                gplLicense;
-    }
+        public String getVFLicense() {
+                return  VFlicenseNotice +  System.getProperty("line.separator")+ System.getProperty("line.separator")  
+                + gplLicense;
+    }
-}