Diffstat (limited to 'noncore/settings/networksettings/ppp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/TODO | 3 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/edit.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdargs.cpp | 31 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdargs.h | 2 |
4 files changed, 11 insertions, 28 deletions
diff --git a/noncore/settings/networksettings/ppp/TODO b/noncore/settings/networksettings/ppp/TODO index 9425628..529d236 100644 --- a/noncore/settings/networksettings/ppp/TODO +++ b/noncore/settings/networksettings/ppp/TODO @@ -1,8 +1,7 @@ - add possibility to input username and password ;) - impl. PPPData::copyaccount & PPPData::deleteAccount - update modem attribute inputs when modem has changed -- fix layout of edit account -- save pppd arguments in edit account +- fix layout of edit account, i.e. get it shown maximised - popup configure modem with the correct account prselected not quite shure why it does not work... IMHO it should work - remove interfaces diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index 10bc25c..45d6e4f 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp @@ -176,13 +176,12 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount } numbersChanged(); tl->activate(); } - bool DialWidget::save() { //first check to make sure that the account name is unique! if(connectname_l->text().isEmpty() || !_pppdata->isUniqueAccname(connectname_l->text())) { return false; } else { @@ -257,13 +256,13 @@ void DialWidget::downNumber() { } } void DialWidget::pppdargsbutton() { PPPdArguments pa(_pppdata, this); - pa.exec(); + pa.exec(); } ///////////////////////////////////////////////////////////////////////////// // ExecWidget diff --git a/noncore/settings/networksettings/ppp/pppdargs.cpp b/noncore/settings/networksettings/ppp/pppdargs.cpp index d1143cf..66a4d82 100644 --- a/noncore/settings/networksettings/ppp/pppdargs.cpp +++ b/noncore/settings/networksettings/ppp/pppdargs.cpp @@ -24,36 +24,34 @@ * License along with this program; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include <qlayout.h> #include <qbuttongroup.h> -//#include <kwin.h> #include <qapplication.h> #include "pppdargs.h" #include "pppdata.h" -//#include <klocale.h> -#define i18n QObject::tr + PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) : QDialog(parent, name, TRUE), _pppdata(pd) { - setCaption(i18n("Customize pppd Arguments")); + setCaption(tr("Customize pppd Arguments")); // KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); QVBoxLayout *l = new QVBoxLayout(this, 10, 10); QHBoxLayout *tl = new QHBoxLayout(10); l->addLayout(tl); QVBoxLayout *l1 = new QVBoxLayout(); QVBoxLayout *l2 = new QVBoxLayout(); tl->addLayout(l1, 1); tl->addLayout(l2, 0); QHBoxLayout *l11 = new QHBoxLayout(10); l1->addLayout(l11); - argument_label = new QLabel(i18n("Argument:"), this); + argument_label = new QLabel(tr("Argument:"), this); l11->addWidget(argument_label); argument = new QLineEdit(this); connect(argument, SIGNAL(returnPressed()), SLOT(addbutton())); l11->addWidget(argument); @@ -63,40 +61,27 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) arguments = new QListBox(this); arguments->setMinimumSize(1, fontMetrics().lineSpacing()*10); connect(arguments, SIGNAL(highlighted(int)), this, SLOT(itemSelected(int))); l1->addWidget(arguments, 1); - add = new QPushButton(i18n("Add"), this); + add = new QPushButton(tr("Add"), this); connect(add, SIGNAL(clicked()), SLOT(addbutton())); l2->addWidget(add); l2->addStretch(1); - remove = new QPushButton(i18n("Remove"), this); + remove = new QPushButton(tr("Remove"), this); connect(remove, SIGNAL(clicked()), SLOT(removebutton())); l2->addWidget(remove); - defaults = new QPushButton(i18n("Defaults"), this); + defaults = new QPushButton(tr("Defaults"), this); connect(defaults, SIGNAL(clicked()), SLOT(defaultsbutton())); l2->addWidget(defaults); l->addSpacing(5); -// QButtonGroup *bbox = new QButtonGroup(this); -// // bbox->addStretch(1); -// closebtn = new QPushButton( bbox, i18n("OK")); -// bbox->insert(closebtn); -// connect(closebtn, SIGNAL(clicked()), SLOT(closebutton())); -// QPushButton *cancel = new QPushButton( bbox, i18n("Cancel")); -// bbox->insert(cancel); -// connect(cancel, SIGNAL(clicked()), -// this, SLOT(reject())); -// bbox->layout(); -// l->addWidget(bbox); - -// setFixedSize(sizeHint()); //load info from gpppdata init(); add->setEnabled(false); remove->setEnabled(false); @@ -129,19 +114,19 @@ void PPPdArguments::defaultsbutton() { // restore old list _pppdata->setpppdArgument(arglist); } -void PPPdArguments::closebutton() { +void PPPdArguments::accept() { QStringList arglist; for(uint i=0; i < arguments->count(); i++) arglist.append(arguments->text(i)); _pppdata->setpppdArgument(arglist); - done(0); + QDialog::accept(); } void PPPdArguments::init() { while(arguments->count()) arguments->removeItem(0); diff --git a/noncore/settings/networksettings/ppp/pppdargs.h b/noncore/settings/networksettings/ppp/pppdargs.h index 75f0c9d..065b03c 100644 --- a/noncore/settings/networksettings/ppp/pppdargs.h +++ b/noncore/settings/networksettings/ppp/pppdargs.h @@ -42,13 +42,13 @@ public: ~PPPdArguments() {} private slots: void addbutton(); void removebutton(); void defaultsbutton(); - void closebutton(); + virtual void accept(); void textChanged(const QString &); void itemSelected(int); private: void init(); |