Git commit 5d1c6f6d4075eadd8abe436d678e0414ccac655f by Luk=C3=A1=C5=A1 Tink= l. Committed on 01/04/2013 at 00:53. Pushed by lukas into branch 'master'. enable Blueetooth setting M +2 -0 editor/btwidget.cpp M +16 -0 editor/connectiondetaileditor.cpp http://commits.kde.org/plasma-nm/5d1c6f6d4075eadd8abe436d678e0414ccac655f diff --git a/editor/btwidget.cpp b/editor/btwidget.cpp index e58c7e0..3e000c8 100644 --- a/editor/btwidget.cpp +++ b/editor/btwidget.cpp @@ -34,6 +34,8 @@ BtWidget::BtWidget(NetworkManager::Settings::Setting * se= tting, QWidget* parent, m_ui->type->addItem(i18n("DUN (dial up networking)"), NetworkManager::= Settings::BluetoothSetting::Dun); m_ui->type->addItem(i18n("PAN (personal area network)"), NetworkManage= r::Settings::BluetoothSetting::Panu); = + m_ui->type->setEnabled(false); + if (setting) loadConfig(setting); } diff --git a/editor/connectiondetaileditor.cpp b/editor/connectiondetailedi= tor.cpp index ae3ed63..fe85bd6 100644 --- a/editor/connectiondetaileditor.cpp +++ b/editor/connectiondetaileditor.cpp @@ -31,6 +31,7 @@ #include "pppoewidget.h" #include "gsmwidget.h" #include "cdmawidget.h" +#include "btwidget.h" = #include #include @@ -178,6 +179,21 @@ void ConnectionDetailEditor::initTabs() m_detailEditor->tabWidget->addTab(pppWidget, i18n("PPP")); IPv4Widget * ipv4Widget =3D new IPv4Widget(m_connection->setting(N= etworkManager::Settings::Setting::Ipv4), this); m_detailEditor->tabWidget->addTab(ipv4Widget, i18n("IPv4")); + } else if (type =3D=3D NetworkManager::Settings::ConnectionSettings::B= luetooth) { + BtWidget * btWidget =3D new BtWidget(m_connection->setting(Network= Manager::Settings::Setting::Bluetooth), this); + m_detailEditor->tabWidget->addTab(btWidget, i18n("Bluetooth")); + NetworkManager::Settings::BluetoothSetting * btSetting =3D static_= cast(m_connection->setting(Ne= tworkManager::Settings::Setting::Bluetooth)); + if (btSetting->profileType() =3D=3D NetworkManager::Settings::Blue= toothSetting::Dun) { + GsmWidget * gsmWidget =3D new GsmWidget(m_connection->setting(= NetworkManager::Settings::Setting::Gsm), this); + m_detailEditor->tabWidget->addTab(gsmWidget, i18n("GSM")); + PPPWidget * pppWidget =3D new PPPWidget(m_connection->setting(= NetworkManager::Settings::Setting::Ppp), this); + m_detailEditor->tabWidget->addTab(pppWidget, i18n("PPP")); + // TODO serial setting? + } + IPv4Widget * ipv4Widget =3D new IPv4Widget(m_connection->setting(N= etworkManager::Settings::Setting::Ipv4), this); + m_detailEditor->tabWidget->addTab(ipv4Widget, i18n("IPv4")); + IPv6Widget * ipv6Widget =3D new IPv6Widget(m_connection->setting(N= etworkManager::Settings::Setting::Ipv6), this); + m_detailEditor->tabWidget->addTab(ipv6Widget, i18n("IPv6")); } } =20