# HG changeset patch # User innparusu # Date 1443696942 -32400 # Node ID b344444aca1352073cf898a5faa45be26e088466 # Parent 704ac9e79e25cbaa37f30bd1073051e3314ba46f Add RederingForSpeed option to OptionsDialog diff -r 704ac9e79e25 -r b344444aca13 .idea/workspace.xml --- a/.idea/workspace.xml Tue Sep 29 18:46:45 2015 +0900 +++ b/.idea/workspace.xml Thu Oct 01 19:55:42 2015 +0900 @@ -1,13 +1,11 @@ - + - - - - - + + + @@ -33,14 +31,14 @@ - +

- + - - + + @@ -51,7 +49,7 @@ - + @@ -61,50 +59,17 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -122,31 +87,21 @@ - - + + - - + + - - + + - - - - - - - - - - - - + + @@ -155,27 +110,39 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -187,7 +154,7 @@ - + @@ -200,24 +167,48 @@ - + - + + + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -225,85 +216,93 @@ - + - + - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -598,7 +597,6 @@

- @@ -1020,7 +1093,7 @@ - + @@ -1030,7 +1103,7 @@ - - - @@ -1168,6 +1228,19 @@ + + + - - + + @@ -1319,26 +1392,26 @@ - - + +

+ - + - + - @@ -1385,7 +1458,7 @@ file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java - 889 + 887 @@ -1583,70 +1656,6 @@

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1654,13 +1663,6 @@ - - - - - - - @@ -1698,7 +1700,6 @@ - @@ -1791,18 +1792,6 @@ - - - - - - - - - - - - @@ -1810,12 +1799,6 @@ - - - - - - @@ -1831,7 +1814,6 @@ - @@ -1847,11 +1829,7 @@ - - - - - + @@ -1872,13 +1850,6 @@ - - - - - - - @@ -1900,50 +1871,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1988,7 +1920,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2000,20 +1977,19 @@ - - - - - - - - - + + + + + + + + @@ -2044,7 +2020,7 @@ - + @@ -2069,19 +2045,9 @@ - - - - - - - - - - - + @@ -2090,21 +2056,100 @@ - + - - + + + + + + + + + + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 704ac9e79e25 -r b344444aca13 src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java --- a/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java Tue Sep 29 18:46:45 2015 +0900 +++ b/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java Thu Oct 01 19:55:42 2015 +0900 @@ -444,4 +444,6 @@ ", colorDepth=" + colorDepth + '}'; } + + } diff -r 704ac9e79e25 -r b344444aca13 src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java --- a/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Tue Sep 29 18:46:45 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java Thu Oct 01 19:55:42 2015 +0900 @@ -152,6 +152,8 @@ public void saveHistory() { final ConnectionParams cp = (ConnectionParams) getModel(CONNECTION_PARAMS_MODEL); + if (cp == null) + return; connectionsHistory.reorder(cp, rfbSettings, uiSettings); connectionsHistory.save(); } diff -r 704ac9e79e25 -r b344444aca13 src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java --- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Tue Sep 29 18:46:45 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java Thu Oct 01 19:55:42 2015 +0900 @@ -871,7 +871,6 @@ } } }); - kbdButtons.add(screenButton); final JButton adjustHdSizeButton = buttonsBar.createButton("adjust-hd", "Adjust Hd Size", new ActionListener() { @Override @@ -881,7 +880,6 @@ uiSettings.adjustHdSize(singleWidth); } }); - kbdButtons.add(adjustHdSizeButton); final JButton fitScreenButton = buttonsBar.createButton("fit-screen", "Fit Screen", new ActionListener() { @Override @@ -892,7 +890,6 @@ } } }); - kbdButtons.add(fitScreenButton); ModifierButtonEventListener modifierButtonListener = new ModifierButtonEventListener(); modifierButtonListener.addButton(KeyEvent.VK_CONTROL, ctrlButton); diff -r 704ac9e79e25 -r b344444aca13 src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java --- a/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java Tue Sep 29 18:46:45 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java Thu Oct 01 19:55:42 2015 +0900 @@ -52,6 +52,7 @@ private Map mouseCursorTrackMap; private JCheckBox useCompressionLevel; private JCheckBox useJpegQuality; + private JCheckBox renderingQuality; private JLabel jpegQualityPoorLabel; private JLabel jpegQualityBestLabel; private JLabel compressionLevelFastLabel; @@ -137,7 +138,8 @@ allowCopyRect.setSelected(settings.isAllowCopyRect()); disableClipboardTransfer.setSelected( ! settings.isAllowClipboardTransfer()); -} + renderingQuality.setSelected(uiSettings.getData().isRenderingForSpeed()); + } private void setSettingsFromControls() { settings.setViewOnly(viewOnlyCheckBox.isSelected()); @@ -157,6 +159,7 @@ - Math.abs(settings.getJpegQuality())); settings.setAllowCopyRect(allowCopyRect.isSelected()); settings.setAllowClipboardTransfer( ! disableClipboardTransfer.isSelected()); + uiSettings.getData().setRenderingForSpeed(renderingQuality.isSelected()); settings.fireListeners(); } @@ -202,9 +205,14 @@ disableClipboardTransfer.setAlignmentX(LEFT_ALIGNMENT); restrictionsBox.add(disableClipboardTransfer); + renderingQuality = new JCheckBox("Rendering for speed"); + renderingQuality.setAlignmentX(LEFT_ALIGNMENT); + restrictionsBox.add(renderingQuality); + return restrictionsPanel; } + private JPanel createEncodingsPanel() { JPanel encodingsPanel = new JPanel(); encodingsPanel.setAlignmentX(LEFT_ALIGNMENT);