Ticket #5690: filetypes.patch

AttributeListView.h

@@ -50 +50 @@
 
 class AttributeListView : public BListView {
     public:
-        AttributeListView(BRect frame, const char* name, uint32 resizingMode);
+        AttributeListView(const char* name);
         virtual ~AttributeListView();
 
         void SetTo(BMimeType* type);
@@ -76 +76 @@
 
 extern const struct display_as_map kDisplayAsMap[];
 
-AttributeItem *create_attribute_item(BMessage& attributes, int32 index);
+AttributeItem* create_attribute_item(BMessage& attributes, int32 index);
 
 #endif  // ATTRIBUTE_LIST_VIEW_H

StringView.cpp

@@ -4 +4 @@
  */
 
 
+#include <GroupView.h>
+#include <LayoutItem.h>
+#include <StringView.h>
+
 #include "StringView.h"
 
-
-StringView::StringView(BRect frame, const char* name, const char* label,
-    const char* text, uint32 resizeMask, uint32 flags)
-    : BView(frame, name, resizeMask, flags),
-    fLabel(label),
-    fText(text),
-    fLabelAlignment(B_ALIGN_RIGHT),
-    fTextAlignment(B_ALIGN_LEFT),
-    fEnabled(true)
+StringView::StringView(const char* label, const char* text)
+    :
+    fView(NULL),
+    fLabel(new BStringView(NULL, label)),
+    fLabelItem(NULL),
+    fText(new BStringView(NULL, text)),
+    fTextItem(NULL)
 {
-    fDivider = StringWidth(label) + 4.0f;
 }
 
 
-StringView::~StringView()
-{
-}
-
-
 void
-StringView::SetAlignment(alignment labelAlignment, alignment textAlignment)
+StringView::SetLabel(const char* label)
 {
-    if (labelAlignment == fLabelAlignment && textAlignment == fTextAlignment)
-        return;
-
-    fLabelAlignment = labelAlignment;
-    fTextAlignment = textAlignment;
-
-    Invalidate();
+    fLabel->SetText(label);
 }
 
 
 void
-StringView::GetAlignment(alignment* _label, alignment* _text) const
+StringView::SetText(const char* text)
 {
-    if (_label)
-        *_label = fLabelAlignment;
-    if (_text)
-        *_text = fTextAlignment;
+    fText->SetText(text);
 }
 
 
-void
-StringView::SetDivider(float divider)
+BLayoutItem*
+StringView::GetLabelLayoutItem()
 {
-    fDivider = divider;
-    _UpdateText();
-
-    Invalidate();
+    return fLabelItem;
 }
 
 
-void
-StringView::AttachedToWindow()
-{
-    if (Parent() != NULL)
-        SetViewColor(Parent()->ViewColor());
-    else
-        SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+BView*
+StringView::LabelView()
+{ return fLabel; }
 
-    SetLowColor(ViewColor());
-    _UpdateText();
-}
 
-
-void
-StringView::Draw(BRect updateRect)
+BLayoutItem*
+StringView::GetTextLayoutItem()
 {
-    BRect rect = Bounds();
-
-    font_height fontHeight;
-    GetFontHeight(&fontHeight);
-
-    float y = ceilf(fontHeight.ascent) + 1.0f;
-    float x;
-
-#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
-    rgb_color textColor = {0, 0, 0, 255};
-#else
-    rgb_color textColor = ui_color(B_CONTROL_TEXT_COLOR);
-#endif
-
-    SetHighColor(IsEnabled() ? textColor
-        : tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_DISABLED_LABEL_TINT));
-
-    if (Label()) {
-        switch (fLabelAlignment) {
-            case B_ALIGN_RIGHT:
-                x = Divider() - StringWidth(Label()) - 3.0f;
-                break;
-
-            case B_ALIGN_CENTER:
-                x = Divider() - StringWidth(Label()) / 2.0f;
-                break;
-
-            default:
-                x = 1.0f;
-                break;
-        }
-
-        DrawString(Label(), BPoint(x, y));
-    }
-
-    if (fTruncatedText.String() != NULL) {
-        switch (fTextAlignment) {
-            case B_ALIGN_RIGHT:
-                x = rect.Width() - StringWidth(fTruncatedText.String());
-                break;
-
-            case B_ALIGN_CENTER:
-                x = Divider() + (rect.Width() - Divider() - StringWidth(Label())) / 2.0f;
-                break;
-
-            default:
-                x = Divider() + 3.0f;
-                break;
-        }
-
-        DrawString(fTruncatedText.String(), BPoint(x, y));
-    }
+    return fTextItem;
 }
 
 
-void
-StringView::FrameResized(float width, float height)
-{
-    BString oldTruncated = fTruncatedText;
-    _UpdateText();
+BView*
+StringView::TextView()
+{ return fText; }
 
-    if (oldTruncated != fTruncatedText) {
-        // invalidate text portion only
-        BRect rect = Bounds();
-        rect.left = Divider();
-        Invalidate(rect);
-    }
-}
 
-
 void
-StringView::ResizeToPreferred()
+StringView::SetEnabled(bool enabled)
 {
-    float width, height;
-    GetPreferredSize(&width, &height);
+    
+    rgb_color color;
 
-    // Resize the width only for B_ALIGN_LEFT (if its large enough already, that is)
-    if (Bounds().Width() > width
-        && (fLabelAlignment != B_ALIGN_LEFT || fTextAlignment != B_ALIGN_LEFT))
-        width = Bounds().Width();
-
-    BView::ResizeTo(width, height);
-}
-
-
-void
-StringView::GetPreferredSize(float* _width, float* _height)
-{
-    if (!Text() && !Label()) {
-        BView::GetPreferredSize(_width, _height);
-        return;
+    if (!enabled) {
+        color = tint_color(
+            ui_color(B_PANEL_BACKGROUND_COLOR), B_DISABLED_LABEL_TINT);
+    } else {
+        color = ui_color(B_CONTROL_TEXT_COLOR);
     }
 
-    if (_width)
-        *_width = 7.0f + ceilf(StringWidth(Label()) + StringWidth(Text()));
-
-    if (_height) {
-        font_height fontHeight;
-        GetFontHeight(&fontHeight);
-        *_height = ceilf(fontHeight.ascent + fontHeight.descent + fontHeight.leading) + 2.0f;
-    }
+    fLabel->SetHighColor(color);
+    fText->SetHighColor(color);
+    fLabel->Invalidate();
+    fText->Invalidate();
 }
 
-
-void
-StringView::SetEnabled(bool enabled)
+    
+//cast operator BView*
+StringView::operator BView*()
 {
-    if (IsEnabled() == enabled)
-        return;
-
-    fEnabled = enabled;
-    Invalidate();
+    if (fView) return fView;
+    fView = new BGroupView(B_HORIZONTAL);
+    BLayout* layout = fView->GroupLayout();
+    fLabelItem = layout->AddView(fLabel);
+    fTextItem = layout->AddView(fText);
+    return fView;
 }
 
 
-void
-StringView::SetLabel(const char* label)
+const char*
+StringView::Label() const
 {
-    fLabel = label;
-
-    // invalidate label portion only
-    BRect rect = Bounds();
-    rect.right = Divider();
-    Invalidate(rect);
+    return fLabel->Text();
 }
 
 
-void
-StringView::SetText(const char* text)
+const char*
+StringView::Text() const
 {
-    fText = text;
-
-    _UpdateText();
-
-    // invalidate text portion only
-    BRect rect = Bounds();
-    rect.left = Divider();
-    Invalidate(rect);
+    return fText->Text();
 }
 
-
-void
-StringView::_UpdateText()
-{
-    fTruncatedText = fText;
-    TruncateString(&fTruncatedText, B_TRUNCATE_MIDDLE, Bounds().Width() - Divider());
-}

ExtensionWindow.cpp

@@ -9 +9 @@
 #include "FileTypesWindow.h"
 
 #include <Button.h>
+#include <ControlLook.h>
+#include <GridLayoutBuilder.h>
+#include <GroupLayout.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Mime.h>
@@ -104 +107 @@
 ExtensionWindow::ExtensionWindow(FileTypesWindow* target, BMimeType& type,
         const char* extension)
     : BWindow(BRect(100, 100, 350, 200), "Extension", B_MODAL_WINDOW_LOOK,
-        B_MODAL_SUBSET_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_V_RESIZABLE
-            | B_ASYNCHRONOUS_CONTROLS),
+        B_MODAL_SUBSET_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_RESIZABLE
+            | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
     fTarget(target),
     fMimeType(type.Type()),
     fExtension(extension)
 {
-    BRect rect = Bounds();
-    BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
+    SetLayout(new BGroupLayout(B_VERTICAL));
 
-    rect.InsetBy(8.0f, 8.0f);
-    fExtensionControl = new BTextControl(rect, "extension", "Extension:", extension,
-        NULL, B_FOLLOW_LEFT_RIGHT);
-
-    float labelWidth = fExtensionControl->StringWidth(fExtensionControl->Label()) + 2.0f;
+    float padding = 3.0f;
+    //if (be_control_look)
+        // padding = be_control_look->DefaultItemSpacing();
+            // this seems to be very large!
+    
+    fExtensionControl = new BTextControl("Extension:", extension, NULL);
     fExtensionControl->SetModificationMessage(new BMessage(kMsgExtensionUpdated));
-    fExtensionControl->SetDivider(labelWidth);
-    fExtensionControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
+    fExtensionControl->SetAlignment(B_ALIGN_LEFT, B_ALIGN_LEFT);
 
     // filter out invalid characters that can't be part of an extension
     BTextView* textView = fExtensionControl->TextView();
@@ -131 +131 @@
         textView->DisallowChar(disallowedCharacters[i]);
     }
 
-    float width, height;
-    fExtensionControl->GetPreferredSize(&width, &height);
-    fExtensionControl->ResizeTo(rect.Width(), height);
-    topView->AddChild(fExtensionControl);
-
-    fAcceptButton = new BButton(rect, "add", extension ? "Done" : "Add",
-        new BMessage(kMsgAccept), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    fAcceptButton->ResizeToPreferred();
-    fAcceptButton->MoveTo(Bounds().Width() - 8.0f - fAcceptButton->Bounds().Width(),
-        Bounds().Height() - 8.0f - fAcceptButton->Bounds().Height());
+    fAcceptButton = new BButton(extension ? "Done" : "Add",
+        new BMessage(kMsgAccept));
     fAcceptButton->SetEnabled(false);
-    topView->AddChild(fAcceptButton);
 
-    BButton* button = new BButton(rect, "cancel", "Cancel",
-        new BMessage(B_QUIT_REQUESTED), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    button->ResizeToPreferred();
-    button->MoveTo(fAcceptButton->Frame().left - 10.0f - button->Bounds().Width(),
-        fAcceptButton->Frame().top);
-    topView->AddChild(button);
+    BButton* button = new BButton("Cancel",
+        new BMessage(B_QUIT_REQUESTED));
 
-    ResizeTo(labelWidth * 4.0f + 24.0f, fExtensionControl->Bounds().Height()
-        + fAcceptButton->Bounds().Height() + 28.0f);
-    SetSizeLimits(button->Bounds().Width() + fAcceptButton->Bounds().Width() + 26.0f,
-        32767.0f, Frame().Height(), Frame().Height());
+    AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(fExtensionControl->CreateLabelLayoutItem(), 0, 0)
+        .Add(fExtensionControl->CreateTextViewLayoutItem(), 1, 0)
+        .Add(fAcceptButton, 0, 1)
+        .Add(button, 1, 1)
+        .SetInsets(padding, padding, padding, padding)
+    );
 
     // omit the leading dot
     if (fExtension.ByteAt(0) == '.')

TypeListWindow.cpp

@@ -8 +8 @@
 #include "TypeListWindow.h"
 
 #include <Button.h>
+#include <ControlLook.h>
+#include <GroupLayoutBuilder.h>
 #include <ScrollView.h>
 
 #include <string.h>
@@ -17 +19 @@
 const uint32 kMsgSelected = 'seld';
 
 
-TypeListWindow::TypeListWindow(const char* currentType, uint32 what, BWindow* target)
-    : BWindow(BRect(100, 100, 360, 440), "Choose type", B_MODAL_WINDOW,
-        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS),
+TypeListWindow::TypeListWindow(const char* currentType,
+    uint32 what, BWindow* target)
+    :
+    BWindow(BRect(100, 100, 360, 440), "Choose type", B_MODAL_WINDOW,
+        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
     fTarget(target),
     fWhat(what)
 {
-    BRect rect = Bounds();
-    BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
+    float padding=3.0f;
+    //if (be_control_look)
+        // padding = be_control_look->DefaultItemSpacing();
+        // seems too big
 
-    fSelectButton = new BButton(rect, "select", "Done",
-        new BMessage(kMsgSelected), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    fSelectButton->ResizeToPreferred();
-    fSelectButton->MoveTo(topView->Bounds().right - 8.0f - fSelectButton->Bounds().Width(),
-        topView->Bounds().bottom - 8.0f - fSelectButton->Bounds().Height());
+    fSelectButton = new BButton("select", "Done",
+        new BMessage(kMsgSelected));
     fSelectButton->SetEnabled(false);
-    topView->AddChild(fSelectButton);
 
-    BButton* button = new BButton(fSelectButton->Frame(), "cancel", "Cancel",
-        new BMessage(B_CANCEL), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    button->ResizeToPreferred();
-    button->MoveBy(-button->Bounds().Width() - 8.0f, 0.0f);
-    topView->AddChild(button);
+    BButton* button = new BButton("cancel", "Cancel",
+        new BMessage(B_CANCEL));
 
     fSelectButton->MakeDefault(true);
 
-    rect.bottom = button->Frame().top - 10.0f;
-    rect.top = 10.0f;
-    rect.left = 10.0f;
-    rect.right -= 10.0f + B_V_SCROLL_BAR_WIDTH;
-    fListView = new MimeTypeListView(rect, "typeview", NULL, true, false,
-        B_FOLLOW_ALL);
+    fListView = new MimeTypeListView("typeview", NULL, true, false);
     fListView->SetSelectionMessage(new BMessage(kMsgTypeSelected));
     fListView->SetInvocationMessage(new BMessage(kMsgSelected));
 
     BScrollView* scrollView = new BScrollView("scrollview", fListView,
-        B_FOLLOW_ALL, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
-    topView->AddChild(scrollView);
+        B_FRAME_EVENTS | B_WILL_DRAW, false, true);
 
+    SetLayout(new BGroupLayout(B_VERTICAL));
+    AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+        .Add(scrollView)
+        .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)     
+            .Add(button)
+            .Add(fSelectButton)
+        )
+        .SetInsets(padding, padding, padding, padding)
+    );
+
+    BAlignment buttonAlignment = 
+        BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_VERTICAL_CENTER);
+    button->SetExplicitAlignment(buttonAlignment);
+    fSelectButton->SetExplicitAlignment(buttonAlignment);
+
     MoveTo(target->Frame().LeftTop() + BPoint(15.0f, 15.0f));
-    SetSizeLimits(button->Bounds().Width() + fSelectButton->Bounds().Width() + 64.0f, 32767.0f,
-        fSelectButton->Bounds().Height() * 5.0f, 32767.0f);
 }
 
 

DropTargetListView.h

@@ -11 +11 @@
 
 class DropTargetListView : public BListView {
     public:
-        DropTargetListView(BRect frame, const char* name,
+        DropTargetListView(const char* name,
             list_view_type type = B_SINGLE_SELECTION_LIST,
-            uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
             uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
         virtual ~DropTargetListView();
 

PreferredAppMenu.h

@@ -15 +15 @@
 
 void update_preferred_app_menu(BMenu* menu, BMimeType* type, uint32 what,
     const char* preferredFrom = NULL);
-status_t retrieve_preferred_app(BMessage* message, bool sameAs, const char* forType,
-    BString& preferredApp);
 
+status_t retrieve_preferred_app(BMessage* message, bool sameAs,
+    const char* forType, BString& preferredApp);
+
 #endif  // PREFERRED_APP_MENU_H

FileTypeWindow.cpp

@@ -14 +14 @@
 #include <Bitmap.h>
 #include <Box.h>
 #include <Button.h>
+#include <ControlLook.h>
 #include <File.h>
+#include <GridLayoutBuilder.h>
+#include <GroupLayoutBuilder.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Mime.h>
 #include <NodeInfo.h>
 #include <PopUpMenu.h>
+#include <SpaceLayoutItem.h>
 #include <TextControl.h>
 
 #include <stdio.h>
@@ -39 +43 @@
 
 
 FileTypeWindow::FileTypeWindow(BPoint position, const BMessage& refs)
-    : BWindow(BRect(0.0f, 0.0f, 200.0f, 200.0f).OffsetBySelf(position),
+    :
+    BWindow(BRect(0.0f, 0.0f, 200.0f, 200.0f).OffsetBySelf(position),
         "File type", B_TITLED_WINDOW,
-        B_NOT_V_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS)
+        B_NOT_V_RESIZABLE | B_NOT_ZOOMABLE |
+        B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
-    BRect rect = Bounds();
-    BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
+    float padding = 3.0f;
+    // if (be_control_look)
+        // padding = be_control_look->DefaultItemSpacing();
+            // too big!
 
     // "File Type" group
+    BBox* fileTypeBox = new BBox("file type BBox");
+    fileTypeBox->SetLabel("File type");
 
-    BFont font(be_bold_font);
-    font_height fontHeight;
-    font.GetHeight(&fontHeight);
+    fTypeControl = new BTextControl("type", NULL, "fTypeControl",
+        new BMessage(kMsgTypeEntered));
 
-    rect.InsetBy(8.0f, 8.0f);
-    BBox* box = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
-    box->SetLabel("File type");
-    topView->AddChild(box);
-
-    rect = box->Bounds();
-    rect.InsetBy(8.0f, 4.0f + fontHeight.ascent + fontHeight.descent);
-    fTypeControl = new BTextControl(rect, "type", NULL, NULL,
-        new BMessage(kMsgTypeEntered), B_FOLLOW_LEFT_RIGHT);
-    fTypeControl->SetDivider(0.0f);
-    float width, height;
-    fTypeControl->GetPreferredSize(&width, &height);
-    fTypeControl->ResizeTo(rect.Width(), height);
-    box->AddChild(fTypeControl);
-
     // filter out invalid characters that can't be part of a MIME type name
     BTextView* textView = fTypeControl->TextView();
     const char* disallowedCharacters = "<>@,;:\"()[]?=";
@@ -76 +68 @@
         textView->DisallowChar(disallowedCharacters[i]);
     }
 
-    rect.OffsetBy(0.0f, fTypeControl->Bounds().Height() + 5.0f);
-    fSelectTypeButton = new BButton(rect, "select type", "Select" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgSelectType), B_FOLLOW_LEFT | B_FOLLOW_TOP);
-    fSelectTypeButton->ResizeToPreferred();
-    box->AddChild(fSelectTypeButton);
+    fSelectTypeButton = new BButton("select type", "Select" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgSelectType));
 
-    rect.OffsetBy(fSelectTypeButton->Bounds().Width() + 8.0f, 0.0f);
-    fSameTypeAsButton = new BButton(rect, "same type as", "Same as" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgSameTypeAs), B_FOLLOW_LEFT | B_FOLLOW_TOP);
-    fSameTypeAsButton->ResizeToPreferred();
-    box->AddChild(fSameTypeAsButton);
+    fSameTypeAsButton = new BButton("same type as", "Same as" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgSameTypeAs));
 
