author | tille <tille> | 2003-06-02 14:25:18 (UTC) |
---|---|---|
committer | tille <tille> | 2003-06-02 14:25:18 (UTC) |
commit | c1e61c513803b05eea14de18604ef05d2f73d5a7 (patch) (unidiff) | |
tree | 9b4abc263eda4a6d0e9610bc22074f0d787c28e5 /noncore | |
parent | c74e5cd0fc051750c3d88cba0178f62b8ce3b5bb (diff) | |
download | opie-c1e61c513803b05eea14de18604ef05d2f73d5a7.zip opie-c1e61c513803b05eea14de18604ef05d2f73d5a7.tar.gz opie-c1e61c513803b05eea14de18604ef05d2f73d5a7.tar.bz2 |
save pppd arguments
-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 @@ | |||
1 | - add possibility to input username and password ;) | 1 | - add possibility to input username and password ;) |
2 | - impl. PPPData::copyaccount & PPPData::deleteAccount | 2 | - impl. PPPData::copyaccount & PPPData::deleteAccount |
3 | - update modem attribute inputs when modem has changed | 3 | - update modem attribute inputs when modem has changed |
4 | - fix layout of edit account | 4 | - fix layout of edit account, i.e. get it shown maximised |
5 | - save pppd arguments in edit account | ||
6 | - popup configure modem with the correct account prselected | 5 | - popup configure modem with the correct account prselected |
7 | not quite shure why it does not work... IMHO it should work | 6 | not quite shure why it does not work... IMHO it should work |
8 | - remove interfaces | 7 | - 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 | |||
@@ -179,7 +179,6 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount | |||
179 | tl->activate(); | 179 | tl->activate(); |
180 | } | 180 | } |
181 | 181 | ||
182 | |||
183 | bool DialWidget::save() { | 182 | bool DialWidget::save() { |
184 | //first check to make sure that the account name is unique! | 183 | //first check to make sure that the account name is unique! |
185 | if(connectname_l->text().isEmpty() || | 184 | if(connectname_l->text().isEmpty() || |
@@ -260,7 +259,7 @@ void DialWidget::downNumber() { | |||
260 | 259 | ||
261 | void DialWidget::pppdargsbutton() { | 260 | void DialWidget::pppdargsbutton() { |
262 | PPPdArguments pa(_pppdata, this); | 261 | PPPdArguments pa(_pppdata, this); |
263 | pa.exec(); | 262 | pa.exec(); |
264 | } | 263 | } |
265 | 264 | ||
266 | 265 | ||
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 | |||
@@ -27,17 +27,15 @@ | |||
27 | 27 | ||
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qbuttongroup.h> | 29 | #include <qbuttongroup.h> |
30 | //#include <kwin.h> | ||
31 | #include <qapplication.h> | 30 | #include <qapplication.h> |
32 | #include "pppdargs.h" | 31 | #include "pppdargs.h" |
33 | #include "pppdata.h" | 32 | #include "pppdata.h" |
34 | //#include <klocale.h> | 33 | |
35 | #define i18n QObject::tr | ||
36 | 34 | ||
37 | PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) | 35 | PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) |
38 | : QDialog(parent, name, TRUE), _pppdata(pd) | 36 | : QDialog(parent, name, TRUE), _pppdata(pd) |
39 | { | 37 | { |
40 | setCaption(i18n("Customize pppd Arguments")); | 38 | setCaption(tr("Customize pppd Arguments")); |
41 | // KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); | 39 | // KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); |
42 | QVBoxLayout *l = new QVBoxLayout(this, 10, 10); | 40 | QVBoxLayout *l = new QVBoxLayout(this, 10, 10); |
43 | QHBoxLayout *tl = new QHBoxLayout(10); | 41 | QHBoxLayout *tl = new QHBoxLayout(10); |
@@ -50,7 +48,7 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) | |||
50 | QHBoxLayout *l11 = new QHBoxLayout(10); | 48 | QHBoxLayout *l11 = new QHBoxLayout(10); |
51 | l1->addLayout(l11); | 49 | l1->addLayout(l11); |
52 | 50 | ||
53 | argument_label = new QLabel(i18n("Argument:"), this); | 51 | argument_label = new QLabel(tr("Argument:"), this); |
54 | l11->addWidget(argument_label); | 52 | l11->addWidget(argument_label); |
55 | 53 | ||
56 | argument = new QLineEdit(this); | 54 | argument = new QLineEdit(this); |
@@ -66,34 +64,21 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) | |||
66 | this, SLOT(itemSelected(int))); | 64 | this, SLOT(itemSelected(int))); |
67 | l1->addWidget(arguments, 1); | 65 | l1->addWidget(arguments, 1); |
68 | 66 | ||
69 | add = new QPushButton(i18n("Add"), this); | 67 | add = new QPushButton(tr("Add"), this); |
70 | connect(add, SIGNAL(clicked()), SLOT(addbutton())); | 68 | connect(add, SIGNAL(clicked()), SLOT(addbutton())); |
71 | l2->addWidget(add); | 69 | l2->addWidget(add); |
72 | l2->addStretch(1); | 70 | l2->addStretch(1); |
73 | 71 | ||
74 | remove = new QPushButton(i18n("Remove"), this); | 72 | remove = new QPushButton(tr("Remove"), this); |
75 | connect(remove, SIGNAL(clicked()), SLOT(removebutton())); | 73 | connect(remove, SIGNAL(clicked()), SLOT(removebutton())); |
76 | l2->addWidget(remove); | 74 | l2->addWidget(remove); |
77 | 75 | ||
78 | defaults = new QPushButton(i18n("Defaults"), this); | 76 | defaults = new QPushButton(tr("Defaults"), this); |
79 | connect(defaults, SIGNAL(clicked()), SLOT(defaultsbutton())); | 77 | connect(defaults, SIGNAL(clicked()), SLOT(defaultsbutton())); |
80 | l2->addWidget(defaults); | 78 | l2->addWidget(defaults); |
81 | 79 | ||
82 | l->addSpacing(5); | 80 | l->addSpacing(5); |
83 | 81 | ||
84 | // QButtonGroup *bbox = new QButtonGroup(this); | ||
85 | // // bbox->addStretch(1); | ||
86 | // closebtn = new QPushButton( bbox, i18n("OK")); | ||
87 | // bbox->insert(closebtn); | ||
88 | // connect(closebtn, SIGNAL(clicked()), SLOT(closebutton())); | ||
89 | // QPushButton *cancel = new QPushButton( bbox, i18n("Cancel")); | ||
90 | // bbox->insert(cancel); | ||
91 | // connect(cancel, SIGNAL(clicked()), | ||
92 | // this, SLOT(reject())); | ||
93 | // bbox->layout(); | ||
94 | // l->addWidget(bbox); | ||
95 | |||
96 | // setFixedSize(sizeHint()); | ||
97 | 82 | ||
98 | //load info from gpppdata | 83 | //load info from gpppdata |
99 | init(); | 84 | init(); |
@@ -132,13 +117,13 @@ void PPPdArguments::defaultsbutton() { | |||
132 | } | 117 | } |
133 | 118 | ||
134 | 119 | ||
135 | void PPPdArguments::closebutton() { | 120 | void PPPdArguments::accept() { |
136 | QStringList arglist; | 121 | QStringList arglist; |
137 | for(uint i=0; i < arguments->count(); i++) | 122 | for(uint i=0; i < arguments->count(); i++) |
138 | arglist.append(arguments->text(i)); | 123 | arglist.append(arguments->text(i)); |
139 | _pppdata->setpppdArgument(arglist); | 124 | _pppdata->setpppdArgument(arglist); |
140 | 125 | ||
141 | done(0); | 126 | QDialog::accept(); |
142 | } | 127 | } |
143 | 128 | ||
144 | 129 | ||
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 | |||
@@ -45,7 +45,7 @@ private slots: | |||
45 | void addbutton(); | 45 | void addbutton(); |
46 | void removebutton(); | 46 | void removebutton(); |
47 | void defaultsbutton(); | 47 | void defaultsbutton(); |
48 | void closebutton(); | 48 | virtual void accept(); |
49 | void textChanged(const QString &); | 49 | void textChanged(const QString &); |
50 | void itemSelected(int); | 50 | void itemSelected(int); |
51 | 51 | ||