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
d21c6bfe
Commit
d21c6bfe
authored
Feb 22, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Main/MainWindow): display correctly auto answer status
parent
f514b2d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
SettingsModel.cpp
linphone-desktop/src/components/settings/SettingsModel.cpp
+5
-3
MainWindow.qml
linphone-desktop/ui/views/App/Main/MainWindow.qml
+1
-0
No files found.
linphone-desktop/src/components/settings/SettingsModel.cpp
View file @
d21c6bfe
...
...
@@ -32,12 +32,12 @@ using namespace std;
const
string
SettingsModel
::
UI_SECTION
(
"ui"
);
SettingsModel
::
SettingsModel
(
QObject
*
parent
)
:
QObject
(
parent
)
{
// TODO: Uncomment when `getConfig` will be available.
// m_config = CoreManager::getInstance()->getCore()->getConfig();
m_config
=
CoreManager
::
getInstance
()
->
getCore
()
->
getConfig
();
}
// -----------------------------------------------------------------------------
bool
SettingsModel
::
getAutoAnswerStatus
()
const
{
return
true
;
// TODO: See above.
return
!!
m_config
->
getInt
(
UI_SECTION
,
"auto_answer"
,
0
);
}
...
...
@@ -46,6 +46,8 @@ void SettingsModel::setAutoAnswerStatus (bool status) {
emit
autoAnswerStatusChanged
(
status
);
}
// -----------------------------------------------------------------------------
QString
SettingsModel
::
getFileTransferUrl
()
const
{
return
::
Utils
::
linphoneStringToQString
(
CoreManager
::
getInstance
()
->
getCore
()
->
getFileTransferServer
()
...
...
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file @
d21c6bfe
...
...
@@ -183,6 +183,7 @@ Controls1.ApplicationWindow {
color
:
MainWindowStyle
.
autoAnswerStatus
.
text
.
color
font.pointSize
:
MainWindowStyle
.
autoAnswerStatus
.
text
.
fontSize
text
:
qsTr
(
'
autoAnswerStatus
'
)
visible
:
SettingsModel
.
autoAnswerStatus
width
:
parent
.
width
}
}
...
...
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