summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/dundialog.cpp15
-rw-r--r--noncore/net/opietooth/manager/dundialog.h3
-rw-r--r--noncore/net/opietooth/manager/pppdialog.cpp28
-rw-r--r--noncore/net/opietooth/manager/pppdialog.h12
4 files changed, 47 insertions, 11 deletions
diff --git a/noncore/net/opietooth/manager/dundialog.cpp b/noncore/net/opietooth/manager/dundialog.cpp
index c6d8619..872ab00 100644
--- a/noncore/net/opietooth/manager/dundialog.cpp
+++ b/noncore/net/opietooth/manager/dundialog.cpp
@@ -17,4 +17,6 @@
17#include <qlabel.h> 17#include <qlabel.h>
18#include <qstring.h> 18#include <qstring.h>
19#include <qcombobox.h>
20#include <qdir.h>
19#include <opie2/oprocess.h> 21#include <opie2/oprocess.h>
20#include <opie2/odebug.h> 22#include <opie2/odebug.h>
@@ -28,4 +30,8 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent,
28 const char* name, bool modal, WFlags fl ) 30 const char* name, bool modal, WFlags fl )
29 : QDialog( parent, name, modal, fl ) { 31 : QDialog( parent, name, modal, fl ) {
32 QDir d("/etc/ppp/peers/"); //Dir we search files in
33 d.setFilter( QDir::Files);
34 d.setSorting( QDir::Size | QDir::Reversed );
35
30 if ( !name ) 36 if ( !name )
31 setName( "DUNDialog" ); 37 setName( "DUNDialog" );
@@ -41,5 +47,6 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent,
41 info->setText( tr("Enter an ppp script name:") ); 47 info->setText( tr("Enter an ppp script name:") );
42 48
43 cmdLine = new QLineEdit( this ); 49 cmdLine = new QComboBox( this );
50 cmdLine->setEditable(true);
44 51
45 outPut = new QMultiLineEdit( this ); 52 outPut = new QMultiLineEdit( this );
@@ -66,4 +73,6 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent,
66 73
67 connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); 74 connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) );
75 //And fill cmdLine with ppp script filenames
76 cmdLine->insertStringList(d.entryList());
68} 77}
69 78
@@ -75,5 +84,5 @@ void DunDialog::connectToDevice() {
75 bool doPersist = persist->isChecked(); 84 bool doPersist = persist->isChecked();
76 85
77 if (cmdLine->text() == "") 86 if (cmdLine->currentText() == "")
78 return; 87 return;
79 if (m_dunConnect) { 88 if (m_dunConnect) {
@@ -94,5 +103,5 @@ void DunDialog::connectToDevice() {
94 *m_dunConnect << tr("--persist"); 103 *m_dunConnect << tr("--persist");
95 *m_dunConnect << tr("call") 104 *m_dunConnect << tr("call")
96 << cmdLine->text(); 105 << cmdLine->currentText();
97 if (!m_dunConnect->start(OProcess::NotifyOnExit, 106 if (!m_dunConnect->start(OProcess::NotifyOnExit,
98 OProcess::All)) { 107 OProcess::All)) {
diff --git a/noncore/net/opietooth/manager/dundialog.h b/noncore/net/opietooth/manager/dundialog.h
index a0d16ad..8310e40 100644
--- a/noncore/net/opietooth/manager/dundialog.h
+++ b/noncore/net/opietooth/manager/dundialog.h
@@ -21,4 +21,5 @@ class QMultiLineEdit;
21class QLineEdit; 21class QLineEdit;
22class QCheckBox; 22class QCheckBox;
23class QComboBox;
23 24
24namespace OpieTooth { 25namespace OpieTooth {
@@ -39,5 +40,5 @@ namespace OpieTooth {
39 protected: 40 protected:
40 QVBoxLayout* layout; 41 QVBoxLayout* layout;
41 QLineEdit* cmdLine; 42 QComboBox* cmdLine;
42 QPushButton* connectButton; 43 QPushButton* connectButton;
43 QMultiLineEdit* outPut; 44 QMultiLineEdit* outPut;
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index 11091c4..1df22a1 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -1,3 +1,12 @@
1 1/* $Id$ */
2/* PPP/rfcomm connection dialog */
3/***************************************************************************
4 * *
5 * This program is free software; you can redistribute it and/or modify *
6 * it under the terms of the GNU General Public License as published by *
7 * the Free Software Foundation; either version 2 of the License, or *
8 * (at your option) any later version. *
9 * *
10 ***************************************************************************/
2#include "pppdialog.h" 11#include "pppdialog.h"
3#include "rfcommhelper.h" 12#include "rfcommhelper.h"
@@ -8,4 +17,5 @@
8#include <qcombobox.h> 17#include <qcombobox.h>
9#include <qlabel.h> 18#include <qlabel.h>
19#include <qdir.h>
10#include <opie2/oprocess.h> 20#include <opie2/oprocess.h>
11#include <opie2/odebug.h> 21#include <opie2/odebug.h>
@@ -22,5 +32,8 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent,
22 : QDialog( parent, name, modal, fl ) { 32 : QDialog( parent, name, modal, fl ) {
23 int i; //Just an index variable 33 int i; //Just an index variable
24 34 QDir d("/etc/ppp/peers/"); //Dir we search files in
35 d.setFilter( QDir::Files);
36 d.setSorting( QDir::Size | QDir::Reversed );
37
25 if ( !name ) 38 if ( !name )
26 setName( "PPPDialog" ); 39 setName( "PPPDialog" );
@@ -33,7 +46,8 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent,
33 46
34 QLabel* info = new QLabel( this ); 47 QLabel* info = new QLabel( this );
35 info->setText( tr("Enter an ppp script name:") ); 48 info->setText( tr("Enter a ppp script name:") );
36 49
37 cmdLine = new QLineEdit( this ); 50 cmdLine = new QComboBox( this );
51 cmdLine->setEditable(true);
38 52
39 outPut = new QMultiLineEdit( this ); 53 outPut = new QMultiLineEdit( this );
@@ -59,4 +73,6 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent,
59 73
60 connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); 74 connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) );
75 //And fill cmdLine with ppp script filenames
76 cmdLine->insertStringList(d.entryList());
61} 77}
62 78
@@ -73,5 +89,5 @@ void PPPDialog::connectToDevice() {
73 PPPDialog::conns[portNum].proc.clearArguments(); 89 PPPDialog::conns[portNum].proc.clearArguments();
74 // vom popupmenu beziehen 90 // vom popupmenu beziehen
75 if (cmdLine->text().isEmpty()) {//Connect by rfcomm 91 if (cmdLine->currentText().isEmpty()) {//Connect by rfcomm
76 PPPDialog::conns[portNum].proc << "rfcomm" << "connect" 92 PPPDialog::conns[portNum].proc << "rfcomm" << "connect"
77 << QString::number(portNum) << m_device << QString::number(m_port); 93 << QString::number(portNum) << m_device << QString::number(m_port);
@@ -81,5 +97,5 @@ void PPPDialog::connectToDevice() {
81 << tr("/dev/bluetooth/rfcomm/%1").arg(portNum) 97 << tr("/dev/bluetooth/rfcomm/%1").arg(portNum)
82 << "call" 98 << "call"
83 << cmdLine->text(); 99 << cmdLine->currentText();
84 } 100 }
85 if (!PPPDialog::conns[portNum].proc.start(OProcess::NotifyOnExit, 101 if (!PPPDialog::conns[portNum].proc.start(OProcess::NotifyOnExit,
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h
index e0ffc7f..d55c15f 100644
--- a/noncore/net/opietooth/manager/pppdialog.h
+++ b/noncore/net/opietooth/manager/pppdialog.h
@@ -1,2 +1,12 @@
1/* $Id$ */
2/* PPP/rfcomm connection dialog */
3/***************************************************************************
4 * *
5 * This program is free software; you can redistribute it and/or modify *
6 * it under the terms of the GNU General Public License as published by *
7 * the Free Software Foundation; either version 2 of the License, or *
8 * (at your option) any later version. *
9 * *
10 ***************************************************************************/
1#ifndef PPPDIALOG_H 11#ifndef PPPDIALOG_H
2#define PPPDIALOG_H 12#define PPPDIALOG_H
@@ -39,5 +49,5 @@ namespace OpieTooth {
39 protected: 49 protected:
40 QVBoxLayout* layout; 50 QVBoxLayout* layout;
41 QLineEdit* cmdLine; 51 QComboBox* cmdLine;
42 QPushButton* connectButton; 52 QPushButton* connectButton;
43 QMultiLineEdit* outPut; 53 QMultiLineEdit* outPut;