i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update layout building code in translators

Browse Source 
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 <[email protected]>
This commit is contained in:
Hannah Boneß
2012-05-04 03:13:51 +12:00
committed by Alex Wilson
parent 0673619349
commit 7d48219b47
14 changed files with 87 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/exr/ConfigView.cpp
+5 -10
View File
@@ -11,9 +11,7 @@
#include <Catalog.h>
#include <CheckBox.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <SpaceLayoutItem.h>
#include <LayoutBuilder.h>
#include <StringView.h>
#include <stdio.h>
@@ -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);
src/add-ons/translators/gif/GIFView.cpp
+10 -15
View File
@@ -20,10 +20,8 @@
#include <stdlib.h>
#include <Catalog.h>
#include <GridLayoutBuilder.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <InterfaceKit.h>
#include <LayoutBuilder.h>
#include <String.h>
#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);
src/add-ons/translators/gif/GIFWindow.cpp
+4 -3
View File
@@ -16,14 +16,15 @@
#include "GIFWindow.h"
#include "GIFView.h"
#include <Application.h>
#include <GroupLayout.h>
#include <LayoutBuilder.h>
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() {
src/add-ons/translators/hvif/HVIFView.cpp
+5 -6
View File
@@ -10,7 +10,7 @@
#include "HVIFTranslator.h"
#include <Catalog.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <String.h>
#include <StringView.h>
@@ -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(
src/add-ons/translators/jpeg/JPEGTranslator.cpp
+13 -17
View File
@@ -38,8 +38,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <Alignment.h>
#include <Catalog.h>
#include <GridLayoutBuilder.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <TabView.h>
#include <TextView.h>
@@ -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);
}
src/add-ons/translators/jpeg2000/JPEG2000Translator.cpp
+12 -15
View File
@@ -37,7 +37,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <syslog.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <TabView.h>
#include <TextView.h>
@@ -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);
}
src/add-ons/translators/ppm/PPMMain.cpp
+2 -2
View File
@@ -6,7 +6,7 @@
#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
#include <GroupLayout.h>
#include <LayoutBuilder.h>
#include <Screen.h>
#include <TranslatorAddOn.h>
#include <View.h>
@@ -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()
{
src/add-ons/translators/ppm/PPMTranslator.cpp
+8 -14
View File
@@ -13,9 +13,7 @@
#include <Catalog.h>
#include <CheckBox.h>
#include <FindDirectory.h>
#include <GridLayoutBuilder.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <Locker.h>
#include <MenuField.h>
#include <MenuItem.h>
@@ -23,7 +21,6 @@
#include <Path.h>
#include <PopUpMenu.h>
#include <Screen.h>
#include <SpaceLayoutItem.h>
#include <StringView.h>
#include <TranslatorAddOn.h>
#include <TranslationKit.h>
@@ -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);
src/add-ons/translators/raw/ConfigView.cpp
+4 -8
View File
@@ -10,8 +10,7 @@
#include <Catalog.h>
#include <CheckBox.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <StringView.h>
#include <stdio.h>
@@ -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);
src/add-ons/translators/raw/main.cpp
+3 -3
View File
@@ -16,7 +16,7 @@
#if SHOW_MODE && TEST_MODE
# include <Bitmap.h>
# include <BitmapStream.h>
# include <GroupLayout.h>
# include <LayoutBuilder.h>
# include <String.h>
# include <View.h>
# include <Window.h>
@@ -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();
src/add-ons/translators/sgi/SGIView.cpp
+5 -6
View File
@@ -34,7 +34,7 @@
#include <string.h>
#include <Catalog.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <MenuBar.h>
#include <MenuField.h>
#include <MenuItem.h>
@@ -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);
src/add-ons/translators/tga/TGAView.cpp
+4 -8
View File
@@ -30,8 +30,7 @@
/*****************************************************************************/
#include <Catalog.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <SpaceLayoutItem.h>
#include <stdio.h>
@@ -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);
src/add-ons/translators/tiff/TIFFView.cpp
+4 -10
View File
@@ -34,9 +34,7 @@
#include <string.h>
#include <Catalog.h>
#include <GridLayoutBuilder.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <MenuBar.h>
#include <MenuField.h>
#include <MenuItem.h>
@@ -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);
src/add-ons/translators/webp/ConfigView.cpp
+8 -13
View File
@@ -14,9 +14,7 @@
#include <Catalog.h>
#include <CheckBox.h>
#include <GridLayoutBuilder.h>
#include <GroupLayout.h>
#include <GroupLayoutBuilder.h>
#include <LayoutBuilder.h>
#include <MenuField.h>
#include <MenuItem.h>
#include <Message.h>
@@ -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);
}