summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/TODO.txt2
-rw-r--r--noncore/net/opietooth/manager/dundialog.cpp8
-rw-r--r--noncore/net/opietooth/manager/dundialog.h1
-rw-r--r--noncore/net/opietooth/manager/dunpopup.cpp3
4 files changed, 13 insertions, 1 deletions
diff --git a/noncore/net/opietooth/manager/TODO.txt b/noncore/net/opietooth/manager/TODO.txt
index 1914d8b..ed512cd 100644
--- a/noncore/net/opietooth/manager/TODO.txt
+++ b/noncore/net/opietooth/manager/TODO.txt
@@ -1,4 +1,4 @@
11. Try and run and correct authentification and encoding. 11. Improve hcid.conf parsing algorithm.
22. Collect requirements from others. 22. Collect requirements from others.
3 3
4//eof 4//eof
diff --git a/noncore/net/opietooth/manager/dundialog.cpp b/noncore/net/opietooth/manager/dundialog.cpp
index 7aac271..c6d8619 100644
--- a/noncore/net/opietooth/manager/dundialog.cpp
+++ b/noncore/net/opietooth/manager/dundialog.cpp
@@ -53,11 +53,15 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent,
53 53
54 doEncryption = new QCheckBox(this, "encrypt"); 54 doEncryption = new QCheckBox(this, "encrypt");
55 doEncryption->setText( tr( "encrypt" ) ); 55 doEncryption->setText( tr( "encrypt" ) );
56 56
57 persist = new QCheckBox(this, "persist");
58 persist->setText( tr( "persist" ) );
59
57 layout->addWidget(info); 60 layout->addWidget(info);
58 layout->addWidget(cmdLine); 61 layout->addWidget(cmdLine);
59 layout->addWidget(doEncryption); 62 layout->addWidget(doEncryption);
63 layout->addWidget(persist);
60 layout->addWidget(outPut); 64 layout->addWidget(outPut);
61 layout->addWidget(connectButton); 65 layout->addWidget(connectButton);
62 66
63 connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); 67 connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) );
@@ -67,8 +71,10 @@ DunDialog::~DunDialog() {
67} 71}
68 72
69void DunDialog::connectToDevice() { 73void DunDialog::connectToDevice() {
70 bool doEnc = doEncryption->isChecked(); 74 bool doEnc = doEncryption->isChecked();
75 bool doPersist = persist->isChecked();
76
71 if (cmdLine->text() == "") 77 if (cmdLine->text() == "")
72 return; 78 return;
73 if (m_dunConnect) { 79 if (m_dunConnect) {
74 outPut->append(tr("Work in progress")); 80 outPut->append(tr("Work in progress"));
@@ -83,8 +89,10 @@ void DunDialog::connectToDevice() {
83 << tr("--channel") << QString::number(m_port) 89 << tr("--channel") << QString::number(m_port)
84 << tr("--nodetach"); 90 << tr("--nodetach");
85 if (doEnc) 91 if (doEnc)
86 *m_dunConnect << tr("--encrypt"); 92 *m_dunConnect << tr("--encrypt");
93 if (doPersist)
94 *m_dunConnect << tr("--persist");
87 *m_dunConnect << tr("call") 95 *m_dunConnect << tr("call")
88 << cmdLine->text(); 96 << cmdLine->text();
89 if (!m_dunConnect->start(OProcess::NotifyOnExit, 97 if (!m_dunConnect->start(OProcess::NotifyOnExit,
90 OProcess::All)) { 98 OProcess::All)) {
diff --git a/noncore/net/opietooth/manager/dundialog.h b/noncore/net/opietooth/manager/dundialog.h
index 9e219cd..a0d16ad 100644
--- a/noncore/net/opietooth/manager/dundialog.h
+++ b/noncore/net/opietooth/manager/dundialog.h
@@ -41,8 +41,9 @@ namespace OpieTooth {
41 QLineEdit* cmdLine; 41 QLineEdit* cmdLine;
42 QPushButton* connectButton; 42 QPushButton* connectButton;
43 QMultiLineEdit* outPut; 43 QMultiLineEdit* outPut;
44 QCheckBox* doEncryption; 44 QCheckBox* doEncryption;
45 QCheckBox* persist;
45 46
46 private: 47 private:
47 QString m_device; //device BT address 48 QString m_device; //device BT address
48 int m_port; //device process 49 int m_port; //device process
diff --git a/noncore/net/opietooth/manager/dunpopup.cpp b/noncore/net/opietooth/manager/dunpopup.cpp
index c304b2d..6844988 100644
--- a/noncore/net/opietooth/manager/dunpopup.cpp
+++ b/noncore/net/opietooth/manager/dunpopup.cpp
@@ -61,10 +61,13 @@ void DunPopup::slotConnect() {
61 61
62void DunPopup::slotDisconnect() { 62void DunPopup::slotDisconnect() {
63 OProcess dunDis; 63 OProcess dunDis;
64 OProcess pppDis; 64 OProcess pppDis;
65 OProcess dunKill;
65 dunDis << tr("dund") << tr("--kill") << m_item->mac(); 66 dunDis << tr("dund") << tr("--kill") << m_item->mac();
66 dunDis.start(OProcess::DontCare, OProcess::NoCommunication); 67 dunDis.start(OProcess::DontCare, OProcess::NoCommunication);
68 dunKill << tr("killall") << tr("-q") << tr("dund");
69 dunKill.start(OProcess::DontCare, OProcess::NoCommunication);
67 pppDis << tr("killall") << tr("-q") << tr("pppd"); 70 pppDis << tr("killall") << tr("-q") << tr("pppd");
68 pppDis.start(OProcess::DontCare, OProcess::NoCommunication); 71 pppDis.start(OProcess::DontCare, OProcess::NoCommunication);
69 sleep(1); 72 sleep(1);
70 QMessageBox::information(this, tr("DUN Disconnect"), tr("DUN Disconnected")); 73 QMessageBox::information(this, tr("DUN Disconnect"), tr("DUN Disconnected"));