Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vmj-qt
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
vmj-qt
Commits
ee92e294
Commit
ee92e294
authored
Oct 14, 2016
by
Dan Pascu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjusted ZRTP and OTR widgets to better fit text with Qt5 themes
parent
2a4b6f3f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
chatwindow.py
blink/chatwindow.py
+2
-2
sessions.py
blink/sessions.py
+1
-1
otr_widget.ui
resources/otr_widget.ui
+1
-1
zrtp_widget.ui
resources/zrtp_widget.ui
+1
-1
No files found.
blink/chatwindow.py
View file @
ee92e294
...
@@ -2520,7 +2520,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
...
@@ -2520,7 +2520,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
self
.
otr_widget
.
peer_fingerprint
=
stream_info
.
otr_peer_fingerprint
self
.
otr_widget
.
peer_fingerprint
=
stream_info
.
otr_peer_fingerprint
self
.
otr_widget
.
my_fingerprint
=
stream_info
.
otr_key_fingerprint
self
.
otr_widget
.
my_fingerprint
=
stream_info
.
otr_key_fingerprint
self
.
otr_widget
.
smp_status
=
stream_info
.
smp_status
self
.
otr_widget
.
smp_status
=
stream_info
.
smp_status
self
.
otr_widget
.
setGeometry
(
QRect
(
0
,
encryption_label
.
rect
()
.
translated
(
encryption_label
.
mapTo
(
self
.
info_panel
,
QPoint
(
0
,
0
)))
.
bottom
()
+
3
,
self
.
info_panel
.
width
(),
3
0
0
))
self
.
otr_widget
.
setGeometry
(
QRect
(
0
,
encryption_label
.
rect
()
.
translated
(
encryption_label
.
mapTo
(
self
.
info_panel
,
QPoint
(
0
,
0
)))
.
bottom
()
+
3
,
self
.
info_panel
.
width
(),
3
2
0
))
self
.
otr_widget
.
verification_stack
.
setCurrentWidget
(
self
.
otr_widget
.
smp_panel
)
self
.
otr_widget
.
verification_stack
.
setCurrentWidget
(
self
.
otr_widget
.
smp_panel
)
self
.
otr_widget
.
show
()
self
.
otr_widget
.
show
()
self
.
otr_widget
.
peer_name_value
.
setFocus
(
Qt
.
OtherFocusReason
)
self
.
otr_widget
.
peer_name_value
.
setFocus
(
Qt
.
OtherFocusReason
)
...
@@ -2538,7 +2538,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
...
@@ -2538,7 +2538,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
self
.
zrtp_widget
.
peer_verified
=
stream_info
.
zrtp_verified
self
.
zrtp_widget
.
peer_verified
=
stream_info
.
zrtp_verified
self
.
zrtp_widget
.
sas
=
stream_info
.
zrtp_sas
self
.
zrtp_widget
.
sas
=
stream_info
.
zrtp_sas
self
.
zrtp_widget
.
stream_type
=
encryption_label
.
stream_type
self
.
zrtp_widget
.
stream_type
=
encryption_label
.
stream_type
self
.
zrtp_widget
.
setGeometry
(
QRect
(
0
,
encryption_label
.
rect
()
.
translated
(
encryption_label
.
mapTo
(
self
.
info_panel
,
QPoint
(
0
,
0
)))
.
bottom
()
+
3
,
self
.
info_panel
.
width
(),
3
0
0
))
self
.
zrtp_widget
.
setGeometry
(
QRect
(
0
,
encryption_label
.
rect
()
.
translated
(
encryption_label
.
mapTo
(
self
.
info_panel
,
QPoint
(
0
,
0
)))
.
bottom
()
+
3
,
self
.
info_panel
.
width
(),
3
2
0
))
self
.
zrtp_widget
.
show
()
self
.
zrtp_widget
.
show
()
self
.
zrtp_widget
.
peer_name_value
.
setFocus
(
Qt
.
OtherFocusReason
)
self
.
zrtp_widget
.
peer_name_value
.
setFocus
(
Qt
.
OtherFocusReason
)
...
...
blink/sessions.py
View file @
ee92e294
...
@@ -1651,7 +1651,7 @@ class AudioSessionWidget(base_class, ui_class):
...
@@ -1651,7 +1651,7 @@ class AudioSessionWidget(base_class, ui_class):
session
=
self
.
session
session
=
self
.
session
stream_info
=
session
.
blink_session
.
info
.
streams
.
audio
stream_info
=
session
.
blink_session
.
info
.
streams
.
audio
if
session
.
audio_stream
is
not
None
and
not
session
.
audio_stream
.
_done
and
stream_info
.
encryption
==
'ZRTP'
:
if
session
.
audio_stream
is
not
None
and
not
session
.
audio_stream
.
_done
and
stream_info
.
encryption
==
'ZRTP'
:
rect
=
QRect
(
0
,
0
,
230
,
3
0
0
)
rect
=
QRect
(
0
,
0
,
230
,
3
2
0
)
rect
.
moveTopRight
(
self
.
srtp_label
.
mapToGlobal
(
self
.
srtp_label
.
rect
()
.
bottomRight
()))
rect
.
moveTopRight
(
self
.
srtp_label
.
mapToGlobal
(
self
.
srtp_label
.
rect
()
.
bottomRight
()))
rect
.
translate
(
0
,
3
)
rect
.
translate
(
0
,
3
)
screen_area
=
QApplication
.
desktop
()
.
screenGeometry
(
self
.
srtp_label
)
screen_area
=
QApplication
.
desktop
()
.
screenGeometry
(
self
.
srtp_label
)
...
...
resources/otr_widget.ui
View file @
ee92e294
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<x>
0
</x>
<x>
0
</x>
<y>
0
</y>
<y>
0
</y>
<width>
220
</width>
<width>
220
</width>
<height>
3
0
0
</height>
<height>
3
2
0
</height>
</rect>
</rect>
</property>
</property>
<property
name=
"palette"
>
<property
name=
"palette"
>
...
...
resources/zrtp_widget.ui
View file @
ee92e294
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
<x>
0
</x>
<x>
0
</x>
<y>
0
</y>
<y>
0
</y>
<width>
220
</width>
<width>
220
</width>
<height>
3
0
0
</height>
<height>
3
2
0
</height>
</rect>
</rect>
</property>
</property>
<property
name=
"palette"
>
<property
name=
"palette"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment