Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
Plasma applet for NetworkManager
Manage
Activity
Members
Labels
Plan
Issues
3
Issue boards
Milestones
Wiki
Bugzilla
Code
Merge requests
23
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Plasma
Plasma applet for NetworkManager
Commits
26c1f5fa
Commit
26c1f5fa
authored
10 years ago
by
Jan Grulich
Browse files
Options
Downloads
Patches
Plain Diff
Add IPv6 tab for OpenVPN connections
BUG:339652
parent
9493f0df
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libs/editor/connectiondetaileditor.cpp
+4
-2
4 additions, 2 deletions
libs/editor/connectiondetaileditor.cpp
with
4 additions
and
2 deletions
libs/editor/connectiondetaileditor.cpp
+
4
−
2
View file @
26c1f5fa
...
...
@@ -40,6 +40,7 @@
#include
"settings/vlanwidget.h"
#include
"settings/wimaxwidget.h"
#include
"vpnuiplugin.h"
#include
"vpn/openvpn/nm-openvpn-service.h"
#include
<QDebug>
...
...
@@ -269,6 +270,7 @@ void ConnectionDetailEditor::initTabs()
const
NetworkManager
::
ConnectionSettings
::
ConnectionType
type
=
m_connection
->
connectionType
();
// setup the widget tabs
QString
serviceType
;
if
(
type
==
NetworkManager
::
ConnectionSettings
::
Wired
)
{
WiredConnectionWidget
*
wiredWidget
=
new
WiredConnectionWidget
(
m_connection
->
setting
(
NetworkManager
::
Setting
::
Wired
),
this
);
m_ui
->
tabWidget
->
addTab
(
wiredWidget
,
i18n
(
"Wired"
));
...
...
@@ -325,7 +327,6 @@ void ConnectionDetailEditor::initTabs()
if
(
!
vpnSetting
)
{
qDebug
()
<<
"Missing VPN setting!"
;
}
else
{
QString
serviceType
;
if
(
m_new
&&
!
m_vpnType
.
isEmpty
())
{
serviceType
=
m_vpnType
;
vpnSetting
->
setServiceType
(
serviceType
);
...
...
@@ -366,7 +367,8 @@ void ConnectionDetailEditor::initTabs()
||
type
==
ConnectionSettings
::
Wimax
||
type
==
ConnectionSettings
::
Bond
||
type
==
ConnectionSettings
::
Bridge
||
type
==
ConnectionSettings
::
Vlan
)
&&
!
isSlave
())
{
||
type
==
ConnectionSettings
::
Vlan
||
(
type
==
ConnectionSettings
::
Vpn
&&
serviceType
==
QLatin1String
(
NM_DBUS_SERVICE_OPENVPN
)))
&&
!
isSlave
())
{
IPv6Widget
*
ipv6Widget
=
new
IPv6Widget
(
m_connection
->
setting
(
NetworkManager
::
Setting
::
Ipv6
),
this
);
m_ui
->
tabWidget
->
addTab
(
ipv6Widget
,
i18n
(
"IPv6"
));
}
...
...
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