Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-windows
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
savoirfairelinux
jami-client-windows
Commits
68779c43
Commit
68779c43
authored
Jul 09, 2015
by
Edric Milaret
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ring: set displayName for Ring account
Refs #77362 Change-Id: I87497043225d1c4f9fde3c6afe92ddc24bc19c5e
parent
1eca0290
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
callwidget.cpp
callwidget.cpp
+6
-3
wizarddialog.cpp
wizarddialog.cpp
+1
-0
No files found.
callwidget.cpp
View file @
68779c43
...
...
@@ -138,7 +138,7 @@ CallWidget::findRingAccount(QModelIndex idx1, QModelIndex idx2, QVector<int> vec
if
((
Account
::
Protocol
)
protocol
.
toUInt
()
==
Account
::
Protocol
::
RING
)
{
auto
username
=
idx
.
data
(
static_cast
<
int
>
(
Account
::
Role
::
Username
));
ui
->
ringIdLabel
->
setText
(
"Your Ring ID: "
+
username
.
toString
());
"Your Ring ID: "
+
username
.
toString
());
found
=
true
;
return
;
}
...
...
@@ -203,9 +203,12 @@ CallWidget::findRingAccount()
auto
idx
=
AccountModel
::
instance
()
->
index
(
i
,
0
);
auto
protocol
=
idx
.
data
(
static_cast
<
int
>
(
Account
::
Role
::
Proto
));
if
((
Account
::
Protocol
)
protocol
.
toUInt
()
==
Account
::
Protocol
::
RING
)
{
auto
username
=
idx
.
data
(
static_cast
<
int
>
(
Account
::
Role
::
Username
));
auto
account
=
AccountModel
::
instance
()
->
getAccountByModelIndex
(
idx
);
if
(
account
->
displayName
().
isEmpty
())
account
->
displayName
()
=
account
->
alias
();
auto
username
=
account
->
username
();
ui
->
ringIdLabel
->
setText
(
ui
->
ringIdLabel
->
text
()
+
" "
+
username
.
toString
()
);
"Your Ring ID: "
+
username
);
found
=
true
;
return
;
}
...
...
wizarddialog.cpp
View file @
68779c43
...
...
@@ -67,6 +67,7 @@ WizardDialog::accept()
Utils
::
CreateStartupLink
();
auto
account
=
AccountModel
::
instance
()
->
add
(
ui
->
usernameEdit
->
text
(),
Account
::
Protocol
::
RING
);
account
->
setDisplayName
(
ui
->
usernameEdit
->
text
());
AccountModel
::
instance
()
->
ip2ip
()
->
setRingtonePath
(
Utils
::
GetRingtonePath
());
account
->
setRingtonePath
(
Utils
::
GetRingtonePath
());
account
->
setUpnpEnabled
(
true
);
...
...
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