[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-nm] editor: Improve visibility of "import vpn" option
From: Jan Grulich <jgrulich () redhat ! com>
Date: 2015-12-16 17:18:16
Message-ID: E1a9FiS-0004FE-5U () scm ! kde ! org
[Download RAW message or body]
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 = 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 = new \
QAction(QIcon::fromTheme(QStringLiteral("network-connect")), \
i18n("Connect"), this); @@ -243,8 +250,9 @@ void \
ConnectionEditor::addConnection(QAction* action) const QString vpnType = \
action->property("type").toString();
// qCDebug(PLASMA_NM) << "Adding new connection of type " << type;
-
- if (type == NetworkManager::ConnectionSettings::Gsm) { // launch the \
mobile broadband wizard, both gsm/cdma + if (type == \
NetworkManager::ConnectionSettings::Vpn && vpnType == "imported") { + \
importVpn(); + } else if (type == \
NetworkManager::ConnectionSettings::Gsm) { // launch the mobile broadband \
wizard, both gsm/cdma #if WITH_MODEMMANAGER_SUPPORT
QPointer<MobileConnectionWizard> wizard = new \
MobileConnectionWizard(NetworkManager::ConnectionSettings::Unknown, this); \
connect(wizard.data(), &MobileConnectionWizard::accepted,
diff --git a/editor/kde5-nm-connection-editorui.rc \
b/editor/kde5-nm-connection-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="file" >
- <Action name="import_vpn" />
- <Action name="export_vpn" />
- </Menu>
-
<Menu name="connection">
<text>Connection</text>
<Action name="connect_connection" />
@@ -19,6 +14,8 @@
<Action name="add_connection" />
<Action name="edit_connection" />
<Action name="delete_connection" />
+ <Action name="import_vpn" />
+ <Action name="export_vpn" />
</Menu>
</MenuBar>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic