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

Make DialogSpellChecker operate on a context rather than going through FrameMain

Browse source 
Originally committed to SVN as r5203.
This commit is contained in:
Thomas Goyne 2011-01-16 07:16:13 +00:00
parent 1aeded1a29
commit bee57ccad3
3 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
aegisub/src/command/subtitle.cpp
View file

@ -355,9 +355,8 @@ struct subtitle_spellcheck : public Command {
STR_HELP("Open spell checker.")
void operator()(agi::Context *c) {
//XXX: This is obscene, requires refactoring the spellchecker.
c->videoContext->Stop();
new DialogSpellChecker(wxGetApp().frame);
new DialogSpellChecker(c);
}
};

17
aegisub/src/dialog_spellchecker.cpp
View file

@ -34,8 +34,6 @@
/// @ingroup unused spelling
///
///////////
// Headers
#include "config.h"
#ifndef AGI_PRE
@ -46,10 +44,10 @@
#include "ass_file.h"
#include "compat.h"
#include "dialog_spellchecker.h"
#include "frame_main.h"
#include "help_button.h"
#include "libresrc/libresrc.h"
#include "main.h"
#include "include/aegisub/context.h"
#include "include/aegisub/spellchecker.h"
#include "selection_controller.h"
#include "subs_edit_box.h"
@ -90,8 +88,9 @@ enum {
/// @param parent
/// @return
///
DialogSpellChecker::DialogSpellChecker(wxFrame *parent)
: wxDialog(parent, -1, _("Spell Checker"), wxDefaultPosition, wxDefaultSize)
DialogSpellChecker::DialogSpellChecker(agi::Context *context)
: wxDialog(context->parent, -1, _("Spell Checker"), wxDefaultPosition, wxDefaultSize)
, context(context)
{
// Set icon
SetIcon(BitmapToIcon(GETIMAGE(spellcheck_toolbutton_24)));
@ -197,7 +196,7 @@ bool DialogSpellChecker::FindNext(int startLine,int startPos) {
if (startPos != -1) lastPos = 0;
// Get grid
SubtitlesGrid *grid = ((FrameMain*)GetParent())->SubsGrid;
SubtitlesGrid *grid = context->SubsGrid;
int rows = grid->GetRows();
// Loop through lines
@ -270,7 +269,7 @@ void DialogSpellChecker::SetWord(wxString word) {
for (size_t i=0;i<sugs.Count();i++) suggestList->Append(sugs[i]);
// Show word on the main program interface
SubtitlesGrid *grid = ((FrameMain*)GetParent())->SubsGrid;
SubtitlesGrid *grid = context->SubsGrid;
int line = lastLine % grid->GetRows();
grid->SelectRow(line,false);
grid->MakeCellVisible(line,0);
@ -383,7 +382,7 @@ bool DialogSpellChecker::FindOrDie() {
///
void DialogSpellChecker::Replace() {
// Get dialog
SubtitlesGrid *grid = ((FrameMain*)GetParent())->SubsGrid;
SubtitlesGrid *grid = context->SubsGrid;
AssDialogue *diag = grid->GetDialogue(lastLine % grid->GetRows());
// Replace
@ -436,7 +435,7 @@ void DialogSpellChecker::OnTakeSuggestion(wxCommandEvent &event) {
///
bool DialogSpellChecker::GetFirstMatch() {
// Get selection
SubtitlesGrid *grid = ((FrameMain*)GetParent())->SubsGrid;
SubtitlesGrid *grid = context->SubsGrid;
wxArrayInt sel = grid->GetSelection();
firstLine = (sel.Count()>0) ? sel[0] : 0;
bool hasTypos = FindNext(firstLine,0);

13
aegisub/src/dialog_spellchecker.h
View file

@ -34,9 +34,6 @@
/// @ingroup unused spelling
///
///////////
// Headers
#ifndef AGI_PRE
#include <map>
@ -46,20 +43,16 @@
#include <wx/textctrl.h>
#endif
//////////////
// Prototypes
namespace agi { struct Context; }
class SpellChecker;
/// DOCME
/// @class DialogSpellChecker
/// @brief DOCME
///
/// DOCME
class DialogSpellChecker : public wxDialog {
private:
agi::Context *context;
/// DOCME
SpellChecker *spellchecker;
@ -121,7 +114,7 @@ private:
void OnAdd(wxCommandEvent &event);
public:
DialogSpellChecker(wxFrame *parent);
DialogSpellChecker(agi::Context *context);
~DialogSpellChecker();
DECLARE_EVENT_TABLE()