Diffstat (limited to 'noncore/settings/networksettings2/ppp/PPPAuthedit.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/ppp/PPPAuthedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/networksettings2/ppp/PPPAuthedit.cpp b/noncore/settings/networksettings2/ppp/PPPAuthedit.cpp index 450d560..9403694 100644 --- a/noncore/settings/networksettings2/ppp/PPPAuthedit.cpp +++ b/noncore/settings/networksettings2/ppp/PPPAuthedit.cpp | |||
@@ -16,82 +16,82 @@ bool PPPAuthEdit::PAP_Checked( void ) { | |||
16 | ); | 16 | ); |
17 | } | 17 | } |
18 | 18 | ||
19 | QString PPPAuthEdit::acceptable( void ) { | 19 | QString PPPAuthEdit::acceptable( void ) { |
20 | if( Login_RB->isChecked() ) { | 20 | if( Login_RB->isChecked() ) { |
21 | if( LoginSend_LE->text().isEmpty() ) | 21 | if( LoginSend_LE->text().isEmpty() ) |
22 | return tr("Login send missing"); | 22 | return tr("Login send missing"); |
23 | if( LoginExpect_LE->text().isEmpty() ) | 23 | if( LoginExpect_LE->text().isEmpty() ) |
24 | return tr("Login expect missing"); | 24 | return tr("Login expect missing"); |
25 | if( PasswordSend_LE->text().isEmpty() ) | 25 | if( PasswordSend_LE->text().isEmpty() ) |
26 | return tr("Password send missing"); | 26 | return tr("Password send missing"); |
27 | if( PasswordExpect_LE->text().isEmpty() ) | 27 | if( PasswordExpect_LE->text().isEmpty() ) |
28 | return tr("Password expect missing"); | 28 | return tr("Password expect missing"); |
29 | } else if( PAP_Checked() ) { | 29 | } else if( PAP_Checked() ) { |
30 | if( Client_LE->text().isEmpty() ) | 30 | if( Client_LE->text().isEmpty() ) |
31 | return tr("Pap/Chap/EAP client id missing"); | 31 | return tr("Pap/Chap/EAP client id missing"); |
32 | if( Server_LE->text().isEmpty() ) | 32 | if( Server_LE->text().isEmpty() ) |
33 | return tr("Pap/Chap/EAP server id missing"); | 33 | return tr("Pap/Chap/EAP server id missing"); |
34 | if( Secret_LE->text().isEmpty() ) | 34 | if( Secret_LE->text().isEmpty() ) |
35 | return tr("Pap/Chap/EAP secret id missing"); | 35 | return tr("Pap/Chap/EAP secret id missing"); |
36 | } | 36 | } |
37 | return QString(); | 37 | return QString(); |
38 | } | 38 | } |
39 | 39 | ||
40 | bool PPPAuthEdit::commit( PPPData_t & D ) { | 40 | bool PPPAuthEdit::commit( PPPData & D ) { |
41 | bool SM = 0; | 41 | bool SM = 0; |
42 | 42 | ||
43 | if( ( D.Auth.Mode == 0 && ! Login_RB->isChecked() ) || | 43 | if( ( D.Auth.Mode == 0 && ! Login_RB->isChecked() ) || |
44 | ( D.Auth.Mode == 1 && ! PAP_Checked() ) || | 44 | ( D.Auth.Mode == 1 && ! PAP_Checked() ) || |
45 | ( D.Auth.Mode == 2 && ! Terminal_RB->isChecked() ) ) { | 45 | ( D.Auth.Mode == 2 && ! Terminal_RB->isChecked() ) ) { |
46 | // mode modifed | 46 | // mode modifed |
47 | SM = 1; | 47 | SM = 1; |
48 | D.Auth.Mode = ( Login_RB->isChecked() ) ? | 48 | D.Auth.Mode = ( Login_RB->isChecked() ) ? |
49 | 0 : | 49 | 0 : |
50 | ( PAP_Checked() ) ? 1 : 2; | 50 | ( PAP_Checked() ) ? 1 : 2; |
51 | } | 51 | } |
52 | 52 | ||
53 | if( Login_RB->isChecked() ) { | 53 | if( Login_RB->isChecked() ) { |
54 | TXTM( D.Auth.Login.Expect, LoginExpect_LE, SM ); | 54 | TXTM( D.Auth.Login.Expect, LoginExpect_LE, SM ); |
55 | TXTM( D.Auth.Login.Send, LoginSend_LE, SM ); | 55 | TXTM( D.Auth.Login.Send, LoginSend_LE, SM ); |
56 | TXTM( D.Auth.Password.Expect, PasswordExpect_LE, SM ); | 56 | TXTM( D.Auth.Password.Expect, PasswordExpect_LE, SM ); |
57 | TXTM( D.Auth.Password.Send, PasswordSend_LE, SM ); | 57 | TXTM( D.Auth.Password.Send, PasswordSend_LE, SM ); |
58 | } else if( PAP_Checked() ) { | 58 | } else if( PAP_Checked() ) { |
59 | TXTM( D.Auth.Client, Client_LE, SM ); | 59 | TXTM( D.Auth.Client, Client_LE, SM ); |
60 | TXTM( D.Auth.Server, Server_LE, SM ); | 60 | TXTM( D.Auth.Server, Server_LE, SM ); |
61 | TXTM( D.Auth.Secret, Secret_LE, SM ); | 61 | TXTM( D.Auth.Secret, Secret_LE, SM ); |
62 | if( Pap_RB->isChecked() ) { | 62 | if( Pap_RB->isChecked() ) { |
63 | D.Auth.PCEMode = 0; | 63 | D.Auth.PCEMode = 0; |
64 | } else if( Chap_RB->isChecked() ) { | 64 | } else if( Chap_RB->isChecked() ) { |
65 | D.Auth.PCEMode = 1; | 65 | D.Auth.PCEMode = 1; |
66 | } else if( EAP_RB->isChecked() ) { | 66 | } else if( EAP_RB->isChecked() ) { |
67 | D.Auth.PCEMode = 2; | 67 | D.Auth.PCEMode = 2; |
68 | } | 68 | } |
69 | } | 69 | } |
70 | return SM; | 70 | return SM; |
71 | } | 71 | } |
72 | 72 | ||
73 | void PPPAuthEdit::showData( PPPData_t & D ) { | 73 | void PPPAuthEdit::showData( PPPData & D ) { |
74 | 74 | ||
75 | switch( D.Auth.Mode ) { | 75 | switch( D.Auth.Mode ) { |
76 | case 0 : | 76 | case 0 : |
77 | Login_RB->setChecked( TRUE ); | 77 | Login_RB->setChecked( TRUE ); |
78 | break; | 78 | break; |
79 | case 1 : | 79 | case 1 : |
80 | switch( D.Auth.PCEMode ) { | 80 | switch( D.Auth.PCEMode ) { |
81 | case 0 : | 81 | case 0 : |
82 | Pap_RB->setChecked( TRUE ); | 82 | Pap_RB->setChecked( TRUE ); |
83 | break; | 83 | break; |
84 | case 1 : | 84 | case 1 : |
85 | Chap_RB->setChecked( TRUE ); | 85 | Chap_RB->setChecked( TRUE ); |
86 | break; | 86 | break; |
87 | case 2 : | 87 | case 2 : |
88 | EAP_RB->setChecked( TRUE ); | 88 | EAP_RB->setChecked( TRUE ); |
89 | break; | 89 | break; |
90 | } | 90 | } |
91 | break; | 91 | break; |
92 | case 2 : | 92 | case 2 : |
93 | Terminal_RB->setChecked( TRUE ); | 93 | Terminal_RB->setChecked( TRUE ); |
94 | break; | 94 | break; |
95 | } | 95 | } |
96 | 96 | ||
97 | LoginExpect_LE->setText( D.Auth.Login.Expect ); | 97 | LoginExpect_LE->setText( D.Auth.Login.Expect ); |