Diffstat (limited to 'noncore/settings/networksettings2/networksettings.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/networksettings.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/noncore/settings/networksettings2/networksettings.cpp b/noncore/settings/networksettings2/networksettings.cpp index 2714dd5..469cec5 100644 --- a/noncore/settings/networksettings2/networksettings.cpp +++ b/noncore/settings/networksettings2/networksettings.cpp | |||
@@ -217,53 +217,55 @@ void NetworkSettings::SLOT_EditNode( QListBoxItem * LBI ) { | |||
217 | // we need to retry | 217 | // we need to retry |
218 | while( 1 ) { | 218 | while( 1 ) { |
219 | if( EC.exec() == QDialog::Accepted ) { | 219 | if( EC.exec() == QDialog::Accepted ) { |
220 | // toplevel item -> store | 220 | // toplevel item -> store |
221 | NetworkSetup * NC = EC.networkSetup(); | 221 | NetworkSetup * NC = EC.networkSetup(); |
222 | if( NC->isModified() ) { | 222 | if( NC->isModified() ) { |
223 | if( LBI ) { | 223 | if( LBI ) { |
224 | if( NC->name() != OldName ) { | 224 | if( NC->name() != OldName ) { |
225 | // find if new name is free | 225 | // find if new name is free |
226 | NetworkSetup * LCN = NSResources->findNetworkSetup( | 226 | NetworkSetup * LCN = NSResources->findNetworkSetup( |
227 | NC->name() ); | 227 | NC->name() ); |
228 | if( LCN ) { | 228 | if( LCN ) { |
229 | QMessageBox::warning( | 229 | QMessageBox::warning( |
230 | 0, | 230 | 0, |
231 | tr( "In System Config" ), | 231 | tr( "In System Config" ), |
232 | tr( "Name %1 already exists" ).arg(NC->name()) | 232 | tr( "Name %1 already exists" ).arg(NC->name()) |
233 | ); | 233 | ); |
234 | continue; // restart exec | 234 | continue; // restart exec |
235 | } // else new name | 235 | } // else new name |
236 | // new name -> remove item | 236 | // new name -> remove item |
237 | NSResources->removeNetworkSetup( OldName ); | 237 | NSResources->removeNetworkSetup( OldName ); |
238 | NSResources->addNetworkSetup( NC, 0 ); | 238 | NSResources->addNetworkSetup( NC, 0 ); |
239 | } // else not changed | 239 | } // else not changed |
240 | 240 | ||
241 | // must add it here since change will trigger event | 241 | // no update (will come later) |
242 | Profiles_LB->blockSignals( TRUE ); | ||
242 | Profiles_LB->changeItem( NC->devicePixmap(), | 243 | Profiles_LB->changeItem( NC->devicePixmap(), |
243 | NC->name(), | 244 | NC->name(), |
244 | Profiles_LB->index( LBI ) | 245 | Profiles_LB->index( LBI ) |
245 | ); | 246 | ); |
247 | Profiles_LB->blockSignals( FALSE ); | ||
246 | } else { | 248 | } else { |
247 | // new item | 249 | // new item |
248 | int ci = Profiles_LB->count(); | 250 | int ci = Profiles_LB->count(); |
249 | NSResources->addNetworkSetup( NC, 0 ); | 251 | NSResources->addNetworkSetup( NC, 0 ); |
250 | NC->setNumber( NSResources->assignNetworkSetupNumber() ); | 252 | NC->setNumber( NSResources->assignNetworkSetupNumber() ); |
251 | Profiles_LB->insertItem( NC->devicePixmap(), NC->name() ); | 253 | Profiles_LB->insertItem( NC->devicePixmap(), NC->name() ); |
252 | Profiles_LB->setSelected( ci, TRUE ); | 254 | Profiles_LB->setSelected( ci, TRUE ); |
253 | } | 255 | } |
254 | SLOT_RefreshStates(); | 256 | SLOT_RefreshStates(); |
255 | } | 257 | } |
256 | } else { | 258 | } else { |
257 | // cancelled : reset NetworkSetup | 259 | // cancelled : reset NetworkSetup |
258 | if( LBI ) { | 260 | if( LBI ) { |
259 | NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); | 261 | NetworkSetup * NC = NSResources->findNetworkSetup( LBI->text() ); |
260 | NC->reassign(); | 262 | NC->reassign(); |
261 | } | 263 | } |
262 | } | 264 | } |
263 | break; | 265 | break; |
264 | } | 266 | } |
265 | // reenable | 267 | // reenable |
266 | UpdateTimer->start( 5000 ); | 268 | UpdateTimer->start( 5000 ); |
267 | } | 269 | } |
268 | 270 | ||
269 | void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) { | 271 | void NetworkSettings::SLOT_ShowNode( QListBoxItem * LBI ) { |