Merge pull request #227 from Kennox/release-0-8

Release v0.8

debianfx/control

@@ -1,5 +1,5 @@
 Package: rscc
-Version: 0.7.1
+Version: 0.8
 Section: misc
 Priority: extra
 Maintainer: Ronny Standtke <Ronny.Standtke@gmx.net>

pom.xml

@@ -459,5 +459,14 @@
             <version>4.7.0-5</version>
         </dependency>
 
+        <!-- EqualsVerifier library for easy equals & hashCode testing -->
+        <!-- http://jqno.nl/equalsverifier -->
+        <dependency>
+            <groupId>nl.jqno.equalsverifier</groupId>
+            <artifactId>equalsverifier</artifactId>
+            <version>[2.3,]</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 </project>

readme.md

@@ -113,6 +113,25 @@ This will create all the necessary files on your local machine (e.g. desktop ent
 
 End with an example of getting some data out of the system or using it for a little demo
 
+## Settings & Recommendations
+Standard settings try to establish a direct connection between clients over ICE. 
+This can be disabled by activating the setting "force server mode".
+If any of the clients activates this setting, ICE process will be skipped.
+The connection over the server might be faster. While using direct connection, it is recommended to use the
+BGR 233 mode to reduce traffic and increase speed.
+View only restricts the VNC protocoll to view only.
+
+## Expertsettings
+Keyserver IP address: Address of the server which generates the key and matches up clients.
+Keyserver HTTP-Port: Communication Port of Keyserver
+VNC Port: Port on which the Vnc-Server runs
+ICE Port: Port over which the direct traffic is sent and received
+UDP Packet Size: max Size of UDP-packets
+Proxy Port: Redirection of VNC-Packets to this port.
+Stunserver Port: try to reach Stun-Server over this port.
+StunServers: List of potential Stun-Servers.
+
+
 ## Running the tests
 
 The whitebox tests are being carried out using JUnit 4 and Mockito. Therefore you can run them in your favorite IDE or by using Maven.
@@ -164,7 +183,6 @@ GPL
 
 ## Acknowledgments
 
-* Hat tip to anyone who's code was used
 * RUDP: https://sourceforge.net/projects/rudp/
 * Proxy Server: http://www.java2s.com/Code/Java/Network-Protocol/Asimpleproxyserver.htm
 * Ice4j https://github.com/jitsi/ice4j#readme

resources/css/styles.css

@@ -91,28 +91,28 @@
     -fx-font-weight: bold;
 }
 
