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

Remove some dead code from style editor. 

Originally committed to SVN as r5991.
This commit is contained in:
Niels Martin Hansen 2011-12-08 17:05:53 +00:00
parent 85e1f6ac34
commit 2902d4e90c
2 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
aegisub/src/dialog_style_editor.cpp
View File

@ -480,6 +480,11 @@ void DialogStyleEditor::Apply (bool apply,bool close) {
// Update work style
UpdateWorkStyle();
// Comic sans warning
if (work->font == _T("Comic Sans MS") && style->font != work->font) {
wxMessageBox(_("You have chosen to use the \"Comic Sans\" font. As the programmer and a typesetter,\nI must urge you to reconsider. Comic Sans is the most abused font in the history\nof computing, so please avoid using it unless it's REALLY suitable. Thanks."), _("Warning"), wxICON_EXCLAMATION | wxOK);
}
// Copy
*style = *work;
style->UpdateData();
@ -560,33 +565,6 @@ void DialogStyleEditor::UpdateWorkStyle() {
}
///////////////////
// Choose font box
void DialogStyleEditor::OnChooseFont (wxCommandEvent &event) {
wxFont oldfont (int(work->fontsize), wxFONTFAMILY_DEFAULT, (work->italic?wxFONTSTYLE_ITALIC:wxFONTSTYLE_NORMAL), (work->bold?wxFONTWEIGHT_BOLD:wxFONTWEIGHT_NORMAL), work->underline, work->font, wxFONTENCODING_DEFAULT);
wxFont newfont = wxGetFontFromUser(this,oldfont);
if (newfont.Ok()) {
FontName->SetValue(newfont.GetFaceName());
FontSize->SetValue(wxString::Format(_T("%i"),newfont.GetPointSize()));
BoxBold->SetValue(newfont.GetWeight() == wxFONTWEIGHT_BOLD);
BoxItalic->SetValue(newfont.GetStyle() == wxFONTSTYLE_ITALIC);
BoxUnderline->SetValue(newfont.GetUnderlined());
work->font = newfont.GetFaceName();
work->fontsize = newfont.GetPointSize();
work->bold = (newfont.GetWeight() == wxFONTWEIGHT_BOLD);
work->italic = (newfont.GetStyle() == wxFONTSTYLE_ITALIC);
work->underline = newfont.GetUnderlined();
UpdateWorkStyle();
if (SubsPreview) SubsPreview->SetStyle(work);
// Comic sans warning
if (newfont.GetFaceName() == _T("Comic Sans MS")) {
wxMessageBox(_("You have chosen to use the \"Comic Sans\" font. As the programmer and a typesetter,\nI must urge you to reconsider. Comic Sans is the most abused font in the history\nof computing, so please avoid using it unless it's REALLY suitable. Thanks."), _("Warning"), wxICON_EXCLAMATION | wxOK);
}
}
}
////////////////////////////////////////////////
// Sets color for one of the four color buttons
void DialogStyleEditor::OnSetColor (int n) {

1
aegisub/src/dialog_style_editor.h
View File

@ -120,7 +120,6 @@ private:
void OnApply (wxCommandEvent &event);
void OnCancel (wxCommandEvent &event);
void OnOK (wxCommandEvent &event);
void OnChooseFont (wxCommandEvent &event);
void OnSetColor1 (wxCommandEvent &event);
void OnSetColor2 (wxCommandEvent &event);
void OnSetColor3 (wxCommandEvent &event);