diff --git a/aegisub/dialog_export.cpp b/aegisub/dialog_export.cpp index 82aa089dd..497fb5071 100644 --- a/aegisub/dialog_export.cpp +++ b/aegisub/dialog_export.cpp @@ -84,6 +84,9 @@ DialogExport::DialogExport (wxWindow *parent) TopButtons->Add(new wxButton(this,Button_Select_All,_("Select all"),wxDefaultPosition,wxSize(80,-1)),1,wxEXPAND | wxRIGHT,0); TopButtons->Add(new wxButton(this,Button_Select_None,_("Select none"),wxDefaultPosition,wxSize(80,-1)),1,wxEXPAND | wxRIGHT,0); + // Description field + Description = new wxTextCtrl(this, -1, _T(""), wxDefaultPosition, wxSize(200,60), wxTE_MULTILINE | wxTE_READONLY); + // Charset dropdown list wxStaticText *charset_list_label = new wxStaticText(this, -1, _("Text encoding:")); CharsetList = new wxChoice(this, Charset_List_Box, wxDefaultPosition, wxDefaultSize, FrameMain::GetEncodings()); @@ -96,7 +99,6 @@ DialogExport::DialogExport (wxWindow *parent) // Top sizer wxSizer *TopSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Filters")); - Description = new wxTextCtrl(this, -1, _T(""), wxDefaultPosition, wxSize(200,60), wxTE_MULTILINE | wxTE_READONLY); TopSizer->Add(FilterList,1,wxEXPAND,0); TopSizer->Add(TopButtons,0,wxEXPAND,0); TopSizer->Add(Description,0,wxEXPAND | wxTOP,5); diff --git a/aegisub/dialog_jumpto.cpp b/aegisub/dialog_jumpto.cpp index bf1524f7e..4fd583474 100644 --- a/aegisub/dialog_jumpto.cpp +++ b/aegisub/dialog_jumpto.cpp @@ -79,8 +79,8 @@ DialogJumpTo::DialogJumpTo (wxWindow *parent) TimesSizer->Add(TimeSizer,0,wxEXPAND,0); // Buttons - wxButton *CancelButton = new wxButton(this,wxID_CANCEL); wxButton *OKButton = new wxButton(this,wxID_OK); + wxButton *CancelButton = new wxButton(this,wxID_CANCEL); wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); ButtonSizer->Add(OKButton,1,wxRIGHT,5); ButtonSizer->Add(CancelButton,0,0,0); diff --git a/aegisub/dialog_kanji_timer.cpp b/aegisub/dialog_kanji_timer.cpp index 33b0f8aa0..fbffe1b6b 100644 --- a/aegisub/dialog_kanji_timer.cpp +++ b/aegisub/dialog_kanji_timer.cpp @@ -102,7 +102,7 @@ DialogKanjiTimer::DialogKanjiTimer(wxWindow *parent, SubtitlesGrid *_grid) wxButton *SkipDestLine = new wxButton(this,BUTTON_KTSKIPDEST,_("Skip Dest Line")); wxButton *GoBackLine = new wxButton(this,BUTTON_KTGOBACK,_("Go Back a Line")); wxButton *AcceptLine = new wxButton(this,BUTTON_KTACCEPT,_("Accept Line")); - wxButton *CloseKT = new wxButton(this,wxID_CLOSE,_("Close"),wxDefaultPosition,wxDefaultSize,wxALIGN_RIGHT); + wxButton *CloseKT = new wxButton(this,wxID_CLOSE,_("Close")); //Checkbox Interpolate = new wxCheckBox(this,-1,_("Attempt to interpolate kanji."),wxDefaultPosition,wxDefaultSize,wxALIGN_LEFT); diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp index 4b71ac32c..0eb667e9a 100644 --- a/aegisub/dialog_options.cpp +++ b/aegisub/dialog_options.cpp @@ -211,13 +211,6 @@ DialogOptions::DialogOptions(wxWindow *parent) // First static box wxString labels1[4] = { _("Enable call tips"), _("Enable syntax highlighting"), _("Link commiting of times"), _("Overwrite-Insertion in time boxes") }; wxString options1[4] = { _T("Call Tips Enabled"), _T("Syntax Highlight Enabled"), _T("Link Time Boxes Commit"), _T("Insert Mode on Time Boxes") }; - editSizer6->Add(new wxStaticText(editPage,-1,_("Path to dictionary files:")),0,wxALIGN_CENTER_VERTICAL|wxRIGHT,5); - wxTextCtrl *edit = new wxTextCtrl(editPage,-1,_T("")); - Bind(edit,_T("Dictionaries path")); - editSizer6->Add(edit,1,wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT,5); - browse = new BrowseButton(editPage,-1,_T(""),BROWSE_FOLDER); - browse->Bind(edit); - editSizer6->Add(browse,0,wxEXPAND); for (int i=0;i<4;i++) { wxCheckBox *control = new wxCheckBox(editPage,-1,labels1[i]); Bind(control,options1[i]); @@ -225,6 +218,13 @@ DialogOptions::DialogOptions(wxWindow *parent) } editSizer2->AddGrowableCol(0,1); editSizer2->AddGrowableCol(1,1); + editSizer6->Add(new wxStaticText(editPage,-1,_("Path to dictionary files:")),0,wxALIGN_CENTER_VERTICAL|wxRIGHT,5); + wxTextCtrl *edit = new wxTextCtrl(editPage,-1,_T("")); + Bind(edit,_T("Dictionaries path")); + editSizer6->Add(edit,1,wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT,5); + browse = new BrowseButton(editPage,-1,_T(""),BROWSE_FOLDER); + browse->Bind(edit); + editSizer6->Add(browse,0,wxEXPAND); // Second static box wxControl *control; @@ -248,15 +248,15 @@ DialogOptions::DialogOptions(wxWindow *parent) // Third sizer editSizer5->Add(new wxStaticText(editPage,-1,_("Font: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10); - browse = new BrowseButton(editPage,-1,_T(""),BROWSE_FONT); control = new wxTextCtrl(editPage,-1); - browse->Bind((wxTextCtrl*)control); Bind(control,options2[10]); editSizer5->Add(control,1,wxEXPAND | wxRIGHT,5); control = new wxTextCtrl(editPage,-1,_T(""),wxDefaultPosition,wxSize(50,-1),0,NumValidator(NULL,false));; - browse->Bind((wxTextCtrl*)control,1); Bind(control,options2[11]); editSizer5->Add(control,0,wxEXPAND | wxRIGHT,5); + browse = new BrowseButton(editPage,-1,_T(""),BROWSE_FONT); + browse->Bind((wxTextCtrl*)control); + browse->Bind((wxTextCtrl*)control,1); editSizer5->Add(browse,0,wxEXPAND); // Sizers @@ -312,13 +312,13 @@ DialogOptions::DialogOptions(wxWindow *parent) // Third sizer gridSizer4->Add(new wxStaticText(gridPage,-1,_("Font: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10); - browse = new BrowseButton(gridPage,-1,_T(""),BROWSE_FONT); control = new wxTextCtrl(gridPage,-1); Bind(control,_T("Grid font face")); - browse->Bind((wxTextCtrl*)control); gridSizer4->Add(control,1,wxEXPAND | wxRIGHT,5); control = new wxTextCtrl(gridPage,-1,_T(""),wxDefaultPosition,wxSize(50,-1),0,NumValidator(NULL,false));; Bind(control,_T("Grid font size")); + browse = new BrowseButton(gridPage,-1,_T(""),BROWSE_FONT); + browse->Bind((wxTextCtrl*)control); browse->Bind((wxTextCtrl*)control,1); gridSizer4->Add(control,0,wxEXPAND | wxRIGHT,5); gridSizer4->Add(browse,0,wxEXPAND); diff --git a/aegisub/dialog_selection.cpp b/aegisub/dialog_selection.cpp index 4f57b3c02..c08bd7dca 100644 --- a/aegisub/dialog_selection.cpp +++ b/aegisub/dialog_selection.cpp @@ -53,16 +53,33 @@ wxDialog (parent,-1,_("Select"),wxDefaultPosition,wxDefaultSize,wxCAPTION) grid = _grid; // Matches box + Matches = new wxRadioButton(this,-1,_("Matches"),wxDefaultPosition,wxDefaultSize,wxRB_GROUP); + DoesntMatch = new wxRadioButton(this,-1,_("Doesn't Match"),wxDefaultPosition,wxDefaultSize,0); Match = new wxTextCtrl(this,-1,Options.AsText(_T("Select Text")),wxDefaultPosition,wxSize(200,-1)); + MatchCase = new wxCheckBox(this,-1,_("Match case")); Exact = new wxRadioButton(this,-1,_("Exact match"),wxDefaultPosition,wxDefaultSize,wxRB_GROUP); Contains = new wxRadioButton(this,-1,_("Contains")); RegExp = new wxRadioButton(this,-1,_("Regular Expression match")); - Matches = new wxRadioButton(this,-1,_("Matches"),wxDefaultPosition,wxDefaultSize,wxRB_GROUP); - DoesntMatch = new wxRadioButton(this,-1,_("Doesn't Match"),wxDefaultPosition,wxDefaultSize,0); - MatchCase = new wxCheckBox(this,-1,_("Match case")); + + // Fields box + wxArrayString field; + field.Add(_("Text")); + field.Add(_("Style")); + field.Add(_("Actor")); + Field = new wxRadioBox(this,-1,_("In Field"),wxDefaultPosition,wxDefaultSize,field); + + // Dialogues/comments box MatchDialogues = new wxCheckBox(this,MATCH_DIALOGUES_CHECKBOX,_("Dialogues")); MatchComments = new wxCheckBox(this,MATCH_COMMENTS_CHECKBOX,_("Comments")); + // Action box + wxArrayString actions; + actions.Add(_("Set selection")); + actions.Add(_("Add to selection")); + actions.Add(_("Subtract from selection")); + actions.Add(_("Intersect with selection")); + Action = new wxRadioBox(this,-1,_("Action"),wxDefaultPosition,wxDefaultSize,actions,1); + // Matches box sizer wxSizer *MatchSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Match")); wxSizer *MatchTopSizer = new wxBoxSizer(wxHORIZONTAL); @@ -76,27 +93,11 @@ wxDialog (parent,-1,_("Select"),wxDefaultPosition,wxDefaultSize,wxCAPTION) MatchSizer->Add(Contains,0,wxTOP|wxEXPAND,5); MatchSizer->Add(RegExp,0,wxTOP|wxEXPAND,5); - // Action box - wxArrayString actions; - actions.Add(_("Set selection")); - actions.Add(_("Add to selection")); - actions.Add(_("Subtract from selection")); - actions.Add(_("Intersect with selection")); - Action = new wxRadioBox(this,-1,_("Action"),wxDefaultPosition,wxDefaultSize,actions,1); - // Dialogues / Comments box wxSizer *DialogueSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Match dialogues/comments")); DialogueSizer->Add(MatchDialogues,0, wxRIGHT|wxEXPAND,5); DialogueSizer->Add(MatchComments,0, wxEXPAND); - - // Fields box - wxArrayString field; - field.Add(_("Text")); - field.Add(_("Style")); - field.Add(_("Actor")); - Field = new wxRadioBox(this,-1,_("In Field"),wxDefaultPosition,wxDefaultSize,field); - // Buttons sizer wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); ButtonSizer->AddStretchSpacer(1); diff --git a/aegisub/dialog_shift_times.cpp b/aegisub/dialog_shift_times.cpp index 4cd28d6d5..04d69da1e 100644 --- a/aegisub/dialog_shift_times.cpp +++ b/aegisub/dialog_shift_times.cpp @@ -114,8 +114,8 @@ DialogShiftTimes::DialogShiftTimes (wxWindow *parent,SubtitlesGrid *_grid) HistorySizer->Add(History,1,wxEXPAND,0); // Buttons - wxButton *CancelButton = new wxButton(this,wxID_CANCEL); wxButton *OKButton = new wxButton(this,wxID_OK); + wxButton *CancelButton = new wxButton(this,wxID_CANCEL); wxButton *ClearButton = new wxButton(this,SHIFT_CLEAR_HISTORY,_("Clear")); OKButton->SetDefault(); wxSizer *ButtonSizer = new wxBoxSizer(wxHORIZONTAL); diff --git a/aegisub/dialog_style_editor.cpp b/aegisub/dialog_style_editor.cpp index db26397b3..8a17943ac 100644 --- a/aegisub/dialog_style_editor.cpp +++ b/aegisub/dialog_style_editor.cpp @@ -327,8 +327,8 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer(); wxButton *okButton = new wxButton(this, wxID_OK); okButton->SetDefault(); - ButtonSizer->AddButton(new wxButton(this, wxID_APPLY)); ButtonSizer->AddButton(new wxButton(this, wxID_CANCEL)); + ButtonSizer->AddButton(new wxButton(this, wxID_APPLY)); ButtonSizer->AddButton(new wxButton(this, wxID_HELP)); ButtonSizer->AddButton(okButton); ButtonSizer->Realize(); diff --git a/aegisub/dialog_style_manager.cpp b/aegisub/dialog_style_manager.cpp index 71a5c4489..a0c87cbfa 100644 --- a/aegisub/dialog_style_manager.cpp +++ b/aegisub/dialog_style_manager.cpp @@ -120,6 +120,8 @@ DialogStyleManager::DialogStyleManager (wxWindow *parent,SubtitlesGrid *_grid) wxSizer *CurrentListSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *MoveImportSizer = new wxBoxSizer(wxHORIZONTAL); MoveToStorage = new wxButton(this, BUTTON_CURRENT_COPYTO, _("<- Copy to storage"), wxDefaultPosition, wxSize(-1,25)); + MoveImportSizer->Add(MoveToStorage,1,wxEXPAND | wxRIGHT,5); + MoveImportSizer->Add(new wxButton(this, BUTTON_CURRENT_IMPORT, _("Import from script...")),1,wxEXPAND,0); CurrentNew = new wxButton(this, BUTTON_CURRENT_NEW, _("New"), wxDefaultPosition, wxSize(40,25)); CurrentEdit = new wxButton(this, BUTTON_CURRENT_EDIT, _("Edit"), wxDefaultPosition, wxSize(40,25)); CurrentCopy = new wxButton(this, BUTTON_CURRENT_COPY, _("Copy"), wxDefaultPosition, wxSize(40,25)); @@ -147,8 +149,6 @@ DialogStyleManager::DialogStyleManager (wxWindow *parent,SubtitlesGrid *_grid) CurrentButtonsLow->AddStretchSpacer(1); CurrentListSizer->Add(CurrentList,1,wxEXPAND | wxRIGHT,0); CurrentListSizer->Add(CurrentButtonsLow,0,wxEXPAND | wxALL,0); - MoveImportSizer->Add(MoveToStorage,1,wxEXPAND | wxRIGHT,5); - MoveImportSizer->Add(new wxButton(this, BUTTON_CURRENT_IMPORT, _("Import from script...")),1,wxEXPAND,0); CurrentBox->Add(CurrentListSizer,1,wxEXPAND | wxBOTTOM,5); CurrentBox->Add(MoveImportSizer,0,wxEXPAND | wxBOTTOM,5); CurrentBox->Add(CurrentButtons,0,wxEXPAND | wxBOTTOM,0); @@ -159,8 +159,8 @@ DialogStyleManager::DialogStyleManager (wxWindow *parent,SubtitlesGrid *_grid) // Buttons wxStdDialogButtonSizer *buttonSizer = new wxStdDialogButtonSizer(); - buttonSizer->AddButton(new wxButton(this,wxID_HELP)); buttonSizer->SetCancelButton(new wxButton(this, wxID_CLOSE)); + buttonSizer->AddButton(new wxButton(this,wxID_HELP)); buttonSizer->Realize(); // General layout diff --git a/aegisub/dialog_timing_processor.cpp b/aegisub/dialog_timing_processor.cpp index 709fb4d59..5208007c6 100644 --- a/aegisub/dialog_timing_processor.cpp +++ b/aegisub/dialog_timing_processor.cpp @@ -66,6 +66,15 @@ DialogTimingProcessor::DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *_gr thresEndAfter = Options.AsText(_T("Timing processor key end after thres")); adjsThresTime = Options.AsText(_T("Timing processor adjascent thres")); + // Styles box + wxArrayString styles = grid->ass->GetStyles(); + StyleList = new wxCheckListBox(this,TIMING_STYLE_LIST,wxDefaultPosition,wxSize(150,150),styles); + StyleList->SetToolTip(_("Select styles to process. Unchecked ones will be ignored.")); + wxButton *all = new wxButton(this,BUTTON_SELECT_ALL,_("All")); + all->SetToolTip(_("Select all styles.")); + wxButton *none = new wxButton(this,BUTTON_SELECT_NONE,_("None")); + none->SetToolTip(_("Deselect all styles.")); + // Options box wxSizer *optionsSizer = new wxStaticBoxSizer(wxHORIZONTAL,this,_("Options")); onlySelection = new wxCheckBox(this,-1,_("Affect selection only")); @@ -157,18 +166,11 @@ DialogTimingProcessor::DialogTimingProcessor(wxWindow *parent,SubtitlesGrid *_gr // Style buttons sizer wxSizer *StyleButtonsSizer = new wxBoxSizer(wxHORIZONTAL); - wxButton *all = new wxButton(this,BUTTON_SELECT_ALL,_("All")); - all->SetToolTip(_("Select all styles.")); - wxButton *none = new wxButton(this,BUTTON_SELECT_NONE,_("None")); - none->SetToolTip(_("Deselect all styles.")); StyleButtonsSizer->Add(all,1,0,0); StyleButtonsSizer->Add(none,1,0,0); // Left sizer wxSizer *LeftSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Apply to styles")); - wxArrayString styles = grid->ass->GetStyles(); - StyleList = new wxCheckListBox(this,TIMING_STYLE_LIST,wxDefaultPosition,wxSize(150,150),styles); - StyleList->SetToolTip(_("Select styles to process. Unchecked ones will be ignored.")); size_t len = StyleList->GetCount(); for (size_t i=0;iCheck(i);