[haiku-commits] haiku: hrev44098 - in src: preferences/filetypes add-ons/translators add-ons/translators/jpeg add-ons/translators/jpeg2000 add-ons/translators/ppm
- From: yourpalal2@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 3 May 2012 18:30:40 +0200 (CEST)
hrev44098 adds 3 changesets to branch 'master'
old head: 06736193497068c34e326be28ae67bbc5d1a154c
new head: b2070d2855626e2faa955aeb97082feb07089455
----------------------------------------------------------------------------
7d48219: Update layout building code in translators
update layout builder code to new api in:
* src/add-ons/translators/raw
* src/add-ons/translators/exr
* src/add-ons/translators/hvif
* src/add-ons/translators/tga
* src/add-ons/translators/webp
* src/add-ons/translators/gif
* src/add-ons/translators/sgi
* src/add-ons/translators/tiff
* src/add-ons/translators/jpeg
* src/add-ons/translators/jpeg2000
* src/add-ons/translators/ppm
Signed-off-by: Alex Wilson <yourpalal2@xxxxxxxxx>
[ Hannah Boneß <hannah@xxxxxxxxx> ]
be887b8: Update layout building code in FileTypes preflet.
Signed-off-by: Alex Wilson <yourpalal2@xxxxxxxxx>
[ Hannah Boneß <hannah@xxxxxxxxx> ]
b2070d2: Layout tweaks in Filetypes. Fixes #6449
[ Alex Wilson <yourpalal2@xxxxxxxxx> ]
----------------------------------------------------------------------------
21 files changed, 155 insertions(+), 229 deletions(-)
src/add-ons/translators/exr/ConfigView.cpp | 15 ++---
src/add-ons/translators/gif/GIFView.cpp | 25 ++++----
src/add-ons/translators/gif/GIFWindow.cpp | 7 ++-
src/add-ons/translators/hvif/HVIFView.cpp | 11 ++--
src/add-ons/translators/jpeg/JPEGTranslator.cpp | 30 +++++-----
.../translators/jpeg2000/JPEG2000Translator.cpp | 27 ++++-----
src/add-ons/translators/ppm/PPMMain.cpp | 4 +-
src/add-ons/translators/ppm/PPMTranslator.cpp | 22 +++-----
src/add-ons/translators/raw/ConfigView.cpp | 12 ++--
src/add-ons/translators/raw/main.cpp | 6 +-
src/add-ons/translators/sgi/SGIView.cpp | 11 ++--
src/add-ons/translators/tga/TGAView.cpp | 12 ++--
src/add-ons/translators/tiff/TIFFView.cpp | 14 ++---
src/add-ons/translators/webp/ConfigView.cpp | 21 +++----
.../filetypes/ApplicationTypeWindow.cpp | 31 +++++-----
.../filetypes/ApplicationTypesWindow.cpp | 16 ++----
src/preferences/filetypes/AttributeWindow.cpp | 4 +-
src/preferences/filetypes/FileTypeWindow.cpp | 45 +++++++--------
src/preferences/filetypes/FileTypesWindow.cpp | 47 +++++++---------
src/preferences/filetypes/NewFileTypeWindow.cpp | 10 ++--
src/preferences/filetypes/TypeListWindow.cpp | 14 ++---
############################################################################
Commit: 7d48219b470e22b5147f0ae9adc8ee2049c981d3
URL: http://cgit.haiku-os.org/haiku/commit/?id=7d48219
Author: Hannah Boneß <hannah@xxxxxxxxx>
Date: Wed Jan 11 03:51:25 2012 UTC
Committer: Alex Wilson <yourpalal2@xxxxxxxxx>
Commit-Date: Thu May 3 15:13:51 2012 UTC
Update layout building code in translators
update layout builder code to new api in:
* src/add-ons/translators/raw
* src/add-ons/translators/exr
* src/add-ons/translators/hvif
* src/add-ons/translators/tga
* src/add-ons/translators/webp
* src/add-ons/translators/gif
* src/add-ons/translators/sgi
* src/add-ons/translators/tiff
* src/add-ons/translators/jpeg
* src/add-ons/translators/jpeg2000
* src/add-ons/translators/ppm
Signed-off-by: Alex Wilson <yourpalal2@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/add-ons/translators/exr/ConfigView.cpp
b/src/add-ons/translators/exr/ConfigView.cpp
index 887218c..03dc28f 100644
--- a/src/add-ons/translators/exr/ConfigView.cpp
+++ b/src/add-ons/translators/exr/ConfigView.cpp
@@ -11,9 +11,7 @@
#include <Catalog.h>
#include <CheckBox.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
-#include <SpaceLayoutItem.h>
+#include <LayoutBuilder.h>
#include <StringView.h>
#include <stdio.h>
@@ -52,10 +50,9 @@ ConfigView::ConfigView(uint32 flags)
B_TRANSLATE("a division of Lucasfilm Entertainment Company
Ltd"));
// Build the layout
- SetLayout(new BGroupLayout(B_HORIZONTAL));
-
- AddChild(BGroupLayoutBuilder(B_VERTICAL, 7)
- .Add(fTitle)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, 7)
+ .SetInsets(5)
+ .Add(fTitle)
.Add(fVersion)
.AddGlue()
.Add(fCopyright)
@@ -63,9 +60,7 @@ ConfigView::ConfigView(uint32 flags)
.AddGlue()
.Add(fCopyright3)
.Add(fCopyright4)
- .AddGlue()
- .SetInsets(5, 5, 5, 5)
- );
+ .AddGlue();
BFont font;
GetFont(&font);
diff --git a/src/add-ons/translators/gif/GIFView.cpp
b/src/add-ons/translators/gif/GIFView.cpp
index fba85bd..266a72b 100644
--- a/src/add-ons/translators/gif/GIFView.cpp
+++ b/src/add-ons/translators/gif/GIFView.cpp
@@ -20,10 +20,8 @@
#include <stdlib.h>
#include <Catalog.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
#include <InterfaceKit.h>
+#include <LayoutBuilder.h>
#include <String.h>
#include "Prefs.h"
@@ -124,23 +122,22 @@ GIFView::GIFView(const char *name)
}
}
- SetLayout(new BGroupLayout(B_HORIZONTAL));
-
- AddChild(BGroupLayoutBuilder(B_VERTICAL, 7)
- .Add(BGridLayoutBuilder(10, 10)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, 7)
+ .SetInsets(5)
+ .AddGrid(10, 10)
.Add(title, 0, 0)
.Add(version, 1, 0)
- )
+ .End()
.Add(copyright)
.AddGlue()
- .Add(BGridLayoutBuilder(10, 10)
+ .AddGrid(10, 10)
.Add(fPaletteMF->CreateLabelLayoutItem(), 0, 0)
.Add(fPaletteMF->CreateMenuBarLayoutItem(), 1, 0)
.Add(fColorCountMF->CreateLabelLayoutItem(), 0, 1)
.Add(fColorCountMF->CreateMenuBarLayoutItem(), 1, 1)
- )
+ .End()
.AddGlue()
.Add(fUseDitheringCB)
@@ -148,15 +145,13 @@ GIFView::GIFView(const char *name)
.Add(fUseTransparentCB)
.Add(fUseTransparentAutoRB)
- .Add(BGridLayoutBuilder(10, 10)
+ .AddGrid(10, 10)
.Add(fUseTransparentColorRB, 0, 0)
.Add(fTransparentRedTC, 1, 0)
.Add(fTransparentGreenTC, 2, 0)
.Add(fTransparentBlueTC, 3, 0)
- )
- .AddGlue()
- .SetInsets(5, 5, 5, 5)
- );
+ .End()
+ .AddGlue();
BFont font;
GetFont(&font);
diff --git a/src/add-ons/translators/gif/GIFWindow.cpp
b/src/add-ons/translators/gif/GIFWindow.cpp
index a9a3609..b318897 100644
--- a/src/add-ons/translators/gif/GIFWindow.cpp
+++ b/src/add-ons/translators/gif/GIFWindow.cpp
@@ -16,14 +16,15 @@
#include "GIFWindow.h"
#include "GIFView.h"
#include <Application.h>
-#include <GroupLayout.h>
+#include <LayoutBuilder.h>
GIFWindow::GIFWindow(BRect rect, const char *name) :
BWindow(rect, name, B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE
| B_AUTO_UPDATE_SIZE_LIMITS, B_CURRENT_WORKSPACE) {
- SetLayout(new BGroupLayout(B_HORIZONTAL));
+
gifview = new GIFView("GIFView");
- AddChild(gifview);
+ BLayoutBuilder::Group<>(this, B_HORIZONTAL)
+ .Add(gifview);
}
bool GIFWindow::QuitRequested() {
diff --git a/src/add-ons/translators/hvif/HVIFView.cpp
b/src/add-ons/translators/hvif/HVIFView.cpp
index debc831..5a3f4b4 100644
--- a/src/add-ons/translators/hvif/HVIFView.cpp
+++ b/src/add-ons/translators/hvif/HVIFView.cpp
@@ -10,7 +10,7 @@
#include "HVIFTranslator.h"
#include <Catalog.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <String.h>
#include <StringView.h>
@@ -63,15 +63,14 @@ HVIFView::HVIFView(const char* name, uint32 flags,
TranslatorSettings *settings)
fRenderSize->SetExplicitAlignment(labelAlignment);
float padding = 5.0f;
- AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, padding)
+ .SetInsets(padding)
.Add(title)
.Add(version)
.Add(copyright)
.Add(fRenderSize)
- .AddGlue()
- .SetInsets(padding, padding, padding, padding)
- );
-
+ .AddGlue();
+
BFont font;
GetFont(&font);
SetExplicitPreferredSize(
diff --git a/src/add-ons/translators/jpeg/JPEGTranslator.cpp
b/src/add-ons/translators/jpeg/JPEGTranslator.cpp
index 38f4d08..c6bb97b 100644
--- a/src/add-ons/translators/jpeg/JPEGTranslator.cpp
+++ b/src/add-ons/translators/jpeg/JPEGTranslator.cpp
@@ -38,8 +38,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <Alignment.h>
#include <Catalog.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <TabView.h>
#include <TextView.h>
@@ -437,14 +436,13 @@ TranslatorReadView::TranslatorReadView(const char* name,
fShowErrorBox->SetValue(B_CONTROL_ON);
float padding = 5.0f;
- AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+
+ BLayoutBuilder::Group<>(this, B_VERTICAL, padding)
+ .SetInsets(padding)
.Add(fAlwaysRGB32)
.Add(fPhotoshopCMYK)
.Add(fShowErrorBox)
- .AddGlue()
- .SetInsets(padding, padding, padding, padding)
- );
-
+ .AddGlue();
}
@@ -559,16 +557,15 @@ TranslatorWriteView::TranslatorWriteView(const char* name,
fGrayAsRGB24->SetValue(B_CONTROL_ON);
float padding = 5.0f;
- AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, padding)
+ .SetInsets(padding)
.Add(fQualitySlider)
.Add(fSmoothingSlider)
.Add(fProgress)
.Add(fOptimizeColors)
.Add(fSmallerFile)
.Add(fGrayAsRGB24)
- .AddGlue()
- .SetInsets(padding, padding, padding, padding)
- );
+ .AddGlue();
}
@@ -687,15 +684,14 @@ TranslatorAboutView::TranslatorAboutView(const char* name)
infoView->MakeEditable(false);
float padding = 5.0f;
- AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
- .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, padding)
+ .SetInsets(padding)
+ .AddGroup(B_HORIZONTAL, padding)
.Add(title)
.Add(version)
.AddGlue()
- )
- .Add(infoView)
- .SetInsets(padding, padding, padding, padding)
- );
+ .End()
+ .Add(infoView);
}
diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
index b2a8fe4..dd9249f 100644
--- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
+++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
@@ -37,7 +37,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <syslog.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <TabView.h>
#include <TextView.h>
@@ -566,11 +566,10 @@ TranslatorReadView::TranslatorReadView(const char* name,
fGrayAsRGB32->SetValue(B_CONTROL_ON);
float padding = 10.0f;
- AddChild(BGroupLayoutBuilder(B_VERTICAL)
+ BLayoutBuilder::Group<>(this, B_VERTICAL)
+ .SetInsets(padding)
.Add(fGrayAsRGB32)
- .AddGlue()
- .SetInsets(padding, padding, padding, padding)
- );
+ .AddGlue();
}
@@ -637,13 +636,12 @@ TranslatorWriteView::TranslatorWriteView(const char* name,
fCodeStreamOnly->SetValue(B_CONTROL_ON);
float padding = 10.0f;
- AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, padding)
+ .SetInsets(padding)
.Add(fQualitySlider)
.Add(fGrayAsRGB24)
.Add(fCodeStreamOnly)
- .AddGlue()
- .SetInsets(padding, padding, padding, padding)
- );
+ .AddGlue();
}
@@ -729,15 +727,14 @@ TranslatorAboutView::TranslatorAboutView(const char* name)
infoView->MakeEditable(false);
float padding = 10.0f;
- AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
- .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, padding)
+ .SetInsets(padding)
+ .AddGroup(B_HORIZONTAL, padding)
.Add(title)
.Add(version)
.AddGlue()
- )
- .Add(infoView)
- .SetInsets(padding, padding, padding, padding)
- );
+ .End()
+ .Add(infoView);
}
diff --git a/src/add-ons/translators/ppm/PPMMain.cpp
b/src/add-ons/translators/ppm/PPMMain.cpp
index d89722b..6b4da65 100644
--- a/src/add-ons/translators/ppm/PPMMain.cpp
+++ b/src/add-ons/translators/ppm/PPMMain.cpp
@@ -6,7 +6,7 @@
#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
-#include <GroupLayout.h>
+#include <LayoutBuilder.h>
#include <Screen.h>
#include <TranslatorAddOn.h>
#include <View.h>
@@ -30,7 +30,7 @@ public:
BWindow(area, B_TRANSLATE("PPM Settings"), B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_NOT_ZOOMABLE |
B_AUTO_UPDATE_SIZE_LIMITS)
{
- SetLayout(new BGroupLayout(B_HORIZONTAL));
+ BLayoutBuilder::Group<>(this, B_HORIZONTAL);
}
~PPMWindow()
{
diff --git a/src/add-ons/translators/ppm/PPMTranslator.cpp
b/src/add-ons/translators/ppm/PPMTranslator.cpp
index 82d444f..f50351b 100644
--- a/src/add-ons/translators/ppm/PPMTranslator.cpp
+++ b/src/add-ons/translators/ppm/PPMTranslator.cpp
@@ -13,9 +13,7 @@
#include <Catalog.h>
#include <CheckBox.h>
#include <FindDirectory.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <Locker.h>
#include <MenuField.h>
#include <MenuItem.h>
@@ -23,7 +21,6 @@
#include <Path.h>
#include <PopUpMenu.h>
#include <Screen.h>
-#include <SpaceLayoutItem.h>
#include <StringView.h>
#include <TranslatorAddOn.h>
#include <TranslationKit.h>
@@ -521,23 +518,20 @@ public:
mAscii->SetViewColor(ViewColor());
// Build the layout
- SetLayout(new BGroupLayout(B_HORIZONTAL));
-
- AddChild(BGroupLayoutBuilder(B_VERTICAL, 7)
- .Add(mTitle)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, 7)
+ .SetInsets(5)
+ .Add(mTitle)
.Add(mDetail)
.AddGlue()
.Add(mBasedOn)
.Add(mCopyright)
.AddGlue()
- .Add(BGridLayoutBuilder(10, 10)
-
.Add(mField->CreateLabelLayoutItem(), 0, 0)
+ .AddGrid(10, 10)
+
.Add(mField->CreateLabelLayoutItem(), 0, 0)
.Add(mField->CreateMenuBarLayoutItem(), 1, 0)
.Add(mAscii, 0, 1)
- )
- .AddGlue()
- .SetInsets(5, 5, 5, 5)
- );
+ .End()
+ .AddGlue();
BFont font;
GetFont(&font);
diff --git a/src/add-ons/translators/raw/ConfigView.cpp
b/src/add-ons/translators/raw/ConfigView.cpp
index c3d7bcb..bbb9c0b 100644
--- a/src/add-ons/translators/raw/ConfigView.cpp
+++ b/src/add-ons/translators/raw/ConfigView.cpp
@@ -10,8 +10,7 @@
#include <Catalog.h>
#include <CheckBox.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <StringView.h>
#include <stdio.h>
@@ -49,9 +48,8 @@ ConfigView::ConfigView(uint32 flags)
B_UTF8_COPYRIGHT "1997-2007 Dave Coffin");
// Build the layout
- SetLayout(new BGroupLayout(B_HORIZONTAL));
-
- AddChild(BGroupLayoutBuilder(B_VERTICAL, 7)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, 7)
+ .SetInsets(5)
.Add(fTitle)
.AddGlue()
.Add(fVersion)
@@ -59,9 +57,7 @@ ConfigView::ConfigView(uint32 flags)
.AddGlue()
.Add(fCopyright2)
.Add(fCopyright3)
- .AddGlue()
- .SetInsets(5, 5, 5, 5)
- );
+ .AddGlue();
BFont font;
GetFont(&font);
diff --git a/src/add-ons/translators/raw/main.cpp
b/src/add-ons/translators/raw/main.cpp
index ba033ea..668c906 100644
--- a/src/add-ons/translators/raw/main.cpp
+++ b/src/add-ons/translators/raw/main.cpp
@@ -16,7 +16,7 @@
#if SHOW_MODE && TEST_MODE
# include <Bitmap.h>
# include <BitmapStream.h>
-# include <GroupLayout.h>
+# include <LayoutBuilder.h>
# include <String.h>
# include <View.h>
# include <Window.h>
@@ -123,8 +123,8 @@ main(int argc, char **argv)
B_AUTO_UPDATE_SIZE_LIMITS);
BView* view = new
BView(window->Bounds(), NULL,
B_WILL_DRAW,
B_FOLLOW_NONE);
- window->AddChild(view);
- window->SetLayout(new
BGroupLayout(B_HORIZONTAL));
+ BLayoutBuilder::Group<>(window,
B_HORIZONTAL)
+ .Add(view);
window->Show();
snooze(300000);
window->Lock();
diff --git a/src/add-ons/translators/sgi/SGIView.cpp
b/src/add-ons/translators/sgi/SGIView.cpp
index 0e87579..aab1590 100644
--- a/src/add-ons/translators/sgi/SGIView.cpp
+++ b/src/add-ons/translators/sgi/SGIView.cpp
@@ -34,7 +34,7 @@
#include <string.h>
#include <Catalog.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <MenuBar.h>
#include <MenuField.h>
#include <MenuItem.h>
@@ -132,16 +132,15 @@ SGIView::SGIView(const char* name, uint32 flags,
TranslatorSettings* settings)
infoView->MakeEditable(false);
infoView->MakeResizable(true);
infoView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-
+
float padding = 5.0f;
- AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, padding)
+ .SetInsets(padding)
.Add(titleView)
.Add(detailView)
.Add(fCompressionMF)
.Add(infoView)
- .AddGlue()
- .SetInsets(padding, padding, padding, padding)
- );
+ .AddGlue();
BFont font;
GetFont(&font);
diff --git a/src/add-ons/translators/tga/TGAView.cpp
b/src/add-ons/translators/tga/TGAView.cpp
index 9a7c99f..1c9daa3 100644
--- a/src/add-ons/translators/tga/TGAView.cpp
+++ b/src/add-ons/translators/tga/TGAView.cpp
@@ -30,8 +30,7 @@
/*****************************************************************************/
#include <Catalog.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <SpaceLayoutItem.h>
#include <stdio.h>
@@ -78,9 +77,8 @@ TGAView::TGAView(const char *name, uint32 flags,
TranslatorSettings *settings)
fpchkRLE->SetViewColor(ViewColor());
// Build the layout
- SetLayout(new BGroupLayout(B_HORIZONTAL));
-
- AddChild(BGroupLayoutBuilder(B_VERTICAL, 7)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, 7)
+ .SetInsets(5)
.Add(fTitle)
.Add(fDetail)
.AddGlue()
@@ -88,9 +86,7 @@ TGAView::TGAView(const char *name, uint32 flags,
TranslatorSettings *settings)
.Add(fpchkRLE)
.AddGlue()
.Add(fWrittenBy)
- .AddGlue()
- .SetInsets(5, 5, 5, 5)
- );
+ .AddGlue();
BFont font;
GetFont(&font);
diff --git a/src/add-ons/translators/tiff/TIFFView.cpp
b/src/add-ons/translators/tiff/TIFFView.cpp
index 6ec5e62..0269f68 100644
--- a/src/add-ons/translators/tiff/TIFFView.cpp
+++ b/src/add-ons/translators/tiff/TIFFView.cpp
@@ -34,9 +34,7 @@
#include <string.h>
#include <Catalog.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <MenuBar.h>
#include <MenuField.h>
#include <MenuItem.h>
@@ -134,10 +132,8 @@ TIFFView::TIFFView(const char *name, uint32 flags,
fCompressionMF = new BMenuField(B_TRANSLATE("Use Compression:"), menu);
// Build the layout
- SetLayout(new BGroupLayout(B_VERTICAL));
-
- i = 0;
- AddChild(BGroupLayoutBuilder(B_VERTICAL, 7)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, 7)
+ .SetInsets(5)
.Add(fTitle)
.Add(fDetail)
.AddGlue()
@@ -149,9 +145,7 @@ TIFFView::TIFFView(const char *name, uint32 flags,
.Add(fLibTIFF[3])
// Theses 4 adding above work because we know there are
4 strings
// but it's fragile: one string less in the library
version and the application breaks
- .AddGlue()
- .SetInsets(5, 5, 5, 5)
- );
+ .AddGlue();
BFont font;
GetFont(&font);
diff --git a/src/add-ons/translators/webp/ConfigView.cpp
b/src/add-ons/translators/webp/ConfigView.cpp
index 44719f3..5bb7c34 100644
--- a/src/add-ons/translators/webp/ConfigView.cpp
+++ b/src/add-ons/translators/webp/ConfigView.cpp
@@ -14,9 +14,7 @@
#include <Catalog.h>
#include <CheckBox.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayout.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <MenuField.h>
#include <MenuItem.h>
#include <Message.h>
@@ -121,26 +119,23 @@ ConfigView::ConfigView(TranslatorSettings* settings,
uint32 flags)
fPreprocessingCheckBox->SetValue(B_CONTROL_ON);
// Build the layout
- SetLayout(new BGroupLayout(B_VERTICAL));
-
- AddChild(BGroupLayoutBuilder(B_VERTICAL)
- .Add(BGroupLayoutBuilder(B_HORIZONTAL)
+ BLayoutBuilder::Group<>(this, B_VERTICAL)
+ .SetInsets(5)
+ .AddGroup(B_HORIZONTAL)
.Add(title)
.Add(version)
.AddGlue()
- )
+ .End()
.Add(copyrights)
.AddGlue()
- .Add(BGridLayoutBuilder()
+ .AddGrid()
.Add(presetsField->CreateLabelLayoutItem(), 0, 0)
.Add(presetsField->CreateMenuBarLayoutItem(), 1, 0)
- )
+ .End()
.Add(fQualitySlider)
.Add(fMethodSlider)
- .Add(fPreprocessingCheckBox)
- .SetInsets(5, 5, 5, 5)
- );
+ .Add(fPreprocessingCheckBox);
}
############################################################################
Commit: be887b8b1377a9f8419b05fb0f5fbfd32fb8a952
URL: http://cgit.haiku-os.org/haiku/commit/?id=be887b8
Author: Hannah Boneß <hannah@xxxxxxxxx>
Date: Wed Dec 14 23:29:03 2011 UTC
Committer: Alex Wilson <yourpalal2@xxxxxxxxx>
Commit-Date: Thu May 3 15:13:52 2012 UTC
Update layout building code in FileTypes preflet.
Signed-off-by: Alex Wilson <yourpalal2@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/preferences/filetypes/ApplicationTypeWindow.cpp
b/src/preferences/filetypes/ApplicationTypeWindow.cpp
index 9c651cc..5ceaaed 100644
--- a/src/preferences/filetypes/ApplicationTypeWindow.cpp
+++ b/src/preferences/filetypes/ApplicationTypeWindow.cpp
@@ -20,8 +20,6 @@
#include <CheckBox.h>
#include <ControlLook.h>
#include <File.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayoutBuilder.h>
#include <GroupView.h>
#include <LayoutBuilder.h>
#include <ListView.h>
@@ -340,12 +338,11 @@ ApplicationTypeWindow::ApplicationTypeWindow(BPoint
position,
fBackgroundAppCheckBox = new BCheckBox("background",
B_TRANSLATE("Background app"), new
BMessage(kMsgAppFlagsChanged));
- flagsBox->AddChild(BGridLayoutBuilder(0, 0)
+ BLayoutBuilder::Grid<>(flagsBox, 0, 0)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fSingleLaunchButton, 0, 0).Add(fArgsOnlyCheckBox, 1, 0)
.Add(fMultipleLaunchButton, 0, 1).Add(fBackgroundAppCheckBox,
1, 1)
- .Add(fExclusiveLaunchButton, 0, 2)
- .SetInsets(padding, padding / 2, padding, padding)
- .View());
+ .Add(fExclusiveLaunchButton, 0, 2);
flagsBox->SetLabel(fFlagsCheckBox);
// "Icon" group
@@ -354,10 +351,9 @@ ApplicationTypeWindow::ApplicationTypeWindow(BPoint
position,
iconBox->SetLabel(B_TRANSLATE("Icon"));
fIconView = new IconView("icon");
fIconView->SetModificationMessage(new BMessage(kMsgIconChanged));
- iconBox->AddChild(BGroupLayoutBuilder(B_HORIZONTAL)
- .Add(fIconView)
- .SetInsets(padding, padding, padding, padding)
- .TopView());
+ BLayoutBuilder::Group<>(iconBox, B_HORIZONTAL)
+ .SetInsets(padding, padding * 2, padding, padding)
+ .Add(fIconView);
// "Supported Types" group
@@ -382,16 +378,16 @@ ApplicationTypeWindow::ApplicationTypeWindow(BPoint
position,
iconHolder->AddChild(fTypeIconView);
fTypeIconView->SetModificationMessage(new
BMessage(kMsgTypeIconsChanged));
- typeBox->AddChild(BGridLayoutBuilder(padding, padding)
+ BLayoutBuilder::Grid<>(typeBox, padding, padding)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(scrollView, 0, 0, 1, 4)
.Add(fAddTypeButton, 1, 0, 1, 2)
.Add(fRemoveTypeButton, 1, 2, 1, 2)
.Add(iconHolder, 2, 1, 1, 2)
- .SetInsets(padding, padding / 2, padding, padding)
.SetColumnWeight(0, 3)
.SetColumnWeight(1, 2)
- .SetColumnWeight(2, 1)
- .View());
+ .SetColumnWeight(2, 1);
+
iconHolder->SetExplicitAlignment(
BAlignment(B_ALIGN_CENTER, B_ALIGN_MIDDLE));
@@ -456,7 +452,8 @@ ApplicationTypeWindow::ApplicationTypeWindow(BPoint
position,
fInternalVersionControl->TextView()->SetExplicitMinSize(
BSize(width, fInternalVersionControl->MinSize().height));
- versionBox->AddChild(BGridLayoutBuilder(padding / 2, padding / 2)
+ BLayoutBuilder::Grid<>(versionBox, padding / 2, padding / 2)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fMajorVersionControl->CreateLabelLayoutItem(), 0, 0)
.Add(fMajorVersionControl->CreateTextViewLayoutItem(), 1, 0)
.Add(fMiddleVersionControl, 2, 0, 2)
@@ -467,9 +464,7 @@ ApplicationTypeWindow::ApplicationTypeWindow(BPoint
position,
.Add(fShortDescriptionControl->CreateTextViewLayoutItem(), 1,
1, 10)
.Add(longLabel, 0, 2)
.Add(scrollView, 1, 2, 10, 3)
- .SetInsets(padding, padding / 2, padding, padding)
- .SetRowWeight(3, 3)
- .View());
+ .SetRowWeight(3, 3);
// put it all together
BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
diff --git a/src/preferences/filetypes/ApplicationTypesWindow.cpp
b/src/preferences/filetypes/ApplicationTypesWindow.cpp
index 4927d14..bd65960 100644
--- a/src/preferences/filetypes/ApplicationTypesWindow.cpp
+++ b/src/preferences/filetypes/ApplicationTypesWindow.cpp
@@ -17,8 +17,6 @@
#include <Button.h>
#include <Catalog.h>
#include <ControlLook.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <Locale.h>
#include <MenuField.h>
@@ -205,15 +203,14 @@ ApplicationTypesWindow::ApplicationTypesWindow(const
BMessage& settings)
fPathView->TextView()->SetExplicitAlignment(labelAlignment);
fPathView->LabelView()->SetExplicitAlignment(labelAlignment);
- infoBox->AddChild(BGridLayoutBuilder(padding, padding)
+ BLayoutBuilder::Grid<>(infoBox, padding, padding)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fNameView->LabelView(), 0, 0)
.Add(fNameView->TextView(), 1, 0, 2)
.Add(fSignatureView->LabelView(), 0, 1)
.Add(fSignatureView->TextView(), 1, 1, 2)
.Add(fPathView->LabelView(), 0, 2)
- .Add(fPathView->TextView(), 1, 2, 2)
- .SetInsets(padding, padding, padding, padding)
- .View());
+ .Add(fPathView->TextView(), 1, 2, 2);
// "Version" group
@@ -231,13 +228,12 @@ ApplicationTypesWindow::ApplicationTypesWindow(const
BMessage& settings)
fDescriptionView->SetLowColor(fDescriptionView->ViewColor());
fDescriptionView->MakeEditable(false);
- versionBox->AddChild(BGridLayoutBuilder(padding, padding)
+ BLayoutBuilder::Grid<>(versionBox, padding, padding)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fVersionView->LabelView(), 0, 0)
.Add(fVersionView->TextView(), 1, 0)
.Add(fDescriptionLabel->LabelView(), 0, 1)
- .Add(fDescriptionView, 1, 1, 2, 2)
- .SetInsets(padding, padding, padding, padding)
- .View());
+ .Add(fDescriptionView, 1, 1, 2, 2);
// Launch and Tracker buttons
diff --git a/src/preferences/filetypes/AttributeWindow.cpp
b/src/preferences/filetypes/AttributeWindow.cpp
index 9d45156..65f8276 100644
--- a/src/preferences/filetypes/AttributeWindow.cpp
+++ b/src/preferences/filetypes/AttributeWindow.cpp
@@ -13,8 +13,6 @@
#include <Catalog.h>
#include <CheckBox.h>
#include <ControlLook.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <Locale.h>
#include <MenuField.h>
@@ -254,7 +252,7 @@ AttributeWindow::AttributeWindow(FileTypesWindow* target,
BMimeType& mimeType,
.View())
)
.AddGroup(B_HORIZONTAL, padding)
- .Add(BSpaceLayoutItem::CreateGlue())
+ .AddGlue()
.Add(cancelButton)
.Add(fAcceptButton);
diff --git a/src/preferences/filetypes/FileTypeWindow.cpp
b/src/preferences/filetypes/FileTypeWindow.cpp
index 2a7248a..f67e485 100644
--- a/src/preferences/filetypes/FileTypeWindow.cpp
+++ b/src/preferences/filetypes/FileTypeWindow.cpp
@@ -17,8 +17,6 @@
#include <Catalog.h>
#include <ControlLook.h>
#include <File.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <Locale.h>
#include <MenuField.h>
@@ -79,22 +77,20 @@ FileTypeWindow::FileTypeWindow(BPoint position, const
BMessage& refs)
B_TRANSLATE_COMMENT("Same as" B_UTF8_ELLIPSIS,
"The same TYPE as ..."), new BMessage(kMsgSameTypeAs));
- fileTypeBox->AddChild(BGridLayoutBuilder(padding, padding)
+ BLayoutBuilder::Grid<>(fileTypeBox, padding, padding)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fTypeControl, 0, 0, 2, 1)
.Add(fSelectTypeButton, 0, 1)
- .Add(fSameTypeAsButton, 1, 1)
- .SetInsets(padding, padding, padding, padding)
- .View());
+ .Add(fSameTypeAsButton, 1, 1);
// "Icon" group
BBox* iconBox = new BBox("icon BBox");
iconBox->SetLabel(B_TRANSLATE("Icon"));
fIconView = new IconView("icon");
- iconBox->AddChild(BGroupLayoutBuilder(B_HORIZONTAL)
- .Add(fIconView)
- .SetInsets(padding, padding, padding, padding)
- .TopView());
+ BLayoutBuilder::Group<>(iconBox, B_HORIZONTAL)
+ .SetInsets(padding, padding * 2, padding, padding)
+ .Add(fIconView);
// "Preferred Application" group
@@ -118,15 +114,14 @@ FileTypeWindow::FileTypeWindow(BPoint position, const
BMessage& refs)
"The same APPLICATION as ..."),
new BMessage(kMsgSamePreferredAppAs));
- preferredBox->AddChild(BGridLayoutBuilder(padding, padding)
+ BLayoutBuilder::Grid<>(preferredBox, padding, padding)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fPreferredField, 0, 0, 2, 1)
.Add(fSelectAppButton, 0, 1)
- .Add(fSameAppAsButton, 1, 1)
- .SetInsets(padding, padding, padding, padding)
- .View());
+ .Add(fSameAppAsButton, 1, 1);
BLayoutBuilder::Group<>(this, B_HORIZONTAL, padding)
- .SetInsets(padding, padding, padding, padding)
+ .SetInsets(padding)
.AddGroup(B_VERTICAL, padding)
.Add(fileTypeBox)
.Add(preferredBox)
diff --git a/src/preferences/filetypes/FileTypesWindow.cpp
b/src/preferences/filetypes/FileTypesWindow.cpp
index a5d840a..6d8d9de 100644
--- a/src/preferences/filetypes/FileTypesWindow.cpp
+++ b/src/preferences/filetypes/FileTypesWindow.cpp
@@ -24,8 +24,6 @@
#include <Button.h>
#include <Catalog.h>
#include <ControlLook.h>
-#include <GridLayoutBuilder.h>
-#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <ListView.h>
#include <Locale.h>
@@ -404,12 +402,11 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
fIconView = new TypeIconView("icon");
fIconBox = new BBox("Icon BBox");
fIconBox->SetLabel(B_TRANSLATE("Icon"));
- fIconBox->AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
- .Add(BSpaceLayoutItem::CreateGlue(), 1)
+ BLayoutBuilder::Group<>(fIconBox, B_VERTICAL, padding)
+ .SetInsets(padding)
+ .AddGlue(1)
.Add(fIconView, 3)
- .Add(BSpaceLayoutItem::CreateGlue(), 1)
- .SetInsets(padding, padding, padding, padding)
- .TopView());
+ .AddGlue(1);
// "File Recognition" group
@@ -443,16 +440,13 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
fRuleControl->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
fRuleControl->Hide();
- BGridView* recognitionBoxGrid = new BGridView(padding, padding / 2);
- BGridLayoutBuilder(recognitionBoxGrid)
+ BLayoutBuilder::Grid<>(fRecognitionBox, padding, padding / 2)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fExtensionLabel->LabelView(), 0, 0)
- .Add(scrollView, 0, 1, 2, 3)
+ .Add(scrollView, 0, 1, 2, 2)
.Add(fAddExtensionButton, 2, 1)
.Add(fRemoveExtensionButton, 2, 2)
- .Add(fRuleControl, 0, 4, 3, 1)
- .SetInsets(padding, padding, padding, padding);
-
- fRecognitionBox->AddChild(recognitionBoxGrid);
+ .Add(fRuleControl, 0, 3, 3, 1);
// "Description" group
@@ -467,15 +461,14 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
fDescriptionControl = new BTextControl("description",
B_TRANSLATE("Description:"), "", new
BMessage(kMsgDescriptionEntered));
- fDescriptionBox->AddChild(BGridLayoutBuilder(padding / 2, padding / 2)
+ BLayoutBuilder::Grid<>(fDescriptionBox, padding / 2, padding / 2)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fInternalNameView->LabelView(), 0, 0)
.Add(fInternalNameView->TextView(), 1, 0)
.Add(fTypeNameControl->CreateLabelLayoutItem(), 0, 1)
.Add(fTypeNameControl->CreateTextViewLayoutItem(), 1, 1, 2)
.Add(fDescriptionControl->CreateLabelLayoutItem(), 0, 2)
- .Add(fDescriptionControl->CreateTextViewLayoutItem(), 1, 2, 2)
- .SetInsets(padding, padding, padding, padding)
- .View());
+ .Add(fDescriptionControl->CreateTextViewLayoutItem(), 1, 2, 2);
// "Preferred Application" group
@@ -496,12 +489,11 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
B_TRANSLATE("Same as" B_UTF8_ELLIPSIS),
new BMessage(kMsgSamePreferredAppAs));
- fPreferredBox->AddChild(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+ BLayoutBuilder::Group<>(fPreferredBox, B_HORIZONTAL, padding)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(fPreferredField)
.Add(fSelectButton)
- .Add(fSameAsButton)
- .SetInsets(padding, padding, padding, padding)
- .TopView());
+ .Add(fSameAsButton);
// "Extra Attributes" group
@@ -536,23 +528,22 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
BScrollView* attributesScroller = new BScrollView("scrollview attr",
fAttributeListView, B_FRAME_EVENTS | B_WILL_DRAW, false, true);
- fAttributeBox->AddChild(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+ BLayoutBuilder::Group<>(fAttributeBox, B_HORIZONTAL, padding)
+ .SetInsets(padding, padding * 2, padding, padding)
.Add(attributesScroller, 1.0f)
.AddGroup(B_VERTICAL, padding / 2, 0.0f)
+ .SetInsets(0)
.Add(fAddAttributeButton)
.Add(fRemoveAttributeButton)
.AddStrut(padding)
.Add(fMoveUpAttributeButton)
.Add(fMoveDownAttributeButton)
- .AddGlue()
- .End()
- .SetInsets(padding, padding, padding, padding)
- .TopView());
+ .AddGlue();
fMainSplitView = new BSplitView(B_HORIZONTAL, floorf(padding / 2));
BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
- .SetInsets(0, 0, 0, 0)
+ .SetInsets(0)
.Add(menuBar)
.AddGroup(B_HORIZONTAL, 0)
.SetInsets(padding, padding, padding, padding)
diff --git a/src/preferences/filetypes/NewFileTypeWindow.cpp
b/src/preferences/filetypes/NewFileTypeWindow.cpp
index a598755..801a7f7 100644
--- a/src/preferences/filetypes/NewFileTypeWindow.cpp
+++ b/src/preferences/filetypes/NewFileTypeWindow.cpp
@@ -11,8 +11,7 @@
#include <Button.h>
#include <Catalog.h>
#include <ControlLook.h>
-#include <GroupLayout.h>
-#include <GridLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <Locale.h>
#include <MenuBar.h>
#include <MenuField.h>
@@ -94,9 +93,8 @@ NewFileTypeWindow::NewFileTypeWindow(FileTypesWindow* target,
float padding = be_control_look->DefaultItemSpacing();
- SetLayout(new BGroupLayout(B_VERTICAL));
- AddChild(BGridLayoutBuilder(padding, padding)
- .SetInsets(padding, padding, padding, padding)
+ BLayoutBuilder::Grid<>(this, padding, padding)
+ .SetInsets(padding)
.Add(typesMenuLabel, 0, 0)
.Add(typesMenuField, 1, 0, 2)
.Add(fNameControl->CreateLabelLayoutItem(), 0, 1)
@@ -105,7 +103,7 @@ NewFileTypeWindow::NewFileTypeWindow(FileTypesWindow*
target,
.Add(new BButton(B_TRANSLATE("Cancel"),
new BMessage(B_QUIT_REQUESTED)), 1, 2)
.Add(fAddButton, 2, 2)
- .SetColumnWeight(0, 3));
+ .SetColumnWeight(0, 3);
BAlignment fullSize = BAlignment(B_ALIGN_USE_FULL_WIDTH,
B_ALIGN_USE_FULL_HEIGHT);
diff --git a/src/preferences/filetypes/TypeListWindow.cpp
b/src/preferences/filetypes/TypeListWindow.cpp
index 8f7e493..aa79389 100644
--- a/src/preferences/filetypes/TypeListWindow.cpp
+++ b/src/preferences/filetypes/TypeListWindow.cpp
@@ -10,7 +10,7 @@
#include <Button.h>
#include <Catalog.h>
#include <ControlLook.h>
-#include <GroupLayoutBuilder.h>
+#include <LayoutBuilder.h>
#include <Locale.h>
#include <ScrollView.h>
@@ -52,15 +52,12 @@ TypeListWindow::TypeListWindow(const char* currentType,
uint32 what,
BScrollView* scrollView = new BScrollView("scrollview", fListView,
B_FRAME_EVENTS | B_WILL_DRAW, false, true);
- SetLayout(new BGroupLayout(B_VERTICAL));
- AddChild(BGroupLayoutBuilder(B_VERTICAL, padding)
+ BLayoutBuilder::Group<>(this, B_VERTICAL, padding)
+ .SetInsets(padding)
.Add(scrollView)
- .Add(BGroupLayoutBuilder(B_HORIZONTAL, padding)
+ .AddGroup(B_HORIZONTAL, padding)
.Add(button)
- .Add(fSelectButton)
- )
- .SetInsets(padding, padding, padding, padding)
- );
+ .Add(fSelectButton);
BAlignment buttonAlignment =
BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_VERTICAL_CENTER);
############################################################################
Revision: hrev44098
Commit: b2070d2855626e2faa955aeb97082feb07089455
URL: http://cgit.haiku-os.org/haiku/commit/?id=b2070d2
Author: Alex Wilson <yourpalal2@xxxxxxxxx>
Date: Thu May 3 16:04:11 2012 UTC
Ticket: https://dev.haiku-os.org/ticket/6449
Layout tweaks in Filetypes. Fixes #6449
----------------------------------------------------------------------------
diff --git a/src/preferences/filetypes/FileTypeWindow.cpp
b/src/preferences/filetypes/FileTypeWindow.cpp
index f67e485..c86cee8 100644
--- a/src/preferences/filetypes/FileTypeWindow.cpp
+++ b/src/preferences/filetypes/FileTypeWindow.cpp
@@ -77,11 +77,11 @@ FileTypeWindow::FileTypeWindow(BPoint position, const
BMessage& refs)
B_TRANSLATE_COMMENT("Same as" B_UTF8_ELLIPSIS,
"The same TYPE as ..."), new BMessage(kMsgSameTypeAs));
- BLayoutBuilder::Grid<>(fileTypeBox, padding, padding)
+ BLayoutBuilder::Grid<>(fileTypeBox)
.SetInsets(padding, padding * 2, padding, padding)
- .Add(fTypeControl, 0, 0, 2, 1)
- .Add(fSelectTypeButton, 0, 1)
- .Add(fSameTypeAsButton, 1, 1);
+ .Add(fTypeControl, 0, 0, 3, 1)
+ .Add(fSelectTypeButton, 1, 1)
+ .Add(fSameTypeAsButton, 2, 1);
// "Icon" group
@@ -116,17 +116,15 @@ FileTypeWindow::FileTypeWindow(BPoint position, const
BMessage& refs)
BLayoutBuilder::Grid<>(preferredBox, padding, padding)
.SetInsets(padding, padding * 2, padding, padding)
- .Add(fPreferredField, 0, 0, 2, 1)
- .Add(fSelectAppButton, 0, 1)
- .Add(fSameAppAsButton, 1, 1);
+ .Add(fPreferredField, 0, 0, 3, 1)
+ .Add(fSelectAppButton, 1, 1)
+ .Add(fSameAppAsButton, 2, 1);
- BLayoutBuilder::Group<>(this, B_HORIZONTAL, padding)
+ BLayoutBuilder::Grid<>(this)
.SetInsets(padding)
- .AddGroup(B_VERTICAL, padding)
- .Add(fileTypeBox)
- .Add(preferredBox)
- .End()
- .Add(iconBox);
+ .Add(fileTypeBox, 0, 0, 2, 1)
+ .Add(iconBox, 0, 1, 1, 1)
+ .Add(preferredBox, 1, 1, 1, 1);
fTypeControl->MakeFocus(true);
BMimeType::StartWatching(this);
diff --git a/src/preferences/filetypes/TypeListWindow.cpp
b/src/preferences/filetypes/TypeListWindow.cpp
index aa79389..816ded2 100644
--- a/src/preferences/filetypes/TypeListWindow.cpp
+++ b/src/preferences/filetypes/TypeListWindow.cpp
@@ -56,6 +56,7 @@ TypeListWindow::TypeListWindow(const char* currentType,
uint32 what,
.SetInsets(padding)
.Add(scrollView)
.AddGroup(B_HORIZONTAL, padding)
+ .AddGlue()
.Add(button)
.Add(fSelectButton);
Other related posts:
- » [haiku-commits] haiku: hrev44098 - in src: preferences/filetypes add-ons/translators add-ons/translators/jpeg add-ons/translators/jpeg2000 add-ons/translators/ppm - yourpalal2
