Applied demi's patch to fix the display of frames on grid, and fixed the toggling of the "layer" column.

Originally committed to SVN as r1193.
This commit is contained in:
Rodrigo Braz Monteiro 2007-05-22 05:53:08 +00:00
parent a0b7583262
commit 3fe5fb09f2
4 changed files with 7 additions and 4 deletions

View file

@ -428,7 +428,7 @@ void BaseGrid::DrawImage(wxDC &dc) {
strings.Add(wxString::Format(_T("%i"),curDiag->Layer));
if (byFrame) {
strings.Add(wxString::Format(_T("%i"),VFR_Output.GetFrameAtTime(curDiag->Start.GetMS(),true)));
strings.Add(wxString::Format(_T("%i"),VFR_Output.GetFrameAtTime(curDiag->End.GetMS(),true)));
strings.Add(wxString::Format(_T("%i"),VFR_Output.GetFrameAtTime(curDiag->End.GetMS(),false)));
}
else {
strings.Add(curDiag->Start.GetASSFormated());

View file

@ -67,7 +67,7 @@ Please visit http://aegisub.net to download latest version
- Scrollbar in main subs grid didn't always allow scrolling through all the subs (jfs)
- Added a "Auto Save on Every Change" option to config.dat (default false), that automatically saves the files whenever you change anything. (AMZ)
- Fixed line selection after pasting. (AMZ)
- Times can now be copy and pasted with ctrl+c and Ctrl+V, as well as from context menu, in the time edit boxes. (AMZ)
- Times can now be copy and pasted with Ctrl+C and Ctrl+V, as well as from context menu, in the time edit boxes. (AMZ)
- Plain-text lines can now be pasted into the grid. They will be inserted as default lines with the text as their content. (AMZ)
- Added Paste Over function, which allows you to paste subtitle lines over others, overwriting the fields of your choice. (AMZ)
- Added global hotkey for Video Play (default Ctrl+P). (AMZ)
@ -124,6 +124,7 @@ Please visit http://aegisub.net to download latest version
- 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)
- Commiting text now commits times as well. (AMZ)
- Fixed display of end frames on the subtitles grid, when set to frame mode. (demi)
= 1.10 beta - 2006.08.07 ===========================

View file

@ -134,6 +134,7 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
colorAlpha[2] = new wxSpinCtrl(this,TEXT_ALPHA_3,_T(""),wxDefaultPosition,wxSize(60,20),wxSP_ARROW_KEYS,0,255,style->outline.a);
colorAlpha[3] = new wxSpinCtrl(this,TEXT_ALPHA_4,_T(""),wxDefaultPosition,wxSize(60,20),wxSP_ARROW_KEYS,0,255,style->shadow.a);
for (int i=0;i<3;i++) margin[i] = new wxSpinCtrl(this,TEXT_MARGIN_L+i,_T(""),wxDefaultPosition,wxSize(60,20),wxSP_ARROW_KEYS,0,9999,style->Margin[i]);
margin[3] = 0;
Alignment = new wxRadioBox(this, RADIO_ALIGNMENT, _("Alignment"), wxDefaultPosition, wxDefaultSize, 9, alignValues, 3, wxRA_SPECIFY_COLS);
Outline = new wxTextCtrl(this,TEXT_OUTLINE,_T(""),wxDefaultPosition,wxSize(40,20),0,wxTextValidator(wxFILTER_NUMERIC,&OutlineValue));
Shadow = new wxTextCtrl(this,TEXT_SHADOW,_T(""),wxDefaultPosition,wxSize(40,20),0,wxTextValidator(wxFILTER_NUMERIC,&ShadowValue));
@ -599,6 +600,7 @@ void DialogStyleEditor::OnPreviewColourChange (wxCommandEvent &event) {
///////////////////////////////////
// Command event to update preview
void DialogStyleEditor::OnCommandPreviewUpdate (wxCommandEvent &event) {
if (!IsShownOnScreen()) return;
UpdateWorkStyle();
SubsPreview->SetStyle(work);
event.Skip();

View file

@ -164,6 +164,6 @@ enum {
MENU_SET_VIDEO_TO_START,
MENU_SET_VIDEO_TO_END,
MENU_GRID_END,
MENU_SHOW_COL = 1250,
MENU_AUDIOCLIP
MENU_AUDIOCLIP,
MENU_SHOW_COL = 1250 // Don't put anything after this
};