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

* Added a menu field that is only visible when a wireless device is selected,

Browse Source 
and that allows you to force a specific network upon start. That setting isn't
  restored yet when you launch Network, though.
* Also, it shows two bugs in the layout engine.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39834 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-12-13 20:01:14 +00:00
parent 3ca00ffdbc
commit a2158925a6
3 changed files with 88 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/network/EthernetSettingsView.cpp
+81 -26
View File
@@ -14,15 +14,6 @@
#include "EthernetSettingsView.h" #include "EthernetSettingsView.h"
#include <arpa/inet.h>
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_media.h>
#include <net/if_types.h>
#include <netinet/in.h>
#include <sys/socket.h>
#include <sys/sockio.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -42,6 +33,7 @@
#include <GroupView.h> #include <GroupView.h>
#include <MenuField.h> #include <MenuField.h>
#include <MenuItem.h> #include <MenuItem.h>
#include <NetworkDevice.h>
#include <NetworkInterface.h> #include <NetworkInterface.h>
#include <NetworkRoster.h> #include <NetworkRoster.h>
#include <Path.h> #include <Path.h>
@@ -55,6 +47,7 @@
#include <AutoDeleter.h> #include <AutoDeleter.h>
#include "Settings.h" #include "Settings.h"
#include "WirelessNetworkMenuItem.h"
static const uint32 kMsgApply = 'aply'; static const uint32 kMsgApply = 'aply';
@@ -66,6 +59,7 @@ static const uint32 kMsgStaticMode = 'stcm';
static const uint32 kMsgDHCPMode = 'dynm'; static const uint32 kMsgDHCPMode = 'dynm';
static const uint32 kMsgDisabledMode = 'disa'; static const uint32 kMsgDisabledMode = 'disa';
static const uint32 kMsgChange = 'chng'; static const uint32 kMsgChange = 'chng';
static const uint32 kMsgJoinNetwork = 'join';
static void static void
@@ -129,7 +123,7 @@ EthernetSettingsView::EthernetSettingsView()
deviceMenu->AddItem(item); deviceMenu->AddItem(item);
} }
BPopUpMenu* modeMenu = new BPopUpMenu("modes"); BPopUpMenu* modeMenu = new BPopUpMenu("modes");
modeMenu->AddItem(new BMenuItem(B_TRANSLATE("Static"), modeMenu->AddItem(new BMenuItem(B_TRANSLATE("Static"),
new BMessage(kMsgStaticMode))); new BMessage(kMsgStaticMode)));
modeMenu->AddItem(new BMenuItem(B_TRANSLATE("DHCP"), modeMenu->AddItem(new BMenuItem(B_TRANSLATE("DHCP"),
@@ -138,13 +132,19 @@ EthernetSettingsView::EthernetSettingsView()
modeMenu->AddItem(new BMenuItem(B_TRANSLATE("Disabled"), modeMenu->AddItem(new BMenuItem(B_TRANSLATE("Disabled"),
new BMessage(kMsgDisabledMode))); new BMessage(kMsgDisabledMode)));
BPopUpMenu* networkMenu = new BPopUpMenu("networks");
fDeviceMenuField = new BMenuField(B_TRANSLATE("Adapter:"), deviceMenu); fDeviceMenuField = new BMenuField(B_TRANSLATE("Adapter:"), deviceMenu);
layout->AddItem(fDeviceMenuField->CreateLabelLayoutItem(), 0, 0); layout->AddItem(fDeviceMenuField->CreateLabelLayoutItem(), 0, 0);
layout->AddItem(fDeviceMenuField->CreateMenuBarLayoutItem(), 1, 0); layout->AddItem(fDeviceMenuField->CreateMenuBarLayoutItem(), 1, 0);
fNetworkMenuField = new BMenuField(B_TRANSLATE("Network:"), networkMenu);
layout->AddItem(fNetworkMenuField->CreateLabelLayoutItem(), 0, 1);
layout->AddItem(fNetworkMenuField->CreateMenuBarLayoutItem(), 1, 1);
fTypeMenuField = new BMenuField(B_TRANSLATE("Mode:"), modeMenu); fTypeMenuField = new BMenuField(B_TRANSLATE("Mode:"), modeMenu);
layout->AddItem(fTypeMenuField->CreateLabelLayoutItem(), 0, 1); layout->AddItem(fTypeMenuField->CreateLabelLayoutItem(), 0, 2);
layout->AddItem(fTypeMenuField->CreateMenuBarLayoutItem(), 1, 1); layout->AddItem(fTypeMenuField->CreateMenuBarLayoutItem(), 1, 2);
fIPTextControl = new BTextControl(B_TRANSLATE("IP address:"), "", NULL); fIPTextControl = new BTextControl(B_TRANSLATE("IP address:"), "", NULL);
SetupTextControl(fIPTextControl); SetupTextControl(fIPTextControl);
@@ -154,44 +154,44 @@ EthernetSettingsView::EthernetSettingsView()
fIPTextControl->StringWidth("XXX.XXX.XXX.XXX") + inset, fIPTextControl->StringWidth("XXX.XXX.XXX.XXX") + inset,
B_SIZE_UNSET)); B_SIZE_UNSET));
layout->AddItem(fIPTextControl->CreateLabelLayoutItem(), 0, 2); layout->AddItem(fIPTextControl->CreateLabelLayoutItem(), 0, 3);
layout->AddItem(layoutItem, 1, 2); layout->AddItem(layoutItem, 1, 3);
fNetMaskTextControl = new BTextControl(B_TRANSLATE("Netmask:"), "", NULL); fNetMaskTextControl = new BTextControl(B_TRANSLATE("Netmask:"), "", NULL);
SetupTextControl(fNetMaskTextControl); SetupTextControl(fNetMaskTextControl);
layout->AddItem(fNetMaskTextControl->CreateLabelLayoutItem(), 0, 3); layout->AddItem(fNetMaskTextControl->CreateLabelLayoutItem(), 0, 4);
layout->AddItem(fNetMaskTextControl->CreateTextViewLayoutItem(), 1, 3); layout->AddItem(fNetMaskTextControl->CreateTextViewLayoutItem(), 1, 4);
fGatewayTextControl = new BTextControl(B_TRANSLATE("Gateway:"), "", NULL); fGatewayTextControl = new BTextControl(B_TRANSLATE("Gateway:"), "", NULL);
SetupTextControl(fGatewayTextControl); SetupTextControl(fGatewayTextControl);
layout->AddItem(fGatewayTextControl->CreateLabelLayoutItem(), 0, 4); layout->AddItem(fGatewayTextControl->CreateLabelLayoutItem(), 0, 5);
layout->AddItem(fGatewayTextControl->CreateTextViewLayoutItem(), 1, 4); layout->AddItem(fGatewayTextControl->CreateTextViewLayoutItem(), 1, 5);
// TODO: Replace the DNS text controls by a BListView with add/remove // TODO: Replace the DNS text controls by a BListView with add/remove
// functionality and so on... // functionality and so on...
fPrimaryDNSTextControl = new BTextControl(B_TRANSLATE("DNS #1:"), "", fPrimaryDNSTextControl = new BTextControl(B_TRANSLATE("DNS #1:"), "",
NULL); NULL);
SetupTextControl(fPrimaryDNSTextControl); SetupTextControl(fPrimaryDNSTextControl);
layout->AddItem(fPrimaryDNSTextControl->CreateLabelLayoutItem(), 0, 5); layout->AddItem(fPrimaryDNSTextControl->CreateLabelLayoutItem(), 0, 6);
layout->AddItem(fPrimaryDNSTextControl->CreateTextViewLayoutItem(), 1, 5); layout->AddItem(fPrimaryDNSTextControl->CreateTextViewLayoutItem(), 1, 6);
fSecondaryDNSTextControl = new BTextControl(B_TRANSLATE("DNS #2:"), "", fSecondaryDNSTextControl = new BTextControl(B_TRANSLATE("DNS #2:"), "",
NULL); NULL);
SetupTextControl(fSecondaryDNSTextControl); SetupTextControl(fSecondaryDNSTextControl);
layout->AddItem(fSecondaryDNSTextControl->CreateLabelLayoutItem(), 0, 6); layout->AddItem(fSecondaryDNSTextControl->CreateLabelLayoutItem(), 0, 7);
layout->AddItem(fSecondaryDNSTextControl->CreateTextViewLayoutItem(), 1, 6); layout->AddItem(fSecondaryDNSTextControl->CreateTextViewLayoutItem(), 1, 7);
fDomainTextControl = new BTextControl(B_TRANSLATE("Domain:"), "", NULL); fDomainTextControl = new BTextControl(B_TRANSLATE("Domain:"), "", NULL);
SetupTextControl(fDomainTextControl); SetupTextControl(fDomainTextControl);
layout->AddItem(fDomainTextControl->CreateLabelLayoutItem(), 0, 7); layout->AddItem(fDomainTextControl->CreateLabelLayoutItem(), 0, 8);
layout->AddItem(fDomainTextControl->CreateTextViewLayoutItem(), 1, 7); layout->AddItem(fDomainTextControl->CreateTextViewLayoutItem(), 1, 8);
fErrorMessage = new BStringView("error", ""); fErrorMessage = new BStringView("error", "");
fErrorMessage->SetAlignment(B_ALIGN_LEFT); fErrorMessage->SetAlignment(B_ALIGN_LEFT);
fErrorMessage->SetFont(be_bold_font); fErrorMessage->SetFont(be_bold_font);
fErrorMessage->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET)); fErrorMessage->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
layout->AddView(fErrorMessage, 1, 8); layout->AddView(fErrorMessage, 1, 9);
// button group (TODO: move to window, but take care of // button group (TODO: move to window, but take care of
// enabling/disabling) // enabling/disabling)
@@ -230,6 +230,7 @@ EthernetSettingsView::AttachedToWindow()
fSecondaryDNSTextControl->SetTarget(this); fSecondaryDNSTextControl->SetTarget(this);
fDomainTextControl->SetTarget(this); fDomainTextControl->SetTarget(this);
fDeviceMenuField->Menu()->SetTargetForItems(this); fDeviceMenuField->Menu()->SetTargetForItems(this);
fNetworkMenuField->Menu()->SetTargetForItems(this);
fTypeMenuField->Menu()->SetTargetForItems(this); fTypeMenuField->Menu()->SetTargetForItems(this);
// display settigs of first adapter on startup // display settigs of first adapter on startup
@@ -254,7 +255,8 @@ EthernetSettingsView::MessageReceived(BMessage* message)
fApplyButton->SetEnabled(true); fApplyButton->SetEnabled(true);
fRevertButton->SetEnabled(true); fRevertButton->SetEnabled(true);
break; break;
case kMsgInfo: { case kMsgInfo:
{
const char* name; const char* name;
if (message->FindString("interface", &name) != B_OK) if (message->FindString("interface", &name) != B_OK)
break; break;
@@ -325,6 +327,53 @@ EthernetSettingsView::_ShowConfiguration(Settings* settings)
fSecondaryDNSTextControl->SetText(""); fSecondaryDNSTextControl->SetText("");
fDomainTextControl->SetText(""); fDomainTextControl->SetText("");
// Show/hide networks menu
BNetworkDevice device(settings->Name());
if (fNetworkMenuField->IsHidden(fNetworkMenuField)
&& device.IsWireless()) {
fNetworkMenuField->Show();
Window()->InvalidateLayout();
} else if (!fNetworkMenuField->IsHidden(fNetworkMenuField)
&& !device.IsWireless()) {
fNetworkMenuField->Hide();
Window()->InvalidateLayout();
}
if (device.IsWireless()) {
// Rebuild network menu
BMenu* menu = fNetworkMenuField->Menu();
menu->RemoveItems(0, menu->CountItems(), true);
wireless_network network;
int32 count = 0;
uint32 cookie = 0;
while (device.GetNextNetwork(cookie, network) == B_OK) {
BMessage* message = new BMessage(kMsgJoinNetwork);
message->AddString("device", device.Name());
message->AddString("name", network.name);
BMenuItem* item = new WirelessNetworkMenuItem(network.name,
network.signal_strength,
(network.flags & B_NETWORK_IS_ENCRYPTED) != 0, message);
menu->AddItem(item);
count++;
}
if (count == 0) {
BMenuItem* item = new BMenuItem(
B_TRANSLATE("<no wireless networks found>"), NULL);
item->SetEnabled(false);
menu->AddItem(item);
} else {
BMenuItem* item = new BMenuItem(
B_TRANSLATE("Choose automatically"), NULL);
item->SetMarked(true);
menu->AddItem(item, 0);
menu->AddItem(new BSeparatorItem(), 1);
}
menu->SetTargetForItems(this);
}
bool enableControls = false; bool enableControls = false;
fTypeMenuField->SetEnabled(settings != NULL); fTypeMenuField->SetEnabled(settings != NULL);
@@ -495,6 +544,12 @@ EthernetSettingsView::_SaveAdaptersConfiguration()
fprintf(fp, "\t\taddress\t%s\n", settings->IP()); fprintf(fp, "\t\taddress\t%s\n", settings->IP());
fprintf(fp, "\t\tgateway\t%s\n", settings->Gateway()); fprintf(fp, "\t\tgateway\t%s\n", settings->Gateway());
fprintf(fp, "\t\tmask\t%s\n", settings->Netmask()); fprintf(fp, "\t\tmask\t%s\n", settings->Netmask());
if (!fNetworkMenuField->IsHidden(fNetworkMenuField)
&& !fNetworkMenuField->Menu()->ItemAt(0)->IsMarked()) {
BMenuItem* item = fNetworkMenuField->Menu()->FindMarked();
if (item != NULL)
fprintf(fp, "\t\tnetwork\t%s", item->Label());
}
fprintf(fp, "\t}\n"); fprintf(fp, "\t}\n");
} }
fprintf(fp, "}\n\n"); fprintf(fp, "}\n\n");
src/preferences/network/EthernetSettingsView.h
+1
View File
@@ -55,6 +55,7 @@ private:
// TODO: buttons should be moved to window instead // TODO: buttons should be moved to window instead
BMenuField* fDeviceMenuField; BMenuField* fDeviceMenuField;
BMenuField* fNetworkMenuField;
BMenuField* fTypeMenuField; BMenuField* fTypeMenuField;
BTextControl* fIPTextControl; BTextControl* fIPTextControl;
BTextControl* fNetMaskTextControl; BTextControl* fNetMaskTextControl;
src/preferences/network/Jamfile
+6 -2
View File
@@ -1,7 +1,7 @@
SubDir HAIKU_TOP src preferences network ; SubDir HAIKU_TOP src preferences network ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src apps networkstatus ] ;
UsePrivateHeaders shared ; UsePrivateHeaders net shared ;
UsePrivateHeaders net ;
Preference Network : Preference Network :
NetworkApp.cpp NetworkApp.cpp
@@ -9,6 +9,10 @@ Preference Network :
EthernetSettingsView.cpp EthernetSettingsView.cpp
Settings.cpp Settings.cpp
# from NetworkStatus
RadioView.cpp
WirelessNetworkMenuItem.cpp
: be $(HAIKU_NETWORK_LIBS) $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS) : be $(HAIKU_NETWORK_LIBS) $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
libbnetapi.so libbnetapi.so
: Network.rdef : Network.rdef