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

Added a little very specific hacked up tool that isn't enabled unless you modify config.dat. 

Originally committed to SVN as r2185.
This commit is contained in:
Rodrigo Braz Monteiro 2008-04-21 16:41:46 +00:00
parent 8fa30c8f15
commit 8918fb6296
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
aegisub/dialog_colorpicker.cpp
View File

@ -44,11 +44,13 @@
#include <wx/dcmemory.h> #include <wx/dcmemory.h>
#include <wx/dcscreen.h> #include <wx/dcscreen.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/clipbrd.h>
#include "dialog_colorpicker.h" #include "dialog_colorpicker.h"
#include "colorspace.h" #include "colorspace.h"
#include "ass_style.h" #include "ass_style.h"
#include "options.h" #include "options.h"
#include "help_button.h" #include "help_button.h"
#include "utils.h"
#ifdef WIN32 #ifdef WIN32
@ -557,12 +559,16 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color)
hsx_sizer->AddSpacer(5); hsx_sizer->AddSpacer(5);
hsx_sizer->Add(hsv_box); hsx_sizer->Add(hsv_box);
wxSizer *recent_sizer = new wxBoxSizer(wxVERTICAL);
recent_sizer->Add(recent_box, 1, wxEXPAND);
if (Options.AsBool(_T("RGBAdjust Tool"))) recent_sizer->Add(new wxButton(this,BUTTON_RGBADJUST,_T("rgbadjust()")), 0, wxEXPAND);
wxSizer *picker_sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *picker_sizer = new wxBoxSizer(wxHORIZONTAL);
picker_sizer->AddStretchSpacer(); picker_sizer->AddStretchSpacer();
picker_sizer->Add(screen_dropper_icon, 0, wxALIGN_CENTER|wxRIGHT, 5); picker_sizer->Add(screen_dropper_icon, 0, wxALIGN_CENTER|wxRIGHT, 5);
picker_sizer->Add(screen_dropper, 0, wxALIGN_CENTER); picker_sizer->Add(screen_dropper, 0, wxALIGN_CENTER);
picker_sizer->AddStretchSpacer(); picker_sizer->AddStretchSpacer();
picker_sizer->Add(recent_box, 0, wxALIGN_CENTER); picker_sizer->Add(recent_sizer, 0, wxALIGN_CENTER);
picker_sizer->AddStretchSpacer(); picker_sizer->AddStretchSpacer();
wxStdDialogButtonSizer *button_sizer = new wxStdDialogButtonSizer(); wxStdDialogButtonSizer *button_sizer = new wxStdDialogButtonSizer();
@ -999,6 +1005,7 @@ BEGIN_EVENT_TABLE(DialogColorPicker, wxDialog)
EVT_COMMAND(SELECTOR_SLIDER, wxSPECTRUM_CHANGE, DialogColorPicker::OnSliderChange) EVT_COMMAND(SELECTOR_SLIDER, wxSPECTRUM_CHANGE, DialogColorPicker::OnSliderChange)
EVT_COMMAND(SELECTOR_RECENT, wxRECENT_SELECT, DialogColorPicker::OnRecentSelect) EVT_COMMAND(SELECTOR_RECENT, wxRECENT_SELECT, DialogColorPicker::OnRecentSelect)
EVT_COMMAND(SELECTOR_DROPPER_PICK, wxDROPPER_SELECT, DialogColorPicker::OnRecentSelect) EVT_COMMAND(SELECTOR_DROPPER_PICK, wxDROPPER_SELECT, DialogColorPicker::OnRecentSelect)
EVT_BUTTON(BUTTON_RGBADJUST, DialogColorPicker::OnRGBAdjust)
END_EVENT_TABLE() END_EVENT_TABLE()
@ -1192,6 +1199,23 @@ void DialogColorPicker::OnDropperMouse(wxMouseEvent &evt)
} }
// rgbadjust() tool
void DialogColorPicker::OnRGBAdjust(wxCommandEvent &evt)
{
wxColour cur = cur_color;
wxColour old = recent_box->GetColor(0);
double r = double(cur.Red()) / double(old.Red());
double g = double(cur.Green()) / double(old.Green());
double b = double(cur.Blue()) / double(old.Blue());
wxString data = wxString(_T("rgbadjust(")) + PrettyFloatD(r) + _T(",") + PrettyFloatD(g) + _T(",") + PrettyFloatD(b) + _T(")");
if (wxTheClipboard->Open()) {
wxTheClipboard->SetData(new wxTextDataObject(data));
wxTheClipboard->Close();
}
}
// Static values for last position of the dialog in this Aegisub session // Static values for last position of the dialog in this Aegisub session
int DialogColorPicker::lastx = -1; int DialogColorPicker::lastx = -1;
int DialogColorPicker::lasty = -1; int DialogColorPicker::lasty = -1;

3
aegisub/dialog_colorpicker.h
View File

@ -93,6 +93,7 @@ public:
void LoadFromString(const wxString &recent_string); void LoadFromString(const wxString &recent_string);
wxString StoreToString(); wxString StoreToString();
void AddColor(wxColour color); void AddColor(wxColour color);
wxColour GetColor(int n) { return colors.at(n); }
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
@ -188,6 +189,7 @@ private:
void OnSpectrumChange(wxCommandEvent &evt); void OnSpectrumChange(wxCommandEvent &evt);
void OnSliderChange(wxCommandEvent &evt); void OnSliderChange(wxCommandEvent &evt);
void OnRecentSelect(wxCommandEvent &evt); // also handles dropper pick void OnRecentSelect(wxCommandEvent &evt); // also handles dropper pick
void OnRGBAdjust(wxCommandEvent &evt);
void OnDropperMouse(wxMouseEvent &evt); void OnDropperMouse(wxMouseEvent &evt);
static int lastx, lasty; static int lastx, lasty;
@ -221,6 +223,7 @@ enum {
SELECTOR_RECENT, SELECTOR_RECENT,
SELECTOR_DROPPER, SELECTOR_DROPPER,
SELECTOR_DROPPER_PICK, SELECTOR_DROPPER_PICK,
BUTTON_RGBADJUST
}; };

3
aegisub/options.cpp
View File

@ -290,6 +290,9 @@ void OptionsManager::LoadDefaults(bool onlyDefaults,bool doOverride) {
SetColour(_T("Audio Background"),wxColour(0,0,0)); SetColour(_T("Audio Background"),wxColour(0,0,0));
SetModificationType(MOD_OFF); SetModificationType(MOD_OFF);
// RGB Adjust tool
SetBool(_T("RGBAdjust Tool"),false);
// Only defaults? // Only defaults?
if (!onlyDefaults) { if (!onlyDefaults) {