Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-windows
Commits
00febbae
Commit
00febbae
authored
Jan 06, 2019
by
Andreas Traczyk
Browse files
settings: handle updates to set file paths better
Change-Id: Ie23ce8ace0354dff5e36ed240ef2bb6983a4f615
parent
79d66b84
Changes
1
Hide whitespace changes
Inline
Side-by-side
advancedsettingswidget.cpp
View file @
00febbae
...
...
@@ -76,13 +76,12 @@ AdvancedSettingsWidget::AdvancedSettingsWidget(QWidget* parent)
connect
(
ui
->
videoDownPushButton
,
&
QPushButton
::
clicked
,
this
,
&
AdvancedSettingsWidget
::
decreaseVideoCodecPriority
);
connect
(
ui
->
videoUpPushButton
,
&
QPushButton
::
clicked
,
this
,
&
AdvancedSettingsWidget
::
increaseVideoCodecPriority
);
///////////////////////////////////////////////////////////////////////////////
ui
->
btnRingtone
->
setEnabled
(
LRCInstance
::
getCurrAccConfig
().
Ringtone
.
ringtoneEnabled
);
ui
->
btnRingtone
->
setText
(
QFileInfo
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
Ringtone
.
ringtonePath
)).
fileName
());
ui
->
lineEditProxy
->
setEnabled
(
LRCInstance
::
getCurrAccConfig
().
proxyEnabled
);
ui
->
lineEditSTUNAddress
->
setEnabled
(
LRCInstance
::
getCurrAccConfig
().
STUN
.
enable
);
}
AdvancedSettingsWidget
::~
AdvancedSettingsWidget
()
...
...
@@ -108,9 +107,9 @@ AdvancedSettingsWidget::updateAdvancedSettings()
ui
->
lineEditBootstrap
->
setText
(
QString
::
fromStdString
(
config
.
hostname
));
// Security
ui
->
btnCACert
->
setText
(
QString
::
fromStdString
(
c
onfig
.
TLS
.
certificateListFile
));
ui
->
btnUserCert
->
setText
(
QString
::
fromStdString
(
c
onfig
.
TLS
.
certificateFile
));
ui
->
btnPrivateKey
->
setText
(
QString
::
fromStdString
(
c
onfig
.
TLS
.
privateKeyFile
));
ui
->
btnCACert
->
setText
(
QFileInfo
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccC
onfig
()
.
TLS
.
certificateListFile
))
.
fileName
())
;
ui
->
btnUserCert
->
setText
(
QFileInfo
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccC
onfig
()
.
TLS
.
certificateFile
))
.
fileName
())
;
ui
->
btnPrivateKey
->
setText
(
QFileInfo
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccC
onfig
()
.
TLS
.
privateKeyFile
))
.
fileName
())
;
// Connectivity
ui
->
checkBoxUPnP
->
setChecked
(
config
.
upnpEnabled
);
...
...
@@ -159,8 +158,7 @@ AdvancedSettingsWidget::openFileCustomRingtone()
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
confProps
.
Ringtone
.
ringtonePath
=
fileUrl
.
toStdString
();
LRCInstance
::
editableAccountModel
()
->
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
ui
->
btnRingtone
->
setText
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
Ringtone
.
ringtonePath
));
ui
->
btnRingtone
->
setText
(
QFileInfo
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
Ringtone
.
ringtonePath
)).
fileName
());
}
else
{
ui
->
btnRingtone
->
setText
(
tr
(
"Add a custom ringtone"
));
}
...
...
@@ -267,7 +265,7 @@ AdvancedSettingsWidget::openFileCACert()
confProps
.
TLS
.
certificateListFile
=
fileUrl
.
toStdString
();
LRCInstance
::
editableAccountModel
()
->
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
ui
->
btnCACert
->
setText
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
TLS
.
certificateListFile
));
ui
->
btnCACert
->
setText
(
QFileInfo
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
TLS
.
certificateListFile
))
.
fileName
())
;
}
void
...
...
@@ -281,7 +279,7 @@ AdvancedSettingsWidget::openFileUserCert()
confProps
.
TLS
.
certificateFile
=
fileUrl
.
toStdString
();
LRCInstance
::
editableAccountModel
()
->
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
ui
->
btnUserCert
->
setText
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
TLS
.
certificateFile
));
ui
->
btnUserCert
->
setText
(
QFileInfo
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
TLS
.
certificateFile
))
.
fileName
())
;
}
void
...
...
@@ -295,7 +293,7 @@ AdvancedSettingsWidget::openFilePrivateKey()
confProps
.
TLS
.
privateKeyFile
=
fileUrl
.
toStdString
();
LRCInstance
::
editableAccountModel
()
->
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
ui
->
btnPrivateKey
->
setText
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
TLS
.
privateKeyFile
));
ui
->
btnPrivateKey
->
setText
(
QFileInfo
(
QString
::
fromStdString
(
LRCInstance
::
getCurrAccConfig
().
TLS
.
privateKeyFile
))
.
fileName
())
;
}
void
...
...
Write
Preview
Supports
Markdown
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