Merge pull request #2664 from calmh/fix2433

Add relaying to main settings dialog (fixes #2433)

gui/syncthing/core/syncthingController.js

@@ -353,6 +353,7 @@ angular.module('syncthing.core')
             $scope.config = config;
             $scope.config.options._listenAddressStr = $scope.config.options.listenAddress.join(', ');
             $scope.config.options._globalAnnounceServersStr = $scope.config.options.globalAnnounceServers.join(', ');
+            $scope.config.options._relayServersStr = $scope.config.options.relayServers.join(', ');
 
             $scope.devices = $scope.config.devices;
             $scope.devices.forEach(function (deviceCfg) {
@@ -890,7 +891,7 @@ angular.module('syncthing.core')
                 $scope.config.options = angular.copy($scope.tmpOptions);
                 $scope.config.gui = angular.copy($scope.tmpGUI);
 
-                ['listenAddress', 'globalAnnounceServers'].forEach(function (key) {
+                ['listenAddress', 'globalAnnounceServers', 'relayServers'].forEach(function (key) {
                     $scope.config.options[key] = $scope.config.options["_" + key + "Str"].split(/[ ,]+/).map(function (x) {
                         return x.trim();
                     });

gui/syncthing/settings/settingsModalView.html

@@ -13,10 +13,12 @@
               <label translate for="DeviceName">Device Name</label>
               <input id="DeviceName" class="form-control" type="text" ng-model="tmpOptions.deviceName">
             </div>
+
             <div class="form-group">
               <label translate for="ListenAddressStr">Sync Protocol Listen Addresses</label>
               <input id="ListenAddressStr" class="form-control" type="text" ng-model="tmpOptions._listenAddressStr">
             </div>
+
             <div class="form-group" ng-class="{'has-error': settingsEditor.MaxRecvKbps.$invalid && settingsEditor.MaxRecvKbps.$dirty}">
               <label translate for="MaxRecvKbps">Incoming Rate Limit (KiB/s)</label>
               <input id="MaxRecvKbps" name="MaxRecvKbps" class="form-control" type="number" ng-model="tmpOptions.maxRecvKbps" min="0">
@@ -24,6 +26,7 @@
                 <span translate ng-if="settingsEditor.MaxRecvKbps.$error.min && settingsEditor.MaxRecvKbps.$dirty">The rate limit must be a non-negative number (0: no limit)</span>
               </p>
             </div>
+
             <div class="form-group" ng-class="{'has-error': settingsEditor.MaxSendKbps.$invalid && settingsEditor.MaxSendKbps.$dirty}">
               <label translate for="MaxSendKbps">Outgoing Rate Limit (KiB/s)</label>
               <input id="MaxSendKbps" name="MaxSendKbps" class="form-control" type="number" ng-model="tmpOptions.maxSendKbps" min="0">
@@ -31,6 +34,8 @@
                 <span translate ng-if="settingsEditor.MaxSendKbps.$error.min && settingsEditor.MaxSendKbps.$dirty">The rate limit must be a non-negative number (0: no limit)</span>
               </p>
             </div>
+
+            <div class="row">
               <div class="col-md-6">
                 <div class="form-group">
                   <div class="checkbox">
@@ -39,13 +44,6 @@
                     </label>
                   </div>
                 </div>
-              <div class="form-group">
-                <div class="checkbox">
-                  <label>
-                    <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.globalAnnounceEnabled"> <span translate>Global Discovery</span>
-                  </label>
-                </div>
-              </div>
               </div>
               <div class="col-md-6">
                 <div class="form-group">
@@ -55,17 +53,34 @@
                     </label>
                   </div>
                 </div>
+              </div>
+            </div>
+
             <div class="form-group">
               <div class="checkbox">
-                  <label ng-if="upgradeInfo">
-                    <input id="AutoUpgradeEnabled" type="checkbox" ng-model="tmpOptions.autoUpgradeEnabled"> <span translate>Automatic upgrades</span>
+                <label>
+                  <input id="RelaysEnabled" type="checkbox" ng-model="tmpOptions.relaysEnabled"> <span translate>Enable Relaying</span>
                 </label>
               </div>
             </div>
-            </div>
+
             <div class="clearfix"></div>
             <div class="form-group">
-              <label translate for="GlobalAnnServersStr">Global Discovery Server</label>
+              <label translate for="RelayServersStr">Relay Servers</label>
+              <input ng-disabled="!tmpOptions.relaysEnabled" id="RelayServersStr" class="form-control" type="text" ng-model="tmpOptions._relayServersStr">
+            </div>
+
+            <div class="form-group">
+              <div class="checkbox">
+                <label>
+                  <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.globalAnnounceEnabled"> <span translate>Global Discovery</span>
+                </label>
+              </div>
+            </div>
+
+            <div class="clearfix"></div>
+            <div class="form-group">
+              <label translate for="GlobalAnnServersStr">Global Discovery Servers</label>
               <input ng-disabled="!tmpOptions.globalAnnounceEnabled" id="GlobalAnnServersStr" class="form-control" type="text" ng-model="tmpOptions._globalAnnounceServersStr">
             </div>
           </div>
@@ -104,6 +119,13 @@
                 </label>
               </div>
             </div>
+            <div class="form-group" ng-xif="upgradeInfo">
+              <div class="checkbox">
+                <label>
+                  <input id="AutoUpgradeEnabled" type="checkbox" ng-model="tmpOptions.autoUpgradeEnabled"> <span translate>Automatic upgrades</span>
+                </label>
+              </div>
+            </div>
 
             <hr />