[haiku-commits] r40539 - haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn

From: kallisti5@xxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 16 Feb 2011 22:17:31 +0100 (CET)
Author: kallisti5
Date: 2011-02-16 22:17:31 +0100 (Wed, 16 Feb 2011)
New Revision: 40539
Changeset: http://dev.haiku-os.org/changeset/40539

Modified:
   
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp
   haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h
Log:
change BMessages to be more friendly; change BView to BGroupView and use 
LayoutBuilder more efficiently

Modified: 
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp
===================================================================
--- 
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp 
    2011-02-16 19:25:19 UTC (rev 40538)
+++ 
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.cpp 
    2011-02-16 21:17:31 UTC (rev 40539)
@@ -10,9 +10,7 @@
 #include "InterfaceAddressView.h"
 #include "NetworkSettings.h"
 
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
-#include <GridLayoutBuilder.h>
+#include <LayoutBuilder.h>
 #include <MenuItem.h>
 #include <StringView.h>
 
@@ -20,7 +18,7 @@
 InterfaceAddressView::InterfaceAddressView(BRect frame, const char* name,
        int family, NetworkSettings* settings)
        :
-       BView(frame, name, B_FOLLOW_ALL_SIDES, 0),
+       BGroupView(B_VERTICAL),
        fSettings(settings),
        fFamily(family)
 {
@@ -30,12 +28,12 @@
        fModePopUpMenu = new BPopUpMenu("modes");
 
        fModePopUpMenu->AddItem(new BMenuItem("Automatic",
-               new BMessage(AUTOSEL_MSG)));
+               new BMessage(M_MODE_AUTO)));
        fModePopUpMenu->AddItem(new BMenuItem("Static",
-               new BMessage(STATICSEL_MSG)));
+               new BMessage(M_MODE_STATIC)));
        fModePopUpMenu->AddSeparatorItem();
        fModePopUpMenu->AddItem(new BMenuItem("None",
-               new BMessage(NONESEL_MSG)));
+               new BMessage(M_MODE_NONE)));
 
        fModeField = new BMenuField("Mode:", fModePopUpMenu);
 
@@ -46,19 +44,16 @@
        RevertFields();
                // Do the initial field population
 
-       AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)
-               .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)
-               )
+       BLayoutBuilder::Group<>(this)
+               .AddGrid()
+                       .AddMenuField(fModeField, 0, 0, B_ALIGN_RIGHT)
+                       .AddTextControl(fAddressField, 0, 1, B_ALIGN_RIGHT)
+                       .AddTextControl(fNetmaskField, 0, 2, B_ALIGN_RIGHT)
+                       .AddTextControl(fGatewayField, 0, 3, B_ALIGN_RIGHT)
+               .End()
                .AddGlue()
-       );
+               .SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
+                       B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING);
 }
 
 
@@ -79,13 +74,13 @@
 InterfaceAddressView::MessageReceived(BMessage* message)
 {
        switch (message->what) {
-               case AUTOSEL_MSG:
+               case M_MODE_AUTO:
                        _EnableFields(false);
                        break;
-               case STATICSEL_MSG:
+               case M_MODE_STATIC:
                        _EnableFields(true);
                        break;
-               case NONESEL_MSG:
+               case M_MODE_NONE:
                        _EnableFields(false);
                        fAddressField->SetText("");
                        fNetmaskField->SetText("");

Modified: 
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h
===================================================================
--- 
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h   
    2011-02-16 19:25:19 UTC (rev 40538)
+++ 
haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn/InterfaceAddressView.h   
    2011-02-16 21:17:31 UTC (rev 40539)
@@ -15,17 +15,17 @@
 #include <PopUpMenu.h>
 #include <Screen.h>
 #include <TextControl.h>
-#include <View.h>
+#include <GroupView.h>
 
 
 enum {
-       AUTOSEL_MSG = 'iato',
-       STATICSEL_MSG = 'istc',
-       NONESEL_MSG = 'inon'
+       M_MODE_AUTO = 'iato',
+       M_MODE_STATIC = 'istc',
+       M_MODE_NONE = 'inon'
 };
 
 
-class InterfaceAddressView : public BView {
+class InterfaceAddressView : public BGroupView {
 public:
                                                                
InterfaceAddressView(BRect frame,
                                                                        const 
char* name, int family,
[haiku-commits] r40539 - haiku/trunk/src/tests/kits/net/preflet/InterfacesAddOn

Other related posts:
