author | wimpie <wimpie> | 2005-01-04 01:35:26 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-04 01:35:26 (UTC) |
commit | a9c188235c97e07b0eb96b13adbcdfd4bad64767 (patch) (unidiff) | |
tree | 13f6ae5c499dc0c1d1bd4b763a1973a0fa8635cf /noncore/settings/networksettings2/network/networkedit.cpp | |
parent | 48b6cd5966ec6cc0b968edf10ba1a1ad96ef165f (diff) | |
download | opie-a9c188235c97e07b0eb96b13adbcdfd4bad64767.zip opie-a9c188235c97e07b0eb96b13adbcdfd4bad64767.tar.gz opie-a9c188235c97e07b0eb96b13adbcdfd4bad64767.tar.bz2 |
CONTROL files : changed version string
NS2 many changes and first release of OT2
Diffstat (limited to 'noncore/settings/networksettings2/network/networkedit.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/network/networkedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/networksettings2/network/networkedit.cpp b/noncore/settings/networksettings2/network/networkedit.cpp index 05110d9..d13cb66 100644 --- a/noncore/settings/networksettings2/network/networkedit.cpp +++ b/noncore/settings/networksettings2/network/networkedit.cpp | |||
@@ -44,69 +44,69 @@ QString NetworkEdit::acceptable( void ) { | |||
44 | if( Broadcast_LE->text().isEmpty() ) | 44 | if( Broadcast_LE->text().isEmpty() ) |
45 | return tr("Broadcast needed"); | 45 | return tr("Broadcast needed"); |
46 | if( SubnetMask_LE->text().isEmpty() ) | 46 | if( SubnetMask_LE->text().isEmpty() ) |
47 | return tr("Subnet mask needed"); | 47 | return tr("Subnet mask needed"); |
48 | 48 | ||
49 | // valid IP ? | 49 | // valid IP ? |
50 | if( ! validIP( IPAddress_LE->text() ) ) | 50 | if( ! validIP( IPAddress_LE->text() ) ) |
51 | return tr("IPAddress not valid"); | 51 | return tr("IPAddress not valid"); |
52 | if( ! validIP( SubnetMask_LE->text() ) ) | 52 | if( ! validIP( SubnetMask_LE->text() ) ) |
53 | return tr("Subnet mask not valid"); | 53 | return tr("Subnet mask not valid"); |
54 | if( ! validIP( Broadcast_LE->text() ) ) | 54 | if( ! validIP( Broadcast_LE->text() ) ) |
55 | return tr("Broadcast address not valid"); | 55 | return tr("Broadcast address not valid"); |
56 | if( Gateway_LE->text().isEmpty() || | 56 | if( Gateway_LE->text().isEmpty() || |
57 | ! validIP( Gateway_LE->text() ) ) | 57 | ! validIP( Gateway_LE->text() ) ) |
58 | return tr("Gateway address not valid"); | 58 | return tr("Gateway address not valid"); |
59 | if( ! DNS1_LE->text().isEmpty() && | 59 | if( ! DNS1_LE->text().isEmpty() && |
60 | ! validIP( DNS1_LE->text() ) ) | 60 | ! validIP( DNS1_LE->text() ) ) |
61 | return tr("DNS1 address not valid"); | 61 | return tr("DNS1 address not valid"); |
62 | if( ! DNS2_LE->text().isEmpty() && | 62 | if( ! DNS2_LE->text().isEmpty() && |
63 | ! validIP( DNS2_LE->text() ) ) | 63 | ! validIP( DNS2_LE->text() ) ) |
64 | return tr("DNS2 address not valid"); | 64 | return tr("DNS2 address not valid"); |
65 | return QString(); | 65 | return QString(); |
66 | } | 66 | } |
67 | 67 | ||
68 | bool NetworkEdit::commit( NetworkData_t & Data ) { | 68 | bool NetworkEdit::commit( NetworkData & Data ) { |
69 | bool SM = 0; | 69 | bool SM = 0; |
70 | CBM( Data.UseDHCP, DHCP_CB, SM ); | 70 | CBM( Data.UseDHCP, DHCP_CB, SM ); |
71 | TXTM( Data.IPAddress, IPAddress_LE, SM ); | 71 | TXTM( Data.IPAddress, IPAddress_LE, SM ); |
72 | CBM( Data.SendHostname, SendHostname_CB, SM ); | 72 | CBM( Data.SendHostname, SendHostname_CB, SM ); |
73 | TXTM( Data.Hostname, Hostname_LE, SM ); | 73 | TXTM( Data.Hostname, Hostname_LE, SM ); |
74 | TXTM( Data.Gateway, Gateway_LE, SM ); | 74 | TXTM( Data.Gateway, Gateway_LE, SM ); |
75 | TXTM( Data.Broadcast, Broadcast_LE, SM ); | 75 | TXTM( Data.Broadcast, Broadcast_LE, SM ); |
76 | TXTM( Data.NetMask, SubnetMask_LE, SM ); | 76 | TXTM( Data.NetMask, SubnetMask_LE, SM ); |
77 | TXTM( Data.DNS1, DNS1_LE, SM ); | 77 | TXTM( Data.DNS1, DNS1_LE, SM ); |
78 | TXTM( Data.DNS2, DNS2_LE, SM ); | 78 | TXTM( Data.DNS2, DNS2_LE, SM ); |
79 | 79 | ||
80 | SM |= updateList( Data.PreUp_SL, PreUp_LB ); | 80 | SM |= updateList( Data.PreUp_SL, PreUp_LB ); |
81 | SM |= updateList( Data.PostUp_SL, PostUp_LB ); | 81 | SM |= updateList( Data.PostUp_SL, PostUp_LB ); |
82 | SM |= updateList( Data.PreDown_SL, PreDown_LB ); | 82 | SM |= updateList( Data.PreDown_SL, PreDown_LB ); |
83 | SM |= updateList( Data.PostDown_SL, PostDown_LB ); | 83 | SM |= updateList( Data.PostDown_SL, PostDown_LB ); |
84 | 84 | ||
85 | return SM; | 85 | return SM; |
86 | } | 86 | } |
87 | 87 | ||
88 | void NetworkEdit::showData( NetworkData_t & Data ) { | 88 | void NetworkEdit::showData( NetworkData & Data ) { |
89 | DHCP_CB->setChecked( Data.UseDHCP ); | 89 | DHCP_CB->setChecked( Data.UseDHCP ); |
90 | SendHostname_CB->setChecked( Data.SendHostname ); | 90 | SendHostname_CB->setChecked( Data.SendHostname ); |
91 | Hostname_LE->setText( Data.Hostname ); | 91 | Hostname_LE->setText( Data.Hostname ); |
92 | IPAddress_LE->setText( Data.IPAddress ); | 92 | IPAddress_LE->setText( Data.IPAddress ); |
93 | Gateway_LE->setText( Data.Gateway ); | 93 | Gateway_LE->setText( Data.Gateway ); |
94 | SubnetMask_LE->setText( Data.NetMask ); | 94 | SubnetMask_LE->setText( Data.NetMask ); |
95 | Broadcast_LE->setText( Data.Broadcast ); | 95 | Broadcast_LE->setText( Data.Broadcast ); |
96 | DNS1_LE->setText( Data.DNS1 ); | 96 | DNS1_LE->setText( Data.DNS1 ); |
97 | DNS2_LE->setText( Data.DNS2 ); | 97 | DNS2_LE->setText( Data.DNS2 ); |
98 | 98 | ||
99 | populateList( Data.PreUp_SL, PreUp_LB ); | 99 | populateList( Data.PreUp_SL, PreUp_LB ); |
100 | populateList( Data.PostUp_SL, PostUp_LB ); | 100 | populateList( Data.PostUp_SL, PostUp_LB ); |
101 | populateList( Data.PreDown_SL, PreDown_LB ); | 101 | populateList( Data.PreDown_SL, PreDown_LB ); |
102 | populateList( Data.PostDown_SL, PostDown_LB ); | 102 | populateList( Data.PostDown_SL, PostDown_LB ); |
103 | } | 103 | } |
104 | 104 | ||
105 | bool NetworkEdit::updateList( QStringList & SL, QListBox * LB ) { | 105 | bool NetworkEdit::updateList( QStringList & SL, QListBox * LB ) { |
106 | bool Changed; | 106 | bool Changed; |
107 | QStringList NewSL; | 107 | QStringList NewSL; |
108 | 108 | ||
109 | // collect new list | 109 | // collect new list |
110 | for( unsigned int i = 0; i < LB->count() ; i ++ ) { | 110 | for( unsigned int i = 0; i < LB->count() ; i ++ ) { |
111 | NewSL.append( LB->text(i) ); | 111 | NewSL.append( LB->text(i) ); |
112 | } | 112 | } |