[haiku-commits] r40524 - haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 16 Feb 2011 00:05:10 +0100 (CET)
Author: kallisti5
Date: 2011-02-16 00:05:10 +0100 (Wed, 16 Feb 2011)
New Revision: 40524
Changeset: http://dev.haiku-os.org/changeset/40524
Modified:
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h
Log:
use grid layout builder
Modified:
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp
===================================================================
---
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp
2011-02-15 21:34:00 UTC (rev 40523)
+++
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp
2011-02-15 23:05:10 UTC (rev 40524)
@@ -12,6 +12,7 @@
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
+#include <GridLayoutBuilder.h>
#include <MenuItem.h>
#include <StringView.h>
@@ -23,9 +24,6 @@
fSettings(settings),
fFamily(family)
{
- float textControlW;
- float textControlH;
-
SetLayout(new BGroupLayout(B_VERTICAL));
// Create our controls
@@ -39,35 +37,27 @@
fModePopUpMenu->AddItem(new BMenuItem("None",
new BMessage(NONESEL_MSG)));
- fModeField = new BMenuField(frame, "mode", "Mode:",
- fModePopUpMenu, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP,
B_WILL_DRAW);
+ fModeField = new BMenuField("Mode:", fModePopUpMenu);
- fAddressField = new BTextControl(frame, "address", "IP Address:",
- NULL, NULL, B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW);
- fNetmaskField = new BTextControl(frame, "netmask", "Netmask:",
- NULL, NULL, B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW);
- fGatewayField = new BTextControl(frame, "gateway", "Gateway:",
- NULL, NULL, B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW);
+ fAddressField = new BTextControl("IP Address:", NULL, NULL);
+ fNetmaskField = new BTextControl("Netmask:", NULL, NULL);
+ fGatewayField = new BTextControl("Gateway:", NULL, NULL);
- fAddressField->GetPreferredSize(&textControlW, &textControlH);
- float labelSize = ( textControlW + 50 )
- - fAddressField->StringWidth("XXX.XXX.XXX.XXX");
-
RevertFields();
// Do the initial field population
- fModeField->SetDivider(labelSize);
- fAddressField->SetDivider(labelSize);
- fNetmaskField->SetDivider(labelSize);
- fGatewayField->SetDivider(labelSize);
-
AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
- .Add(fModeField)
- .Add(fAddressField)
- .Add(fNetmaskField)
- .Add(fGatewayField)
+ .Add(BGridLayoutBuilder()
+ .Add(fModeField->CreateLabelLayoutItem(), 0, 0)
+ .Add(fModeField->CreateMenuBarLayoutItem(), 1, 0)
+ .Add(fAddressField->CreateLabelLayoutItem(), 0, 1)
+ .Add(fAddressField->CreateTextViewLayoutItem(), 1, 1)
+ .Add(fNetmaskField->CreateLabelLayoutItem(), 0, 2)
+ .Add(fNetmaskField->CreateTextViewLayoutItem(), 1, 2)
+ .Add(fGatewayField->CreateLabelLayoutItem(), 0, 3)
+ .Add(fGatewayField->CreateTextViewLayoutItem(), 1, 3)
+ )
.AddGlue()
- .SetInsets(10, 10, 10, 10)
);
}
Modified:
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h
===================================================================
---
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h
2011-02-15 21:34:00 UTC (rev 40523)
+++
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h
2011-02-15 23:05:10 UTC (rev 40524)
@@ -19,9 +19,9 @@
enum {
- AUTOSEL_MSG = 'iato',
- STATICSEL_MSG = 'istc',
- NONESEL_MSG = 'inon'
+ AUTOSEL_MSG = 'iato',
+ STATICSEL_MSG = 'istc',
+ NONESEL_MSG = 'inon'
};
Other related posts:
