Mercurial > hg > Members > riono > TreeVNC_ja_comment
changeset 396:b344444aca13
Add RederingForSpeed option to OptionsDialog
| author | innparusu |
|---|---|
| date | Thu, 01 Oct 2015 19:55:42 +0900 |
| parents | 704ac9e79e25 |
| children | 5b496bef0b98 |
| files | .idea/workspace.xml src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java |
| diffstat | 5 files changed, 404 insertions(+), 350 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment=""> + <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="settingsChanged"> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" afterPath="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="TreeVNC.iws" /> @@ -33,14 +31,14 @@ <favorites_list name="TreeVNC" /> </component> <component name="FileEditorManager"> - <splitter split-orientation="horizontal" split-proportion="0.40454724"> + <splitter split-orientation="horizontal" split-proportion="0.54475236"> <split-first> <leaf> - <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.7286759" vertical-offset="2967" max-vertical-offset="6394"> - <caret line="189" column="13" selection-start-line="189" selection-start-column="13" selection-end-line="189" selection-end-column="13" /> + <state vertical-scroll-proportion="0.0" vertical-offset="5011" max-vertical-offset="7506"> + <caret line="194" column="0" selection-start-line="194" selection-start-column="0" selection-end-line="194" selection-end-column="0" /> <folding> <element signature="e#0#11451#0" expanded="true" /> </folding> @@ -51,7 +49,7 @@ <file leaf-file-name="SwingConnectionWorkerFactory.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingConnectionWorkerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675"> + <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="675"> <caret line="61" column="39" selection-start-line="61" selection-start-column="39" selection-end-line="61" selection-end-column="39" /> <folding /> </state> @@ -61,50 +59,17 @@ <file leaf-file-name="RfbConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="850"> + <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="510"> <caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="Reader.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1666" max-vertical-offset="2910"> - <caret line="218" column="0" selection-start-line="218" selection-start-column="0" selection-end-line="218" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Surface.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1635" max-vertical-offset="3450"> - <caret line="145" column="54" selection-start-line="145" selection-start-column="54" selection-end-line="145" selection-end-column="54" /> - <folding> - <element signature="e#0#8895#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3024#3025#0" expanded="false" /> - <element signature="e#3072#3073#0" expanded="false" /> - <element signature="e#5826#5827#0" expanded="false" /> - <element signature="e#5858#5859#0" expanded="false" /> - <element signature="e#5907#5908#0" expanded="false" /> - <element signature="e#5939#5940#0" expanded="false" /> - <element signature="e#6257#6258#0" expanded="false" /> - <element signature="e#6318#6319#0" expanded="false" /> - <element signature="e#8857#8858#0" expanded="false" /> - <element signature="e#8890#8891#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="8.0" vertical-offset="420" max-vertical-offset="17120"> + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="12840"> <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" /> <folding> <element signature="e#7167#13720#0" expanded="true" /> @@ -122,31 +87,21 @@ </provider> </entry> </file> - <file leaf-file-name="SenderTask.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/SenderTask.java"> + <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1035"> - <caret line="88" column="18" selection-start-line="88" selection-start-column="18" selection-end-line="88" selection-end-column="18" /> + <state vertical-scroll-proportion="1.0722083" vertical-offset="13303" max-vertical-offset="17320"> + <caret line="882" column="0" selection-start-line="882" selection-start-column="0" selection-end-line="882" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="SwingViewerWindow.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <file leaf-file-name="IChangeSettingsListener.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/IChangeSettingsListener.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="11791" max-vertical-offset="13035"> - <caret line="1016" column="12" selection-start-line="1016" selection-start-column="12" selection-end-line="1016" selection-end-column="12" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="RendererImpl.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/RendererImpl.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1200"> - <caret line="50" column="27" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" /> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504"> + <caret line="32" column="24" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="24" /> <folding /> </state> </provider> @@ -155,27 +110,39 @@ <file leaf-file-name="UiSettings.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="2190" max-vertical-offset="2730"> - <caret line="189" column="0" selection-start-line="189" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> - <folding> - <element signature="e#0#7625#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#1874#1899#0" expanded="false" /> - <element signature="e#2442#2443#0" expanded="false" /> - <element signature="e#2495#2496#0" expanded="false" /> - <element signature="e#2739#2740#0" expanded="false" /> - <element signature="e#2769#2770#0" expanded="false" /> - <element signature="e#5027#5028#0" expanded="false" /> - <element signature="e#5073#5074#0" expanded="false" /> - <element signature="e#5301#5302#0" expanded="false" /> - <element signature="e#5360#5361#0" expanded="false" /> - <element signature="e#5674#5675#0" expanded="false" /> - <element signature="e#5712#5713#0" expanded="false" /> - <element signature="e#6390#6391#0" expanded="false" /> - <element signature="e#6442#6443#0" expanded="false" /> - <element signature="e#6481#6482#0" expanded="false" /> - <element signature="e#6518#6519#0" expanded="false" /> - </folding> + <state vertical-scroll-proportion="0.0" vertical-offset="2537" max-vertical-offset="4368"> + <caret line="186" column="29" selection-start-line="186" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="OptionsDialog.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-11.925" vertical-offset="2067" max-vertical-offset="10560"> + <caret line="143" column="17" selection-start-line="143" selection-start-column="17" selection-end-line="143" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ConnectionParams.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="367" max-vertical-offset="4464"> + <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ProtocolSettings.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="4546" max-vertical-offset="5790"> + <caret line="447" column="0" selection-start-line="447" selection-start-column="0" selection-end-line="447" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -187,7 +154,7 @@ <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-5.125" vertical-offset="7355" max-vertical-offset="11208"> + <state vertical-scroll-proportion="0.0" vertical-offset="4725" max-vertical-offset="7005"> <caret line="336" column="64" selection-start-line="336" selection-start-column="64" selection-end-line="336" selection-end-column="64" /> <folding> <element signature="e#0#16331#0" expanded="true" /> @@ -200,24 +167,48 @@ <file leaf-file-name="ReceiverTask.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="3096" max-vertical-offset="8736"> + <state vertical-scroll-proportion="0.0" vertical-offset="2265" max-vertical-offset="5460"> <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> <folding> - <element signature="imports" expanded="true" /> + <element signature="e#0#17406#0" expanded="false" /> + <element signature="e#4918#5317#0" expanded="false" /> + <element signature="e#5316#5317#0" expanded="false" /> + <element signature="e#11939#11967#0" expanded="false" /> + <element signature="e#16926#16927#0" expanded="false" /> + <element signature="e#16959#16960#0" expanded="false" /> + <element signature="e#17000#17001#0" expanded="false" /> + <element signature="e#17038#17039#0" expanded="false" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-9.925" vertical-offset="822" max-vertical-offset="7475"> - <caret line="94" column="22" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" /> - <folding> - <element signature="e#13339#13340#0" expanded="true" /> - <element signature="e#13393#13394#0" expanded="true" /> - </folding> + <state vertical-scroll-proportion="0.4142973" vertical-offset="2340" max-vertical-offset="8125"> + <caret line="157" column="8" selection-start-line="157" selection-start-column="8" selection-end-line="157" selection-end-column="8" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Presenter.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="566" max-vertical-offset="6440"> + <caret line="61" column="20" selection-start-line="61" selection-start-column="20" selection-end-line="61" selection-end-column="20" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ConnectionsHistory.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionsHistory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="5115" max-vertical-offset="8050"> + <caret line="237" column="7" selection-start-line="237" selection-start-column="7" selection-end-line="237" selection-end-column="7" /> + <folding /> </state> </provider> </entry> @@ -225,85 +216,93 @@ <file leaf-file-name="SwingNetworkConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingNetworkConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="1604" max-vertical-offset="4890"> + <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="2445"> <caret line="95" column="0" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="CuiViewer.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.54589766" vertical-offset="1808" max-vertical-offset="5520"> + <state vertical-scroll-proportion="0.0" vertical-offset="4424" max-vertical-offset="8004"> <caret line="145" column="95" selection-start-line="145" selection-start-column="95" selection-end-line="145" selection-end-column="95" /> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="ConnectionView.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="8339" max-vertical-offset="10350"> + <caret line="435" column="6" selection-start-line="435" selection-start-column="6" selection-end-line="435" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="TreeViewer.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="759" max-vertical-offset="4738"> + <state vertical-scroll-proportion="0.0" vertical-offset="1110" max-vertical-offset="3090"> <caret line="79" column="15" selection-start-line="79" selection-start-column="15" selection-end-line="79" selection-end-column="15" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="InitState.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/InitState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="690" max-vertical-offset="1020"> - <caret line="78" column="53" selection-start-line="78" selection-start-column="53" selection-end-line="78" selection-end-column="53" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ServerInitMessage.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/encoding/ServerInitMessage.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1080"> - <caret line="88" column="22" selection-start-line="88" selection-start-column="22" selection-end-line="88" selection-end-column="22" /> - <folding> - <element signature="e#0#2883#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2021#2022#0" expanded="false" /> - <element signature="e#2051#2052#0" expanded="false" /> - <element signature="e#2089#2090#0" expanded="false" /> - <element signature="e#2120#2121#0" expanded="false" /> - <element signature="e#2160#2161#0" expanded="false" /> - <element signature="e#2185#2186#0" expanded="false" /> - <element signature="e#2218#2219#0" expanded="false" /> - <element signature="e#2240#2241#0" expanded="false" /> - <element signature="e#2268#2269#0" expanded="false" /> - <element signature="e#2286#2287#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - </file> <file leaf-file-name="Protocol.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="5016" max-vertical-offset="6936"> + <state vertical-scroll-proportion="0.0" vertical-offset="3720" max-vertical-offset="4335"> <caret line="316" column="32" selection-start-line="316" selection-start-column="32" selection-end-line="316" selection-end-column="32" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ChengeDesktopSize.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChengeDesktopSize.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="540"> - <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" /> <folding> + <element signature="e#0#12477#0" expanded="false" /> <element signature="imports" expanded="false" /> - <element signature="e#873#874#0" expanded="false" /> - <element signature="e#899#900#0" expanded="false" /> + <element signature="e#3369#3370#0" expanded="false" /> + <element signature="e#3403#3404#0" expanded="false" /> + <element signature="e#3795#3796#0" expanded="false" /> + <element signature="e#3829#3830#0" expanded="false" /> + <element signature="e#4116#4117#0" expanded="false" /> + <element signature="e#4156#4157#0" expanded="false" /> + <element signature="e#4223#4224#0" expanded="false" /> + <element signature="e#4263#4264#0" expanded="false" /> + <element signature="e#4308#4309#0" expanded="false" /> + <element signature="e#4338#4339#0" expanded="false" /> + <element signature="e#4395#4396#0" expanded="false" /> + <element signature="e#4433#4434#0" expanded="false" /> + <element signature="e#4479#4480#0" expanded="false" /> + <element signature="e#4510#4511#0" expanded="false" /> + <element signature="e#4560#4561#0" expanded="false" /> + <element signature="e#4591#4592#0" expanded="false" /> + <element signature="e#4653#4654#0" expanded="false" /> + <element signature="e#4693#4694#0" expanded="false" /> + <element signature="e#4752#4753#0" expanded="false" /> + <element signature="e#4792#4793#0" expanded="false" /> + <element signature="e#4862#4863#0" expanded="false" /> + <element signature="e#4902#4903#0" expanded="false" /> + <element signature="e#4961#4962#0" expanded="false" /> + <element signature="e#4992#4993#0" expanded="false" /> + <element signature="e#5039#5040#0" expanded="false" /> + <element signature="e#5068#5069#0" expanded="false" /> + <element signature="e#5115#5116#0" expanded="false" /> + <element signature="e#5144#5145#0" expanded="false" /> + <element signature="e#8521#8522#0" expanded="false" /> + <element signature="e#8562#8563#0" expanded="false" /> + <element signature="e#11959#11960#0" expanded="false" /> + <element signature="e#11985#11986#0" expanded="false" /> + <element signature="e#12044#12045#0" expanded="false" /> + <element signature="e#12082#12083#0" expanded="false" /> + <element signature="e#12128#12129#0" expanded="false" /> + <element signature="e#12158#12159#0" expanded="false" /> + <element signature="e#12234#12235#0" expanded="false" /> + <element signature="e#12288#12289#0" expanded="false" /> + <element signature="e#12344#12345#0" expanded="false" /> + <element signature="e#12382#12383#0" expanded="false" /> + <element signature="e#12433#12434#0" expanded="false" /> + <element signature="e#12473#12474#0" expanded="false" /> </folding> </state> </provider> @@ -598,7 +597,6 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettingsData.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/transport/Reader.java" /> @@ -607,14 +605,17 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/RfbConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java" /> + <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="4" /> + <option name="x" value="222" /> <option name="y" value="23" /> <option name="width" value="3836" /> <option name="height" value="2109" /> @@ -642,6 +643,8 @@ <sortByType /> </navigator> <panes> + <pane id="Scope" /> + <pane id="PackagesPane" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -766,6 +769,78 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="viewer_swing" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="viewer" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="swing" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="viewer_swing" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="viewer" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="swing" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="gui" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="ConnectionView.java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.ClassesTreeStructureProvider$PsiClassOwnerTreeNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="TreeVNC" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -994,8 +1069,6 @@ </PATH> </subPane> </pane> - <pane id="Scope" /> - <pane id="PackagesPane" /> <pane id="Scratches" /> </panes> </component> @@ -1020,7 +1093,7 @@ <property name="settings.editor.splitter.proportion" value="0.2" /> <property name="FullScreen" value="false" /> </component> - <component name="RunManager" selected="Application.TreeeViewer -d"> + <component name="RunManager" selected="Application.TreeViewer"> <configuration default="false" name="TreeViewer" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea"> <pattern> @@ -1030,7 +1103,7 @@ </extension> <option name="MAIN_CLASS_NAME" value="com.glavsoft.viewer.TreeViewer" /> <option name="VM_PARAMETERS" value="" /> - <option name="PROGRAM_PARAMETERS" value="--host 127.0.0.1:5950 --direct" /> + <option name="PROGRAM_PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -1127,19 +1200,6 @@ </ExternalSystemSettings> <method /> </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <method /> - </configuration> <configuration default="true" type="TestNG" factoryName="TestNG"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <module name="" /> @@ -1168,6 +1228,19 @@ <listeners /> <method /> </configuration> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <method /> + </configuration> <configuration default="true" type="Application" factoryName="Application"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <option name="MAIN_CLASS_NAME" /> @@ -1297,8 +1370,8 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="4" y="23" width="3836" height="2109" extended-state="0" /> - <editor active="true" /> + <frame x="222" y="23" width="3836" height="2109" extended-state="0" /> + <editor active="false" /> <layout> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> @@ -1319,26 +1392,26 @@ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18326382" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35796306" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.15172054" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35796306" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24296142" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3293944" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13529718" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14520334" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34118852" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14520334" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> @@ -1385,7 +1458,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java</url> - <line>889</line> + <line>887</line> <properties /> <option name="timeStamp" value="31" /> </line-breakpoint> @@ -1583,70 +1656,6 @@ <option name="FILTER_TARGETS" value="false" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="424" column="19" selection-start-line="424" selection-start-column="16" selection-end-line="424" selection-end-column="19" /> - <folding> - <element signature="e#7167#13720#0" expanded="true" /> - <element signature="e#10887#11213#0" expanded="true" /> - <element signature="e#11212#11213#0" expanded="true" /> - <element signature="e#11458#11784#0" expanded="true" /> - <element signature="e#11783#11784#0" expanded="true" /> - <element signature="e#12015#12341#0" expanded="true" /> - <element signature="e#12340#12341#0" expanded="true" /> - <element signature="e#12563#12889#0" expanded="true" /> - <element signature="e#12888#12889#0" expanded="true" /> - <element signature="e#13719#13720#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/ChengeDesktopSize.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#873#874#0" expanded="false" /> - <element signature="e#899#900#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVNCNetwork.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="34" column="38" selection-start-line="34" selection-start-column="38" selection-end-line="34" selection-end-column="38" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#400#424#0" expanded="false" /> - <element signature="e#537#538#0" expanded="false" /> - <element signature="e#565#566#0" expanded="false" /> - <element signature="e#613#614#0" expanded="false" /> - <element signature="e#647#648#0" expanded="false" /> - <element signature="e#3023#3024#0" expanded="false" /> - <element signature="e#3069#3070#0" expanded="false" /> - <element signature="e#3123#3124#0" expanded="false" /> - <element signature="e#3157#3158#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendCheckDelay.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="21" column="35" selection-start-line="21" selection-start-column="35" selection-end-line="21" selection-end-column="35" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/state/AuthenticationState.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SoundPacketQueue.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.103643216" vertical-offset="0" max-vertical-offset="0"> @@ -1654,13 +1663,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="227" column="5" selection-start-line="227" selection-start-column="5" selection-end-line="227" selection-end-column="5" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/SendSound.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> @@ -1698,7 +1700,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> - <folding /> </state> </provider> </entry> @@ -1791,18 +1792,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="39" column="38" selection-start-line="39" selection-start-column="38" selection-end-line="39" selection-end-column="38" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#400#424#0" expanded="false" /> - <element signature="e#537#538#0" expanded="false" /> - <element signature="e#565#566#0" expanded="false" /> - <element signature="e#613#614#0" expanded="false" /> - <element signature="e#647#648#0" expanded="false" /> - <element signature="e#3023#3024#0" expanded="false" /> - <element signature="e#3069#3070#0" expanded="false" /> - <element signature="e#3123#3124#0" expanded="false" /> - <element signature="e#3157#3158#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1810,12 +1799,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="42" column="11" selection-start-line="42" selection-start-column="11" selection-end-line="42" selection-end-column="11" /> - <folding> - <element signature="e#0#2596#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#2421#2514#0" expanded="false" /> - <element signature="e#2513#2514#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -1831,7 +1814,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="46" column="8" selection-start-line="46" selection-start-column="8" selection-end-line="46" selection-end-column="8" /> - <folding /> </state> </provider> </entry> @@ -1847,11 +1829,7 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#873#874#0" expanded="false" /> - <element signature="e#899#900#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -1872,13 +1850,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.07121212" vertical-offset="0" max-vertical-offset="0"> - <caret line="42" column="13" selection-start-line="42" selection-start-column="13" selection-end-line="42" selection-end-column="13" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettingsData.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> @@ -1900,50 +1871,11 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> - <caret line="189" column="0" selection-start-line="189" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> - <folding> - <element signature="e#0#7625#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#1874#1899#0" expanded="false" /> - <element signature="e#2442#2443#0" expanded="false" /> - <element signature="e#2495#2496#0" expanded="false" /> - <element signature="e#2739#2740#0" expanded="false" /> - <element signature="e#2769#2770#0" expanded="false" /> - <element signature="e#5027#5028#0" expanded="false" /> - <element signature="e#5073#5074#0" expanded="false" /> - <element signature="e#5301#5302#0" expanded="false" /> - <element signature="e#5360#5361#0" expanded="false" /> - <element signature="e#5674#5675#0" expanded="false" /> - <element signature="e#5712#5713#0" expanded="false" /> - <element signature="e#6390#6391#0" expanded="false" /> - <element signature="e#6442#6443#0" expanded="false" /> - <element signature="e#6481#6482#0" expanded="false" /> - <element signature="e#6518#6519#0" expanded="false" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/Surface.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="0"> <caret line="145" column="54" selection-start-line="145" selection-start-column="54" selection-end-line="145" selection-end-column="54" /> - <folding> - <element signature="e#0#8895#0" expanded="false" /> - <element signature="imports" expanded="false" /> - <element signature="e#3024#3025#0" expanded="false" /> - <element signature="e#3072#3073#0" expanded="false" /> - <element signature="e#5826#5827#0" expanded="false" /> - <element signature="e#5858#5859#0" expanded="false" /> - <element signature="e#5907#5908#0" expanded="false" /> - <element signature="e#5939#5940#0" expanded="false" /> - <element signature="e#6257#6258#0" expanded="false" /> - <element signature="e#6318#6319#0" expanded="false" /> - <element signature="e#8857#8858#0" expanded="false" /> - <element signature="e#8890#8891#0" expanded="false" /> - </folding> + <folding /> </state> </provider> </entry> @@ -1988,7 +1920,52 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="5016" max-vertical-offset="6936"> <caret line="316" column="32" selection-start-line="316" selection-start-column="32" selection-end-line="316" selection-end-column="32" /> - <folding /> + <folding> + <element signature="e#0#12477#0" expanded="false" /> + <element signature="imports" expanded="false" /> + <element signature="e#3369#3370#0" expanded="false" /> + <element signature="e#3403#3404#0" expanded="false" /> + <element signature="e#3795#3796#0" expanded="false" /> + <element signature="e#3829#3830#0" expanded="false" /> + <element signature="e#4116#4117#0" expanded="false" /> + <element signature="e#4156#4157#0" expanded="false" /> + <element signature="e#4223#4224#0" expanded="false" /> + <element signature="e#4263#4264#0" expanded="false" /> + <element signature="e#4308#4309#0" expanded="false" /> + <element signature="e#4338#4339#0" expanded="false" /> + <element signature="e#4395#4396#0" expanded="false" /> + <element signature="e#4433#4434#0" expanded="false" /> + <element signature="e#4479#4480#0" expanded="false" /> + <element signature="e#4510#4511#0" expanded="false" /> + <element signature="e#4560#4561#0" expanded="false" /> + <element signature="e#4591#4592#0" expanded="false" /> + <element signature="e#4653#4654#0" expanded="false" /> + <element signature="e#4693#4694#0" expanded="false" /> + <element signature="e#4752#4753#0" expanded="false" /> + <element signature="e#4792#4793#0" expanded="false" /> + <element signature="e#4862#4863#0" expanded="false" /> + <element signature="e#4902#4903#0" expanded="false" /> + <element signature="e#4961#4962#0" expanded="false" /> + <element signature="e#4992#4993#0" expanded="false" /> + <element signature="e#5039#5040#0" expanded="false" /> + <element signature="e#5068#5069#0" expanded="false" /> + <element signature="e#5115#5116#0" expanded="false" /> + <element signature="e#5144#5145#0" expanded="false" /> + <element signature="e#8521#8522#0" expanded="false" /> + <element signature="e#8562#8563#0" expanded="false" /> + <element signature="e#11959#11960#0" expanded="false" /> + <element signature="e#11985#11986#0" expanded="false" /> + <element signature="e#12044#12045#0" expanded="false" /> + <element signature="e#12082#12083#0" expanded="false" /> + <element signature="e#12128#12129#0" expanded="false" /> + <element signature="e#12158#12159#0" expanded="false" /> + <element signature="e#12234#12235#0" expanded="false" /> + <element signature="e#12288#12289#0" expanded="false" /> + <element signature="e#12344#12345#0" expanded="false" /> + <element signature="e#12382#12383#0" expanded="false" /> + <element signature="e#12433#12434#0" expanded="false" /> + <element signature="e#12473#12474#0" expanded="false" /> + </folding> </state> </provider> </entry> @@ -2000,20 +1977,19 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0" vertical-offset="11791" max-vertical-offset="13035"> - <caret line="1016" column="12" selection-start-line="1016" selection-start-column="12" selection-end-line="1016" selection-end-column="12" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="3096" max-vertical-offset="8736"> <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> <folding> - <element signature="imports" expanded="true" /> + <element signature="e#0#17406#0" expanded="false" /> + <element signature="e#4918#5317#0" expanded="false" /> + <element signature="e#5316#5317#0" expanded="false" /> + <element signature="e#11939#11967#0" expanded="false" /> + <element signature="e#16926#16927#0" expanded="false" /> + <element signature="e#16959#16960#0" expanded="false" /> + <element signature="e#17000#17001#0" expanded="false" /> + <element signature="e#17038#17039#0" expanded="false" /> </folding> </state> </provider> @@ -2044,7 +2020,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="8.0" vertical-offset="420" max-vertical-offset="17120"> + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="12840"> <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" /> <folding> <element signature="e#7167#13720#0" expanded="true" /> @@ -2069,19 +2045,9 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.7286759" vertical-offset="2967" max-vertical-offset="6394"> - <caret line="189" column="13" selection-start-line="189" selection-start-column="13" selection-end-line="189" selection-end-column="13" /> - <folding> - <element signature="e#0#11451#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-5.125" vertical-offset="7355" max-vertical-offset="11208"> + <state vertical-scroll-proportion="0.0" vertical-offset="4725" max-vertical-offset="7005"> <caret line="336" column="64" selection-start-line="336" selection-start-column="64" selection-end-line="336" selection-end-column="64" /> <folding> <element signature="e#0#16331#0" expanded="true" /> @@ -2090,21 +2056,100 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-9.925" vertical-offset="822" max-vertical-offset="7475"> - <caret line="94" column="22" selection-start-line="94" selection-start-column="22" selection-end-line="94" selection-end-column="22" /> + <state vertical-scroll-proportion="0.0" vertical-offset="4424" max-vertical-offset="8004"> + <caret line="145" column="95" selection-start-line="145" selection-start-column="95" selection-end-line="145" selection-end-column="95" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="5011" max-vertical-offset="7506"> + <caret line="194" column="0" selection-start-line="194" selection-start-column="0" selection-end-line="194" selection-end-column="0" /> <folding> - <element signature="e#13339#13340#0" expanded="true" /> - <element signature="e#13393#13394#0" expanded="true" /> + <element signature="e#0#11451#0" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/CuiViewer.java"> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ProtocolSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="4546" max-vertical-offset="5790"> + <caret line="447" column="0" selection-start-line="447" selection-start-column="0" selection-end-line="447" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/UiSettings.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="2537" max-vertical-offset="4368"> + <caret line="186" column="29" selection-start-line="186" selection-start-column="0" selection-end-line="189" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="8339" max-vertical-offset="10350"> + <caret line="435" column="6" selection-start-line="435" selection-start-column="6" selection-end-line="435" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/mvp/Presenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="566" max-vertical-offset="6440"> + <caret line="61" column="20" selection-start-line="61" selection-start-column="20" selection-end-line="61" selection-end-column="20" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/ConnectionsHistory.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.54589766" vertical-offset="1808" max-vertical-offset="5520"> - <caret line="145" column="95" selection-start-line="145" selection-start-column="95" selection-end-line="145" selection-end-column="95" /> + <state vertical-scroll-proportion="0.0" vertical-offset="5115" max-vertical-offset="8050"> + <caret line="237" column="7" selection-start-line="237" selection-start-column="7" selection-end-line="237" selection-end-column="7" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/ConnectionParams.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="367" max-vertical-offset="4464"> + <caret line="75" column="0" selection-start-line="75" selection-start-column="0" selection-end-line="75" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.4142973" vertical-offset="2340" max-vertical-offset="8125"> + <caret line="157" column="8" selection-start-line="157" selection-start-column="8" selection-end-line="157" selection-end-column="8" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/gui/OptionsDialog.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-11.925" vertical-offset="2067" max-vertical-offset="10560"> + <caret line="143" column="17" selection-start-line="143" selection-start-column="17" selection-end-line="143" selection-end-column="17" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/IChangeSettingsListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="504"> + <caret line="32" column="24" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="24" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="1.0722083" vertical-offset="13303" max-vertical-offset="17320"> + <caret line="882" column="0" selection-start-line="882" selection-start-column="0" selection-end-line="882" selection-end-column="0" /> <folding /> </state> </provider>
--- 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 + '}'; } + + }
--- 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(); }
--- 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);
--- 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<LocalPointer, JRadioButton> 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);