Fixed RDP to add "font smoothing" capability

Fixed users_groups metagroups information

server/src/uds/REST/methods/users_groups.py

@@ -67,7 +67,7 @@ def getGroupsFromMeta(groups):
 
 
 def getPoolsForGroups(groups):
-    for g in getGroupsFromMeta(groups):
+    for g in groups:
         for servicePool in g.deployedServices.all():
             yield servicePool
 
@@ -355,17 +355,15 @@ class Groups(DetailHandler):
     def users(self, parent, item):
         uuid = processUuid(item)
         group = parent.groups.get(uuid=processUuid(uuid))
-        groups = getGroupsFromMeta((group,))
 
         res = []
-        for group in groups:
-            for i in group.users.all():
-                res.append({
-                    'id': i.uuid,
-                    'name': i.name,
-                    'real_name': i.real_name,
-                    'state': i.state,
-                    'last_access': i.last_access
-                })
+        for i in group.users.all():
+            res.append({
+                'id': i.uuid,
+                'name': i.name,
+                'real_name': i.real_name,
+                'state': i.state,
+                'last_access': i.last_access
+            })
 
         return res

server/src/uds/templates/uds/admin/tmpl/service-info.html

@@ -6,13 +6,13 @@
     <li><a href="#{{ id }}-logs_tab" data-toggle="tab">{% endverbatim %}{% trans 'Logs' %}{% verbatim %}</a></li>
 </ul>
 <div class="tab-content">
-    <div class="tab-pane fade in active" id="{{ id }}-overview_tab">
+    <!-- <div class="tab-pane fade in" id="{{ id }}-overview_tab">
         <div class="row">
             <div class="col-xs-12" id="{{ id }}-overview">
             </div>
         </div>
-    </div>
-    <div class="tab-pane fade" id="{{ id }}-pools_tab">
+    </div> -->
+    <div class="tab-pane fade active in" id="{{ id }}-pools_tab">
         <div class="row">
             <div class="col-xs-12">
               <table id="{{ id }}-pools-table" style="width:100%;" class="display">

server/src/uds/transports/RDP/BaseRDPTransport.py

@@ -42,7 +42,7 @@ from uds.core.util import connection
 import logging
 import os
 
-__updated__ = '2016-07-28'
+__updated__ = '2017-01-25'
 
 
 logger = logging.getLogger(__name__)
@@ -69,9 +69,10 @@ class BaseRDPTransport(Transport):
     allowSerials = gui.CheckBoxField(label=_('Allow Serials'), order=19, tooltip=_('If checked, this transport will allow the use of user serial ports'), tab=gui.PARAMETERS_TAB)
     wallpaper = gui.CheckBoxField(label=_('Show wallpaper'), order=20, tooltip=_('If checked, the wallpaper and themes will be shown on machine (better user experience, more bandwidth)'), tab=gui.PARAMETERS_TAB)
     multimon = gui.CheckBoxField(label=_('Multiple monitors'), order=21, tooltip=_('If checked, all client monitors will be used for displaying (only works on windows clients)'), tab=gui.PARAMETERS_TAB)
