i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Network Preflet: EthernetSettingsView::_BuildInterfacesMenu()

Browse Source 
needs to call SetTargetForItems(), otherwise selecting interfaces
in the popup menu doesn't work.
This commit is contained in:
Stefano Ceccherini
2014-09-07 07:51:29 +02:00
parent 5bde266926
commit 7da4809bfc
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/network/EthernetSettingsView.cpp
+12 -1
View File
@@ -341,6 +341,12 @@ void
EthernetSettingsView::_BuildInterfacesMenu() EthernetSettingsView::_BuildInterfacesMenu()
{ {
BMenu* menu = fDeviceMenuField->Menu(); BMenu* menu = fDeviceMenuField->Menu();
BMenuItem* marked = menu->FindMarked();
BString markedName;
if (marked != NULL) {
markedName = marked->Label();
marked->SetMarked(false);
}
menu->RemoveItems(0, menu->CountItems(), true); menu->RemoveItems(0, menu->CountItems(), true);
for (int32 i = 0; i < fInterfaces.CountItems(); i++) { for (int32 i = 0; i < fInterfaces.CountItems(); i++) {
@@ -352,9 +358,15 @@ EthernetSettingsView::_BuildInterfacesMenu()
menu->AddItem(item); menu->AddItem(item);
} }
if (Window() != NULL)
menu->SetTargetForItems(this);
int32 numItems = menu->CountItems(); int32 numItems = menu->CountItems();
if (numItems > 0) { if (numItems > 0) {
fDeviceMenuField->Menu()->SetEnabled(true); fDeviceMenuField->Menu()->SetEnabled(true);
BMenuItem* item = menu->FindItem(markedName.String());
if (item != NULL)
item->SetMarked(true);
} else { } else {
fDeviceMenuField->Menu()->SetEnabled(false); fDeviceMenuField->Menu()->SetEnabled(false);
} }
@@ -405,7 +417,6 @@ EthernetSettingsView::_ShowConfiguration(Settings* settings)
fSecondaryDNSTextControl->SetText(""); fSecondaryDNSTextControl->SetText("");
fDomainTextControl->SetText(""); fDomainTextControl->SetText("");
fDeviceMenuField->SetEnabled(settings != NULL);
fTypeMenuField->SetEnabled(settings != NULL); fTypeMenuField->SetEnabled(settings != NULL);
bool enableControls = false; bool enableControls = false;