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
41d51203
Commit
41d51203
authored
Mar 03, 2014
by
Dan Pascu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed is_composing_icon to composing_icon
parent
d9de5ef9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
chatwindow.py
blink/chatwindow.py
+1
-1
sessions.py
blink/sessions.py
+4
-4
chat_session.ui
resources/chat_session.ui
+1
-1
chat_window.ui
resources/chat_window.ui
+1
-1
No files found.
blink/chatwindow.py
View file @
41d51203
...
@@ -789,7 +789,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
...
@@ -789,7 +789,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
self
.
icon_label
.
setPixmap
(
widget
.
icon_label
.
pixmap
())
self
.
icon_label
.
setPixmap
(
widget
.
icon_label
.
pixmap
())
self
.
state_label
.
state
=
widget
.
state_label
.
state
or
'offline'
self
.
state_label
.
state
=
widget
.
state_label
.
state
or
'offline'
self
.
hold_icon
.
setVisible
(
widget
.
hold_icon
.
isVisibleTo
(
widget
))
self
.
hold_icon
.
setVisible
(
widget
.
hold_icon
.
isVisibleTo
(
widget
))
self
.
is_composing_icon
.
setVisible
(
widget
.
is_
composing_icon
.
isVisibleTo
(
widget
))
self
.
composing_icon
.
setVisible
(
widget
.
composing_icon
.
isVisibleTo
(
widget
))
self
.
audio_icon
.
setVisible
(
widget
.
audio_icon
.
isVisibleTo
(
widget
))
self
.
audio_icon
.
setVisible
(
widget
.
audio_icon
.
isVisibleTo
(
widget
))
self
.
audio_icon
.
setEnabled
(
widget
.
audio_icon
.
isEnabledTo
(
widget
))
self
.
audio_icon
.
setEnabled
(
widget
.
audio_icon
.
isEnabledTo
(
widget
))
self
.
chat_icon
.
setVisible
(
widget
.
chat_icon
.
isVisibleTo
(
widget
))
self
.
chat_icon
.
setVisible
(
widget
.
chat_icon
.
isVisibleTo
(
widget
))
...
...
blink/sessions.py
View file @
41d51203
...
@@ -2441,7 +2441,7 @@ class ChatSessionWidget(base_class, ui_class):
...
@@ -2441,7 +2441,7 @@ class ChatSessionWidget(base_class, ui_class):
self
.
setBackgroundRole
(
QPalette
.
Window
)
self
.
setBackgroundRole
(
QPalette
.
Window
)
self
.
display_mode
=
self
.
StandardDisplayMode
self
.
display_mode
=
self
.
StandardDisplayMode
self
.
hold_icon
.
installEventFilter
(
self
)
self
.
hold_icon
.
installEventFilter
(
self
)
self
.
is_
composing_icon
.
installEventFilter
(
self
)
self
.
composing_icon
.
installEventFilter
(
self
)
self
.
audio_icon
.
installEventFilter
(
self
)
self
.
audio_icon
.
installEventFilter
(
self
)
self
.
chat_icon
.
installEventFilter
(
self
)
self
.
chat_icon
.
installEventFilter
(
self
)
self
.
video_icon
.
installEventFilter
(
self
)
self
.
video_icon
.
installEventFilter
(
self
)
...
@@ -2506,7 +2506,7 @@ class ChatSessionWidget(base_class, ui_class):
...
@@ -2506,7 +2506,7 @@ class ChatSessionWidget(base_class, ui_class):
self
.
icon_label
.
setPixmap
(
session
.
pixmap
)
self
.
icon_label
.
setPixmap
(
session
.
pixmap
)
self
.
state_label
.
state
=
session
.
state
self
.
state_label
.
state
=
session
.
state
self
.
hold_icon
.
setVisible
(
session
.
blink_session
.
on_hold
)
self
.
hold_icon
.
setVisible
(
session
.
blink_session
.
on_hold
)
self
.
is_
composing_icon
.
setVisible
(
session
.
remote_composing
)
self
.
composing_icon
.
setVisible
(
session
.
remote_composing
)
self
.
chat_icon
.
setVisible
(
'chat'
in
session
.
blink_session
.
streams
)
self
.
chat_icon
.
setVisible
(
'chat'
in
session
.
blink_session
.
streams
)
self
.
video_icon
.
setVisible
(
'video'
in
session
.
blink_session
.
streams
)
self
.
video_icon
.
setVisible
(
'video'
in
session
.
blink_session
.
streams
)
self
.
screen_sharing_icon
.
setVisible
(
'screen-sharing'
in
session
.
blink_session
.
streams
)
self
.
screen_sharing_icon
.
setVisible
(
'screen-sharing'
in
session
.
blink_session
.
streams
)
...
@@ -2566,7 +2566,7 @@ class ChatSessionItem(object):
...
@@ -2566,7 +2566,7 @@ class ChatSessionItem(object):
old_value
=
self
.
__dict__
.
get
(
'remote_composing'
,
False
)
old_value
=
self
.
__dict__
.
get
(
'remote_composing'
,
False
)
self
.
__dict__
[
'remote_composing'
]
=
value
self
.
__dict__
[
'remote_composing'
]
=
value
if
value
!=
old_value
and
self
.
widget
is
not
None
:
if
value
!=
old_value
and
self
.
widget
is
not
None
:
self
.
widget
.
is_
composing_icon
.
setVisible
(
value
)
self
.
widget
.
composing_icon
.
setVisible
(
value
)
notification_center
=
NotificationCenter
()
notification_center
=
NotificationCenter
()
notification_center
.
post_notification
(
'ChatSessionItemDidChange'
,
sender
=
self
)
notification_center
.
post_notification
(
'ChatSessionItemDidChange'
,
sender
=
self
)
...
@@ -3084,7 +3084,7 @@ class ConferenceParticipantWidget(ChatSessionWidget):
...
@@ -3084,7 +3084,7 @@ class ConferenceParticipantWidget(ChatSessionWidget):
self
.
icon_label
.
setPixmap
(
participant
.
pixmap
)
self
.
icon_label
.
setPixmap
(
participant
.
pixmap
)
self
.
state_label
.
state
=
participant
.
state
self
.
state_label
.
state
=
participant
.
state
self
.
hold_icon
.
setVisible
(
participant
.
on_hold
)
self
.
hold_icon
.
setVisible
(
participant
.
on_hold
)
self
.
is_
composing_icon
.
setVisible
(
participant
.
is_composing
)
self
.
composing_icon
.
setVisible
(
participant
.
is_composing
)
self
.
chat_icon
.
setVisible
(
'chat'
in
participant
.
active_media
)
self
.
chat_icon
.
setVisible
(
'chat'
in
participant
.
active_media
)
self
.
video_icon
.
setVisible
(
'video'
in
participant
.
active_media
)
self
.
video_icon
.
setVisible
(
'video'
in
participant
.
active_media
)
self
.
screen_sharing_icon
.
setVisible
(
'screen-sharing'
in
participant
.
active_media
)
self
.
screen_sharing_icon
.
setVisible
(
'screen-sharing'
in
participant
.
active_media
)
...
...
resources/chat_session.ui
View file @
41d51203
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
<number>
0
</number>
<number>
0
</number>
</property>
</property>
<item>
<item>
<widget
class=
"QLabel"
name=
"
is_
composing_icon"
>
<widget
class=
"QLabel"
name=
"composing_icon"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Fixed"
vsizetype=
"Fixed"
>
<sizepolicy
hsizetype=
"Fixed"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<horstretch>
0
</horstretch>
...
...
resources/chat_window.ui
View file @
41d51203
...
@@ -316,7 +316,7 @@ QWidget#session_widget_no:hover {
...
@@ -316,7 +316,7 @@ QWidget#session_widget_no:hover {
<number>
0
</number>
<number>
0
</number>
</property>
</property>
<item>
<item>
<widget
class=
"QLabel"
name=
"
is_
composing_icon"
>
<widget
class=
"QLabel"
name=
"composing_icon"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Fixed"
vsizetype=
"Fixed"
>
<sizepolicy
hsizetype=
"Fixed"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<horstretch>
0
</horstretch>
...
...
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