From kde-commits  Wed Dec 16 17:18:16 2015
From: Jan Grulich <jgrulich () redhat ! com>
Date: Wed, 16 Dec 2015 17:18:16 +0000
To: kde-commits
Subject: [plasma-nm] editor: Improve visibility of "import vpn" option
Message-Id: <E1a9FiS-0004FE-5U () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=145028630903940

Git commit 98f1f1287cee2d3dc77f0de2d8d607074cdaca81 by Jan Grulich.
Committed on 16/12/2015 at 17:18.
Pushed by grulich into branch 'master'.

Improve visibility of "import vpn" option

REVIEW:126386

M  +10   -2    editor/connectioneditor.cpp
M  +2    -5    editor/kde5-nm-connection-editorui.rc

http://commits.kde.org/plasma-nm/98f1f1287cee2d3dc77f0de2d8d607074cdaca81

diff --git a/editor/connectioneditor.cpp b/editor/connectioneditor.cpp
index de4773f..6e07971 100644
--- a/editor/connectioneditor.cpp
+++ b/editor/connectioneditor.cpp
@@ -195,6 +195,13 @@ void ConnectionEditor::initializeMenu()
         m_menu->addAction(action);
     }
 =

+    m_menu->menu()->addSeparator();
+
+    action =3D new QAction(i18n("Import VPN..."), this);
+    action->setData(NetworkManager::ConnectionSettings::Vpn);
+    action->setProperty("type", "imported");
+    m_menu->addAction(action);
+
     actionCollection()->addAction(QStringLiteral("add_connection"), m_menu=
);
 =

     QAction * kAction =3D new QAction(QIcon::fromTheme(QStringLiteral("net=
work-connect")), i18n("Connect"), this);
@@ -243,8 +250,9 @@ void ConnectionEditor::addConnection(QAction* action)
     const QString vpnType =3D action->property("type").toString();
 =

     // qCDebug(PLASMA_NM) << "Adding new connection of type " << type;
-
-    if (type =3D=3D NetworkManager::ConnectionSettings::Gsm) { // launch t=
he mobile broadband wizard, both gsm/cdma
+    if (type =3D=3D NetworkManager::ConnectionSettings::Vpn && vpnType =3D=
=3D "imported") {
+        importVpn();
+    } else if (type =3D=3D NetworkManager::ConnectionSettings::Gsm) { // l=
aunch the mobile broadband wizard, both gsm/cdma
 #if WITH_MODEMMANAGER_SUPPORT
         QPointer<MobileConnectionWizard> wizard =3D new MobileConnectionWi=
zard(NetworkManager::ConnectionSettings::Unknown, this);
         connect(wizard.data(), &MobileConnectionWizard::accepted,
diff --git a/editor/kde5-nm-connection-editorui.rc b/editor/kde5-nm-connect=
ion-editorui.rc
index 67b0e79..6fee46b 100644
--- a/editor/kde5-nm-connection-editorui.rc
+++ b/editor/kde5-nm-connection-editorui.rc
@@ -7,11 +7,6 @@
                          http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.=
xsd" >
 =

   <MenuBar>
-    <Menu name=3D"file" >
-      <Action name=3D"import_vpn" />
-      <Action name=3D"export_vpn" />
-    </Menu>
-
     <Menu name=3D"connection">
     <text>Connection</text>
       <Action name=3D"connect_connection" />
@@ -19,6 +14,8 @@
       <Action name=3D"add_connection" />
       <Action name=3D"edit_connection" />
       <Action name=3D"delete_connection" />
+      <Action name=3D"import_vpn" />
+      <Action name=3D"export_vpn" />
     </Menu>
   </MenuBar>
=20