diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp index 7e806e9c06..7574103c2c 100644 --- a/src/apps/charactermap/CharacterWindow.cpp +++ b/src/apps/charactermap/CharacterWindow.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -137,9 +136,6 @@ CharacterWindow::CharacterWindow() } // create GUI - - SetLayout(new BGroupLayout(B_VERTICAL)); - BMenuBar* menuBar = new BMenuBar("menu"); fFilterControl = new BTextControl(B_TRANSLATE("Filter:"), NULL, NULL); @@ -205,21 +201,23 @@ CharacterWindow::CharacterWindow() fCodeView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, fCodeView->PreferredSize().Height())); - AddChild(BGroupLayoutBuilder(B_VERTICAL) + BLayoutBuilder::Group<>(this, B_VERTICAL) .Add(menuBar) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10)//BSplitLayoutBuilder() - .Add(BGroupLayoutBuilder(B_VERTICAL, 10) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10) + .AddGroup(B_HORIZONTAL, 10) + .SetInsets(10) + .AddGroup(B_VERTICAL, 10) + .AddGroup(B_HORIZONTAL, 10) .Add(fFilterControl) - .Add(clearButton)) - .Add(unicodeScroller)) - .Add(BGroupLayoutBuilder(B_VERTICAL, 10) + .Add(clearButton) + .End() + .Add(unicodeScroller) + .End() + .AddGroup(B_VERTICAL, 10) .Add(characterScroller) .Add(fFontSizeSlider) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, 0) + .AddGroup(B_HORIZONTAL, 0) .Add(fGlyphView) - .Add(fCodeView))) - .SetInsets(10, 10, 10, 10))); + .Add(fCodeView); // Add menu diff --git a/src/apps/installer/InstallerApp.cpp b/src/apps/installer/InstallerApp.cpp index 972b39dea7..67eecbb64a 100644 --- a/src/apps/installer/InstallerApp.cpp +++ b/src/apps/installer/InstallerApp.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include @@ -244,16 +244,13 @@ InstallerApp::ReadyToRun() B_MODAL_WINDOW, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS); - fEULAWindow->SetLayout(new BGroupLayout(B_HORIZONTAL)); - fEULAWindow->AddChild(BGroupLayoutBuilder(B_VERTICAL, 10) + BLayoutBuilder::Group<>(fEULAWindow, B_VERTICAL, 10) + .SetInsets(10) .Add(scrollView) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, 10) + .AddGroup(B_HORIZONTAL, 10) .AddGlue() .Add(cancelButton) - .Add(continueButton) - ) - .SetInsets(10, 10, 10, 10) - ); + .Add(continueButton); fEULAWindow->CenterOnScreen(); fEULAWindow->Show(); diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index 06940ab075..41146e7367 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -19,8 +19,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -248,13 +247,12 @@ InstallerWindow::InstallerWindow() float spacing = be_control_look->DefaultItemSpacing(); - SetLayout(new BGroupLayout(B_HORIZONTAL)); - AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) + BLayoutBuilder::Group<>(this, B_VERTICAL, 0) .Add(mainMenu) .Add(logoGroup) .Add(new BSeparatorView(B_HORIZONTAL, B_PLAIN_BORDER)) - .Add(BGroupLayoutBuilder(B_VERTICAL, spacing) - .Add(BGridLayoutBuilder(0, spacing) + .AddGroup(B_VERTICAL, spacing) + .AddGrid(new BGridView(0.0f, spacing)) .Add(fSrcMenuField->CreateLabelLayoutItem(), 0, 0) .Add(fSrcMenuField->CreateMenuBarLayoutItem(), 1, 0) .Add(fDestMenuField->CreateLabelLayoutItem(), 0, 1) @@ -266,16 +264,13 @@ InstallerWindow::InstallerWindow() .Add(packagesScrollView, 0, 4, 2) .Add(fProgressBar, 0, 5, 2) .Add(fSizeView, 0, 6, 2) - ) + .End() - .Add(BGroupLayoutBuilder(B_HORIZONTAL, spacing) + .AddGroup(B_HORIZONTAL, spacing) + .SetInsets(spacing) .Add(fLaunchDriveSetupButton) .AddGlue() - .Add(fBeginButton) - ) - .SetInsets(spacing, spacing, spacing, spacing) - ) - ); + .Add(fBeginButton); // Make the optional packages and progress bar invisible on start fPackagesLayoutItem = layout_item_for(packagesScrollView); diff --git a/src/apps/mediaplayer/settings/SettingsWindow.cpp b/src/apps/mediaplayer/settings/SettingsWindow.cpp index 760957eddc..3026120186 100644 --- a/src/apps/mediaplayer/settings/SettingsWindow.cpp +++ b/src/apps/mediaplayer/settings/SettingsWindow.cpp @@ -16,8 +16,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -139,61 +138,56 @@ SettingsWindow::SettingsWindow(BRect frame) // Build the layout - SetLayout(new BGroupLayout(B_HORIZONTAL)); - - AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) - .Add(BGroupLayoutBuilder(settingsLayout) + BLayoutBuilder::Group<>(this, B_VERTICAL, 0) + .AddGroup(settingsLayout) + .SetInsets(5, 5, 15, 5) .Add(playModeLabel) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, 0) - .Add(BSpaceLayoutItem::CreateHorizontalStrut(10)) - .Add(BGroupLayoutBuilder(B_VERTICAL, 0) + .AddGroup(B_HORIZONTAL, 0) + .AddStrut(10) + .AddGroup(B_VERTICAL, 0) .Add(fAutostartCB) - .Add(BGridLayoutBuilder(5, 0) + .AddGrid(5, 0) .Add(BSpaceLayoutItem::CreateHorizontalStrut(10), 0, 0) .Add(fCloseWindowMoviesCB, 1, 0) .Add(BSpaceLayoutItem::CreateHorizontalStrut(10), 0, 1) .Add(fCloseWindowSoundsCB, 1, 1) - ) + .End() .Add(fLoopMoviesCB) .Add(fLoopSoundsCB) - ) - ) - .Add(BSpaceLayoutItem::CreateVerticalStrut(5)) + .End() + .End() + .AddStrut(5) .Add(viewOptionsLabel) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, 0) - .Add(BSpaceLayoutItem::CreateHorizontalStrut(10)) - .Add(BGroupLayoutBuilder(B_VERTICAL, 0) + .AddGroup(B_HORIZONTAL, 0) + .AddStrut(10) + .AddGroup(B_VERTICAL, 0) .Add(fUseOverlaysCB) .Add(fScaleBilinearCB) .Add(fScaleFullscreenControlsCB) .Add(fSubtitleSizeOP) .Add(fSubtitlePlacementOP) - ) - ) - .Add(BSpaceLayoutItem::CreateVerticalStrut(5)) + .End() + .End() + .AddStrut(5) .Add(bgMoviesModeLabel) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, 0) - .Add(BSpaceLayoutItem::CreateHorizontalStrut(10)) - .Add(BGroupLayoutBuilder(B_VERTICAL, 0) + .AddGroup(B_HORIZONTAL, 0) + .AddStrut(10) + .AddGroup(B_VERTICAL, 0) .Add(fFullVolumeBGMoviesRB) .Add(fHalfVolumeBGMoviesRB) .Add(fMutedVolumeBGMoviesRB) - ) - ) - .Add(BSpaceLayoutItem::CreateVerticalStrut(5)) - - .SetInsets(5, 5, 15, 5) - ) - .Add(BGroupLayoutBuilder(buttonLayout) + .End() + .End() + .AddStrut(5) + .End() + .AddGroup(buttonLayout) + .SetInsets(5) .Add(fRevertB) .AddGlue() .Add(cancelButton) - .Add(okButton) - .SetInsets(5, 5, 5, 5) - ) - ); + .Add(okButton); } diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp index d3ae2212c0..2c66d0bee5 100644 --- a/src/apps/screenshot/ScreenshotWindow.cpp +++ b/src/apps/screenshot/ScreenshotWindow.cpp @@ -26,8 +26,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -195,36 +194,33 @@ ScreenshotWindow::ScreenshotWindow(const Utility& utility, bool silent, const float kLabelSpacing = be_control_look->DefaultLabelSpacing(); fPreview = new PreviewView(); - - BGridLayout* gridLayout = BGridLayoutBuilder(0.0, kSpacing / 2) - .Add(fDelayControl->CreateLabelLayoutItem(), 0, 0) - .Add(fDelayControl->CreateTextViewLayoutItem(), 1, 0) - .Add(BSpaceLayoutItem::CreateHorizontalStrut(kLabelSpacing), 2, 0) - .Add(seconds, 3, 0) - .Add(fNameControl->CreateLabelLayoutItem(), 0, 1) - .Add(fNameControl->CreateTextViewLayoutItem(), 1, 1, 3, 1) - .Add(menuLocation->CreateLabelLayoutItem(), 0, 2) - .Add(menuLocation->CreateMenuBarLayoutItem(), 1, 2, 3, 1) - .Add(menuFormat->CreateLabelLayoutItem(), 0, 3) - .Add(menuFormat->CreateMenuBarLayoutItem(), 1, 3, 3, 1); - - gridLayout->SetMinColumnWidth(1, - menuFormat->StringWidth("SomethingLongHere")); - SetLayout(new BGroupLayout(B_HORIZONTAL, 0)); - - AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) - .Add(BGroupLayoutBuilder(B_HORIZONTAL, kSpacing) + BLayoutBuilder::Group<>(this, B_VERTICAL, 0) + .SetInsets(kSpacing) + .AddGroup(B_HORIZONTAL, kSpacing) .Add(fPreview) .AddGroup(B_VERTICAL, 0) .Add(fActiveWindow) .Add(fWindowBorder) .Add(fShowCursor) .AddStrut(kSpacing) - .Add(gridLayout) + .AddGrid(0.0, kSpacing/2) + .Add(fDelayControl->CreateLabelLayoutItem(), 0, 0) + .Add(fDelayControl->CreateTextViewLayoutItem(), 1, 0) + .Add(BSpaceLayoutItem::CreateHorizontalStrut(kLabelSpacing), + 2, 0) + .Add(seconds, 3, 0) + .Add(fNameControl->CreateLabelLayoutItem(), 0, 1) + .Add(fNameControl->CreateTextViewLayoutItem(), 1, 1, 3, 1) + .Add(menuLocation->CreateLabelLayoutItem(), 0, 2) + .Add(menuLocation->CreateMenuBarLayoutItem(), 1, 2, 3, 1) + .Add(menuFormat->CreateLabelLayoutItem(), 0, 3) + .Add(menuFormat->CreateMenuBarLayoutItem(), 1, 3, 3, 1) + .End() .Add(showSettings) .AddGlue() - .End()) + .End() + .End() .AddStrut(kSpacing) .Add(divider) .AddStrut(kSpacing) @@ -234,10 +230,7 @@ ScreenshotWindow::ScreenshotWindow(const Utility& utility, bool silent, .Add(new BButton("", B_TRANSLATE("New screenshot"), new BMessage(kNewScreenshot))) .AddGlue() - .Add(saveScreenshot) - .End() - .SetInsets(kSpacing, kSpacing, kSpacing, kSpacing) - ); + .Add(saveScreenshot); saveScreenshot->MakeDefault(true);