hrev52415 adds 1 changeset to branch 'master'
old head: ee2c12f4c8262cebeb50defdd642aab78b5351b0
new head: 4fd69b6cc2242c4224dd316abffdb5ff29961ae8
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=4fd69b6cc224+%5Eee2c12f4c826
----------------------------------------------------------------------------
4fd69b6cc224: WebPositive: improves the layout of Proxy server tab
* Fixes #14647
Change-Id: I6501e44ab836f6ed4c0a3b67a47b4ed9c9177064
Reviewed-on: https://review.haiku-os.org/634
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Janus <janus2@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52415
Commit: 4fd69b6cc2242c4224dd316abffdb5ff29961ae8
URL: https://git.haiku-os.org/haiku/commit/?id=4fd69b6cc224
Author: Janus <janus2@xxxxxxxxx>
Date: Sat Oct 20 16:19:12 2018 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Oct 20 19:52:26 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/14647
----------------------------------------------------------------------------
1 file changed, 14 insertions(+), 22 deletions(-)
src/apps/webpositive/SettingsWindow.cpp | 36 +++++++++++------------------
----------------------------------------------------------------------------
diff --git a/src/apps/webpositive/SettingsWindow.cpp
b/src/apps/webpositive/SettingsWindow.cpp
index 24b3563a32..51e578dcc7 100644
--- a/src/apps/webpositive/SettingsWindow.cpp
+++ b/src/apps/webpositive/SettingsWindow.cpp
@@ -470,31 +470,23 @@ SettingsWindow::_CreateProxyPage(float spacing)
fProxyPasswordControl->SetText(
fSettings->GetValue(kSettingsKeyProxyPassword, ""));
- BView* view = BGroupLayoutBuilder(B_VERTICAL, 0)
- .Add(fUseProxyCheckBox)
- .Add(BGridLayoutBuilder(spacing / 2, spacing / 2)
- .Add(fProxyAddressControl->CreateLabelLayoutItem(), 0,
0)
- .Add(fProxyAddressControl->CreateTextViewLayoutItem(),
1, 0)
-
- .Add(fProxyPortControl->CreateLabelLayoutItem(), 0, 1)
- .Add(fProxyPortControl->CreateTextViewLayoutItem(), 1,
1)
- )
- .Add(BSpaceLayoutItem::CreateVerticalStrut(spacing))
- .Add(fUseProxyAuthCheckBox)
- .Add(BGridLayoutBuilder(spacing / 2, spacing / 2)
- .Add(fProxyUsernameControl->CreateLabelLayoutItem(), 0,
0)
- .Add(fProxyUsernameControl->CreateTextViewLayoutItem(),
1, 0)
-
- .Add(fProxyPasswordControl->CreateLabelLayoutItem(), 0,
1)
- .Add(fProxyPasswordControl->CreateTextViewLayoutItem(),
1, 1)
- )
- .Add(BSpaceLayoutItem::CreateGlue())
-
+ BView* view = BGridLayoutBuilder(spacing / 2, spacing / 2)
+ .Add(fUseProxyCheckBox, 0, 0, 2)
+ .Add(fProxyAddressControl->CreateLabelLayoutItem(), 0, 1)
+ .Add(fProxyAddressControl->CreateTextViewLayoutItem(), 1, 1, 2)
+ .Add(fProxyPortControl->CreateLabelLayoutItem(), 0, 2)
+ .Add(fProxyPortControl->CreateTextViewLayoutItem(), 1, 2, 2)
+ .Add(BSpaceLayoutItem::CreateVerticalStrut(spacing), 0, 3)
+ .Add(fUseProxyAuthCheckBox, 0, 4, 2)
+ .Add(fProxyUsernameControl->CreateLabelLayoutItem(), 0, 5)
+ .Add(fProxyUsernameControl->CreateTextViewLayoutItem(), 1, 5, 2)
+ .Add(fProxyPasswordControl->CreateLabelLayoutItem(), 0, 6)
+ .Add(fProxyPasswordControl->CreateTextViewLayoutItem(), 1, 6, 2)
+ .Add(BSpaceLayoutItem::CreateGlue(), 0, 7)
.SetInsets(B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING,
B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING)
+ .View();
- .TopView()
- ;
view->SetName(B_TRANSLATE("Proxy server"));
return view;
}
