mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Tweaks to style editor.

Browse source 
Originally committed to SVN as r1080.
This commit is contained in:
Rodrigo Braz Monteiro 2007-04-16 15:08:09 +00:00
parent 50f63ba3fe
commit 3726c82f21
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
aegisub/dialog_style_editor.cpp
View file

@ -228,7 +228,7 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
// Misc // Misc
wxSizer *MiscBox = new wxStaticBoxSizer(wxVERTICAL,this,_("Miscelaneous")); wxSizer *MiscBox = new wxStaticBoxSizer(wxVERTICAL,this,_("Miscelaneous"));
wxSizer *MiscBoxTop = new wxFlexGridSizer(2,4,5,5); wxFlexGridSizer *MiscBoxTop = new wxFlexGridSizer(2,4,5,5);
wxSizer *MiscBoxBottom = new wxBoxSizer(wxHORIZONTAL); wxSizer *MiscBoxBottom = new wxBoxSizer(wxHORIZONTAL);
ScaleXValue = FloatToString(style->scalex); ScaleXValue = FloatToString(style->scalex);
ScaleYValue = FloatToString(style->scaley); ScaleYValue = FloatToString(style->scaley);
@ -245,21 +245,20 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
Angle->SetToolTip(_("Angle to rotate in Z axis, in degrees")); Angle->SetToolTip(_("Angle to rotate in Z axis, in degrees"));
Encoding->SetToolTip(_("Encoding, only useful in unicode if the font doesn't have the proper unicode mapping.")); Encoding->SetToolTip(_("Encoding, only useful in unicode if the font doesn't have the proper unicode mapping."));
Spacing->SetToolTip(_("Character spacing, in pixels")); Spacing->SetToolTip(_("Character spacing, in pixels"));
SubsPreview = new SubtitlesPreview(this,-1,wxDefaultPosition,wxSize(100,60),wxSUNKEN_BORDER);
SubsPreview->SetStyle(style);
MiscBoxTop->Add(new wxStaticText(this,-1,_("Scale X%:")),1,wxALIGN_CENTER,0); MiscBoxTop->Add(new wxStaticText(this,-1,_("Scale X%:")),1,wxALIGN_CENTER,0);
MiscBoxTop->Add(ScaleX,0,wxLEFT | wxALIGN_CENTER | wxEXPAND,5); MiscBoxTop->Add(ScaleX,0,wxLEFT | wxALIGN_CENTER | wxEXPAND,5);
MiscBoxTop->Add(new wxStaticText(this,-1,_("Scale Y%:")),1,wxLEFT | wxALIGN_CENTER,5); MiscBoxTop->Add(new wxStaticText(this,-1,_("Scale Y%:")),1,wxLEFT | wxALIGN_CENTER,5);
MiscBoxTop->Add(ScaleY,0,wxLEFT | wxALIGN_CENTER | wxEXPAND,5); MiscBoxTop->Add(ScaleY,0,wxLEFT | wxALIGN_CENTER | wxEXPAND,5);
MiscBoxTop->Add(new wxStaticText(this,-1,_("Angle:")),1,wxALIGN_CENTER,0); MiscBoxTop->Add(new wxStaticText(this,-1,_("Rotation:")),1,wxALIGN_CENTER,0);
MiscBoxTop->Add(Angle,0,wxLEFT | wxALIGN_CENTER | wxEXPAND,5); MiscBoxTop->Add(Angle,0,wxLEFT | wxALIGN_CENTER | wxEXPAND,5);
MiscBoxTop->Add(new wxStaticText(this,-1,_("Spacing:")),1,wxLEFT | wxALIGN_CENTER,5); MiscBoxTop->Add(new wxStaticText(this,-1,_("Spacing:")),1,wxLEFT | wxALIGN_CENTER,5);
MiscBoxTop->Add(Spacing,0,wxLEFT | wxALIGN_CENTER | wxEXPAND,5); MiscBoxTop->Add(Spacing,0,wxLEFT | wxALIGN_CENTER | wxEXPAND,5);
MiscBoxTop->AddGrowableCol(1,1);
MiscBoxTop->AddGrowableCol(3,1);
MiscBoxBottom->Add(new wxStaticText(this,-1,_("Encoding:")),0,wxLEFT | wxALIGN_CENTER,5); MiscBoxBottom->Add(new wxStaticText(this,-1,_("Encoding:")),0,wxLEFT | wxALIGN_CENTER,5);
MiscBoxBottom->Add(Encoding,1,wxLEFT | wxALIGN_CENTER,5); MiscBoxBottom->Add(Encoding,1,wxLEFT | wxALIGN_CENTER,5);
MiscBox->Add(MiscBoxTop,0,wxEXPAND | wxALIGN_CENTER,0); MiscBox->Add(MiscBoxTop,0,wxEXPAND | wxALIGN_CENTER,0);
MiscBox->Add(MiscBoxBottom,0,wxEXPAND | wxTOP | wxALIGN_CENTER,5); MiscBox->Add(MiscBoxBottom,1,wxEXPAND | wxTOP | wxALIGN_CENTER,5);
MiscBox->Add(SubsPreview,1,wxEXPAND | wxTOP,5);
// Set encoding value // Set encoding value
int encLen = EncodingValue.Length(); int encLen = EncodingValue.Length();
@ -273,6 +272,14 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
} }
if (!found) Encoding->Select(0); if (!found) Encoding->Select(0);
// Preview
SubsPreview = new SubtitlesPreview(this,-1,wxDefaultPosition,wxSize(100,60),wxSUNKEN_BORDER);
SubsPreview->SetStyle(style);
PreviewText = new wxTextCtrl(this,-1,_T("preview text (TODO)"));
wxSizer *PreviewBox = new wxStaticBoxSizer(wxVERTICAL,this,_("Preview"));
PreviewBox->Add(SubsPreview,1,wxEXPAND | wxBOTTOM,5);
PreviewBox->Add(PreviewText,0,wxEXPAND | wxBOTTOM,0);
// Buttons // Buttons
wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL);
ButtonSizer->AddStretchSpacer(1); ButtonSizer->AddStretchSpacer(1);
@ -293,12 +300,13 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
LeftSizer->Add(NameSizer,0,wxBOTTOM | wxEXPAND,5); LeftSizer->Add(NameSizer,0,wxBOTTOM | wxEXPAND,5);
LeftSizer->Add(FontSizer,0,wxBOTTOM | wxEXPAND,5); LeftSizer->Add(FontSizer,0,wxBOTTOM | wxEXPAND,5);
LeftSizer->Add(ColorsSizer,0,wxBOTTOM | wxEXPAND,5); LeftSizer->Add(ColorsSizer,0,wxBOTTOM | wxEXPAND,5);
LeftSizer->Add(OutlineBox,0,wxEXPAND,0); LeftSizer->Add(MarginAlign,0,wxBOTTOM | wxEXPAND,0);
// Right side sizer // Right side sizer
wxSizer *RightSizer = new wxBoxSizer(wxVERTICAL); wxSizer *RightSizer = new wxBoxSizer(wxVERTICAL);
RightSizer->Add(MarginAlign,0,wxBOTTOM | wxEXPAND,5); RightSizer->Add(OutlineBox,0,wxEXPAND | wxBOTTOM,5);
RightSizer->Add(MiscBox,1,wxEXPAND,0); RightSizer->Add(MiscBox,0,wxEXPAND | wxBOTTOM,5);
RightSizer->Add(PreviewBox,1,wxEXPAND,0);
// Controls Sizer // Controls Sizer
wxSizer *ControlSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *ControlSizer = new wxBoxSizer(wxHORIZONTAL);

1
aegisub/dialog_style_editor.h
View file

@ -100,6 +100,7 @@ private:
wxTextCtrl *Angle; wxTextCtrl *Angle;
wxComboBox *Encoding; wxComboBox *Encoding;
wxTextCtrl *Spacing; wxTextCtrl *Spacing;
wxTextCtrl *PreviewText;
SubtitlesPreview *SubsPreview; SubtitlesPreview *SubsPreview;
wxSizer *MainSizer; wxSizer *MainSizer;

1
aegisub/subs_preview.cpp
View file

@ -139,6 +139,7 @@ void SubtitlesPreview::UpdateBitmap(int w,int h) {
// Convert frame to bitmap // Convert frame to bitmap
wxMemoryDC dc(*bmp); wxMemoryDC dc(*bmp);
wxBitmap tempBmp(frame.GetImage()); wxBitmap tempBmp(frame.GetImage());
frame.Clear();
dc.DrawBitmap(tempBmp,0,0); dc.DrawBitmap(tempBmp,0,0);
Refresh(); Refresh();
} }