summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/TODO3
-rw-r--r--noncore/settings/networksettings/ppp/edit.cpp3
-rw-r--r--noncore/settings/networksettings/ppp/pppdargs.cpp31
-rw-r--r--noncore/settings/networksettings/ppp/pppdargs.h2
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
@@ -176,13 +176,12 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount
176 } 176 }
177 177
178 numbersChanged(); 178 numbersChanged();
179 tl->activate(); 179 tl->activate();
180} 180}
181 181
182
183bool DialWidget::save() { 182bool 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() ||
186 !_pppdata->isUniqueAccname(connectname_l->text())) { 185 !_pppdata->isUniqueAccname(connectname_l->text())) {
187 return false; 186 return false;
188 } else { 187 } else {
@@ -257,13 +256,13 @@ void DialWidget::downNumber() {
257 } 256 }
258} 257}
259 258
260 259
261void DialWidget::pppdargsbutton() { 260void DialWidget::pppdargsbutton() {
262 PPPdArguments pa(_pppdata, this); 261 PPPdArguments pa(_pppdata, this);
263 pa.exec(); 262 pa.exec();
264} 263}
265 264
266 265
267 266
268///////////////////////////////////////////////////////////////////////////// 267/////////////////////////////////////////////////////////////////////////////
269// ExecWidget 268// 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 @@
24 * License along with this program; if not, write to the Free 24 * License along with this program; if not, write to the Free
25 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 25 * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 */ 26 */
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
37PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name) 35PPPdArguments::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);
44 l->addLayout(tl); 42 l->addLayout(tl);
45 QVBoxLayout *l1 = new QVBoxLayout(); 43 QVBoxLayout *l1 = new QVBoxLayout();
46 QVBoxLayout *l2 = new QVBoxLayout(); 44 QVBoxLayout *l2 = new QVBoxLayout();
47 tl->addLayout(l1, 1); 45 tl->addLayout(l1, 1);
48 tl->addLayout(l2, 0); 46 tl->addLayout(l2, 0);
49 47
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);
57 connect(argument, SIGNAL(returnPressed()), 55 connect(argument, SIGNAL(returnPressed()),
58 SLOT(addbutton())); 56 SLOT(addbutton()));
59 l11->addWidget(argument); 57 l11->addWidget(argument);
@@ -63,40 +61,27 @@ PPPdArguments::PPPdArguments( PPPData *pd, QWidget *parent, const char *name)
63 arguments = new QListBox(this); 61 arguments = new QListBox(this);
64 arguments->setMinimumSize(1, fontMetrics().lineSpacing()*10); 62 arguments->setMinimumSize(1, fontMetrics().lineSpacing()*10);
65 connect(arguments, SIGNAL(highlighted(int)), 63 connect(arguments, SIGNAL(highlighted(int)),
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();
100 85
101 add->setEnabled(false); 86 add->setEnabled(false);
102 remove->setEnabled(false); 87 remove->setEnabled(false);
@@ -129,19 +114,19 @@ void PPPdArguments::defaultsbutton() {
129 114
130 // restore old list 115 // restore old list
131 _pppdata->setpppdArgument(arglist); 116 _pppdata->setpppdArgument(arglist);
132} 117}
133 118
134 119
135void PPPdArguments::closebutton() { 120void 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
145void PPPdArguments::init() { 130void PPPdArguments::init() {
146 while(arguments->count()) 131 while(arguments->count())
147 arguments->removeItem(0); 132 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:
42 ~PPPdArguments() {} 42 ~PPPdArguments() {}
43 43
44private slots: 44private 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
52private: 52private:
53 void init(); 53 void init();
54 54