From 41425e461d8ab5d5f3a59f87d8edc9bbaa0a7441 Mon Sep 17 00:00:00 2001
From: Janus <janus2@ymail.com>
Date: Tue, 21 Apr 2015 09:36:07 +0000
Subject: [PATCH] Preferences: uses BLayoutBuilder instead of
 BGroupLayoutBuilder.

* Fixes Appearance.
* Fixes Keyboard.
* Fixes Mouse.
* Fixes Notifications.
---
 src/preferences/appearance/APRWindow.cpp     | 16 +++++-----------
 src/preferences/keyboard/KeyboardWindow.cpp  | 14 ++++----------
 src/preferences/mouse/MouseWindow.cpp        | 14 ++++----------
 src/preferences/notifications/PrefletWin.cpp | 15 ++++-----------
 4 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/src/preferences/appearance/APRWindow.cpp b/src/preferences/appearance/APRWindow.cpp
index 7995db6974..f213daadc3 100644
--- a/src/preferences/appearance/APRWindow.cpp
+++ b/src/preferences/appearance/APRWindow.cpp
@@ -13,10 +13,9 @@
 
 #include <Button.h>
 #include <Catalog.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
 #include <Locale.h>
 #include <Messenger.h>
-#include <SpaceLayoutItem.h>
 #include <TabView.h>
 
 #include "AntialiasingSettingsView.h"
@@ -40,8 +39,6 @@ APRWindow::APRWindow(BRect frame)
 		B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS
 			| B_QUIT_ON_WINDOW_CLOSE, B_ALL_WORKSPACES)
 {
-	SetLayout(new BGroupLayout(B_HORIZONTAL));
-
 	fDefaultsButton = new BButton("defaults", B_TRANSLATE("Defaults"),
 		new BMessage(kMsgSetDefaults), B_WILL_DRAW);
 
@@ -67,16 +64,13 @@ APRWindow::APRWindow(BRect frame)
 
 	_UpdateButtons();
 
-	AddChild(BGroupLayoutBuilder(B_VERTICAL)
+	BLayoutBuilder::Group<>(this, B_VERTICAL)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(tabView)
-		.Add(BGroupLayoutBuilder(B_HORIZONTAL)
+		.AddGroup(B_HORIZONTAL)
 			.Add(fDefaultsButton)
 			.Add(fRevertButton)
-			.AddGlue()
-		)
-		.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
-			B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
-	);
+			.AddGlue();
 }
 
 
diff --git a/src/preferences/keyboard/KeyboardWindow.cpp b/src/preferences/keyboard/KeyboardWindow.cpp
index b12860016b..a0fe65ed69 100644
--- a/src/preferences/keyboard/KeyboardWindow.cpp
+++ b/src/preferences/keyboard/KeyboardWindow.cpp
@@ -16,8 +16,7 @@
 #include <Box.h>
 #include <Button.h>
 #include <Catalog.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
 #include <Locale.h>
 #include <Message.h>
 #include <Screen.h>
@@ -48,18 +47,13 @@ KeyboardWindow::KeyboardWindow()
 	fRevertButton->SetEnabled(false);
 
 	// Build the layout
-	SetLayout(new BGroupLayout(B_VERTICAL));
-
-	AddChild(BGroupLayoutBuilder(B_VERTICAL)
+	BLayoutBuilder::Group<>(this, B_VERTICAL)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(fSettingsBox)
 		.AddGroup(B_HORIZONTAL)
 			.Add(fDefaultsButton)
 			.Add(fRevertButton)
-			.AddGlue()
-		.End()
-		.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
-			B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
-	);
+			.AddGlue();
 
 	BSlider* slider = (BSlider* )FindView("key_repeat_rate");
 	if (slider !=NULL)
diff --git a/src/preferences/mouse/MouseWindow.cpp b/src/preferences/mouse/MouseWindow.cpp
index 251cfcd633..06e7e5a317 100644
--- a/src/preferences/mouse/MouseWindow.cpp
+++ b/src/preferences/mouse/MouseWindow.cpp
@@ -11,12 +11,11 @@
 
 #include <Alert.h>
 #include <Application.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
 #include <Button.h>
 #include <Catalog.h>
 #include <CheckBox.h>
 #include <Debug.h>
+#include <LayoutBuilder.h>
 #include <Locale.h>
 #include <Menu.h>
 #include <MenuField.h>
@@ -58,18 +57,13 @@ MouseWindow::MouseWindow(BRect _rect)
 		// buttons and draw the selected imagery
 
 	// Build the layout
-	SetLayout(new BGroupLayout(B_VERTICAL));
-
-	AddChild(BGroupLayoutBuilder(B_VERTICAL)
+	BLayoutBuilder::Group<>(this, B_VERTICAL)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(fSettingsBox)
 		.AddGroup(B_HORIZONTAL)
 			.Add(fDefaultsButton)
 			.Add(fRevertButton)
-			.AddGlue()
-		.End()
-		.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
-			B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
-	);
+			.AddGlue();
 
 	// check if the window is on screen
 	BRect rect = BScreen().Frame();
diff --git a/src/preferences/notifications/PrefletWin.cpp b/src/preferences/notifications/PrefletWin.cpp
index 0796100bba..64b1e492be 100644
--- a/src/preferences/notifications/PrefletWin.cpp
+++ b/src/preferences/notifications/PrefletWin.cpp
@@ -14,8 +14,7 @@
 #include <Button.h>
 #include <Catalog.h>
 #include <FindDirectory.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
 #include <Path.h>
 
 #include <notification/Notifications.h>
@@ -48,19 +47,13 @@ PrefletWin::PrefletWin()
 	fApply->SetEnabled(false);
 
 	// Build the layout
-	SetLayout(new BGroupLayout(B_VERTICAL));
-
-	// Add childs
-	AddChild(BGroupLayoutBuilder(B_VERTICAL)
+	BLayoutBuilder::Group<>(this, B_VERTICAL)
+		.SetInsets(B_USE_DEFAULT_SPACING)
 		.Add(fMainView)
 		.AddGroup(B_HORIZONTAL)
 			.Add(fRevert)
 			.AddGlue()
-			.Add(fApply)
-		.End()
-		.SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
-			B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING)
-	);
+			.Add(fApply);
 
 	ReloadSettings();