From 6c1c44237a16dc8fed89905ae729e36eb9711c07 Mon Sep 17 00:00:00 2001 From: korovkin Date: Wed, 05 Apr 2006 19:29:19 +0000 Subject: Added combobox with ppp script names from /etc/ppp/peers. --- 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 @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include #include using namespace Opie::Core; @@ -27,6 +29,10 @@ 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 " ) ) ; @@ -40,7 +46,8 @@ 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() ); @@ -65,6 +72,8 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent, layout->addWidget(connectButton); connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); + //And fill cmdLine with ppp script filenames + cmdLine->insertStringList(d.entryList()); } DunDialog::~DunDialog() { @@ -74,7 +83,7 @@ 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")); @@ -93,7 +102,7 @@ void DunDialog::connectToDevice() { 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")); 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 @@ -20,6 +20,7 @@ class QPushButton; class QMultiLineEdit; class QLineEdit; class QCheckBox; +class QComboBox; namespace OpieTooth { class DunDialog : public QDialog { @@ -38,7 +39,7 @@ namespace OpieTooth { void closeEvent(QCloseEvent* e); protected: QVBoxLayout* layout; - QLineEdit* cmdLine; + QComboBox* cmdLine; QPushButton* connectButton; QMultiLineEdit* outPut; QCheckBox* doEncryption; 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,4 +1,13 @@ - +/* $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 @@ -7,6 +16,7 @@ #include #include #include +#include #include #include using namespace Opie::Core; @@ -21,7 +31,10 @@ 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 " ) ) ; @@ -32,9 +45,10 @@ 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() ); @@ -58,6 +72,8 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent, layout->addWidget(connectButton); connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); + //And fill cmdLine with ppp script filenames + cmdLine->insertStringList(d.entryList()); } PPPDialog::~PPPDialog() { @@ -72,7 +88,7 @@ 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); } @@ -80,7 +96,7 @@ void PPPDialog::connectToDevice() { 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)) { 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,3 +1,13 @@ +/* $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 @@ -38,7 +48,7 @@ namespace OpieTooth { static Connection conns[NCONNECTS]; protected: QVBoxLayout* layout; - QLineEdit* cmdLine; + QComboBox* cmdLine; QPushButton* connectButton; QMultiLineEdit* outPut; QComboBox* serPort; -- cgit v0.9.0.2