DataTranslations: use layout, standard format.
* Small layout fix. * Fixes #11999.
This commit is contained in:
@@ -174,9 +174,6 @@ GIFView::GIFView(TranslatorSettings* settings)
|
|||||||
.AddGlue()
|
.AddGlue()
|
||||||
.End();
|
.End();
|
||||||
|
|
||||||
BFont font;
|
|
||||||
GetFont(&font);
|
|
||||||
|
|
||||||
fSettings->Acquire();
|
fSettings->Acquire();
|
||||||
|
|
||||||
RestorePrefs();
|
RestorePrefs();
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ ConfigView::ConfigView()
|
|||||||
BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
|
BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
|
||||||
.SetInsets(B_USE_DEFAULT_SPACING)
|
.SetInsets(B_USE_DEFAULT_SPACING)
|
||||||
.Add(titleView)
|
.Add(titleView)
|
||||||
.AddStrut(B_USE_SMALL_SPACING)
|
|
||||||
.Add(versionView)
|
.Add(versionView)
|
||||||
.Add(copyrightView)
|
.Add(copyrightView)
|
||||||
.AddGlue()
|
.AddGlue()
|
||||||
|
|||||||
@@ -63,15 +63,12 @@ PNGView::PNGView(const BRect &frame, const char *name, uint32 resizeMode,
|
|||||||
item->SetMarked(true);
|
item->SetMarked(true);
|
||||||
fInterlaceMenu->AddItem(item);
|
fInterlaceMenu->AddItem(item);
|
||||||
|
|
||||||
|
|
||||||
BMenuField* menuField = new BMenuField(
|
BMenuField* menuField = new BMenuField(
|
||||||
B_TRANSLATE("PNG Interlace Menu"),
|
B_TRANSLATE("PNG Interlace Menu"),
|
||||||
B_TRANSLATE("Interlacing type:"), fInterlaceMenu);
|
B_TRANSLATE("Interlacing type:"), fInterlaceMenu);
|
||||||
menuField->SetDivider(menuField->StringWidth(menuField->Label()) + 7.0f);
|
menuField->SetDivider(menuField->StringWidth(menuField->Label()) + 7.0f);
|
||||||
menuField->ResizeToPreferred();
|
menuField->ResizeToPreferred();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
fCopyrightView = new BTextView("PNG copyright");
|
fCopyrightView = new BTextView("PNG copyright");
|
||||||
fCopyrightView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
fCopyrightView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
|
||||||
fCopyrightView->SetLowColor(fCopyrightView->ViewColor());
|
fCopyrightView->SetLowColor(fCopyrightView->ViewColor());
|
||||||
@@ -80,21 +77,20 @@ PNGView::PNGView(const BRect &frame, const char *name, uint32 resizeMode,
|
|||||||
fCopyrightView->MakeResizable(true);
|
fCopyrightView->MakeResizable(true);
|
||||||
fCopyrightView->SetText(png_get_copyright(NULL));
|
fCopyrightView->SetText(png_get_copyright(NULL));
|
||||||
|
|
||||||
BFont font;
|
|
||||||
//font.SetSize(font.Size() * 0.8);
|
|
||||||
//fCopyrightView->SetFontAndColor(&font, B_FONT_SIZE, NULL);
|
|
||||||
|
|
||||||
|
|
||||||
BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
|
BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
|
||||||
.SetInsets(B_USE_DEFAULT_SPACING)
|
.SetInsets(B_USE_DEFAULT_SPACING)
|
||||||
.Add(titleView)
|
.Add(titleView)
|
||||||
.Add(versionView)
|
.Add(versionView)
|
||||||
.Add(copyrightView)
|
.Add(copyrightView)
|
||||||
.AddGlue()
|
.AddGlue()
|
||||||
.Add(menuField)
|
.AddGroup(B_HORIZONTAL)
|
||||||
|
.Add(menuField)
|
||||||
|
.AddGlue()
|
||||||
|
.End()
|
||||||
.AddGlue()
|
.AddGlue()
|
||||||
.Add(fCopyrightView);
|
.Add(fCopyrightView);
|
||||||
|
|
||||||
|
BFont font;
|
||||||
GetFont(&font);
|
GetFont(&font);
|
||||||
SetExplicitPreferredSize(BSize((font.Size() * 390) / 12,
|
SetExplicitPreferredSize(BSize((font.Size() * 390) / 12,
|
||||||
(font.Size() * 180) / 12));
|
(font.Size() * 180) / 12));
|
||||||
|
|||||||
@@ -507,7 +507,7 @@ public:
|
|||||||
"bits big-endian"), CSMessage(B_RGBA15_BIG)));
|
"bits big-endian"), CSMessage(B_RGBA15_BIG)));
|
||||||
fMenu->AddItem(new BMenuItem(B_TRANSLATE("RGB 5:6:5 16 bits "
|
fMenu->AddItem(new BMenuItem(B_TRANSLATE("RGB 5:6:5 16 bits "
|
||||||
"big-endian"), CSMessage(B_RGB16)));
|
"big-endian"), CSMessage(B_RGB16)));
|
||||||
fField = new BMenuField(B_TRANSLATE("Input Color Space"),
|
fField = new BMenuField(B_TRANSLATE("Input Color Space:"),
|
||||||
fMenu);
|
fMenu);
|
||||||
fField->SetViewColor(ViewColor());
|
fField->SetViewColor(ViewColor());
|
||||||
SelectColorSpace(g_settings.out_space);
|
SelectColorSpace(g_settings.out_space);
|
||||||
@@ -523,18 +523,19 @@ public:
|
|||||||
.Add(fTitle)
|
.Add(fTitle)
|
||||||
.Add(fDetail)
|
.Add(fDetail)
|
||||||
.AddGlue()
|
.AddGlue()
|
||||||
.AddGrid(10, 10)
|
.AddGroup(B_HORIZONTAL)
|
||||||
.Add(fField->CreateLabelLayoutItem(), 0, 0)
|
.Add(fField)
|
||||||
.Add(fField->CreateMenuBarLayoutItem(), 1, 0)
|
.AddGlue()
|
||||||
.Add(fAscii, 0, 1)
|
.End()
|
||||||
.End()
|
.Add(fAscii)
|
||||||
.AddGlue()
|
.AddGlue()
|
||||||
.Add(fBasedOn)
|
.Add(fBasedOn)
|
||||||
.Add(fCopyright);
|
.Add(fCopyright);
|
||||||
|
|
||||||
BFont font;
|
BFont font;
|
||||||
GetFont(&font);
|
GetFont(&font);
|
||||||
SetExplicitPreferredSize(BSize((font.Size() * 350)/12, (font.Size() * 200)/12));
|
SetExplicitPreferredSize(BSize((font.Size() * 350)/12,
|
||||||
|
(font.Size() * 200)/12));
|
||||||
}
|
}
|
||||||
~PPMView()
|
~PPMView()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ ConfigView::ConfigView(TranslatorSettings *settings)
|
|||||||
|
|
||||||
fCompressionField = new BMenuField("compression",
|
fCompressionField = new BMenuField("compression",
|
||||||
B_TRANSLATE("Compression: "), compressionPopupMenu);
|
B_TRANSLATE("Compression: "), compressionPopupMenu);
|
||||||
|
fCompressionField->SetAlignment(B_ALIGN_RIGHT);
|
||||||
|
|
||||||
BPopUpMenu* versionPopupMenu = new BPopUpMenu("popup_version");
|
BPopUpMenu* versionPopupMenu = new BPopUpMenu("popup_version");
|
||||||
|
|
||||||
@@ -52,6 +53,7 @@ ConfigView::ConfigView(TranslatorSettings *settings)
|
|||||||
|
|
||||||
fVersionField = new BMenuField("version",
|
fVersionField = new BMenuField("version",
|
||||||
B_TRANSLATE("Format: "), versionPopupMenu);
|
B_TRANSLATE("Format: "), versionPopupMenu);
|
||||||
|
fVersionField->SetAlignment(B_ALIGN_RIGHT);
|
||||||
|
|
||||||
BStringView *titleView = new BStringView("title",
|
BStringView *titleView = new BStringView("title",
|
||||||
B_TRANSLATE("Photoshop image translator"));
|
B_TRANSLATE("Photoshop image translator"));
|
||||||
@@ -78,6 +80,12 @@ ConfigView::ConfigView(TranslatorSettings *settings)
|
|||||||
.AddGlue()
|
.AddGlue()
|
||||||
.Add(fVersionField)
|
.Add(fVersionField)
|
||||||
.Add(fCompressionField)
|
.Add(fCompressionField)
|
||||||
|
.AddGrid(10.0f, 5.0f)
|
||||||
|
.Add(fVersionField->CreateLabelLayoutItem(), 0, 0)
|
||||||
|
.Add(fVersionField->CreateMenuBarLayoutItem(), 1, 0)
|
||||||
|
.Add(fCompressionField->CreateLabelLayoutItem(), 0, 1)
|
||||||
|
.Add(fCompressionField->CreateMenuBarLayoutItem(), 1, 1)
|
||||||
|
.End()
|
||||||
.AddGlue()
|
.AddGlue()
|
||||||
.Add(copyright2View);
|
.Add(copyright2View);
|
||||||
|
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ SGIView::SGIView(const char* name, uint32 flags, TranslatorSettings* settings)
|
|||||||
BTextView* infoView = new BTextView("info");
|
BTextView* infoView = new BTextView("info");
|
||||||
infoView->SetText(BString(B_TRANSLATE("written by:\n"))
|
infoView->SetText(BString(B_TRANSLATE("written by:\n"))
|
||||||
.Append(author)
|
.Append(author)
|
||||||
.Append(B_TRANSLATE("\n\nbased on GIMP SGI plugin v1.5:\n"))
|
.Append(B_TRANSLATE("\nbased on GIMP SGI plugin v1.5:\n"))
|
||||||
.Append(kSGICopyright).String());
|
.Append(kSGICopyright).String());
|
||||||
infoView->SetExplicitAlignment(labelAlignment);
|
infoView->SetExplicitAlignment(labelAlignment);
|
||||||
infoView->SetWordWrap(false);
|
infoView->SetWordWrap(false);
|
||||||
@@ -144,7 +144,7 @@ SGIView::SGIView(const char* name, uint32 flags, TranslatorSettings* settings)
|
|||||||
|
|
||||||
// TODO: remove this workaround for ticket #4217
|
// TODO: remove this workaround for ticket #4217
|
||||||
infoView->SetExplicitPreferredSize(
|
infoView->SetExplicitPreferredSize(
|
||||||
BSize(infoView->LineWidth(4), infoView->TextHeight(0, 80)));
|
BSize(infoView->LineWidth(3), infoView->TextHeight(0, 80)));
|
||||||
infoView->SetExplicitMaxSize(infoView->ExplicitPreferredSize());
|
infoView->SetExplicitMaxSize(infoView->ExplicitPreferredSize());
|
||||||
infoView->SetExplicitMinSize(infoView->ExplicitPreferredSize());
|
infoView->SetExplicitMinSize(infoView->ExplicitPreferredSize());
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user