-    aero = gui.CheckBoxField(label=_('Allow Aero'), order=22, tooltip=_('If checked, desktop composition will be allowed'), tab=gui.PARAMETERS_TAB)
-    multimedia = gui.CheckBoxField(label=_('Multimedia sync'), order=23, tooltip=_('If checked. Linux client will use multimedia parameter for xfreerdp'), tab='Linux Client')
-    alsa = gui.CheckBoxField(label=_('Use Alsa'), order=24, tooltip=_('If checked, Linux client will try to use ALSA, otherwise Pulse will be used'), tab='Linux Client')
+    aero = gui.CheckBoxField(label=_('Allow Desk.Comp.'), order=22, tooltip=_('If checked, desktop composition will be allowed'), tab=gui.PARAMETERS_TAB)
+    smooth = gui.CheckBoxField(label=_('Font Smoothing'), order=23, tooltip=_('If checked, fonts smoothing will be allowed (windows clients only)'), tab=gui.PARAMETERS_TAB)
+    multimedia = gui.CheckBoxField(label=_('Multimedia sync'), order=25, tooltip=_('If checked. Linux client will use multimedia parameter for xfreerdp'), tab='Linux Client')
+    alsa = gui.CheckBoxField(label=_('Use Alsa'), order=26, tooltip=_('If checked, Linux client will try to use ALSA, otherwise Pulse will be used'), tab='Linux Client')
 
     def isAvailableFor(self, userService, ip):
         '''

server/src/uds/transports/RDP/RDPFile.py

@@ -40,7 +40,7 @@ from uds.core.util import OsDetector
 import six
 import os
 
-__updated__ = '2016-07-21'
+__updated__ = '2017-01-25'
 
 
 class RDPFile(object):
@@ -64,6 +64,7 @@ class RDPFile(object):
     showWallpaper = False
     multimon = False
     desktopComposition = False
+    smoothFonts = True
 
     def __init__(self, fullScreen, width, height, bpp, target=OsDetector.Windows):
         self.width = six.text_type(width)
@@ -241,7 +242,10 @@ class RDPFile(object):
         res += 'authentication level:i:0' + '\n'
         res += 'enablecredsspsupport:i:1' + '\n'
         res += 'prompt for credentials:i:0' + '\n'
-        res += 'negotiate security layer:i:1' + '\n'
+        res += 'negotiate security layer:i:1\n'
+        res += 'videoplaybackmode:i:1\n'
+        if self.smoothFonts is True:
+            res += 'allow font smoothing:i:1\n'
         if self.desktopComposition is True:
             res += 'allow desktop composition:i:1\n'
 

server/src/uds/transports/RDP/RDPTransport.py

@@ -44,7 +44,7 @@ logger = logging.getLogger(__name__)
 
 READY_CACHE_TIMEOUT = 30
 
-__updated__ = '2016-07-21'
+__updated__ = '2017-01-25'
 
 
 class RDPTransport(BaseRDPTransport):
@@ -68,6 +68,7 @@ class RDPTransport(BaseRDPTransport):
     wallpaper = BaseRDPTransport.wallpaper
     multimon = BaseRDPTransport.multimon
     aero = BaseRDPTransport.aero
+    smooth = BaseRDPTransport.smooth
     multimedia = BaseRDPTransport.multimedia
     alsa = BaseRDPTransport.alsa
 
@@ -93,6 +94,7 @@ class RDPTransport(BaseRDPTransport):
         r.showWallpaper = self.wallpaper.isTrue()
         r.multimon = self.multimon.isTrue()
         r.desktopComposition = self.aero.isTrue()
+        r.smoothFonts = self.smooth.isTrue()
         r.multimedia = self.multimedia.isTrue()
         r.alsa = self.alsa.isTrue()
 

server/src/uds/transports/RDP/TRDPTransport.py

@@ -48,7 +48,7 @@ import logging
 import random
 import string
 
-__updated__ = '2016-10-14'
+__updated__ = '2017-01-25'
 
 
 logger = logging.getLogger(__name__)
@@ -83,6 +83,7 @@ class TRDPTransport(BaseRDPTransport):
     wallpaper = BaseRDPTransport.wallpaper
     multimon = BaseRDPTransport.multimon
     aero = BaseRDPTransport.aero
+    smooth = BaseRDPTransport.smooth
     multimedia = BaseRDPTransport.multimedia
     alsa = BaseRDPTransport.alsa
 
@@ -120,6 +121,7 @@ class TRDPTransport(BaseRDPTransport):
         r.showWallpaper = self.wallpaper.isTrue()
         r.multimon = self.multimon.isTrue()
         r.desktopComposition = self.aero.isTrue()
+        r.smoothFonts = self.smooth.isTrue()
         r.multimedia = self.multimedia.isTrue()
         r.alsa = self.alsa.isTrue()