-    width = font.StringWidth("Icon") + 16.0f;
-    if (width < B_LARGE_ICON + 16.0f)
-        width = B_LARGE_ICON + 16.0f;
+    fileTypeBox->AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(fTypeControl, 0, 0, 2, 1)
+        .Add(fSelectTypeButton, 0, 1)
+        .Add(fSameTypeAsButton, 1, 1)
+        .SetInsets(padding, padding, padding, padding)
+    );
 
-    height = fSelectTypeButton->Frame().bottom + 8.0f;
-    if (height < 8.0f + B_LARGE_ICON + fontHeight.ascent + fontHeight.descent)
-        height = 8.0f + B_LARGE_ICON + fontHeight.ascent + fontHeight.descent;
-    box->ResizeTo(box->Bounds().Width() - width - 8.0f, height);
-
     // "Icon" group
 
-    rect = box->Frame();
-    rect.left = rect.right + 8.0f;
-    rect.right += width + 8.0f;
-    float iconBoxWidth = rect.Width();
-    box = new BBox(rect, NULL, B_FOLLOW_RIGHT | B_FOLLOW_TOP);
-    box->SetLabel("Icon");
-    topView->AddChild(box);
+    BBox* iconBox = new BBox("icon BBox");
+    iconBox->SetLabel("Icon");
+    fIconView = new IconView("icon");
+    iconBox->AddChild(BGroupLayoutBuilder(B_HORIZONTAL)
+        .Add(fIconView)
+        .SetInsets(padding, padding, padding, padding));
 
-    rect = BRect(8.0f, 0.0f, 7.0f + B_LARGE_ICON, B_LARGE_ICON - 1.0f);
-    rect.OffsetBy(0.0f, (box->Bounds().Height() - rect.Height()) / 2.0f);
-    if (rect.top < fontHeight.ascent + fontHeight.descent + 4.0f)
-        rect.top = fontHeight.ascent + fontHeight.descent + 4.0f;
-    fIconView = new IconView(rect, "icon");
-    box->AddChild(fIconView);
-
     // "Preferred Application" group
 
-    rect.top = box->Frame().bottom + 8.0f;
-    rect.bottom = rect.top + box->Bounds().Height();
-    rect.left = 8.0f;
-    rect.right = Bounds().Width() - 8.0f;
-    box = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
-    box->SetLabel("Preferred application");
-    topView->AddChild(box);
+    BBox* preferredBox = new BBox("preferred BBox");
+    preferredBox->SetLabel("Preferred application");
 
     BMenu* menu = new BPopUpMenu("preferred");
     BMenuItem* item;
@@ -130 +101 @@
         new BMessage(kMsgPreferredAppChosen)));
     item->SetMarked(true);
 
-    rect = fTypeControl->Frame();
-    BView* constrainingView = new BView(rect, NULL, B_FOLLOW_LEFT_RIGHT, B_WILL_DRAW);
-    constrainingView->SetViewColor(topView->ViewColor());
+    fPreferredField = new BMenuField("preferred", NULL, menu);
 
-    fPreferredField = new BMenuField(rect.OffsetToCopy(B_ORIGIN), "preferred",
-        NULL, menu);
-    fPreferredField->GetPreferredSize(&width, &height);
-    fPreferredField->ResizeTo(rect.Width(), height);
-    constrainingView->ResizeTo(rect.Width(), height);
-    constrainingView->AddChild(fPreferredField);
-        // we embed the menu field in another view to make it behave like
-        // we want so that it can't obscure other elements with larger
-        // labels
+    fSelectAppButton = new BButton("select app", "Select" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgSelectPreferredApp));
 
-    box->AddChild(constrainingView);
+    fSameAppAsButton = new BButton("same app as", "Same as" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgSamePreferredAppAs));
 
-    rect.OffsetBy(0.0f, height + 5.0f);
-    fSelectAppButton = new BButton(rect, "select app", "Select" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgSelectPreferredApp), B_FOLLOW_LEFT | B_FOLLOW_TOP);
-    fSelectAppButton->ResizeToPreferred();
-    box->AddChild(fSelectAppButton);
+    preferredBox->AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(fPreferredField, 0, 0, 2, 1)
+        .Add(fSelectAppButton, 0, 1)
+        .Add(fSameAppAsButton, 1, 1)
+        .Add(BSpaceLayoutItem::CreateGlue(), 3, 0, 1, 2)
+        .SetInsets(padding, padding, padding, padding)
+    );
 
-    rect.OffsetBy(fSelectAppButton->Bounds().Width() + 8.0f, 0.0f);
-    fSameAppAsButton = new BButton(rect, "same app as", "Same as" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgSamePreferredAppAs), B_FOLLOW_LEFT | B_FOLLOW_TOP);
-    fSameAppAsButton->ResizeToPreferred();
-    box->AddChild(fSameAppAsButton);
-    box->ResizeBy(0.0f, height - fTypeControl->Bounds().Height());
+    SetLayout(new BGroupLayout(B_VERTICAL));
+    AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(fileTypeBox, 0, 0, 1, 2)
+        .Add(iconBox, 1, 1, 1, 2)
+        .Add(preferredBox, 0, 2, 1, 2)
+        .SetInsets(padding, padding, padding, padding)
+    );
 
-    ResizeTo(fSameAppAsButton->Frame().right + 100.0f, box->Frame().bottom + 8.0f);
-    SetSizeLimits(fSameAppAsButton->Frame().right + iconBoxWidth + 32.0f, 32767.0f,
-        Bounds().Height(), Bounds().Height());
+    float minWidth, minHeight;
+    GetSizeLimits(&minWidth, NULL, &minHeight, NULL);
+    ResizeTo(minWidth, minHeight);
 
     fTypeControl->MakeFocus(true);
-
     BMimeType::StartWatching(this);
     _SetTo(refs);
 }

MimeTypeListView.cpp

@@ -267 +267 @@
 //  #pragma mark -
 
 
-MimeTypeListView::MimeTypeListView(BRect rect, const char* name,
-        const char* supertype, bool showIcons, bool applicationMode,
-        uint32 resizingMode)
-    : BOutlineListView(rect, name, B_SINGLE_SELECTION_LIST, resizingMode),
+MimeTypeListView::MimeTypeListView(const char* name,
+        const char* supertype, bool showIcons, bool applicationMode)
+    : BOutlineListView(name, B_SINGLE_SELECTION_LIST),
     fSupertype(supertype),
     fShowIcons(showIcons),
     fApplicationMode(applicationMode)

NewFileTypeWindow.cpp

@@ -9 +9 @@
 #include "NewFileTypeWindow.h"
 
 #include <Button.h>
+#include <ControlLook.h>
+#include <GroupLayout.h>
+#include <GridLayoutBuilder.h>
+#include <MenuBar.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Mime.h>
 #include <PopUpMenu.h>
+#include <SpaceLayoutItem.h>
 #include <String.h>
+#include <StringView.h>
 #include <TextControl.h>
 
 #include <string.h>
@@ -27 +33 @@
 const uint32 kMsgAddType = 'atyp';
 
 
-NewFileTypeWindow::NewFileTypeWindow(FileTypesWindow* target, const char* currentType)
-    : BWindow(BRect(100, 100, 350, 200), "New file type", B_TITLED_WINDOW,
-        B_NOT_ZOOMABLE | B_NOT_V_RESIZABLE | B_ASYNCHRONOUS_CONTROLS),
+NewFileTypeWindow::NewFileTypeWindow(FileTypesWindow* target,
+    const char* currentType)
+    :
+    BWindow(BRect(100, 100, 350, 200), "New file type", B_MODAL_WINDOW,
+        B_NOT_ZOOMABLE | B_NOT_V_RESIZABLE | B_ASYNCHRONOUS_CONTROLS 
+        | B_AUTO_UPDATE_SIZE_LIMITS ),
     fTarget(target)
 {
-    BRect rect = Bounds();
-    BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
-
-    float labelWidth = be_plain_font->StringWidth("Internal name:") + 2.0f;
-
-    rect.InsetBy(8.0f, 6.0f);
     fSupertypesMenu = new BPopUpMenu("supertypes");
     BMenuItem* item;
     BMessage types;
@@ -61 +62 @@
         if (i > 1)
             fSupertypesMenu->AddSeparatorItem();
     }
+
     fSupertypesMenu->AddItem(new BMenuItem("Add new group",
         new BMessage(kMsgNewSupertypeChosen)));
+    BMenuField* typesMenuField = new BMenuField(NULL, fSupertypesMenu);
 
-    BMenuField* menuField = new BMenuField(rect, "supertypes",
-        "Group:", fSupertypesMenu);
-    menuField->SetDivider(labelWidth);
-    menuField->SetAlignment(B_ALIGN_RIGHT);
-    float width, height;
-    menuField->GetPreferredSize(&width, &height);
-    menuField->ResizeTo(rect.Width(), height);
-    topView->AddChild(menuField);
+    BStringView* typesMenuLabel = new BStringView(NULL, "Group:");
+        // Create a separate label view, otherwise things don't line up right
+    typesMenuLabel->SetAlignment(B_ALIGN_LEFT);
+    typesMenuLabel->SetExplicitAlignment(
+        BAlignment(B_ALIGN_LEFT, B_ALIGN_USE_FULL_HEIGHT));
 
-    fNameControl = new BTextControl(rect, "internal", "Internal name:", "",
-        NULL, B_FOLLOW_LEFT_RIGHT);
+    fNameControl = new BTextControl("Internal name:", "", NULL);
     fNameControl->SetModificationMessage(new BMessage(kMsgNameUpdated));
-    fNameControl->SetDivider(labelWidth);
-    fNameControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
 
     // filter out invalid characters that can't be part of a MIME type name
-    BTextView* textView = fNameControl->TextView();
+    BTextView* nameControlTextView = fNameControl->TextView();
     const char* disallowedCharacters = "/<>@,;:\"()[]?=";
     for (int32 i = 0; disallowedCharacters[i]; i++) {
-        textView->DisallowChar(disallowedCharacters[i]);
+        nameControlTextView->DisallowChar(disallowedCharacters[i]);
     }
 
-    fNameControl->GetPreferredSize(&width, &height);
-    fNameControl->ResizeTo(rect.Width(), height);
-    fNameControl->MoveTo(8.0f, 12.0f + menuField->Bounds().Height());
-    topView->AddChild(fNameControl);
+    fAddButton = new BButton("Add type", new BMessage(kMsgAddType));
 
