author | korovkin <korovkin> | 2006-04-05 19:29:19 (UTC) |
---|---|---|
committer | korovkin <korovkin> | 2006-04-05 19:29:19 (UTC) |
commit | 6c1c44237a16dc8fed89905ae729e36eb9711c07 (patch) (side-by-side diff) | |
tree | cfcb46f571669c0d8e57ee703c712b09ed8af185 | |
parent | 31ea6e9f697d72a31ce319f7f42254fe90e48a36 (diff) | |
download | opie-6c1c44237a16dc8fed89905ae729e36eb9711c07.zip opie-6c1c44237a16dc8fed89905ae729e36eb9711c07.tar.gz opie-6c1c44237a16dc8fed89905ae729e36eb9711c07.tar.bz2 |
Added combobox with ppp script names from /etc/ppp/peers.
-rw-r--r-- | noncore/net/opietooth/manager/dundialog.cpp | 15 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/dundialog.h | 3 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.cpp | 26 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.h | 12 |
4 files changed, 46 insertions, 10 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 @@ -15,8 +15,10 @@ #include <qlayout.h> #include <qcheckbox.h> #include <qlabel.h> #include <qstring.h> +#include <qcombobox.h> +#include <qdir.h> #include <opie2/oprocess.h> #include <opie2/odebug.h> using namespace Opie::Core; @@ -26,8 +28,12 @@ using namespace Opie::Core; DunDialog::DunDialog( const QString& device, int port, QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { + QDir d("/etc/ppp/peers/"); //Dir we search files in + d.setFilter( QDir::Files); + d.setSorting( QDir::Size | QDir::Reversed ); + if ( !name ) setName( "DUNDialog" ); setCaption( tr( "DUN connection " ) ) ; @@ -39,9 +45,10 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent, QLabel* info = new QLabel( this ); info->setText( tr("Enter an ppp script name:") ); - cmdLine = new QLineEdit( this ); + cmdLine = new QComboBox( this ); + cmdLine->setEditable(true); outPut = new QMultiLineEdit( this ); QFont outPut_font( outPut->font() ); outPut_font.setPointSize( 8 ); @@ -64,8 +71,10 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent, layout->addWidget(outPut); layout->addWidget(connectButton); connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); + //And fill cmdLine with ppp script filenames + cmdLine->insertStringList(d.entryList()); } DunDialog::~DunDialog() { } @@ -73,9 +82,9 @@ DunDialog::~DunDialog() { void DunDialog::connectToDevice() { bool doEnc = doEncryption->isChecked(); bool doPersist = persist->isChecked(); - if (cmdLine->text() == "") + if (cmdLine->currentText() == "") return; if (m_dunConnect) { outPut->append(tr("Work in progress")); return; @@ -92,9 +101,9 @@ void DunDialog::connectToDevice() { *m_dunConnect << tr("--encrypt"); if (doPersist) *m_dunConnect << tr("--persist"); *m_dunConnect << tr("call") - << cmdLine->text(); + << cmdLine->currentText(); if (!m_dunConnect->start(OProcess::NotifyOnExit, OProcess::All)) { outPut->append(tr("Couldn't start")); delete m_dunConnect; 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 @@ -19,8 +19,9 @@ class QVBoxLayout; class QPushButton; class QMultiLineEdit; class QLineEdit; class QCheckBox; +class QComboBox; namespace OpieTooth { class DunDialog : public QDialog { @@ -37,9 +38,9 @@ namespace OpieTooth { void slotProcessExited(Opie::Core::OProcess* proc); void closeEvent(QCloseEvent* e); protected: QVBoxLayout* layout; - QLineEdit* cmdLine; + QComboBox* cmdLine; QPushButton* connectButton; QMultiLineEdit* outPut; QCheckBox* doEncryption; QCheckBox* persist; 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,13 +1,23 @@ - +/* $Id$ */ +/* PPP/rfcomm connection dialog */ +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ #include "pppdialog.h" #include "rfcommhelper.h" #include <qpushbutton.h> #include <qmultilineedit.h> #include <qlineedit.h> #include <qlayout.h> #include <qcombobox.h> #include <qlabel.h> +#include <qdir.h> #include <opie2/oprocess.h> #include <opie2/odebug.h> using namespace Opie::Core; @@ -20,8 +30,11 @@ Connection PPPDialog::conns[NCONNECTS]; PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { int i; //Just an index variable + QDir d("/etc/ppp/peers/"); //Dir we search files in + d.setFilter( QDir::Files); + d.setSorting( QDir::Size | QDir::Reversed ); if ( !name ) setName( "PPPDialog" ); setCaption( tr( "ppp connection " ) ) ; @@ -31,11 +44,12 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent, layout = new QVBoxLayout( this ); QLabel* info = new QLabel( this ); - info->setText( tr("Enter an ppp script name:") ); + info->setText( tr("Enter a ppp script name:") ); - cmdLine = new QLineEdit( this ); + cmdLine = new QComboBox( this ); + cmdLine->setEditable(true); outPut = new QMultiLineEdit( this ); QFont outPut_font( outPut->font() ); outPut_font.setPointSize( 8 ); @@ -57,8 +71,10 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent, layout->addWidget(outPut); layout->addWidget(connectButton); connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); + //And fill cmdLine with ppp script filenames + cmdLine->insertStringList(d.entryList()); } PPPDialog::~PPPDialog() { } @@ -71,17 +87,17 @@ void PPPDialog::connectToDevice() { } outPut->clear(); PPPDialog::conns[portNum].proc.clearArguments(); // vom popupmenu beziehen - if (cmdLine->text().isEmpty()) {//Connect by rfcomm + if (cmdLine->currentText().isEmpty()) {//Connect by rfcomm PPPDialog::conns[portNum].proc << "rfcomm" << "connect" << QString::number(portNum) << m_device << QString::number(m_port); } else { PPPDialog::conns[portNum].proc << "pppd" << tr("/dev/bluetooth/rfcomm/%1").arg(portNum) << "call" - << cmdLine->text(); + << cmdLine->currentText(); } if (!PPPDialog::conns[portNum].proc.start(OProcess::NotifyOnExit, OProcess::All)) { outPut->append(tr("Couldn't start")); 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,4 +1,14 @@ +/* $Id$ */ +/* PPP/rfcomm connection dialog */ +/*************************************************************************** + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + ***************************************************************************/ #ifndef PPPDIALOG_H #define PPPDIALOG_H @@ -37,9 +47,9 @@ namespace OpieTooth { //Array of connections indexed by rfcomm device number static Connection conns[NCONNECTS]; protected: QVBoxLayout* layout; - QLineEdit* cmdLine; + QComboBox* cmdLine; QPushButton* connectButton; QMultiLineEdit* outPut; QComboBox* serPort; |