Diffstat (limited to 'noncore/settings/networksettings2/ppp/PPPAuthedit.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/settings/networksettings2/ppp/PPPAuthedit.cpp | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/noncore/settings/networksettings2/ppp/PPPAuthedit.cpp b/noncore/settings/networksettings2/ppp/PPPAuthedit.cpp index f305cc4..450d560 100644 --- a/noncore/settings/networksettings2/ppp/PPPAuthedit.cpp +++ b/noncore/settings/networksettings2/ppp/PPPAuthedit.cpp @@ -11,2 +11,9 @@ PPPAuthEdit::PPPAuthEdit( QWidget * Parent ) : PPPAuthGUI( Parent ){ +bool PPPAuthEdit::PAP_Checked( void ) { + return ( Pap_RB->isChecked() || + Chap_RB->isChecked() || + EAP_RB->isChecked() + ); +} + QString PPPAuthEdit::acceptable( void ) { @@ -21,3 +28,3 @@ QString PPPAuthEdit::acceptable( void ) { return tr("Password expect missing"); - } else if( PapChap_RB->isChecked() ) { + } else if( PAP_Checked() ) { if( Client_LE->text().isEmpty() ) @@ -36,3 +43,3 @@ bool PPPAuthEdit::commit( PPPData_t & D ) { if( ( D.Auth.Mode == 0 && ! Login_RB->isChecked() ) || - ( D.Auth.Mode == 1 && ! PapChap_RB->isChecked() ) || + ( D.Auth.Mode == 1 && ! PAP_Checked() ) || ( D.Auth.Mode == 2 && ! Terminal_RB->isChecked() ) ) { @@ -42,4 +49,3 @@ bool PPPAuthEdit::commit( PPPData_t & D ) { 0 : - ( ( PapChap_RB->isChecked() ) ? - 1 : 2 ); + ( PAP_Checked() ) ? 1 : 2; } @@ -51,3 +57,3 @@ bool PPPAuthEdit::commit( PPPData_t & D ) { TXTM( D.Auth.Password.Send, PasswordSend_LE, SM ); - } else if( PapChap_RB->isChecked() ) { + } else if( PAP_Checked() ) { TXTM( D.Auth.Client, Client_LE, SM ); @@ -55,3 +61,9 @@ bool PPPAuthEdit::commit( PPPData_t & D ) { TXTM( D.Auth.Secret, Secret_LE, SM ); - CIM( D.Auth.PCEMode, AuthMethod_CB, SM ); + if( Pap_RB->isChecked() ) { + D.Auth.PCEMode = 0; + } else if( Chap_RB->isChecked() ) { + D.Auth.PCEMode = 1; + } else if( EAP_RB->isChecked() ) { + D.Auth.PCEMode = 2; + } } @@ -64,9 +76,19 @@ void PPPAuthEdit::showData( PPPData_t & D ) { case 0 : - Login_RB->isChecked(); + Login_RB->setChecked( TRUE ); + break; + case 1 : + switch( D.Auth.PCEMode ) { + case 0 : + Pap_RB->setChecked( TRUE ); break; case 1 : - PapChap_RB->isChecked(); + Chap_RB->setChecked( TRUE ); break; case 2 : - Terminal_RB->isChecked(); + EAP_RB->setChecked( TRUE ); + break; + } + break; + case 2 : + Terminal_RB->setChecked( TRUE ); break; @@ -82,4 +104,2 @@ void PPPAuthEdit::showData( PPPData_t & D ) { Secret_LE->setText( D.Auth.Secret ); - - AuthMethod_CB->setCurrentItem( D.Auth.PCEMode ); } |