iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Add Comment field to the paste over dialog

This commit is contained in:
Thomas Goyne 2014-05-05 07:01:57 -07:00
parent 26a9e57006
commit c5608a4725
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/command/edit.cpp
View File

@ -141,16 +141,17 @@ AssDialogue *paste_over(wxWindow *parent, std::vector<bool>& pasteOverOptions, A
pasteOverOptions = OPT_GET("Tool/Paste Lines Over/Fields")->GetListBool(); pasteOverOptions = OPT_GET("Tool/Paste Lines Over/Fields")->GetListBool();
} }
if (pasteOverOptions[0]) old_line->Layer = new_line->Layer; if (pasteOverOptions[0]) old_line->Comment = new_line->Comment;
if (pasteOverOptions[1]) old_line->Start = new_line->Start; if (pasteOverOptions[1]) old_line->Layer = new_line->Layer;
if (pasteOverOptions[2]) old_line->End = new_line->End; if (pasteOverOptions[2]) old_line->Start = new_line->Start;
if (pasteOverOptions[3]) old_line->Style = new_line->Style; if (pasteOverOptions[3]) old_line->End = new_line->End;
if (pasteOverOptions[4]) old_line->Actor = new_line->Actor; if (pasteOverOptions[4]) old_line->Style = new_line->Style;
if (pasteOverOptions[5]) old_line->Margin[0] = new_line->Margin[0]; if (pasteOverOptions[5]) old_line->Actor = new_line->Actor;
if (pasteOverOptions[6]) old_line->Margin[1] = new_line->Margin[1]; if (pasteOverOptions[6]) old_line->Margin[0] = new_line->Margin[0];
if (pasteOverOptions[7]) old_line->Margin[2] = new_line->Margin[2]; if (pasteOverOptions[7]) old_line->Margin[1] = new_line->Margin[1];
if (pasteOverOptions[8]) old_line->Effect = new_line->Effect; if (pasteOverOptions[8]) old_line->Margin[2] = new_line->Margin[2];
if (pasteOverOptions[9]) old_line->Text = new_line->Text; if (pasteOverOptions[9]) old_line->Effect = new_line->Effect;
if (pasteOverOptions[10]) old_line->Text = new_line->Text;
return old_line; return old_line;
} }

7
src/dialog_paste_over.cpp
View File

@ -45,7 +45,7 @@
#include "options.h" #include "options.h"
DialogPasteOver::DialogPasteOver(wxWindow *parent) DialogPasteOver::DialogPasteOver(wxWindow *parent)
: wxDialog (parent, -1, _("Select Fields to Paste Over")) : wxDialog(parent, -1, _("Select Fields to Paste Over"))
{ {
// Label and list sizer // Label and list sizer
wxSizer *ListSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Fields")); wxSizer *ListSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Fields"));
@ -53,6 +53,7 @@ DialogPasteOver::DialogPasteOver(wxWindow *parent)
// List box // List box
wxArrayString choices; wxArrayString choices;
choices.Add(_("Comment"));
choices.Add(_("Layer")); choices.Add(_("Layer"));
choices.Add(_("Start Time")); choices.Add(_("Start Time"));
choices.Add(_("End Time")); choices.Add(_("End Time"));
@ -111,13 +112,13 @@ void DialogPasteOver::OnOK(wxCommandEvent &) {
void DialogPasteOver::OnText(wxCommandEvent &) { void DialogPasteOver::OnText(wxCommandEvent &) {
CheckAll(false); CheckAll(false);
ListBox->Check(9, true); ListBox->Check(10, true);
} }
void DialogPasteOver::OnTimes(wxCommandEvent &) { void DialogPasteOver::OnTimes(wxCommandEvent &) {
CheckAll(false); CheckAll(false);
ListBox->Check(1, true);
ListBox->Check(2, true); ListBox->Check(2, true);
ListBox->Check(3, true);
} }
void DialogPasteOver::CheckAll(bool check) { void DialogPasteOver::CheckAll(bool check) {