mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
CtrlLib: DateTimeCtrl fixed in dark theme
git-svn-id: svn://ultimatepp.org/upp/trunk@13682 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
85f2afdb27
commit
620bc1ec74
2 changed files with 61 additions and 61 deletions
|
|
@ -564,49 +564,49 @@ IMAGE_DATA(204,38,207,3,248,145,157,129,252,170,242,23,98,212,3,155,0,0,0,0,0,0,
|
|||
IMAGE_END_DATA(1088, 24)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,89,123,76,83,87,28,190,102,89,178,63,150,72,178,152,101,46,49,221,178,133,164,49,155,209,108,25,217,28)
|
||||
IMAGE_DATA(101,19,216,156,83,167,235,50,134,48,148,71,34,10,131,161,188,68,169,193,58,39,102,209,77,16,24,143,6,100,178,10)
|
||||
IMAGE_DATA(202,80,129,109,153,99,14,117,168,75,0,121,63,228,253,28,108,62,38,232,148,251,173,231,150,219,222,219,158,219,210,162)
|
||||
IMAGE_DATA(43,89,238,185,249,229,244,222,115,190,223,247,125,191,115,238,105,3,140,27,227,198,32,153,121,144,13,211,161,118,22,175)
|
||||
IMAGE_DATA(215,235,249,28,206,228,1,105,85,85,85,208,104,52,80,169,84,142,230,225,240,6,4,20,127,43,160,105,212,56,154,199)
|
||||
IMAGE_DATA(132,231,47,7,243,88,225,29,204,35,137,231,47,213,168,202,84,31,198,92,103,187,248,5,35,11,160,214,171,161,86,171)
|
||||
IMAGE_DATA(109,173,143,21,94,136,83,42,149,51,246,239,32,78,132,39,222,28,196,153,240,22,117,113,120,255,57,137,115,125,155,221)
|
||||
IMAGE_DATA(97,160,52,24,38,133,83,58,97,156,199,242,33,149,67,56,79,56,135,220,39,67,220,211,154,6,58,221,25,46,232,115)
|
||||
IMAGE_DATA(164,112,70,110,149,42,141,195,146,151,135,124,182,214,105,11,79,94,92,61,135,35,120,177,6,123,250,141,220,4,207,123)
|
||||
IMAGE_DATA(16,107,176,87,63,51,55,159,203,90,131,212,250,137,185,133,117,148,174,131,20,183,217,35,93,131,237,154,75,133,180,6)
|
||||
IMAGE_DATA(35,183,66,177,31,226,250,104,76,58,164,53,152,235,68,207,111,30,167,207,49,114,27,15,90,61,37,191,121,156,62,39)
|
||||
IMAGE_DATA(217,74,171,24,111,57,78,155,227,124,115,35,135,129,179,109,201,146,37,158,196,20,233,157,197,242,33,157,195,51,217,108)
|
||||
IMAGE_DATA(220,211,116,108,209,54,8,29,175,193,129,3,39,16,31,95,68,221,128,210,56,210,140,139,191,111,95,9,42,43,127,162)
|
||||
IMAGE_DATA(110,16,219,120,13,162,162,10,57,28,193,23,21,85,154,52,216,215,175,84,175,93,155,197,225,9,134,96,133,26,236,215)
|
||||
IMAGE_DATA(207,200,77,114,240,62,44,53,72,175,159,152,155,97,20,158,52,13,246,124,27,185,173,15,3,161,6,169,154,63,236,195)
|
||||
IMAGE_DATA(128,174,97,246,135,65,80,144,142,27,35,61,237,48,224,199,233,115,92,123,24,216,251,101,160,246,243,243,3,45,24,219)
|
||||
IMAGE_DATA(63,131,56,220,26,181,55,206,55,148,96,28,181,162,32,207,200,152,68,30,181,16,55,134,58,43,60,255,140,207,35,204)
|
||||
IMAGE_DATA(65,114,10,57,115,245,169,252,28,46,200,103,242,76,168,101,90,135,137,219,56,86,199,133,165,7,158,211,60,167,214,164)
|
||||
IMAGE_DATA(65,204,93,71,237,105,120,94,3,9,33,183,56,140,94,222,90,173,18,232,55,143,205,4,47,246,82,231,0,158,166,219)
|
||||
IMAGE_DATA(49,188,52,183,24,47,165,143,172,157,45,109,252,94,162,105,28,179,232,105,218,248,61,36,165,193,200,111,147,155,186,127)
|
||||
IMAGE_DATA(205,97,185,31,232,251,247,1,188,63,206,191,191,10,102,158,240,22,46,237,231,25,228,204,25,49,10,11,49,0,247,221)
|
||||
IMAGE_DATA(237,146,222,149,220,211,5,145,253,203,254,101,255,178,127,217,191,236,95,246,47,251,151,253,203,254,101,255,178,127,217,191)
|
||||
IMAGE_DATA(236,255,255,239,255,17,195,101,163,193,234,137,45,64,247,186,117,118,1,228,47,53,99,130,158,0,174,76,223,95,224,122)
|
||||
IMAGE_DATA(75,192,116,86,174,231,67,248,156,153,199,60,97,154,125,227,198,4,174,54,180,161,161,177,29,141,77,29,104,106,238,68)
|
||||
IMAGE_DATA(115,235,53,180,182,117,163,173,189,7,237,29,189,232,184,214,135,206,174,126,92,235,30,64,119,207,16,122,250,134,209,219)
|
||||
IMAGE_DATA(63,130,190,129,81,244,15,254,129,129,161,49,92,186,92,11,230,49,230,113,91,197,121,216,205,186,150,226,49,72,204,1)
|
||||
IMAGE_DATA(37,108,141,73,229,153,91,205,197,139,225,76,155,73,177,103,178,16,51,89,164,255,116,1,207,205,230,255,174,115,173,177)
|
||||
IMAGE_DATA(241,219,192,69,236,167,152,138,142,196,253,173,225,136,251,102,20,219,142,14,35,82,55,140,45,57,131,8,205,236,71,96)
|
||||
IMAGE_DATA(90,47,124,61,220,214,183,20,126,136,246,239,180,168,205,241,193,170,151,231,7,114,216,31,43,193,126,95,14,182,252,20)
|
||||
IMAGE_DATA(216,83,165,240,222,211,133,47,43,198,16,95,56,136,152,252,65,104,75,70,16,178,55,29,67,103,227,112,189,254,52,112)
|
||||
IMAGE_DATA(107,0,127,213,23,227,76,178,215,240,84,76,20,216,138,211,96,181,187,193,238,78,2,123,178,24,30,59,90,177,191,108)
|
||||
IMAGE_DATA(20,145,121,253,8,207,238,67,94,113,33,70,234,53,184,219,87,134,161,170,84,76,92,61,129,251,221,213,184,146,181,105)
|
||||
IMAGE_DATA(146,232,37,156,236,174,4,176,9,219,193,234,139,160,220,214,130,148,146,97,132,102,244,66,155,87,140,241,134,157,152,154)
|
||||
IMAGE_DATA(168,198,68,231,86,140,95,138,64,115,65,48,106,178,55,32,44,111,53,254,9,9,230,56,137,127,54,58,2,236,209,124)
|
||||
IMAGE_DATA(44,218,220,132,29,199,134,176,59,235,91,252,121,53,1,83,147,23,113,187,227,99,76,246,250,227,102,83,34,218,115,87)
|
||||
IMAGE_DATA(162,180,58,11,239,166,123,227,142,191,63,199,201,126,178,5,236,230,80,176,186,92,44,12,170,67,106,134,14,67,151,227)
|
||||
IMAGE_DATA(166,177,129,152,236,249,8,55,26,118,160,249,136,15,14,158,140,65,193,239,199,176,34,117,57,38,222,91,207,113,178,97)
|
||||
IMAGE_DATA(155,192,110,12,0,251,117,38,222,9,57,140,134,138,88,131,230,115,152,236,10,198,157,222,0,92,55,232,104,61,226,139)
|
||||
IMAGE_DATA(189,101,113,136,41,75,64,246,111,58,188,166,121,9,183,125,87,114,156,108,160,65,135,223,7,104,209,134,161,177,60,17)
|
||||
IMAGE_DATA(117,21,7,209,95,163,198,237,46,127,140,215,198,163,230,192,42,28,175,206,68,116,105,28,194,143,71,33,221,160,127,89)
|
||||
IMAGE_DATA(236,11,184,181,220,139,227,100,51,210,193,166,125,5,253,231,111,2,55,187,209,146,245,62,206,38,46,196,249,140,183,81)
|
||||
IMAGE_DATA(158,226,141,165,175,23,33,183,38,31,153,23,114,144,246,107,6,14,85,29,198,226,8,119,104,86,124,134,93,158,41,216)
|
||||
IMAGE_DATA(249,74,50,146,150,37,33,37,100,49,238,94,60,140,187,53,135,80,163,245,66,193,198,231,240,162,71,33,230,187,255,140)
|
||||
IMAGE_DATA(231,215,36,225,153,149,137,88,228,19,135,167,223,216,142,167,60,99,172,94,220,117,175,186,77,238,9,112,191,247,131,214)
|
||||
IMAGE_DATA(247,222,23,225,75,127,121,114,254,163,207,186,226,189,152,105,251,23,36,79,112,33,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_DATA(120,156,237,89,127,76,148,101,28,63,214,218,250,163,77,182,230,90,70,118,215,106,108,55,87,76,87,203,149,113,148,72)
|
||||
IMAGE_DATA(145,169,129,231,36,148,80,193,77,16,2,65,249,33,114,199,240,204,132,53,45,64,64,129,27,72,208,9,74,136,64,191)
|
||||
IMAGE_DATA(140,12,52,202,22,135,168,152,53,12,21,144,129,153,6,136,202,251,233,158,247,120,239,222,247,238,121,239,184,67,59,215)
|
||||
IMAGE_DATA(222,231,221,119,207,189,239,243,124,190,159,207,231,251,60,239,115,55,144,121,203,188,101,208,200,238,101,195,100,168,221,197)
|
||||
IMAGE_DATA(27,12,6,46,135,59,121,64,90,75,75,11,180,90,45,84,42,149,171,121,88,188,9,1,249,63,114,104,207,104,93,205)
|
||||
IMAGE_DATA(99,193,115,151,139,121,236,240,46,230,17,197,115,151,106,80,101,169,143,204,90,103,167,248,153,87,103,66,109,80,67,173)
|
||||
IMAGE_DATA(86,59,90,31,59,60,31,167,84,42,167,236,223,69,156,0,79,188,185,136,179,224,109,234,226,242,254,115,19,231,249,54)
|
||||
IMAGE_DATA(189,195,64,105,50,76,10,167,116,195,56,135,229,66,44,7,127,30,127,14,185,215,64,216,211,154,22,122,253,81,54,232)
|
||||
IMAGE_DATA(115,196,112,102,110,149,42,159,197,146,151,135,124,182,215,233,8,79,94,92,3,139,35,120,161,6,103,250,205,220,4,207)
|
||||
IMAGE_DATA(121,16,106,112,86,63,43,55,151,203,94,131,216,250,9,185,249,117,20,175,131,24,183,213,35,93,131,227,154,139,133,184)
|
||||
IMAGE_DATA(6,51,183,92,190,11,194,250,104,45,58,196,53,88,235,68,207,111,29,167,207,49,115,155,15,90,3,37,191,117,156,62)
|
||||
IMAGE_DATA(71,99,167,85,136,183,29,167,205,113,191,121,147,195,192,221,230,231,231,231,79,76,145,222,93,44,23,226,57,252,53,86)
|
||||
IMAGE_DATA(227,254,150,99,139,182,65,232,120,45,114,115,15,33,53,181,154,186,1,197,113,164,153,23,127,231,206,90,52,55,127,75)
|
||||
IMAGE_DATA(221,32,142,241,90,36,36,84,178,56,130,175,174,110,182,104,112,174,95,169,94,182,172,152,197,19,12,193,242,53,56,175)
|
||||
IMAGE_DATA(159,153,155,228,224,124,216,106,16,95,63,33,183,76,38,247,167,105,112,230,219,204,109,127,24,240,53,136,213,252,126,31)
|
||||
IMAGE_DATA(6,116,13,211,63,12,34,35,245,236,24,233,105,135,1,55,78,159,227,217,195,192,217,47,3,117,88,88,24,104,33,115)
|
||||
IMAGE_DATA(252,51,136,197,45,85,7,162,173,171,22,195,232,16,4,121,70,198,68,242,168,249,184,33,24,237,240,220,51,46,15,63)
|
||||
IMAGE_DATA(7,201,201,231,44,53,228,112,115,216,32,159,201,51,190,150,73,29,22,110,243,152,145,13,91,15,28,167,117,78,135,69)
|
||||
IMAGE_DATA(131,144,219,72,237,105,120,78,3,9,62,183,48,204,94,222,92,162,226,233,183,142,77,5,47,244,98,116,1,79,211,237)
|
||||
IMAGE_DATA(26,94,156,91,136,23,211,71,214,206,145,54,110,47,209,52,14,217,244,52,109,220,30,18,211,96,230,119,200,77,221,191)
|
||||
IMAGE_DATA(214,176,221,15,244,253,123,15,222,31,247,223,95,185,204,139,127,11,143,246,94,38,57,15,140,24,185,141,24,128,253,238)
|
||||
IMAGE_DATA(246,72,239,73,238,201,130,72,254,37,255,146,127,201,191,228,95,242,47,249,151,252,75,254,37,255,146,127,201,191,228,95)
|
||||
IMAGE_DATA(242,255,255,247,255,144,233,114,208,96,247,196,17,224,98,72,136,83,0,249,75,205,16,175,39,128,83,147,247,39,216,222)
|
||||
IMAGE_DATA(22,48,153,149,237,185,224,63,111,241,146,61,102,153,173,8,45,130,34,116,159,41,74,161,88,94,14,197,138,42,40,194)
|
||||
IMAGE_DATA(106,161,88,213,0,69,228,55,80,68,183,225,233,216,95,241,212,166,223,224,147,122,5,62,25,215,224,147,57,2,31,205)
|
||||
IMAGE_DATA(109,83,76,152,2,150,144,61,34,123,212,81,113,238,119,179,175,165,112,12,34,115,64,9,71,99,98,121,30,172,230,225)
|
||||
IMAGE_DATA(197,112,167,77,165,216,83,89,136,169,44,210,127,186,128,199,167,243,127,215,7,173,49,169,201,96,99,203,38,76,36,198)
|
||||
IMAGE_DATA(227,238,198,24,164,124,54,136,228,3,3,136,215,15,32,182,164,15,209,69,151,17,145,223,139,160,249,222,161,221,149,43)
|
||||
IMAGE_DATA(113,225,11,29,58,74,22,97,241,75,51,34,88,236,215,205,96,190,108,4,211,120,4,204,145,58,4,110,239,193,39,77)
|
||||
IMAGE_DATA(67,72,173,236,67,82,121,31,116,181,87,17,181,163,0,253,199,82,112,189,179,1,184,121,5,127,117,214,224,168,38,96)
|
||||
IMAGE_DATA(96,34,41,1,76,83,3,24,93,22,152,172,12,48,135,107,48,127,235,121,236,170,31,68,124,217,101,196,236,191,132,178)
|
||||
IMAGE_DATA(154,74,92,237,212,98,252,82,61,250,91,114,48,122,250,16,238,94,108,197,169,226,181,99,68,47,225,100,50,211,192,164)
|
||||
IMAGE_DATA(109,6,99,168,134,50,185,27,217,181,3,136,46,236,133,174,172,6,195,93,219,48,49,218,138,209,63,54,98,248,167,56)
|
||||
IMAGE_DATA(156,171,88,135,246,253,171,176,190,108,9,110,71,173,99,57,137,127,38,49,14,204,129,114,204,222,112,22,91,171,250,145)
|
||||
IMAGE_DATA(85,252,57,174,157,78,195,196,216,73,140,252,254,62,198,122,195,113,227,108,58,46,148,6,163,174,181,24,239,20,4,226)
|
||||
IMAGE_DATA(86,120,56,203,201,124,16,11,102,67,52,24,125,41,102,69,26,145,83,168,71,255,207,41,147,216,8,140,253,249,30,254)
|
||||
IMAGE_DATA(238,218,138,115,123,23,97,247,225,36,84,252,82,133,133,57,11,48,250,110,40,203,201,172,95,11,102,205,106,48,251,138)
|
||||
IMAGE_DATA(240,118,84,30,186,154,182,152,52,31,199,88,207,58,220,234,93,141,235,38,29,231,247,6,97,71,125,10,146,234,211,176)
|
||||
IMAGE_DATA(255,71,61,94,213,190,136,145,160,96,150,147,137,48,233,8,91,129,110,221,122,156,105,76,135,177,105,55,46,183,171,49)
|
||||
IMAGE_DATA(210,19,142,225,142,84,180,231,46,198,193,214,34,36,214,165,32,230,96,2,10,76,250,231,109,121,30,55,23,4,176,156)
|
||||
IMAGE_DATA(76,97,1,152,252,79,97,248,232,13,224,198,69,116,23,47,199,177,244,89,104,43,124,11,141,217,129,152,251,90,53,74)
|
||||
IMAGE_DATA(219,203,81,116,162,4,249,63,20,98,79,75,30,230,196,249,66,187,240,67,100,250,103,99,219,203,26,100,204,203,64,118)
|
||||
IMAGE_DATA(212,28,140,159,204,195,120,251,30,180,235,2,80,177,230,89,188,48,191,18,51,124,191,195,115,75,51,160,8,78,199,236)
|
||||
IMAGE_DATA(69,41,120,242,245,205,120,194,63,201,238,197,13,121,197,123,108,251,106,223,59,95,233,130,238,124,28,51,247,251,199,103)
|
||||
IMAGE_DATA(60,252,140,39,222,139,169,182,127,1,101,189,88,202,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(1440, 15)
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ void Calendar::Reset()
|
|||
Calendar& Calendar::SetStyle(const Style& s)
|
||||
{
|
||||
style = &s;
|
||||
nbg = Colorize(CtrlImg::Bg(), s.header, 150);
|
||||
nbg = CtrlImg::Bg();
|
||||
Refresh();
|
||||
return *this;
|
||||
}
|
||||
|
|
@ -494,7 +494,7 @@ void Calendar::Paint(Draw &w)
|
|||
}
|
||||
d = GetDaysOfMonth(m, y) - fd + 1;
|
||||
}
|
||||
|
||||
|
||||
for(int i = 0; i < rows; i++)
|
||||
{
|
||||
int yp = 2 + (int) ((i + 1) * rowh + hs);
|
||||
|
|
@ -529,11 +529,11 @@ void Calendar::Paint(Draw &w)
|
|||
{
|
||||
Day(j, i) = d;
|
||||
|
||||
fg = Black;
|
||||
fg = SBlack;
|
||||
|
||||
if(j == 6)
|
||||
{
|
||||
fg = Red;
|
||||
fg = SRed;
|
||||
}
|
||||
if(d == 1)
|
||||
{
|
||||
|
|
@ -584,7 +584,7 @@ void Calendar::Paint(Draw &w)
|
|||
w.DrawRect(xp, yp, cw, rh, bg);
|
||||
if(special)
|
||||
{
|
||||
DrawFrame(w, xp + 1, yp + 1, cw - 2, rh - 2, Black);
|
||||
DrawFrame(w, xp + 1, yp + 1, cw - 2, rh - 2, SBlack);
|
||||
DrawFrame(w, xp, yp, cw, rh, st.bgmain);
|
||||
}
|
||||
|
||||
|
|
@ -800,7 +800,7 @@ LineCtrl::LineCtrl()
|
|||
Clock& Clock::SetStyle(const Style& s)
|
||||
{
|
||||
style = &s;
|
||||
nbg = Colorize(CtrlImg::Bg(), s.header, 150);
|
||||
nbg = CtrlImg::Bg();
|
||||
Refresh();
|
||||
return *this;
|
||||
}
|
||||
|
|
@ -1518,10 +1518,10 @@ CH_STYLE(Clock, Style, StyleDefault)
|
|||
header = SColorHighlight;
|
||||
bgmain = SColorPaper;
|
||||
fgmain = SColorText;
|
||||
arrowhl = Green;
|
||||
arrowhour = Red;
|
||||
arrowminute = Blue;
|
||||
arrowsecond = Black;
|
||||
arrowhl = SGreen;
|
||||
arrowhour = SRed;
|
||||
arrowminute = SBlue;
|
||||
arrowsecond = SBlack;
|
||||
font = StdFont();
|
||||
}
|
||||
|
||||
|
|
@ -1531,19 +1531,19 @@ CH_STYLE(Calendar, Style, StyleDefault)
|
|||
|
||||
bgmain = SColorPaper;
|
||||
bgtoday = SColorPaper;
|
||||
bgselect = Color(255, 254, 220);
|
||||
bgselect = AdjustIfDark(Color(255, 254, 220));
|
||||
|
||||
fgmain = SColorText;
|
||||
fgtoday = Black;
|
||||
fgselect = Black;
|
||||
fgtoday = SBlack;
|
||||
fgselect = SBlack;
|
||||
|
||||
outofmonth = Color(180, 180, 180);
|
||||
curdate = White;
|
||||
outofmonth = AdjustIfDark(Color(180, 180, 180));
|
||||
curdate = SWhite;
|
||||
today = SColorText;
|
||||
selecttoday = SColorMark;
|
||||
cursorday = SColorText;
|
||||
selectday = SColorMark;
|
||||
line = Gray;
|
||||
line = SGray;
|
||||
dayname = SColorText;
|
||||
week = SColorText;
|
||||
font = StdFont();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue