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
0fc72ba7
Commit
0fc72ba7
authored
5 years ago
by
Ming Rui Zhang
Committed by
Andreas Traczyk
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
advancedSIPSetting: add additional Connectivity settings
Change-Id: I34156625e5ab3676ddff3b598515630f91940ba3
parent
05966ae3
No related branches found
No related tags found
No related merge requests found
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
advancedsipsettingwidget.cpp
+51
-0
51 additions, 0 deletions
advancedsipsettingwidget.cpp
advancedsipsettingwidget.h
+3
-0
3 additions, 0 deletions
advancedsipsettingwidget.h
advancedsipsettingwidget.ui
+401
-298
401 additions, 298 deletions
advancedsipsettingwidget.ui
with
455 additions
and
298 deletions
advancedsipsettingwidget.cpp
+
51
−
0
View file @
0fc72ba7
...
@@ -82,8 +82,20 @@ AdvancedSIPSettingsWidget::AdvancedSIPSettingsWidget(QWidget* parent)
...
@@ -82,8 +82,20 @@ AdvancedSIPSettingsWidget::AdvancedSIPSettingsWidget(QWidget* parent)
connect
(
ui
->
lineEditTurnAddressSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setTURNAddress
);
connect
(
ui
->
lineEditTurnAddressSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setTURNAddress
);
connect
(
ui
->
lineEditTurnUsernameSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setTURNUsername
);
connect
(
ui
->
lineEditTurnUsernameSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setTURNUsername
);
connect
(
ui
->
lineEditTurnPsswdSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setTURNPsswd
);
connect
(
ui
->
lineEditTurnPsswdSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setTURNPsswd
);
connect
(
ui
->
lineEditTurnRealmSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setTURNRealm
);
connect
(
ui
->
lineEditSTUNAddressSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setSTUNAddress
);
connect
(
ui
->
lineEditSTUNAddressSIP
,
&
QLineEdit
::
editingFinished
,
this
,
&
AdvancedSIPSettingsWidget
::
setSTUNAddress
);
connect
(
ui
->
checkBoxTurnEnableSIP
,
&
QAbstractButton
::
clicked
,
[
this
](
int
state
)
{
ui
->
lineEditTurnAddressSIP
->
setEnabled
((
bool
)
state
);
ui
->
lineEditTurnUsernameSIP
->
setEnabled
((
bool
)
state
);
ui
->
lineEditTurnPsswdSIP
->
setEnabled
((
bool
)
state
);
ui
->
lineEditTurnRealmSIP
->
setEnabled
((
bool
)
state
);
});
connect
(
ui
->
checkBoxSTUNEnableSIP
,
&
QAbstractButton
::
clicked
,
[
this
](
int
state
)
{
ui
->
lineEditSTUNAddressSIP
->
setEnabled
((
bool
)
state
);
});
// codecs
// codecs
connect
(
ui
->
audioListWidgetSIP
,
&
QListWidget
::
itemChanged
,
this
,
&
AdvancedSIPSettingsWidget
::
audioCodecsStateChange
);
connect
(
ui
->
audioListWidgetSIP
,
&
QListWidget
::
itemChanged
,
this
,
&
AdvancedSIPSettingsWidget
::
audioCodecsStateChange
);
connect
(
ui
->
videoListWidgetSIP
,
&
QListWidget
::
itemChanged
,
this
,
&
AdvancedSIPSettingsWidget
::
videoCodecsStateChange
);
connect
(
ui
->
videoListWidgetSIP
,
&
QListWidget
::
itemChanged
,
this
,
&
AdvancedSIPSettingsWidget
::
videoCodecsStateChange
);
...
@@ -167,8 +179,20 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings()
...
@@ -167,8 +179,20 @@ void AdvancedSIPSettingsWidget::updateAdvancedSIPSettings()
ui
->
lineEditTurnAddressSIP
->
setText
(
QString
::
fromStdString
(
config
.
TURN
.
server
));
ui
->
lineEditTurnAddressSIP
->
setText
(
QString
::
fromStdString
(
config
.
TURN
.
server
));
ui
->
lineEditTurnUsernameSIP
->
setText
(
QString
::
fromStdString
(
config
.
TURN
.
username
));
ui
->
lineEditTurnUsernameSIP
->
setText
(
QString
::
fromStdString
(
config
.
TURN
.
username
));
ui
->
lineEditTurnPsswdSIP
->
setText
(
QString
::
fromStdString
(
config
.
TURN
.
password
));
ui
->
lineEditTurnPsswdSIP
->
setText
(
QString
::
fromStdString
(
config
.
TURN
.
password
));
ui
->
lineEditTurnRealmSIP
->
setText
(
QString
::
fromStdString
(
config
.
TURN
.
realm
));
ui
->
lineEditTurnAddressSIP
->
setEnabled
(
config
.
TURN
.
enable
);
ui
->
lineEditTurnUsernameSIP
->
setEnabled
(
config
.
TURN
.
enable
);
ui
->
lineEditTurnPsswdSIP
->
setEnabled
(
config
.
TURN
.
enable
);
ui
->
lineEditTurnRealmSIP
->
setEnabled
(
config
.
TURN
.
enable
);
ui
->
checkBoxSTUNEnableSIP
->
setChecked
(
config
.
STUN
.
enable
);
ui
->
checkBoxSTUNEnableSIP
->
setChecked
(
config
.
STUN
.
enable
);
ui
->
lineEditSTUNAddressSIP
->
setText
(
QString
::
fromStdString
(
config
.
STUN
.
server
));
ui
->
lineEditSTUNAddressSIP
->
setText
(
QString
::
fromStdString
(
config
.
STUN
.
server
));
ui
->
lineEditSTUNAddressSIP
->
setEnabled
(
config
.
STUN
.
enable
);
ui
->
registrationExpireTimeoutSpinBox
->
setValue
(
config
.
Registration
.
expire
);
connect
(
ui
->
registrationExpireTimeoutSpinBox
,
QOverload
<
int
>::
of
(
&
QSpinBox
::
valueChanged
),
this
,
&
AdvancedSIPSettingsWidget
::
registrationTimeoutSpinBoxValueChanged
);
ui
->
networkInterfaceSpinBox
->
setValue
(
config
.
localPort
);
connect
(
ui
->
networkInterfaceSpinBox
,
QOverload
<
int
>::
of
(
&
QSpinBox
::
valueChanged
),
this
,
&
AdvancedSIPSettingsWidget
::
networkInterfaceSpinBoxValueChanged
);
// codecs
// codecs
ui
->
videoCheckBoxSIP
->
setChecked
(
config
.
Video
.
videoEnabled
);
ui
->
videoCheckBoxSIP
->
setChecked
(
config
.
Video
.
videoEnabled
);
...
@@ -244,18 +268,29 @@ void AdvancedSIPSettingsWidget::setTURNAddress()
...
@@ -244,18 +268,29 @@ void AdvancedSIPSettingsWidget::setTURNAddress()
confProps
.
TURN
.
server
=
ui
->
lineEditTurnAddressSIP
->
text
().
toStdString
();
confProps
.
TURN
.
server
=
ui
->
lineEditTurnAddressSIP
->
text
().
toStdString
();
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
}
void
AdvancedSIPSettingsWidget
::
setTURNUsername
()
void
AdvancedSIPSettingsWidget
::
setTURNUsername
()
{
{
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
confProps
.
TURN
.
username
=
ui
->
lineEditTurnUsernameSIP
->
text
().
toStdString
();
confProps
.
TURN
.
username
=
ui
->
lineEditTurnUsernameSIP
->
text
().
toStdString
();
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
}
void
AdvancedSIPSettingsWidget
::
setTURNPsswd
()
void
AdvancedSIPSettingsWidget
::
setTURNPsswd
()
{
{
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
confProps
.
TURN
.
password
=
ui
->
lineEditTurnPsswdSIP
->
text
().
toStdString
();
confProps
.
TURN
.
password
=
ui
->
lineEditTurnPsswdSIP
->
text
().
toStdString
();
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
}
void
AdvancedSIPSettingsWidget
::
setTURNRealm
()
{
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
confProps
.
TURN
.
realm
=
ui
->
lineEditTurnRealmSIP
->
text
().
toStdString
();
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
void
AdvancedSIPSettingsWidget
::
setSTUNAddress
()
void
AdvancedSIPSettingsWidget
::
setSTUNAddress
()
{
{
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
...
@@ -527,3 +562,19 @@ AdvancedSIPSettingsWidget::openButtonFilePath(const std::string& accConfigFilePa
...
@@ -527,3 +562,19 @@ AdvancedSIPSettingsWidget::openButtonFilePath(const std::string& accConfigFilePa
}
}
return
fileUrl
.
toStdString
();
return
fileUrl
.
toStdString
();
}
}
void
AdvancedSIPSettingsWidget
::
registrationTimeoutSpinBoxValueChanged
(
const
int
&
value
)
{
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
confProps
.
Registration
.
expire
=
value
;
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
void
AdvancedSIPSettingsWidget
::
networkInterfaceSpinBoxValueChanged
(
const
int
&
value
)
{
auto
confProps
=
LRCInstance
::
accountModel
().
getAccountConfig
(
LRCInstance
::
getCurrAccId
());
confProps
.
localPort
=
value
;
LRCInstance
::
accountModel
().
setAccountConfig
(
LRCInstance
::
getCurrAccId
(),
confProps
);
}
This diff is collapsed.
Click to expand it.
advancedsipsettingwidget.h
+
3
−
0
View file @
0fc72ba7
...
@@ -77,9 +77,12 @@ private slots:
...
@@ -77,9 +77,12 @@ private slots:
void
setUseTURN
(
bool
state
);
void
setUseTURN
(
bool
state
);
void
setUseSTUN
(
bool
state
);
void
setUseSTUN
(
bool
state
);
void
registrationTimeoutSpinBoxValueChanged
(
const
int
&
value
);
void
networkInterfaceSpinBoxValueChanged
(
const
int
&
value
);
void
setTURNAddress
();
void
setTURNAddress
();
void
setTURNUsername
();
void
setTURNUsername
();
void
setTURNPsswd
();
void
setTURNPsswd
();
void
setTURNRealm
();
void
setSTUNAddress
();
void
setSTUNAddress
();
// codecs
// codecs
...
...
This diff is collapsed.
Click to expand it.
advancedsipsettingwidget.ui
+
401
−
298
View file @
0fc72ba7
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