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

Switch to using Bind for DialogKanjiTimer events

Browse source
This commit is contained in:
Thomas Goyne 2013-07-12 13:39:10 -07:00
parent 1d7334c129
commit 3e3bd37a26
2 changed files with 18 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
aegisub/src/dialog_kara_timing_copy.cpp
View file

@ -64,17 +64,6 @@
#define TEXT_LABEL_SOURCE _("Source: ") #define TEXT_LABEL_SOURCE _("Source: ")
#define TEXT_LABEL_DEST _("Dest: ") #define TEXT_LABEL_DEST _("Dest: ")
// IDs
enum {
BUTTON_KTSTART = 2500,
BUTTON_KTLINK,
BUTTON_KTUNLINK,
BUTTON_KTSKIPSOURCE,
BUTTON_KTSKIPDEST,
BUTTON_KTGOBACK,
BUTTON_KTACCEPT
};
class KaraokeLineMatchDisplay : public wxControl { class KaraokeLineMatchDisplay : public wxControl {
typedef AssKaraoke::Syllable MatchSyllable; typedef AssKaraoke::Syllable MatchSyllable;
@ -133,7 +122,7 @@ KaraokeLineMatchDisplay::KaraokeLineMatchDisplay(wxWindow *parent)
, label_destination(TEXT_LABEL_DEST) , label_destination(TEXT_LABEL_DEST)
{ {
InheritAttributes(); InheritAttributes();
SetInputData(0, 0); SetInputData(nullptr, nullptr);
wxSize best_size = GetBestSize(); wxSize best_size = GetBestSize();
SetMaxSize(wxSize(-1, best_size.GetHeight())); SetMaxSize(wxSize(-1, best_size.GetHeight()));
@ -624,13 +613,13 @@ DialogKanjiTimer::DialogKanjiTimer(agi::Context *c)
wxStaticText *ShortcutKeys = new wxStaticText(this,-1,_("When the destination textbox has focus, use the following keys:\n\nRight Arrow: Increase dest. selection length\nLeft Arrow: Decrease dest. selection length\nUp Arrow: Increase source selection length\nDown Arrow: Decrease source selection length\nEnter: Link, accept line when done\nBackspace: Unlink last")); wxStaticText *ShortcutKeys = new wxStaticText(this,-1,_("When the destination textbox has focus, use the following keys:\n\nRight Arrow: Increase dest. selection length\nLeft Arrow: Decrease dest. selection length\nUp Arrow: Increase source selection length\nDown Arrow: Decrease source selection length\nEnter: Link, accept line when done\nBackspace: Unlink last"));
//Buttons //Buttons
wxButton *Start = new wxButton(this,BUTTON_KTSTART,_("S&tart!")); wxButton *Start = new wxButton(this, -1,_("S&tart!"));
wxButton *Link = new wxButton(this,BUTTON_KTLINK,_("&Link")); wxButton *Link = new wxButton(this, -1,_("&Link"));
wxButton *Unlink = new wxButton(this,BUTTON_KTUNLINK,_("&Unlink")); wxButton *Unlink = new wxButton(this, -1,_("&Unlink"));
wxButton *SkipSourceLine = new wxButton(this,BUTTON_KTSKIPSOURCE,_("Skip &Source Line")); wxButton *SkipSourceLine = new wxButton(this, -1,_("Skip &Source Line"));
wxButton *SkipDestLine = new wxButton(this,BUTTON_KTSKIPDEST,_("Skip &Dest Line")); wxButton *SkipDestLine = new wxButton(this, -1,_("Skip &Dest Line"));
wxButton *GoBackLine = new wxButton(this,BUTTON_KTGOBACK,_("&Go Back a Line")); wxButton *GoBackLine = new wxButton(this, -1,_("&Go Back a Line"));
wxButton *AcceptLine = new wxButton(this,BUTTON_KTACCEPT,_("&Accept Line")); wxButton *AcceptLine = new wxButton(this, -1,_("&Accept Line"));
wxButton *CloseKT = new wxButton(this,wxID_CLOSE,_("&Close")); wxButton *CloseKT = new wxButton(this,wxID_CLOSE,_("&Close"));
//Frame: Text //Frame: Text
@ -673,20 +662,18 @@ DialogKanjiTimer::DialogKanjiTimer(agi::Context *c)
SetSizerAndFit(MainStackSizer); SetSizerAndFit(MainStackSizer);
CenterOnParent(); CenterOnParent();
Bind(wxEVT_KEY_DOWN, &DialogKanjiTimer::OnKeyDown, this);
display->Bind(wxEVT_KEY_DOWN, &DialogKanjiTimer::OnKeyDown, this); display->Bind(wxEVT_KEY_DOWN, &DialogKanjiTimer::OnKeyDown, this);
}
BEGIN_EVENT_TABLE(DialogKanjiTimer,wxDialog) CloseKT->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogKanjiTimer::OnClose, this);
EVT_BUTTON(wxID_CLOSE,DialogKanjiTimer::OnClose) Start->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogKanjiTimer::OnStart, this);
EVT_BUTTON(BUTTON_KTSTART,DialogKanjiTimer::OnStart) Link->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogKanjiTimer::OnLink, this);
EVT_BUTTON(BUTTON_KTLINK,DialogKanjiTimer::OnLink) Unlink->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogKanjiTimer::OnUnlink, this);
EVT_BUTTON(BUTTON_KTUNLINK,DialogKanjiTimer::OnUnlink) SkipSourceLine->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogKanjiTimer::OnSkipSource, this);
EVT_BUTTON(BUTTON_KTSKIPSOURCE,DialogKanjiTimer::OnSkipSource) SkipDestLine->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogKanjiTimer::OnSkipDest, this);
EVT_BUTTON(BUTTON_KTSKIPDEST,DialogKanjiTimer::OnSkipDest) GoBackLine->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogKanjiTimer::OnGoBack, this);
EVT_BUTTON(BUTTON_KTGOBACK,DialogKanjiTimer::OnGoBack) AcceptLine->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogKanjiTimer::OnAccept, this);
EVT_BUTTON(BUTTON_KTACCEPT,DialogKanjiTimer::OnAccept) }
EVT_KEY_DOWN(DialogKanjiTimer::OnKeyDown)
END_EVENT_TABLE()
void DialogKanjiTimer::OnClose(wxCommandEvent &) { void DialogKanjiTimer::OnClose(wxCommandEvent &) {
OPT_SET("Tool/Kanji Timer/Interpolation")->SetBool(Interpolate->IsChecked()); OPT_SET("Tool/Kanji Timer/Interpolation")->SetBool(Interpolate->IsChecked());

1
aegisub/src/dialog_kara_timing_copy.h
View file

@ -76,5 +76,4 @@ class DialogKanjiTimer : public wxDialog {
public: public:
DialogKanjiTimer(agi::Context *context); DialogKanjiTimer(agi::Context *context);
DECLARE_EVENT_TABLE()
}; };