-    fAddButton = new BButton(rect, "add", "Add type", new BMessage(kMsgAddType),
-        B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    fAddButton->ResizeToPreferred();
-    fAddButton->MoveTo(Bounds().Width() - 8.0f - fAddButton->Bounds().Width(),
-        Bounds().Height() - 8.0f - fAddButton->Bounds().Height());
-    fAddButton->SetEnabled(false);
-    topView->AddChild(fAddButton);
+    float padding = 3.0f;
+    // if (be_control_look)
+        // padding = be_control_look->DefaultItemSpacing();
 
-    BButton* button = new BButton(rect, "cancel", "Cancel",
-        new BMessage(B_QUIT_REQUESTED), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    button->ResizeToPreferred();
-    button->MoveTo(fAddButton->Frame().left - 10.0f - button->Bounds().Width(),
-        fAddButton->Frame().top);
-    topView->AddChild(button);
+    SetLayout(new BGroupLayout(B_VERTICAL));
+    AddChild(BGridLayoutBuilder(padding, padding)
+        .SetInsets(padding, padding, padding, padding)
+        .Add(typesMenuLabel, 0, 0)
+        .Add(typesMenuField, 1, 0, 2)
+        .Add(fNameControl->CreateLabelLayoutItem(), 0, 1)
+        .Add(fNameControl->CreateTextViewLayoutItem(), 1, 1, 2)
+        .Add(BSpaceLayoutItem::CreateGlue(), 0, 2)
+        .Add(new BButton("Cancel", new BMessage(B_QUIT_REQUESTED)), 1, 2)
+        .Add(fAddButton, 2, 2)
+        .SetColumnWeight(0, 3)
+        );
 
-    ResizeTo(labelWidth * 4.0f + 24.0f, fNameControl->Bounds().Height()
-        + menuField->Bounds().Height() + fAddButton->Bounds().Height() + 30.0f);
-    SetSizeLimits(button->Bounds().Width() + fAddButton->Bounds().Width() + 26.0f,
-        32767.0f, Frame().Height(), Frame().Height());
+    BAlignment fullSize = BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_USE_FULL_HEIGHT);
+    typesMenuField->MenuBar()->SetExplicitAlignment(fullSize);
+    fNameControl->TextView()->SetExplicitAlignment(fullSize);
 
+    BLayoutItem* nameControlLabelItem = fNameControl->CreateLabelLayoutItem();
+    nameControlLabelItem->SetExplicitMinSize(nameControlLabelItem->MinSize());
+        // stops fNameControl's label from truncating under certain conditions
+
     fAddButton->MakeDefault(true);
     fNameControl->MakeFocus(true);
 
@@ -131 +130 @@
             fAddButton->SetLabel("Add type");
             fNameControl->SetLabel("Internal name:");
             fNameControl->MakeFocus(true);
+            InvalidateLayout(true);
             break;
 
         case kMsgNewSupertypeChosen:
             fAddButton->SetLabel("Add group");
             fNameControl->SetLabel("Group name:");
             fNameControl->MakeFocus(true);
+            InvalidateLayout(true);
             break;
 
         case kMsgNameUpdated:
@@ -195 +196 @@
     fTarget.SendMessage(kMsgNewTypeWindowClosed);
     return true;
 }
+
+

ApplicationTypesWindow.h

@@ -27 +27 @@
         ApplicationTypesWindow(const BMessage& settings);
         virtual ~ApplicationTypesWindow();
 
-        virtual void FrameResized(float width, float height);
         virtual void MessageReceived(BMessage* message);
         virtual bool QuitRequested();
 

IconView.h

@@ -50 +50 @@
 
         Icon& operator=(const Icon& source);
 
-        void AdoptLarge(BBitmap *large);
-        void AdoptMini(BBitmap *mini);
+        void AdoptLarge(BBitmap* large);
+        void AdoptMini(BBitmap* mini);
         void AdoptData(uint8* data, size_t size);
 
         static BBitmap* AllocateBitmap(int32 size, int32 space = -1);
@@ -63 +63 @@
         size_t      fSize;
 };
 
