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

cosmetics in dialog_options.cpp

Browse source 
Originally committed to SVN as r790.
This commit is contained in:
Karl Blomster 2007-01-14 22:57:25 +00:00
parent e638c96e32
commit 0adbb2a443
2 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
aegisub/dialog_options.cpp
View file

@ -96,7 +96,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
Bind(box,_T("Auto check for updates")); Bind(box,_T("Auto check for updates"));
genSizer4->Add(box,1,wxALL,0); genSizer4->Add(box,1,wxALL,0);
genSizer1->Add(genSizer4,1,wxEXPAND|wxALL,5); genSizer1->Add(genSizer4,1,wxEXPAND|wxALL,5);
wxSizer *genSizer2 = new wxStaticBoxSizer(wxVERTICAL,generalPage,_("Limits for Levels and Recent Files")); wxSizer *genSizer2 = new wxStaticBoxSizer(wxVERTICAL,generalPage,_("Limits for levels and recent files"));
wxFlexGridSizer *genSizer3 = new wxFlexGridSizer(8,2,5,5); wxFlexGridSizer *genSizer3 = new wxFlexGridSizer(8,2,5,5);
wxString options[8] = { _T("Undo levels"), _T("Recent timecodes max"), _T("Recent keyframes max"), _T("Recent sub max"), _T("Recent vid max"), _T("Recent aud max"), _T("Recent find max"), _T("Recent replace max") }; wxString options[8] = { _T("Undo levels"), _T("Recent timecodes max"), _T("Recent keyframes max"), _T("Recent sub max"), _T("Recent vid max"), _T("Recent aud max"), _T("Recent find max"), _T("Recent replace max") };
wxString labels[8] = { _("Maximum undo levels"), _("Maximum recent timecode files"), _("Maximum recent keyframe files"), _("Maximum recent subtitle files"), _("Maximum recent video files"), _("Maximum recent audio files"), _("Maximum recent find strings"), _("Maximum recent replace strings") }; wxString labels[8] = { _("Maximum undo levels"), _("Maximum recent timecode files"), _("Maximum recent keyframe files"), _("Maximum recent subtitle files"), _("Maximum recent video files"), _("Maximum recent audio files"), _("Maximum recent find strings"), _("Maximum recent replace strings") };
@ -121,7 +121,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
wxSizer *fileMainSizer = new wxBoxSizer(wxVERTICAL); wxSizer *fileMainSizer = new wxBoxSizer(wxVERTICAL);
wxSizer *fileSizer1 = new wxStaticBoxSizer(wxVERTICAL,filePage,_("Auto-save")); wxSizer *fileSizer1 = new wxStaticBoxSizer(wxVERTICAL,filePage,_("Auto-save"));
wxSizer *fileSizer2 = new wxBoxSizer(wxHORIZONTAL); wxSizer *fileSizer2 = new wxBoxSizer(wxHORIZONTAL);
wxSizer *fileSizer3 = new wxStaticBoxSizer(wxHORIZONTAL,filePage,_("File Paths")); wxSizer *fileSizer3 = new wxStaticBoxSizer(wxHORIZONTAL,filePage,_("File paths"));
wxFlexGridSizer *fileSizer4 = new wxFlexGridSizer(3,2,5,5); wxFlexGridSizer *fileSizer4 = new wxFlexGridSizer(3,2,5,5);
wxSizer *fileSizer5 = new wxStaticBoxSizer(wxHORIZONTAL,filePage,_("Miscelanea")); wxSizer *fileSizer5 = new wxStaticBoxSizer(wxHORIZONTAL,filePage,_("Miscelanea"));
wxFlexGridSizer *fileSizer6 = new wxFlexGridSizer(3,2,5,5); wxFlexGridSizer *fileSizer6 = new wxFlexGridSizer(3,2,5,5);
@ -215,7 +215,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
wxString caption = labels2[i]+_T(": "); wxString caption = labels2[i]+_T(": ");
wxString option = options2[i]; wxString option = options2[i];
if (i < 8) { if (i < 8) {
caption = _("Syntax Highlighter - ") + caption; caption = _("Syntax highlighter - ") + caption;
option = _T("Syntax highlight ") + option; option = _T("Syntax highlight ") + option;
} }
control = new ColourButton(editPage,-1,wxSize(40,10)); control = new ColourButton(editPage,-1,wxSize(40,10));
@ -266,9 +266,9 @@ DialogOptions::DialogOptions(wxWindow *parent)
// Second sizer // Second sizer
wxControl *control; wxControl *control;
wxString labels2[12] = { _("Standard Foreground"), _("Standard Background"), _("Selection Foreground"), wxString labels2[12] = { _("Standard foreground"), _("Standard background"), _("Selection foreground"),
_("Selection Background"), _("Comment Background"), _("Selected Comment Background"), _("Selection background"), _("Comment background"), _("Selected comment background"),
_("Collision Foreground"), _("Line In Frame Background"), _("Header"), _("Collision foreground"), _("Line in frame background"), _("Header"),
_("Left Column"), _("Active Line Border"), _("Lines") }; _("Left Column"), _("Active Line Border"), _("Lines") };
wxString options2[12] = { _T("standard foreground"), _T("background"), _T("selection foreground"), wxString options2[12] = { _T("standard foreground"), _T("background"), _T("selection foreground"),
_("selection background"), _T("comment background"), _T("selected comment background"), _("selection background"), _T("comment background"), _T("selected comment background"),
@ -337,7 +337,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
control = new wxComboBox(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,choices2,wxCB_READONLY | wxCB_DROPDOWN); control = new wxComboBox(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,choices2,wxCB_READONLY | wxCB_DROPDOWN);
Bind(control,_T("Video Default Zoom")); Bind(control,_T("Video Default Zoom"));
videoSizer3->Add(control,1,wxEXPAND); videoSizer3->Add(control,1,wxEXPAND);
videoSizer3->Add(new wxStaticText(videoPage,-1,_("Fast Jump step in frames: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10); videoSizer3->Add(new wxStaticText(videoPage,-1,_("Fast jump step in frames: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10);
control = new wxTextCtrl(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator()); control = new wxTextCtrl(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator());
Bind(control,_T("Video fast jump step")); Bind(control,_T("Video fast jump step"));
videoSizer3->Add(control,1,wxEXPAND); videoSizer3->Add(control,1,wxEXPAND);
@ -353,7 +353,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
videoSizer3->AddGrowableCol(1,1); videoSizer3->AddGrowableCol(1,1);
// Second sizer // Second sizer
videoSizer4->Add(new wxStaticText(videoPage,-1,_("Video Provider: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10); videoSizer4->Add(new wxStaticText(videoPage,-1,_("Video provider: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10);
wxArrayString choices4; wxArrayString choices4;
#ifdef __WINDOWS__ #ifdef __WINDOWS__
choices4.Add(_T("Avisynth")); choices4.Add(_T("Avisynth"));
@ -367,16 +367,16 @@ DialogOptions::DialogOptions(wxWindow *parent)
control = new wxComboBox(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,choices4,wxCB_DROPDOWN | wxCB_READONLY); control = new wxComboBox(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,choices4,wxCB_DROPDOWN | wxCB_READONLY);
Bind(control,_T("Video provider"),1); Bind(control,_T("Video provider"),1);
videoSizer4->Add(control,1,wxEXPAND); videoSizer4->Add(control,1,wxEXPAND);
videoSizer4->Add(new wxStaticText(videoPage,-1,_("Avisynth Video Resizer: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10); videoSizer4->Add(new wxStaticText(videoPage,-1,_("Avisynth video resizer: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10);
wxString choices5[3] = { _T("BilinearResize"), _T("BicubicResize"), _T("LanczosResize") }; wxString choices5[3] = { _T("BilinearResize"), _T("BicubicResize"), _T("LanczosResize") };
control = new wxComboBox(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,3,choices5,wxCB_DROPDOWN); control = new wxComboBox(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,3,choices5,wxCB_DROPDOWN);
Bind(control,_T("Video resizer")); Bind(control,_T("Video resizer"));
videoSizer4->Add(control,1,wxEXPAND); videoSizer4->Add(control,1,wxEXPAND);
videoSizer4->Add(new wxStaticText(videoPage,-1,_("Avisynth Memory Limit: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10); videoSizer4->Add(new wxStaticText(videoPage,-1,_("Avisynth memory limit: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10);
control = new wxTextCtrl(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator(NULL,false)); control = new wxTextCtrl(videoPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator(NULL,false));
Bind(control,_T("Avisynth memorymax")); Bind(control,_T("Avisynth memorymax"));
videoSizer4->Add(control,1,wxEXPAND); videoSizer4->Add(control,1,wxEXPAND);
control = new wxCheckBox(videoPage,-1,_("Threaded Video")); control = new wxCheckBox(videoPage,-1,_("Threaded video"));
Bind(control,_T("Threaded video")); Bind(control,_T("Threaded video"));
videoSizer4->Add(control,1,wxEXPAND); videoSizer4->Add(control,1,wxEXPAND);
control = new wxCheckBox(videoPage,-1,_("Allow pre-2.56a Avisynth")); control = new wxCheckBox(videoPage,-1,_("Allow pre-2.56a Avisynth"));
@ -454,19 +454,19 @@ DialogOptions::DialogOptions(wxWindow *parent)
audioSizer5->Add(control,1,wxEXPAND,0); audioSizer5->Add(control,1,wxEXPAND,0);
control = new wxTextCtrl(audioPage,-1); control = new wxTextCtrl(audioPage,-1);
Bind(control,_T("Audio HD Cache Location")); Bind(control,_T("Audio HD Cache Location"));
audioSizer5->Add(new wxStaticText(audioPage,-1,_("HD Cache Path: ")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,5); audioSizer5->Add(new wxStaticText(audioPage,-1,_("HD cache path: ")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,5);
audioSizer5->Add(control,1,wxEXPAND,0); audioSizer5->Add(control,1,wxEXPAND,0);
control = new wxTextCtrl(audioPage,-1); control = new wxTextCtrl(audioPage,-1);
Bind(control,_T("Audio HD Cache Name")); Bind(control,_T("Audio HD Cache Name"));
audioSizer5->Add(new wxStaticText(audioPage,-1,_("HD Cache Name: ")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,5); audioSizer5->Add(new wxStaticText(audioPage,-1,_("HD cache name: ")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,5);
audioSizer5->Add(control,1,wxEXPAND,0); audioSizer5->Add(control,1,wxEXPAND,0);
control = new wxTextCtrl(audioPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator()); control = new wxTextCtrl(audioPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator());
Bind(control,_T("Audio Spectrum Cutoff")); Bind(control,_T("Audio Spectrum Cutoff"));
audioSizer5->Add(new wxStaticText(audioPage,-1,_("Spectrum Cutoff: ")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,5); audioSizer5->Add(new wxStaticText(audioPage,-1,_("Spectrum cutoff: ")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,5);
audioSizer5->Add(control,1,wxEXPAND,0); audioSizer5->Add(control,1,wxEXPAND,0);
control = new wxTextCtrl(audioPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator()); control = new wxTextCtrl(audioPage,-1,_T(""),wxDefaultPosition,wxDefaultSize,0,NumValidator());
Bind(control,_T("Audio Spectrum Window")); Bind(control,_T("Audio Spectrum Window"));
audioSizer5->Add(new wxStaticText(audioPage,-1,_("Spectrum FFT Window Exponent: ")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,5); audioSizer5->Add(new wxStaticText(audioPage,-1,_("Spectrum FFT window exponent: ")),0,wxRIGHT | wxALIGN_CENTER_VERTICAL,5);
audioSizer5->Add(control,1,wxEXPAND,0); audioSizer5->Add(control,1,wxEXPAND,0);
audioSizer5->AddGrowableCol(0,1); audioSizer5->AddGrowableCol(0,1);
@ -492,7 +492,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
wxFlexGridSizer *displaySizer4 = new wxFlexGridSizer(14,2,2,2); wxFlexGridSizer *displaySizer4 = new wxFlexGridSizer(14,2,2,2);
// First sizer // First sizer
wxString labels1[4] = { _("Draw Secondary Lines"), _("Draw Selection Background"), _("Draw Timeline"), _("Draw Cursor Time") }; wxString labels1[4] = { _("Draw secondary lines"), _("Draw selection background"), _("Draw timeline"), _("Draw cursor time") };
wxString options1[4] = { _T("Draw Secondary Lines"), _T("Draw Selection Background") , _T("Draw Timeline"), _T("Draw Cursor Time")}; wxString options1[4] = { _T("Draw Secondary Lines"), _T("Draw Selection Background") , _T("Draw Timeline"), _T("Draw Cursor Time")};
for (int i=0;i<4;i++) { for (int i=0;i<4;i++) {
wxCheckBox *control = new wxCheckBox(displayPage,-1,labels1[i]); wxCheckBox *control = new wxCheckBox(displayPage,-1,labels1[i]);
@ -502,14 +502,14 @@ DialogOptions::DialogOptions(wxWindow *parent)
// Second sizer // Second sizer
wxControl *control; wxControl *control;
wxString labels2[14] = { _("Play cursor"), _("Background"), _("Selection Background"), wxString labels2[14] = { _("Play cursor"), _("Background"), _("Selection background"),
_("Selection Background - Modified"), _("Seconds Boundary"), _("Waveform"), _("Selection background - modified"), _("Seconds boundary"), _("Waveform"),
_("Waveform - Selection"), _("Waveform - Modified"), _("Waveform - Inactive"), _("Waveform - selection"), _("Waveform - modified"), _("Waveform - inactive"),
_("Boundary - Start"), _("Boundary - End"), _("Boundary - Inactive"), _("Boundary - start"), _("Boundary - end"), _("Boundary - inactive"),
_("Syllable Text"), _("Syllable Boundary") }; _("Syllable text"), _("Syllable boundary") };
wxString options2[14] = { _T("Play cursor"), _T("Background"), _T("Selection Background"), wxString options2[14] = { _T("Play cursor"), _T("Background"), _T("Selection background"),
_T("Selection Background Modified"), _T("Seconds Boundaries"), _T("Waveform"), _T("Selection background modified"), _T("Seconds boundaries"), _T("Waveform"),
_T("Waveform Selected"), _T("Waveform Modified"), _T("Waveform Inactive"), _T("Waveform selected"), _T("Waveform Modified"), _T("Waveform Inactive"),
_T("Line boundary start"), _T("Line boundary end"), _T("Line boundary inactive line"), _T("Line boundary start"), _T("Line boundary end"), _T("Line boundary inactive line"),
_T("Syllable text"), _T("Syllable boundaries") }; _T("Syllable text"), _T("Syllable boundaries") };
for (int i=0;i<14;i++) { for (int i=0;i<14;i++) {
@ -575,15 +575,15 @@ DialogOptions::DialogOptions(wxWindow *parent)
// List book // List book
book->AddPage(generalPage,_("General"),true); book->AddPage(generalPage,_("General"),true);
book->AddSubPage(filePage,_("File Save/Load"),true); book->AddSubPage(filePage,_("File save/load"),true);
book->AddSubPage(editPage,_("Subtitles Edit Box"),true); book->AddSubPage(editPage,_("Subtitles edit box"),true);
book->AddSubPage(gridPage,_("Subtitles Grid"),true); book->AddSubPage(gridPage,_("Subtitles grid"),true);
book->AddPage(videoPage,_("Video"),true); book->AddPage(videoPage,_("Video"),true);
book->AddPage(audioPage,_("Audio"),true); book->AddPage(audioPage,_("Audio"),true);
book->AddSubPage(displayPage,_("Display"),true); book->AddSubPage(displayPage,_("Display"),true);
book->AddPage(autoPage,_("Automation"),true); book->AddPage(autoPage,_("Automation"),true);
#ifdef wxUSE_TREEBOOK #ifdef wxUSE_TREEBOOK
book->ChangeSelection(Options.AsInt(_T("Options Page"))); book->ChangeSelection(Options.AsInt(_T("Options page")));
#endif #endif
// Buttons Sizer // Buttons Sizer

14
aegisub/options.cpp
View file

@ -73,7 +73,7 @@ void OptionsManager::LoadDefaults() {
SetModificationType(MOD_AUTOMATIC); SetModificationType(MOD_AUTOMATIC);
SetBool(_T("Tips enabled"),true); SetBool(_T("Tips enabled"),true);
SetBool(_T("Show splash"),true); SetBool(_T("Show splash"),true);
SetInt(_T("Undo Levels"),8); SetInt(_T("Undo levels"),8);
SetInt(_T("Recent timecodes max"),16); SetInt(_T("Recent timecodes max"),16);
SetInt(_T("Recent keyframes max"),16); SetInt(_T("Recent keyframes max"),16);
SetInt(_T("Recent sub max"),16); SetInt(_T("Recent sub max"),16);
@ -81,7 +81,7 @@ void OptionsManager::LoadDefaults() {
SetInt(_T("Recent aud max"),16); SetInt(_T("Recent aud max"),16);
SetInt(_T("Recent find max"),16); SetInt(_T("Recent find max"),16);
SetInt(_T("Recent replace max"),16); SetInt(_T("Recent replace max"),16);
SetInt(_T("Auto Check for Updates"),-1); SetInt(_T("Auto check for updates"),-1);
// File Save/Load // File Save/Load
SetModificationType(MOD_RESTART); SetModificationType(MOD_RESTART);
@ -94,16 +94,16 @@ void OptionsManager::LoadDefaults() {
SetInt(_T("Autoload linked files"),2); SetInt(_T("Autoload linked files"),2);
SetText(_T("Text actor separator"),_T(":")); SetText(_T("Text actor separator"),_T(":"));
SetText(_T("Text comment starter"),_T("#")); SetText(_T("Text comment starter"),_T("#"));
SetText(_T("Save Charset"),_T("UTF-8")); SetText(_T("Save charset"),_T("UTF-8"));
SetBool(_T("Use nonstandard Milisecond Times"),false); SetBool(_T("Use nonstandard milisecond times"),false);
SetBool(_T("Auto save on every change"),false); SetBool(_T("Auto save on every change"),false);
// Edit Box // Edit Box
SetText(_T("Dictionaries path"),_T("dictionaries")); SetText(_T("Dictionaries path"),_T("dictionaries"));
SetBool(_T("Link Time Boxes Commit"),true); SetBool(_T("Link time boxes commit"),true);
SetModificationType(MOD_EDIT_BOX); SetModificationType(MOD_EDIT_BOX);
SetBool(_T("Call Tips Enabled"),true); SetBool(_T("Call tips enabled"),true);
SetBool(_T("Syntax Highlight Enabled"),true); SetBool(_T("Syntax highlight enabled"),true);
// Edit box cosmetic // Edit box cosmetic
SetColour(_T("Syntax Highlight Normal"),wxColour(0,0,0)); SetColour(_T("Syntax Highlight Normal"),wxColour(0,0,0));