hrev49095 adds 1 changeset to branch 'master'
old head: 2d00a953c7d3bd29d114df4858195371101f366b
new head: b5118c36ccba519c87bdee48d3d60aea1429ea0d
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=b5118c36ccba+%5E2d00a953c7d3
----------------------------------------------------------------------------
b5118c36ccba: DataTranslations: use layout, standard format.
* Fix icns, ico.
* Small fix.
* Partialy fixes #11999.
[ Janus <janus2@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev49095
Commit: b5118c36ccba519c87bdee48d3d60aea1429ea0d
URL: http://cgit.haiku-os.org/haiku/commit/?id=b5118c36ccba
Author: Janus <janus2@xxxxxxxxx>
Date: Thu Apr 23 10:21:26 2015 UTC
Ticket: https://dev.haiku-os.org/ticket/11999
----------------------------------------------------------------------------
3 files changed, 53 insertions(+), 89 deletions(-)
src/add-ons/translators/icns/ConfigView.cpp | 79 +++++++++----------------
src/add-ons/translators/ico/ConfigView.cpp | 61 ++++++++-----------
src/add-ons/translators/webp/ConfigView.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/add-ons/translators/icns/ConfigView.cpp
b/src/add-ons/translators/icns/ConfigView.cpp
index ccafe4f..0bf06a5 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 <Catalog.h>
+#include <LayoutBuilder.h>
#include <StringView.h>
-#include <SpaceLayoutItem.h>
#include <ControlLook.h>
#include <stdio.h>
@@ -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@xxxxxxxxx>.");
- 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 <mathew@xxxxxxxxxx>";
-
- 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));
-
- BFont font;
- font.SetSize(font.Size() * 0.9);
- fCopyrightView->SetFontAndColor(&font, B_FONT_SIZE, NULL);
- AddChild(fCopyrightView);
-
- fCopyrightView->SetExplicitAlignment(leftAlignment);
- AddChild(BSpaceLayoutItem::CreateGlue());
- GroupLayout()->SetInsets(B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING,
- B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING);
+ BStringView *copyright3View = new BStringView("copyright3",
+ "libicns v0.8.1\n");
+
+ BStringView *copyright4View = new BStringView("copyright4",
+ "2001-2012 Mathew Eis <mathew@xxxxxxxxxx>");
+
+ 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 cdd69c2..adc2bde 100644
--- a/src/add-ons/translators/ico/ConfigView.cpp
+++ b/src/add-ons/translators/ico/ConfigView.cpp
@@ -10,7 +10,7 @@
#include <Catalog.h>
#include <CheckBox.h>
#include <ControlLook.h>
-#include <SpaceLayoutItem.h>
+#include <LayoutBuilder.h>
#include <StringView.h>
#include <stdio.h>
@@ -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",
- B_UTF8_COPYRIGHT "2005-2006 Haiku Inc.");
- stringView->SetExplicitAlignment(leftAlignment);
- AddChild(stringView);
+ BStringView* versionView = new BStringView("version", version);
- AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing));
+ BStringView *copyrightView = new BStringView("copyright",
+ B_UTF8_COPYRIGHT "2005-2006 Haiku Inc.");
- 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);
- AddChild(BSpaceLayoutItem::CreateVerticalStrut(spacing));
+ BCheckBox *sizeCheckBox = new BCheckBox("size",
+ B_TRANSLATE("Enforce valid icon sizes"), NULL);
+ sizeCheckBox->SetValue(1);
- 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 a638801..f3328d1 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));
}