+class BSize;
+
 class IconView : public BControl {
     public:
-        IconView(BRect rect, const char* name,
-            uint32 resizeMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
-            uint32 flags = B_NAVIGABLE);
+        IconView(const char* name, uint32 flags = B_NAVIGABLE);
         virtual ~IconView();
 
         virtual void AttachedToWindow();
@@ -76 +76 @@
         virtual void Draw(BRect updateRect);
         virtual void GetPreferredSize(float* _width, float* _height);
 
+        virtual BSize MaxSize();
+        virtual BSize MinSize();
+        virtual BSize PreferredSize();
+
         virtual void MouseDown(BPoint where);
         virtual void MouseUp(BPoint where);
         virtual void MouseMoved(BPoint where, uint32 transit, const BMessage* dragMessage);
@@ -92 +96 @@
         void SetIconSize(int32 size);
         void ShowIconHeap(bool show);
         void ShowEmptyFrame(bool show);
-        void SetTarget(const BMessenger& target);
+        status_t SetTarget(const BMessenger& target);
         void SetModificationMessage(BMessage* message);
-        void Invoke(const BMessage* message = NULL);
+        status_t Invoke(const BMessage* message = NULL);
 
         ::Icon* Icon();
         int32 IconSize() const { return fIconSize; } 

AttributeListView.cpp

@@ -71 +71 @@
     buffer[4] = 0xff & (type);
     buffer[5] = '\'';
     buffer[6] = 0;
-    for (int16 i = 0;i < 4;i++) {
+    for (int16 i = 0; i < 4; i++) {
         if (buffer[i] < ' ')
             buffer[i] = '.';
     }
@@ -81 +81 @@
 }
 
 
-AttributeItem *
+AttributeItem*
 create_attribute_item(BMessage& attributes, int32 index)
 {
     const char* publicName;
@@ -235 +235 @@
 //  #pragma mark -
 
 
-AttributeListView::AttributeListView(BRect frame, const char* name,
-        uint32 resizingMode)
-    : BListView(frame, name, B_SINGLE_SELECTION_LIST, resizingMode,
+AttributeListView::AttributeListView(const char* name)
+    : BListView(name, B_SINGLE_SELECTION_LIST,
         B_WILL_DRAW | B_NAVIGABLE | B_FULL_UPDATE_ON_RESIZE | B_FRAME_EVENTS)
 {
 }

AttributeWindow.cpp

@@ -11 +11 @@
 #include <Box.h>
 #include <Button.h>
 #include <CheckBox.h>
+#include <ControlLook.h>
+#include <GridLayoutBuilder.h>
+#include <GroupLayoutBuilder.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Mime.h>
 #include <PopUpMenu.h>
+#include <SpaceLayoutItem.h>
 #include <String.h>
 #include <TextControl.h>
 
@@ -85 +89 @@
 
 AttributeWindow::AttributeWindow(FileTypesWindow* target, BMimeType& mimeType,
         AttributeItem* attributeItem)
-    : BWindow(BRect(100, 100, 350, 200), "Attribute", B_MODAL_WINDOW_LOOK,
-        B_MODAL_SUBSET_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_V_RESIZABLE
+    :
+    BWindow(BRect(100, 100, 350, 200), "Attribute", B_MODAL_WINDOW_LOOK,
+        B_MODAL_SUBSET_WINDOW_FEEL, B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS
             | B_ASYNCHRONOUS_CONTROLS),
     fTarget(target),
     fMimeType(mimeType.Type())
 {
+    float padding = 3.0f;
+    //if (be_control_look)
+        //padding = be_control_look->DefaultItemSpacing();
+
     if (attributeItem != NULL)
         fAttribute = *attributeItem;
 
-    BRect rect = Bounds();
-    BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
-
-    rect.InsetBy(8.0f, 8.0f);
-    fPublicNameControl = new BTextControl(rect, "public", "Attribute name:",
-        fAttribute.PublicName(), NULL, B_FOLLOW_LEFT_RIGHT);
-    fPublicNameControl->SetModificationMessage(new BMessage(kMsgAttributeUpdated));
-
-    float labelWidth = fPublicNameControl->StringWidth(fPublicNameControl->Label()) + 2.0f;
-    fPublicNameControl->SetDivider(labelWidth);
+    fPublicNameControl = new BTextControl("Attribute name:",
+        fAttribute.PublicName(), NULL);
+    fPublicNameControl->SetModificationMessage(
+        new BMessage(kMsgAttributeUpdated));
     fPublicNameControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
 
-    float width, height;
-    fPublicNameControl->GetPreferredSize(&width, &height);
-    fPublicNameControl->ResizeTo(rect.Width(), height);
-    topView->AddChild(fPublicNameControl);
-
-    rect = fPublicNameControl->Frame();
-    rect.OffsetBy(0.0f, rect.Height() + 5.0f);
-    fAttributeControl = new BTextControl(rect, "internal", "Internal name:",
-        fAttribute.Name(), NULL, B_FOLLOW_LEFT_RIGHT);
-    fAttributeControl->SetModificationMessage(new BMessage(kMsgAttributeUpdated));
-    fAttributeControl->SetDivider(labelWidth);
+    fAttributeControl = new BTextControl("Internal name:",
+        fAttribute.Name(), NULL);
+    fAttributeControl->SetModificationMessage(
+        new BMessage(kMsgAttributeUpdated));
     fAttributeControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
 
     // filter out invalid characters that can't be part of an attribute
@@ -128 +122 @@
         textView->DisallowChar(disallowedCharacters[i]);
     }
 
-    topView->AddChild(fAttributeControl);
-
     fTypeMenu = new BPopUpMenu("type");
     BMenuItem* item = NULL;
     for (int32 i = 0; kTypeMap[i].name != NULL; i++) {
@@ -143 +135 @@
             item->SetMarked(true);
     }
 
-    rect.OffsetBy(0.0f, rect.Height() + 4.0f);
-    BMenuField* menuField = new BMenuField(rect, "types",
-        "Type:", fTypeMenu);
-    menuField->SetDivider(labelWidth);
-    menuField->SetAlignment(B_ALIGN_RIGHT);
-    menuField->GetPreferredSize(&width, &height);
-    menuField->ResizeTo(rect.Width(), height);
-    topView->AddChild(menuField);
+    BMenuField* typeMenuField = new BMenuField("types" , "Type:", fTypeMenu);
+    typeMenuField->SetAlignment(B_ALIGN_RIGHT);
 
-    rect.OffsetBy(0.0f, rect.Height() + 4.0f);
-    rect.bottom = rect.top + fAttributeControl->Bounds().Height() * 2.0f + 18.0f;
-    BBox* box = new BBox(rect, "", B_FOLLOW_LEFT_RIGHT);
-    topView->AddChild(box);
-
-    fVisibleCheckBox = new BCheckBox(rect, "visible", "Visible",
+    fVisibleCheckBox = new BCheckBox("visible", "Visible",
         new BMessage(kMsgVisibilityChanged));
     fVisibleCheckBox->SetValue(fAttribute.Visible());
-    fVisibleCheckBox->ResizeToPreferred();
-    box->SetLabel(fVisibleCheckBox);
 
-    labelWidth -= 8.0f;
-
     BMenu* menu = new BPopUpMenu("display as");
     for (int32 i = 0; kDisplayAsMap[i].name != NULL; i++) {
         BMessage* message = new BMessage(kMsgDisplayAsChosen);
@@ -182 +159 @@
             item->SetMarked(true);
     }
 
-    rect.OffsetTo(8.0f, fVisibleCheckBox->Bounds().Height());
-    rect.right -= 18.0f;
-    fDisplayAsMenuField = new BMenuField(rect, "display as",
+    fDisplayAsMenuField = new BMenuField("display as",
         "Display as:", menu);
-    fDisplayAsMenuField->SetDivider(labelWidth);
     fDisplayAsMenuField->SetAlignment(B_ALIGN_RIGHT);
-    fDisplayAsMenuField->ResizeTo(rect.Width(), height);
-    box->AddChild(fDisplayAsMenuField);
 
-    fEditableCheckBox = new BCheckBox(rect, "editable", "Editable",
-        new BMessage(kMsgAttributeUpdated), B_FOLLOW_RIGHT);
+    fEditableCheckBox = new BCheckBox("editable", "Editable",
+        new BMessage(kMsgAttributeUpdated));
     fEditableCheckBox->SetValue(fAttribute.Editable());
-    fEditableCheckBox->ResizeToPreferred();
-    fEditableCheckBox->MoveTo(rect.right - fEditableCheckBox->Bounds().Width(),
-        rect.top + (fDisplayAsMenuField->Bounds().Height()
-        - fEditableCheckBox->Bounds().Height()) / 2.0f);
-    box->AddChild(fEditableCheckBox);
 
-    rect.OffsetBy(0.0f, menuField->Bounds().Height() + 4.0f);
-    rect.bottom = rect.top + fPublicNameControl->Bounds().Height();
-    fSpecialControl = new BTextControl(rect, "special", "Special:",
-        display_as_parameter(fAttribute.DisplayAs()), NULL,
-        B_FOLLOW_LEFT_RIGHT);
-    fSpecialControl->SetModificationMessage(new BMessage(kMsgAttributeUpdated));
-    fSpecialControl->SetDivider(labelWidth);
+    fSpecialControl = new BTextControl("Special:",
+        display_as_parameter(fAttribute.DisplayAs()), NULL);
+    fSpecialControl->SetModificationMessage(
+        new BMessage(kMsgAttributeUpdated));
     fSpecialControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
     fSpecialControl->SetEnabled(false);
-    box->AddChild(fSpecialControl);
 
     char text[64];
     snprintf(text, sizeof(text), "%ld", fAttribute.Width());
-    rect.OffsetBy(0.0f, fSpecialControl->Bounds().Height() + 4.0f);
-    fWidthControl = new BTextControl(rect, "width", "Width:",
-        text, NULL, B_FOLLOW_LEFT_RIGHT);
-    fWidthControl->SetModificationMessage(new BMessage(kMsgAttributeUpdated));
-    fWidthControl->SetDivider(labelWidth);
+    fWidthControl = new BTextControl("Width:", text, NULL);
+    fWidthControl->SetModificationMessage(
+        new BMessage(kMsgAttributeUpdated));
     fWidthControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
 
     // filter out invalid characters that can't be part of a width
@@ -228 +189 @@
     }
     textView->SetMaxBytes(4);
 
-    box->AddChild(fWidthControl);
-
     const struct alignment_map {
         int32       alignment;
         const char* name;
@@ -252 +211 @@
             item->SetMarked(true);
     }
 
-    rect.OffsetBy(0.0f, menuField->Bounds().Height() + 1.0f);
-    fAlignmentMenuField = new BMenuField(rect, "alignment",
+    fAlignmentMenuField = new BMenuField("alignment",
         "Alignment:", menu);
-    fAlignmentMenuField->SetDivider(labelWidth);
     fAlignmentMenuField->SetAlignment(B_ALIGN_RIGHT);
-    fAlignmentMenuField->ResizeTo(rect.Width(), height);
-    box->AddChild(fAlignmentMenuField);
-    box->ResizeBy(0.0f, fAlignmentMenuField->Bounds().Height() * 2.0f
-        + fVisibleCheckBox->Bounds().Height());
 
-    fAcceptButton = new BButton(rect, "add", item ? "Done" : "Add",
-        new BMessage(kMsgAccept), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    fAcceptButton->ResizeToPreferred();
-    fAcceptButton->MoveTo(Bounds().Width() - 8.0f - fAcceptButton->Bounds().Width(),
-        Bounds().Height() - 8.0f - fAcceptButton->Bounds().Height());
+    fAcceptButton = new BButton("add", item ? "Done" : "Add",
+        new BMessage(kMsgAccept));
     fAcceptButton->SetEnabled(false);
-    topView->AddChild(fAcceptButton);
 
-    BButton* button = new BButton(rect, "cancel", "Cancel",
-        new BMessage(B_QUIT_REQUESTED), B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
-    button->ResizeToPreferred();
-    button->MoveTo(fAcceptButton->Frame().left - 10.0f - button->Bounds().Width(),
-        fAcceptButton->Frame().top);
-    topView->AddChild(button);
+    BButton* cancelButton = new BButton("cancel", "Cancel",
+        new BMessage(B_QUIT_REQUESTED));
 
-    ResizeTo(labelWidth * 4.0f + 24.0f, box->Frame().bottom
-        + button->Bounds().Height() + 20.0f);
-    SetSizeLimits(fEditableCheckBox->Bounds().Width() + button->Bounds().Width()
-        + fAcceptButton->Bounds().Width() + labelWidth + 24.0f,
-        32767.0f, Frame().Height(), Frame().Height());
+    BBox* visibleBox;
+    SetLayout(new BGroupLayout(B_VERTICAL));
+    AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+        .SetInsets(padding, padding, padding, padding)
+        .Add(BGridLayoutBuilder(padding, padding)
+            .Add(fPublicNameControl->CreateLabelLayoutItem(), 0, 0)
+            .Add(fPublicNameControl->CreateTextViewLayoutItem(), 1, 0)
+            .Add(fAttributeControl->CreateLabelLayoutItem(), 0, 1)
+            .Add(fAttributeControl->CreateTextViewLayoutItem(), 1, 1)
+            .Add(typeMenuField->CreateLabelLayoutItem(), 0, 2)
+            .Add(typeMenuField->CreateMenuBarLayoutItem(), 1, 2)
+        )
+        .Add(visibleBox = new BBox(B_FANCY_BORDER, 
+            BGridLayoutBuilder(padding, padding)
+                .Add(fDisplayAsMenuField->CreateLabelLayoutItem(), 0, 0)
+                .Add(fDisplayAsMenuField->CreateMenuBarLayoutItem(), 1, 0)
+                .Add(fEditableCheckBox, 3, 0)
+                .Add(fSpecialControl->CreateLabelLayoutItem(), 0, 1)
+                .Add(fSpecialControl->CreateTextViewLayoutItem(), 1, 1, 3)
+                .Add(fWidthControl->CreateLabelLayoutItem(), 0, 2)
+                .Add(fWidthControl->CreateTextViewLayoutItem(), 1, 2, 3)
+                .Add(fAlignmentMenuField->CreateLabelLayoutItem(), 0, 3)
+                .Add(fAlignmentMenuField->CreateMenuBarLayoutItem(), 1, 3, 3)
+                .SetInsets(padding, padding, padding, padding)
+            ))
+        .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+            .Add(BSpaceLayoutItem::CreateGlue())
+            .Add(BSpaceLayoutItem::CreateGlue())
+            .Add(cancelButton)
+            .Add(fAcceptButton)
+        )
+    );
+    visibleBox->SetLabel(fVisibleCheckBox);
 
     fAcceptButton->MakeDefault(true);
     fPublicNameControl->MakeFocus(true);

FileTypesWindow.h

@@ -20 +20 @@
 
 class AttributeListView;
 class ExtensionListView;
+class StringView;
 class TypeIconView;
 class MimeTypeListView;
-class StringView;
 
 
 class FileTypesWindow : public BWindow {

DropTargetListView.cpp

@@ -7 +7 @@
 #include "DropTargetListView.h"
 
 
-DropTargetListView::DropTargetListView(BRect frame, const char* name,
-        list_view_type type, uint32 resizeMask, uint32 flags)
-    : BListView(frame, name, type, resizeMask, flags),
+DropTargetListView::DropTargetListView(const char* name,
+        list_view_type type, uint32 flags)
+    : BListView(name, type, flags),
     fDropTarget(false)
 {
 }

StringView.h

@@ -6 +6 @@
 #define STRING_VIEW_H
 
 
-#include <String.h>
-#include <View.h>
+class BLayoutItem;
+class BGroupView;
+class BStringView;
 
-
-class StringView : public BView {
+class StringView {
     public:
-        StringView(BRect frame, const char* name, const char* label,
-            const char* text, uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
-            uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS);
-        virtual ~StringView();
+        StringView(const char* label,
+            const char* text);
 
-        virtual void Draw(BRect updateRect);
-        virtual void AttachedToWindow();
-
-        virtual void FrameResized(float width, float height);
-
-        virtual void GetPreferredSize(float* _width, float* _height);
-        virtual void ResizeToPreferred();
-
         void SetEnabled(bool enabled);
-        bool IsEnabled() const { return fEnabled; }
 
         void SetLabel(const char* label);
-        const char* Label() const { return fLabel.String(); }
-
+        const char* Label() const;
         void SetText(const char* text);
-        const char* Text() const { return fText.String(); }
+        const char* Text() const;
 
-        void SetDivider(float divider);
-        float Divider() const { return fDivider; }
+        BLayoutItem* GetLabelLayoutItem();
+        BView* LabelView();
+        BLayoutItem* GetTextLayoutItem();
+        BView* TextView();
 
-        void SetAlignment(alignment labelAlignment, alignment textAlignment);
-        void GetAlignment(alignment* _label, alignment* _text) const;
+        operator BView*();
 
     private:
-        void _UpdateText();
 
-        BString     fLabel;
-        BString     fText;
-        BString     fTruncatedText;
-        float       fDivider;
-        alignment   fLabelAlignment;
-        alignment   fTextAlignment;
-        bool        fEnabled;
+        BGroupView*     fView;
+        BStringView*    fLabel;
+        BLayoutItem*    fLabelItem;
+        BStringView*    fText;
+        BLayoutItem*    fTextItem;
 };
 
+
 #endif  // STRING_VIEW_H

ApplicationTypesWindow.cpp

@@ -16 +16 @@
 #include <Bitmap.h>
 #include <Box.h>
 #include <Button.h>
+#include <ControlLook.h>
+#include <GridLayoutBuilder.h>
+#include <GroupLayoutBuilder.h>
 #include <MenuField.h>
 #include <MenuItem.h>
 #include <Mime.h>
@@ -54 +57 @@
 const uint32 kMsgEdit = 'edit';
 
 
-const char*
+const char* 
 variety_to_text(uint32 variety)
 {
 #if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
@@ -88 +91 @@
 //  #pragma mark -
 
 
-ProgressWindow::ProgressWindow(const char* message, int32 max, volatile bool* signalQuit)
-    : BWindow(BRect(0, 0, 300, 200), "Progress", B_MODAL_WINDOW_LOOK,
-        B_MODAL_SUBSET_WINDOW_FEEL, B_ASYNCHRONOUS_CONTROLS | B_NOT_V_RESIZABLE),
+ProgressWindow::ProgressWindow(const char* message,
+    int32 max, volatile bool* signalQuit)
+    :
+    BWindow(BRect(0, 0, 300, 200), "Progress", B_MODAL_WINDOW_LOOK, 
+        B_MODAL_SUBSET_WINDOW_FEEL, B_ASYNCHRONOUS_CONTROLS | 
+            B_NOT_V_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS),
     fQuitListener(signalQuit)
 {
-    BView* topView = new BView(Bounds(), NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
-
     char count[100];
     snprintf(count, sizeof(count), "/%ld", max);
 
-    BRect rect = Bounds().InsetByCopy(8, 8);
-    fStatusBar = new BStatusBar(rect, "status", message, count);
+    fStatusBar = new BStatusBar("status", message, count);
     fStatusBar->SetMaxValue(max);
-    fStatusBar->SetResizingMode(B_FOLLOW_LEFT_RIGHT);
-    float width, height;
-    fStatusBar->GetPreferredSize(&width, &height);
-    fStatusBar->ResizeTo(rect.Width(), height);
-    topView->AddChild(fStatusBar);
+    fAbortButton = new BButton("abort", "Abort", new BMessage(B_CANCEL));
+    
+    SetLayout(new BGroupLayout(B_VERTICAL));
+    AddChild(BGroupLayoutBuilder(B_VERTICAL, 3.0f)
+        .Add(fStatusBar)
+        .Add(fAbortButton)
+        .SetInsets(3.0f, 3.0f, 3.0f, 3.0f)
+    );
 
-    fAbortButton = new BButton(rect, "abort", "Abort", new BMessage(B_CANCEL),
-        B_FOLLOW_H_CENTER | B_FOLLOW_TOP);
-    fAbortButton->ResizeToPreferred();
-    fAbortButton->MoveTo((Bounds().Width() - fAbortButton->Bounds().Width()) / 2,
-        fStatusBar->Frame().bottom + 10.0f);
-    topView->AddChild(fAbortButton);
-
-    ResizeTo(width * 1.4f, fAbortButton->Frame().bottom + 8.0f);
-    SetSizeLimits(width + 42.0f, 32767.0f,
-        Bounds().Height(), Bounds().Height());
-
     // center on screen
     BScreen screen(this);
-    MoveTo(screen.Frame().left + (screen.Frame().Width() - Bounds().Width()) / 2.0f,
-        screen.Frame().top + (screen.Frame().Height() - Bounds().Height()) / 2.0f);
+    MoveTo(screen.Frame().left + (screen.Frame().Width() 
+            - Bounds().Width()) / 2.0f,
+        screen.Frame().top + (screen.Frame().Height()
+            - Bounds().Height()) / 2.0f);
 }
 
 
@@ -159 +154 @@
 //  #pragma mark -
 
 
-ApplicationTypesWindow::ApplicationTypesWindow(const BMessage &settings)
+ApplicationTypesWindow::ApplicationTypesWindow(const BMessage& settings)
     : BWindow(_Frame(settings), "Application types", B_TITLED_WINDOW,
-        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS)
+        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
 {
-    // Application list
 
-    BRect rect = Bounds();
-    BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
+    float padding = 3.0f;
+    BAlignment labelAlignment = BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP);
+    BAlignment fullWidthTopAlignment = 
+        BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_TOP);
+    if (be_control_look) {
+        // padding = be_control_look->DefaultItemSpacing();
+            // seems too big
+        labelAlignment = be_control_look->DefaultLabelAlignment();
+    }
 
-    BButton* button = new BButton(rect, "remove", "Remove uninstalled",
-        new BMessage(kMsgRemoveUninstalled), B_FOLLOW_LEFT | B_FOLLOW_BOTTOM);
-    button->ResizeToPreferred();
-    button->MoveTo(8.0f, rect.bottom - 8.0f - button->Bounds().Height());
-    topView->AddChild(button);
+    // Application list
+    BView* currentView = new BGroupView(B_VERTICAL, padding);
 
-    rect.bottom = button->Frame().top - 10.0f;
-    rect.top = 10.0f;
-    rect.left = 10.0f;
-    rect.right = 170;
-
-    fTypeListView = new MimeTypeListView(rect, "listview", "application", true, true,
-        B_FOLLOW_LEFT | B_FOLLOW_TOP_BOTTOM);
+    fTypeListView = new MimeTypeListView("listview", "application", true, true);
     fTypeListView->SetSelectionMessage(new BMessage(kMsgTypeSelected));
     fTypeListView->SetInvocationMessage(new BMessage(kMsgTypeInvoked));
 
     BScrollView* scrollView = new BScrollView("scrollview", fTypeListView,
-        B_FOLLOW_LEFT | B_FOLLOW_TOP_BOTTOM, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
-    topView->AddChild(scrollView);
+        B_FRAME_EVENTS | B_WILL_DRAW, false, true);
 
-    // "Information" group
+    BButton* button = new BButton("remove", "Remove uninstalled",
+        new BMessage(kMsgRemoveUninstalled));
 
-    BFont font(be_bold_font);
-    font_height fontHeight;
-    font.GetHeight(&fontHeight);
+    SetLayout(BGroupLayoutBuilder(B_HORIZONTAL));
 
-    rect.left = rect.right + 12.0f + B_V_SCROLL_BAR_WIDTH;
-    rect.top -= 2.0f;
-    rect.right = topView->Bounds().Width() - 8.0f;
-    rect.bottom = rect.top + ceilf(fontHeight.ascent) + 24.0f;
-    BBox* box = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
-    box->SetLabel("Information");
-    topView->AddChild(box);
+    // "Information" group
 
-    BRect innerRect = box->Bounds().InsetByCopy(8.0f, 6.0f);
-    float labelWidth = topView->StringWidth("Description:") + 4.0f;
+    BBox* infoBox = new BBox((char*)NULL);
+    infoBox->SetLabel("Information");
+    infoBox->SetExplicitAlignment(fullWidthTopAlignment);
+    
+    fNameView = new StringView("Name:", NULL);
+    fNameView->TextView()->SetExplicitAlignment(labelAlignment);
+    fNameView->LabelView()->SetExplicitAlignment(labelAlignment);
+    fSignatureView = new StringView("Signature:", NULL);
+    fSignatureView->TextView()->SetExplicitAlignment(labelAlignment);
+    fSignatureView->LabelView()->SetExplicitAlignment(labelAlignment);
+    fPathView = new StringView("Path:", NULL);
+    fPathView->TextView()->SetExplicitAlignment(labelAlignment);
+    fPathView->LabelView()->SetExplicitAlignment(labelAlignment);
 
-    innerRect.right = box->Bounds().Width() - 8.0f;
-    innerRect.top += ceilf(fontHeight.ascent);
-    fNameView = new StringView(innerRect, "name", "Name:", NULL, B_FOLLOW_LEFT_RIGHT);
-    fNameView->SetDivider(labelWidth);
-    float width, height;
-    fNameView->GetPreferredSize(&width, &height);
-    fNameView->ResizeTo(innerRect.Width(), height);
-    box->ResizeBy(0, fNameView->Bounds().Height() * 3.0f);
-    box->AddChild(fNameView);
+    infoBox->AddChild(
+        BGridLayoutBuilder(padding, padding)
+            .Add(fNameView->LabelView(), 0, 0)
+            .Add(fNameView->TextView(), 1, 0, 2)
+            .Add(fSignatureView->LabelView(), 0, 1)
+            .Add(fSignatureView->TextView(), 1, 1, 2, 2)
+            .Add(fPathView->LabelView(), 0, 2)
+            .Add(fPathView->TextView(), 1, 2, 2)
+            .SetInsets(padding, padding, padding, padding)
+    );
 
-    innerRect.OffsetBy(0, fNameView->Bounds().Height() + 5.0f);
-    innerRect.bottom = innerRect.top + height;
-    fSignatureView = new StringView(innerRect, "signature", "Signature:", NULL,
-        B_FOLLOW_LEFT_RIGHT);
-    fSignatureView->SetDivider(labelWidth);
-    box->AddChild(fSignatureView);
-
-    innerRect.OffsetBy(0, fNameView->Bounds().Height() + 5.0f);
-    fPathView = new StringView(innerRect, "path", "Path:", NULL,
-        B_FOLLOW_LEFT_RIGHT);
-    fPathView->SetDivider(labelWidth);
-    box->AddChild(fPathView);
-
     // "Version" group
 
-    rect.top = box->Frame().bottom + 8.0f;
-    rect.bottom = rect.top + ceilf(fontHeight.ascent)
-        + fNameView->Bounds().Height() * 4.0f + 20.0f;
-    box = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
-    box->SetLabel("Version");
-    topView->AddChild(box);
+    BBox* versionBox = new BBox("");
+    versionBox->SetLabel("Version");
+    versionBox->SetExplicitAlignment(fullWidthTopAlignment);
 
-    innerRect = fNameView->Frame();
-    fVersionView = new StringView(innerRect, "version", "Version:", NULL,
-        B_FOLLOW_LEFT_RIGHT);
-    fVersionView->SetDivider(labelWidth);
-    box->AddChild(fVersionView);
-
-    innerRect.OffsetBy(0, fNameView->Bounds().Height() + 5.0f);
-    innerRect.right = innerRect.left + labelWidth;
-    fDescriptionLabel = new StringView(innerRect, "description", "Description:", NULL);
-    fDescriptionLabel->SetDivider(labelWidth);
-    box->AddChild(fDescriptionLabel);
-
-    innerRect.left = innerRect.right + 3.0f;
-    innerRect.top += 1.0f;
-    innerRect.right = box->Bounds().Width() - 8.0f;
-    innerRect.bottom += fNameView->Bounds().Height() * 2.0f - 1.0f;
-    fDescriptionView = new BTextView(innerRect, "description",
-        innerRect.OffsetToCopy(B_ORIGIN), B_FOLLOW_LEFT_RIGHT,
-        B_WILL_DRAW | B_FRAME_EVENTS);
+    fVersionView = new StringView("Version:", NULL);
+    fVersionView->TextView()->SetExplicitAlignment(labelAlignment);
+    fVersionView->LabelView()->SetExplicitAlignment(labelAlignment);
+    fDescriptionLabel = new StringView("Description:", NULL);
+    fDescriptionLabel->LabelView()->SetExplicitAlignment(labelAlignment);
+    fDescriptionView = new BTextView("description");
     fDescriptionView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
     fDescriptionView->SetLowColor(fDescriptionView->ViewColor());
     fDescriptionView->MakeEditable(false);
-    box->AddChild(fDescriptionView);
+    
+    versionBox->AddChild(currentView = 
+        BGridLayoutBuilder(padding, padding)
+            .Add(fVersionView->LabelView(), 0, 0)
+            .Add(fVersionView->TextView(), 1, 0)
+            .Add(fDescriptionLabel->LabelView(), 0, 1)
+            .Add(fDescriptionView, 1, 1, 2, 2)
+            .SetInsets(padding, padding, padding, padding)
+    );
+    currentView->SetExplicitAlignment(fullWidthTopAlignment);
 
     // Launch and Tracker buttons
 
-    rect = box->Frame();
-    rect.top = rect.bottom + 8.0f;
-    rect.bottom = rect.top + 20.0f;
-    fTrackerButton = new BButton(rect, "tracker", "Show in Tracker" B_UTF8_ELLIPSIS, NULL,
-        B_FOLLOW_RIGHT);
-    fTrackerButton->ResizeToPreferred();
-    fTrackerButton->MoveTo(rect.right - fTrackerButton->Bounds().Width(), rect.top);
-    topView->AddChild(fTrackerButton);
+    fEditButton = new BButton("Edit" B_UTF8_ELLIPSIS, new BMessage(kMsgEdit));
+    // launch and tracker buttons get messages in _SetType()
+    fLaunchButton = new BButton("Launch");
+    fTrackerButton = new BButton("Show in Tracker" B_UTF8_ELLIPSIS);
 
-    fLaunchButton = new BButton(rect, "launch", "Launch", NULL,
-        B_FOLLOW_RIGHT);
-    fLaunchButton->ResizeToPreferred();
-    fLaunchButton->MoveTo(fTrackerButton->Frame().left - 6.0f
-        - fLaunchButton->Bounds().Width(), rect.top);
-    topView->AddChild(fLaunchButton);
-    
-    fEditButton = new BButton(rect, "edit", "Edit" B_UTF8_ELLIPSIS, new BMessage(kMsgEdit),
-        B_FOLLOW_RIGHT);
-    fEditButton->ResizeToPreferred();
-    fEditButton->MoveTo(fLaunchButton->Frame().left - 6.0f
-        - fEditButton->Bounds().Width(), rect.top);
-    topView->AddChild(fEditButton);
+    AddChild(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+        .Add(BGroupLayoutBuilder(B_VERTICAL, padding)
+            .Add(scrollView)
+            .Add(button)
+            .SetInsets(padding, padding, padding, padding)
+        , 3)
+        .Add(BGroupLayoutBuilder(B_VERTICAL, padding)
+            .Add(infoBox)
+            .Add(versionBox)
+            .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+                .Add(fEditButton)
+                .Add(fLaunchButton)
+                .Add(fTrackerButton)
+            )
+            .AddGlue()
+            .SetInsets(padding, padding, padding, padding)
+        )
+        .SetInsets(padding, padding, padding, padding)
+    );
 
-    SetSizeLimits(scrollView->Frame().right + 22.0f + fTrackerButton->Frame().Width()
-        + fLaunchButton->Frame().Width() + 6 + fEditButton->Frame().Width(), 32767.0f,
-        fTrackerButton->Frame().bottom + 8.0f, 32767.0f);
-
     BMimeType::StartWatching(this);
     _SetType(NULL);
 }
@@ -322 +294 @@
     int32 removed = 0;
     volatile bool quit = false;
 
-    BWindow* progressWindow = new ProgressWindow("Removing uninstalled application types",
-        fTypeListView->FullListCountItems(), &quit);
+    BWindow* progressWindow = 
+        new ProgressWindow("Removing uninstalled application types",
+            fTypeListView->FullListCountItems(), &quit);
     progressWindow->AddToSubset(this);
     progressWindow->Show();
 
     for (int32 i = fTypeListView->FullListCountItems(); i-- > 0 && !quit;) {
-        MimeTypeItem* item = dynamic_cast<MimeTypeItem*>(fTypeListView->FullListItemAt(i));
+        MimeTypeItem* item = dynamic_cast<MimeTypeItem*>
+            (fTypeListView->FullListItemAt(i));
         progressWindow->PostMessage(B_UPDATE_STATUS_BAR);
 
         if (item == NULL)
@@ -474 +448 @@
     fNameView->SetEnabled(enabled);
     fSignatureView->SetEnabled(enabled);
     fPathView->SetEnabled(enabled);
-
+    
     fVersionView->SetEnabled(enabled);
     fDescriptionLabel->SetEnabled(enabled);
 
@@ -485 +459 @@
 
 
 void
-ApplicationTypesWindow::FrameResized(float width, float height)
-{
-    // This works around a flaw of BTextView
-    fDescriptionView->SetTextRect(fDescriptionView->Bounds());
-}
-
-
-void
 ApplicationTypesWindow::MessageReceived(BMessage* message)
 {
     switch (message->what) {

IconView.cpp

@@ -21 +21 @@
 #include <PopUpMenu.h>
 #include <Resources.h>
 #include <Roster.h>
+#include <Size.h>
 
 #include <new>
 #include <stdlib.h>
@@ -523 +524 @@
 //  #pragma mark -
 
 
-IconView::IconView(BRect rect, const char* name, uint32 resizeMode, uint32 flags)
-    : BControl(rect, name, NULL, NULL, resizeMode, B_WILL_DRAW | flags),
+IconView::IconView(const char* name, uint32 flags)
+    : BControl(name, NULL, NULL, B_WILL_DRAW | flags),
     fModificationMessage(NULL),
     fIconSize(B_LARGE_ICON),
     fIcon(NULL),
@@ -781 +782 @@
 }
 
 
+BSize
+IconView::MinSize()
+{
+    float width, height;
+    GetPreferredSize(&width, &height);
+    return BSize(width, height);
+}
+
+
+BSize
+IconView::PreferredSize()
+{
+    return MinSize();
+}
+
+
+BSize
+IconView::MaxSize()
+{
+    return MinSize();
+}
+
+
 void
 IconView::MouseDown(BPoint where)
 {
@@ -1108 +1132 @@
 }
 
 
-void
+status_t
 IconView::SetTarget(const BMessenger& target)
 {
     fTarget = target;
+    return B_OK;
 }
 
 
@@ -1123 +1148 @@
 }
 
 
-void
+status_t
 IconView::Invoke(const BMessage* _message)
 {
     if (_message == NULL)
@@ -1132 +1157 @@
         BMessage message(*_message);
         fTarget.SendMessage(&message);
     }
+    return B_OK;
 }
 
 

MimeTypeListView.h

@@ -52 +52 @@
 
 class MimeTypeListView : public BOutlineListView {
     public:
-        MimeTypeListView(BRect rect, const char* name,
+        MimeTypeListView(const char* name,
             const char* supertype = NULL, bool showIcons = false,
-            bool applicationMode = false,
-            uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP);
+            bool applicationMode = false);
         virtual ~MimeTypeListView();
 
         void SelectNewType(const char* type);

FileTypesWindow.cpp

@@ -16 +16 @@
 #include "PreferredAppMenu.h"
 #include "StringView.h"
 
+#include <Alignment.h>
 #include <AppFileInfo.h>
 #include <Application.h>
 #include <Bitmap.h>
 #include <Box.h>
 #include <Button.h>
+#include <ControlLook.h>
+#include <GridLayoutBuilder.h>
+#include <GroupLayoutBuilder.h>
 #include <ListView.h>
 #include <MenuBar.h>
 #include <MenuField.h>
@@ -30 +34 @@
 #include <OutlineListView.h>
 #include <PopUpMenu.h>
 #include <ScrollView.h>
+#include <SpaceLayoutItem.h>
+#include <SplitView.h>
 #include <TextControl.h>
 
 #include <OverrideAlert.h>
@@ -38 +44 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-
 const uint32 kMsgTypeSelected = 'typs';
 const uint32 kMsgAddType = 'atyp';
 const uint32 kMsgRemoveType = 'rtyp';
@@ -69 +74 @@
 
 class TypeIconView : public IconView {
     public:
-        TypeIconView(BRect frame, const char* name,
-            int32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP);
+        TypeIconView(const char* name);
         virtual ~TypeIconView();
 
         virtual void Draw(BRect updateRect);
@@ -82 +86 @@
 
 class ExtensionListView : public DropTargetListView {
     public:
-        ExtensionListView(BRect frame, const char* name,
+        ExtensionListView(const char* name,
             list_view_type type = B_SINGLE_SELECTION_LIST,
-            uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
             uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
         virtual ~ExtensionListView();
 
@@ -101 +104 @@
 //  #pragma mark -
 
 
-TypeIconView::TypeIconView(BRect frame, const char* name, int32 resizingMode)
-    : IconView(frame, name, resizingMode)
+TypeIconView::TypeIconView(const char* name)
+    : IconView(name)
 {
     ShowEmptyFrame(false);
 }
@@ -202 +205 @@
 //  #pragma mark -
 
 
-ExtensionListView::ExtensionListView(BRect frame, const char* name,
-        list_view_type type, uint32 resizeMask, uint32 flags)
-    : DropTargetListView(frame, name, type, resizeMask, flags)
+ExtensionListView::ExtensionListView(const char* name,
+        list_view_type type, uint32 flags)
+    : DropTargetListView(name, type, flags)
 {
 }
 
@@ -271 +274 @@
 
 
 FileTypesWindow::FileTypesWindow(const BMessage& settings)
-    : BWindow(_Frame(settings), "FileTypes", B_TITLED_WINDOW,
-        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS),
+    :
+    BWindow(_Frame(settings), "FileTypes", B_TITLED_WINDOW,
+        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS),
     fNewTypeWindow(NULL)
 {
     bool showIcons;
@@ -282 +286 @@
     if (settings.FindBool("show_rule", &showRule) != B_OK)
         showRule = false;
 
+    SetLayout(new BGroupLayout(B_VERTICAL));
+    float padding = 3.0f;
+    BAlignment labelAlignment = BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP);
+    if (be_control_look) {
+        // padding = be_control_look->DefaultItemSpacing();
+            // this seems to be very large!
+        labelAlignment = be_control_look->DefaultLabelAlignment();
+    }
+    BAlignment fullAlignment = 
+        BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_USE_FULL_HEIGHT);
+
     // add the menu
+    BMenuBar* menuBar = new BMenuBar("");
 
-    BMenuBar* menuBar = new BMenuBar(BRect(0, 0, 0, 0), NULL);
-    AddChild(menuBar);
-
     BMenu* menu = new BMenu("File");
     BMenuItem* item;
     menu->AddItem(item = new BMenuItem("New resource file" B_UTF8_ELLIPSIS,
@@ -298 +311 @@
     item = new BMenuItem(recentsMenu, new BMessage(kMsgOpenFilePanel));
     item->SetShortcut('O', B_COMMAND_KEY);
     menu->AddItem(item);
+
     menu->AddItem(new BMenuItem("Application types" B_UTF8_ELLIPSIS,
         new BMessage(kMsgOpenApplicationTypesWindow)));
     menu->AddSeparatorItem();
@@ -323 +337 @@
     menu->AddItem(item);
     menuBar->AddItem(menu);
 
+    AddChild(menuBar);
+    menuBar->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP));
+
     // MIME Types list
+    BButton* addTypeButton = new BButton( "add", "Add" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgAddType));
 
-    BRect rect = Bounds();
-    rect.top = menuBar->Bounds().Height() + 1.0f;
-    BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
+    fRemoveTypeButton = new BButton( "remove", "Remove",
+        new BMessage(kMsgRemoveType) );
 
-    BButton* button = new BButton(rect, "add", "Add" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgAddType), B_FOLLOW_BOTTOM);
-    button->ResizeToPreferred();
-    button->MoveTo(8.0f, topView->Bounds().bottom - 8.0f - button->Bounds().Height());
-    topView->AddChild(button);
-
-    rect = button->Frame();
-    rect.OffsetBy(rect.Width() + 8.0f, 0.0f);
-    fRemoveTypeButton = new BButton(rect, "remove", "Remove",
-        new BMessage(kMsgRemoveType), B_FOLLOW_BOTTOM);
-    fRemoveTypeButton->ResizeToPreferred();
-    topView->AddChild(fRemoveTypeButton);
-
-    rect.bottom = rect.top - 10.0f;
-    rect.top = 10.0f;
-    rect.left = 10.0f;
-    rect.right -= B_V_SCROLL_BAR_WIDTH + 2.0f;
-    if (rect.right < 180)
-        rect.right = 180;
-
-    fTypeListView = new MimeTypeListView(rect, "typeview", NULL, showIcons, false,
-        B_FOLLOW_LEFT | B_FOLLOW_TOP_BOTTOM);
+    fTypeListView = new MimeTypeListView( "typeview", NULL, showIcons, false);
     fTypeListView->SetSelectionMessage(new BMessage(kMsgTypeSelected));
 
-    BScrollView* scrollView = new BScrollView("scrollview", fTypeListView,
-        B_FOLLOW_LEFT | B_FOLLOW_TOP_BOTTOM, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
-    topView->AddChild(scrollView);
+    BScrollView* typeListScrollView = new BScrollView("scrollview", fTypeListView,
+        B_FRAME_EVENTS | B_WILL_DRAW, false, true);
 
     // "Icon" group
 
-    font_height plainHeight;
-    be_plain_font->GetHeight(&plainHeight);
-    float height = ceilf(plainHeight.ascent + plainHeight.descent
-        + plainHeight.leading) + 2.0f;
-
-    BFont font(be_bold_font);
-    float labelWidth = font.StringWidth("Icon");
-    font_height boldHeight;
-    font.GetHeight(&boldHeight);
-
-    BRect innerRect;
-    fIconView = new TypeIconView(innerRect, "icon",
-        B_FOLLOW_LEFT | B_FOLLOW_V_CENTER);
-    fIconView->ResizeToPreferred();
-
-    rect.left = rect.right + 12.0f + B_V_SCROLL_BAR_WIDTH;
-    rect.right = rect.left + max_c(fIconView->Bounds().Width(), labelWidth) + 16.0f;
-    rect.bottom = rect.top + ceilf(boldHeight.ascent)
-        + max_c(fIconView->Bounds().Height(),
-            button->Bounds().Height() * 2.0f + height + 4.0f) + 12.0f;
-    rect.top -= 2.0f;
-    fIconBox = new BBox(rect);
+    fIconView = new TypeIconView( "icon");
+    fIconBox = new BBox("Icon BBox");
     fIconBox->SetLabel("Icon");
-    topView->AddChild(fIconBox);
+    fIconBox->AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+        .Add(BSpaceLayoutItem::CreateGlue(), 1)
+        .Add(fIconView, 3)
+        .Add(BSpaceLayoutItem::CreateGlue(), 1)
+        .SetInsets(padding, padding, padding, padding)
+    );
 
-    innerRect.left = 8.0f;
-    innerRect.top = plainHeight.ascent + 3.0f
-        + (rect.Height() - boldHeight.ascent - fIconView->Bounds().Height()) / 2.0f;
-    if (innerRect.top + fIconView->Bounds().Height() > fIconBox->Bounds().Height() - 6.0f)
-        innerRect.top = fIconBox->Bounds().Height() - 6.0f - fIconView->Bounds().Height();
-    fIconView->MoveTo(innerRect.LeftTop());
-    fIconBox->AddChild(fIconView);
-
     // "File Recognition" group
 
-    BRect rightRect(rect);
-    rightRect.left = rect.right + 8.0f;
-    rightRect.right = topView->Bounds().Width() - 8.0f;
-    fRecognitionBox = new BBox(rightRect, NULL, B_FOLLOW_LEFT_RIGHT);
+    fRecognitionBox = new BBox("Recognition Box");
     fRecognitionBox->SetLabel("File recognition");
-    topView->AddChild(fRecognitionBox);
+    fRecognitionBox->SetExplicitAlignment(fullAlignment);
 
-    innerRect = fRecognitionBox->Bounds().InsetByCopy(8.0f, 4.0f);
-    innerRect.top += ceilf(boldHeight.ascent);
-    fExtensionLabel = new StringView(innerRect, "extension", "Extensions:", NULL);
-    fExtensionLabel->SetAlignment(B_ALIGN_LEFT, B_ALIGN_LEFT);
-    fExtensionLabel->ResizeToPreferred();
-    fRecognitionBox->AddChild(fExtensionLabel);
+    fExtensionLabel = new StringView("Extensions:", NULL);
+    fExtensionLabel->LabelView()->SetExplicitAlignment(labelAlignment);
 
-    innerRect.top += fExtensionLabel->Bounds().Height() + 2.0f;
-    innerRect.left = innerRect.right - button->StringWidth("Remove") - 16.0f;
-    innerRect.bottom = innerRect.top + button->Bounds().Height();
-    fAddExtensionButton = new BButton(innerRect, "add ext", "Add" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgAddExtension), B_FOLLOW_RIGHT);
-    fRecognitionBox->AddChild(fAddExtensionButton);
+    fAddExtensionButton = new BButton("add ext", "Add" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgAddExtension));
 
-    innerRect.OffsetBy(0, innerRect.Height() + 4.0f);
-    fRemoveExtensionButton = new BButton(innerRect, "remove ext", "Remove",
-        new BMessage(kMsgRemoveExtension), B_FOLLOW_RIGHT);
-    fRecognitionBox->AddChild(fRemoveExtensionButton);
+    fRemoveExtensionButton = new BButton("remove ext", "Remove",
+        new BMessage(kMsgRemoveExtension));
 
-    innerRect.right = innerRect.left - 10.0f - B_V_SCROLL_BAR_WIDTH;
-    innerRect.left = 10.0f;
-    innerRect.top = fAddExtensionButton->Frame().top + 2.0f;
-    innerRect.bottom = innerRect.bottom - 2.0f;
-        // take scrollview border into account
-    fExtensionListView = new ExtensionListView(innerRect, "listview ext",
-        B_SINGLE_SELECTION_LIST, B_FOLLOW_LEFT_RIGHT);
+    fExtensionListView = new ExtensionListView("listview ext",
+        B_SINGLE_SELECTION_LIST);
     fExtensionListView->SetSelectionMessage(new BMessage(kMsgExtensionSelected));
     fExtensionListView->SetInvocationMessage(new BMessage(kMsgExtensionInvoked));
 
-    scrollView = new BScrollView("scrollview ext", fExtensionListView,
-        B_FOLLOW_LEFT_RIGHT, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
-    fRecognitionBox->AddChild(scrollView);
+    BScrollView* scrollView = new BScrollView("scrollview ext", 
+        fExtensionListView, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
 
-    innerRect.left = 8.0f;
-    innerRect.top = innerRect.bottom + 10.0f;
-    innerRect.right = fRecognitionBox->Bounds().right - 8.0f;
-    innerRect.bottom = innerRect.top + 20.0f;
-    fRuleControl = new BTextControl(innerRect, "rule", "Rule:", "",
-        new BMessage(kMsgRuleEntered), B_FOLLOW_LEFT_RIGHT);
-    //fRuleControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
-    fRuleControl->SetDivider(fRuleControl->StringWidth(fRuleControl->Label()) + 6.0f);
+    fRuleControl = new BTextControl("rule", "Rule:", "", 
+        new BMessage(kMsgRuleEntered));
+    fRuleControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
     fRuleControl->Hide();
-    fRecognitionBox->AddChild(fRuleControl);
 
+    BView* recognitionBoxGrid = 
+        BGridLayoutBuilder(padding, padding)
+            .Add(fExtensionLabel->LabelView(), 0, 0)
+            .Add(scrollView, 0, 1, 2, 3)
+            .Add(fAddExtensionButton, 2, 1)
+            .Add(fRemoveExtensionButton, 2, 2)
+            .Add(fRuleControl, 0, 4, 3, 1)
+            .SetInsets(padding, padding, padding, padding);
+
+    recognitionBoxGrid->SetExplicitAlignment(fullAlignment);
+    fRecognitionBox->AddChild(recognitionBoxGrid);
+
     // "Description" group
 
-    rect.top = rect.bottom + 8.0f;
-    rect.bottom = rect.top + ceilf(boldHeight.ascent) + 24.0f;
-    rect.right = rightRect.right;
-    fDescriptionBox = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
+    fDescriptionBox = new BBox("description BBox");
     fDescriptionBox->SetLabel("Description");
-    topView->AddChild(fDescriptionBox);
+    fDescriptionBox->SetExplicitAlignment(fullAlignment);
 
-    innerRect = fDescriptionBox->Bounds().InsetByCopy(8.0f, 6.0f);
-    innerRect.top += ceilf(boldHeight.ascent);
-    innerRect.bottom = innerRect.top + button->Bounds().Height();
-    fInternalNameView = new StringView(innerRect, "internal", "Internal name:", "",
-        B_FOLLOW_LEFT_RIGHT);
-    labelWidth = fInternalNameView->StringWidth(fInternalNameView->Label()) + 2.0f;
-    fInternalNameView->SetDivider(labelWidth);
+    fInternalNameView = new StringView("Internal name:", NULL);
     fInternalNameView->SetEnabled(false);
-    fInternalNameView->ResizeToPreferred();
-    fDescriptionBox->AddChild(fInternalNameView);
+    fTypeNameControl = new BTextControl("type", "Type name:", "", 
+        new BMessage(kMsgTypeEntered));
+    fDescriptionControl = new BTextControl("description", "Description:",
+        "", new BMessage(kMsgDescriptionEntered));
 
-    innerRect.OffsetBy(0, fInternalNameView->Bounds().Height() + 5.0f);
-    fTypeNameControl = new BTextControl(innerRect, "type", "Type name:", "",
-        new BMessage(kMsgTypeEntered), B_FOLLOW_LEFT_RIGHT);
-    fTypeNameControl->SetDivider(labelWidth);
-    fTypeNameControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
-    fDescriptionBox->ResizeBy(0, fInternalNameView->Bounds().Height()
-        + fTypeNameControl->Bounds().Height() * 2.0f);
-    fDescriptionBox->AddChild(fTypeNameControl);
+    fDescriptionBox->AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(fInternalNameView->LabelView(), 0, 0)
+        .Add(fInternalNameView->TextView(), 1, 0)
+        .Add(fTypeNameControl->CreateLabelLayoutItem(), 0, 1)
+        .Add(fTypeNameControl->CreateTextViewLayoutItem(), 1, 1, 2)
+        .Add(fDescriptionControl->CreateLabelLayoutItem(), 0, 2)
+        .Add(fDescriptionControl->CreateTextViewLayoutItem(), 1, 2, 2)
+        .SetInsets(padding, padding, padding, padding)
+    );
 
-    innerRect.OffsetBy(0, fTypeNameControl->Bounds().Height() + 5.0f);
-    fDescriptionControl = new BTextControl(innerRect, "description", "Description:", "",
-        new BMessage(kMsgDescriptionEntered), B_FOLLOW_LEFT_RIGHT);
-    fDescriptionControl->SetDivider(labelWidth);
-    fDescriptionControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
-    fDescriptionBox->AddChild(fDescriptionControl);
 
     // "Preferred Application" group
 
-    rect = fDescriptionBox->Frame();
-    rect.top = rect.bottom + 8.0f;
-    rect.bottom = rect.top + ceilf(boldHeight.ascent)
-        + button->Bounds().Height() + 14.0f;
-    fPreferredBox = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
+    fPreferredBox = new BBox("preferred BBox");
     fPreferredBox->SetLabel("Preferred application");
-    topView->AddChild(fPreferredBox);
 
-    innerRect = fPreferredBox->Bounds().InsetByCopy(8.0f, 6.0f);
-    innerRect.top += ceilf(boldHeight.ascent);
-    innerRect.left = innerRect.right - button->StringWidth(
-        "Same as" B_UTF8_ELLIPSIS) - 24.0f;
-    innerRect.bottom = innerRect.top + button->Bounds().Height();
-    fSameAsButton = new BButton(innerRect, "same as",
-        "Same as" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgSamePreferredAppAs), B_FOLLOW_RIGHT);
-    fPreferredBox->AddChild(fSameAsButton);
-
-    innerRect.OffsetBy(-innerRect.Width() - 6.0f, 0.0f);
-    fSelectButton = new BButton(innerRect, "select", "Select" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgSelectPreferredApp), B_FOLLOW_RIGHT);
-    fPreferredBox->AddChild(fSelectButton);
-
     menu = new BPopUpMenu("preferred");
     menu->AddItem(item = new BMenuItem("None",
         new BMessage(kMsgPreferredAppChosen)));
     item->SetMarked(true);
+    fPreferredField = new BMenuField("preferred", (char*)NULL, menu);
 
-    innerRect.right = innerRect.left - 6.0f;
-    innerRect.left = 8.0f;
+    fSelectButton = new BButton("select", "Select" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgSelectPreferredApp));
 
-    fPreferredField = new BMenuField(innerRect, "preferred", NULL, menu, true,
-        B_FOLLOW_LEFT_RIGHT);
-    float width;
-    fPreferredField->GetPreferredSize(&width, &height);
-    fPreferredField->ResizeTo(innerRect.Width(), height);
-    fPreferredField->MoveBy(0.0f, (innerRect.Height() - height) / 2.0f);
+    fSameAsButton = new BButton("same as", "Same as" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgSamePreferredAppAs));
 
-    fPreferredBox->AddChild(fPreferredField);
+    fPreferredBox->AddChild(
+        BGroupLayoutBuilder(B_HORIZONTAL, padding)
+            .Add(fPreferredField)
+            .Add(fSelectButton)
+            .Add(fSameAsButton)
+            .SetInsets(padding, padding, padding, padding)
+    );
 
     // "Extra Attributes" group
-
-    rect.top = rect.bottom + 8.0f;
-    rect.bottom = topView->Bounds().Height() - 8.0f;
-    fAttributeBox = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT
-        | B_FOLLOW_TOP_BOTTOM);
+    fAttributeBox = new BBox("fAttributeBox");
     fAttributeBox->SetLabel("Extra attributes");
-    topView->AddChild(fAttributeBox);
 
-    innerRect = fAttributeBox->Bounds().InsetByCopy(8.0f, 6.0f);
-    innerRect.top += ceilf(boldHeight.ascent);
-    innerRect.left = innerRect.right - button->StringWidth("Remove") - 16.0f;
-    innerRect.bottom = innerRect.top + button->Bounds().Height();
-    fAddAttributeButton = new BButton(innerRect, "add attr",
-        "Add" B_UTF8_ELLIPSIS, new BMessage(kMsgAddAttribute), B_FOLLOW_RIGHT);
-    fAttributeBox->AddChild(fAddAttributeButton);
+    fAddAttributeButton = new BButton("add attr",
+        "Add" B_UTF8_ELLIPSIS, new BMessage(kMsgAddAttribute));
 
-    innerRect.OffsetBy(0, innerRect.Height() + 4.0f);
-    fRemoveAttributeButton = new BButton(innerRect, "remove attr", "Remove",
-        new BMessage(kMsgRemoveAttribute), B_FOLLOW_RIGHT);
-    fAttributeBox->AddChild(fRemoveAttributeButton);
-/*
-    innerRect.OffsetBy(0, innerRect.Height() + 4.0f);
-    button = new BButton(innerRect, "push attr", "Push Up",
-        new BMessage(kMsgRemoveAttribute), B_FOLLOW_RIGHT);
-    fAttributeBox->AddChild(button);
-*/
-    innerRect.right = innerRect.left - 10.0f - B_V_SCROLL_BAR_WIDTH;
-    innerRect.left = 10.0f;
-    innerRect.top = 8.0f + ceilf(boldHeight.ascent);
-    innerRect.bottom = fAttributeBox->Bounds().bottom - 10.0f;
-        // take scrollview border into account
-    fAttributeListView = new AttributeListView(innerRect, "listview attr",
-        B_FOLLOW_ALL);
+    fRemoveAttributeButton = new BButton("remove attr", "Remove",
+        new BMessage(kMsgRemoveAttribute));
+
+    fAttributeListView = new AttributeListView("listview attr");
     fAttributeListView->SetSelectionMessage(new BMessage(kMsgAttributeSelected));
     fAttributeListView->SetInvocationMessage(new BMessage(kMsgAttributeInvoked));
 
-    scrollView = new BScrollView("scrollview attr", fAttributeListView,
-        B_FOLLOW_ALL, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
-    fAttributeBox->AddChild(scrollView);
+    BScrollView* attributesScroller = new BScrollView("scrollview attr",
+        fAttributeListView, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
 
-    SetSizeLimits(rightRect.left + 72.0f + font.StringWidth("jpg")
-        + font.StringWidth(fRecognitionBox->Label()), 32767.0f,
-        rect.top + 2.0f * button->Bounds().Height() + boldHeight.ascent
-        + 32.0f + menuBar->Bounds().Height(), 32767.0f);
+    fAttributeBox->AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(attributesScroller, 0, 0, 2, 3)
+        .Add(fAddAttributeButton, 2, 0)
+        .Add(fRemoveAttributeButton, 2, 1)
+        .SetInsets(padding, padding, padding, padding)
+    );
 
+
+    BView* topView = 
+        BGroupLayoutBuilder(B_HORIZONTAL, padding)
+        .SetInsets(padding, padding, padding, padding)
+        .Add(BGroupLayoutBuilder(B_VERTICAL, padding)
+            .Add(typeListScrollView)
+            .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+                .Add(addTypeButton).Add(fRemoveTypeButton)
+            )
+        )
+        // Right side
+        .Add(BGroupLayoutBuilder(B_VERTICAL, padding)
+            .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+                .Add(fIconBox, 1).Add(fRecognitionBox, 3)
+            )
+            .Add(fDescriptionBox)
+            .Add(fPreferredBox)
+            .Add(fAttributeBox, 5)
+        );
+
+    //topView->SetExplicitAlignment(fullAlignment);
+    //topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
+    AddChild(topView);
+
     _SetType(NULL);
     _ShowSnifferRule(showRule);
 
@@ -591 +522 @@
     if (settings.FindRect("file_types_frame", &rect) == B_OK)
         return rect;
 
-    return BRect(80.0f, 80.0f, 600.0f, 480.0f);
+    return BRect(80.0f, 80.0f, 0.0f, 0.0f);
 }
 
 
@@ -601 +532 @@
     if (fRuleControl->IsHidden() == !show)
         return;
 
-    float minWidth, maxWidth, minHeight, maxHeight;
-    GetSizeLimits(&minWidth, &maxWidth, &minHeight, &maxHeight);
-
-    float diff = fRuleControl->Bounds().Height() + 8.0f;
-
-    if (!show) {
+    if (!show)
         fRuleControl->Hide();
-        diff = -diff;
-    }
-
-    // adjust other controls to make space or take it again
-
-    fIconBox->ResizeBy(0.0f, diff);
-    fRecognitionBox->ResizeBy(0.0f, diff);
-    fDescriptionBox->MoveBy(0.0f, diff);
-    fPreferredBox->MoveBy(0.0f, diff);
-    fAttributeBox->MoveBy(0.0f, diff);
-    fAttributeBox->ResizeBy(0.0f, -diff);
-
-    if (show)
+    else
         fRuleControl->Show();
-
-    SetSizeLimits(minWidth, maxWidth, minHeight + diff, maxHeight);
 }
 
 

