From 7d48219b470e22b5147f0ae9adc8ee2049c981d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannah=20Bone=C3=9F?= Date: Wed, 11 Jan 2012 04:51:25 +0100 Subject: [PATCH] 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 --- 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 ++++--- .../translators/jpeg/JPEGTranslator.cpp | 30 ++++++++----------- .../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 +++++-------- 14 files changed, 87 insertions(+), 130 deletions(-) diff --git a/src/add-ons/translators/exr/ConfigView.cpp b/src/add-ons/translators/exr/ConfigView.cpp index 887218c303..03dc28ff24 100644 --- a/src/add-ons/translators/exr/ConfigView.cpp +++ b/src/add-ons/translators/exr/ConfigView.cpp @@ -11,9 +11,7 @@ #include #include -#include -#include -#include +#include #include #include @@ -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 fba85bd00a..266a72b460 100644 --- a/src/add-ons/translators/gif/GIFView.cpp +++ b/src/add-ons/translators/gif/GIFView.cpp @@ -20,10 +20,8 @@ #include #include -#include -#include -#include #include +#include #include #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 a9a360997f..b318897603 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 -#include +#include 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 debc831449..5a3f4b4696 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 -#include +#include #include #include @@ -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 38f4d08e3e..c6bb97b963 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 #include -#include -#include +#include #include #include @@ -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 b2a8fe4e59..dd9249ff9c 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 -#include +#include #include #include @@ -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 d89722b07b..6b4da65991 100644 --- a/src/add-ons/translators/ppm/PPMMain.cpp +++ b/src/add-ons/translators/ppm/PPMMain.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include @@ -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 82d444f721..f50351b87b 100644 --- a/src/add-ons/translators/ppm/PPMTranslator.cpp +++ b/src/add-ons/translators/ppm/PPMTranslator.cpp @@ -13,9 +13,7 @@ #include #include #include -#include -#include -#include +#include #include #include #include @@ -23,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -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 c3d7bcb800..bbb9c0bc15 100644 --- a/src/add-ons/translators/raw/ConfigView.cpp +++ b/src/add-ons/translators/raw/ConfigView.cpp @@ -10,8 +10,7 @@ #include #include -#include -#include +#include #include #include @@ -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 ba033eabd4..668c90692d 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 # include -# include +# include # include # include # include @@ -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 0e87579171..aab159056a 100644 --- a/src/add-ons/translators/sgi/SGIView.cpp +++ b/src/add-ons/translators/sgi/SGIView.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include @@ -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 9a7c99f323..1c9daa3eaa 100644 --- a/src/add-ons/translators/tga/TGAView.cpp +++ b/src/add-ons/translators/tga/TGAView.cpp @@ -30,8 +30,7 @@ /*****************************************************************************/ #include -#include -#include +#include #include #include @@ -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 6ec5e6247a..0269f68673 100644 --- a/src/add-ons/translators/tiff/TIFFView.cpp +++ b/src/add-ons/translators/tiff/TIFFView.cpp @@ -34,9 +34,7 @@ #include #include -#include -#include -#include +#include #include #include #include @@ -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 44719f38a1..5bb7c34ef3 100644 --- a/src/add-ons/translators/webp/ConfigView.cpp +++ b/src/add-ons/translators/webp/ConfigView.cpp @@ -14,9 +14,7 @@ #include #include -#include -#include -#include +#include #include #include #include @@ -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); }