Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-windows
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-windows
Commits
d8528fa2
Commit
d8528fa2
authored
Jul 7, 2015
by
Edric Milaret
Browse files
Options
Downloads
Patches
Plain Diff
call: add cancel button for dialing call
Refs #76414 Change-Id: I5d9c160f64c93205be275ad09a3e08b055de0380
parent
4f63084e
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
callwidget.cpp
+9
-3
9 additions, 3 deletions
callwidget.cpp
callwidget.h
+2
-0
2 additions, 0 deletions
callwidget.h
callwidget.ui
+26
-7
26 additions, 7 deletions
callwidget.ui
with
37 additions
and
10 deletions
callwidget.cpp
+
9
−
3
View file @
d8528fa2
...
@@ -49,7 +49,7 @@ CallWidget::CallWidget(QWidget *parent) :
...
@@ -49,7 +49,7 @@ CallWidget::CallWidget(QWidget *parent) :
connect
(
ui
->
videoWidget
,
SIGNAL
(
setChatVisibility
(
bool
)),
connect
(
ui
->
videoWidget
,
SIGNAL
(
setChatVisibility
(
bool
)),
ui
->
instantMessagingWidget
,
SLOT
(
setVisible
(
bool
)));
ui
->
instantMessagingWidget
,
SLOT
(
setVisible
(
bool
)));
ui
->
spinner
Label
->
hide
();
ui
->
spinner
Widget
->
hide
();
spinner_
=
new
QMovie
(
":/images/spinner.gif"
);
spinner_
=
new
QMovie
(
":/images/spinner.gif"
);
if
(
spinner_
->
isValid
())
{
if
(
spinner_
->
isValid
())
{
ui
->
spinnerLabel
->
setMovie
(
spinner_
);
ui
->
spinnerLabel
->
setMovie
(
spinner_
);
...
@@ -262,7 +262,7 @@ CallWidget::callStateChanged(Call* call, Call::State previousState)
...
@@ -262,7 +262,7 @@ CallWidget::callStateChanged(Call* call, Call::State previousState)
ui
->
videoWidget
->
hide
();
ui
->
videoWidget
->
hide
();
displaySpinner
(
false
);
displaySpinner
(
false
);
auto
onHoldCall
=
callModel_
->
getActiveCalls
().
first
();
auto
onHoldCall
=
callModel_
->
getActiveCalls
().
first
();
if
(
onHoldCall
!=
nullptr
)
{
if
(
onHoldCall
!=
nullptr
&&
onHoldCall
->
state
()
==
Call
::
State
::
HOLD
)
{
setActualCall
(
onHoldCall
);
setActualCall
(
onHoldCall
);
onHoldCall
->
performAction
(
Call
::
Action
::
HOLD
);
onHoldCall
->
performAction
(
Call
::
Action
::
HOLD
);
}
}
...
@@ -349,7 +349,13 @@ CallWidget::on_sortComboBox_currentIndexChanged(int index)
...
@@ -349,7 +349,13 @@ CallWidget::on_sortComboBox_currentIndexChanged(int index)
void
void
CallWidget
::
displaySpinner
(
bool
display
)
CallWidget
::
displaySpinner
(
bool
display
)
{
{
display
?
ui
->
spinner
Label
->
show
()
:
ui
->
spinner
Label
->
hide
();
display
?
ui
->
spinner
Widget
->
show
()
:
ui
->
spinner
Widget
->
hide
();
if
(
ui
->
spinnerLabel
->
movie
())
if
(
ui
->
spinnerLabel
->
movie
())
display
?
ui
->
spinnerLabel
->
movie
()
->
start
()
:
ui
->
spinnerLabel
->
movie
()
->
stop
();
display
?
ui
->
spinnerLabel
->
movie
()
->
start
()
:
ui
->
spinnerLabel
->
movie
()
->
stop
();
}
}
void
CallWidget
::
on_cancelButton_clicked
()
{
if
(
actualCall_
)
actualCall_
->
performAction
(
Call
::
Action
::
REFUSE
);
}
This diff is collapsed.
Click to expand it.
callwidget.h
+
2
−
0
View file @
d8528fa2
...
@@ -66,6 +66,8 @@ private slots:
...
@@ -66,6 +66,8 @@ private slots:
void
findRingAccount
(
QModelIndex
idx1
,
QModelIndex
idx2
,
QVector
<
int
>
vec
);
void
findRingAccount
(
QModelIndex
idx1
,
QModelIndex
idx2
,
QVector
<
int
>
vec
);
void
checkRegistrationState
(
Account
*
account
,
Account
::
RegistrationState
state
);
void
checkRegistrationState
(
Account
*
account
,
Account
::
RegistrationState
state
);
void
on_cancelButton_clicked
();
private:
private:
Ui
::
CallWidget
*
ui
;
Ui
::
CallWidget
*
ui
;
Call
*
actualCall_
;
Call
*
actualCall_
;
...
...
This diff is collapsed.
Click to expand it.
callwidget.ui
+
26
−
7
View file @
d8528fa2
...
@@ -50,6 +50,9 @@
...
@@ -50,6 +50,9 @@
<item>
<item>
<widget
class=
"VideoView"
name=
"videoWidget"
native=
"true"
/>
<widget
class=
"VideoView"
name=
"videoWidget"
native=
"true"
/>
</item>
</item>
<item>
<widget
class=
"QWidget"
name=
"spinnerWidget"
native=
"true"
>
<layout
class=
"QVBoxLayout"
name=
"spinnerLayout"
>
<item>
<item>
<widget
class=
"QLabel"
name=
"spinnerLabel"
>
<widget
class=
"QLabel"
name=
"spinnerLabel"
>
<property
name=
"text"
>
<property
name=
"text"
>
...
@@ -60,6 +63,22 @@
...
@@ -60,6 +63,22 @@
</property>
</property>
</widget>
</widget>
</item>
</item>
<item
alignment=
"Qt::AlignHCenter"
>
<widget
class=
"QPushButton"
name=
"cancelButton"
>
<property
name=
"maximumSize"
>
<size>
<width>
100
</width>
<height>
16777215
</height>
</size>
</property>
<property
name=
"text"
>
<string>
Cancel
</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item
alignment=
"Qt::AlignHCenter|Qt::AlignVCenter"
>
<item
alignment=
"Qt::AlignHCenter|Qt::AlignVCenter"
>
<widget
class=
"QWidget"
name=
"callInvite"
native=
"true"
>
<widget
class=
"QWidget"
name=
"callInvite"
native=
"true"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_4"
>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_4"
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment