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

Selected comments are now highlighted in a different color

Browse source 
Originally committed to SVN as r87.
This commit is contained in:
Rodrigo Braz Monteiro 2006-02-20 23:12:08 +00:00
parent fd728e90d5
commit c31367c761
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/base_grid.cpp
View file

@ -282,15 +282,17 @@ void BaseGrid::DrawImage(wxDC &dc) {
// Row colors // Row colors
std::vector<wxBrush> rowColors; std::vector<wxBrush> rowColors;
std::vector<wxColor> foreColors; std::vector<wxColor> foreColors;
rowColors.push_back(wxBrush(wxColour(255,255,255))); // 0 = Standard rowColors.push_back(wxBrush(wxColour(255,255,255))); // 0 = Standard
foreColors.push_back(wxColour(0,0,0)); foreColors.push_back(wxColour(0,0,0));
rowColors.push_back(wxBrush(wxColour(165,207,231))); // 1 = Header rowColors.push_back(wxBrush(wxColour(165,207,231))); // 1 = Header
foreColors.push_back(wxColour(0,0,0)); foreColors.push_back(wxColour(0,0,0));
rowColors.push_back(wxBrush(Options.AsColour(_T("Grid selection background")))); // 2 = Selected rowColors.push_back(wxBrush(Options.AsColour(_T("Grid selection background")))); // 2 = Selected
foreColors.push_back(Options.AsColour(_T("Grid selection foreground"))); foreColors.push_back(Options.AsColour(_T("Grid selection foreground")));
rowColors.push_back(wxBrush(Options.AsColour(_T("Grid comment background")))); // 3 = Commented rowColors.push_back(wxBrush(Options.AsColour(_T("Grid comment background")))); // 3 = Commented
foreColors.push_back(Options.AsColour(_T("Grid selection foreground"))); foreColors.push_back(Options.AsColour(_T("Grid selection foreground")));
rowColors.push_back(wxBrush(Options.AsColour(_T("Grid inframe background")))); // 4 = Video Highlighted rowColors.push_back(wxBrush(Options.AsColour(_T("Grid inframe background")))); // 4 = Video Highlighted
foreColors.push_back(Options.AsColour(_T("Grid selection foreground")));
rowColors.push_back(wxBrush(Options.AsColour(_T("Grid selected comment background")))); // 5 = Commented & selected
foreColors.push_back(Options.AsColour(_T("Grid selection foreground"))); foreColors.push_back(Options.AsColour(_T("Grid selection foreground")));
// First grid row // First grid row
@ -393,7 +395,9 @@ void BaseGrid::DrawImage(wxDC &dc) {
// Set color // Set color
curColor = 0; curColor = 0;
if (IsInSelection(curRow,0)) curColor = 2; bool inSel = IsInSelection(curRow,0);
if (inSel && curDiag->Comment) curColor = 5;
else if (inSel) curColor = 2;
else if (curDiag->Comment) curColor = 3; else if (curDiag->Comment) curColor = 3;
else if (Options.AsBool(_T("Highlight subs in frame")) && IsDisplayed(curDiag)) curColor = 4; else if (Options.AsBool(_T("Highlight subs in frame")) && IsDisplayed(curDiag)) curColor = 4;
} }

1
core/changelog.txt
View file

@ -35,6 +35,7 @@ Please visit http://aegisub.net to download latest version
- Added a simple audio resync method for video playback (AMZ) - Added a simple audio resync method for video playback (AMZ)
- Audio timing will now apply to all selected lines, as well as active line (AMZ) - Audio timing will now apply to all selected lines, as well as active line (AMZ)
- Rows colliding with the currently active one will now be highlighted in grid (AMZ) - Rows colliding with the currently active one will now be highlighted in grid (AMZ)
- Selected comments are now highlighted in a different color (AMZ)
= 1.09 beta - 2006.01.16 =========================== = 1.09 beta - 2006.01.16 ===========================

1
core/options.cpp
View file

@ -110,6 +110,7 @@ void OptionsManager::LoadDefaults() {
SetColour(_T("Grid selection background"),wxColour(206,255,231)); SetColour(_T("Grid selection background"),wxColour(206,255,231));
SetColour(_T("Grid selection foreground"),wxColour(0,0,0)); SetColour(_T("Grid selection foreground"),wxColour(0,0,0));
SetColour(_T("Grid comment background"),wxColour(216,222,245)); SetColour(_T("Grid comment background"),wxColour(216,222,245));
SetColour(_T("Grid selected comment background"),wxColour(211,238,238));
SetColour(_T("Grid inframe background"),wxColour(255,253,234)); SetColour(_T("Grid inframe background"),wxColour(255,253,234));
SetInt(_T("Grid hide overrides"),1); SetInt(_T("Grid hide overrides"),1);
wchar_t temp = 0x2600; wchar_t temp = 0x2600;