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

Added help button to colour picker and changed its default colour space to HSV/H.

Browse source 
Originally committed to SVN as r1703.
This commit is contained in:
Rodrigo Braz Monteiro 2008-01-13 22:06:04 +00:00
parent 3f522b8836
commit 62e3c7a3a6
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/dialog_colorpicker.cpp
View file

@ -48,6 +48,7 @@
#include "colorspace.h" #include "colorspace.h"
#include "ass_style.h" #include "ass_style.h"
#include "options.h" #include "options.h"
#include "help_button.h"
#ifdef WIN32 #ifdef WIN32
@ -560,7 +561,11 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
picker_sizer->Add(recent_box, 0, wxALIGN_CENTER); picker_sizer->Add(recent_box, 0, wxALIGN_CENTER);
picker_sizer->AddStretchSpacer(); picker_sizer->AddStretchSpacer();
wxSizer *button_sizer = CreateStdDialogButtonSizer(wxOK|wxCANCEL); wxStdDialogButtonSizer *button_sizer = new wxStdDialogButtonSizer();
button_sizer->AddButton(new wxButton(this,wxID_OK));
button_sizer->AddButton(new wxButton(this,wxID_CANCEL));
button_sizer->AddButton(new HelpButton(this,_T("Colour Picker")));
button_sizer->Realize();
wxSizer *input_sizer = new wxBoxSizer(wxVERTICAL); wxSizer *input_sizer = new wxBoxSizer(wxVERTICAL);
input_sizer->Add(rgb_box, 0, wxALIGN_CENTER|wxEXPAND); input_sizer->Add(rgb_box, 0, wxALIGN_CENTER|wxEXPAND);

1
aegisub/help_button.cpp
View file

@ -95,6 +95,7 @@ void HelpButton::InitStatic() {
if (!pages) { if (!pages) {
pages = new std::map<wxString,wxString>; pages = new std::map<wxString,wxString>;
std::map<wxString,wxString> &page = *pages; std::map<wxString,wxString> &page = *pages;
page[_T("Colour Picker")] = _T("Colour_Picker");
page[_T("Kanji Timer")] = _T("Kanji_Timer"); page[_T("Kanji Timer")] = _T("Kanji_Timer");
page[_T("Main")] = _T(""); page[_T("Main")] = _T("");
page[_T("Options")] = _T("Options"); page[_T("Options")] = _T("Options");

2
aegisub/options.cpp
View file

@ -359,7 +359,7 @@ void OptionsManager::LoadDefaults(bool onlyDefaults) {
SetBool(_T("Select Match comments"),false); SetBool(_T("Select Match comments"),false);
SetText(_T("Color Picker Recent"), _T("&H000000& &H0000FF& &H00FFFF& &H00FF00& &HFFFF00& &HFF0000& &HFF00FF& &HFFFFFF&")); SetText(_T("Color Picker Recent"), _T("&H000000& &H0000FF& &H00FFFF& &H00FF00& &HFFFF00& &HFF0000& &HFF00FF& &HFFFFFF&"));
SetInt(_T("Color Picker Mode"), 3); SetInt(_T("Color Picker Mode"), 4);
SetText(_T("Last open subtitles path"),_T("")); SetText(_T("Last open subtitles path"),_T(""));
SetText(_T("Last open video path"),_T("")); SetText(_T("Last open video path"),_T(""));