Alpha edit boxes on the style editor were replaced with spin controls.
Originally committed to SVN as r1191.
This commit is contained in:
parent
7f1f1c956b
commit
e1592d0628
4 changed files with 29 additions and 50 deletions
|
@ -49,7 +49,9 @@ Please visit http://aegisub.net to download latest version
|
||||||
o Prevent creating multiple styles with the same names. (AMZ)
|
o Prevent creating multiple styles with the same names. (AMZ)
|
||||||
o New, more horizontal, layout (AMZ)
|
o New, more horizontal, layout (AMZ)
|
||||||
o Realtime preview box (AMZ)
|
o Realtime preview box (AMZ)
|
||||||
o Hitting enter on style editor will now "OK" it. (AMZ)
|
o Editable drop-down (combo box) to select fonts, instead of the OS's standard font chooser. This allows easy realtime preview of fonts. (AMZ)
|
||||||
|
o Alpha boxes now use spin controls. (AMZ)
|
||||||
|
o Hitting enter will now "OK" it. (AMZ)
|
||||||
- Changes to subtitle reading/writing:
|
- Changes to subtitle reading/writing:
|
||||||
o Support reading SSA/ASS files with intermixed V4 and V4+ Styles sections. (jfs)
|
o Support reading SSA/ASS files with intermixed V4 and V4+ Styles sections. (jfs)
|
||||||
o Fixed loading of sections with unexpected casing. (AMZ)
|
o Fixed loading of sections with unexpected casing. (AMZ)
|
||||||
|
@ -122,7 +124,6 @@ Please visit http://aegisub.net to download latest version
|
||||||
- Added a "Scale Border and Shadow" check box to script properties dialog. (AMZ)
|
- Added a "Scale Border and Shadow" check box to script properties dialog. (AMZ)
|
||||||
- Fixed drawing of inactive lines in audio display to prevent it from being drawn over selection. (AMZ)
|
- Fixed drawing of inactive lines in audio display to prevent it from being drawn over selection. (AMZ)
|
||||||
- Commiting text now commits times as well. (AMZ)
|
- Commiting text now commits times as well. (AMZ)
|
||||||
- Changed the Style Editor to have an editable drop-down (combo box) to select fonts, instead of the OS's standard font chooser. This allows easy realtime preview of fonts. (AMZ)
|
|
||||||
|
|
||||||
|
|
||||||
= 1.10 beta - 2006.08.07 ===========================
|
= 1.10 beta - 2006.08.07 ===========================
|
||||||
|
|
|
@ -101,10 +101,6 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
|
||||||
|
|
||||||
// Prepare control values
|
// Prepare control values
|
||||||
FontSizeValue = FloatToString(style->fontsize);
|
FontSizeValue = FloatToString(style->fontsize);
|
||||||
ColorAlpha1Value = wxString::Format(_T("%i"),style->primary.a);
|
|
||||||
ColorAlpha2Value = wxString::Format(_T("%i"),style->secondary.a);
|
|
||||||
ColorAlpha3Value = wxString::Format(_T("%i"),style->outline.a);
|
|
||||||
ColorAlpha4Value = wxString::Format(_T("%i"),style->shadow.a);
|
|
||||||
MarginLValue = style->GetMarginString(0);
|
MarginLValue = style->GetMarginString(0);
|
||||||
MarginRValue = style->GetMarginString(1);
|
MarginRValue = style->GetMarginString(1);
|
||||||
MarginVValue = style->GetMarginString(2);
|
MarginVValue = style->GetMarginString(2);
|
||||||
|
@ -136,10 +132,10 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
|
||||||
colorButton[1] = new ColourButton(this,BUTTON_COLOR_2,wxSize(45,16),style->secondary.GetWXColor());
|
colorButton[1] = new ColourButton(this,BUTTON_COLOR_2,wxSize(45,16),style->secondary.GetWXColor());
|
||||||
colorButton[2] = new ColourButton(this,BUTTON_COLOR_3,wxSize(45,16),style->outline.GetWXColor());
|
colorButton[2] = new ColourButton(this,BUTTON_COLOR_3,wxSize(45,16),style->outline.GetWXColor());
|
||||||
colorButton[3] = new ColourButton(this,BUTTON_COLOR_4,wxSize(45,16),style->shadow.GetWXColor());
|
colorButton[3] = new ColourButton(this,BUTTON_COLOR_4,wxSize(45,16),style->shadow.GetWXColor());
|
||||||
ColorAlpha1 = new wxTextCtrl(this,TEXT_ALPHA_1,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&ColorAlpha1Value));
|
colorAlpha[0] = new wxSpinCtrl(this,TEXT_ALPHA_1,_T(""),wxDefaultPosition,wxSize(50,20),wxSP_ARROW_KEYS,0,255,style->primary.a);
|
||||||
ColorAlpha2 = new wxTextCtrl(this,TEXT_ALPHA_2,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&ColorAlpha2Value));
|
colorAlpha[1] = new wxSpinCtrl(this,TEXT_ALPHA_2,_T(""),wxDefaultPosition,wxSize(50,20),wxSP_ARROW_KEYS,0,255,style->secondary.a);
|
||||||
ColorAlpha3 = new wxTextCtrl(this,TEXT_ALPHA_3,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&ColorAlpha3Value));
|
colorAlpha[2] = new wxSpinCtrl(this,TEXT_ALPHA_3,_T(""),wxDefaultPosition,wxSize(50,20),wxSP_ARROW_KEYS,0,255,style->outline.a);
|
||||||
ColorAlpha4 = new wxTextCtrl(this,TEXT_ALPHA_4,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&ColorAlpha4Value));
|
colorAlpha[3] = new wxSpinCtrl(this,TEXT_ALPHA_4,_T(""),wxDefaultPosition,wxSize(50,20),wxSP_ARROW_KEYS,0,255,style->shadow.a);
|
||||||
MarginL = new wxTextCtrl(this,TEXT_MARGIN_L,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&MarginLValue));
|
MarginL = new wxTextCtrl(this,TEXT_MARGIN_L,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&MarginLValue));
|
||||||
MarginR = new wxTextCtrl(this,TEXT_MARGIN_R,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&MarginRValue));
|
MarginR = new wxTextCtrl(this,TEXT_MARGIN_R,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&MarginRValue));
|
||||||
MarginV = new wxTextCtrl(this,TEXT_MARGIN_V,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&MarginVValue));
|
MarginV = new wxTextCtrl(this,TEXT_MARGIN_V,_T(""),wxDefaultPosition,wxSize(40,20),0,NumValidator(&MarginVValue));
|
||||||
|
@ -165,10 +161,7 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
|
||||||
colorButton[1]->SetToolTip(_("Click to choose secondary color"));
|
colorButton[1]->SetToolTip(_("Click to choose secondary color"));
|
||||||
colorButton[2]->SetToolTip(_("Click to choose outline color"));
|
colorButton[2]->SetToolTip(_("Click to choose outline color"));
|
||||||
colorButton[3]->SetToolTip(_("Click to choose shadow color"));
|
colorButton[3]->SetToolTip(_("Click to choose shadow color"));
|
||||||
ColorAlpha1->SetToolTip(_("Set opacity, from 0 (opaque) to 255 (transparent)"));
|
for (int i=0;i<4;i++) colorAlpha[i]->SetToolTip(_("Set opacity, from 0 (opaque) to 255 (transparent)"));
|
||||||
ColorAlpha2->SetToolTip(_("Set opacity, from 0 (opaque) to 255 (transparent)"));
|
|
||||||
ColorAlpha3->SetToolTip(_("Set opacity, from 0 (opaque) to 255 (transparent)"));
|
|
||||||
ColorAlpha4->SetToolTip(_("Set opacity, from 0 (opaque) to 255 (transparent)"));
|
|
||||||
MarginL->SetToolTip(_("Distance from left edge, in pixels"));
|
MarginL->SetToolTip(_("Distance from left edge, in pixels"));
|
||||||
MarginR->SetToolTip(_("Distance from right edge, in pixels"));
|
MarginR->SetToolTip(_("Distance from right edge, in pixels"));
|
||||||
MarginV->SetToolTip(_("Distance from top/bottom edge, in pixels"));
|
MarginV->SetToolTip(_("Distance from top/bottom edge, in pixels"));
|
||||||
|
@ -228,28 +221,17 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
|
||||||
|
|
||||||
// Colors sizer
|
// Colors sizer
|
||||||
wxSizer *ColorsSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Colors"));
|
wxSizer *ColorsSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Colors"));
|
||||||
wxSizer *ColorSizer1 = new wxBoxSizer(wxVERTICAL);
|
wxSizer *ColorSizer[4];
|
||||||
wxSizer *ColorSizer2 = new wxBoxSizer(wxVERTICAL);
|
wxString colorLabels[] = { _("Primary"), _("Secondary"), _("Outline"), _("Shadow") };
|
||||||
wxSizer *ColorSizer3 = new wxBoxSizer(wxVERTICAL);
|
|
||||||
wxSizer *ColorSizer4 = new wxBoxSizer(wxVERTICAL);
|
|
||||||
ColorsSizer->AddStretchSpacer(1);
|
ColorsSizer->AddStretchSpacer(1);
|
||||||
ColorsSizer->Add(ColorSizer1,0,0,0);
|
for (int i=0;i<4;i++) {
|
||||||
ColorsSizer->Add(ColorSizer2,0,wxLEFT,5);
|
ColorSizer[i] = new wxBoxSizer(wxVERTICAL);
|
||||||
ColorsSizer->Add(ColorSizer3,0,wxLEFT,5);
|
ColorSizer[i]->Add(new wxStaticText(this,-1,colorLabels[i]),0,wxBOTTOM | wxALIGN_CENTER,5);
|
||||||
ColorsSizer->Add(ColorSizer4,0,wxLEFT,5);
|
ColorSizer[i]->Add(colorButton[i],0,wxBOTTOM | wxALIGN_CENTER,5);
|
||||||
|
ColorSizer[i]->Add(colorAlpha[i],0,wxALIGN_CENTER,0);
|
||||||
|
ColorsSizer->Add(ColorSizer[i],0,wxLEFT,i?5:0);
|
||||||
|
}
|
||||||
ColorsSizer->AddStretchSpacer(1);
|
ColorsSizer->AddStretchSpacer(1);
|
||||||
ColorSizer1->Add(new wxStaticText(this,-1,_("Primary")),0,wxBOTTOM | wxALIGN_CENTER,5);
|
|
||||||
ColorSizer2->Add(new wxStaticText(this,-1,_("Secondary")),0,wxBOTTOM | wxALIGN_CENTER,5);
|
|
||||||
ColorSizer3->Add(new wxStaticText(this,-1,_("Outline")),0,wxBOTTOM | wxALIGN_CENTER,5);
|
|
||||||
ColorSizer4->Add(new wxStaticText(this,-1,_("Shadow")),0,wxBOTTOM | wxALIGN_CENTER,5);
|
|
||||||
ColorSizer1->Add(colorButton[0],0,wxBOTTOM | wxALIGN_CENTER,5);
|
|
||||||
ColorSizer2->Add(colorButton[1],0,wxBOTTOM | wxALIGN_CENTER,5);
|
|
||||||
ColorSizer3->Add(colorButton[2],0,wxBOTTOM | wxALIGN_CENTER,5);
|
|
||||||
ColorSizer4->Add(colorButton[3],0,wxBOTTOM | wxALIGN_CENTER,5);
|
|
||||||
ColorSizer1->Add(ColorAlpha1,0,wxALIGN_CENTER,0);
|
|
||||||
ColorSizer2->Add(ColorAlpha2,0,wxALIGN_CENTER,0);
|
|
||||||
ColorSizer3->Add(ColorAlpha3,0,wxALIGN_CENTER,0);
|
|
||||||
ColorSizer4->Add(ColorAlpha4,0,wxALIGN_CENTER,0);
|
|
||||||
|
|
||||||
// Margins
|
// Margins
|
||||||
wxSizer *MarginSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Margins"));
|
wxSizer *MarginSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Margins"));
|
||||||
|
@ -391,6 +373,10 @@ BEGIN_EVENT_TABLE(DialogStyleEditor, wxDialog)
|
||||||
EVT_COMBOBOX(COMBO_ENCODING, DialogStyleEditor::OnCommandPreviewUpdate)
|
EVT_COMBOBOX(COMBO_ENCODING, DialogStyleEditor::OnCommandPreviewUpdate)
|
||||||
EVT_COMBOBOX(TEXT_FONT_NAME, DialogStyleEditor::OnCommandPreviewUpdate)
|
EVT_COMBOBOX(TEXT_FONT_NAME, DialogStyleEditor::OnCommandPreviewUpdate)
|
||||||
EVT_TEXT_ENTER(TEXT_FONT_NAME, DialogStyleEditor::OnCommandPreviewUpdate)
|
EVT_TEXT_ENTER(TEXT_FONT_NAME, DialogStyleEditor::OnCommandPreviewUpdate)
|
||||||
|
EVT_SPINCTRL(TEXT_ALPHA_1, DialogStyleEditor::OnSpinPreviewUpdate)
|
||||||
|
EVT_SPINCTRL(TEXT_ALPHA_2, DialogStyleEditor::OnSpinPreviewUpdate)
|
||||||
|
EVT_SPINCTRL(TEXT_ALPHA_3, DialogStyleEditor::OnSpinPreviewUpdate)
|
||||||
|
EVT_SPINCTRL(TEXT_ALPHA_4, DialogStyleEditor::OnSpinPreviewUpdate)
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
|
|
||||||
|
@ -540,14 +526,10 @@ void DialogStyleEditor::UpdateWorkStyle() {
|
||||||
work->SetMarginString(MarginV->GetValue(),3);
|
work->SetMarginString(MarginV->GetValue(),3);
|
||||||
|
|
||||||
// Color alphas
|
// Color alphas
|
||||||
ColorAlpha1->GetValue().ToLong(&templ);
|
work->primary.a = colorAlpha[0]->GetValue();
|
||||||
work->primary.a = templ;
|
work->secondary.a = colorAlpha[1]->GetValue();
|
||||||
ColorAlpha2->GetValue().ToLong(&templ);
|
work->outline.a = colorAlpha[2]->GetValue();
|
||||||
work->secondary.a = templ;
|
work->shadow.a = colorAlpha[3]->GetValue();
|
||||||
ColorAlpha3->GetValue().ToLong(&templ);
|
|
||||||
work->outline.a = templ;
|
|
||||||
ColorAlpha4->GetValue().ToLong(&templ);
|
|
||||||
work->shadow.a = templ;
|
|
||||||
|
|
||||||
// Bold/italic/underline/strikeout
|
// Bold/italic/underline/strikeout
|
||||||
work->bold = BoxBold->IsChecked();
|
work->bold = BoxBold->IsChecked();
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
////////////
|
////////////
|
||||||
// Includes
|
// Includes
|
||||||
#include <wx/wxprec.h>
|
#include <wx/wxprec.h>
|
||||||
|
#include <wx/spinctrl.h>
|
||||||
#include "colour_button.h"
|
#include "colour_button.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,10 +61,6 @@ private:
|
||||||
SubtitlesGrid *grid;
|
SubtitlesGrid *grid;
|
||||||
|
|
||||||
wxString FontSizeValue;
|
wxString FontSizeValue;
|
||||||
wxString ColorAlpha1Value;
|
|
||||||
wxString ColorAlpha2Value;
|
|
||||||
wxString ColorAlpha3Value;
|
|
||||||
wxString ColorAlpha4Value;
|
|
||||||
wxString MarginLValue;
|
wxString MarginLValue;
|
||||||
wxString MarginRValue;
|
wxString MarginRValue;
|
||||||
wxString MarginVValue;
|
wxString MarginVValue;
|
||||||
|
@ -84,10 +81,7 @@ private:
|
||||||
wxCheckBox *BoxUnderline;
|
wxCheckBox *BoxUnderline;
|
||||||
wxCheckBox *BoxStrikeout;
|
wxCheckBox *BoxStrikeout;
|
||||||
ColourButton *colorButton[4];
|
ColourButton *colorButton[4];
|
||||||
wxTextCtrl *ColorAlpha1;
|
wxSpinCtrl *colorAlpha[4];
|
||||||
wxTextCtrl *ColorAlpha2;
|
|
||||||
wxTextCtrl *ColorAlpha3;
|
|
||||||
wxTextCtrl *ColorAlpha4;
|
|
||||||
wxTextCtrl *MarginL;
|
wxTextCtrl *MarginL;
|
||||||
wxTextCtrl *MarginR;
|
wxTextCtrl *MarginR;
|
||||||
wxTextCtrl *MarginV;
|
wxTextCtrl *MarginV;
|
||||||
|
@ -120,6 +114,7 @@ private:
|
||||||
void OnSetColor4 (wxCommandEvent &event);
|
void OnSetColor4 (wxCommandEvent &event);
|
||||||
void OnChildFocus (wxChildFocusEvent &event);
|
void OnChildFocus (wxChildFocusEvent &event);
|
||||||
void OnCommandPreviewUpdate (wxCommandEvent &event);
|
void OnCommandPreviewUpdate (wxCommandEvent &event);
|
||||||
|
void OnSpinPreviewUpdate (wxSpinEvent &event) { OnCommandPreviewUpdate(event); }
|
||||||
void OnPreviewTextChange (wxCommandEvent &event);
|
void OnPreviewTextChange (wxCommandEvent &event);
|
||||||
void OnPreviewColourChange (wxCommandEvent &event);
|
void OnPreviewColourChange (wxCommandEvent &event);
|
||||||
|
|
||||||
|
|
|
@ -66,6 +66,7 @@ public:
|
||||||
void SetStyle(AssStyle *style);
|
void SetStyle(AssStyle *style);
|
||||||
void SetText(wxString text);
|
void SetText(wxString text);
|
||||||
void SetColour(wxColour col);
|
void SetColour(wxColour col);
|
||||||
|
void Update() { UpdateBitmap(); }
|
||||||
|
|
||||||
SubtitlesPreview(wxWindow *parent,int id,wxPoint pos,wxSize size,int style,wxColour colour);
|
SubtitlesPreview(wxWindow *parent,int id,wxPoint pos,wxSize size,int style,wxColour colour);
|
||||||
~SubtitlesPreview();
|
~SubtitlesPreview();
|
||||||
|
|
Loading…
Reference in a new issue