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

Tuned spacing in the settings layout a bit.

Browse Source
This commit is contained in:
Humdinger
2012-02-29 18:53:15 +01:00
parent c2060a1f34
commit 108d2173b9
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/settings/SettingsWindow.cpp
+14 -17
View File
@@ -16,6 +16,7 @@
#include <Button.h> #include <Button.h>
#include <Catalog.h> #include <Catalog.h>
#include <CheckBox.h> #include <CheckBox.h>
#include <ControlLook.h>
#include <LayoutBuilder.h> #include <LayoutBuilder.h>
#include <Locale.h> #include <Locale.h>
#include <OptionPopUp.h> #include <OptionPopUp.h>
@@ -39,11 +40,6 @@ enum {
}; };
#define SPACE 10
#define SPACEING 7
#define BUTTONHEIGHT 20
SettingsWindow::SettingsWindow(BRect frame) SettingsWindow::SettingsWindow(BRect frame)
: :
BWindow(frame, B_TRANSLATE("MediaPlayer settings"), B_FLOATING_WINDOW_LOOK, BWindow(frame, B_TRANSLATE("MediaPlayer settings"), B_FLOATING_WINDOW_LOOK,
@@ -51,11 +47,13 @@ SettingsWindow::SettingsWindow(BRect frame)
B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE
| B_AUTO_UPDATE_SIZE_LIMITS) | B_AUTO_UPDATE_SIZE_LIMITS)
{ {
const float kSpacing = be_control_look->DefaultItemSpacing();
BBox* settingsBox = new BBox(B_PLAIN_BORDER, NULL); BBox* settingsBox = new BBox(B_PLAIN_BORDER, NULL);
BGroupLayout* settingsLayout = new BGroupLayout(B_VERTICAL, 5); BGroupLayout* settingsLayout = new BGroupLayout(B_VERTICAL, kSpacing / 2);
settingsBox->SetLayout(settingsLayout); settingsBox->SetLayout(settingsLayout);
BBox* buttonBox = new BBox(B_PLAIN_BORDER, NULL); BBox* buttonBox = new BBox(B_PLAIN_BORDER, NULL);
BGroupLayout* buttonLayout = new BGroupLayout(B_HORIZONTAL, 5); BGroupLayout* buttonLayout = new BGroupLayout(B_HORIZONTAL, kSpacing / 2);
buttonBox->SetLayout(buttonLayout); buttonBox->SetLayout(buttonLayout);
BStringView* playModeLabel = new BStringView("stringViewPlayMode", BStringView* playModeLabel = new BStringView("stringViewPlayMode",
@@ -136,27 +134,26 @@ SettingsWindow::SettingsWindow(BRect frame)
new BMessage(M_SETTINGS_SAVE)); new BMessage(M_SETTINGS_SAVE));
okButton->MakeDefault(true); okButton->MakeDefault(true);
// Build the layout // Build the layout
BLayoutBuilder::Group<>(this, B_VERTICAL, 0) BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
.AddGroup(settingsLayout) .AddGroup(settingsLayout)
.SetInsets(5, 5, 15, 5) .SetInsets(kSpacing, kSpacing, kSpacing * 2, 0)
.Add(playModeLabel) .Add(playModeLabel)
.AddGroup(B_HORIZONTAL, 0) .AddGroup(B_HORIZONTAL, 0)
.AddStrut(10) .AddStrut(kSpacing)
.AddGroup(B_VERTICAL, 0) .AddGroup(B_VERTICAL, 0)
.Add(fAutostartCB) .Add(fAutostartCB)
.AddGrid(5, 0) .AddGrid(kSpacing, 0)
.Add(BSpaceLayoutItem::CreateHorizontalStrut(10), 0, 0) .Add(BSpaceLayoutItem::CreateHorizontalStrut(kSpacing), 0, 0)
.Add(fCloseWindowMoviesCB, 1, 0) .Add(fCloseWindowMoviesCB, 1, 0)
.Add(BSpaceLayoutItem::CreateHorizontalStrut(10), 0, 1) .Add(BSpaceLayoutItem::CreateHorizontalStrut(kSpacing), 0, 1)
.Add(fCloseWindowSoundsCB, 1, 1) .Add(fCloseWindowSoundsCB, 1, 1)
.End() .End()
.Add(fLoopMoviesCB) .Add(fLoopMoviesCB)
.Add(fLoopSoundsCB) .Add(fLoopSoundsCB)
.End() .End()
.End() .End()
.AddStrut(5) .AddStrut(kSpacing)
.Add(viewOptionsLabel) .Add(viewOptionsLabel)
.AddGroup(B_HORIZONTAL, 0) .AddGroup(B_HORIZONTAL, 0)
@@ -169,7 +166,7 @@ SettingsWindow::SettingsWindow(BRect frame)
.Add(fSubtitlePlacementOP) .Add(fSubtitlePlacementOP)
.End() .End()
.End() .End()
.AddStrut(5) .AddStrut(kSpacing)
.Add(bgMoviesModeLabel) .Add(bgMoviesModeLabel)
.AddGroup(B_HORIZONTAL, 0) .AddGroup(B_HORIZONTAL, 0)
@@ -180,10 +177,10 @@ SettingsWindow::SettingsWindow(BRect frame)
.Add(fMutedVolumeBGMoviesRB) .Add(fMutedVolumeBGMoviesRB)
.End() .End()
.End() .End()
.AddStrut(5) .AddStrut(kSpacing)
.End() .End()
.AddGroup(buttonLayout) .AddGroup(buttonLayout)
.SetInsets(5) .SetInsets(kSpacing)
.Add(fRevertB) .Add(fRevertB)
.AddGlue() .AddGlue()
.Add(cancelButton) .Add(cancelButton)