| -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 | 28 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/pppdialog.h | 12 |
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 @@ -18,2 +18,4 @@ #include <qstring.h> +#include <qcombobox.h> +#include <qdir.h> #include <opie2/oprocess.h> @@ -29,2 +31,6 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent, : 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 ) @@ -42,3 +48,4 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent, - cmdLine = new QLineEdit( this ); + cmdLine = new QComboBox( this ); + cmdLine->setEditable(true); @@ -67,2 +74,4 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent, connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); + //And fill cmdLine with ppp script filenames + cmdLine->insertStringList(d.entryList()); } @@ -76,3 +85,3 @@ void DunDialog::connectToDevice() { - if (cmdLine->text() == "") + if (cmdLine->currentText() == "") return; @@ -95,3 +104,3 @@ void DunDialog::connectToDevice() { *m_dunConnect << tr("call") - << cmdLine->text(); + << cmdLine->currentText(); if (!m_dunConnect->start(OProcess::NotifyOnExit, 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 @@ -22,2 +22,3 @@ class QLineEdit; class QCheckBox; +class QComboBox; @@ -40,3 +41,3 @@ namespace OpieTooth { QVBoxLayout* layout; - QLineEdit* cmdLine; + QComboBox* cmdLine; QPushButton* connectButton; 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,2 +1,11 @@ - +/* $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" @@ -9,2 +18,3 @@ #include <qlabel.h> +#include <qdir.h> #include <opie2/oprocess.h> @@ -23,3 +33,6 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent, 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 ) @@ -34,5 +47,6 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent, 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); @@ -60,2 +74,4 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent, connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); + //And fill cmdLine with ppp script filenames + cmdLine->insertStringList(d.entryList()); } @@ -74,3 +90,3 @@ void PPPDialog::connectToDevice() { // vom popupmenu beziehen - if (cmdLine->text().isEmpty()) {//Connect by rfcomm + if (cmdLine->currentText().isEmpty()) {//Connect by rfcomm PPPDialog::conns[portNum].proc << "rfcomm" << "connect" @@ -82,3 +98,3 @@ void PPPDialog::connectToDevice() { << "call" - << cmdLine->text(); + << cmdLine->currentText(); } 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 +1,11 @@ +/* $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 @@ -40,3 +50,3 @@ namespace OpieTooth { QVBoxLayout* layout; - QLineEdit* cmdLine; + QComboBox* cmdLine; QPushButton* connectButton; |