safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-724: Move mouse emulation setting from client to menu.

Browse Source
This commit is contained in:
Michael Jumper
2021-06-16 21:51:47 -07:00
parent 4b227fe8c6
commit 3f4c6a4cd1
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole/src/main/frontend/src/app/client/controllers/clientController.js
View File

@@ -120,6 +120,14 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
*/ */
inputMethod : preferenceService.preferences.inputMethod, inputMethod : preferenceService.preferences.inputMethod,
/**
* Whether translation of touch to mouse events should emulate an
* absolute pointer device, or a relative pointer device.
*
* @type Boolean
*/
emulateAbsoluteMouse : preferenceService.preferences.emulateAbsoluteMouse,
/** /**
* The current scroll state of the menu. * The current scroll state of the menu.
* *

6
guacamole/src/main/frontend/src/app/client/templates/client.html
View File

@@ -150,14 +150,14 @@
</div> </div>
<!-- Mouse mode --> <!-- Mouse mode -->
<div class="menu-section" id="mouse-settings" ng-hide="client.multiTouchSupport"> <div class="menu-section" id="mouse-settings">
<h3>{{'CLIENT.SECTION_HEADER_MOUSE_MODE' | translate}}</h3> <h3>{{'CLIENT.SECTION_HEADER_MOUSE_MODE' | translate}}</h3>
<div class="content"> <div class="content">
<p class="description">{{'CLIENT.HELP_MOUSE_MODE' | translate}}</p> <p class="description">{{'CLIENT.HELP_MOUSE_MODE' | translate}}</p>
<!-- Touchscreen --> <!-- Touchscreen -->
<div class="choice"> <div class="choice">
<input name="mouse-mode" ng-change="closeMenu()" ng-model="client.clientProperties.emulateAbsoluteMouse" type="radio" ng-value="true" checked="checked" id="absolute"> <input name="mouse-mode" ng-change="closeMenu()" ng-model="menu.emulateAbsoluteMouse" type="radio" ng-value="true" checked="checked" id="absolute">
<div class="figure"> <div class="figure">
<label for="absolute"><img src="images/settings/touchscreen.png" alt="{{'CLIENT.NAME_MOUSE_MODE_ABSOLUTE' | translate}}"></label> <label for="absolute"><img src="images/settings/touchscreen.png" alt="{{'CLIENT.NAME_MOUSE_MODE_ABSOLUTE' | translate}}"></label>
<p class="caption"><label for="absolute">{{'CLIENT.HELP_MOUSE_MODE_ABSOLUTE' | translate}}</label></p> <p class="caption"><label for="absolute">{{'CLIENT.HELP_MOUSE_MODE_ABSOLUTE' | translate}}</label></p>
@@ -166,7 +166,7 @@
<!-- Touchpad --> <!-- Touchpad -->
<div class="choice"> <div class="choice">
<input name="mouse-mode" ng-change="closeMenu()" ng-model="client.clientProperties.emulateAbsoluteMouse" type="radio" ng-value="false" id="relative"> <input name="mouse-mode" ng-change="closeMenu()" ng-model="menu.emulateAbsoluteMouse" type="radio" ng-value="false" id="relative">
<div class="figure"> <div class="figure">
<label for="relative"><img src="images/settings/touchpad.png" alt="{{'CLIENT.NAME_MOUSE_MODE_RELATIVE' | translate}}"></label> <label for="relative"><img src="images/settings/touchpad.png" alt="{{'CLIENT.NAME_MOUSE_MODE_RELATIVE' | translate}}"></label>
<p class="caption"><label for="relative">{{'CLIENT.HELP_MOUSE_MODE_RELATIVE' | translate}}</label></p> <p class="caption"><label for="relative">{{'CLIENT.HELP_MOUSE_MODE_RELATIVE' | translate}}</label></p>

11
guacamole/src/main/frontend/src/app/client/types/ClientProperties.js
View File

@@ -22,9 +22,6 @@
*/ */
angular.module('client').factory('ClientProperties', ['$injector', function defineClientProperties($injector) { angular.module('client').factory('ClientProperties', ['$injector', function defineClientProperties($injector) {
// Required services
var preferenceService = $injector.get('preferenceService');
/** /**
* Object used for interacting with a guacClient directive. * Object used for interacting with a guacClient directive.
* *
@@ -83,14 +80,6 @@ angular.module('client').factory('ClientProperties', ['$injector', function defi
*/ */
this.focused = template.focused || false; this.focused = template.focused || false;
/**
* Whether translation of touch to mouse events should emulate an
* absolute pointer device, or a relative pointer device.
*
* @type Boolean
*/
this.emulateAbsoluteMouse = template.emulateAbsoluteMouse || preferenceService.preferences.emulateAbsoluteMouse;
/** /**
* The relative Y coordinate of the scroll offset of the display within * The relative Y coordinate of the scroll offset of the display within
* the client element. * the client element.