summaryrefslogtreecommitdiff
Side-by-side diff
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,3 +1,3 @@
-1. Try and run and correct authentification and encoding.
+1. Improve hcid.conf parsing algorithm.
2. Collect requirements from others.
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
@@ -55,7 +55,11 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent,
doEncryption->setText( tr( "encrypt" ) );
+ persist = new QCheckBox(this, "persist");
+ persist->setText( tr( "persist" ) );
+
layout->addWidget(info);
layout->addWidget(cmdLine);
layout->addWidget(doEncryption);
+ layout->addWidget(persist);
layout->addWidget(outPut);
layout->addWidget(connectButton);
@@ -69,4 +73,6 @@ DunDialog::~DunDialog() {
void DunDialog::connectToDevice() {
bool doEnc = doEncryption->isChecked();
+ bool doPersist = persist->isChecked();
+
if (cmdLine->text() == "")
return;
@@ -85,4 +91,6 @@ void DunDialog::connectToDevice() {
if (doEnc)
*m_dunConnect << tr("--encrypt");
+ if (doPersist)
+ *m_dunConnect << tr("--persist");
*m_dunConnect << tr("call")
<< cmdLine->text();
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
@@ -43,4 +43,5 @@ namespace OpieTooth {
QMultiLineEdit* outPut;
QCheckBox* doEncryption;
+ QCheckBox* persist;
private:
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
@@ -63,6 +63,9 @@ void DunPopup::slotDisconnect() {
OProcess dunDis;
OProcess pppDis;
+ OProcess dunKill;
dunDis << tr("dund") << tr("--kill") << m_item->mac();
dunDis.start(OProcess::DontCare, OProcess::NoCommunication);
+ dunKill << tr("killall") << tr("-q") << tr("dund");
+ dunKill.start(OProcess::DontCare, OProcess::NoCommunication);
pppDis << tr("killall") << tr("-q") << tr("pppd");
pppDis.start(OProcess::DontCare, OProcess::NoCommunication);