Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/authwidget.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/connect.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/ppp/interfaceppp.cpp | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/noncore/settings/networksettings/ppp/authwidget.cpp b/noncore/settings/networksettings/ppp/authwidget.cpp index 86bea98..fa2b164 100644 --- a/noncore/settings/networksettings/ppp/authwidget.cpp +++ b/noncore/settings/networksettings/ppp/authwidget.cpp | |||
@@ -157,30 +157,32 @@ void AuthWidget::authChanged( const QString &authStr ) | |||
157 | } | 157 | } |
158 | } | 158 | } |
159 | 159 | ||
160 | 160 | ||
161 | void AuthWidget::showUsernamePassword( bool show ) | 161 | void AuthWidget::showUsernamePassword( bool show ) |
162 | { | 162 | { |
163 | if (show){ | 163 | if (show){ |
164 | user_l->show(); | 164 | user_l->show(); |
165 | userName->show(); | 165 | userName->show(); |
166 | pw_l->show(); | 166 | pw_l->show(); |
167 | passWord->show(); | 167 | passWord->show(); |
168 | store_password->show(); | 168 | store_password->show(); |
169 | hidePw->show(); | ||
169 | }else{//!show | 170 | }else{//!show |
170 | user_l->hide(); | 171 | user_l->hide(); |
171 | userName->hide(); | 172 | userName->hide(); |
172 | pw_l->hide(); | 173 | pw_l->hide(); |
173 | passWord->hide(); | 174 | passWord->hide(); |
174 | store_password->hide(); | 175 | store_password->hide(); |
176 | hidePw->hide(); | ||
175 | } | 177 | } |
176 | } | 178 | } |
177 | 179 | ||
178 | void AuthWidget::showScriptWindow( bool show ) | 180 | void AuthWidget::showScriptWindow( bool show ) |
179 | { | 181 | { |
180 | if (show){ | 182 | if (show){ |
181 | if (!scriptWidget){ | 183 | if (!scriptWidget){ |
182 | scriptWidget = new ScriptWidget( _pppdata, this, isNewAccount, "scriptWid"); | 184 | scriptWidget = new ScriptWidget( _pppdata, this, isNewAccount, "scriptWid"); |
183 | layout->addMultiCellWidget( scriptWidget, 1, 4, 0, 1 ); | 185 | layout->addMultiCellWidget( scriptWidget, 1, 4, 0, 1 ); |
184 | } | 186 | } |
185 | scriptWidget->show(); | 187 | scriptWidget->show(); |
186 | }else{ // !show | 188 | }else{ // !show |
diff --git a/noncore/settings/networksettings/ppp/connect.cpp b/noncore/settings/networksettings/ppp/connect.cpp index a93f93d..798431b 100644 --- a/noncore/settings/networksettings/ppp/connect.cpp +++ b/noncore/settings/networksettings/ppp/connect.cpp | |||
@@ -590,25 +590,25 @@ void ConnectWidget::timerEvent(QTimerEvent *) { | |||
590 | emit debugMessage(i18n("Answer")); | 590 | emit debugMessage(i18n("Answer")); |
591 | 591 | ||
592 | setExpect(_ifaceppp->data()->modemRingResp()); | 592 | setExpect(_ifaceppp->data()->modemRingResp()); |
593 | vmain = 150; | 593 | vmain = 150; |
594 | return; | 594 | return; |
595 | } | 595 | } |
596 | 596 | ||
597 | if (scriptCommand == "ID") { | 597 | if (scriptCommand == "ID") { |
598 | QString bm = i18n("ID %1").arg(scriptArgument); | 598 | QString bm = i18n("ID %1").arg(scriptArgument); |
599 | messg->setText(bm); | 599 | messg->setText(bm); |
600 | emit debugMessage(bm); | 600 | emit debugMessage(bm); |
601 | 601 | ||
602 | QString idstring = _ifaceppp->data()->storedUsername(); | 602 | QString idstring = _ifaceppp->data()->password(); |
603 | 603 | ||
604 | if(!idstring.isEmpty() && firstrunID) { | 604 | if(!idstring.isEmpty() && firstrunID) { |
605 | // the user entered an Id on the main kppp dialog | 605 | // the user entered an Id on the main kppp dialog |
606 | writeline(idstring); | 606 | writeline(idstring); |
607 | firstrunID = false; | 607 | firstrunID = false; |
608 | scriptindex++; | 608 | scriptindex++; |
609 | } | 609 | } |
610 | else { | 610 | else { |
611 | // the user didn't enter and Id on the main kppp dialog | 611 | // the user didn't enter and Id on the main kppp dialog |
612 | // let's query for an ID | 612 | // let's query for an ID |
613 | /* if not around yet, then post window... */ | 613 | /* if not around yet, then post window... */ |
614 | if (prompt->Consumed()) { | 614 | if (prompt->Consumed()) { |
diff --git a/noncore/settings/networksettings/ppp/interfaceppp.cpp b/noncore/settings/networksettings/ppp/interfaceppp.cpp index 98bb4da..85ddbee 100644 --- a/noncore/settings/networksettings/ppp/interfaceppp.cpp +++ b/noncore/settings/networksettings/ppp/interfaceppp.cpp | |||
@@ -36,29 +36,30 @@ 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()->password().isEmpty() ){ | 48 | // should work... |
49 | //FIXME: ask for password | 49 | // if (data()->password().isEmpty() ){ |
50 | qDebug("using dummy password"); | 50 | // //FIXME: ask for password |
51 | QMessageBox::critical( 0, "no password", "you should be prompted for a password, but you are not! ;-)"); | 51 | // qDebug("using dummy password"); |
52 | } | 52 | // QMessageBox::critical( 0, "no password", "you should be prompted for a password, but you are not! ;-)"); |
53 | // } | ||
53 | 54 | ||
54 | 55 | ||
55 | QFileInfo info(pppdPath()); | 56 | QFileInfo info(pppdPath()); |
56 | 57 | ||
57 | if(!info.exists()){ | 58 | if(!info.exists()){ |
58 | QMessageBox::warning(0, tr("Error"), | 59 | QMessageBox::warning(0, tr("Error"), |
59 | i18n("<qt>Cannot find the PPP daemon!<br>" | 60 | i18n("<qt>Cannot find the PPP daemon!<br>" |
60 | "Make sure that pppd is installed and " | 61 | "Make sure that pppd is installed and " |
61 | "that you have entered the correct path.</qt>")); | 62 | "that you have entered the correct path.</qt>")); |
62 | return; | 63 | return; |
63 | } | 64 | } |
64 | //#if 0 | 65 | //#if 0 |