-.statusBox{
+.statusBar{
     -fx-alignment: center;
     -fx-background-color: darkgray;
     -fx-background-radius: 0.308em;
     -fx-border-radius: 0.308em;
 }
 
-.statusBoxInitialize{
+.statusBarInitialize{
     -fx-background-color: rgb(240, 173, 78);
     -fx-alignment: center;
     -fx-background-radius: 0.308em;
     -fx-border-radius: 0.308em;
 }
 
-.statusBoxSuccess{
+.statusBarSuccess{
     -fx-background-color: rgb(92, 184, 92);
     -fx-alignment: center;
     -fx-background-radius: 0.308em;
     -fx-border-radius: 0.308em;
 }
 
-.statusBoxFail{
+.statusBarFail{
     -fx-background-color: rgb(217, 83, 79);
     -fx-alignment: center;
 }
@@ -137,6 +137,12 @@
     -fx-padding: 2em 0 2em 0;
 }
 
+.keyFld .context-menu {
+    -fx-font-size: 0.7em;
+    -fx-border-radius: 0.308em;
+    -fx-background-radius: 0.308em;
+}
+
 .titled-pane {
     -fx-font-size: 1.641em;
 }
@@ -190,6 +196,13 @@
 
 }
 
+.supporterBtn .context-menu {
+    -fx-font-size: 1em;
+    -fx-border-radius: 0.308em;
+    -fx-background-radius: 0.308em;
+}
+
+
 .supporterBtn:hover{
     -fx-cursor: hand;
     -fx-background-color: lightgrey; /* Green */
@@ -264,6 +277,7 @@
 
 .toggles {
     -fx-alignment: baseline-center;
+    -thumb-move-animation-time: 150;
 }
 
 .toggles .thumb-area {
@@ -283,7 +297,8 @@
 }
 
 .toggles:selected .thumb-area {
-    -fx-background-color: #A7A7A7;
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)),
+    linear-gradient(to bottom, derive(#0b99c9, 30%), #0b99c9);
 }
 
 .toggles .thumb:hover {
@@ -328,6 +343,41 @@
     -fx-font-size: 1.3em;
 }
 
+.list-view {
+    -fx-font-size: 1.3em;
+}
+
+.addRemoveDefaultsBtn {
+    -fx-font-size: 1.3em;
+    -fx-padding: 1.538em 2.308em 1.538em 2.308em;
+    -fx-alignment: center;
+    -fx-background-radius: 0.308em;
+    -fx-border-radius: 0.308em;
+    -fx-border-color:#A7A7A7;
+    -fx-background-color: #EAEAEA;
+}
+
+.addRemoveDefaultsBtn:hover {
+    -fx-background-color: #ffffff;
+    -fx-cursor: hand;
+}
+
+.expertDialog .button-bar .button{
+    -fx-font-size: 1.3em;
+    -fx-padding: 1.538em 2.308em 1.538em 2.308em;
+    -fx-alignment: center;
+    -fx-background-radius: 0.308em;
+    -fx-border-radius: 0.308em;
+    -fx-border-color:#A7A7A7;
+    -fx-background-color: #EAEAEA;
+}
+
+.expertDialog .button-bar .button:hover{
+    -fx-background-color: #ffffff;
+    -fx-cursor: hand;
+}
+
+}
 /***************************************************************************
  *                                                                         *
  *                             Dialog Supporter                            *

resources/docker-build_p2p/port_connect.sh

@@ -58,7 +58,7 @@ then
 fi
 
 ### get the private key of the connection
-keyfile=$(tempfile)
+keyfile=$(mktemp)
 echo -e "$key\n" | ssh -o StrictHostKeyChecking=no -p $p2p_port -i keys/get.key vnc@$p2p_server > $keyfile 2>>$logfile
 
 ### get the remote port from the key file

resources/docker-build_p2p/port_share.sh

@@ -46,7 +46,7 @@ fi
 
 ### create a key pair for the connection and get
 ### the key name, remote port and the private key
-keyfile=$(tempfile)
+keyfile=$(mktemp)
 ssh -o StrictHostKeyChecking=no -p $p2p_port -i keys/create.key vnc@$p2p_server > $keyfile 2>>$logfile
 key=$(sed -n -e '1p' $keyfile | tr -d [:space:])
 remote_port=$(sed -n -e '2p' $keyfile | tr -d [:space:])

resources/docker-build_p2p/port_stop.sh

@@ -43,7 +43,7 @@ then
 fi
 
 ### get the remote port from the private key
-keyfile=$(tempfile)
+keyfile=$(mktemp)
 echo -e "$key\n" | ssh -o StrictHostKeyChecking=no -p $p2p_port -i keys/get.key vnc@$p2p_server > $keyfile 2>>$logfile
 remote_port=$(head -1 $keyfile)
 rm $keyfile

src/ch/imedias/rsccfx/RsccApp.java

@@ -14,6 +14,7 @@
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import javafx.application.Application;
+import javafx.application.Platform;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Node;
 import javafx.scene.Scene;
@@ -28,6 +29,8 @@ public class RsccApp extends Application {
       Logger.getLogger(RsccApp.class.getName());
 
   public static final String APP_NAME = "Remote Support";
+  public static final String APP_VERSION = "0.8";
+
   /**
    * Declares views for use with ViewController.
    */
@@ -47,18 +50,18 @@ public class RsccApp extends Application {
   private static final double ROOT_TEXT_SIZE_FULL_HD = 11;
   private static final double ROOT_TEXT_SIZE_LOW = 10;
 
-  public static double rootTextSize;
+  private static double rootTextSize;
 
   /**
    * Defines the scaling based on the DPI of the screen in relation to a 4K resolution display.
    * Must be used in all views to scale all displayed values that cannot be set in the CSS.
    */
-  public static double scalingFactor;
+  private static double scalingFactor;
 
   /**
    * Defines the stylesheet that is being used.
    */
-  public static String styleSheet;
+  private static String styleSheet;
 
   private Rscc model;
 
@@ -118,6 +121,16 @@ public void start(Stage stage) {
     model = new Rscc(systemCommander, new KeyUtil());
     ViewController mainView = new ViewController();
 
+    // Initialize StatusBars
+    Platform.runLater(() -> {
+      model.setStatusBarStartService(
+          model.strings.statusBarServiceIdle, model.STATUS_BAR_STYLE_IDLE);
+      model.setStatusBarKeyInput(
+          model.strings.statusBarPleaseEnterKey, model.STATUS_BAR_STYLE_INITIALIZE);
+      model.setStatusBarSupporter(
+          model.strings.supportStatusLblReady, model.STATUS_BAR_STYLE_IDLE);
+    });
+
     // Set root font size, everything adapts to it afterwards
     mainView.setStyle("-fx-font-size: " + rootTextSize + "px;");
 
@@ -157,6 +170,7 @@ public void start(Stage stage) {
 
   @Override
   public void stop() throws Exception {
+    model.saveUserPreferences();
     model.killConnection();
     super.stop();
     System.exit(0);
@@ -168,4 +182,16 @@ private void setLogLevel(Level logLevel) {
       h.setLevel(logLevel);
     }
   }
+
+  public static double getRootTextSize() {
+    return rootTextSize;
+  }
+
+  public static double getScalingFactor() {
+    return scalingFactor;
+  }
+
+  public static String getStyleSheet() {
+    return styleSheet;
+  }
 }