sltv team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12
committer: lucasa@xxxxxxxxx
branch nick: SLTV
timestamp: Fri 2009-10-23 13:43:07 -0200
message:
  janela maximizada
modified:
  .classpath
  lib/sltv.jar
  src/br/org/softwarelivre/sltv/SLTVMain.java
  src/br/org/softwarelivre/sltv/SLTVPlayerGst.java


--
lp:sltv
https://code.launchpad.net/~sltv/sltv/trunk

Your team sltv is subscribed to branch lp:sltv.
To unsubscribe from this branch go to https://code.launchpad.net/~sltv/sltv/trunk/+edit-subscription.

=== modified file '.classpath'
--- .classpath	2009-10-22 05:19:28 +0000
+++ .classpath	2009-10-23 15:43:07 +0000
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/DJNativeSwing.jar"/>
-	<classpathentry kind="lib" path="lib/gstreamer-java.jar"/>
+	<classpathentry kind="lib" path="lib/gstreamer-java.jar" sourcepath="/gstreamer-java"/>
 	<classpathentry kind="lib" path="lib/swingx-beaninfo.jar"/>
 	<classpathentry kind="lib" path="lib/swingx.jar"/>
 	<classpathentry kind="lib" path="lib/jna-3.0.9.jar"/>

=== modified file 'lib/sltv.jar'
Binary files lib/sltv.jar	2009-10-23 03:37:58 +0000 and lib/sltv.jar	2009-10-23 15:43:07 +0000 differ
=== modified file 'src/br/org/softwarelivre/sltv/SLTVMain.java'
--- src/br/org/softwarelivre/sltv/SLTVMain.java	2009-10-23 03:37:58 +0000
+++ src/br/org/softwarelivre/sltv/SLTVMain.java	2009-10-23 15:43:07 +0000
@@ -125,9 +125,10 @@
 		this.setContentPane(getJContentPane());
 		this.setTitle("sltv - free video streaming tool");
 		this.setJMenuBar(getJJMenuBar());
-		
 		this.addWindowListener(new WindowListener() {
 			public void windowOpened(WindowEvent arg0) {
+				// Load the main window in a maximize state
+				setExtendedState(JFrame.MAXIMIZED_BOTH); 
 			}
 			public void windowClosing(WindowEvent arg0) {
 				/* clean before get out */
@@ -135,7 +136,6 @@
 				System.exit(0);
 			}
 			public void windowClosed(WindowEvent arg0) {
-				
 				System.exit(0);
 			}
 			public void windowIconified(WindowEvent arg0) {
@@ -331,8 +331,8 @@
 		final SLTVPlayerGst player = new SLTVPlayerGst();
 		getJDesktopPane().setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
 		getJDesktopPane().add(player);
-		
 		player.setVisible(true);
+		
 		Runnable thread = new Runnable() {
 			public void run() {
 				System.out.println("Playing video: "+path);

=== modified file 'src/br/org/softwarelivre/sltv/SLTVPlayerGst.java'
--- src/br/org/softwarelivre/sltv/SLTVPlayerGst.java	2009-10-23 03:37:58 +0000
+++ src/br/org/softwarelivre/sltv/SLTVPlayerGst.java	2009-10-23 15:43:07 +0000
@@ -10,10 +10,10 @@
 import java.awt.event.ItemListener;
 
 import javax.swing.DefaultComboBoxModel;
-import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
+import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JInternalFrame;
 import javax.swing.JLabel;
@@ -32,10 +32,10 @@
 import org.gstreamer.Pad;
 import org.gstreamer.State;
 import org.gstreamer.swing.VideoComponent;
-import org.jdesktop.swingx.JXMonthView;
 import org.jdesktop.swingx.JXPanel;
 import org.jdesktop.swingx.JXTaskPane;
 import org.jdesktop.swingx.JXTaskPaneContainer;
+import org.jdesktop.swingx.VerticalLayout;
 import org.jdesktop.swingx.border.DropShadowBorder;
 
 import br.org.softwarelivre.sltv.VideoPipeline.SLTVEffects;
@@ -79,20 +79,22 @@
 		if(jxTaskePaneContainer == null)
 		{
 			jxTaskePaneContainer = new JXTaskPaneContainer(); 
-			jxTaskePaneContainer.setBorder(new DropShadowBorder());  
+			jxTaskePaneContainer.setBorder(new DropShadowBorder());
 			
-			JXTaskPane tpPrincipal = new JXTaskPane();
+			JXTaskPane tpGeneric = new JXTaskPane();
+			tpGeneric.setCollapsed(true);
 			// Define o título.
-			tpPrincipal.setTitle("Principal");
-			JTextField jtextField_ServerIP = new JTextField();
-			JCheckBox jCheckBox_StreamOutput = new JCheckBox("Stream to Icecast2");
-			JCheckBox jCheckBox_VideoOutput = new JCheckBox("Output Video");
-			tpPrincipal.add(jtextField_ServerIP);
-			tpPrincipal.add(jCheckBox_StreamOutput);
-			tpPrincipal.add(jCheckBox_VideoOutput);
-			jxTaskePaneContainer.add(tpPrincipal);
+			tpGeneric.setTitle("Generic");
+			JCheckBox jCheckBox_StreamOutput = new JCheckBox("Stream to Icecast");
+			JCheckBox jCheckBox_VideoOutput = new JCheckBox("Output local Video");
+			JCheckBox jCheckBox_AudioOutput = new JCheckBox("Output local Audio");
+			tpGeneric.add(jCheckBox_StreamOutput);
+			tpGeneric.add(jCheckBox_VideoOutput);
+			tpGeneric.add(jCheckBox_AudioOutput);
+			jxTaskePaneContainer.add(tpGeneric);
 			
 			JXTaskPane jxTaskPane_Audio = new JXTaskPane();
+			jxTaskPane_Audio.setCollapsed(true);
 			jxTaskPane_Audio.setTitle("Audio");
 			final JSpinner jSpinner = new JSpinner(new SpinnerNumberModel(50d,0d,100d,1d));
 			jSpinner.addChangeListener(new ChangeListener() {
@@ -105,9 +107,20 @@
 					System.out.println("Audio volume: "+volume*100+"%");
 				}
 			});
-			jxTaskPane_Audio.add(jSpinner);
+			jxTaskPane_Audio.add(createPanel("Volume", jSpinner));
+			JComboBox comboBoxRate = new JComboBox(new String[] {"44,1kHz", "22,05kHz"});
+			jxTaskPane_Audio.add(createPanel("Rate", comboBoxRate));
 			jxTaskePaneContainer.add(jxTaskPane_Audio);
 			
+			JXTaskPane jxTaskPane_Stream = new JXTaskPane();
+			jxTaskPane_Stream.setCollapsed(true);
+			jxTaskPane_Stream.setTitle("Icecast");
+			JTextField jtextField_IcecastIP = new JTextField();
+			JTextField jtextField_IcecastPort = new JTextField();
+			jxTaskPane_Stream.add(createPanel("IP", jtextField_IcecastIP));
+			jxTaskPane_Stream.add(createPanel("Port", jtextField_IcecastPort));
+			jxTaskePaneContainer.add(jxTaskPane_Stream);
+			
 //			JXTaskPane tpCalendario = new JXTaskPane();  
 //			JXMonthView monthView = new JXMonthView();  
 //			JXTaskPane tpSearchUrl = new JXTaskPane();  
@@ -140,6 +153,16 @@
 		return jxTaskePaneContainer;
 	}
 
+	private JComponent createPanel(String string, JComponent component) {
+		JPanel panel = new JPanel(new VerticalLayout());
+		panel.setPreferredSize(new Dimension(200,25));
+		component.setPreferredSize(new Dimension(150,25));
+		JLabel label = new JLabel(string);
+		panel.add(label);
+		panel.add(component);
+		return panel;
+	}
+
 	public JPanel getJTitledPanel_VideoPreview() {
 		if(jTitledPanel_VideoPreview == null)
 		{
@@ -162,7 +185,7 @@
 			jContentPane1 = new JXPanel();
 			jContentPane1.setLayout(new BorderLayout());
 			jContentPane1.add(getJScrollPane(), java.awt.BorderLayout.CENTER);
-			jContentPane1.add(getJPanelControls(), java.awt.BorderLayout.SOUTH);
+			jContentPane1.add(new JScrollPane(getJPanelControls()), java.awt.BorderLayout.SOUTH);
 		}
 		return jContentPane1;
 	}
@@ -274,6 +297,7 @@
 			NativeSwing.initialize();
 			NativeComponentWrapper ncw = new NativeComponentWrapper(getVideoComponent());
 			jScrollPane = new JScrollPane(ncw.createEmbeddableComponent(new NSOption[] {}));
+			getVideoComponent().setMaximumSize(new Dimension(320,240));
 		}
 		return jScrollPane;
 	}
@@ -325,13 +349,12 @@
 	 * @return void
 	 */
 	private void initialize() {
-		this.setSize(520, 350);
+		this.setSize(680, 350);
 		//JPanel panel = new JPanel(new BorderLayout());
-		
 		JSplitPane mainPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
 		mainPanel.setOneTouchExpandable(true);
-		mainPanel.setDividerLocation(0);
-		mainPanel.setLeftComponent(getJxPaneContainer());
+		mainPanel.setDividerLocation(230);
+		mainPanel.setLeftComponent(new JScrollPane(getJxPaneContainer()));
 		mainPanel.setRightComponent(getJContentPane1());
 		//panel.add(mainPanel, BorderLayout.CENTER);
 		this.setContentPane(mainPanel);