ApplicationTypeWindow.cpp

@@ -17 +17 @@
 #include <Box.h>
 #include <Button.h>
 #include <CheckBox.h>
+#include <ControlLook.h>
 #include <File.h>
+#include <GridLayoutBuilder.h>
+#include <GroupLayoutBuilder.h>
+#include <GroupView.h>
 #include <ListView.h>
 #include <MenuBar.h>
 #include <MenuField.h>
@@ -28 +32 @@
 #include <RadioButton.h>
 #include <Roster.h>
 #include <ScrollView.h>
+#include <StringView.h>
 #include <TextControl.h>
 
 #include <ctype.h>
@@ -54 +59 @@
 // TextView that filters the tab key to be able to tab-navigate while editing   
 class TabFilteringTextView : public BTextView {
     public:
-        TabFilteringTextView(BRect frame, const char* name, BRect textRect,
-            uint32 resizeMask, uint32 flags = B_WILL_DRAW | B_PULSE_NEEDED);
+        TabFilteringTextView(const char* name);
         virtual ~TabFilteringTextView();
         virtual void KeyDown(const char* bytes, int32 count);
 };
 
 
-TabFilteringTextView::TabFilteringTextView(BRect frame, const char* name,
-    BRect textRect, uint32 resizeMask, uint32 flags)
-    :   BTextView(frame, name, textRect, resizeMask, flags)
+TabFilteringTextView::TabFilteringTextView(const char* name)
+    :   BTextView(name, B_WILL_DRAW | B_PULSE_NEEDED)
 {
 }
 
