From 967f72d6c1ef0163250a0992a8a196469aff2a5a Mon Sep 17 00:00:00 2001 From: Brian Hinz Date: Wed, 11 Apr 2012 14:38:48 +0000 Subject: [PATCH] remove some bits of dead/unused code git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4885 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- java/com/tigervnc/vncviewer/CConn.java | 2 -- java/com/tigervnc/vncviewer/OptionsDialog.java | 11 ++++------- java/com/tigervnc/vncviewer/ServerDialog.java | 6 +----- java/com/tigervnc/vncviewer/VncViewer.java | 5 ----- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/java/com/tigervnc/vncviewer/CConn.java b/java/com/tigervnc/vncviewer/CConn.java index df2d315f..861144c1 100644 --- a/java/com/tigervnc/vncviewer/CConn.java +++ b/java/com/tigervnc/vncviewer/CConn.java @@ -967,7 +967,6 @@ public class CConn extends CConnection 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 @@ public class CConn extends CConnection 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(); diff --git a/java/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java index 9a463fb3..b5dad7e0 100644 --- a/java/com/tigervnc/vncviewer/OptionsDialog.java +++ b/java/com/tigervnc/vncviewer/OptionsDialog.java @@ -42,7 +42,7 @@ class OptionsDialog extends Dialog implements 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 @@ class OptionsDialog extends Dialog implements 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 @@ class OptionsDialog extends Dialog implements 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()); diff --git a/java/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java index 0f32a96c..3f482b2e 100644 --- a/java/com/tigervnc/vncviewer/ServerDialog.java +++ b/java/com/tigervnc/vncviewer/ServerDialog.java @@ -63,9 +63,6 @@ class ServerDialog extends Dialog implements 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 @@ class ServerDialog extends Dialog implements 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 @@ class ServerDialog extends Dialog implements } CConn cc; - JComboBox encryption, server; + JComboBox server; ComboBoxEditor editor; JButton aboutButton, optionsButton, okButton, cancelButton; OptionsDialog options; diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java index f7d1f62a..7f664577 100644 --- a/java/com/tigervnc/vncviewer/VncViewer.java +++ b/java/com/tigervnc/vncviewer/VncViewer.java @@ -338,11 +338,6 @@ public class VncViewer extends java.applet.Applet implements Runnable } } - 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); -- 2.39.5