Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
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
Administrator
linphone-desktop
Commits
23f0c854
Commit
23f0c854
authored
Dec 15, 2016
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/components/contact/ContactModel): chain `vcardUpdated` signal to `contactUpdated`
parent
e61c6cd8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
ContactModel.cpp
tests/src/components/contact/ContactModel.cpp
+3
-1
ContactModel.hpp
tests/src/components/contact/ContactModel.hpp
+1
-0
ContactEdit.qml
tests/ui/views/App/MainWindow/ContactEdit.qml
+4
-0
No files found.
tests/src/components/contact/ContactModel.cpp
View file @
23f0c854
...
@@ -11,11 +11,12 @@ using namespace std;
...
@@ -11,11 +11,12 @@ using namespace std;
const
char
*
ContactModel
::
NAME
=
"contact-model"
;
const
char
*
ContactModel
::
NAME
=
"contact-model"
;
ContactModel
::
ContactModel
(
shared_ptr
<
linphone
::
Friend
>
linphone_friend
)
{
ContactModel
::
ContactModel
(
shared_ptr
<
linphone
::
Friend
>
linphone_friend
)
{
linphone_friend
->
setData
(
NAME
,
*
this
);
m_linphone_friend
=
linphone_friend
;
m_linphone_friend
=
linphone_friend
;
m_linphone_friend
->
setData
(
NAME
,
*
this
);
m_vcard
=
make_shared
<
VcardModel
>
(
linphone_friend
->
getVcard
());
m_vcard
=
make_shared
<
VcardModel
>
(
linphone_friend
->
getVcard
());
App
::
getInstance
()
->
getEngine
()
->
setObjectOwnership
(
m_vcard
.
get
(),
QQmlEngine
::
CppOwnership
);
App
::
getInstance
()
->
getEngine
()
->
setObjectOwnership
(
m_vcard
.
get
(),
QQmlEngine
::
CppOwnership
);
QObject
::
connect
(
m_vcard
.
get
(),
&
VcardModel
::
vcardUpdated
,
this
,
&
ContactModel
::
contactUpdated
);
}
}
ContactModel
::
ContactModel
(
VcardModel
*
vcard
)
{
ContactModel
::
ContactModel
(
VcardModel
*
vcard
)
{
...
@@ -28,6 +29,7 @@ ContactModel::ContactModel (VcardModel *vcard) {
...
@@ -28,6 +29,7 @@ ContactModel::ContactModel (VcardModel *vcard) {
m_vcard
.
reset
(
vcard
);
m_vcard
.
reset
(
vcard
);
engine
->
setObjectOwnership
(
vcard
,
QQmlEngine
::
CppOwnership
);
engine
->
setObjectOwnership
(
vcard
,
QQmlEngine
::
CppOwnership
);
QObject
::
connect
(
vcard
,
&
VcardModel
::
vcardUpdated
,
this
,
&
ContactModel
::
contactUpdated
);
}
}
Presence
::
PresenceStatus
ContactModel
::
getPresenceStatus
()
const
{
Presence
::
PresenceStatus
ContactModel
::
getPresenceStatus
()
const
{
...
...
tests/src/components/contact/ContactModel.hpp
View file @
23f0c854
...
@@ -23,6 +23,7 @@ class ContactModel : public QObject {
...
@@ -23,6 +23,7 @@ class ContactModel : public QObject {
public:
public:
ContactModel
(
std
::
shared_ptr
<
linphone
::
Friend
>
linphone_friend
);
ContactModel
(
std
::
shared_ptr
<
linphone
::
Friend
>
linphone_friend
);
ContactModel
(
VcardModel
*
vcard
);
ContactModel
(
VcardModel
*
vcard
);
~
ContactModel
()
=
default
;
static
const
char
*
NAME
;
static
const
char
*
NAME
;
...
...
tests/ui/views/App/MainWindow/ContactEdit.qml
View file @
23f0c854
...
@@ -323,6 +323,10 @@ ColumnLayout {
...
@@ -323,6 +323,10 @@ ColumnLayout {
color
:
ContactEditStyle
.
values
.
separator
.
color
color
:
ContactEditStyle
.
values
.
separator
.
color
}
}
// -----------------------------------------------------------------------
// Edition buttons.
// -----------------------------------------------------------------------
Row
{
Row
{
Layout.alignment
:
Qt
.
AlignHCenter
Layout.alignment
:
Qt
.
AlignHCenter
Layout.topMargin
:
ContactEditStyle
.
buttons
.
topMargin
Layout.topMargin
:
ContactEditStyle
.
buttons
.
topMargin
...
...
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