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
cdb13553
Commit
cdb13553
authored
Feb 20, 2014
by
Dan Pascu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed conference attribute on sessions to client_conference
parent
e4a7cdfd
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
112 additions
and
112 deletions
+112
-112
chatwindow.py
blink/chatwindow.py
+1
-1
mainwindow.py
blink/mainwindow.py
+6
-6
sessions.py
blink/sessions.py
+105
-105
No files found.
blink/chatwindow.py
View file @
cdb13553
...
@@ -1290,7 +1290,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
...
@@ -1290,7 +1290,7 @@ class ChatWindow(base_class, ui_class, ColorHelperMixin):
print
"state:
%
r"
%
blink_session
.
state
print
"state:
%
r"
%
blink_session
.
state
print
"streams:
%
r"
%
[
stream
for
stream
in
blink_session
.
streams
]
print
"streams:
%
r"
%
[
stream
for
stream
in
blink_session
.
streams
]
print
"hold:
%
r/
%
r"
%
(
blink_session
.
local_hold
,
blink_session
.
remote_hold
)
print
"hold:
%
r/
%
r"
%
(
blink_session
.
local_hold
,
blink_session
.
remote_hold
)
print
"conf:
%
r"
%
blink_session
.
conference
print
"conf:
%
r"
%
blink_session
.
c
lient_c
onference
print
"active:
%
r"
%
blink_session
.
active
print
"active:
%
r"
%
blink_session
.
active
def
_EH_CloseSession
(
self
):
def
_EH_CloseSession
(
self
):
...
...
blink/mainwindow.py
View file @
cdb13553
...
@@ -475,7 +475,7 @@ class MainWindow(base_class, ui_class):
...
@@ -475,7 +475,7 @@ class MainWindow(base_class, ui_class):
def
_SH_BreakConference
(
self
):
def
_SH_BreakConference
(
self
):
active_session
=
self
.
session_list
.
selectionModel
()
.
selectedIndexes
()[
0
]
.
data
(
Qt
.
UserRole
)
active_session
=
self
.
session_list
.
selectionModel
()
.
selectedIndexes
()[
0
]
.
data
(
Qt
.
UserRole
)
self
.
session_model
.
breakConference
(
active_session
.
conference
)
self
.
session_model
.
breakConference
(
active_session
.
c
lient_c
onference
)
def
_SH_ContactListSelectionChanged
(
self
,
selected
,
deselected
):
def
_SH_ContactListSelectionChanged
(
self
,
selected
,
deselected
):
account_manager
=
AccountManager
()
account_manager
=
AccountManager
()
...
@@ -530,7 +530,7 @@ class MainWindow(base_class, ui_class):
...
@@ -530,7 +530,7 @@ class MainWindow(base_class, ui_class):
self
.
saved_account_state
=
None
self
.
saved_account_state
=
None
def
_SH_MakeConference
(
self
):
def
_SH_MakeConference
(
self
):
self
.
session_model
.
conferenceSessions
([
session
for
session
in
self
.
session_model
.
active_sessions
if
session
.
conference
is
None
])
self
.
session_model
.
conferenceSessions
([
session
for
session
in
self
.
session_model
.
active_sessions
if
session
.
c
lient_c
onference
is
None
])
def
_SH_MuteButtonClicked
(
self
,
muted
):
def
_SH_MuteButtonClicked
(
self
,
muted
):
settings
=
SIPSimpleSettings
()
settings
=
SIPSimpleSettings
()
...
@@ -577,11 +577,11 @@ class MainWindow(base_class, ui_class):
...
@@ -577,11 +577,11 @@ class MainWindow(base_class, ui_class):
def
_SH_SessionListSelectionChanged
(
self
,
selected
,
deselected
):
def
_SH_SessionListSelectionChanged
(
self
,
selected
,
deselected
):
selected_indexes
=
selected
.
indexes
()
selected_indexes
=
selected
.
indexes
()
active_session
=
selected_indexes
[
0
]
.
data
(
Qt
.
UserRole
)
if
selected_indexes
else
Null
active_session
=
selected_indexes
[
0
]
.
data
(
Qt
.
UserRole
)
if
selected_indexes
else
Null
if
active_session
.
conference
:
if
active_session
.
c
lient_c
onference
:
self
.
conference_button
.
setEnabled
(
True
)
self
.
conference_button
.
setEnabled
(
True
)
self
.
conference_button
.
setChecked
(
True
)
self
.
conference_button
.
setChecked
(
True
)
else
:
else
:
self
.
conference_button
.
setEnabled
(
len
([
session
for
session
in
self
.
session_model
.
active_sessions
if
session
.
conference
is
None
])
>
1
)
self
.
conference_button
.
setEnabled
(
len
([
session
for
session
in
self
.
session_model
.
active_sessions
if
session
.
c
lient_c
onference
is
None
])
>
1
)
self
.
conference_button
.
setChecked
(
False
)
self
.
conference_button
.
setChecked
(
False
)
def
_SH_AudioSessionModelAddedSession
(
self
,
session_item
):
def
_SH_AudioSessionModelAddedSession
(
self
,
session_item
):
...
@@ -599,11 +599,11 @@ class MainWindow(base_class, ui_class):
...
@@ -599,11 +599,11 @@ class MainWindow(base_class, ui_class):
self
.
hangup_all_button
.
setEnabled
(
any
(
active_sessions
))
self
.
hangup_all_button
.
setEnabled
(
any
(
active_sessions
))
selected_indexes
=
self
.
session_list
.
selectionModel
()
.
selectedIndexes
()
selected_indexes
=
self
.
session_list
.
selectionModel
()
.
selectedIndexes
()
active_session
=
selected_indexes
[
0
]
.
data
(
Qt
.
UserRole
)
if
selected_indexes
else
Null
active_session
=
selected_indexes
[
0
]
.
data
(
Qt
.
UserRole
)
if
selected_indexes
else
Null
if
active_session
.
conference
:
if
active_session
.
c
lient_c
onference
:
self
.
conference_button
.
setEnabled
(
True
)
self
.
conference_button
.
setEnabled
(
True
)
self
.
conference_button
.
setChecked
(
True
)
self
.
conference_button
.
setChecked
(
True
)
else
:
else
:
self
.
conference_button
.
setEnabled
(
len
([
session
for
session
in
active_sessions
if
session
.
conference
is
None
])
>
1
)
self
.
conference_button
.
setEnabled
(
len
([
session
for
session
in
active_sessions
if
session
.
c
lient_c
onference
is
None
])
>
1
)
self
.
conference_button
.
setChecked
(
False
)
self
.
conference_button
.
setChecked
(
False
)
if
active_sessions
:
if
active_sessions
:
if
self
.
account_state
.
state
is
not
AccountState
.
Invisible
:
if
self
.
account_state
.
state
is
not
AccountState
.
Invisible
:
...
...
blink/sessions.py
View file @
cdb13553
This diff is collapsed.
Click to expand it.
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