Revision: 4885
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4885&view=rev
Author: bphinz
Date: 2012-04-11 14:38:48 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
remove some bits of dead/unused code
Modified Paths:
--------------
trunk/java/com/tigervnc/vncviewer/CConn.java
trunk/java/com/tigervnc/vncviewer/OptionsDialog.java
trunk/java/com/tigervnc/vncviewer/ServerDialog.java
trunk/java/com/tigervnc/vncviewer/VncViewer.java
Modified: trunk/java/com/tigervnc/vncviewer/CConn.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/CConn.java 2012-04-08 19:18:31 UTC
(rev 4884)
+++ trunk/java/com/tigervnc/vncviewer/CConn.java 2012-04-11 14:38:48 UTC
(rev 4885)
@@ -967,7 +967,6 @@
options.fullScreen.setSelected(fullScreen);
options.useLocalCursor.setSelected(viewer.useLocalCursor.getValue());
- options.fastCopyRect.setSelected(viewer.fastCopyRect.getValue());
options.acceptBell.setSelected(viewer.acceptBell.getValue());
String scaleString = viewer.scalingFactor.getValue();
if (scaleString.equals("Auto")) {
@@ -1041,7 +1040,6 @@
viewer.viewOnly.setParam(options.viewOnly.isSelected());
viewer.acceptClipboard.setParam(options.acceptClipboard.isSelected());
viewer.sendClipboard.setParam(options.sendClipboard.isSelected());
- viewer.fastCopyRect.setParam(options.fastCopyRect.isSelected());
viewer.acceptBell.setParam(options.acceptBell.isSelected());
String scaleString =
options.scalingFactor.getSelectedItem().toString();
Modified: trunk/java/com/tigervnc/vncviewer/OptionsDialog.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/OptionsDialog.java 2012-04-08
19:18:31 UTC (rev 4884)
+++ trunk/java/com/tigervnc/vncviewer/OptionsDialog.java 2012-04-11
14:38:48 UTC (rev 4885)
@@ -42,7 +42,7 @@
JRadioButton zrle, hextile, tight, raw;
JRadioButton fullColour, mediumColour, lowColour, veryLowColour;
JCheckBox viewOnly, acceptClipboard, sendClipboard, acceptBell;
- JCheckBox fullScreen, shared, useLocalCursor, fastCopyRect;
+ JCheckBox fullScreen, shared, useLocalCursor;
JCheckBox secVeNCrypt, encNone, encTLS, encX509;
JCheckBox secNone, secVnc, secPlain, secIdent, sendLocalUsername;
JButton okButton, cancelButton;
@@ -149,8 +149,6 @@
shared.addItemListener(this);
useLocalCursor = new JCheckBox("Render cursor locally");
useLocalCursor.addItemListener(this);
- fastCopyRect = new JCheckBox("Fast CopyRect");
- fastCopyRect.addItemListener(this);
acceptBell = new JCheckBox("Beep when requested by the server");
acceptBell.addItemListener(this);
JLabel scalingFactorLabel = new JLabel("Scaling Factor");
@@ -163,10 +161,9 @@
addGBComponent(fullScreen,MiscPanel, 0, 0, 2, 1, 0, 0, 1, 0,
GridBagConstraints.HORIZONTAL, GridBagConstraints.LINE_START, new
Insets(4,4,0,4));
addGBComponent(shared,MiscPanel, 0, 1, 2, 1, 0, 0, 1, 0,
GridBagConstraints.HORIZONTAL, GridBagConstraints.LINE_START, new
Insets(4,4,0,4));
addGBComponent(useLocalCursor,MiscPanel, 0, 2, 2, 1, 0, 0, 1, 0,
GridBagConstraints.HORIZONTAL, GridBagConstraints.LINE_START, new
Insets(4,4,0,4));
- addGBComponent(fastCopyRect,MiscPanel, 0, 3, 2, 1, 0, 0, 1, 0,
GridBagConstraints.HORIZONTAL, GridBagConstraints.LINE_START, new
Insets(4,4,0,4));
- addGBComponent(acceptBell,MiscPanel, 0, 4, 2, 1, 0, 0, 1, 0,
GridBagConstraints.HORIZONTAL, GridBagConstraints.FIRST_LINE_START, new
Insets(4,4,0,4));
- addGBComponent(scalingFactorLabel,MiscPanel, 0, 5, 1,
GridBagConstraints.REMAINDER, 0, 0, 1, 1, GridBagConstraints.NONE,
GridBagConstraints.FIRST_LINE_START, new Insets(8,8,0,4));
- addGBComponent(scalingFactor,MiscPanel, 1, 5, 1,
GridBagConstraints.REMAINDER, 0, 0, 25, 1, GridBagConstraints.NONE,
GridBagConstraints.FIRST_LINE_START, new Insets(4,4,0,4));
+ addGBComponent(acceptBell,MiscPanel, 0, 3, 2, 1, 0, 0, 1, 0,
GridBagConstraints.HORIZONTAL, GridBagConstraints.FIRST_LINE_START, new
Insets(4,4,0,4));
+ addGBComponent(scalingFactorLabel,MiscPanel, 0, 4, 1,
GridBagConstraints.REMAINDER, 0, 0, 1, 1, GridBagConstraints.NONE,
GridBagConstraints.FIRST_LINE_START, new Insets(8,8,0,4));
+ addGBComponent(scalingFactor,MiscPanel, 1, 4, 1,
GridBagConstraints.REMAINDER, 0, 0, 25, 1, GridBagConstraints.NONE,
GridBagConstraints.FIRST_LINE_START, new Insets(4,4,0,4));
// load/save tab
DefaultsPanel=new JPanel(new GridBagLayout());
Modified: trunk/java/com/tigervnc/vncviewer/ServerDialog.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/ServerDialog.java 2012-04-08 19:18:31 UTC
(rev 4884)
+++ trunk/java/com/tigervnc/vncviewer/ServerDialog.java 2012-04-11 14:38:48 UTC
(rev 4885)
@@ -63,9 +63,6 @@
server.setEditable(true);
editor = server.getEditor();
- JLabel encryptionLabel = new JLabel("Encryption:");
- encryption = new JComboBox();
- serverLabel.setPreferredSize(encryptionLabel.getPreferredSize());
JPanel topPanel = new JPanel(new GridBagLayout());
@@ -135,7 +132,6 @@
public void endDialog() {
if (ok) {
try {
-
options.defaults.setPref("encryption",(encryption.getSelectedIndex()==1) ?
"off" : "on");
if (!server.getSelectedItem().toString().equals("")) {
String t = (options.defaults.getString("server")==null) ? "" :
options.defaults.getString("server");
StringTokenizer st = new StringTokenizer(t, ",");
@@ -166,7 +162,7 @@
}
CConn cc;
- JComboBox encryption, server;
+ JComboBox server;
ComboBoxEditor editor;
JButton aboutButton, optionsButton, okButton, cancelButton;
OptionsDialog options;
Modified: trunk/java/com/tigervnc/vncviewer/VncViewer.java
===================================================================
--- trunk/java/com/tigervnc/vncviewer/VncViewer.java 2012-04-08 19:18:31 UTC
(rev 4884)
+++ trunk/java/com/tigervnc/vncviewer/VncViewer.java 2012-04-11 14:38:48 UTC
(rev 4885)
@@ -338,11 +338,6 @@
}
}
- BoolParameter fastCopyRect
- = new BoolParameter("FastCopyRect",
- "Use fast CopyRect - turn this off if you get "+
- "screen corruption when copying from off-screen",
- true);
BoolParameter useLocalCursor
= new BoolParameter("UseLocalCursor",
"Render the mouse cursor locally", true);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
