summaryrefslogtreecommitdiff
authortille <tille>2003-06-02 14:25:18 (UTC)
committer tille <tille>2003-06-02 14:25:18 (UTC)
commitc1e61c513803b05eea14de18604ef05d2f73d5a7 (patch) (side-by-side diff)
tree9b4abc263eda4a6d0e9610bc22074f0d787c28e5
parentc74e5cd0fc051750c3d88cba0178f62b8ce3b5bb (diff)
downloadopie-c1e61c513803b05eea14de18604ef05d2f73d5a7.zip
opie-c1e61c513803b05eea14de18604ef05d2f73d5a7.tar.gz
opie-c1e61c513803b05eea14de18604ef05d2f73d5a7.tar.bz2
save pppd arguments
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/TODO3
-rw-r--r--noncore/settings/networksettings/ppp/edit.cpp1
-rw-r--r--noncore/settings/networksettings/ppp/pppdargs.cpp31
-rw-r--r--noncore/settings/networksettings/ppp/pppdargs.h2
4 files changed, 10 insertions, 27 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
@@ -3,4 +3,3 @@
- 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
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
@@ -181,3 +181,2 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
-
bool DialWidget::save() {
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
@@ -29,3 +29,2 @@
#include <qbuttongroup.h>
-//#include <kwin.h>
#include <qapplication.h>
@@ -33,4 +32,3 @@
#include "pppdata.h"
-//#include <klocale.h>
-#define i18n QObject::tr
+
@@ -39,3 +37,3 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
{
- setCaption(i18n("Customize pppd Arguments"));
+ setCaption(tr("Customize pppd Arguments"));
// KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
@@ -52,3 +50,3 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
- argument_label = new QLabel(i18n("Argument:"), this);
+ argument_label = new QLabel(tr("Argument:"), this);
l11->addWidget(argument_label);
@@ -68,3 +66,3 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
- add = new QPushButton(i18n("Add"), this);
+ add = new QPushButton(tr("Add"), this);
connect(add, SIGNAL(clicked()), SLOT(addbutton()));
@@ -73,3 +71,3 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
- remove = new QPushButton(i18n("Remove"), this);
+ remove = new QPushButton(tr("Remove"), this);
connect(remove, SIGNAL(clicked()), SLOT(removebutton()));
@@ -77,3 +75,3 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
- defaults = new QPushButton(i18n("Defaults"), this);
+ defaults = new QPushButton(tr("Defaults"), this);
connect(defaults, SIGNAL(clicked()), SLOT(defaultsbutton()));
@@ -83,15 +81,2 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
-// 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());
@@ -134,3 +119,3 @@ void PPPdArguments::defaultsbutton() {
-void PPPdArguments::closebutton() {
+void PPPdArguments::accept() {
QStringList arglist;
@@ -140,3 +125,3 @@ void PPPdArguments::closebutton() {
- done(0);
+ QDialog::accept();
}
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
@@ -47,3 +47,3 @@ private slots:
void defaultsbutton();
- void closebutton();
+ virtual void accept();
void textChanged(const QString &);