mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix a few minor issues with the Paste Over dialog

Browse source 
Remove the pointlessly hardcoded height of the checklist.

Set the parent correctly.

Set the initial focus to the OK button.

Originally committed to SVN as r6373.
This commit is contained in:
Thomas Goyne 2012-01-26 23:21:19 +00:00
parent 8c246e1cb8
commit a54983a9bc
3 changed files with 54 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
aegisub/src/dialog_paste_over.cpp
View file

@ -36,40 +36,26 @@
#include "config.h"
#include "dialog_paste_over.h"
#ifndef AGI_PRE
#include <tr1/functional>
#include <wx/button.h>
#include <wx/config.h>
#include <wx/checklst.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#endif
#include "dialog_paste_over.h"
#include "help_button.h"
#include "main.h"
/// Button IDs
enum {
Paste_Over_Times = 1620,
Paste_Over_Text,
Paste_Over_All,
Paste_Over_None
};
/// @brief Constructor
/// @param parent
///
DialogPasteOver::DialogPasteOver (wxWindow *parent, std::vector<bool>& options)
: wxDialog (parent,-1,_("Select Fields to Paste Over"),wxDefaultPosition,wxDefaultSize)
, options(options)
DialogPasteOver::DialogPasteOver(wxWindow *parent)
: wxDialog (parent, -1, _("Select Fields to Paste Over"))
{
// Script mode
int mode = 1; // ASS
// Label and list sizer
wxSizer *ListSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Fields"));
wxStaticText *label = new wxStaticText(this,-1,_("Please select the fields that you want to paste over:"),wxDefaultPosition,wxDefaultSize);
ListSizer->Add(label,0,wxEXPAND,0);
wxSizer *ListSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Fields"));
ListSizer->Add(new wxStaticText(this, -1, _("Please select the fields that you want to paste over:")), wxSizerFlags());
// List box
wxArrayString choices;
@ -80,94 +66,67 @@ DialogPasteOver::DialogPasteOver (wxWindow *parent, std::vector<bool>& options)
choices.Add(_("Actor"));
choices.Add(_("Margin Left"));
choices.Add(_("Margin Right"));
if (mode == 1) {
choices.Add(_("Margin Vertical"));
}
else {
choices.Add(_("Margin Top"));
choices.Add(_("Margin Bottom"));
}
choices.Add(_("Margin Vertical"));
choices.Add(_("Effect"));
choices.Add(_("Text"));
ListBox = new wxCheckListBox(this,-1,wxDefaultPosition,wxSize(250,170), choices);
ListSizer->Add(ListBox,0,wxEXPAND|wxTOP,5);
ListBox = new wxCheckListBox(this, -1, wxDefaultPosition, wxSize(-1, 170), choices);
ListSizer->Add(ListBox, wxSizerFlags(0).Expand().Border(wxTOP));
// Load checked items
/// @todo This assumes a static set of fields.
options = OPT_GET("Tool/Paste Lines Over/Fields")->GetListBool();
for (unsigned int i=0;i<choices.Count();i++) ListBox->Check(i,options[i]);
std::vector<bool> options = OPT_GET("Tool/Paste Lines Over/Fields")->GetListBool();
if (options.size() != choices.size())
options.resize(choices.size(), false);
for (size_t i = 0; i < choices.size(); ++i)
ListBox->Check(i, options[i]);
// Top buttons
wxButton *btn;
wxSizer *TopButtonSizer = new wxBoxSizer(wxHORIZONTAL);
TopButtonSizer->Add(new wxButton(this, Paste_Over_All, _("&All")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_None, _("&None")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_Times, _("&Times")),1,0,0);
TopButtonSizer->Add(new wxButton(this, Paste_Over_Text, _("T&ext")),1,0,0);
TopButtonSizer->Add(btn = new wxButton(this, -1, _("&All")), wxSizerFlags(1));
btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, std::tr1::bind(&DialogPasteOver::CheckAll, this, true));
TopButtonSizer->Add(btn = new wxButton(this, -1, _("&None")), wxSizerFlags(1));
btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, std::tr1::bind(&DialogPasteOver::CheckAll, this, false));
TopButtonSizer->Add(btn = new wxButton(this, -1, _("&Times")), wxSizerFlags(1));
btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogPasteOver::OnTimes, this);
TopButtonSizer->Add(btn = new wxButton(this, -1, _("T&ext")), wxSizerFlags(1));
btn->Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogPasteOver::OnText, this);
// Buttons
wxStdDialogButtonSizer *ButtonSizer = new wxStdDialogButtonSizer();
ButtonSizer->AddButton(new wxButton(this, wxID_OK));
ButtonSizer->AddButton(new wxButton(this, wxID_CANCEL));
ButtonSizer->AddButton(new HelpButton(this,"Paste Over"));
ButtonSizer->Realize();
wxStdDialogButtonSizer *ButtonSizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL | wxHELP);
Bind(wxEVT_COMMAND_BUTTON_CLICKED, &DialogPasteOver::OnOK, this, wxID_OK);
Bind(wxEVT_COMMAND_BUTTON_CLICKED, std::tr1::bind(&HelpButton::OpenPage, "Paste Over"), wxID_HELP);
// Main sizer
wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
MainSizer->Add(ListSizer,0,wxEXPAND | wxLEFT | wxRIGHT,5);
MainSizer->Add(TopButtonSizer,0,wxLEFT | wxRIGHT | wxEXPAND,5);
MainSizer->Add(ButtonSizer,0,wxALL | wxEXPAND,5);
SetSizer(MainSizer);
MainSizer->SetSizeHints(this);
Center();
SetSizerAndFit(MainSizer);
CenterOnParent();
}
/// @brief Destructor
DialogPasteOver::~DialogPasteOver() {
}
BEGIN_EVENT_TABLE(DialogPasteOver, wxDialog)
EVT_BUTTON(wxID_OK,DialogPasteOver::OnOK)
EVT_BUTTON(wxID_CANCEL,DialogPasteOver::OnCancel)
EVT_BUTTON(Paste_Over_All,DialogPasteOver::OnAll)
EVT_BUTTON(Paste_Over_None,DialogPasteOver::OnNone)
EVT_BUTTON(Paste_Over_Text,DialogPasteOver::OnText)
EVT_BUTTON(Paste_Over_Times,DialogPasteOver::OnTimes)
END_EVENT_TABLE()
/// @brief OK pressed
void DialogPasteOver::OnOK(wxCommandEvent &) {
for (int i=0;i<10;i++) {
options[i] = ListBox->IsChecked(i);
}
std::vector<bool> options;
for (size_t i = 0; i < ListBox->GetCount(); ++i)
options.push_back(ListBox->IsChecked(i));
OPT_SET("Tool/Paste Lines Over/Fields")->SetListBool(options);
EndModal(1);
}
/// @brief Cancel pressed
void DialogPasteOver::OnCancel(wxCommandEvent &) {
EndModal(0);
}
/// @brief Select Text
void DialogPasteOver::OnText(wxCommandEvent &) {
for (int i=0;i<9;i++) ListBox->Check(i,false);
ListBox->Check(9,true);
CheckAll(false);
ListBox->Check(9, true);
}
/// @brief Select Times
void DialogPasteOver::OnTimes(wxCommandEvent &) {
for (int i=0;i<10;i++) ListBox->Check(i,false);
ListBox->Check(1,true);
ListBox->Check(2,true);
CheckAll(false);
ListBox->Check(1, true);
ListBox->Check(2, true);
}
/// @brief Select All
void DialogPasteOver::OnAll(wxCommandEvent &) {
for (int i=0;i<10;i++) ListBox->Check(i,true);
}
/// @brief Select None
void DialogPasteOver::OnNone(wxCommandEvent &) {
for (int i=0;i<10;i++) ListBox->Check(i,false);
void DialogPasteOver::CheckAll(bool check) {
for (size_t i = 0; i < ListBox->GetCount(); ++i)
ListBox->Check(i, check);
}

24
aegisub/src/dialog_paste_over.h
View file

@ -35,12 +35,10 @@
///
#ifndef AGI_PRE
#include <vector>
#include <wx/dialog.h>
#include <wx/checklst.h>
#endif
class wxCheckListBox;
/// DOCME
/// @class DialogPasteOver
@ -48,24 +46,14 @@
///
/// DOCME
class DialogPasteOver : public wxDialog {
private:
/// DOCME
wxCheckListBox *ListBox;
/// DOCME
std::vector<bool>& options;
void CheckAll(bool check);
void OnOK(wxCommandEvent &event);
void OnCancel(wxCommandEvent &event);
void OnTimes(wxCommandEvent &event);
void OnText(wxCommandEvent &event);
void OnAll(wxCommandEvent &event);
void OnNone(wxCommandEvent &event);
void OnOK(wxCommandEvent &);
void OnTimes(wxCommandEvent &);
void OnText(wxCommandEvent &);
public:
DialogPasteOver(wxWindow *parent, std::vector<bool>& options);
~DialogPasteOver();
DECLARE_EVENT_TABLE()
DialogPasteOver(wxWindow *parent);
};

6
aegisub/src/subs_grid.cpp
View file

@ -53,6 +53,7 @@
#include "ass_dialogue.h"
#include "ass_file.h"
#include "dialog_paste_over.h"
#include "main.h"
#include "utils.h"
#include "video_context.h"
@ -255,11 +256,12 @@ void SubtitlesGrid::PasteLines(int n,bool pasteOver) {
if (n+inserted < GetRows()) {
// Get list of options to paste over, if not asked yet
if (pasteOverOptions.empty()) {
DialogPasteOver diag(NULL, pasteOverOptions);
if (!diag.ShowModal()) {
DialogPasteOver diag(context->parent);
if (diag.ShowModal()) {
delete curdiag;
return;
}
pasteOverOptions = OPT_GET("Tool/Paste Lines Over/Fields")->GetListBool();
}
// Paste over