Diffstat (limited to 'noncore/net/opietooth/manager/pppdialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.cpp | 28 |
1 files changed, 22 insertions, 6 deletions
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,95 +1,111 @@ - +/* $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; using namespace OpieTooth; using namespace Opie::Core; 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 " ) ) ; m_device = device; m_port = port; 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 ); outPut->setFont( outPut_font ); outPut->setWordWrap( QMultiLineEdit::WidgetWidth ); connectButton = new QPushButton( this ); connectButton->setText( tr( "Connect" ) ); serPort = new QComboBox(this); for (i = 0; i < NCONNECTS; i++) { if (!PPPDialog::conns[i].proc.isRunning()) serPort->insertItem(tr("rfcomm%1").arg(i)); } layout->addWidget(info); layout->addWidget(cmdLine); layout->addWidget(serPort); 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() { } void PPPDialog::connectToDevice() { int portNum = serPort->currentText().right(1).toInt(); if (PPPDialog::conns[portNum].proc.isRunning()) { outPut->append(tr("Work in progress")); return; } 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")); } else { PPPDialog::conns[portNum].proc.resume(); outPut->append(tr("Started")); PPPDialog::conns[portNum].btAddr = m_device; PPPDialog::conns[portNum].port = m_port; connect(&PPPDialog::conns[portNum].proc, |