Author: solomax
Date: Wed Aug 20 11:33:41 2014
New Revision: 1619076
URL: http://svn.apache.org/r1619076
Log:
[OPENMEETINGS-1066] fields on screen-sharing applet are reordered
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Modified:
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1619076&r1=1619075&r2=1619076&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
(original)
+++
openmeetings/branches/3.0.x/src/screenshare/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Wed Aug 20 11:33:41 2014
@@ -61,7 +61,7 @@ import org.apache.openmeetings.screen.we
import org.slf4j.Logger;
public class ScreenSharerFrame extends JFrame {
- private static final long serialVersionUID = 6892639796386017437L;
+ private static final long serialVersionUID = 1L;
private static final Logger logger = getLogger(ScreenSharerFrame.class);
private JPanel contentPane;
@@ -115,7 +115,7 @@ public class ScreenSharerFrame extends J
private JCheckBox audioNotify;
private class PublishTextField extends JTextField {
- private static final long serialVersionUID =
-2104245360975135871L;
+ private static final long serialVersionUID = 1L;
PublishTextField() {
getDocument().addDocumentListener(
@@ -173,7 +173,7 @@ public class ScreenSharerFrame extends J
//this implementation will not allow to Enable Panel in runtime
private class DisabledPanel extends JPanel {
- private static final long serialVersionUID =
-2679640611165728979L;
+ private static final long serialVersionUID = 1L;
@Override
public void setEnabled(boolean enabled) {
@@ -185,7 +185,7 @@ public class ScreenSharerFrame extends J
}
private class VerticalSlider extends MouseListenerable {
- private static final long serialVersionUID =
6388951979741767971L;
+ private static final long serialVersionUID = 1L;
public VerticalSlider() {
ImageIcon iUp = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/apache/openmeetings/screen/up.png"));
@@ -201,7 +201,7 @@ public class ScreenSharerFrame extends J
}
private class HorizontalSlider extends MouseListenerable {
- private static final long serialVersionUID =
4630712955901760443L;
+ private static final long serialVersionUID = 1L;
public HorizontalSlider() {
ImageIcon iLeft = new
ImageIcon(ScreenSharerFrame.class.getResource("/org/apache/openmeetings/screen/previous.png"));
@@ -373,15 +373,45 @@ public class ScreenSharerFrame extends J
JLabel bgScreen = new JLabel(imgBgScreen);
bgScreen.setBounds(vScreenX, vScreenY, width, height);
panelScreen.add(bgScreen);
+
+ //Spinner Width
+ JLabel vscreenWidthLabel = new JLabel();
+ vscreenWidthLabel.setText(getTextLabel(textLabels, 9)); //#id
740
+ vscreenWidthLabel.setBounds(250, 20, 150, 24);
+ panelScreen.add(vscreenWidthLabel);
+
+ spinnerWidth = new NumberSpinner(ScreenDimensions.spinnerWidth,
0, ScreenDimensions.widthMax, 1);
+ spinnerWidth.setBounds(400, 20, 60, 24);
+ spinnerWidth.addChangeListener( new ChangeListener(){
+ public void stateChanged(ChangeEvent arg0) {
+ calcNewValueWidthSpin();
+ }
+ });
+ panelScreen.add(spinnerWidth);
+
+ //Spinner Height
+ JLabel labelHeight = new JLabel();
+ labelHeight.setText(getTextLabel(textLabels, 10)); //#id 741
+ labelHeight.setBounds(250, 50, 150, 24);
+ panelScreen.add(labelHeight);
+
+ spinnerHeight = new
NumberSpinner(ScreenDimensions.spinnerHeight, 0, ScreenDimensions.heightMax, 1);
+ spinnerHeight.setBounds(400, 50, 60, 24);
+ spinnerHeight.addChangeListener( new ChangeListener(){
+ public void stateChanged(ChangeEvent arg0) {
+ calcNewValueHeightSpin();
+ }
+ });
+ panelScreen.add(spinnerHeight);
//Spinner X
JLabel labelX = new JLabel();
labelX.setText(getTextLabel(textLabels, 7)); //#id 738
- labelX.setBounds(250, 20, 150, 24);
+ labelX.setBounds(250, 80, 150, 24);
panelScreen.add(labelX);
spinnerX = new NumberSpinner(ScreenDimensions.spinnerX, 0,
ScreenDimensions.widthMax, 1);
- spinnerX.setBounds(400, 20, 60, 24);
+ spinnerX.setBounds(400, 80, 60, 24);
spinnerX.addChangeListener( new ChangeListener(){
public void stateChanged(ChangeEvent arg0) {
calcNewValueXSpin();
@@ -392,11 +422,11 @@ public class ScreenSharerFrame extends J
//Spinner Y
JLabel labelY = new JLabel();
labelY.setText(getTextLabel(textLabels, 8)); //#id 739
- labelY.setBounds(250, 50, 150, 24);
+ labelY.setBounds(250, 110, 150, 24);
panelScreen.add(labelY);
spinnerY = new NumberSpinner(ScreenDimensions.spinnerY, 0,
ScreenDimensions.heightMax, 1);
- spinnerY.setBounds(400, 50, 60, 24);
+ spinnerY.setBounds(400, 110, 60, 24);
spinnerY.addChangeListener( new ChangeListener(){
public void stateChanged(ChangeEvent arg0) {
calcNewValueYSpin();
@@ -404,35 +434,6 @@ public class ScreenSharerFrame extends J
});
panelScreen.add(spinnerY);
- JLabel vscreenWidthLabel = new JLabel();
- vscreenWidthLabel.setText(getTextLabel(textLabels, 9)); //#id
740
- vscreenWidthLabel.setBounds(250, 80, 150, 24);
- panelScreen.add(vscreenWidthLabel);
-
- spinnerWidth = new NumberSpinner(ScreenDimensions.spinnerWidth,
0, ScreenDimensions.widthMax, 1);
- spinnerWidth.setBounds(400, 80, 60, 24);
- spinnerWidth.addChangeListener( new ChangeListener(){
- public void stateChanged(ChangeEvent arg0) {
- calcNewValueWidthSpin();
- }
- });
- panelScreen.add(spinnerWidth);
-
- //Spinner Height
- JLabel labelHeight = new JLabel();
- labelHeight.setText(getTextLabel(textLabels, 10)); //#id 741
- labelHeight.setBounds(250, 110, 150, 24);
- panelScreen.add(labelHeight);
-
- spinnerHeight = new
NumberSpinner(ScreenDimensions.spinnerHeight, 0, ScreenDimensions.heightMax, 1);
- spinnerHeight.setBounds(400, 110, 60, 24);
- spinnerHeight.addChangeListener( new ChangeListener(){
- public void stateChanged(ChangeEvent arg0) {
- calcNewValueHeightSpin();
- }
- });
- panelScreen.add(spinnerHeight);
-
//Quality
JLabel labelQuality = new JLabel();
labelQuality.setText(getTextLabel(textLabels, 18)); //#id 1089
Modified:
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java?rev=1619076&r1=1619075&r2=1619076&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/gui/ScreenSharerFrame.java
Wed Aug 20 11:33:41 2014
@@ -373,15 +373,45 @@ public class ScreenSharerFrame extends J
JLabel bgScreen = new JLabel(imgBgScreen);
bgScreen.setBounds(vScreenX, vScreenY, width, height);
panelScreen.add(bgScreen);
+
+ //Spinner Width
+ JLabel vscreenWidthLabel = new JLabel();
+ vscreenWidthLabel.setText(getTextLabel(textLabels, 9)); //#id
740
+ vscreenWidthLabel.setBounds(250, 20, 150, 24);
+ panelScreen.add(vscreenWidthLabel);
+
+ spinnerWidth = new NumberSpinner(ScreenDimensions.spinnerWidth,
0, ScreenDimensions.widthMax, 1);
+ spinnerWidth.setBounds(400, 20, 60, 24);
+ spinnerWidth.addChangeListener( new ChangeListener(){
+ public void stateChanged(ChangeEvent arg0) {
+ calcNewValueWidthSpin();
+ }
+ });
+ panelScreen.add(spinnerWidth);
+
+ //Spinner Height
+ JLabel labelHeight = new JLabel();
+ labelHeight.setText(getTextLabel(textLabels, 10)); //#id 741
+ labelHeight.setBounds(250, 50, 150, 24);
+ panelScreen.add(labelHeight);
+
+ spinnerHeight = new
NumberSpinner(ScreenDimensions.spinnerHeight, 0, ScreenDimensions.heightMax, 1);
+ spinnerHeight.setBounds(400, 50, 60, 24);
+ spinnerHeight.addChangeListener( new ChangeListener(){
+ public void stateChanged(ChangeEvent arg0) {
+ calcNewValueHeightSpin();
+ }
+ });
+ panelScreen.add(spinnerHeight);
//Spinner X
JLabel labelX = new JLabel();
labelX.setText(getTextLabel(textLabels, 7)); //#id 738
- labelX.setBounds(250, 20, 150, 24);
+ labelX.setBounds(250, 80, 150, 24);
panelScreen.add(labelX);
spinnerX = new NumberSpinner(ScreenDimensions.spinnerX, 0,
ScreenDimensions.widthMax, 1);
- spinnerX.setBounds(400, 20, 60, 24);
+ spinnerX.setBounds(400, 80, 60, 24);
spinnerX.addChangeListener( new ChangeListener(){
public void stateChanged(ChangeEvent arg0) {
calcNewValueXSpin();
@@ -392,11 +422,11 @@ public class ScreenSharerFrame extends J
//Spinner Y
JLabel labelY = new JLabel();
labelY.setText(getTextLabel(textLabels, 8)); //#id 739
- labelY.setBounds(250, 50, 150, 24);
+ labelY.setBounds(250, 110, 150, 24);
panelScreen.add(labelY);
spinnerY = new NumberSpinner(ScreenDimensions.spinnerY, 0,
ScreenDimensions.heightMax, 1);
- spinnerY.setBounds(400, 50, 60, 24);
+ spinnerY.setBounds(400, 110, 60, 24);
spinnerY.addChangeListener( new ChangeListener(){
public void stateChanged(ChangeEvent arg0) {
calcNewValueYSpin();
@@ -404,35 +434,6 @@ public class ScreenSharerFrame extends J
});
panelScreen.add(spinnerY);
- JLabel vscreenWidthLabel = new JLabel();
- vscreenWidthLabel.setText(getTextLabel(textLabels, 9)); //#id
740
- vscreenWidthLabel.setBounds(250, 80, 150, 24);
- panelScreen.add(vscreenWidthLabel);
-
- spinnerWidth = new NumberSpinner(ScreenDimensions.spinnerWidth,
0, ScreenDimensions.widthMax, 1);
- spinnerWidth.setBounds(400, 80, 60, 24);
- spinnerWidth.addChangeListener( new ChangeListener(){
- public void stateChanged(ChangeEvent arg0) {
- calcNewValueWidthSpin();
- }
- });
- panelScreen.add(spinnerWidth);
-
- //Spinner Height
- JLabel labelHeight = new JLabel();
- labelHeight.setText(getTextLabel(textLabels, 10)); //#id 741
- labelHeight.setBounds(250, 110, 150, 24);
- panelScreen.add(labelHeight);
-
- spinnerHeight = new
NumberSpinner(ScreenDimensions.spinnerHeight, 0, ScreenDimensions.heightMax, 1);
- spinnerHeight.setBounds(400, 110, 60, 24);
- spinnerHeight.addChangeListener( new ChangeListener(){
- public void stateChanged(ChangeEvent arg0) {
- calcNewValueHeightSpin();
- }
- });
- panelScreen.add(spinnerHeight);
-
//Quality
JLabel labelQuality = new JLabel();
labelQuality.setText(getTextLabel(textLabels, 18)); //#id 1089
@@ -468,7 +469,7 @@ public class ScreenSharerFrame extends J
ScreenDimensions.FPS =
((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue();
calcRescaleFactors();
}
- });
+ });
boolean fpsSelected = false;
for (int i = 0; i < comboFPS.getItemCount(); ++i) {
KeyValue<Integer> v = comboFPS.getItemAt(i);
