mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-21 06:14:08 -06:00
ide: Slideshow improvements
git-svn-id: svn://ultimatepp.org/upp/trunk@12838 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
6e8da83e05
commit
7b24fd6488
4 changed files with 100 additions and 2 deletions
|
|
@ -4,12 +4,14 @@ struct SlideShow;
|
|||
|
||||
struct SlideShowView : RichTextView {
|
||||
SlideShow *slideshow;
|
||||
Image cursor;
|
||||
|
||||
virtual void RightDown(Point p, dword keyflags);
|
||||
virtual void MouseWheel(Point p, int zdelta, dword keyflags);
|
||||
virtual Image CursorImage(Point p, dword keyflags);
|
||||
};
|
||||
|
||||
struct SlideShowSettingsDlg : WithSlideShowSettings<TopWindow> {
|
||||
struct SlideShowSettingsDlg : WithSlideShowSettingsLayout<TopWindow> {
|
||||
SlideShow *slideshow;
|
||||
|
||||
typedef SlideShowSettingsDlg CLASSNAME;
|
||||
|
|
@ -57,6 +59,7 @@ SlideShowSettingsDlg::SlideShowSettingsDlg()
|
|||
margin_minus.WhenRepeat = margin_minus ^= [=] { slideshow->Key(K_ALT|K_SUBTRACT, 1); };
|
||||
title_plus.WhenRepeat = title_plus ^= [=] { slideshow->Key(K_CTRL|K_ALT|K_ADD, 1); };
|
||||
title_minus.WhenRepeat = title_minus ^= [=] { slideshow->Key(K_CTRL|K_ALT|K_SUBTRACT, 1); };
|
||||
pointer ^= [=] { slideshow->SetPage(); };
|
||||
}
|
||||
|
||||
void SlideShow::Serialize(Stream& s)
|
||||
|
|
@ -123,6 +126,13 @@ void SlideShowView::MouseWheel(Point p, int zdelta, dword keyflags)
|
|||
RichTextView::MouseWheel(p, zdelta, keyflags);
|
||||
}
|
||||
|
||||
Image SlideShowView::CursorImage(Point p, dword keyflags)
|
||||
{
|
||||
if(IsNull(cursor))
|
||||
return RichTextView::CursorImage(p, keyflags);
|
||||
return cursor;
|
||||
}
|
||||
|
||||
bool SlideShow::Key(dword key, int count)
|
||||
{
|
||||
switch(key) {
|
||||
|
|
@ -206,6 +216,9 @@ void SlideShow::SetPage()
|
|||
rp = page;
|
||||
text <<= t.text;
|
||||
}
|
||||
|
||||
text.cursor = decode(~settings.pointer, 1, IdeImg::ShowPointer1(), 2, IdeImg::ShowPointer2(),
|
||||
Image());
|
||||
}
|
||||
|
||||
void TopicCtrl::SShow()
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.9 KiB |
|
|
@ -119,6 +119,8 @@ IMAGE_ID(Settings)
|
|||
IMAGE_ID(pencil)
|
||||
IMAGE_ID(arrow_up)
|
||||
IMAGE_ID(arrow_down)
|
||||
IMAGE_ID(ShowPointer1)
|
||||
IMAGE_ID(ShowPointer2)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,152,11,114,194,48,12,68,115,132,30,161,71,229,22,189,14,55,83,9,224,32,108,105,37,255,148,97,176,50)
|
||||
|
|
@ -1166,3 +1168,85 @@ IMAGE_DATA(221,32,111,57,236,122,103,124,55,234,13,67,211,67,237,47,251,136,185,
|
|||
IMAGE_DATA(234,244,205,132,177,177,46,163,178,103,7,153,195,98,191,25,20,231,13,127,40,42,199,107,138,214,114,119,228,173,134,117)
|
||||
IMAGE_DATA(248,17,171,171,246,127,170,42,232,212,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(5184, 17)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,157,93,168,102,83,24,199,151,49,142,175,211,24,26,202,5,229,227,6,37,36,185,146,143,162,220,76,110,16)
|
||||
IMAGE_DATA(166,220,140,27,81,40,23,200,197,220,72,138,114,163,40,74,146,34,97,34,66,6,105,20,51,164,124,53,226,76,50,40)
|
||||
IMAGE_DATA(76,12,198,52,99,94,107,177,247,177,206,58,123,239,179,63,214,247,250,253,234,95,103,102,222,121,231,121,222,253,123,246)
|
||||
IMAGE_DATA(90,251,204,123,246,187,229,60,113,158,208,248,90,230,109,153,227,68,218,204,170,124,34,115,98,224,90,166,48,211,242,149)
|
||||
IMAGE_DATA(204,41,97,203,25,205,204,200,119,50,103,5,173,104,28,102,31,42,63,201,92,16,178,168,17,52,245,161,242,155,204,165)
|
||||
IMAGE_DATA(1,235,26,74,91,31,42,123,101,214,135,43,109,16,93,125,168,236,151,217,16,172,186,254,172,212,135,202,65,153,91,66)
|
||||
IMAGE_DATA(21,216,147,62,125,212,185,55,80,141,125,24,210,135,202,67,50,135,4,169,180,155,161,125,168,60,33,115,104,136,98,59)
|
||||
IMAGE_DATA(24,211,135,202,243,50,135,7,168,183,141,177,125,168,188,46,51,239,191,228,70,166,244,161,178,85,196,177,87,158,218,135)
|
||||
IMAGE_DATA(74,12,123,101,27,125,168,132,222,43,219,234,67,37,228,94,217,102,31,42,161,246,202,182,251,80,9,177,87,118,209,135)
|
||||
IMAGE_DATA(138,239,189,178,171,62,84,124,238,149,93,246,161,162,246,202,215,101,208,135,202,3,145,247,241,135,204,130,204,251,50,155)
|
||||
IMAGE_DATA(101,30,151,185,79,230,54,153,27,100,46,151,57,91,102,85,196,125,124,35,179,218,67,125,125,153,114,60,174,9,80,111)
|
||||
IMAGE_DATA(27,43,213,250,67,199,159,109,15,80,111,27,93,61,168,189,236,58,153,29,29,143,185,204,127,201,141,180,213,247,166,248)
|
||||
IMAGE_DATA(255,218,226,150,142,199,189,234,185,222,54,154,106,123,81,230,8,237,49,107,100,246,180,60,86,173,15,231,120,172,183,13)
|
||||
IMAGE_DATA(179,174,167,68,243,121,232,225,134,199,214,121,210,75,165,221,232,245,60,34,218,207,245,167,203,252,45,154,251,80,251,143)
|
||||
IMAGE_DATA(147,157,87,218,77,93,203,125,61,30,187,89,180,31,147,7,93,21,216,147,77,50,55,245,124,236,21,162,189,15,53,63)
|
||||
IMAGE_DATA(107,93,20,232,0,245,253,183,79,69,123,47,119,133,43,109,48,27,69,123,31,187,68,92,223,211,234,226,104,153,221,162)
|
||||
IMAGE_DATA(189,151,141,225,74,27,140,218,135,183,245,177,37,92,89,131,81,231,88,117,174,53,123,88,144,185,42,92,89,163,120,86)
|
||||
IMAGE_DATA(252,95,255,135,50,215,138,184,246,241,125,57,77,252,183,198,95,18,186,16,0,0,128,177,108,217,162,237,135,102,26,34)
|
||||
IMAGE_DATA(206,255,36,7,112,198,204,32,116,61,0,62,49,253,175,102,192,199,127,6,1,4,71,115,254,17,214,1,40,13,205,247)
|
||||
IMAGE_DATA(153,48,150,3,249,235,195,2,151,7,224,20,211,127,153,167,89,7,160,20,26,252,111,90,7,142,12,90,36,128,35,218)
|
||||
IMAGE_DATA(252,151,217,204,247,134,32,119,58,252,95,182,14,48,3,144,27,43,249,47,243,150,10,51,0,57,210,195,255,58,31,48)
|
||||
IMAGE_DATA(3,144,27,67,252,23,204,0,100,198,0,255,235,124,198,12,64,46,140,241,95,48,3,144,9,35,252,175,243,53,51,0)
|
||||
IMAGE_DATA(169,51,197,127,193,12,64,226,76,240,191,206,46,102,0,82,197,134,255,130,25,128,68,177,224,127,157,159,153,1,72,13)
|
||||
IMAGE_DATA(155,254,11,102,0,18,195,162,255,117,246,48,3,144,10,46,252,23,204,0,36,130,3,255,235,236,157,25,120,109,12,160)
|
||||
IMAGE_DATA(7,46,253,23,204,0,68,142,67,255,235,168,155,25,238,103,6,32,70,124,249,47,115,3,51,0,177,225,193,255,58,234)
|
||||
IMAGE_DATA(166,238,7,153,1,136,9,223,254,203,220,204,12,64,44,120,244,127,73,152,1,136,129,80,254,203,220,205,12,64,104,2)
|
||||
IMAGE_DATA(250,223,180,14,112,255,105,240,74,104,255,101,30,96,29,128,80,68,224,127,211,58,16,219,7,220,67,166,196,226,191,204)
|
||||
IMAGE_DATA(163,172,3,224,155,136,252,111,90,7,230,28,183,15,133,19,155,255,50,207,176,14,128,47,34,244,191,105,29,56,202,233)
|
||||
IMAGE_DATA(139,0,197,18,171,255,50,175,176,14,128,107,34,246,127,217,58,192,28,128,109,98,247,95,230,29,102,0,92,145,128,255)
|
||||
IMAGE_DATA(117,182,49,3,96,155,148,252,23,204,0,88,38,33,255,235,124,206,12,128,45,82,244,95,48,3,96,137,4,253,175,179)
|
||||
IMAGE_DATA(192,12,192,84,82,246,95,48,3,48,145,132,253,175,243,61,51,0,99,201,193,127,193,12,192,72,50,240,191,206,47,204)
|
||||
IMAGE_DATA(0,12,37,39,255,5,51,0,3,201,200,255,58,191,51,3,208,151,28,253,23,204,0,244,36,67,255,235,236,99,6,96)
|
||||
IMAGE_DATA(37,114,246,95,24,51,192,28,128,73,198,254,215,57,192,12,64,27,37,248,95,229,70,102,0,76,10,240,191,14,247,159)
|
||||
IMAGE_DATA(134,101,148,230,191,204,173,204,0,212,20,228,255,146,48,3,160,40,213,127,153,123,153,1,40,216,255,166,117,128,251,79)
|
||||
IMAGE_DATA(23,70,233,254,203,60,196,58,80,46,248,223,184,14,112,255,233,66,192,255,197,60,206,58,80,30,248,191,52,198,12,112)
|
||||
IMAGE_DATA(255,233,204,193,255,101,121,142,117,160,28,240,191,57,198,12,28,61,233,69,134,104,193,255,214,188,198,58,144,63,248,223)
|
||||
IMAGE_DATA(29,147,41,175,53,196,7,254,175,152,247,152,129,124,193,255,222,249,152,25,200,15,252,239,239,191,96,6,178,3,255,7)
|
||||
IMAGE_DATA(231,11,102,32,31,240,127,184,255,130,25,200,6,252,31,157,157,204,64,250,224,255,120,255,5,51,144,60,248,63,57,63)
|
||||
IMAGE_DATA(50,3,233,130,255,211,253,23,204,64,178,224,191,181,236,102,6,210,3,255,237,249,47,152,129,228,192,127,235,249,131,25)
|
||||
IMAGE_DATA(72,7,252,183,239,191,96,6,146,1,255,157,133,251,79,39,0,254,187,243,95,48,3,209,131,255,206,195,253,167,35,6)
|
||||
IMAGE_DATA(255,221,251,47,152,129,104,193,127,111,225,254,211,17,130,255,126,253,151,185,157,25,136,7,252,15,19,102,32,14,240,63)
|
||||
IMAGE_DATA(88,54,49,3,225,193,255,176,49,102,128,251,79,123,6,255,131,231,97,214,129,112,224,127,28,49,102,128,251,79,123,2)
|
||||
IMAGE_DATA(255,163,201,147,172,3,254,193,255,184,98,204,192,225,43,28,62,152,8,254,71,151,23,88,7,252,129,255,113,198,152,129)
|
||||
IMAGE_DATA(249,206,131,8,163,193,255,104,243,6,235,128,123,240,63,238,24,51,112,108,199,161,132,17,224,127,244,217,58,51,232,56)
|
||||
IMAGE_DATA(156,48,16,252,79,35,204,128,27,240,63,153,124,162,194,12,216,5,255,147,203,14,102,192,30,248,159,92,118,8,102,192)
|
||||
IMAGE_DATA(26,248,159,108,190,101,6,166,131,255,201,230,91,193,12,76,6,255,147,205,95,85,182,51,3,227,193,255,52,211,69,243)
|
||||
IMAGE_DATA(145,134,38,240,223,121,246,86,217,89,101,107,149,151,170,60,86,101,83,151,211,125,89,241,128,195,18,240,223,93,92,50)
|
||||
IMAGE_DATA(232,32,67,43,248,191,152,63,171,44,84,169,207,211,47,86,121,84,5,167,243,2,255,221,157,167,229,115,175,153,126,132)
|
||||
IMAGE_DATA(192,37,165,248,111,209,105,200,8,252,231,60,93,50,165,248,175,181,170,190,190,216,210,203,7,137,131,255,80,50,37,249)
|
||||
IMAGE_DATA(175,181,59,179,245,250,65,218,224,63,148,76,105,254,11,237,30,252,242,235,51,237,188,138,144,42,248,15,37,19,177,255)
|
||||
IMAGE_DATA(95,106,181,237,179,253,252,236,131,64,17,171,255,198,247,231,241,31,156,16,161,255,219,102,13,56,248,119,246,105,207,125)
|
||||
IMAGE_DATA(162,181,23,20,146,34,54,255,13,231,143,199,127,112,73,68,254,191,109,184,95,115,161,171,26,181,231,189,223,194,75,9)
|
||||
IMAGE_DATA(9,18,139,255,134,251,199,104,37,58,243,95,255,119,45,188,148,144,32,17,248,255,114,203,121,223,75,157,218,243,206,11)
|
||||
IMAGE_DATA(238,179,92,28,161,253,55,220,63,42,64,157,187,141,25,128,130,8,232,255,51,125,206,251,62,234,212,158,251,142,193,47)
|
||||
IMAGE_DATA(32,36,77,8,255,77,228,239,205,245,40,245,58,174,3,192,54,190,253,111,112,191,47,115,218,223,217,229,170,46,249,245)
|
||||
IMAGE_DATA(234,42,80,0,62,253,55,188,63,84,12,251,156,79,181,70,204,57,172,119,167,49,3,80,0,190,252,55,220,31,253,57)
|
||||
IMAGE_DATA(231,158,246,64,27,198,214,7,105,225,195,255,6,247,163,244,95,175,117,108,125,144,22,190,124,178,232,212,9,218,243,241)
|
||||
IMAGE_DATA(190,56,152,132,143,253,132,101,159,156,250,47,180,251,201,90,172,25,34,197,129,255,7,133,246,51,38,174,60,242,116,29)
|
||||
IMAGE_DATA(112,133,139,218,33,30,92,248,239,218,125,71,117,227,127,129,88,244,232,128,138,15,247,43,206,245,52,3,144,49,54,253)
|
||||
IMAGE_DATA(247,232,190,2,255,97,50,22,28,250,247,115,72,60,187,111,214,254,222,132,250,251,204,192,185,190,122,2,191,216,240,63)
|
||||
IMAGE_DATA(132,251,22,235,199,255,130,153,224,207,239,42,33,221,159,88,63,251,32,152,228,127,104,247,43,174,230,58,0,198,50,194)
|
||||
IMAGE_DATA(157,95,84,34,113,95,177,90,171,67,125,190,150,237,25,216,175,61,255,201,30,251,2,15,140,241,63,34,247,21,255,190)
|
||||
IMAGE_DATA(95,217,225,26,128,255,25,51,192,155,239,85,34,115,127,17,174,3,96,12,67,252,143,213,125,5,254,195,24,122,120,179)
|
||||
IMAGE_DATA(48,51,8,88,110,23,235,180,250,212,231,56,186,242,127,109,21,200,128,149,252,79,196,125,133,83,255,101,246,24,51,0)
|
||||
IMAGE_DATA(25,208,225,255,231,137,120,191,4,151,251,32,237,185,239,244,217,19,184,163,205,23,195,253,147,130,22,57,0,174,3,96)
|
||||
IMAGE_DATA(8,13,190,108,55,220,79,13,95,239,139,155,19,253,238,219,2,17,99,186,98,184,127,66,224,242,198,224,212,127,153,93)
|
||||
IMAGE_DATA(198,12,64,194,104,199,242,221,196,207,251,139,104,61,188,37,220,174,1,55,250,235,10,92,48,107,64,44,189,255,114,146)
|
||||
IMAGE_DATA(112,29,0,125,104,112,63,11,60,250,63,233,126,46,16,22,195,253,214,251,47,39,200,85,142,103,224,83,99,6,32,65)
|
||||
IMAGE_DATA(114,59,239,107,184,126,95,168,126,222,184,210,99,95,96,145,140,207,95,248,15,197,195,117,48,148,12,254,67,225,172,213)
|
||||
IMAGE_DATA(28,117,241,190,56,125,6,206,247,216,23,64,31,240,31,138,135,125,16,148,12,254,67,201,104,126,30,172,98,123,6,244)
|
||||
IMAGE_DATA(159,147,63,213,95,103,0,189,56,211,152,1,252,135,162,208,252,124,67,176,15,130,2,225,58,0,74,198,181,255,98,233)
|
||||
IMAGE_DATA(207,201,175,243,215,25,64,47,214,59,158,1,252,135,152,89,165,249,185,67,184,221,3,221,227,177,47,128,62,56,247,95)
|
||||
IMAGE_DATA(112,29,0,145,227,241,58,248,200,42,0,209,224,225,58,248,7,99,6,0,98,66,127,95,220,30,225,118,13,216,232,177)
|
||||
IMAGE_DATA(47,128,62,56,247,95,112,29,0,145,227,241,58,96,85,21,128,104,240,112,29,240,165,49,3,0,209,160,185,233,234,125)
|
||||
IMAGE_DATA(161,250,26,176,222,95,103,0,189,56,195,152,1,174,3,160,40,52,55,95,21,246,221,95,188,95,46,254,67,172,184,184)
|
||||
IMAGE_DATA(14,48,145,191,119,189,223,174,0,250,97,209,255,109,13,222,115,159,116,136,26,27,254,55,120,191,65,240,57,25,144,6)
|
||||
IMAGE_DATA(67,223,23,119,64,101,153,244,236,241,33,77,6,249,223,226,253,69,161,138,7,176,65,199,62,232,87,21,206,245,144,51)
|
||||
IMAGE_DATA(109,254,55,120,127,170,224,62,15,144,31,243,154,227,31,113,190,135,194,152,55,157,175,188,95,83,5,50,226,31,121,146)
|
||||
IMAGE_DATA(4,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(2528, 2)
|
||||
|
|
|
|||
|
|
@ -839,7 +839,7 @@ LAYOUT(SetupSVNLayout, 536, 112)
|
|||
ITEM(Label, dv___10, SetLabel(t_("Revision to checkout")).LeftPosZ(304, 160).TopPosZ(28, 19))
|
||||
END_LAYOUT
|
||||
|
||||
LAYOUT(SlideShowSettings, 184, 108)
|
||||
LAYOUT(SlideShowSettingsLayout, 184, 164)
|
||||
ITEM(Label, dv___0, SetLabel(t_("Zoom")).LeftPosZ(8, 40).TopPosZ(8, 19))
|
||||
ITEM(Button, zoom_plus, SetLabel(t_("+")).LeftPosZ(124, 24).TopPosZ(8, 19))
|
||||
ITEM(Button, zoom_minus, SetLabel(t_("-")).LeftPosZ(152, 24).TopPosZ(8, 19))
|
||||
|
|
@ -850,5 +850,6 @@ LAYOUT(SlideShowSettings, 184, 108)
|
|||
ITEM(Option, title, SetLabel(t_("Display title")).LeftPosZ(8, 168).TopPosZ(80, 20))
|
||||
ITEM(Button, title_plus, SetLabel(t_("+")).LeftPosZ(124, 24).TopPosZ(80, 19))
|
||||
ITEM(Button, title_minus, SetLabel(t_("-")).LeftPosZ(152, 24).TopPosZ(80, 19))
|
||||
ITEM(Switch, pointer, SetLabel(t_("Standard pointer\nPointer 1\nPointer 2")).LeftPosZ(8, 120).TopPosZ(108, 52))
|
||||
END_LAYOUT
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue