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

Update AutoMounterSettings to use the templatized layout builders from LayoutBuilder.h and also fix a regresson caused by r38207, also caught by diver.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38281 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alex Wilson
2010-08-19 19:56:35 +00:00
parent 2faa1532f8
commit be345b9c46
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/AutoMounterSettings.cpp
+17 -18
View File
@@ -40,8 +40,7 @@ All rights reserved.
#include <Catalog.h> #include <Catalog.h>
#include <CheckBox.h> #include <CheckBox.h>
#include <Debug.h> #include <Debug.h>
#include <GridLayoutBuilder.h> #include <LayoutBuilder.h>
#include <GroupLayoutBuilder.h>
#include <Locale.h> #include <Locale.h>
#include <SpaceLayoutItem.h> #include <SpaceLayoutItem.h>
#include <SeparatorView.h> #include <SeparatorView.h>
@@ -162,33 +161,33 @@ AutomountSettingsPanel::AutomountSettingsPanel(BMessage* settings,
fDone->MakeDefault(true); fDone->MakeDefault(true);
// Layout the controls // Layout the controls
AddChild(BGroupLayoutBuilder(B_VERTICAL, 0) BGroupView* contentView = new BGroupView(B_VERTICAL, 0);
.Add(BGroupLayoutBuilder(B_VERTICAL, spacing) AddChild(contentView);
.Add(BGroupLayoutBuilder(autoMountLayout) BLayoutBuilder::Group<>(contentView)
.AddGroup(B_VERTICAL, spacing)
.SetInsets(spacing, spacing, spacing, spacing)
.AddGroup(autoMountLayout)
.Add(fScanningDisabledCheck) .Add(fScanningDisabledCheck)
.Add(fAutoMountAllBFSCheck) .Add(fAutoMountAllBFSCheck)
.Add(fAutoMountAllCheck) .Add(fAutoMountAllCheck)
) .End()
.Add(BGroupLayoutBuilder(bootMountLayout) .AddGroup(bootMountLayout)
.Add(fInitialDontMountCheck) .Add(fInitialDontMountCheck)
.Add(fInitialMountRestoreCheck) .Add(fInitialMountRestoreCheck)
.Add(fInitialMountAllBFSCheck) .Add(fInitialMountAllBFSCheck)
.Add(fInitialMountAllCheck) .Add(fInitialMountAllCheck)
) .End()
.Add(BGroupLayoutBuilder(B_HORIZONTAL) .AddGroup(B_HORIZONTAL)
.Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing - 1)) .AddStrut(spacing - 1)
.Add(fEjectWhenUnmountingCheckBox) .Add(fEjectWhenUnmountingCheckBox)
) .End()
.SetInsets(spacing, spacing, spacing, spacing) .End()
)
.Add(new BSeparatorView(B_HORIZONTAL/*, B_FANCY_BORDER*/)) .Add(new BSeparatorView(B_HORIZONTAL/*, B_FANCY_BORDER*/))
.Add(BGroupLayoutBuilder(B_HORIZONTAL, spacing) .AddGroup(B_HORIZONTAL, spacing)
.SetInsets(spacing, spacing, spacing, spacing)
.AddGlue() .AddGlue()
.Add(fMountAllNow) .Add(fMountAllNow)
.Add(fDone) .Add(fDone);
.SetInsets(spacing, spacing, spacing, spacing)
)
);
// Apply the settings // Apply the settings