Commit c61e42a0 authored by Adrian Georgescu's avatar Adrian Georgescu

Screen sharing fixes

parent 07c1b55b
...@@ -164,7 +164,7 @@ cdef class RFBClient: ...@@ -164,7 +164,7 @@ cdef class RFBClient:
try: try:
with nogil: with nogil:
self.client = rfbGetClient(8, 3, 4) # 24 bit color depth in 32 bits per pixel. Will change color depth and bpp later if needed. self.client = rfbGetClient(8, 3, 4) # 24 bit color depth in 32 bits per pixel. Will change color depth and bpp later if needed.
server_host = strdup(parent.host) server_host = strdup(<bytes>parent.host.encode('utf8'))
client_data = <rfbClientData*> calloc(1, sizeof(rfbClientData)) client_data = <rfbClientData*> calloc(1, sizeof(rfbClientData))
if not server_host or not client_data or not self.client: if not server_host or not client_data or not self.client:
raise MemoryError("could not allocate RFB client") raise MemoryError("could not allocate RFB client")
...@@ -246,7 +246,7 @@ cdef class RFBClient: ...@@ -246,7 +246,7 @@ cdef class RFBClient:
self.client.format.blueMax = 0xff self.client.format.blueMax = 0xff
self.client.appData.requestedDepth = self.client.format.depth self.client.appData.requestedDepth = self.client.format.depth
self.client.appData.enableJPEG = bool(self.client.format.bitsPerPixel != 8) self.client.appData.enableJPEG = bool(self.client.format.bitsPerPixel != 8)
self.client.appData.encodingsString = self.parent.settings.encodings self.client.appData.encodingsString = strdup(<bytes>self.parent.settings.encodings.encode('utf-8'))
self.client.appData.compressLevel = self.parent.settings.compression self.client.appData.compressLevel = self.parent.settings.compression
self.client.appData.qualityLevel = self.parent.settings.quality self.client.appData.qualityLevel = self.parent.settings.quality
if self.connected: if self.connected:
......
...@@ -438,7 +438,7 @@ class ScreensharingToolbox(base_class, ui_class): ...@@ -438,7 +438,7 @@ class ScreensharingToolbox(base_class, ui_class):
with Resources.directory: with Resources.directory:
self.setupUi() self.setupUi()
parent.installEventFilter(self) parent.installEventFilter(self)
self.animation = QPropertyAnimation(self, 'pos') self.animation = QPropertyAnimation(self, b'pos')
self.animation.setDuration(250) self.animation.setDuration(250)
self.animation.setDirection(QPropertyAnimation.Forward) self.animation.setDirection(QPropertyAnimation.Forward)
self.animation.setEasingCurve(QEasingCurve.Linear) # or OutCirc with 300ms self.animation.setEasingCurve(QEasingCurve.Linear) # or OutCirc with 300ms
......
...@@ -5268,7 +5268,7 @@ class IncomingRequest(QObject): ...@@ -5268,7 +5268,7 @@ class IncomingRequest(QObject):
self.dialog.screensharing_stream.setVisible(self.screensharing_stream is not None) self.dialog.screensharing_stream.setVisible(self.screensharing_stream is not None)
if self.screensharing_stream is not None: if self.screensharing_stream is not None:
if self.screensharing_stream.handler.type == 'active': if self.screensharing_stream.handler.type == 'active':
self.dialog.screensharing_label.setText('is offering to share his screen') self.dialog.screensharing_label.setText('is offering screen sharing')
else: else:
self.dialog.screensharing_label.setText('is asking to share your screen') self.dialog.screensharing_label.setText('is asking to share your screen')
# self.dialog.screensharing_stream.accepted = bool(proposal) # self.dialog.screensharing_stream.accepted = bool(proposal)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment