Mercurial > hg > Applications > TreeVNC
changeset 401:94c520535ef1
Fix selection panel
| author | Tatsuki IHA <e125716@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 13 Oct 2015 18:21:46 +0900 |
| parents | 845698fd6fb6 |
| children | 73c96a1d4a3a |
| files | .idea/workspace.xml src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java src/viewer_swing/java/com/glavsoft/viewer/Viewer.java |
| diffstat | 5 files changed, 125 insertions(+), 138 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Tue Oct 13 17:45:16 2015 +0900 +++ b/.idea/workspace.xml Tue Oct 13 18:21:46 2015 +0900 @@ -2,6 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="settingsChanged"> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" afterPath="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.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" /> @@ -42,10 +43,10 @@ </provider> </entry> </file> - <file leaf-file-name="TreeVncCommand.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="TreeVncCommand.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.45915493"> + <state vertical-scroll-proportion="0.0"> <caret line="56" column="67" selection-start-line="56" selection-start-column="63" selection-end-line="56" selection-end-column="67" /> <folding /> </state> @@ -56,7 +57,7 @@ <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" /> + <caret line="24" column="37" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" /> <folding> <element signature="imports" expanded="true" /> </folding> @@ -64,12 +65,13 @@ </provider> </entry> </file> - <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="false"> + <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true"> <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="0.0"> - <caret line="18" column="74" selection-start-line="18" selection-start-column="74" selection-end-line="18" selection-end-column="74" /> + <state vertical-scroll-proportion="0.33239436"> + <caret line="369" column="66" selection-start-line="369" selection-start-column="66" selection-end-line="369" selection-end-column="66" /> <folding> + <element signature="e#0#16554#0" expanded="true" /> <element signature="imports" expanded="true" /> <element signature="e#6823#6824#0" expanded="true" /> <element signature="e#6852#6853#0" expanded="true" /> @@ -191,13 +193,13 @@ <file leaf-file-name="CreateConnectionParam.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-7.7777777"> - <caret line="20" column="23" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" /> + <state vertical-scroll-proportion="-21.666666"> + <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" /> <folding> - <element signature="e#1986#1987#0" expanded="true" /> - <element signature="e#2017#2018#0" expanded="true" /> - <element signature="e#2050#2051#0" expanded="true" /> - <element signature="e#2072#2073#0" expanded="true" /> + <element signature="e#2009#2010#0" expanded="true" /> + <element signature="e#2040#2041#0" expanded="true" /> + <element signature="e#2073#2074#0" expanded="true" /> + <element signature="e#2095#2096#0" expanded="true" /> </folding> </state> </provider> @@ -206,8 +208,8 @@ <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="-15.074074"> - <caret line="433" column="34" selection-start-line="433" selection-start-column="34" selection-end-line="433" selection-end-column="34" /> + <state vertical-scroll-proportion="-2.7777777"> + <caret line="53" column="44" selection-start-line="53" selection-start-column="44" selection-end-line="53" selection-end-column="44" /> <folding> <element signature="e#31944#31945#0" expanded="true" /> <element signature="e#31987#31988#0" expanded="true" /> @@ -220,7 +222,7 @@ <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="65" column="51" selection-start-line="65" selection-start-column="51" selection-end-line="65" selection-end-column="51" /> + <caret line="55" column="23" selection-start-line="55" selection-start-column="23" selection-end-line="55" selection-end-column="23" /> <folding /> </state> </provider> @@ -239,13 +241,13 @@ <file leaf-file-name="TreeVncRootSelectionPanel.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.45731708"> - <caret line="50" column="11" selection-start-line="50" selection-start-column="11" selection-end-line="50" selection-end-column="11" /> + <state vertical-scroll-proportion="1.0746951"> + <caret line="55" column="29" selection-start-line="55" selection-start-column="29" selection-end-line="55" selection-end-column="29" /> <folding> <element signature="e#1405#1554#0" expanded="true" /> <element signature="e#1553#1554#0" expanded="true" /> - <element signature="e#1596#1762#0" expanded="true" /> - <element signature="e#1761#1762#0" expanded="true" /> + <element signature="e#1596#1772#0" expanded="true" /> + <element signature="e#1771#1772#0" expanded="true" /> </folding> </state> </provider> @@ -268,23 +270,8 @@ <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"> - <caret line="237" column="7" selection-start-line="237" selection-start-column="7" selection-end-line="237" selection-end-column="7" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#2256#2283#0" expanded="false" /> - <element signature="e#2346#2364#0" expanded="false" /> - <element signature="e#5490#5491#0" expanded="false" /> - <element signature="e#5515#5516#0" expanded="false" /> - <element signature="e#5587#5588#0" expanded="false" /> - <element signature="e#5637#5638#0" expanded="false" /> - <element signature="e#5705#5706#0" expanded="false" /> - <element signature="e#5753#5754#0" expanded="false" /> - <element signature="e#10490#10508#0" expanded="false" /> - <element signature="e#14383#14384#0" expanded="false" /> - <element signature="e#14433#14434#0" expanded="false" /> - <element signature="e#14671#14672#0" expanded="false" /> - <element signature="e#14715#14716#0" expanded="false" /> - </folding> + <caret line="257" column="57" selection-start-line="257" selection-start-column="57" selection-end-line="257" selection-end-column="57" /> + <folding /> </state> </provider> </entry> @@ -293,7 +280,7 @@ <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"> - <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" /> + <caret line="72" column="29" selection-start-line="72" selection-start-column="29" selection-end-line="72" selection-end-column="29" /> <folding /> </state> </provider> @@ -644,12 +631,12 @@ <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java" /> + <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> - <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java" /> </list> </option> </component> @@ -1447,11 +1434,17 @@ <properties /> <option name="timeStamp" value="151" /> </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java</url> + <line>33</line> + <properties /> + <option name="timeStamp" value="159" /> + </line-breakpoint> </breakpoints> <breakpoints-dialog> <breakpoints-dialog /> </breakpoints-dialog> - <option name="time" value="159" /> + <option name="time" value="160" /> </breakpoint-manager> <watches-manager /> </component> @@ -1695,29 +1688,6 @@ </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.0"> - <caret line="237" column="7" selection-start-line="237" selection-start-column="7" selection-end-line="237" selection-end-column="7" /> - <folding> - <element signature="imports" expanded="false" /> - <element signature="e#2256#2283#0" expanded="false" /> - <element signature="e#2346#2364#0" expanded="false" /> - <element signature="e#5490#5491#0" expanded="false" /> - <element signature="e#5515#5516#0" expanded="false" /> - <element signature="e#5587#5588#0" expanded="false" /> - <element signature="e#5637#5638#0" expanded="false" /> - <element signature="e#5705#5706#0" expanded="false" /> - <element signature="e#5753#5754#0" expanded="false" /> - <element signature="e#10490#10508#0" expanded="false" /> - <element signature="e#14383#14384#0" expanded="false" /> - <element signature="e#14433#14434#0" expanded="false" /> - <element signature="e#14671#14672#0" expanded="false" /> - <element signature="e#14715#14716#0" expanded="false" /> - </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"> @@ -1895,55 +1865,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-7.7777777"> - <caret line="20" column="23" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" /> - <folding> - <element signature="e#1986#1987#0" expanded="true" /> - <element signature="e#2017#2018#0" expanded="true" /> - <element signature="e#2050#2051#0" expanded="true" /> - <element signature="e#2072#2073#0" expanded="true" /> - </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"> - <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> - <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="0.0"> - <caret line="18" column="74" selection-start-line="18" selection-start-column="74" selection-end-line="18" selection-end-column="74" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="e#6823#6824#0" expanded="true" /> - <element signature="e#6852#6853#0" expanded="true" /> - <element signature="e#7108#7109#0" expanded="true" /> - <element signature="e#7140#7141#0" expanded="true" /> - <element signature="e#7688#7689#0" expanded="true" /> - <element signature="e#7730#7731#0" expanded="true" /> - <element signature="e#9164#9165#0" expanded="true" /> - <element signature="e#9207#9208#0" expanded="true" /> - <element signature="e#9941#9942#0" expanded="true" /> - <element signature="e#9979#9980#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> - <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"> - <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/RequestScreenThread.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -1955,16 +1876,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" /> - <folding> - <element signature="imports" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/TestTextBox.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -1973,18 +1884,57 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="56" column="67" selection-start-line="56" selection-start-column="63" selection-end-line="56" selection-end-column="67" /> + <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"> + <caret line="176" column="16" selection-start-line="176" selection-start-column="16" selection-end-line="176" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommandChannelListener.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="65" column="51" selection-start-line="65" selection-start-column="51" selection-end-line="65" selection-end-column="51" /> + <caret line="55" column="23" selection-start-line="55" selection-start-column="23" selection-end-line="55" selection-end-column="23" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/FindRoot.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="24" column="37" selection-start-line="24" selection-start-column="37" selection-end-line="24" selection-end-column="37" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-21.666666"> + <caret line="46" column="32" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" /> + <folding> + <element signature="e#2009#2010#0" expanded="true" /> + <element signature="e#2040#2041#0" expanded="true" /> + <element signature="e#2073#2074#0" expanded="true" /> + <element signature="e#2095#2096#0" expanded="true" /> + </folding> + </state> + </provider> + </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="-15.074074"> - <caret line="433" column="34" selection-start-line="433" selection-start-column="34" selection-end-line="433" selection-end-column="34" /> + <state vertical-scroll-proportion="-2.7777777"> + <caret line="53" column="44" selection-start-line="53" selection-start-column="44" selection-end-line="53" selection-end-column="44" /> <folding> <element signature="e#31944#31945#0" expanded="true" /> <element signature="e#31987#31988#0" expanded="true" /> @@ -1992,23 +1942,52 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncCommand.java"> + <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.45915493"> - <caret line="56" column="67" selection-start-line="56" selection-start-column="63" selection-end-line="56" selection-end-column="67" /> + <state vertical-scroll-proportion="0.0"> + <caret line="257" column="57" selection-start-line="257" selection-start-column="57" selection-end-line="257" selection-end-column="57" /> + <folding /> + </state> + </provider> + </entry> + <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"> + <caret line="72" column="29" selection-start-line="72" selection-start-column="29" selection-end-line="72" selection-end-column="29" /> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.45731708"> - <caret line="50" column="11" selection-start-line="50" selection-start-column="11" selection-end-line="50" selection-end-column="11" /> + <state vertical-scroll-proportion="1.0746951"> + <caret line="55" column="29" selection-start-line="55" selection-start-column="29" selection-end-line="55" selection-end-column="29" /> <folding> <element signature="e#1405#1554#0" expanded="true" /> <element signature="e#1553#1554#0" expanded="true" /> - <element signature="e#1596#1762#0" expanded="true" /> - <element signature="e#1761#1762#0" expanded="true" /> + <element signature="e#1596#1772#0" expanded="true" /> + <element signature="e#1771#1772#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="0.33239436"> + <caret line="369" column="66" selection-start-line="369" selection-start-column="66" selection-end-line="369" selection-end-column="66" /> + <folding> + <element signature="e#0#16554#0" expanded="true" /> + <element signature="imports" expanded="true" /> + <element signature="e#6823#6824#0" expanded="true" /> + <element signature="e#6852#6853#0" expanded="true" /> + <element signature="e#7108#7109#0" expanded="true" /> + <element signature="e#7140#7141#0" expanded="true" /> + <element signature="e#7688#7689#0" expanded="true" /> + <element signature="e#7730#7731#0" expanded="true" /> + <element signature="e#9164#9165#0" expanded="true" /> + <element signature="e#9207#9208#0" expanded="true" /> + <element signature="e#9941#9942#0" expanded="true" /> + <element signature="e#9979#9980#0" expanded="true" /> </folding> </state> </provider>
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Tue Oct 13 17:45:16 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/CreateConnectionParam.java Tue Oct 13 18:21:46 2015 +0900 @@ -24,6 +24,7 @@ public synchronized void findTreeVncRoot() { FindRoot getBcast = new FindRoot(rfb.acceptPort,this); rfb.createRootSelectionPanel(this, getBcast); + getBcast.findRoot(); // wait for RootSelection try { wait();
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Tue Oct 13 17:45:16 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeVncRootSelectionPanel.java Tue Oct 13 18:21:46 2015 +0900 @@ -53,7 +53,8 @@ @Override public void actionPerformed(ActionEvent e) { cp.setDisplayMode(); - findRoot.findRoot(); + cp.restart(); + unVisible(); } }); contentPane.add(panel, BorderLayout.CENTER);
--- a/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Tue Oct 13 17:45:16 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/TreeViewer.java Tue Oct 13 18:21:46 2015 +0900 @@ -72,9 +72,15 @@ } else { v.startTreeViewer(hostName,cui, addSerialNum); - // selected "Start as TreeVNC Root" for start selection panel - if (v.getRfb().getConnectionParam().isRootMode()) { + // selected "Start Display Mode" or "Start as TreeVNC Root" for start selection panel + if (v.getRfb().getConnectionParam().isDisplayMode()) { noConnection = true; + treeProxy = true; + viewer = true; + rootStart(args, v); + } else if (v.getRfb().getConnectionParam().isRootMode()) { + viewer = false; + treeProxy = true; rootStart(args, v); } }
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Oct 13 17:45:16 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Oct 13 18:21:46 2015 +0900 @@ -367,8 +367,8 @@ } else { cp.findTreeVncRoot(); - // selected "Start as TreeVNC Root" for start selection panel - if (cp.isRootMode()) { + // selected "Start Display Mode" or "Start as TreeVNC Root" for start selection panel + if (cp.isDisplayMode() || cp.isRootMode()) { myRfb = rfb; return; }