author | tille <tille> | 2003-06-03 14:08:04 (UTC) |
---|---|---|
committer | tille <tille> | 2003-06-03 14:08:04 (UTC) |
commit | 60d9f66d2b31c659ac652c15423ecaca89a5f312 (patch) (unidiff) | |
tree | bfda269b58eb1c72893057d9d7fae5a6a2e45abc | |
parent | aaf7709f64dda5a6cb81eeb96e421ba4189654d6 (diff) | |
download | opie-60d9f66d2b31c659ac652c15423ecaca89a5f312.zip opie-60d9f66d2b31c659ac652c15423ecaca89a5f312.tar.gz opie-60d9f66d2b31c659ac652c15423ecaca89a5f312.tar.bz2 |
authentication (except when passwd not stored)
and minor things
17 files changed, 313 insertions, 156 deletions
diff --git a/noncore/settings/networksettings/ppp/TODO b/noncore/settings/networksettings/ppp/TODO index 5635438..80fc5a6 100644 --- a/noncore/settings/networksettings/ppp/TODO +++ b/noncore/settings/networksettings/ppp/TODO | |||
@@ -1,7 +1,9 @@ | |||
1 | - add possibility to input username and password ;) | 1 | - ask for password is non is set |
2 | - impl. PPPData::copyaccount & PPPData::deleteAccount | 2 | |
3 | - stop pppd, i.e. fix interfaceinformationppp | ||
4 | |||
3 | - update modem attribute inputs when modem has changed | 5 | - update modem attribute inputs when modem has changed |
4 | - fix layout of edit account, i.e. get it shown maximised | 6 | - impl. PPPData::copyaccount & PPPData::deleteAccount |
5 | - popup configure modem with the correct account prselected | ||
6 | not quite shure why it does not work... IMHO it should work | ||
7 | 7 | ||
8 | - check if the same interface device combination allready exists | ||
9 | - fix layout of edit account, i.e. get it shown maximised | ||
diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp index f704c84..7760d5e 100644 --- a/noncore/settings/networksettings/ppp/accounts.cpp +++ b/noncore/settings/networksettings/ppp/accounts.cpp | |||
@@ -28,33 +28,35 @@ | |||
28 | #include <stdlib.h> | 28 | #include <stdlib.h> |
29 | #include <qlayout.h> | 29 | #include <qlayout.h> |
30 | #include <qtabwidget.h> | 30 | #include <qtabwidget.h> |
31 | #include <qtabdialog.h> | 31 | #include <qtabdialog.h> |
32 | #include <qwhatsthis.h> | 32 | #include <qwhatsthis.h> |
33 | #include <qmessagebox.h> | 33 | #include <qmessagebox.h> |
34 | 34 | ||
35 | #include <qapplication.h> | 35 | #include <qapplication.h> |
36 | #include <qbuttongroup.h> | 36 | #include <qbuttongroup.h> |
37 | #include <qmessagebox.h> | 37 | #include <qmessagebox.h> |
38 | #include <qvgroupbox.h> | 38 | #include <qvgroupbox.h> |
39 | 39 | ||
40 | #include "pppdata.h" | ||
41 | #include "accounts.h" | 40 | #include "accounts.h" |
41 | #include "authwidget.h" | ||
42 | #include "pppdata.h" | ||
42 | #include "edit.h" | 43 | #include "edit.h" |
43 | 44 | ||
44 | void parseargs(char* buf, char** args); | 45 | void parseargs(char* buf, char** args); |
45 | 46 | ||
46 | AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name ) | 47 | AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name ) |
47 | : QWidget( parent, name ), _pppdata(pd) | 48 | : QWidget( parent, name )//, _pppdata(pd) |
48 | { | 49 | { |
50 | _pppdata = pd; | ||
49 | QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10); | 51 | QVBoxLayout *l1 = new QVBoxLayout(this, 10, 10); |
50 | accountlist_l = new QListBox(this); | 52 | accountlist_l = new QListBox(this); |
51 | 53 | ||
52 | connect(accountlist_l, SIGNAL(highlighted(int)), | 54 | connect(accountlist_l, SIGNAL(highlighted(int)), |
53 | this, SLOT(slotListBoxSelect(int))); | 55 | this, SLOT(slotListBoxSelect(int))); |
54 | connect(accountlist_l, SIGNAL(selected(int)), | 56 | connect(accountlist_l, SIGNAL(selected(int)), |
55 | this, SLOT(editaccount())); | 57 | this, SLOT(editaccount())); |
56 | l1->addWidget(accountlist_l, 10); | 58 | l1->addWidget(accountlist_l, 10); |
57 | 59 | ||
58 | edit_b = new QPushButton(tr("&Edit..."), this); | 60 | edit_b = new QPushButton(tr("&Edit..."), this); |
59 | connect(edit_b, SIGNAL(clicked()), SLOT(editaccount())); | 61 | connect(edit_b, SIGNAL(clicked()), SLOT(editaccount())); |
60 | QWhatsThis::add(edit_b, tr("Allows you to modify the selected account")); | 62 | QWhatsThis::add(edit_b, tr("Allows you to modify the selected account")); |
@@ -77,86 +79,56 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name ) | |||
77 | 79 | ||
78 | delete_b = new QPushButton(tr("De&lete"), this); | 80 | delete_b = new QPushButton(tr("De&lete"), this); |
79 | connect(delete_b, SIGNAL(clicked()), SLOT(deleteaccount())); | 81 | connect(delete_b, SIGNAL(clicked()), SLOT(deleteaccount())); |
80 | l1->addWidget(delete_b); | 82 | l1->addWidget(delete_b); |
81 | QWhatsThis::add(delete_b, | 83 | QWhatsThis::add(delete_b, |
82 | tr("<p>Deletes the selected account\n\n" | 84 | tr("<p>Deletes the selected account\n\n" |
83 | "<font color=\"red\"><b>Use with care!</b></font>")); | 85 | "<font color=\"red\"><b>Use with care!</b></font>")); |
84 | 86 | ||
85 | QHBoxLayout *l12 = new QHBoxLayout; | 87 | QHBoxLayout *l12 = new QHBoxLayout; |
86 | l1->addStretch(1); | 88 | l1->addStretch(1); |
87 | l1->addLayout(l12); | 89 | l1->addLayout(l12); |
88 | 90 | ||
91 | int currAccId = _pppdata->currentAccountID(); | ||
92 | qDebug("currentAccountID %i", currAccId); | ||
93 | |||
89 | //load up account list from gppdata to the list box | 94 | //load up account list from gppdata to the list box |
90 | if(_pppdata->count() > 0) { | 95 | if(_pppdata->count() > 0) { |
91 | for(int i=0; i <= _pppdata->count()-1; i++) { | 96 | for(int i=0; i <= _pppdata->count()-1; i++) { |
92 | _pppdata->setAccountbyIndex(i); | 97 | _pppdata->setAccountbyIndex(i); |
93 | accountlist_l->insertItem(_pppdata->accname()); | 98 | accountlist_l->insertItem(_pppdata->accname()); |
94 | } | 99 | } |
95 | } | 100 | } |
96 | 101 | _pppdata->setAccountbyIndex( currAccId ); | |
97 | 102 | ||
98 | qDebug("setting listview index to %i",_pppdata->currentAccountID() ); | 103 | qDebug("setting listview index to %i",_pppdata->currentAccountID() ); |
99 | accountlist_l->setCurrentItem( _pppdata->currentAccountID() ); | 104 | accountlist_l->setCurrentItem( _pppdata->currentAccountID() ); |
100 | slotListBoxSelect( _pppdata->currentAccountID()); | 105 | slotListBoxSelect( _pppdata->currentAccountID() ); |
101 | 106 | ||
102 | l1->activate(); | 107 | l1->activate(); |
103 | } | 108 | } |
104 | 109 | ||
105 | 110 | ||
106 | 111 | ||
107 | void AccountWidget::slotListBoxSelect(int idx) { | 112 | void AccountWidget::slotListBoxSelect(int idx) { |
108 | delete_b->setEnabled((bool)(idx != -1)); | 113 | delete_b->setEnabled((bool)(idx != -1)); |
109 | edit_b->setEnabled((bool)(idx != -1)); | 114 | edit_b->setEnabled((bool)(idx != -1)); |
110 | copy_b->setEnabled((bool)(idx != -1)); | 115 | copy_b->setEnabled((bool)(idx != -1)); |
111 | if(idx!=-1) { | 116 | if(idx!=-1) { |
112 | qDebug("setting account to %i", idx); | 117 | qDebug("setting account to %i", idx); |
113 | QString account = _pppdata->accname(); | 118 | QString account = _pppdata->accname(); |
114 | _pppdata->setAccountbyIndex(accountlist_l->currentItem()); | 119 | _pppdata->setAccountbyIndex(accountlist_l->currentItem()); |
115 | // _pppdata->setAccount(account); | ||
116 | } | 120 | } |
117 | } | 121 | } |
118 | 122 | ||
119 | |||
120 | // void AccountWidget::viewLogClicked(){ | ||
121 | |||
122 | // QApplication::flushX(); | ||
123 | // if(fork() == 0) { | ||
124 | // setgid(getgid()); | ||
125 | // setuid(getuid()); | ||
126 | // system("kppplogview -kppp"); | ||
127 | // _exit(0); | ||
128 | // } | ||
129 | // } | ||
130 | |||
131 | |||
132 | // void AccountWidget::resetClicked(){ | ||
133 | // if(accountlist_l->currentItem() == -1) | ||
134 | // return; | ||
135 | |||
136 | // // QueryReset dlg(this); | ||
137 | // // int what = dlg.exec(); | ||
138 | |||
139 | // // if(what && QueryReset::COSTS) { | ||
140 | // // emit resetCosts(accountlist_l->text(accountlist_l->currentItem())); | ||
141 | // // costedit->setText("0"); | ||
142 | // // } | ||
143 | |||
144 | // // if(what && QueryReset::VOLUME) { | ||
145 | // // emit resetVolume(accountlist_l->text(accountlist_l->currentItem())); | ||
146 | // // voledit->setText(prettyPrintVolume(0)); | ||
147 | // // } | ||
148 | // } | ||
149 | |||
150 | |||
151 | void AccountWidget::editaccount() { | 123 | void AccountWidget::editaccount() { |
152 | _pppdata->setAccount(accountlist_l->text(accountlist_l->currentItem())); | 124 | _pppdata->setAccount(accountlist_l->text(accountlist_l->currentItem())); |
153 | 125 | ||
154 | int result = doTab(); | 126 | int result = doTab(); |
155 | 127 | ||
156 | if(result == QDialog::Accepted) { | 128 | if(result == QDialog::Accepted) { |
157 | accountlist_l->changeItem(_pppdata->accname(),accountlist_l->currentItem()); | 129 | accountlist_l->changeItem(_pppdata->accname(),accountlist_l->currentItem()); |
158 | // emit resetaccounts(); | 130 | // emit resetaccounts(); |
159 | _pppdata->save(); | 131 | _pppdata->save(); |
160 | } | 132 | } |
161 | } | 133 | } |
162 | 134 | ||
@@ -240,64 +212,63 @@ int AccountWidget::doTab(){ | |||
240 | isnewaccount = true; | 212 | isnewaccount = true; |
241 | } else { | 213 | } else { |
242 | QString tit = tr("Edit Account: "); | 214 | QString tit = tr("Edit Account: "); |
243 | tit += _pppdata->accname(); | 215 | tit += _pppdata->accname(); |
244 | dlg->setCaption(tit); | 216 | dlg->setCaption(tit); |
245 | isnewaccount = false; | 217 | isnewaccount = false; |
246 | } | 218 | } |
247 | 219 | ||
248 | // // DIAL WIDGET | 220 | // // DIAL WIDGET |
249 | dial_w = new DialWidget( _pppdata, tabWindow, isnewaccount, "Dial Setup"); | 221 | dial_w = new DialWidget( _pppdata, tabWindow, isnewaccount, "Dial Setup"); |
250 | tabWindow->addTab( dial_w, tr("Dial") ); | 222 | tabWindow->addTab( dial_w, tr("Dial") ); |
251 | 223 | ||
224 | // // AUTH WIDGET | ||
225 | auth_w = new AuthWidget( _pppdata, tabWindow, isnewaccount, tr("Edit Login Script")); | ||
226 | tabWindow->addTab( auth_w, tr("Authentication") ); | ||
227 | |||
252 | // // IP WIDGET | 228 | // // IP WIDGET |
253 | ip_w = new IPWidget( _pppdata, tabWindow, isnewaccount, tr("IP Setup")); | 229 | ip_w = new IPWidget( _pppdata, tabWindow, isnewaccount, tr("IP Setup")); |
254 | tabWindow->addTab( ip_w, tr("IP") ); | 230 | tabWindow->addTab( ip_w, tr("IP") ); |
255 | 231 | ||
256 | // // GATEWAY WIDGET | 232 | // // GATEWAY WIDGET |
257 | gateway_w = new GatewayWidget( _pppdata, tabWindow, isnewaccount, tr("Gateway Setup")); | 233 | gateway_w = new GatewayWidget( _pppdata, tabWindow, isnewaccount, tr("Gateway Setup")); |
258 | tabWindow->addTab( gateway_w, tr("Gateway") ); | 234 | tabWindow->addTab( gateway_w, tr("Gateway") ); |
259 | 235 | ||
260 | // // DNS WIDGET | 236 | // // DNS WIDGET |
261 | dns_w = new DNSWidget( _pppdata, tabWindow, isnewaccount, tr("DNS Servers") ); | 237 | dns_w = new DNSWidget( _pppdata, tabWindow, isnewaccount, tr("DNS Servers") ); |
262 | tabWindow->addTab( dns_w, tr("DNS") ); | 238 | tabWindow->addTab( dns_w, tr("DNS") ); |
263 | 239 | ||
264 | // // SCRIPT WIDGET | ||
265 | script_w = new ScriptWidget( _pppdata, tabWindow, isnewaccount, tr("Edit Login Script")); | ||
266 | tabWindow->addTab( script_w, tr("Login Script") ); | ||
267 | |||
268 | // // EXECUTE WIDGET | 240 | // // EXECUTE WIDGET |
269 | ExecWidget *exec_w = new ExecWidget( _pppdata, tabWindow, isnewaccount, tr("Execute Programs")); | 241 | ExecWidget *exec_w = new ExecWidget( _pppdata, tabWindow, isnewaccount, tr("Execute Programs")); |
270 | tabWindow->addTab( exec_w, tr("Execute") ); | 242 | tabWindow->addTab( exec_w, tr("Execute") ); |
271 | 243 | ||
272 | int result = 0; | 244 | int result = 0; |
273 | bool ok = false; | 245 | bool ok = false; |
274 | 246 | ||
275 | while (!ok){ | 247 | while (!ok){ |
276 | // dlg->showMinimized(); | 248 | // dlg->showMinimized(); |
277 | result = dlg->exec(); | 249 | result = dlg->exec(); |
278 | ok = true; | 250 | ok = true; |
279 | 251 | ||
280 | if(result == QDialog::Accepted) { | 252 | if(result == QDialog::Accepted) { |
281 | if (!script_w->check()){ | 253 | if (!auth_w->check()){ |
282 | QMessageBox::critical(this, "error", tr("<qt>Login script has unbalanced loop Start/End<qt>")); | ||
283 | ok = false; | 254 | ok = false; |
284 | } else if(!dial_w->save()) { | 255 | } else if(!dial_w->save()) { |
285 | QMessageBox::critical(this, "error", tr( "You must enter a unique account name")); | 256 | QMessageBox::critical(this, "error", tr( "You must enter a unique account name")); |
286 | ok = false; | 257 | ok = false; |
287 | }else{ | 258 | }else{ |
288 | ip_w->save(); | 259 | ip_w->save(); |
289 | dns_w->save(); | 260 | dns_w->save(); |
290 | gateway_w->save(); | 261 | gateway_w->save(); |
291 | script_w->save(); | 262 | auth_w->save(); |
292 | exec_w->save(); | 263 | exec_w->save(); |
293 | } | 264 | } |
294 | } | 265 | } |
295 | } | 266 | } |
296 | 267 | ||
297 | delete dlg; | 268 | delete dlg; |
298 | 269 | ||
299 | return result; | 270 | return result; |
300 | } | 271 | } |
301 | 272 | ||
302 | 273 | ||
303 | QString AccountWidget::prettyPrintVolume(unsigned int n) { | 274 | QString AccountWidget::prettyPrintVolume(unsigned int n) { |
diff --git a/noncore/settings/networksettings/ppp/accounts.h b/noncore/settings/networksettings/ppp/accounts.h index eae3922..8c16a7c 100644 --- a/noncore/settings/networksettings/ppp/accounts.h +++ b/noncore/settings/networksettings/ppp/accounts.h | |||
@@ -29,25 +29,25 @@ | |||
29 | 29 | ||
30 | #include <qwidget.h> | 30 | #include <qwidget.h> |
31 | #include <qdialog.h> | 31 | #include <qdialog.h> |
32 | #include <qpushbutton.h> | 32 | #include <qpushbutton.h> |
33 | #include <qlistbox.h> | 33 | #include <qlistbox.h> |
34 | //#include "acctselect.h" | 34 | //#include "acctselect.h" |
35 | 35 | ||
36 | class QDialog; | 36 | class QDialog; |
37 | class QCheckBox; | 37 | class QCheckBox; |
38 | class QLineEdit; | 38 | class QLineEdit; |
39 | class QTabWidget; | 39 | class QTabWidget; |
40 | class DialWidget; | 40 | class DialWidget; |
41 | class ScriptWidget; | 41 | class AuthWidget; |
42 | class IPWidget; | 42 | class IPWidget; |
43 | class DNSWidget; | 43 | class DNSWidget; |
44 | class GatewayWidget; | 44 | class GatewayWidget; |
45 | class PPPData; | 45 | class PPPData; |
46 | 46 | ||
47 | class AccountWidget : public QWidget { | 47 | class AccountWidget : public QWidget { |
48 | Q_OBJECT | 48 | Q_OBJECT |
49 | public: | 49 | public: |
50 | AccountWidget( PPPData *pd, QWidget *parent=0, const char *name=0 ); | 50 | AccountWidget( PPPData *pd, QWidget *parent=0, const char *name=0 ); |
51 | ~AccountWidget() {} | 51 | ~AccountWidget() {} |
52 | 52 | ||
53 | private slots: | 53 | private slots: |
@@ -63,38 +63,24 @@ private: | |||
63 | signals: | 63 | signals: |
64 | void resetaccounts(); | 64 | void resetaccounts(); |
65 | 65 | ||
66 | private: | 66 | private: |
67 | QString prettyPrintVolume(unsigned int); | 67 | QString prettyPrintVolume(unsigned int); |
68 | 68 | ||
69 | PPPData *_pppdata; | 69 | PPPData *_pppdata; |
70 | QTabWidget *tabWindow; | 70 | QTabWidget *tabWindow; |
71 | DialWidget *dial_w; | 71 | DialWidget *dial_w; |
72 | IPWidget *ip_w; | 72 | IPWidget *ip_w; |
73 | DNSWidget *dns_w; | 73 | DNSWidget *dns_w; |
74 | GatewayWidget *gateway_w; | 74 | GatewayWidget *gateway_w; |
75 | ScriptWidget *script_w; | 75 | AuthWidget *auth_w; |
76 | 76 | ||
77 | QListBox *accountlist_l; | 77 | QListBox *accountlist_l; |
78 | QPushButton *edit_b; | 78 | QPushButton *edit_b; |
79 | QPushButton *copy_b; | 79 | QPushButton *copy_b; |
80 | QPushButton *new_b; | 80 | QPushButton *new_b; |
81 | QPushButton *delete_b; | 81 | QPushButton *delete_b; |
82 | }; | 82 | }; |
83 | 83 | ||
84 | 84 | ||
85 | // class QueryReset : public QDialog { | ||
86 | // Q_OBJECT | ||
87 | // public: | ||
88 | // QueryReset(QWidget *parent); | ||
89 | |||
90 | // enum {COSTS=1, VOLUME=2}; | ||
91 | |||
92 | // private slots: | ||
93 | // void accepted(); | ||
94 | |||
95 | // private: | ||
96 | // QCheckBox *costs, *volume; | ||
97 | // }; | ||
98 | |||
99 | #endif | 85 | #endif |
100 | 86 | ||
diff --git a/noncore/settings/networksettings/ppp/authwidget.cpp b/noncore/settings/networksettings/ppp/authwidget.cpp new file mode 100644 index 0000000..86bea98 --- a/dev/null +++ b/noncore/settings/networksettings/ppp/authwidget.cpp | |||
@@ -0,0 +1,195 @@ | |||
1 | |||
2 | #include <qlayout.h> | ||
3 | #include <qmessagebox.h> | ||
4 | #include <qtoolbutton.h> | ||
5 | #include <qwhatsthis.h> | ||
6 | |||
7 | #include "auth.h" | ||
8 | #include "authwidget.h" | ||
9 | #include "edit.h" | ||
10 | #include "pppdata.h" | ||
11 | |||
12 | |||
13 | static const char* const image0_data[] = { | ||
14 | "16 16 2 1", | ||
15 | ". c None", | ||
16 | "# c #000000", | ||
17 | "................", | ||
18 | "...#...###...##.", | ||
19 | "..#.#..#..#.##..", | ||
20 | "..###..###.##...", | ||
21 | ".#...#.#..##....", | ||
22 | ".#...#.#.##.....", | ||
23 | "........##.#..#.", | ||
24 | "..##...##...##..", | ||
25 | ".#..#.###...##..", | ||
26 | ".#...##..#.#..#.", | ||
27 | ".#..##..........", | ||
28 | ".#.##.#..#.#..#.", | ||
29 | "..##...##...##..", | ||
30 | ".##....##...##..", | ||
31 | ".#....#..#.#..#.", | ||
32 | "................"}; | ||
33 | |||
34 | |||
35 | AuthWidget::AuthWidget(PPPData *pd, QWidget *parent, bool isnewaccount, const char *name ) | ||
36 | : QWidget( parent, name), | ||
37 | scriptWidget(0), | ||
38 | _pppdata(pd), | ||
39 | isNewAccount(isnewaccount) | ||
40 | { | ||
41 | layout = new QGridLayout(this); | ||
42 | |||
43 | auth_l = new QLabel(tr("Authentication: "), this); | ||
44 | layout->addWidget(auth_l, 0, 0); | ||
45 | |||
46 | auth = new QComboBox(this); | ||
47 | auth->insertItem(tr("Script-based")); | ||
48 | auth->insertItem(tr("PAP")); | ||
49 | auth->insertItem(tr("Terminal-based")); | ||
50 | auth->insertItem(tr("CHAP")); | ||
51 | auth->insertItem(tr("PAP/CHAP")); | ||
52 | layout->addWidget(auth, 0, 1); | ||
53 | |||
54 | connect( auth, SIGNAL(activated(const QString&)), | ||
55 | SLOT(authChanged(const QString&))); | ||
56 | |||
57 | QString tmp = tr("<p>Specifies the method used to identify yourself to\n" | ||
58 | "the PPP server. Most universities still use\n" | ||
59 | "<b>Terminal</b>- or <b>Script</b>-based authentication,\n" | ||
60 | "while most ISP use <b>PAP</b> and/or <b>CHAP</b>. If\n" | ||
61 | "unsure, contact your ISP.\n" | ||
62 | "\n" | ||
63 | "If you can choose between PAP and CHAP,\n" | ||
64 | "choose CHAP, because it's much safer. If you don't know\n" | ||
65 | "whether PAP or CHAP is right, choose PAP/CHAP."); | ||
66 | |||
67 | QWhatsThis::add(auth_l,tmp); | ||
68 | QWhatsThis::add(auth,tmp); | ||
69 | |||
70 | user_l = new QLabel( tr("Username: "), this); | ||
71 | layout->addWidget( user_l, 1, 0 ); | ||
72 | userName = new QLineEdit( this, "usernameEdit" ); | ||
73 | layout->addWidget( userName, 1, 1 ); | ||
74 | tmp = tr("Enter your username here..."); | ||
75 | QWhatsThis::add( user_l, tmp ); | ||
76 | QWhatsThis::add( userName, tmp ); | ||
77 | |||
78 | pw_l = new QLabel( tr("Password: "), this); | ||
79 | layout->addWidget( pw_l, 2, 0 ); | ||
80 | passWord = new QLineEdit( this, "pw" ); | ||
81 | passWord->setAutoMask( true ); | ||
82 | passWord->setEchoMode( QLineEdit::Password ); | ||
83 | layout->addWidget( passWord, 2, 1 ); | ||
84 | hidePw = new QToolButton( this ); | ||
85 | hidePw->setPixmap( QPixmap( ( const char** ) image0_data ) ); | ||
86 | hidePw->setToggleButton( true ); | ||
87 | layout->addWidget( hidePw, 2, 2 ); | ||
88 | |||
89 | connect(hidePw, SIGNAL(toggled(bool)), SLOT(toggleEchoMode(bool))); | ||
90 | |||
91 | tmp = tr("Enter your password here"); | ||
92 | QWhatsThis::add( pw_l, tmp ); | ||
93 | QWhatsThis::add( passWord, tmp ); | ||
94 | |||
95 | store_password = new QCheckBox(tr("Store password"), this); | ||
96 | layout->addMultiCellWidget(store_password, 3, 3, 0, 1, AlignRight); | ||
97 | QWhatsThis::add(store_password, | ||
98 | tr("<p>When this is turned on, your ISP password\n" | ||
99 | "will be saved in <i>kppp</i>'s config file, so\n" | ||
100 | "you do not need to type it in every time.\n" | ||
101 | "\n" | ||
102 | "<b><font color=\"red\">Warning:</font> your password will be stored as\n" | ||
103 | "plain text in the config file, which is\n" | ||
104 | "readable only to you. Make sure nobody\n" | ||
105 | "gains access to this file!")); | ||
106 | |||
107 | if (isNewAccount){ | ||
108 | // select PAP/CHAP as default | ||
109 | auth->setCurrentItem(AUTH_PAPCHAP); | ||
110 | store_password->setChecked(true); | ||
111 | }else{ | ||
112 | auth->setCurrentItem(_pppdata->authMethod()); | ||
113 | authChanged( auth->currentText() ); | ||
114 | userName->setText( _pppdata->storedUsername() ); | ||
115 | store_password->setChecked(_pppdata->storePassword()); | ||
116 | if (store_password->isChecked()) | ||
117 | passWord->setText( _pppdata->storedPassword() ); | ||
118 | } | ||
119 | } | ||
120 | |||
121 | bool AuthWidget::check() | ||
122 | { | ||
123 | bool ret = true; | ||
124 | if (scriptWidget){ | ||
125 | if (!scriptWidget->check()){ | ||
126 | QMessageBox::critical(this, tr("error"), tr("<qt>Login script has unbalanced loop Start/End<qt>")); | ||
127 | ret = false; | ||
128 | } | ||
129 | } | ||
130 | return ret; | ||
131 | } | ||
132 | |||
133 | void AuthWidget::save() | ||
134 | { | ||
135 | _pppdata->setAuthMethod(auth->currentItem()); | ||
136 | if (scriptWidget) scriptWidget->save(); | ||
137 | _pppdata->setStoredUsername( userName->text() ); | ||
138 | _pppdata->setStorePassword(store_password->isChecked()); | ||
139 | if (store_password->isChecked()) | ||
140 | _pppdata->setStoredPassword( passWord->text() ); | ||
141 | } | ||
142 | |||
143 | void AuthWidget::authChanged( const QString &authStr ) | ||
144 | { | ||
145 | qDebug("AuthWidget::authChanged( %s )", authStr.latin1() ); | ||
146 | if ( authStr.contains( tr("Script-based") ) ){ | ||
147 | showUsernamePassword( false ); | ||
148 | showScriptWindow( true ); | ||
149 | } else if ( authStr.contains( tr("PAP") ) || | ||
150 | authStr.contains( tr("CHAP") ) ){ | ||
151 | showUsernamePassword( true ); | ||
152 | showScriptWindow( false ); | ||
153 | } else { | ||
154 | qDebug("do not really know how to handle"); | ||
155 | showUsernamePassword( false ); | ||
156 | showScriptWindow( false ); | ||
157 | } | ||
158 | } | ||
159 | |||
160 | |||
161 | void AuthWidget::showUsernamePassword( bool show ) | ||
162 | { | ||
163 | if (show){ | ||
164 | user_l->show(); | ||
165 | userName->show(); | ||
166 | pw_l->show(); | ||
167 | passWord->show(); | ||
168 | store_password->show(); | ||
169 | }else{//!show | ||
170 | user_l->hide(); | ||
171 | userName->hide(); | ||
172 | pw_l->hide(); | ||
173 | passWord->hide(); | ||
174 | store_password->hide(); | ||
175 | } | ||
176 | } | ||
177 | |||
178 | void AuthWidget::showScriptWindow( bool show ) | ||
179 | { | ||
180 | if (show){ | ||
181 | if (!scriptWidget){ | ||
182 | scriptWidget = new ScriptWidget( _pppdata, this, isNewAccount, "scriptWid"); | ||
183 | layout->addMultiCellWidget( scriptWidget, 1, 4, 0, 1 ); | ||
184 | } | ||
185 | scriptWidget->show(); | ||
186 | }else{ // !show | ||
187 | if (scriptWidget) scriptWidget->hide(); | ||
188 | } | ||
189 | } | ||
190 | |||
191 | void AuthWidget::toggleEchoMode( bool t ) | ||
192 | { | ||
193 | passWord->setEchoMode( t ? QLineEdit::Normal : QLineEdit::Password ); | ||
194 | } | ||
195 | |||
diff --git a/noncore/settings/networksettings/ppp/authwidget.h b/noncore/settings/networksettings/ppp/authwidget.h new file mode 100644 index 0000000..33ec4c2 --- a/dev/null +++ b/noncore/settings/networksettings/ppp/authwidget.h | |||
@@ -0,0 +1,46 @@ | |||
1 | #ifndef _AUTHWIDGET_H | ||
2 | #define _AUTHWIDGET_H | ||
3 | |||
4 | #include <qwidget.h> | ||
5 | |||
6 | class ScriptWidget; | ||
7 | class PPPData; | ||
8 | class QCheckBox; | ||
9 | class QComboBox; | ||
10 | class QLabel; | ||
11 | class QGridLayout; | ||
12 | class QLineEdit; | ||
13 | class QToolButton; | ||
14 | |||
15 | class AuthWidget : public QWidget { | ||
16 | Q_OBJECT | ||
17 | public: | ||
18 | AuthWidget(PPPData*, QWidget *parent=0, bool isnewaccount = true, const char *name=0 ); | ||
19 | ~AuthWidget() {}; | ||
20 | |||
21 | public slots: | ||
22 | bool check(); | ||
23 | void save(); | ||
24 | |||
25 | private slots: | ||
26 | void authChanged(const QString&); | ||
27 | void showUsernamePassword(bool); | ||
28 | void showScriptWindow(bool); | ||
29 | void toggleEchoMode(bool); | ||
30 | |||
31 | private: | ||
32 | ScriptWidget *scriptWidget; | ||
33 | PPPData *_pppdata; | ||
34 | bool isNewAccount; | ||
35 | QGridLayout *layout; | ||
36 | QComboBox *auth; | ||
37 | QLabel *auth_l; | ||
38 | QLabel *user_l; | ||
39 | QLineEdit *userName; | ||
40 | QLabel *pw_l; | ||
41 | QLineEdit *passWord; | ||
42 | QToolButton *hidePw; | ||
43 | QCheckBox *store_password; | ||
44 | }; | ||
45 | |||
46 | #endif | ||
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp index 89d9930..a93f93d 100644 --- a/noncore/settings/networksettings/ppp/connect.cpp +++ b/noncore/settings/networksettings/ppp/connect.cpp | |||
@@ -115,24 +115,25 @@ ConnectWidget::ConnectWidget(InterfacePPP *ifp, QWidget *parent, const char *nam | |||
115 | // messg->setMinimumWidth(messw); | 115 | // messg->setMinimumWidth(messw); |
116 | messg->setText(i18n("Offline")); | 116 | messg->setText(i18n("Offline")); |
117 | l0->addSpacing(10); | 117 | l0->addSpacing(10); |
118 | l0->addWidget(messg); | 118 | l0->addWidget(messg); |
119 | l0->addSpacing(10); | 119 | l0->addSpacing(10); |
120 | 120 | ||
121 | QHBoxLayout *l1 = new QHBoxLayout(10); | 121 | QHBoxLayout *l1 = new QHBoxLayout(10); |
122 | tl->addLayout(l1); | 122 | tl->addLayout(l1); |
123 | l1->addStretch(1); | 123 | l1->addStretch(1); |
124 | 124 | ||
125 | debug = new QPushButton(i18n("Log"), this); | 125 | debug = new QPushButton(i18n("Log"), this); |
126 | debug->setToggleButton(true); | 126 | debug->setToggleButton(true); |
127 | debug->setEnabled( false ); // FIXME: disable the log button | ||
127 | connect(debug, SIGNAL(clicked()), SIGNAL(toggleDebugWindow())); | 128 | connect(debug, SIGNAL(clicked()), SIGNAL(toggleDebugWindow())); |
128 | 129 | ||
129 | cancel = new QPushButton(i18n("Cancel"), this); | 130 | cancel = new QPushButton(i18n("Cancel"), this); |
130 | cancel->setFocus(); | 131 | cancel->setFocus(); |
131 | connect(cancel, SIGNAL(clicked()), SLOT(cancelbutton())); | 132 | connect(cancel, SIGNAL(clicked()), SLOT(cancelbutton())); |
132 | 133 | ||
133 | // int maxw = QMAX(cancel->sizeHint().width(), | 134 | // int maxw = QMAX(cancel->sizeHint().width(), |
134 | // debug->sizeHint().width()); | 135 | // debug->sizeHint().width()); |
135 | // maxw = QMAX(maxw,65); | 136 | // maxw = QMAX(maxw,65); |
136 | // debug->setFixedWidth(maxw); | 137 | // debug->setFixedWidth(maxw); |
137 | // cancel->setFixedWidth(maxw); | 138 | // cancel->setFixedWidth(maxw); |
138 | l1->addWidget(debug); | 139 | l1->addWidget(debug); |
diff --git a/noncore/settings/networksettings/ppp/edit.cpp b/noncore/settings/networksettings/ppp/edit.cpp index 45d6e4f..b880978 100644 --- a/noncore/settings/networksettings/ppp/edit.cpp +++ b/noncore/settings/networksettings/ppp/edit.cpp | |||
@@ -25,37 +25,38 @@ | |||
25 | 25 | ||
26 | #include <string.h> | 26 | #include <string.h> |
27 | #include <termios.h> | 27 | #include <termios.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qmessagebox.h> | 29 | #include <qmessagebox.h> |
30 | #include <qwhatsthis.h> | 30 | #include <qwhatsthis.h> |
31 | #include <qregexp.h> | 31 | #include <qregexp.h> |
32 | #include <qapplication.h> | 32 | #include <qapplication.h> |
33 | #include <qbuttongroup.h> | 33 | #include <qbuttongroup.h> |
34 | #include <qvgroupbox.h> | 34 | #include <qvgroupbox.h> |
35 | #include <qhbox.h> | 35 | #include <qhbox.h> |
36 | #include <qdialog.h> | 36 | #include <qdialog.h> |
37 | #include <qpe/resource.h> | ||
37 | 38 | ||
38 | #include "edit.h" | 39 | #include "edit.h" |
39 | #include "pppdata.h" | 40 | #include "pppdata.h" |
40 | #include "iplined.h" | 41 | #include "iplined.h" |
41 | #include "auth.h" | 42 | #include "auth.h" |
42 | 43 | ||
43 | DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount | 44 | DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount |
44 | , const char *name ) | 45 | , const char *name ) |
45 | : QWidget(parent, name), _pppdata(pd) | 46 | : QWidget(parent, name), _pppdata(pd) |
46 | { | 47 | { |
47 | const int GRIDROWS = 6; | 48 | const int GRIDROWS = 6; |
48 | 49 | ||
49 | QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 );//, KDialog::spacingHint()); | 50 | QGridLayout *tl = new QGridLayout(this, GRIDROWS, 2, 0 ); |
50 | 51 | ||
51 | connect_label = new QLabel(tr("Connection name:"), this); | 52 | connect_label = new QLabel(tr("Connection name:"), this); |
52 | tl->addWidget(connect_label, 0, 0); | 53 | tl->addWidget(connect_label, 0, 0); |
53 | 54 | ||
54 | connectname_l = new QLineEdit(this); | 55 | connectname_l = new QLineEdit(this); |
55 | // connectname_l->setMaxLength(ACCNAME_SIZE); | 56 | // connectname_l->setMaxLength(ACCNAME_SIZE); |
56 | tl->addWidget(connectname_l, 0, 1); | 57 | tl->addWidget(connectname_l, 0, 1); |
57 | QString tmp = tr("Type in a unique name for this connection"); | 58 | QString tmp = tr("Type in a unique name for this connection"); |
58 | 59 | ||
59 | QWhatsThis::add(connect_label,tmp); | 60 | QWhatsThis::add(connect_label,tmp); |
60 | QWhatsThis::add(connectname_l,tmp); | 61 | QWhatsThis::add(connectname_l,tmp); |
61 | 62 | ||
@@ -66,29 +67,27 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount | |||
66 | 67 | ||
67 | QHBoxLayout *lpn = new QHBoxLayout(5); | 68 | QHBoxLayout *lpn = new QHBoxLayout(5); |
68 | tl->addLayout(lpn, 1, 1); | 69 | tl->addLayout(lpn, 1, 1); |
69 | numbers = new QListBox(this); | 70 | numbers = new QListBox(this); |
70 | // numbers->setMinimumSize(120, 70); | 71 | // numbers->setMinimumSize(120, 70); |
71 | lpn->addWidget(numbers); | 72 | lpn->addWidget(numbers); |
72 | QVBoxLayout *lpn1 = new QVBoxLayout; | 73 | QVBoxLayout *lpn1 = new QVBoxLayout; |
73 | lpn->addLayout(lpn1); | 74 | lpn->addLayout(lpn1); |
74 | add = new QPushButton(tr("&Add..."), this); | 75 | add = new QPushButton(tr("&Add..."), this); |
75 | del = new QPushButton(tr("&Remove"), this); | 76 | del = new QPushButton(tr("&Remove"), this); |
76 | 77 | ||
77 | up = new QPushButton(this); | 78 | up = new QPushButton(this); |
78 | //FIXME: QPixmap pm = BarIcon("up"); | 79 | up->setPixmap( Resource::loadPixmap("inline/up") ); |
79 | // up->setPixmap(pm); | ||
80 | down = new QPushButton(this); | 80 | down = new QPushButton(this); |
81 | //FIXME: pm = BarIcon("down"); | 81 | down->setPixmap( Resource::loadPixmap("inline/down") ); |
82 | // down->setPixmap(pm); | ||
83 | lpn1->addWidget(add); | 82 | lpn1->addWidget(add); |
84 | lpn1->addWidget(del); | 83 | lpn1->addWidget(del); |
85 | lpn1->addStretch(1); | 84 | lpn1->addStretch(1); |
86 | lpn1->addWidget(up); | 85 | lpn1->addWidget(up); |
87 | lpn1->addWidget(down); | 86 | lpn1->addWidget(down); |
88 | connect(add, SIGNAL(clicked()), | 87 | connect(add, SIGNAL(clicked()), |
89 | this, SLOT(addNumber())); | 88 | this, SLOT(addNumber())); |
90 | connect(del, SIGNAL(clicked()), | 89 | connect(del, SIGNAL(clicked()), |
91 | this, SLOT(delNumber())); | 90 | this, SLOT(delNumber())); |
92 | connect(up, SIGNAL(clicked()), | 91 | connect(up, SIGNAL(clicked()), |
93 | this, SLOT(upNumber())); | 92 | this, SLOT(upNumber())); |
94 | connect(down, SIGNAL(clicked()), | 93 | connect(down, SIGNAL(clicked()), |
@@ -99,113 +98,70 @@ DialWidget::DialWidget( PPPData *pd, QWidget *parent, bool isnewaccount | |||
99 | 98 | ||
100 | tmp = tr("<p>Specifies the phone numbers to dial. You\n" | 99 | tmp = tr("<p>Specifies the phone numbers to dial. You\n" |
101 | "can supply multiple numbers here, simply\n" | 100 | "can supply multiple numbers here, simply\n" |
102 | "click on \"Add\". You can arrange the\n" | 101 | "click on \"Add\". You can arrange the\n" |
103 | "order the numbers are tried by using the\n" | 102 | "order the numbers are tried by using the\n" |
104 | "arrow buttons.\n\n" | 103 | "arrow buttons.\n\n" |
105 | "When a number is busy or fails, <i>kppp</i> will \n" | 104 | "When a number is busy or fails, <i>kppp</i> will \n" |
106 | "try the next number and so on"); | 105 | "try the next number and so on"); |
107 | 106 | ||
108 | QWhatsThis::add(number_label,tmp); | 107 | QWhatsThis::add(number_label,tmp); |
109 | QWhatsThis::add(numbers,tmp); | 108 | QWhatsThis::add(numbers,tmp); |
110 | 109 | ||
111 | auth_l = new QLabel(tr("Authentication:"), this); | ||
112 | tl->addWidget(auth_l, 3, 0); | ||
113 | |||
114 | auth = new QComboBox(this); | ||
115 | auth->insertItem(tr("Script-based")); | ||
116 | auth->insertItem(tr("PAP")); | ||
117 | auth->insertItem(tr("Terminal-based")); | ||
118 | auth->insertItem(tr("CHAP")); | ||
119 | auth->insertItem(tr("PAP/CHAP")); | ||
120 | tl->addWidget(auth, 3, 1); | ||
121 | tmp = tr("<p>Specifies the method used to identify yourself to\n" | ||
122 | "the PPP server. Most universities still use\n" | ||
123 | "<b>Terminal</b>- or <b>Script</b>-based authentication,\n" | ||
124 | "while most ISP use <b>PAP</b> and/or <b>CHAP</b>. If\n" | ||
125 | "unsure, contact your ISP.\n" | ||
126 | "\n" | ||
127 | "If you can choose between PAP and CHAP,\n" | ||
128 | "choose CHAP, because it's much safer. If you don't know\n" | ||
129 | "whether PAP or CHAP is right, choose PAP/CHAP."); | ||
130 | |||
131 | QWhatsThis::add(auth_l,tmp); | ||
132 | QWhatsThis::add(auth,tmp); | ||
133 | |||
134 | store_password = new QCheckBox(tr("Store password"), this); | ||
135 | store_password->setChecked(true); | ||
136 | tl->addMultiCellWidget(store_password, 4, 4, 0, 1, AlignRight); | ||
137 | QWhatsThis::add(store_password, | ||
138 | tr("<p>When this is turned on, your ISP password\n" | ||
139 | "will be saved in <i>kppp</i>'s config file, so\n" | ||
140 | "you do not need to type it in every time.\n" | ||
141 | "\n" | ||
142 | "<b><font color=\"red\">Warning:</font> your password will be stored as\n" | ||
143 | "plain text in the config file, which is\n" | ||
144 | "readable only to you. Make sure nobody\n" | ||
145 | "gains access to this file!")); | ||
146 | |||
147 | pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this); | 110 | pppdargs = new QPushButton(tr("Customize pppd Arguments..."), this); |
148 | connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton())); | 111 | connect(pppdargs, SIGNAL(clicked()), SLOT(pppdargsbutton())); |
149 | tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter); | 112 | tl->addMultiCellWidget(pppdargs, 5, 5, 0, 1, AlignCenter); |
150 | 113 | ||
151 | // Set defaults if editing an existing connection | 114 | // Set defaults if editing an existing connection |
152 | if(!isnewaccount) { | 115 | if(!isnewaccount) { |
153 | connectname_l->setText(_pppdata->accname()); | 116 | connectname_l->setText(_pppdata->accname()); |
154 | 117 | ||
155 | // insert the phone numbers into the listbox | 118 | // insert the phone numbers into the listbox |
156 | QString n = _pppdata->phonenumber(); | 119 | QString n = _pppdata->phonenumber(); |
157 | QString tmp = ""; | 120 | QString tmp = ""; |
158 | uint idx = 0; | 121 | uint idx = 0; |
159 | while(idx != n.length()) { | 122 | while(idx != n.length()) { |
160 | if(n[idx] == ':') { | 123 | if(n[idx] == ':') { |
161 | if(tmp.length() > 0) | 124 | if(tmp.length() > 0) |
162 | numbers->insertItem(tmp); | 125 | numbers->insertItem(tmp); |
163 | tmp = ""; | 126 | tmp = ""; |
164 | } else | 127 | } else |
165 | tmp += n[idx]; | 128 | tmp += n[idx]; |
166 | idx++; | 129 | idx++; |
167 | } | 130 | } |
168 | if(tmp.length() > 0) | 131 | if(tmp.length() > 0) |
169 | numbers->insertItem(tmp); | 132 | numbers->insertItem(tmp); |
170 | 133 | ||
171 | auth->setCurrentItem(_pppdata->authMethod()); | ||
172 | store_password->setChecked(_pppdata->storePassword()); | ||
173 | } else { | ||
174 | // select PAP/CHAP as default | ||
175 | auth->setCurrentItem(AUTH_PAPCHAP); | ||
176 | } | 134 | } |
177 | 135 | ||
178 | numbersChanged(); | 136 | numbersChanged(); |
179 | tl->activate(); | 137 | tl->activate(); |
180 | } | 138 | } |
181 | 139 | ||
182 | bool DialWidget::save() { | 140 | bool DialWidget::save() { |
183 | //first check to make sure that the account name is unique! | 141 | //first check to make sure that the account name is unique! |
184 | if(connectname_l->text().isEmpty() || | 142 | if(connectname_l->text().isEmpty() || |
185 | !_pppdata->isUniqueAccname(connectname_l->text())) { | 143 | !_pppdata->isUniqueAccname(connectname_l->text())) { |
186 | return false; | 144 | return false; |
187 | } else { | 145 | } else { |
188 | _pppdata->setAccname(connectname_l->text()); | 146 | _pppdata->setAccname(connectname_l->text()); |
189 | 147 | ||
190 | QString number = ""; | 148 | QString number = ""; |
191 | for(uint i = 0; i < numbers->count(); i++) { | 149 | for(uint i = 0; i < numbers->count(); i++) { |
192 | if(i != 0) | 150 | if(i != 0) |
193 | number += ":"; | 151 | number += ":"; |
194 | number += numbers->text(i); | 152 | number += numbers->text(i); |
195 | } | 153 | } |
196 | 154 | ||
197 | _pppdata->setPhonenumber(number); | 155 | _pppdata->setPhonenumber(number); |
198 | _pppdata->setAuthMethod(auth->currentItem()); | ||
199 | _pppdata->setStorePassword(store_password->isChecked()); | ||
200 | return true; | 156 | return true; |
201 | } | 157 | } |
202 | } | 158 | } |
203 | 159 | ||
204 | 160 | ||
205 | void DialWidget::numbersChanged() { | 161 | void DialWidget::numbersChanged() { |
206 | int sel = numbers->currentItem(); | 162 | int sel = numbers->currentItem(); |
207 | 163 | ||
208 | del->setEnabled(sel != -1); | 164 | del->setEnabled(sel != -1); |
209 | up->setEnabled(sel != -1 && sel != 0); | 165 | up->setEnabled(sel != -1 && sel != 0); |
210 | down->setEnabled(sel != -1 && sel != (int)numbers->count()-1); | 166 | down->setEnabled(sel != -1 && sel != (int)numbers->count()-1); |
211 | } | 167 | } |
diff --git a/noncore/settings/networksettings/ppp/edit.h b/noncore/settings/networksettings/ppp/edit.h index 2cc0fed..8b5ec03 100644 --- a/noncore/settings/networksettings/ppp/edit.h +++ b/noncore/settings/networksettings/ppp/edit.h | |||
@@ -61,27 +61,24 @@ public slots: | |||
61 | void numbersChanged(); | 61 | void numbersChanged(); |
62 | void selectionChanged(int); | 62 | void selectionChanged(int); |
63 | void addNumber(); | 63 | void addNumber(); |
64 | void delNumber(); | 64 | void delNumber(); |
65 | void upNumber(); | 65 | void upNumber(); |
66 | void downNumber(); | 66 | void downNumber(); |
67 | 67 | ||
68 | private: | 68 | private: |
69 | QLineEdit *connectname_l; | 69 | QLineEdit *connectname_l; |
70 | QLabel *connect_label; | 70 | QLabel *connect_label; |
71 | QLabel *number_label; | 71 | QLabel *number_label; |
72 | QPushButton *pppdargs; | 72 | QPushButton *pppdargs; |
73 | QComboBox *auth; | ||
74 | QLabel *auth_l; | ||
75 | QCheckBox *store_password; | ||
76 | 73 | ||
77 | // for the phonenumber selection | 74 | // for the phonenumber selection |
78 | QPushButton *add, *del, *up, *down; | 75 | QPushButton *add, *del, *up, *down; |
79 | QListBox *numbers; | 76 | QListBox *numbers; |
80 | PPPData *_pppdata; | 77 | PPPData *_pppdata; |
81 | }; | 78 | }; |
82 | 79 | ||
83 | 80 | ||
84 | ///////////////////////////////////////////////////////////////////////////// | 81 | ///////////////////////////////////////////////////////////////////////////// |
85 | // | 82 | // |
86 | // tab-window to select what to execute when | 83 | // tab-window to select what to execute when |
87 | // | 84 | // |
diff --git a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp index 3cf1167..553daa2 100644 --- a/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp +++ b/noncore/settings/networksettings/ppp/interfaceinformationppp.cpp | |||
@@ -1,32 +1,37 @@ | |||
1 | #include "interfaceinformationppp.h" | 1 | #include "interfaceinformationppp.h" |
2 | 2 | ||
3 | 3 | ||
4 | #include <qpushbutton.h> | 4 | #include <qpushbutton.h> |
5 | #include <qlabel.h> | 5 | #include <qlabel.h> |
6 | //#include <qgroupbox.h> | 6 | //#include <qgroupbox.h> |
7 | #include <qmessagebox.h> | 7 | #include <qmessagebox.h> |
8 | #include <qabstractlayout.h> | ||
8 | 9 | ||
9 | #include "connect.h" | 10 | #include "connect.h" |
10 | #include "conwindow.h" | 11 | #include "conwindow.h" |
11 | 12 | ||
12 | #ifdef QWS | 13 | #ifdef QWS |
13 | #else | 14 | #else |
14 | #define showMaximized show | 15 | #define showMaximized show |
15 | #endif | 16 | #endif |
16 | 17 | ||
17 | /** | 18 | /** |
18 | * Constructor for the InterfaceInformationImp class. This class pretty much | 19 | * Constructor for the InterfaceInformationImp class. This class pretty much |
19 | * just display's information about the interface that is passed to it. | 20 | * just display's information about the interface that is passed to it. |
20 | */ | 21 | */ |
21 | InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags f) | 22 | InterfaceInformationPPP::InterfaceInformationPPP(QWidget *parent, const char *name, Interface *i, WFlags f) |
22 | :InterfaceInformationImp(parent, name, i, f) | 23 | :InterfaceInformationImp(parent, name, i, f) |
23 | { | 24 | { |
24 | qDebug("InterfaceInformationPPP::InterfaceInformationPPP"); | 25 | qDebug("InterfaceInformationPPP::InterfaceInformationPPP"); |
25 | con = new ConnectWidget( (InterfacePPP*)i, this, "con" ); | 26 | con = new ConnectWidget( (InterfacePPP*)i, this, "con" ); |
26 | // InterfaceInformationLayout->addMultiCellWidget( con, 7, 7, 0, 1 ); | 27 | con->setSizePolicy( QSizePolicy(QSizePolicy::MinimumExpanding, |
27 | InterfaceInformationLayout->addWidget( con, 7, 0 ); | 28 | QSizePolicy::Fixed) ); |
29 | QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
30 | InterfaceInformationLayout->addItem( spacer, 7, 0 ); | ||
31 | InterfaceInformationLayout->addMultiCellWidget( con, 8, 8, 0, 1 ); | ||
32 | // InterfaceInformationLayout->addWidget( con, 7, 0 ); | ||
28 | connect(i, SIGNAL(begin_connect()),con, SLOT(preinit())); | 33 | connect(i, SIGNAL(begin_connect()),con, SLOT(preinit())); |
29 | } | 34 | } |
30 | 35 | ||
31 | 36 | ||
32 | 37 | ||
diff --git a/noncore/settings/networksettings/ppp/interfaceppp.cpp b/noncore/settings/networksettings/ppp/interfaceppp.cpp index dc24824..98bb4da 100644 --- a/noncore/settings/networksettings/ppp/interfaceppp.cpp +++ b/noncore/settings/networksettings/ppp/interfaceppp.cpp | |||
@@ -36,30 +36,28 @@ Modem* InterfacePPP::modem() | |||
36 | } | 36 | } |
37 | 37 | ||
38 | bool InterfacePPP::refresh() | 38 | bool InterfacePPP::refresh() |
39 | { | 39 | { |
40 | qDebug("InterfacePPP::refresh()"); | 40 | qDebug("InterfacePPP::refresh()"); |
41 | QMessageBox::information(0,"Not Implemented","This feature is not yet implemneted... ;-("); | 41 | QMessageBox::information(0,"Not Implemented","This feature is not yet implemneted... ;-("); |
42 | return false; | 42 | return false; |
43 | } | 43 | } |
44 | 44 | ||
45 | void InterfacePPP::start() | 45 | void InterfacePPP::start() |
46 | { | 46 | { |
47 | qDebug("InterfacePPP::start"); | 47 | qDebug("InterfacePPP::start"); |
48 | if (data()->storedPassword() != "" ){ | 48 | if (data()->password().isEmpty() ){ |
49 | data()->setPassword(data()->storedPassword()); | 49 | //FIXME: ask for password |
50 | }else{ | ||
51 | //FIXME: | ||
52 | qDebug("using dummy password"); | 50 | qDebug("using dummy password"); |
53 | data()->setPassword( "dummy" ); | 51 | QMessageBox::critical( 0, "no password", "you should be prompted for a password, but you are not! ;-)"); |
54 | } | 52 | } |
55 | 53 | ||
56 | 54 | ||
57 | QFileInfo info(pppdPath()); | 55 | QFileInfo info(pppdPath()); |
58 | 56 | ||
59 | if(!info.exists()){ | 57 | if(!info.exists()){ |
60 | QMessageBox::warning(0, tr("Error"), | 58 | QMessageBox::warning(0, tr("Error"), |
61 | i18n("<qt>Cannot find the PPP daemon!<br>" | 59 | i18n("<qt>Cannot find the PPP daemon!<br>" |
62 | "Make sure that pppd is installed and " | 60 | "Make sure that pppd is installed and " |
63 | "that you have entered the correct path.</qt>")); | 61 | "that you have entered the correct path.</qt>")); |
64 | return; | 62 | return; |
65 | } | 63 | } |
@@ -87,55 +85,56 @@ void InterfacePPP::start() | |||
87 | "and/or adjust the location of the modem device on " | 85 | "and/or adjust the location of the modem device on " |
88 | "the modem tab of " | 86 | "the modem tab of " |
89 | "the setup dialog.</qt>").arg(data()->modemDevice()); | 87 | "the setup dialog.</qt>").arg(data()->modemDevice()); |
90 | QMessageBox::warning(0, tr("Error"), string); | 88 | QMessageBox::warning(0, tr("Error"), string); |
91 | return; | 89 | return; |
92 | } | 90 | } |
93 | 91 | ||
94 | // if this is a PAP or CHAP account, ensure that username is | 92 | // if this is a PAP or CHAP account, ensure that username is |
95 | // supplied | 93 | // supplied |
96 | if(data()->authMethod() == AUTH_PAP || | 94 | if(data()->authMethod() == AUTH_PAP || |
97 | data()->authMethod() == AUTH_CHAP || | 95 | data()->authMethod() == AUTH_CHAP || |
98 | data()->authMethod() == AUTH_PAPCHAP ) { | 96 | data()->authMethod() == AUTH_PAPCHAP ) { |
99 | if(false){ //ID_Edit->text().isEmpty()) { | 97 | if(false){ //FIXME: ID_Edit->text().isEmpty()) { |
100 | QMessageBox::warning(0,tr("Error"), | 98 | QMessageBox::warning(0,tr("Error"), |
101 | i18n("<qt>You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!</qt>")); | 99 | i18n("<qt>You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!</qt>")); |
102 | // FIXME: return; | 100 | // FIXME: return; |
103 | } else { | 101 | } else { |
104 | if(!modem()->setSecret(data()->authMethod(), | 102 | if(!modem()->setSecret(data()->authMethod(), |
105 | PPPData::encodeWord(data()->storedUsername()), | 103 | PPPData::encodeWord(data()->storedUsername()), |
106 | PPPData::encodeWord(data()->password())) | 104 | PPPData::encodeWord(data()->password())) |
107 | ) { | 105 | ) { |
108 | QString s; | 106 | QString s; |
109 | s = i18n("<qt>Cannot create PAP/CHAP authentication<br>" | 107 | s = i18n("<qt>Cannot create PAP/CHAP authentication<br>" |
110 | "file \"%1\"</qt>").arg(PAP_AUTH_FILE); | 108 | "file \"%1\"</qt>").arg(PAP_AUTH_FILE); |
111 | QMessageBox::warning(0, tr("Error"), s); | 109 | QMessageBox::warning(0, tr("Error"), s); |
112 | return; | 110 | return; |
113 | } | 111 | } |
114 | } | 112 | } |
115 | } | 113 | } |
116 | 114 | ||
117 | if (data()->phonenumber().isEmpty()) { | 115 | if (data()->phonenumber().isEmpty()) { |
118 | QString s = i18n("You must specify a telephone number!"); | 116 | QString s = i18n("You must specify a telephone number!"); |
119 | QMessageBox::warning(0, tr("Error"), s); | 117 | QMessageBox::warning(0, tr("Error"), s); |
120 | return; | 118 | return; |
121 | } | 119 | } |
122 | 120 | ||
123 | // this->hide(); | 121 | // SEGFAULTS: |
124 | 122 | // setStatus( true ); | |
125 | QString tit = i18n("Connecting to: %1").arg(data()->accname()); | 123 | // emit updateInterface((Interface*) this); |
126 | // con->setCaption(tit); | ||
127 | |||
128 | // con->show(); | ||
129 | |||
130 | 124 | ||
131 | emit begin_connect(); | 125 | emit begin_connect(); |
132 | 126 | ||
133 | qDebug("InterfacePPP::start END"); | 127 | qDebug("InterfacePPP::start END"); |
134 | } | 128 | } |
135 | 129 | ||
136 | void InterfacePPP::stop() | 130 | void InterfacePPP::stop() |
137 | { | 131 | { |
138 | qDebug("InterfacePPP::stop"); | 132 | qDebug("InterfacePPP::stop"); |
139 | 133 | ||
140 | } | 134 | } |
141 | 135 | ||
136 | void InterfacePPP::save() | ||
137 | { | ||
138 | data()->save(); | ||
139 | emit updateInterface((Interface*) this); | ||
140 | } | ||
diff --git a/noncore/settings/networksettings/ppp/interfaceppp.h b/noncore/settings/networksettings/ppp/interfaceppp.h index 06a4dbf..6eb6a69 100644 --- a/noncore/settings/networksettings/ppp/interfaceppp.h +++ b/noncore/settings/networksettings/ppp/interfaceppp.h | |||
@@ -14,20 +14,21 @@ public: | |||
14 | InterfacePPP(QObject *parent=0, const char *name="PPP", bool status=false); | 14 | InterfacePPP(QObject *parent=0, const char *name="PPP", bool status=false); |
15 | 15 | ||
16 | PPPData* data(); | 16 | PPPData* data(); |
17 | Modem* modem(); | 17 | Modem* modem(); |
18 | 18 | ||
19 | signals: | 19 | signals: |
20 | void begin_connect(); | 20 | void begin_connect(); |
21 | 21 | ||
22 | public slots: | 22 | public slots: |
23 | virtual bool refresh(); | 23 | virtual bool refresh(); |
24 | virtual void start(); | 24 | virtual void start(); |
25 | virtual void stop(); | 25 | virtual void stop(); |
26 | void save(); | ||
26 | 27 | ||
27 | private: | 28 | private: |
28 | Modem *_modemPtr; | 29 | Modem *_modemPtr; |
29 | PPPData *_dataPtr; | 30 | PPPData *_dataPtr; |
30 | }; | 31 | }; |
31 | 32 | ||
32 | 33 | ||
33 | #endif | 34 | #endif |
diff --git a/noncore/settings/networksettings/ppp/kpppwidget.cpp b/noncore/settings/networksettings/ppp/kpppwidget.cpp index 289e9f5..7b5c74d 100644 --- a/noncore/settings/networksettings/ppp/kpppwidget.cpp +++ b/noncore/settings/networksettings/ppp/kpppwidget.cpp | |||
@@ -591,25 +591,25 @@ void KPPPWidget::beginConnect() { | |||
591 | QMessageBox::warning(this, "error", string); | 591 | QMessageBox::warning(this, "error", string); |
592 | return; | 592 | return; |
593 | } | 593 | } |
594 | 594 | ||
595 | // if this is a PAP or CHAP account, ensure that username is | 595 | // if this is a PAP or CHAP account, ensure that username is |
596 | // supplied | 596 | // supplied |
597 | if(_pppdata->authMethod() == AUTH_PAP || | 597 | if(_pppdata->authMethod() == AUTH_PAP || |
598 | _pppdata->authMethod() == AUTH_CHAP || | 598 | _pppdata->authMethod() == AUTH_CHAP || |
599 | _pppdata->authMethod() == AUTH_PAPCHAP ) { | 599 | _pppdata->authMethod() == AUTH_PAPCHAP ) { |
600 | if(ID_Edit->text().isEmpty()) { | 600 | if(ID_Edit->text().isEmpty()) { |
601 | QMessageBox::warning(this,"error", | 601 | QMessageBox::warning(this,"error", |
602 | i18n("You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!")); | 602 | i18n("You have selected the authentication method PAP or CHAP. This requires that you supply a username and a password!")); |
603 | // FIXME: return; | 603 | return; |
604 | } else { | 604 | } else { |
605 | if(!Modem::modem->setSecret(_pppdata->authMethod(), | 605 | if(!Modem::modem->setSecret(_pppdata->authMethod(), |
606 | encodeWord(_pppdata->storedUsername()), | 606 | encodeWord(_pppdata->storedUsername()), |
607 | encodeWord(_pppdata->password()))) { | 607 | encodeWord(_pppdata->password()))) { |
608 | QString s; | 608 | QString s; |
609 | s = i18n("Cannot create PAP/CHAP authentication\n" | 609 | s = i18n("Cannot create PAP/CHAP authentication\n" |
610 | "file \"%1\"").arg(PAP_AUTH_FILE); | 610 | "file \"%1\"").arg(PAP_AUTH_FILE); |
611 | QMessageBox::warning(this, "error", s); | 611 | QMessageBox::warning(this, "error", s); |
612 | return; | 612 | return; |
613 | } | 613 | } |
614 | } | 614 | } |
615 | } | 615 | } |
diff --git a/noncore/settings/networksettings/ppp/ppp.pro b/noncore/settings/networksettings/ppp/ppp.pro index 483aa58..56a7ace 100644 --- a/noncore/settings/networksettings/ppp/ppp.pro +++ b/noncore/settings/networksettings/ppp/ppp.pro | |||
@@ -1,20 +1,18 @@ | |||
1 | #TEMPLATE = app | 1 | #TEMPLATE = app |
2 | # | 2 | # |
3 | TEMPLATE = lib | 3 | TEMPLATE = lib |
4 | #CONFIG += qt warn_on release | 4 | #CONFIG += qt warn_on release |
5 | CONFIG += qt warn_on debug | 5 | CONFIG += qt warn_on debug |
6 | DESTDIR = $(OPIEDIR)/plugins/networksettings | 6 | DESTDIR = $(OPIEDIR)/plugins/networksettings |
7 | HEADERS = pppmodule.h devices.h modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h conwindow.h accounts.h connect.h edit.h scriptedit.h pppdargs.h iplined.h pwentry.h pppconfig.h interfaceinformationppp.h interfaceppp.h | 7 | HEADERS = pppmodule.h devices.h modem.h modeminfo.h pppdata.h kpppconfig.h pppdata.h runtests.h general.h modemcmds.h conwindow.h accounts.h connect.h edit.h scriptedit.h pppdargs.h iplined.h pwentry.h pppconfig.h interfaceinformationppp.h interfaceppp.h authwidget.h |
8 | # kpppwidget.h | 8 | SOURCES = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp conwindow.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp iplined.cpp pwentry.cpp pppconfig.cpp interfaceinformationppp.cpp interfaceppp.cpp authwidget.cpp |
9 | SOURCES = pppmodule.cpp modem.cpp modeminfo.cpp pppdata.cpp runtests.cpp general.cpp modemcmds.cpp conwindow.cpp accounts.cpp connect.cpp edit.cpp scriptedit.cpp pppdargs.cpp iplined.cpp pwentry.cpp pppconfig.cpp interfaceinformationppp.cpp interfaceppp.cpp | ||
10 | # kpppwidget.cpp | ||
11 | INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/ | 9 | INCLUDEPATH+= $(OPIEDIR)/include ../ ../interfaces/ |
12 | DEPENDPATH+= $(OPIEDIR)/include | 10 | DEPENDPATH+= $(OPIEDIR)/include |
13 | LIBS += -lqpe -L../interfaces/ -linterfaces | 11 | LIBS += -lqpe -L../interfaces/ -linterfaces |
14 | INTERFACES= | 12 | INTERFACES= |
15 | TARGET = pppplugin | 13 | TARGET = pppplugin |
16 | VERSION = 1.0.0 | 14 | VERSION = 1.0.0 |
17 | 15 | ||
18 | 16 | ||
19 | 17 | ||
20 | include ( $(OPIEDIR)/include.pro ) | 18 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/settings/networksettings/ppp/pppconfig.cpp b/noncore/settings/networksettings/ppp/pppconfig.cpp index 63f9335..5fa7d3f 100644 --- a/noncore/settings/networksettings/ppp/pppconfig.cpp +++ b/noncore/settings/networksettings/ppp/pppconfig.cpp | |||
@@ -33,40 +33,38 @@ PPPConfigWidget::PPPConfigWidget( InterfacePPP* iface, QWidget *parent, | |||
33 | QVBoxLayout *layout = new QVBoxLayout( this ); | 33 | QVBoxLayout *layout = new QVBoxLayout( this ); |
34 | layout->setSpacing( 0 ); | 34 | layout->setSpacing( 0 ); |
35 | layout->setMargin( 1 ); | 35 | layout->setMargin( 1 ); |
36 | tabWindow = new QTabWidget( this, "tabWidget" ); | 36 | tabWindow = new QTabWidget( this, "tabWidget" ); |
37 | layout->addWidget( tabWindow ); | 37 | layout->addWidget( tabWindow ); |
38 | 38 | ||
39 | accounts = new AccountWidget( interface->data(), tabWindow, "accounts" ); | 39 | accounts = new AccountWidget( interface->data(), tabWindow, "accounts" ); |
40 | tabWindow->addTab( accounts, tr("&Accounts") ); | 40 | tabWindow->addTab( accounts, tr("&Accounts") ); |
41 | modem1 = new ModemWidget( interface, tabWindow, "modem1" ); | 41 | modem1 = new ModemWidget( interface, tabWindow, "modem1" ); |
42 | tabWindow->addTab( modem1, tr("&Device") ); | 42 | tabWindow->addTab( modem1, tr("&Device") ); |
43 | modem2 = new ModemWidget2( interface, tabWindow, "modem2" ); | 43 | modem2 = new ModemWidget2( interface, tabWindow, "modem2" ); |
44 | tabWindow->addTab( modem2, tr("&Modem") ); | 44 | tabWindow->addTab( modem2, tr("&Modem") ); |
45 | // graph = new GraphSetup( tabWindow->addPage( tr("&Graph"), tr("Throughput Graph" ) ) ); | ||
46 | // general = new GeneralWidget( tabWindow->addPage( tr("M&isc"), tr("Miscellaneous Settings") ) ); | ||
47 | 45 | ||
48 | } | 46 | } |
49 | 47 | ||
50 | 48 | ||
51 | PPPConfigWidget::~PPPConfigWidget() | 49 | PPPConfigWidget::~PPPConfigWidget() |
52 | { | 50 | { |
53 | 51 | ||
54 | } | 52 | } |
55 | 53 | ||
56 | void PPPConfigWidget::accept() | 54 | void PPPConfigWidget::accept() |
57 | { | 55 | { |
58 | qDebug("PPPConfigWidget::accept"); | 56 | qDebug("PPPConfigWidget::accept"); |
59 | qDebug(" _pppdata->accname >%s<",interface->data()->accname().latin1()); | 57 | qDebug(" _pppdata->accname >%s<",interface->data()->accname().latin1()); |
60 | qDebug(" interface->getHardwareName >%s<", interface->getHardwareName().latin1()); | 58 | qDebug(" interface->getHardwareName >%s<", interface->getHardwareName().latin1()); |
61 | interface->setInterfaceName( interface->data()->modemDevice() ); | 59 | interface->setInterfaceName( interface->data()->modemDevice() ); |
62 | interface->setHardwareName( interface->data()->accname() ); | 60 | interface->setHardwareName( interface->data()->accname() ); |
63 | interface->data()->save(); | 61 | interface->save(); |
64 | QDialog::accept(); | 62 | QDialog::accept(); |
65 | } | 63 | } |
66 | 64 | ||
67 | 65 | ||
68 | void PPPConfigWidget::reject() | 66 | void PPPConfigWidget::reject() |
69 | { | 67 | { |
70 | interface->data()->cancel(); | 68 | interface->data()->cancel(); |
71 | QDialog::reject(); | 69 | QDialog::reject(); |
72 | } | 70 | } |
diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp index 23db409..8f066ff 100644 --- a/noncore/settings/networksettings/ppp/pppdata.cpp +++ b/noncore/settings/networksettings/ppp/pppdata.cpp | |||
@@ -34,29 +34,30 @@ | |||
34 | #include <qapplication.h> | 34 | #include <qapplication.h> |
35 | // #include <klocale.h> | 35 | // #include <klocale.h> |
36 | // #include <kconfig.h> | 36 | // #include <kconfig.h> |
37 | // #include <kmessagebox.h> | 37 | // #include <kmessagebox.h> |
38 | // #include <kapplication.h> | 38 | // #include <kapplication.h> |
39 | #include <assert.h> | 39 | #include <assert.h> |
40 | 40 | ||
41 | #define SEPARATOR -sseepp- | 41 | #define SEPARATOR -sseepp- |
42 | #define SEP QString("%1SEPARATOR%1") | 42 | #define SEP QString("%1SEPARATOR%1") |
43 | 43 | ||
44 | PPPData::PPPData() | 44 | PPPData::PPPData() |
45 | : modemDeviceGroup(-1), | 45 | : modemDeviceGroup(-1), |
46 | highcount(-1), // start out with no entries | 46 | passwd(""), |
47 | caccount(-1), // set the current account index also | 47 | highcount(-1), // start out with no entries |
48 | suidprocessid(-1), // process ID of setuid child | 48 | caccount(-1), // set the current account index also |
49 | pppdisrunning(false), | 49 | suidprocessid(-1), // process ID of setuid child |
50 | pppderror(0) | 50 | pppdisrunning(false), |
51 | pppderror(0) | ||
51 | { | 52 | { |
52 | highcount = readNumConfig(GENERAL_GRP, NUMACCOUNTS_KEY, 0) - 1; | 53 | highcount = readNumConfig(GENERAL_GRP, NUMACCOUNTS_KEY, 0) - 1; |
53 | 54 | ||
54 | if (highcount > MAX_ACCOUNTS) | 55 | if (highcount > MAX_ACCOUNTS) |
55 | highcount = MAX_ACCOUNTS; | 56 | highcount = MAX_ACCOUNTS; |
56 | 57 | ||
57 | if(highcount >= 0 && defaultAccount().isEmpty()) { | 58 | if(highcount >= 0 && defaultAccount().isEmpty()) { |
58 | setAccountbyIndex(0); | 59 | setAccountbyIndex(0); |
59 | setDefaultAccount(accname()); | 60 | setDefaultAccount(accname()); |
60 | } else if(!setAccount(defaultAccount())) | 61 | } else if(!setAccount(defaultAccount())) |
61 | setDefaultAccount(accname()); | 62 | setDefaultAccount(accname()); |
62 | 63 | ||
@@ -208,26 +209,27 @@ void PPPData::writeListConfig(const QString &group, const QString &key, | |||
208 | listEntries.insert( SEP.arg(group).arg(key), list ); | 209 | listEntries.insert( SEP.arg(group).arg(key), list ); |
209 | sepEntries.insert( SEP.arg(group).arg(key), sep ); | 210 | sepEntries.insert( SEP.arg(group).arg(key), sep ); |
210 | // if (config) { | 211 | // if (config) { |
211 | // config->setGroup(group); | 212 | // config->setGroup(group); |
212 | // config->writeEntry(key, list, sep); | 213 | // config->writeEntry(key, list, sep); |
213 | // } | 214 | // } |
214 | } | 215 | } |
215 | 216 | ||
216 | 217 | ||
217 | // | 218 | // |
218 | // functions to set/return general information | 219 | // functions to set/return general information |
219 | // | 220 | // |
220 | QString PPPData::password() const { | 221 | QString PPPData::password(){ |
221 | return passwd; | 222 | if ( storePassword() ) return storedPassword(); |
223 | else return passwd; | ||
222 | } | 224 | } |
223 | 225 | ||
224 | 226 | ||
225 | void PPPData::setPassword(const QString &pw) { | 227 | void PPPData::setPassword(const QString &pw) { |
226 | passwd = pw; | 228 | passwd = pw; |
227 | } | 229 | } |
228 | 230 | ||
229 | 231 | ||
230 | const QString PPPData::defaultAccount() { | 232 | const QString PPPData::defaultAccount() { |
231 | return readConfig(GENERAL_GRP, DEFAULTACCOUNT_KEY); | 233 | return readConfig(GENERAL_GRP, DEFAULTACCOUNT_KEY); |
232 | } | 234 | } |
233 | 235 | ||
@@ -744,25 +746,25 @@ bool PPPData::isUniqueAccname(const QString &n) { | |||
744 | setAccountbyIndex(i); | 746 | setAccountbyIndex(i); |
745 | if(accname() == n && i != current) { | 747 | if(accname() == n && i != current) { |
746 | setAccountbyIndex(current); | 748 | setAccountbyIndex(current); |
747 | return false; | 749 | return false; |
748 | } | 750 | } |
749 | } | 751 | } |
750 | setAccountbyIndex(current); | 752 | setAccountbyIndex(current); |
751 | return true; | 753 | return true; |
752 | } | 754 | } |
753 | 755 | ||
754 | 756 | ||
755 | bool PPPData::deleteAccount() { | 757 | bool PPPData::deleteAccount() { |
756 | //FIXME: | 758 | //FIXME: PPPData::deleteAccount |
757 | // if(caccount < 0) | 759 | // if(caccount < 0) |
758 | return false; | 760 | return false; |
759 | 761 | ||
760 | // QMap <QString, QString> map; | 762 | // QMap <QString, QString> map; |
761 | // QMap <QString, QString>::Iterator it; | 763 | // QMap <QString, QString>::Iterator it; |
762 | 764 | ||
763 | // // set all entries of the current account to "" | 765 | // // set all entries of the current account to "" |
764 | // map = config->entryMap(cgroup); | 766 | // map = config->entryMap(cgroup); |
765 | // it = map.begin(); | 767 | // it = map.begin(); |
766 | // while (it != map.end()) { | 768 | // while (it != map.end()) { |
767 | // config->writeEntry(it.key(), ""); | 769 | // config->writeEntry(it.key(), ""); |
768 | // it++; | 770 | // it++; |
@@ -817,25 +819,25 @@ int PPPData::newaccount() { | |||
817 | // if(!config) open(); | 819 | // if(!config) open(); |
818 | if (highcount >= MAX_ACCOUNTS) return -1; | 820 | if (highcount >= MAX_ACCOUNTS) return -1; |
819 | 821 | ||
820 | highcount++; | 822 | highcount++; |
821 | setAccountbyIndex(highcount); | 823 | setAccountbyIndex(highcount); |
822 | 824 | ||
823 | setpppdArgumentDefaults(); | 825 | setpppdArgumentDefaults(); |
824 | qDebug("PPPData::newaccount -> %i",caccount); | 826 | qDebug("PPPData::newaccount -> %i",caccount); |
825 | return caccount; | 827 | return caccount; |
826 | } | 828 | } |
827 | 829 | ||
828 | int PPPData::copyaccount(int i) { | 830 | int PPPData::copyaccount(int i) { |
829 | // FIXME | 831 | // FIXME: PPPData::copyaccount |
830 | // if(highcount >= MAX_ACCOUNTS) | 832 | // if(highcount >= MAX_ACCOUNTS) |
831 | return -1; | 833 | return -1; |
832 | 834 | ||
833 | // setAccountbyIndex(i); | 835 | // setAccountbyIndex(i); |
834 | 836 | ||
835 | // QMap <QString, QString> map = config->entryMap(cgroup); | 837 | // QMap <QString, QString> map = config->entryMap(cgroup); |
836 | // QMap <QString, QString>::ConstIterator it = map.begin(); | 838 | // QMap <QString, QString>::ConstIterator it = map.begin(); |
837 | 839 | ||
838 | // QString newname = i18n("%1_copy").arg(accname()); | 840 | // QString newname = i18n("%1_copy").arg(accname()); |
839 | 841 | ||
840 | // newaccount(); | 842 | // newaccount(); |
841 | 843 | ||
@@ -1267,30 +1269,32 @@ QMap<QString,QString> PPPData::getConfiguredInterfaces() | |||
1267 | acc = config.readEntry( ACOUNTS_ACC, "error" ); | 1269 | acc = config.readEntry( ACOUNTS_ACC, "error" ); |
1268 | ifaces.insert( dev, acc ); | 1270 | ifaces.insert( dev, acc ); |
1269 | } | 1271 | } |
1270 | 1272 | ||
1271 | return ifaces; | 1273 | return ifaces; |
1272 | } | 1274 | } |
1273 | 1275 | ||
1274 | void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces ) | 1276 | void PPPData::setConfiguredInterfaces( QMap<QString,QString> ifaces ) |
1275 | { | 1277 | { |
1276 | QMap<QString,QString>::Iterator it; | 1278 | QMap<QString,QString>::Iterator it; |
1277 | int i = 0; | 1279 | int i = 0; |
1278 | Config cfg = config(); | 1280 | Config cfg = config(); |
1279 | for( it = ifaces.begin(); it != ifaces.end(); ++it, ++i ){ | 1281 | for( it = ifaces.begin(); it != ifaces.end(); ++it ){ |
1280 | cfg.setGroup(QString("%1_%1").arg(ACCLIST_GRP).arg(i)); | 1282 | cfg.setGroup(QString("%1_%1").arg(ACCLIST_GRP).arg(i++)); |
1281 | cfg.writeEntry( ACOUNTS_DEV, it.key() ); | 1283 | cfg.writeEntry( ACOUNTS_DEV, it.key() ); |
1282 | cfg.writeEntry( ACOUNTS_ACC, it.data() ); | 1284 | cfg.writeEntry( ACOUNTS_ACC, it.data() ); |
1285 | qDebug("I %i",i); | ||
1283 | } | 1286 | } |
1284 | cfg.setGroup( ACCLIST_GRP ); | 1287 | cfg.setGroup( ACCLIST_GRP ); |
1288 | qDebug("saved %i account settings", i); | ||
1285 | cfg.writeEntry( ACCOUNTS_COUNT, i ); | 1289 | cfg.writeEntry( ACCOUNTS_COUNT, i ); |
1286 | 1290 | ||
1287 | } | 1291 | } |
1288 | 1292 | ||
1289 | /** | 1293 | /** |
1290 | * pppd's getword() function knows about escape characters. | 1294 | * pppd's getword() function knows about escape characters. |
1291 | * If we write the username and password to the secrets file | 1295 | * If we write the username and password to the secrets file |
1292 | * we'll therefore have to escape back slashes. | 1296 | * we'll therefore have to escape back slashes. |
1293 | */ | 1297 | */ |
1294 | QString PPPData::encodeWord(const QString &s) { | 1298 | QString PPPData::encodeWord(const QString &s) { |
1295 | QString r = s; | 1299 | QString r = s; |
1296 | r.replace(QRegExp("\\"), "\\\\"); | 1300 | r.replace(QRegExp("\\"), "\\\\"); |
diff --git a/noncore/settings/networksettings/ppp/pppdata.h b/noncore/settings/networksettings/ppp/pppdata.h index c9cd482..6e1379d 100644 --- a/noncore/settings/networksettings/ppp/pppdata.h +++ b/noncore/settings/networksettings/ppp/pppdata.h | |||
@@ -172,28 +172,28 @@ public: | |||
172 | bool readListConfig(const QString &, const QString &, | 172 | bool readListConfig(const QString &, const QString &, |
173 | QStringList &, char sep = ','); | 173 | QStringList &, char sep = ','); |
174 | void writeConfig(const QString &, const QString &, const QString &); | 174 | void writeConfig(const QString &, const QString &, const QString &); |
175 | void writeConfig(const QString &, const QString &, int); | 175 | void writeConfig(const QString &, const QString &, int); |
176 | void writeListConfig(const QString &, const QString &, | 176 | void writeListConfig(const QString &, const QString &, |
177 | QStringList &, char sep = ','); | 177 | QStringList &, char sep = ','); |
178 | 178 | ||
179 | // return the current account group | 179 | // return the current account group |
180 | QString currentGroup() { return cgroup; } | 180 | QString currentGroup() { return cgroup; } |
181 | QString modemGroup(); | 181 | QString modemGroup(); |
182 | 182 | ||
183 | // functions to set/get general kppp info | 183 | // functions to set/get general kppp info |
184 | QString password() const; | 184 | QString password(); |
185 | void setPassword(const QString &); | 185 | void setPassword(const QString &); |
186 | 186 | ||
187 | int currentAccountID() { return caccount; }; | 187 | int currentAccountID() { return caccount; }; |
188 | const QString defaultAccount(); | 188 | const QString defaultAccount(); |
189 | void setDefaultAccount(const QString &); | 189 | void setDefaultAccount(const QString &); |
190 | 190 | ||
191 | void set_xserver_exit_disconnect(bool set); | 191 | void set_xserver_exit_disconnect(bool set); |
192 | bool get_xserver_exit_disconnect(); | 192 | bool get_xserver_exit_disconnect(); |
193 | 193 | ||
194 | void setPPPDebug(bool set); | 194 | void setPPPDebug(bool set); |
195 | bool getPPPDebug(); | 195 | bool getPPPDebug(); |
196 | 196 | ||
197 | void set_quit_on_disconnect(bool); | 197 | void set_quit_on_disconnect(bool); |
198 | bool quit_on_disconnect(); | 198 | bool quit_on_disconnect(); |
199 | 199 | ||
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index 8c401a9..d4c137b 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp | |||
@@ -71,28 +71,26 @@ QWidget *PPPModule::configure(Interface *i){ | |||
71 | 0, "PPPConfig", false, | 71 | 0, "PPPConfig", false, |
72 | Qt::WDestructiveClose ); | 72 | Qt::WDestructiveClose ); |
73 | return pppconfig; | 73 | return pppconfig; |
74 | } | 74 | } |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * Create, and return the Information Module | 77 | * Create, and return the Information Module |
78 | * @return QWidget* pointer to this modules info. | 78 | * @return QWidget* pointer to this modules info. |
79 | */ | 79 | */ |
80 | QWidget *PPPModule::information(Interface *i){ | 80 | QWidget *PPPModule::information(Interface *i){ |
81 | // We don't have any advanced pppd information widget yet :-D | 81 | // We don't have any advanced pppd information widget yet :-D |
82 | // TODO ^ | 82 | // TODO ^ |
83 | qDebug("return PPPModule::information"); | 83 | |
84 | // InterfaceInformationImp *information = new InterfaceInformationImp( 0, "InterfaceSetupImp", i); | 84 | return new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); |
85 | InterfaceInformationPPP *information = new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); | ||
86 | return information; | ||
87 | } | 85 | } |
88 | 86 | ||
89 | /** | 87 | /** |
90 | * Get all active (up or down) interfaces | 88 | * Get all active (up or down) interfaces |
91 | * @return QList<Interface> A list of interfaces that exsist that havn't | 89 | * @return QList<Interface> A list of interfaces that exsist that havn't |
92 | * been called by isOwner() | 90 | * been called by isOwner() |
93 | */ | 91 | */ |
94 | QList<Interface> PPPModule::getInterfaces(){ | 92 | QList<Interface> PPPModule::getInterfaces(){ |
95 | // List all of the files in the peer directory | 93 | // List all of the files in the peer directory |
96 | qDebug("PPPModule::getInterfaces"); | 94 | qDebug("PPPModule::getInterfaces"); |
97 | return list; | 95 | return list; |
98 | } | 96 | } |