author | tille <tille> | 2003-06-02 15:15:18 (UTC) |
---|---|---|
committer | tille <tille> | 2003-06-02 15:15:18 (UTC) |
commit | 59138f775070440bc3c7ccb2c31f7dea176d54da (patch) (unidiff) | |
tree | d8b11524a159696851211c690b0611395b96acea | |
parent | 2d9798f244078089a0305d26509e288bb4a4190e (diff) | |
download | opie-59138f775070440bc3c7ccb2c31f7dea176d54da.zip opie-59138f775070440bc3c7ccb2c31f7dea176d54da.tar.gz opie-59138f775070440bc3c7ccb2c31f7dea176d54da.tar.bz2 |
remove item when interface is removed
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index abf5663..a0b3113 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -83,13 +83,13 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
83 | found = true; | 83 | found = true; |
84 | } | 84 | } |
85 | if(!found){ | 85 | if(!found){ |
86 | if(!(*ni).contains("_")){ | 86 | if(!(*ni).contains("_")){ |
87 | Interface *i = new Interface(this, *ni, false); | 87 | Interface *i = new Interface(this, *ni, false); |
88 | i->setAttached(false); | 88 | i->setAttached(false); |
89 | i->setHardwareName("Disconnected"); | 89 | i->setHardwareName(tr("Disconnected")); |
90 | interfaceNames.insert(i->getInterfaceName(), i); | 90 | interfaceNames.insert(i->getInterfaceName(), i); |
91 | updateInterface(i); | 91 | updateInterface(i); |
92 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | 92 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); |
93 | } | 93 | } |
94 | } | 94 | } |
95 | } | 95 | } |
@@ -385,30 +385,29 @@ void MainWindowImp::removeClicked(){ | |||
385 | Interface *i = interfaceItems[item]; | 385 | Interface *i = interfaceItems[item]; |
386 | if(i->getModuleOwner() == NULL){ | 386 | if(i->getModuleOwner() == NULL){ |
387 | QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok); | 387 | QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok); |
388 | } | 388 | } |
389 | else{ | 389 | else{ |
390 | if(!i->getModuleOwner()->remove(i)) | 390 | if(!i->getModuleOwner()->remove(i)) |
391 | QMessageBox::information(this, "Error", "Unable to remove.", QMessageBox::Ok); | 391 | QMessageBox::information(this, tr("Error"), tr("Unable to remove."), QMessageBox::Ok); |
392 | else{ | 392 | else{ |
393 | QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok); | 393 | delete item; |
394 | // TODO memory managment.... | 394 | // QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok); |
395 | // who deletes the interface? | ||
396 | } | 395 | } |
397 | } | 396 | } |
398 | } | 397 | } |
399 | 398 | ||
400 | /** | 399 | /** |
401 | * Pull up the configure about the currently selected interface. | 400 | * Pull up the configure about the currently selected interface. |
402 | * Report an error if no interface is selected. | 401 | * Report an error if no interface is selected. |
403 | * If the interface has a module owner then request its configure. | 402 | * If the interface has a module owner then request its configure. |
404 | */ | 403 | */ |
405 | void MainWindowImp::configureClicked(){ | 404 | void MainWindowImp::configureClicked(){ |
406 | QListViewItem *item = connectionList->currentItem(); | 405 | QListViewItem *item = connectionList->currentItem(); |
407 | if(!item){ | 406 | if(!item){ |
408 | QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); | 407 | QMessageBox::information(this, tr("Sorry"),tr("Please select an interface first."), QMessageBox::Ok); |
409 | return; | 408 | return; |
410 | } | 409 | } |
411 | 410 | ||
412 | QString currentProfileText = currentProfileLabel->text(); | 411 | QString currentProfileText = currentProfileLabel->text(); |
413 | if(currentProfileText.upper() == "ALL"); | 412 | if(currentProfileText.upper() == "ALL"); |
414 | currentProfileText = ""; | 413 | currentProfileText = ""; |