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 /noncore/net/opietooth/manager | |
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.
Diffstat (limited to 'noncore/net/opietooth/manager') (more/less context) (ignore whitespace changes)
-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 @@ -17,4 +17,6 @@ #include <qlabel.h> #include <qstring.h> +#include <qcombobox.h> +#include <qdir.h> #include <opie2/oprocess.h> #include <opie2/odebug.h> @@ -28,4 +30,8 @@ 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" ); @@ -41,5 +47,6 @@ DunDialog::DunDialog( const QString& device, int port, QWidget* parent, info->setText( tr("Enter an ppp script name:") ); - cmdLine = new QLineEdit( this ); + cmdLine = new QComboBox( this ); + cmdLine->setEditable(true); outPut = new QMultiLineEdit( this ); @@ -66,4 +73,6 @@ 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()); } @@ -75,5 +84,5 @@ void DunDialog::connectToDevice() { bool doPersist = persist->isChecked(); - if (cmdLine->text() == "") + if (cmdLine->currentText() == "") return; if (m_dunConnect) { @@ -94,5 +103,5 @@ void DunDialog::connectToDevice() { *m_dunConnect << tr("--persist"); *m_dunConnect << tr("call") - << cmdLine->text(); + << cmdLine->currentText(); if (!m_dunConnect->start(OProcess::NotifyOnExit, 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; class QLineEdit; class QCheckBox; +class QComboBox; namespace OpieTooth { @@ -39,5 +40,5 @@ namespace OpieTooth { protected: QVBoxLayout* layout; - QLineEdit* cmdLine; + QComboBox* cmdLine; QPushButton* connectButton; 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 @@ - +/* $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" @@ -8,4 +17,5 @@ #include <qcombobox.h> #include <qlabel.h> +#include <qdir.h> #include <opie2/oprocess.h> #include <opie2/odebug.h> @@ -22,5 +32,8 @@ PPPDialog::PPPDialog( const QString& device, int port, QWidget* parent, : 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" ); @@ -33,7 +46,8 @@ 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); outPut = new QMultiLineEdit( this ); @@ -59,4 +73,6 @@ 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()); } @@ -73,5 +89,5 @@ void PPPDialog::connectToDevice() { 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); @@ -81,5 +97,5 @@ void PPPDialog::connectToDevice() { << tr("/dev/bluetooth/rfcomm/%1").arg(portNum) << "call" - << cmdLine->text(); + << cmdLine->currentText(); } 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 @@ +/* $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 @@ -39,5 +49,5 @@ namespace OpieTooth { protected: QVBoxLayout* layout; - QLineEdit* cmdLine; + QComboBox* cmdLine; QPushButton* connectButton; QMultiLineEdit* outPut; |