From caf3ea9044ab66aebc86217be4f8f6af73ba8db6 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 28 Sep 2022 18:29:33 -0400 Subject: [PATCH] Remove unnecessary SetExplicitPreferredSize from translators using layouts. --- src/add-ons/translators/avif/ConfigView.cpp | 5 ----- src/add-ons/translators/exr/ConfigView.cpp | 7 +------ src/add-ons/translators/hvif/HVIFView.cpp | 7 +------ src/add-ons/translators/jpeg/JPEGTranslator.cpp | 7 +------ .../translators/jpeg2000/JPEG2000Translator.cpp | 13 ++++--------- src/add-ons/translators/ppm/PPMTranslator.cpp | 5 ----- src/add-ons/translators/sgi/SGIView.cpp | 13 ++++--------- src/add-ons/translators/webp/ConfigView.cpp | 7 +------ 8 files changed, 12 insertions(+), 52 deletions(-) diff --git a/src/add-ons/translators/avif/ConfigView.cpp b/src/add-ons/translators/avif/ConfigView.cpp index b04a80baa3..99249339cb 100644 --- a/src/add-ons/translators/avif/ConfigView.cpp +++ b/src/add-ons/translators/avif/ConfigView.cpp @@ -171,11 +171,6 @@ ConfigView::ConfigView(TranslatorSettings* settings) .AddGlue() .Add(copyright2View) .Add(copyright3View); - - BFont font; - GetFont(&font); - SetExplicitPreferredSize(BSize((font.Size() * 250) / 12, - (font.Size() * 350) / 12)); } diff --git a/src/add-ons/translators/exr/ConfigView.cpp b/src/add-ons/translators/exr/ConfigView.cpp index 50a5ad846a..4c238de661 100644 --- a/src/add-ons/translators/exr/ConfigView.cpp +++ b/src/add-ons/translators/exr/ConfigView.cpp @@ -64,13 +64,8 @@ ConfigView::ConfigView(uint32 flags) .Add(copyrightView2) .Add(copyrightView3) .Add(copyrightView4); - - BFont font; - GetFont(&font); - SetExplicitPreferredSize(BSize(font.Size() * 400 / 12, - font.Size() * 200 / 12)); } - + ConfigView::~ConfigView() { diff --git a/src/add-ons/translators/hvif/HVIFView.cpp b/src/add-ons/translators/hvif/HVIFView.cpp index 0eb3db6a73..22d779529f 100644 --- a/src/add-ons/translators/hvif/HVIFView.cpp +++ b/src/add-ons/translators/hvif/HVIFView.cpp @@ -35,7 +35,7 @@ HVIFView::HVIFView(const char* name, uint32 flags, TranslatorSettings *settings) title->SetExplicitAlignment(labelAlignment); char versionString[256]; - snprintf(versionString, sizeof(versionString), + snprintf(versionString, sizeof(versionString), B_TRANSLATE("Version %d.%d.%d, %s"), int(B_TRANSLATION_MAJOR_VERSION(HVIF_TRANSLATOR_VERSION)), int(B_TRANSLATION_MINOR_VERSION(HVIF_TRANSLATOR_VERSION)), @@ -70,11 +70,6 @@ HVIFView::HVIFView(const char* name, uint32 flags, TranslatorSettings *settings) .AddGlue() .Add(fRenderSize) .AddGlue(); - - BFont font; - GetFont(&font); - SetExplicitPreferredSize( - BSize((font.Size() * 270) / 12, (font.Size() * 100) / 12)); } diff --git a/src/add-ons/translators/jpeg/JPEGTranslator.cpp b/src/add-ons/translators/jpeg/JPEGTranslator.cpp index 3f0b21f2d3..ce61ee9e8d 100644 --- a/src/add-ons/translators/jpeg/JPEGTranslator.cpp +++ b/src/add-ons/translators/jpeg/JPEGTranslator.cpp @@ -707,11 +707,6 @@ TranslatorView::TranslatorView(const char* name, TranslatorSettings* settings) AddTab(new TranslatorAboutView(B_TRANSLATE("About"))); settings->Release(); - - BFont font; - GetFont(&font); - SetExplicitPreferredSize( - BSize((font.Size() * 380) / 12, (font.Size() * 250) / 12)); } @@ -1281,7 +1276,7 @@ JPEGTranslator::PopulateInfoFromFormat(translator_info* info, info->quality = formats[i].quality; info->capability = formats[i].capability; BString str1(formats[i].name); - str1.ReplaceFirst("Be Bitmap Format (JPEGTranslator)", + str1.ReplaceFirst("Be Bitmap Format (JPEGTranslator)", B_TRANSLATE("Be Bitmap Format (JPEGTranslator)")); strlcpy(info->name, str1.String(), sizeof(info->name)); strcpy(info->MIME, formats[i].MIME); diff --git a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp index a9911f4d12..eee8ebe6b2 100644 --- a/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp +++ b/src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp @@ -714,8 +714,8 @@ TranslatorAboutView::TranslatorAboutView(const char* name) char versionString[100]; snprintf(versionString, sizeof(versionString), - B_TRANSLATE("Version %d.%d.%d"), - static_cast(sTranslatorVersion >> 8), + B_TRANSLATE("Version %d.%d.%d"), + static_cast(sTranslatorVersion >> 8), static_cast((sTranslatorVersion >> 4) & 0xf), static_cast(sTranslatorVersion & 0xf)); @@ -746,18 +746,13 @@ TranslatorView::TranslatorView(const char* name, TranslatorSettings* settings) { SetBorder(B_NO_BORDER); - AddTab(new TranslatorWriteView(B_TRANSLATE("Write"), + AddTab(new TranslatorWriteView(B_TRANSLATE("Write"), settings->Acquire())); - AddTab(new TranslatorReadView(B_TRANSLATE("Read"), + AddTab(new TranslatorReadView(B_TRANSLATE("Read"), settings->Acquire())); AddTab(new TranslatorAboutView(B_TRANSLATE("About"))); settings->Release(); - - BFont font; - GetFont(&font); - SetExplicitPreferredSize( - BSize((font.Size() * 380) / 12, (font.Size() * 250) / 12)); } diff --git a/src/add-ons/translators/ppm/PPMTranslator.cpp b/src/add-ons/translators/ppm/PPMTranslator.cpp index 0c87831f75..b5f2d9bfaf 100644 --- a/src/add-ons/translators/ppm/PPMTranslator.cpp +++ b/src/add-ons/translators/ppm/PPMTranslator.cpp @@ -516,11 +516,6 @@ public: .AddGlue() .Add(fBasedOn) .Add(fCopyright); - - BFont font; - GetFont(&font); - SetExplicitPreferredSize( - BSize((font.Size() * 350) / 12, (font.Size() * 200) / 12)); } ~PPMView() { /* nothing here */ } diff --git a/src/add-ons/translators/sgi/SGIView.cpp b/src/add-ons/translators/sgi/SGIView.cpp index 7780864df8..d147b5e557 100644 --- a/src/add-ons/translators/sgi/SGIView.cpp +++ b/src/add-ons/translators/sgi/SGIView.cpp @@ -78,10 +78,10 @@ SGIView::SGIView(const char* name, uint32 flags, TranslatorSettings* settings) { BPopUpMenu* menu = new BPopUpMenu("pick compression"); - uint32 currentCompression = + uint32 currentCompression = fSettings->SetGetInt32(SGI_SETTING_COMPRESSION); // create the menu items with the various compression methods - add_menu_item(menu, SGI_COMP_NONE, B_TRANSLATE("None"), + add_menu_item(menu, SGI_COMP_NONE, B_TRANSLATE("None"), currentCompression); //menu->AddSeparatorItem(); add_menu_item(menu, SGI_COMP_RLE, B_TRANSLATE("RLE"), currentCompression); @@ -94,12 +94,12 @@ SGIView::SGIView(const char* name, uint32 flags, TranslatorSettings* settings) //add_menu_item(menu, SGI_COMP_ARLE, "Agressive RLE", currentCompression); - fCompressionMF = new BMenuField("compression", + fCompressionMF = new BMenuField("compression", B_TRANSLATE("Use compression:"), menu); BAlignment labelAlignment(B_ALIGN_LEFT, B_ALIGN_NO_VERTICAL); - BStringView* titleView = new BStringView("title", + BStringView* titleView = new BStringView("title", B_TRANSLATE("SGI image translator")); titleView->SetFont(be_bold_font); titleView->SetExplicitAlignment(labelAlignment); @@ -130,11 +130,6 @@ SGIView::SGIView(const char* name, uint32 flags, TranslatorSettings* settings) .End() .AddGlue() .Add(infoView); - - BFont font; - GetFont(&font); - SetExplicitPreferredSize(BSize((font.Size() * 390) / 12, - (font.Size() * 180) / 12)); } diff --git a/src/add-ons/translators/webp/ConfigView.cpp b/src/add-ons/translators/webp/ConfigView.cpp index 81ed12cc69..5dd0470c26 100644 --- a/src/add-ons/translators/webp/ConfigView.cpp +++ b/src/add-ons/translators/webp/ConfigView.cpp @@ -83,7 +83,7 @@ ConfigView::ConfigView(TranslatorSettings* settings) snprintf(libwebpVersion, sizeof(libwebpVersion), "%d.%d.%d", v >> 16, (v>>8)&255, v&255); libwebpInfo.ReplaceAll("%version%", libwebpVersion); - + BStringView *copyright2View = new BStringView("Copyright2", libwebpInfo.String()); BStringView *copyright3View = new BStringView("Copyright3", @@ -147,11 +147,6 @@ ConfigView::ConfigView(TranslatorSettings* settings) .AddGlue() .Add(copyright2View) .Add(copyright3View); - - BFont font; - GetFont(&font); - SetExplicitPreferredSize(BSize((font.Size() * 250) / 12, - (font.Size() * 350) / 12)); }