diff --git a/src/add-ons/translators/icns/ConfigView.cpp b/src/add-ons/translators/icns/ConfigView.cpp index ccafe4f36d..0bf06a5b76 100644 --- a/src/add-ons/translators/icns/ConfigView.cpp +++ b/src/add-ons/translators/icns/ConfigView.cpp @@ -7,8 +7,8 @@ #include "ICNSTranslator.h" #include +#include #include -#include #include #include @@ -21,15 +21,9 @@ ConfigView::ConfigView(TranslatorSettings *settings) : BGroupView("ICNSTranslator Settings", B_VERTICAL, 0) { fSettings = settings; - BAlignment leftAlignment(B_ALIGN_LEFT, B_ALIGN_VERTICAL_UNSET); - BStringView *stringView = new BStringView("title", B_TRANSLATE("Apple icon translator")); - stringView->SetFont(be_bold_font); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - - float spacing = be_control_look->DefaultItemSpacing(); - AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing)); + BStringView *titleView = new BStringView("title", B_TRANSLATE("Apple icon translator")); + titleView->SetFont(be_bold_font); char version[256]; sprintf(version, B_TRANSLATE("Version %d.%d.%d, %s"), @@ -37,57 +31,40 @@ ConfigView::ConfigView(TranslatorSettings *settings) int(B_TRANSLATION_MINOR_VERSION(ICNS_TRANSLATOR_VERSION)), int(B_TRANSLATION_REVISION_VERSION(ICNS_TRANSLATOR_VERSION)), __DATE__); - stringView = new BStringView("version", version); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - stringView = new BStringView("copyright", + BStringView *versionView = new BStringView("version", version); + + + BStringView *copyrightView = new BStringView("copyright", B_UTF8_COPYRIGHT "2005-2006 Haiku Inc."); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - stringView = new BStringView("my_copyright", + BStringView *copyright2View = new BStringView("my_copyright", B_UTF8_COPYRIGHT "2012 Gerasim Troeglazov <3dEyes@gmail.com>."); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing)); - - stringView = new BStringView("support_sizes", + BStringView *infoView = new BStringView("support_sizes", "Valid sizes: 16, 32, 48, 128, 256, 512, 1024"); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - stringView = new BStringView("support_colors", + BStringView *info2View = new BStringView("support_colors", "Valid colors: RGB32, RGBA32"); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - - AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing)); - - BString copyrightText; - copyrightText << "libicns v0.8.1\n" - << B_UTF8_COPYRIGHT "2001-2012 Mathew Eis "; - fCopyrightView = new BTextView("CopyrightLibs"); - fCopyrightView->SetExplicitAlignment(leftAlignment); - fCopyrightView->MakeEditable(false); - fCopyrightView->MakeResizable(true); - fCopyrightView->SetWordWrap(true); - fCopyrightView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - fCopyrightView->SetText(copyrightText.String()); - fCopyrightView->SetExplicitMinSize(BSize(300,200)); + BStringView *copyright3View = new BStringView("copyright3", + "libicns v0.8.1\n"); - BFont font; - font.SetSize(font.Size() * 0.9); - fCopyrightView->SetFontAndColor(&font, B_FONT_SIZE, NULL); - AddChild(fCopyrightView); + BStringView *copyright4View = new BStringView("copyright4", + "2001-2012 Mathew Eis "); - fCopyrightView->SetExplicitAlignment(leftAlignment); - - AddChild(BSpaceLayoutItem::CreateGlue()); - GroupLayout()->SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING, - B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING); + BLayoutBuilder::Group<>(this, B_VERTICAL, 0) + .SetInsets(B_USE_DEFAULT_SPACING) + .Add(titleView) + .Add(versionView) + .Add(copyrightView) + .Add(copyright2View) + .AddGlue() + .Add(infoView) + .Add(info2View) + .AddGlue() + .Add(copyright3View) + .Add(copyright4View); SetExplicitPreferredSize(GroupLayout()->MinSize()); } diff --git a/src/add-ons/translators/ico/ConfigView.cpp b/src/add-ons/translators/ico/ConfigView.cpp index cdd69c2b8b..adc2bde2b6 100644 --- a/src/add-ons/translators/ico/ConfigView.cpp +++ b/src/add-ons/translators/ico/ConfigView.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include @@ -24,16 +24,9 @@ ConfigView::ConfigView() : BGroupView(B_TRANSLATE("ICOTranslator Settings"), B_VERTICAL, 0) { - BAlignment leftAlignment(B_ALIGN_LEFT, B_ALIGN_VERTICAL_UNSET); - - BStringView* stringView = new BStringView("title", + BStringView* titleView = new BStringView("title", B_TRANSLATE("Windows icon translator")); - stringView->SetFont(be_bold_font); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - - float spacing = be_control_look->DefaultItemSpacing(); - AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing)); + titleView->SetFont(be_bold_font); char version[256]; sprintf(version, B_TRANSLATE("Version %d.%d.%d, %s"), @@ -41,43 +34,37 @@ ConfigView::ConfigView() int(B_TRANSLATION_MINOR_VERSION(ICO_TRANSLATOR_VERSION)), int(B_TRANSLATION_REVISION_VERSION(ICO_TRANSLATOR_VERSION)), __DATE__); - stringView = new BStringView("version", version); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - stringView = new BStringView("copyright", + BStringView* versionView = new BStringView("version", version); + + BStringView *copyrightView = new BStringView("copyright", B_UTF8_COPYRIGHT "2005-2006 Haiku Inc."); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing)); - - BCheckBox *checkBox = new BCheckBox("color", + BCheckBox *colorCheckBox = new BCheckBox("color", B_TRANSLATE("Write 32 bit images on true color input"), NULL); - checkBox->SetExplicitAlignment(leftAlignment); - AddChild(checkBox); - checkBox = new BCheckBox("size", B_TRANSLATE("Enforce valid icon sizes"), - NULL); - checkBox->SetValue(1); - checkBox->SetExplicitAlignment(leftAlignment); - AddChild(checkBox); + BCheckBox *sizeCheckBox = new BCheckBox("size", + B_TRANSLATE("Enforce valid icon sizes"), NULL); + sizeCheckBox->SetValue(1); - AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing)); - - stringView = new BStringView("valid1", + BStringView* infoView = new BStringView("valid1", B_TRANSLATE("Valid icon sizes are 16, 32, or 48")); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - stringView = new BStringView("valid2", + BStringView* info2View = new BStringView("valid2", B_TRANSLATE("pixels in either direction.")); - stringView->SetExplicitAlignment(leftAlignment); - AddChild(stringView); - AddChild(BSpaceLayoutItem::CreateGlue()); - GroupLayout()->SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING, - B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING); + BLayoutBuilder::Group<>(this, B_VERTICAL, 0) + .SetInsets(B_USE_DEFAULT_SPACING) + .Add(titleView) + .AddStrut(B_USE_SMALL_SPACING) + .Add(versionView) + .Add(copyrightView) + .AddGlue() + .Add(colorCheckBox) + .Add(sizeCheckBox) + .Add(infoView) + .Add(info2View) + .AddGlue(); SetExplicitPreferredSize(GroupLayout()->MinSize()); } diff --git a/src/add-ons/translators/webp/ConfigView.cpp b/src/add-ons/translators/webp/ConfigView.cpp index a638801fdf..f3328d10e7 100644 --- a/src/add-ons/translators/webp/ConfigView.cpp +++ b/src/add-ons/translators/webp/ConfigView.cpp @@ -134,7 +134,7 @@ ConfigView::ConfigView(TranslatorSettings* settings) BFont font; GetFont(&font); - SetExplicitPreferredSize(BSize((font.Size() * 433)/12, (font.Size() * 200)/12)); + SetExplicitPreferredSize(BSize((font.Size() * 250)/12, (font.Size() * 350)/12)); }