@@ -102 +105 @@
 
 class SupportedTypeListView : public DropTargetListView {
     public:
-        SupportedTypeListView(BRect frame, const char* name,
+        SupportedTypeListView(const char* name,
             list_view_type type = B_SINGLE_SELECTION_LIST,
-            uint32 resizeMask = B_FOLLOW_LEFT | B_FOLLOW_TOP,
             uint32 flags = B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE);
         virtual ~SupportedTypeListView();
 
@@ -153 +155 @@
 {
     const SupportedTypeItem* a = *(const SupportedTypeItem**)_a;
     const SupportedTypeItem* b = *(const SupportedTypeItem**)_b;
-
+    
     int compare = strcasecmp(a->Text(), b->Text());
     if (compare != 0)
         return compare;
-
+    
     return strcasecmp(a->Type(), b->Type());
 }
 
@@ -165 +167 @@
 //  #pragma mark -
 
 
-SupportedTypeListView::SupportedTypeListView(BRect frame, const char* name,
-        list_view_type type, uint32 resizeMask, uint32 flags)
-    : DropTargetListView(frame, name, type, resizeMask, flags)
+SupportedTypeListView::SupportedTypeListView(const char* name,
+    list_view_type type, uint32 flags)
+    :
+    DropTargetListView(name, type, flags)
 {
 }
 
@@ -188 +191 @@
             BNodeInfo info(&node);
             if (node.InitCheck() != B_OK || info.InitCheck() != B_OK)
                 continue;
-
+    
             // TODO: we could identify the file in case it doesn't have a type...
             char type[B_MIME_TYPE_LENGTH];
             if (info.GetType(type) != B_OK)
                 continue;
-
+    
             // check if that type is already in our list
             bool found = false;
             for (int32 i = CountItems(); i-- > 0;) {
@@ -203 +206 @@
                     break;
                 }
             }
-
+    
             if (!found) {
                 // add type
                 AddItem(new SupportedTypeItem(type));
             }
         }
-
+    
         SortItems(&SupportedTypeItem::Compare);
     } else
         DropTargetListView::MessageReceived(message);
@@ -227 +230 @@
 //  #pragma mark -
 
 
-ApplicationTypeWindow::ApplicationTypeWindow(BPoint position, const BEntry& entry)
-    : BWindow(BRect(0.0f, 0.0f, 250.0f, 340.0f).OffsetBySelf(position),
+ApplicationTypeWindow::ApplicationTypeWindow(BPoint position, 
+    const BEntry& entry)
+    :
+    BWindow(BRect(0.0f, 0.0f, 250.0f, 340.0f).OffsetBySelf(position),
         "Application Type", B_TITLED_WINDOW,
-        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS),
+        B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | 
+            B_FRAME_EVENTS | B_AUTO_UPDATE_SIZE_LIMITS),
     fChangedProperties(0)
 {
-    // add the menu
-
-    BMenuBar* menuBar = new BMenuBar(BRect(0, 0, 0, 0), NULL);
-    AddChild(menuBar);
-
+    float padding = 3.0f;
+    BAlignment labelAlignment = BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP);
+    if (be_control_look){
+        // padding = be_control_look->DefaultItemSpacing();
+            // seems too big
+        labelAlignment = be_control_look->DefaultLabelAlignment();
+    }
+    
+    BMenuBar* menuBar = new BMenuBar((char*)NULL);
+    menuBar->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_TOP));
+    
     BMenu* menu = new BMenu("File");
     fSaveMenuItem = new BMenuItem("Save", new BMessage(kMsgSave), 'S');
     fSaveMenuItem->SetEnabled(false);
@@ -246 +258 @@
     menu->AddItem(item = new BMenuItem("Save into resource file" B_UTF8_ELLIPSIS,
         NULL));
     item->SetEnabled(false);
-
+    
     menu->AddSeparatorItem();
     menu->AddItem(new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED),
         'W', B_COMMAND_KEY));
     menuBar->AddItem(menu);
+    
 
-    // Top view and signature
-
-    BRect rect = Bounds();
-    rect.top = menuBar->Bounds().Height() + 1.0f;
-    BView* topView = new BView(rect, NULL, B_FOLLOW_ALL, B_WILL_DRAW);
-    topView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-    AddChild(topView);
-
-    rect = topView->Bounds().InsetByCopy(8.0f, 8.0f);
-    fSignatureControl = new BTextControl(rect, "signature", "Signature:", NULL,
-        new BMessage(kMsgSignatureChanged), B_FOLLOW_LEFT_RIGHT);
-    fSignatureControl->SetModificationMessage(
+    // Signature
+    
+    fSignatureControl = new BTextControl("Signature:", NULL, 
         new BMessage(kMsgSignatureChanged));
-    fSignatureControl->SetDivider(fSignatureControl->StringWidth(
-        fSignatureControl->Label()) + 4.0f);
-    float width, height;
-    fSignatureControl->GetPreferredSize(&width, &height);
-    fSignatureControl->ResizeTo(rect.Width(), height);
-    topView->AddChild(fSignatureControl);
-
+    fSignatureControl->SetModificationMessage( 
+        new BMessage(kMsgSignatureChanged));
+    
     // filter out invalid characters that can't be part of a MIME type name
     BTextView* textView = fSignatureControl->TextView();
     textView->SetMaxBytes(B_MIME_TYPE_LENGTH);
@@ -279 +279 @@
     for (int32 i = 0; disallowedCharacters[i]; i++) {
         textView->DisallowChar(disallowedCharacters[i]);
     }
-
+    
     // "Application Flags" group
+    
+    BBox* flagsBox = new BBox("flagsBox");
 
-    BFont font(be_bold_font);
-    font_height fontHeight;
-    font.GetHeight(&fontHeight);
-
-    width = font.StringWidth("Icon") + 16.0f;
-    if (width < B_LARGE_ICON + 16.0f)
-        width = B_LARGE_ICON + 16.0f;
-
-    rect.top = fSignatureControl->Frame().bottom + 4.0f;
-    rect.bottom = rect.top + 100.0f;
-    rect.right -= width + 8.0f;
-    BBox* box = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
-    topView->AddChild(box);
-
-    fFlagsCheckBox = new BCheckBox(rect, "flags", "Application flags",
+    fFlagsCheckBox = new BCheckBox("flags", "Application flags",
         new BMessage(kMsgToggleAppFlags));
     fFlagsCheckBox->SetValue(B_CONTROL_ON);
-    fFlagsCheckBox->ResizeToPreferred();
-    box->SetLabel(fFlagsCheckBox);
-
-    rect.top = fFlagsCheckBox->Bounds().Height() + 4.0f;
-    fSingleLaunchButton = new BRadioButton(rect, "single", "Single launch",
+    
+    fSingleLaunchButton = new BRadioButton("single", "Single launch",
         new BMessage(kMsgAppFlagsChanged));
-    fSingleLaunchButton->ResizeToPreferred();
-    box->AddChild(fSingleLaunchButton);
-
-    rect.OffsetBy(0.0f, fSingleLaunchButton->Bounds().Height() + 0.0f);
-    fMultipleLaunchButton = new BRadioButton(rect, "multiple",
+    
+    fMultipleLaunchButton = new BRadioButton("multiple",
         "Multiple launch", new BMessage(kMsgAppFlagsChanged));
-    fMultipleLaunchButton->ResizeToPreferred();
-    box->AddChild(fMultipleLaunchButton);
-
-    rect.OffsetBy(0.0f, fSingleLaunchButton->Bounds().Height() + 0.0f);
-    fExclusiveLaunchButton = new BRadioButton(rect, "exclusive",
+    
+    fExclusiveLaunchButton = new BRadioButton("exclusive",
         "Exclusive launch", new BMessage(kMsgAppFlagsChanged));
-    fExclusiveLaunchButton->ResizeToPreferred();
-    box->AddChild(fExclusiveLaunchButton);
-
-    rect.top = fSingleLaunchButton->Frame().top;
-    rect.left = fExclusiveLaunchButton->Frame().right + 4.0f;
-    fArgsOnlyCheckBox = new BCheckBox(rect, "args only", "Args only",
+    
+    fArgsOnlyCheckBox = new BCheckBox("args only", "Args only",
         new BMessage(kMsgAppFlagsChanged));
-    fArgsOnlyCheckBox->ResizeToPreferred();
-    box->AddChild(fArgsOnlyCheckBox);
-
-    rect.top += fArgsOnlyCheckBox->Bounds().Height();
-    fBackgroundAppCheckBox = new BCheckBox(rect, "background",
+    
+    fBackgroundAppCheckBox = new BCheckBox("background",
         "Background app", new BMessage(kMsgAppFlagsChanged));
-    fBackgroundAppCheckBox->ResizeToPreferred();
-    box->AddChild(fBackgroundAppCheckBox);
-
-    box->ResizeTo(box->Bounds().Width(),
-        fExclusiveLaunchButton->Frame().bottom + 8.0f);
-
+    
+    flagsBox->AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(fSingleLaunchButton, 0, 0).Add(fArgsOnlyCheckBox, 1, 0)
+        .Add(fMultipleLaunchButton, 0, 1).Add(fBackgroundAppCheckBox, 1, 1)
+        .Add(fExclusiveLaunchButton, 0, 2)
+        .SetInsets(padding, padding, padding, padding));
+    flagsBox->SetLabel(fFlagsCheckBox);
+    
     // "Icon" group
-
-    rect = box->Frame();
-#ifdef __HAIKU__
-    rect.top += box->TopBorderOffset();
-#endif
-    rect.left = rect.right + 8.0f;
-    rect.right += width + 8.0f;
-    float iconBoxWidth = rect.Width();
-    box = new BBox(rect, NULL, B_FOLLOW_RIGHT | B_FOLLOW_TOP);
-    box->SetLabel("Icon");
-#ifdef __HAIKU__
-    box->MoveBy(0.0f, -box->TopBorderOffset());
-    box->ResizeBy(0.0f, box->TopBorderOffset());
-#endif
-    topView->AddChild(box);
-
-    rect = BRect(8.0f, 0.0f, 7.0f + B_LARGE_ICON, B_LARGE_ICON - 1.0f);
-#ifdef __HAIKU__
-    rect.OffsetBy(0.0f, (box->Bounds().Height() + box->TopBorderOffset()
-        - rect.Height()) / 2.0f);
-#else
-    rect.OffsetBy(0.0f, (box->Bounds().Height() - rect.Height()) / 2.0f);
-#endif
-    if (rect.top < fontHeight.ascent + fontHeight.descent + 4.0f)
-        rect.top = fontHeight.ascent + fontHeight.descent + 4.0f;
-    fIconView = new IconView(rect, "icon");
+    
+    BBox* iconBox = new BBox("IconBox");
+    iconBox->SetLabel("Icon");
+    fIconView = new IconView("icon");
     fIconView->SetModificationMessage(new BMessage(kMsgIconChanged));
-    box->AddChild(fIconView);
-
+    iconBox->AddChild(
+        BGroupLayoutBuilder(B_HORIZONTAL)
+        .Add(fIconView)
+        .SetInsets(padding, padding, padding, padding)
+    );
+    
     // "Supported Types" group
-
-    rect.top = box->Frame().bottom + 8.0f;
-    rect.bottom = rect.top + box->Bounds().Height();
-    rect.left = 8.0f;
-    rect.right = Bounds().Width() - 8.0f;
-    BBox* typeBox = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
+    
+    BBox* typeBox = new BBox("typesBox");
     typeBox->SetLabel("Supported types");
-    topView->AddChild(typeBox);
-
-    rect = typeBox->Bounds().InsetByCopy(8.0f, 6.0f);
-    rect.top += ceilf(fontHeight.ascent);
-    fAddTypeButton = new BButton(rect, "add type", "Add" B_UTF8_ELLIPSIS,
-        new BMessage(kMsgAddType), B_FOLLOW_RIGHT);
-    fAddTypeButton->ResizeToPreferred();
-    fAddTypeButton->MoveBy(rect.right - fAddTypeButton->Bounds().Width()
-        - B_LARGE_ICON - 16.0f, 0.0f);
-    typeBox->AddChild(fAddTypeButton);
-
-    rect = fAddTypeButton->Frame();
-    rect.OffsetBy(0, rect.Height() + 4.0f);
-    fRemoveTypeButton = new BButton(rect, "remove type", "Remove",
-        new BMessage(kMsgRemoveType), B_FOLLOW_RIGHT);
-    typeBox->AddChild(fRemoveTypeButton);
-
-    rect.right = rect.left - 10.0f - B_V_SCROLL_BAR_WIDTH;
-    rect.left = 10.0f;
-    rect.top = 8.0f + ceilf(fontHeight.ascent);
-    rect.bottom -= 2.0f;
-        // take scrollview border into account
-    fTypeListView = new SupportedTypeListView(rect, "type listview",
-        B_SINGLE_SELECTION_LIST, B_FOLLOW_ALL);
+    
+    fTypeListView = new SupportedTypeListView("Suppported Types", 
+        B_SINGLE_SELECTION_LIST);
     fTypeListView->SetSelectionMessage(new BMessage(kMsgTypeSelected));
-
+    
     BScrollView* scrollView = new BScrollView("type scrollview", fTypeListView,
-        B_FOLLOW_ALL, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
-
-    typeBox->ResizeTo(typeBox->Bounds().Width(), fRemoveTypeButton->Frame().bottom + 8.0f);
-    typeBox->AddChild(scrollView);
-
-    rect.left = fRemoveTypeButton->Frame().right + 8.0f;
-#ifdef __HAIKU__
-    rect.top = (box->Bounds().Height() + box->TopBorderOffset() - B_LARGE_ICON) / 2.0f;
-#else
-    rect.top = (box->Bounds().Height() - B_LARGE_ICON) / 2.0f;
-#endif
-    rect.right = rect.left + B_LARGE_ICON - 1.0f;
-    rect.bottom = rect.top + B_LARGE_ICON - 1.0f;
-    fTypeIconView = new IconView(rect, "type icon", B_FOLLOW_RIGHT | B_FOLLOW_TOP);
+        B_FRAME_EVENTS | B_WILL_DRAW, false, true);
+    
+    fAddTypeButton = new BButton("add type", "Add" B_UTF8_ELLIPSIS,
+        new BMessage(kMsgAddType));
+    
+    fRemoveTypeButton = new BButton("remove type", "Remove",
+        new BMessage(kMsgRemoveType));
+    
+    fTypeIconView = new IconView("type icon");
+    BView* iconHolder = BGroupLayoutBuilder(B_HORIZONTAL).Add(fTypeIconView);
     fTypeIconView->SetModificationMessage(new BMessage(kMsgTypeIconsChanged));
-    typeBox->AddChild(fTypeIconView);
-
+    
+    typeBox->AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(scrollView, 0, 0, 1, 4)
+        .Add(fAddTypeButton, 1, 0, 1, 2)
+        .Add(fRemoveTypeButton, 1, 2, 1, 2)
+        .Add(iconHolder, 2, 1, 1, 2)
+        .SetInsets(padding, padding, padding, padding)
+        .SetColumnWeight(0, 3)
+        .SetColumnWeight(1, 2)
+        .SetColumnWeight(2, 1)
+    );
+    iconHolder->SetExplicitAlignment(BAlignment(B_ALIGN_CENTER, B_ALIGN_MIDDLE));
+    
     // "Version Info" group
-
-    rect.top = typeBox->Frame().bottom + 8.0f;
-    rect.bottom = rect.top + typeBox->Bounds().Height();
-    rect.left = 8.0f;
-    rect.right = Bounds().Width() - 8.0f;
-    box = new BBox(rect, NULL, B_FOLLOW_LEFT_RIGHT);
-        // the resizing mode will later also be set to B_FOLLOW_BOTTOM
-    box->SetLabel("Version info");
-    topView->AddChild(box);
-
-    BMenuField* menuField;
-#if 0
-    BPopUpMenu *popUpMenu = new BPopUpMenu("version info", true, true);
-    item = new BMenuItem("Version Info", NULL);
-    item->SetMarked(true);
-    popUpMenu->AddItem(item);
-    item = new BMenuItem("System Version Info", NULL);
-    popUpMenu->AddItem(item);
-
-    menuField = new BMenuField(BRect(0, 0, 100, 15),
-        "version kind", NULL, popUpMenu, true);
-    menuField->ResizeToPreferred();
-    box->SetLabel(menuField);
-#endif
-
-    rect.top = 4.0f + ceilf(fontHeight.ascent + fontHeight.descent);
-    rect.bottom = rect.top + height;
-    fMajorVersionControl = new BTextControl(rect, "major", "Version:", NULL,
-        NULL);
-    fMajorVersionControl->SetDivider(fMajorVersionControl->StringWidth(
-        fMajorVersionControl->Label()) + 4.0f);
-    fMajorVersionControl->GetPreferredSize(&width, &height);
-    width = 12.0f + fMajorVersionControl->StringWidth("99");
-    fMajorVersionControl->ResizeTo(fMajorVersionControl->Divider() + width, height);
+    
+    BBox* versionBox = new BBox("versionBox");
+    versionBox->SetLabel("Version info");
+    
+    fMajorVersionControl = new BTextControl("Version:", NULL, NULL);
     _MakeNumberTextControl(fMajorVersionControl);
-    box->AddChild(fMajorVersionControl);
-
-    rect.left = fMajorVersionControl->Frame().right + 1.0f;
-    fMiddleVersionControl = new BTextControl(rect, "middle", ".", NULL,
-        NULL);
-    fMiddleVersionControl->SetDivider(fMiddleVersionControl->StringWidth(
-        fMiddleVersionControl->Label()) + 4.0f);
-    fMiddleVersionControl->ResizeTo(fMiddleVersionControl->Divider() + width, height);
+    
+    fMiddleVersionControl = new BTextControl(".", NULL, NULL);
     _MakeNumberTextControl(fMiddleVersionControl);
-    box->AddChild(fMiddleVersionControl);
-
-    rect.left = fMiddleVersionControl->Frame().right + 1.0f;
-    fMinorVersionControl = new BTextControl(rect, "middle", ".", NULL,
-        NULL);
-    fMinorVersionControl->SetDivider(fMinorVersionControl->StringWidth(
-        fMinorVersionControl->Label()) + 4.0f);
-    fMinorVersionControl->ResizeTo(fMinorVersionControl->Divider() + width, height);
+    
+    fMinorVersionControl = new BTextControl(".", NULL, NULL);
     _MakeNumberTextControl(fMinorVersionControl);
-    box->AddChild(fMinorVersionControl);
-
+    
     fVarietyMenu = new BPopUpMenu("variety", true, true);
     fVarietyMenu->AddItem(new BMenuItem("Development", NULL));
     fVarietyMenu->AddItem(new BMenuItem("Alpha", NULL));
     fVarietyMenu->AddItem(new BMenuItem("Beta", NULL));
     fVarietyMenu->AddItem(new BMenuItem("Gamma", NULL));
-    fVarietyMenu->AddItem(item = new BMenuItem("Golden master", NULL));
+    item = new BMenuItem("Golden master", NULL);
+    fVarietyMenu->AddItem(item);
     item->SetMarked(true);
     fVarietyMenu->AddItem(new BMenuItem("Final", NULL));
-
-    rect.top--;
-        // BMenuField oddity
-    rect.left = fMinorVersionControl->Frame().right + 6.0f;
-    menuField = new BMenuField(rect,
-        "variety", NULL, fVarietyMenu, true);
-    menuField->ResizeToPreferred();
-    box->AddChild(menuField);
-
-    rect.top++;
-    rect.left = menuField->Frame().right;
-    rect.right = rect.left + 30.0f; 
-    fInternalVersionControl = new BTextControl(rect, "internal", "/", NULL,
-        NULL);
-    fInternalVersionControl->SetDivider(fInternalVersionControl->StringWidth(
-        fInternalVersionControl->Label()) + 4.0f);
-    fInternalVersionControl->ResizeTo(fInternalVersionControl->Divider() + width, height);
-    box->AddChild(fInternalVersionControl);
-
-    rect = box->Bounds().InsetByCopy(8.0f, 0.0f);
-    rect.top = fInternalVersionControl->Frame().bottom + 8.0f;
-    fShortDescriptionControl = new BTextControl(rect, "short desc", "Short description:",
-        NULL, NULL, B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP);
-    float labelWidth = fShortDescriptionControl->StringWidth(
-        fShortDescriptionControl->Label()) + 4.0f;
-    fShortDescriptionControl->SetDivider(labelWidth);
-    fShortDescriptionControl->GetPreferredSize(&width, &height);
-    fShortDescriptionControl->ResizeTo(rect.Width(), height);
-
+    
+    BMenuField* varietyField = new BMenuField("", fVarietyMenu);
+    fInternalVersionControl = new BTextControl("/", NULL, NULL);
+    fShortDescriptionControl = 
+        new BTextControl("Short description:", NULL, NULL);
+    
     // TODO: workaround for a GCC 4.1.0 bug? Or is that really what the standard says?
     version_info versionInfo;
-    fShortDescriptionControl->TextView()->SetMaxBytes(sizeof(versionInfo.short_info));
-    box->AddChild(fShortDescriptionControl);
-
-    rect.OffsetBy(0.0f, fShortDescriptionControl->Bounds().Height() + 5.0f);
-    rect.right = rect.left + labelWidth;
-    StringView* label = new StringView(rect, NULL, "Long description:", NULL);
-    label->SetDivider(labelWidth);
-    box->AddChild(label);
-
-    rect.left = rect.right + 3.0f;
-    rect.top += 1.0f;
-    rect.right = box->Bounds().Width() - 10.0f - B_V_SCROLL_BAR_WIDTH;
-    rect.bottom = rect.top + fShortDescriptionControl->Bounds().Height() * 3.0f - 1.0f;
-    fLongDescriptionView = new TabFilteringTextView(rect, "long desc",
-        rect.OffsetToCopy(B_ORIGIN), B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS
-        | B_NAVIGABLE);
+    fShortDescriptionControl->TextView()->SetMaxBytes(
+        sizeof(versionInfo.short_info));
+    
+    BStringView* longLabel = new BStringView(NULL, "Long description:");
+    longLabel->SetExplicitAlignment(labelAlignment);
+    fLongDescriptionView = new TabFilteringTextView("long desc");
     fLongDescriptionView->SetMaxBytes(sizeof(versionInfo.long_info));
-
+    
     scrollView = new BScrollView("desc scrollview", fLongDescriptionView,
-        B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
-    box->ResizeTo(box->Bounds().Width(), scrollView->Frame().bottom + 8.0f);
-    box->AddChild(scrollView);
+        B_FRAME_EVENTS | B_WILL_DRAW, false, true);
 
-    // Adjust window size and limits
+    // TODO: remove workaround (bug #5678)
+    BSize minScrollSize = scrollView->ScrollBar(B_VERTICAL)->MinSize();
+    minScrollSize.width+=fLongDescriptionView->MinSize().width;
+    scrollView->SetExplicitMinSize(minScrollSize);
+    
+    versionBox->AddChild(BGridLayoutBuilder(padding, padding)
+        .Add(fMajorVersionControl->CreateLabelLayoutItem(), 0, 0)
+        .Add(fMajorVersionControl->CreateTextViewLayoutItem(), 1, 0)
+        .Add(fMiddleVersionControl, 2, 0, 2)
+        .Add(fMinorVersionControl, 4, 0, 2)
+        .Add(varietyField, 6, 0, 3)
+        .Add(fInternalVersionControl, 9, 0, 2)
+        .Add(fShortDescriptionControl->CreateLabelLayoutItem(), 0, 1)
+        .Add(fShortDescriptionControl->CreateTextViewLayoutItem(), 1, 1, 10)
+        .Add(longLabel, 0, 2)
+        .Add(scrollView, 1, 2, 10, 3)
+        .SetInsets(padding, padding, padding, padding)
+        .SetRowWeight(3, 3)
+    );
 
-    width = fInternalVersionControl->Frame().right + 16.0f;
-    float minWidth = fBackgroundAppCheckBox->Frame().right + iconBoxWidth + 32.0f;
-    if (width > minWidth)
-        minWidth = width;
+    // put it all together
+    SetLayout(new BGroupLayout(B_VERTICAL));
+    AddChild(menuBar);
+    AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+        .Add(fSignatureControl)
+        .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+            .Add(flagsBox, 3)
+            .Add(iconBox, 1)
+        )
+        .Add(typeBox)
+        .Add(versionBox)
+        .SetInsets(padding, padding, padding, padding)
+    );
 
-    ResizeTo(Bounds().Width() > minWidth ? Bounds().Width() : minWidth,
-        box->Frame().bottom + topView->Frame().top + 8.0f);
-    SetSizeLimits(minWidth, 32767.0f, Bounds().Height(), 32767.0f);
-    typeBox->SetResizingMode(B_FOLLOW_ALL);
-    box->SetResizingMode(B_FOLLOW_LEFT_RIGHT | B_FOLLOW_BOTTOM);
+    SetKeyMenuBar(menuBar);
 
     fSignatureControl->MakeFocus(true);
-
     BMimeType::StartWatching(this);
     _SetTo(entry);
 }