You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/29 12:06:52 UTC
svn commit: r1331890 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/red5-screenshare/ WebContent/swf10/audioVideoTest/
WebContent/swf10/audioVideoTest/resources/ src/org/openmeetings/screen/
src/org/openmeetings/screen/webstart/ src/org/op...
Author: sebawagner
Date: Sun Apr 29 10:06:51 2012
New Revision: 1331890
URL: http://svn.apache.org/viewvc?rev=1331890&view=rev
Log:
OPENMEETINGS-129 Fix UI Icons to APL compliance in screen sharing client
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/webstart_record.fla (with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/webstart_record.png (with props)
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_down.png (with props)
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_next.png (with props)
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_previous.png (with props)
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_up.png (with props)
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart_record.png (with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/1downarrow.png
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/1leftarrow.png
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/1rightarrow.png
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/1uparrow.png
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/background.png
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/icon.jpg
incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/splashicon.jpg
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/icon.jpg
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/icon.jpg?rev=1331890&r1=1331889&r2=1331890&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/splashicon.jpg
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/red5-screenshare/splashicon.jpg?rev=1331890&r1=1331889&r2=1331890&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx?rev=1331890&r1=1331889&r2=1331890&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/library.lzx Sun Apr 29 10:06:51 2012
@@ -23,7 +23,7 @@
<!-- APL author sebawagner -->
<resource name="level_meter_rsc" src="resources/level_meter.png" />
<!-- APL author sebawagner -->
- <resource name="test_setup_record_rsc" src="resources/record.png" />
+ <resource name="test_setup_record_rsc" src="resources/webstart_record.png" />
<!-- APL author sebawagner -->
<resource name="test_setup_play_rsc" src="resources/run.png" />
<!-- APL author sebawagner -->
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/webstart_record.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/webstart_record.fla?rev=1331890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/webstart_record.fla
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/webstart_record.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/webstart_record.png?rev=1331890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/resources/webstart_record.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx?rev=1331890&r1=1331889&r2=1331890&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx Sun Apr 29 10:06:51 2012
@@ -290,7 +290,7 @@ Test the setup values before you enter a
parent._level_meter.startLevel();
parent.doninitalize();
</handler>
- <view resource="test_setup_record_rsc" x="2" y="4" />
+ <view resource="test_setup_record_rsc" x="2" y="2" />
</simpleLabelButton>
Added: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_down.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_down.png?rev=1331890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_down.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_next.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_next.png?rev=1331890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_next.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_previous.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_previous.png?rev=1331890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_previous.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_up.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_up.png?rev=1331890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/resultset_up.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java?rev=1331890&r1=1331889&r2=1331890&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/CoreScreenShare.java Sun Apr 29 10:06:51 2012
@@ -1,7 +1,6 @@
package org.openmeetings.screen.webstart;
import java.awt.Color;
-import java.awt.Image;
import java.awt.MouseInfo;
import java.awt.Point;
import java.awt.PointerInfo;
@@ -25,7 +24,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComboBox;
@@ -250,6 +248,7 @@ public class CoreScreenShare {
try {
ImageIcon start_btn = createImageIcon("/org/openmeetings/screen/webstart_play.png");
+ ImageIcon record_btn = createImageIcon("/org/openmeetings/screen/webstart_record.png");
ImageIcon stop_btn = createImageIcon("/org/openmeetings/screen/webstart_stop.png");
t = new JFrame(this.label730);
@@ -311,7 +310,7 @@ public class CoreScreenShare {
// *****
// Start Button Recording
- startButtonRecording = new JButton(this.label871, start_btn);
+ startButtonRecording = new JButton(this.label871, record_btn);
startButtonRecording.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
startRecording = true;
@@ -359,13 +358,16 @@ public class CoreScreenShare {
// *****
// Background Image
- Image im_left = ImageIO.read(getClass()
- .getResource("/org/openmeetings/screen/background.png"));
- ImageIcon iIconBack = new ImageIcon(im_left);
-
- JLabel jLab = new JLabel(iIconBack);
- jLab.setBounds(0, 0, 500, 440);
- t.add(jLab);
+
+ //We have no logo, that is why we need no background, sebawagner 29.04.2012
+
+// Image im_left = ImageIO.read(getClass()
+// .getResource("/org/openmeetings/screen/background.png"));
+// ImageIcon iIconBack = new ImageIcon(im_left);
+//
+// JLabel jLab = new JLabel(iIconBack);
+// jLab.setBounds(0, 0, 500, 440);
+// t.add(jLab);
t.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java?rev=1331890&r1=1331889&r2=1331890&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart/gui/VirtualScreen.java Sun Apr 29 10:06:51 2012
@@ -114,13 +114,13 @@ public class VirtualScreen {
css.vScreenIconDown = new JLabel();
css.vScreenIconDown.setBounds(30+(width/2)-8, 162+height-8, 16, 32);
- Image im_left = ImageIO.read(RTMPScreenShare.class.getResource("/org/openmeetings/screen/1leftarrow.png"));
+ Image im_left = ImageIO.read(RTMPScreenShare.class.getResource("/org/openmeetings/screen/resultset_previous.png"));
ImageIcon iIcon1 = new ImageIcon(im_left);
- Image im_right = ImageIO.read(RTMPScreenShare.class.getResource("/org/openmeetings/screen/1rightarrow.png"));
+ Image im_right = ImageIO.read(RTMPScreenShare.class.getResource("/org/openmeetings/screen/resultset_next.png"));
ImageIcon iIcon2 = new ImageIcon(im_right);
- Image im_up = ImageIO.read(RTMPScreenShare.class.getResource("/org/openmeetings/screen/1uparrow.png"));
+ Image im_up = ImageIO.read(RTMPScreenShare.class.getResource("/org/openmeetings/screen/resultset_up.png"));
ImageIcon iIcon3 = new ImageIcon(im_up);
- Image im_down = ImageIO.read(RTMPScreenShare.class.getResource("/org/openmeetings/screen/1downarrow.png"));
+ Image im_down = ImageIO.read(RTMPScreenShare.class.getResource("/org/openmeetings/screen/resultset_down.png"));
ImageIcon iIcon4 = new ImageIcon(im_down);
JLabel jLab1 = new JLabel(iIcon1);
Added: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart_record.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart_record.png?rev=1331890&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/screen/webstart_record.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream