Diffstat (limited to 'noncore/settings/networksettings/ppp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/TODO | 3 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/edit.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdargs.cpp | 31 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/pppdargs.h | 2 |
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 | |||
@@ -2,6 +2,5 @@ | |||
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 |
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 | |||
@@ -180,5 +180,4 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount | |||
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! |
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 | |||
@@ -28,15 +28,13 @@ | |||
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); |
@@ -51,5 +49,5 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) | |||
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 | ||
@@ -67,14 +65,14 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) | |||
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); |
@@ -82,17 +80,4 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) | |||
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 |
@@ -133,5 +118,5 @@ void PPPdArguments::defaultsbutton() { | |||
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++) |
@@ -139,5 +124,5 @@ void PPPdArguments::closebutton() { | |||
139 | _pppdata->setpppdArgument(arglist); | 124 | _pppdata->setpppdArgument(arglist); |
140 | 125 | ||
141 | done(0); | 126 | QDialog::accept(); |
142 | } | 127 | } |
143 | 128 | ||
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 | |||
@@ -46,5 +46,5 @@ private slots: | |||
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); |