mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-19 06:06:54 -06:00
IconDes: Slice command
git-svn-id: svn://ultimatepp.org/upp/trunk@11669 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
c9dcedd1b3
commit
10cfcef284
6 changed files with 166 additions and 119 deletions
|
|
@ -153,24 +153,6 @@ void IconDes::DrawBar(Bar& bar)
|
|||
{
|
||||
using namespace IconDesKeys;
|
||||
bool notpasting = !IsPasting();
|
||||
Slot *c = IsCurrent() ? &Current() : NULL;
|
||||
bar.Add(c && c->image.GetLength() < 256 * 256, "Smart Upscale 2x",
|
||||
IconDesImg::Upscale(), THISBACK(Upscale))
|
||||
.Key(AK_RESIZEUP2);
|
||||
bar.Add(c && c->image.GetLength() < 256 * 256, "Resize Up 2x",
|
||||
IconDesImg::ResizeUp2(), THISBACK(ResizeUp2))
|
||||
.Key(AK_RESIZEUP2);
|
||||
bar.Add(c, "Supersample 2x", IconDesImg::ResizeDown2(), THISBACK(ResizeDown2))
|
||||
.Key(AK_RESIZEDOWN2);
|
||||
bar.Add(c && c->image.GetLength() < 256 * 256, "Resize Up 3x",
|
||||
IconDesImg::ResizeUp(), THISBACK(ResizeUp))
|
||||
.Key(AK_RESIZEUP3);
|
||||
bar.Add(c, "Supersample 3x", IconDesImg::ResizeDown(), THISBACK(ResizeDown))
|
||||
.Key(AK_RESIZEDOWN3);
|
||||
bar.Add("Show downscaled", IconDesImg::ShowSmall(),
|
||||
[=] { show_small = !show_small; SetBar(); SyncShow(); })
|
||||
.Check(show_small);
|
||||
bar.Separator();
|
||||
bar.Add(AK_FREEHAND, IconDesImg::FreeHand(), THISBACK1(SetTool, &IconDes::FreehandTool))
|
||||
.Check(tool == &IconDes::FreehandTool && notpasting);
|
||||
bar.Add(AK_LINES, IconDesImg::Lines(), THISBACK1(SetTool, &IconDes::LineTool))
|
||||
|
|
@ -192,6 +174,26 @@ void IconDes::DrawBar(Bar& bar)
|
|||
bar.Add("Pen " + AsString(i), IconDesImg::Get(IconDesImg::I_Pen1 + i - 1), THISBACK1(SetPen, i))
|
||||
.Check(pen == i)
|
||||
.Key(K_1 + i - 1);
|
||||
bar.Separator();
|
||||
Slot *c = IsCurrent() ? &Current() : NULL;
|
||||
bar.Add(c && c->image.GetLength() < 256 * 256, "Smart Upscale 2x",
|
||||
IconDesImg::Upscale(), THISBACK(Upscale))
|
||||
.Key(AK_RESIZEUP2);
|
||||
bar.Add(c && c->image.GetLength() < 256 * 256, "Resize Up 2x",
|
||||
IconDesImg::ResizeUp2(), THISBACK(ResizeUp2))
|
||||
.Key(AK_RESIZEUP2);
|
||||
bar.Add(c, "Supersample 2x", IconDesImg::ResizeDown2(), THISBACK(ResizeDown2))
|
||||
.Key(AK_RESIZEDOWN2);
|
||||
bar.Add(c && c->image.GetLength() < 256 * 256, "Resize Up 3x",
|
||||
IconDesImg::ResizeUp(), THISBACK(ResizeUp))
|
||||
.Key(AK_RESIZEUP3);
|
||||
bar.Add(c, "Supersample 3x", IconDesImg::ResizeDown(), THISBACK(ResizeDown))
|
||||
.Key(AK_RESIZEDOWN3);
|
||||
bar.Add("Show downscaled", IconDesImg::ShowSmall(),
|
||||
[=] { show_small = !show_small; SetBar(); SyncShow(); })
|
||||
.Check(show_small);
|
||||
bar.Separator();
|
||||
bar.Add(c, AK_SLICE, IconDesImg::Slice(), THISBACK(Slice));
|
||||
}
|
||||
|
||||
void IconDes::MainToolBar(Bar& bar)
|
||||
|
|
|
|||
|
|
@ -326,7 +326,9 @@ private:
|
|||
void ListCursor();
|
||||
void PrepareImageDlg(WithImageLayout<TopWindow>& dlg);
|
||||
void PrepareImageSizeDlg(WithImageSizeLayout<TopWindow>& dlg);
|
||||
void ImageInsert(int ii, const String& name, const Image& m, bool exp = false);
|
||||
void ImageInsert(const String& name, const Image& m, bool exp = false);
|
||||
void Slice();
|
||||
void InsertImage();
|
||||
void InsertRemoved(int ii);
|
||||
void EditImageSize();
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ IMAGE_ID(Colorize)
|
|||
IMAGE_ID(Chroma)
|
||||
IMAGE_ID(Contrast)
|
||||
IMAGE_ID(Upscale)
|
||||
IMAGE_ID(Slice)
|
||||
IMAGE_ID(Smoothen)
|
||||
IMAGE_ID(Text)
|
||||
IMAGE_ID(AlphaI)
|
||||
|
|
@ -207,101 +208,105 @@ IMAGE_END_DATA(1312, 18)
|
|||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,155,77,140,20,69,20,199,31,24,48,124,236,135,27,80,48,16,38,70,129,172,16,195,238,104,20,197,89,35)
|
||||
IMAGE_DATA(40,89,201,114,106,66,136,132,209,132,117,216,152,0,55,18,201,76,27,63,47,186,241,178,7,15,124,44,234,97,213,195)
|
||||
IMAGE_DATA(34,65,137,28,54,196,143,131,137,7,51,137,55,61,17,76,184,233,134,195,38,76,249,94,87,85,119,85,79,85,119,117)
|
||||
IMAGE_DATA(247,126,137,251,38,255,188,234,87,245,171,170,174,174,170,110,122,27,232,134,110,184,135,140,57,200,86,46,136,111,98,204)
|
||||
IMAGE_DATA(42,91,185,188,60,248,192,149,131,15,217,4,94,43,227,187,157,127,27,99,230,237,227,239,198,199,219,205,204,199,198,35)
|
||||
IMAGE_DATA(226,179,95,255,37,147,102,223,12,42,21,28,43,198,125,86,147,172,84,214,58,84,86,42,143,229,229,150,248,249,227,213)
|
||||
IMAGE_DATA(249,17,159,115,174,188,100,76,243,38,139,138,182,175,154,235,250,177,149,41,58,247,115,172,223,78,88,13,203,149,30,228)
|
||||
IMAGE_DATA(22,237,212,22,245,78,76,48,31,203,144,15,227,42,71,113,207,227,18,101,168,172,135,199,196,145,15,89,149,163,242,77)
|
||||
IMAGE_DATA(224,162,52,198,168,108,3,243,165,60,17,215,184,192,139,31,165,169,110,42,223,0,230,251,220,171,113,77,178,61,37,230)
|
||||
IMAGE_DATA(7,119,45,95,248,152,168,174,17,145,238,21,233,17,158,214,218,163,60,47,198,169,241,70,138,226,156,239,192,168,92,30)
|
||||
IMAGE_DATA(209,157,228,62,252,221,67,150,119,48,34,62,223,66,208,249,236,11,66,231,179,47,12,157,207,190,64,218,199,47,219,66)
|
||||
IMAGE_DATA(137,248,124,11,70,231,179,47,156,118,62,219,2,154,173,249,243,223,53,218,12,150,167,23,147,230,129,251,128,196,227,30)
|
||||
IMAGE_DATA(77,222,9,156,124,113,179,241,83,83,83,129,36,59,57,57,201,134,134,134,130,58,200,55,155,205,84,254,194,133,11,76)
|
||||
IMAGE_DATA(178,106,29,242,56,169,255,196,15,12,12,4,101,7,7,7,113,18,251,129,87,88,47,97,172,2,158,24,8,22,145,111)
|
||||
IMAGE_DATA(60,54,180,171,241,165,233,105,227,38,68,113,23,94,110,88,114,35,9,55,16,148,27,207,127,180,120,165,228,111,62,249)
|
||||
IMAGE_DATA(248,175,52,93,10,199,50,137,183,137,88,186,182,96,191,134,69,88,43,79,243,209,129,5,72,94,103,105,108,62,91,108)
|
||||
IMAGE_DATA(47,156,240,76,195,135,107,237,167,60,115,223,188,121,51,208,240,240,112,160,249,230,37,39,235,153,111,126,233,252,239,221)
|
||||
IMAGE_DATA(243,95,80,179,108,6,73,187,82,146,34,62,225,81,187,68,187,43,150,41,41,119,46,35,79,249,149,10,151,40,75,76)
|
||||
IMAGE_DATA(21,143,137,39,31,214,97,226,137,251,19,184,40,141,49,201,74,85,69,220,200,171,23,148,210,226,78,70,143,185,82,106)
|
||||
IMAGE_DATA(220,56,126,42,47,68,92,169,84,53,61,106,95,71,253,10,107,86,221,130,135,58,103,224,201,206,22,28,237,98,112,172)
|
||||
IMAGE_DATA(135,193,182,85,81,185,251,81,91,215,49,232,16,199,213,144,159,6,191,126,7,38,46,205,192,167,31,223,133,139,163,45)
|
||||
IMAGE_DATA(248,225,50,131,223,127,97,112,249,75,6,181,227,172,139,202,213,112,1,124,54,222,130,209,119,91,240,48,180,194,55,187)
|
||||
IMAGE_DATA(27,54,180,224,235,47,90,240,199,213,22,188,255,76,11,62,64,221,190,193,96,250,54,131,27,215,217,174,205,15,178,253)
|
||||
IMAGE_DATA(88,142,60,92,157,108,193,87,151,238,194,246,21,51,97,251,235,176,159,159,188,195,224,237,157,12,126,196,227,159,81,31)
|
||||
IMAGE_DATA(150,25,124,251,57,235,122,169,143,13,98,153,97,20,249,206,231,123,91,240,94,125,6,186,151,221,210,198,96,224,9,6)
|
||||
IMAGE_DATA(71,208,255,38,244,42,234,181,189,88,55,176,61,27,129,29,126,148,123,232,194,126,191,252,220,157,96,188,226,227,254,20)
|
||||
IMAGE_DATA(106,92,104,55,106,37,106,21,176,173,187,80,219,185,135,21,200,3,252,131,250,94,227,215,209,92,65,237,68,81,185,131)
|
||||
IMAGE_DATA(168,167,81,216,230,202,253,192,54,31,225,30,30,64,126,53,252,141,204,119,26,79,220,139,52,150,168,23,80,135,129,159)
|
||||
IMAGE_DATA(207,33,212,81,26,123,225,135,144,127,196,192,119,211,181,21,122,92,180,189,91,232,89,212,30,225,119,33,223,101,224,221)
|
||||
IMAGE_DATA(69,231,175,243,75,155,193,162,218,12,242,73,169,135,37,232,47,212,184,240,225,221,203,192,79,161,42,66,83,10,123,77)
|
||||
IMAGE_DATA(240,215,148,58,76,60,113,193,228,63,196,211,76,97,199,149,58,66,30,116,62,72,191,46,36,250,64,126,124,53,106,13)
|
||||
IMAGE_DATA(247,106,220,56,238,162,125,53,70,236,69,225,173,243,182,15,181,67,196,215,138,244,14,158,214,218,95,43,22,172,137,239)
|
||||
IMAGE_DATA(83,242,251,82,100,227,251,29,88,19,159,79,220,230,106,51,24,27,27,179,170,94,175,179,114,185,28,120,25,51,241,167)
|
||||
IMAGE_DATA(79,159,102,61,61,61,129,40,45,217,3,7,14,4,60,121,89,135,137,39,78,246,141,210,20,147,172,20,29,219,248,248)
|
||||
IMAGE_DATA(249,81,31,58,58,58,52,158,142,41,158,229,162,16,183,111,223,190,192,23,24,107,179,242,109,194,58,159,125,19,214,249)
|
||||
IMAGE_DATA(236,155,176,206,7,30,138,109,194,178,125,37,230,244,242,147,242,78,137,120,73,164,79,241,180,214,62,229,85,45,188,154)
|
||||
IMAGE_DATA(239,167,200,198,187,42,195,188,75,16,183,165,39,131,197,243,100,80,173,86,115,73,78,138,224,248,220,57,174,243,231,185)
|
||||
IMAGE_DATA(228,49,170,54,58,202,124,44,67,62,140,155,120,202,63,121,146,75,148,37,230,12,30,19,79,62,172,131,248,170,194,83)
|
||||
IMAGE_DATA(155,196,141,85,185,40,141,49,201,74,157,17,241,128,135,24,31,244,67,136,210,212,22,113,126,36,53,46,7,93,27,23)
|
||||
IMAGE_DATA(217,190,18,227,156,31,241,114,252,84,158,242,206,138,188,154,72,159,229,105,173,125,202,59,99,225,213,124,63,69,54,222)
|
||||
IMAGE_DATA(85,182,243,207,50,127,132,77,101,123,129,216,64,240,205,219,0,219,62,2,88,182,41,3,168,240,170,246,126,147,141,247)
|
||||
IMAGE_DATA(89,164,134,240,7,127,202,199,171,117,216,250,33,203,217,120,95,57,23,211,120,184,240,178,14,26,83,91,57,23,158,174)
|
||||
IMAGE_DATA(75,17,190,145,80,110,62,120,181,255,69,199,47,11,159,116,253,108,245,185,206,159,36,62,207,252,45,186,126,82,214,175)
|
||||
IMAGE_DATA(219,102,160,118,32,207,102,208,136,13,124,218,201,168,101,146,38,128,109,48,147,56,151,139,233,202,219,38,147,43,27,159)
|
||||
IMAGE_DATA(204,105,231,156,182,152,242,176,241,235,82,148,47,210,255,162,227,55,91,215,111,54,230,79,145,249,91,116,253,152,120,135)
|
||||
IMAGE_DATA(245,59,71,127,90,100,25,101,227,43,134,152,180,74,10,95,49,196,226,101,43,134,24,36,196,92,203,154,204,198,187,218)
|
||||
IMAGE_DATA(18,255,255,228,93,215,76,113,91,136,119,6,36,63,94,198,241,157,193,22,244,199,240,184,129,101,200,111,201,248,206,128)
|
||||
IMAGE_DATA(152,58,240,47,248,234,162,142,172,239,12,218,190,226,203,241,34,171,82,25,48,189,200,58,33,196,224,49,33,153,167,28)
|
||||
IMAGE_DATA(191,242,74,164,32,175,170,240,181,26,137,193,21,161,183,200,15,11,189,193,202,196,160,15,99,116,236,39,240,87,34,126)
|
||||
IMAGE_DATA(235,241,141,172,31,203,147,79,228,41,93,19,10,210,53,86,70,31,87,208,78,252,252,57,143,94,72,137,149,203,92,253)
|
||||
IMAGE_DATA(253,122,92,25,247,19,161,84,94,136,88,128,114,196,71,138,248,178,144,204,83,142,137,147,10,243,146,248,126,69,125,49)
|
||||
IMAGE_DATA(149,83,120,147,92,248,124,226,22,219,12,138,223,209,93,63,227,205,200,183,125,65,151,198,123,168,102,196,235,95,192,37)
|
||||
IMAGE_DATA(240,13,161,145,94,6,189,226,147,98,60,30,17,44,249,132,255,241,165,127,230,74,44,213,65,117,249,16,169,145,192,183)
|
||||
IMAGE_DATA(201,243,32,248,139,155,103,250,250,211,209,180,58,178,152,173,31,166,254,154,121,245,58,54,197,117,153,160,122,172,55,2)
|
||||
IMAGE_DATA(59,207,4,235,113,62,101,46,152,121,193,174,95,223,228,155,113,26,223,104,151,39,110,6,41,115,193,202,59,206,5,128)
|
||||
IMAGE_DATA(98,107,49,187,229,255,103,130,252,95,52,69,88,82,158,255,69,39,217,188,117,196,219,143,206,131,62,53,77,147,94,135)
|
||||
IMAGE_DATA(236,79,86,62,126,62,179,195,231,51,133,119,121,146,211,44,54,15,12,108,245,124,37,88,60,228,35,222,114,253,124,112)
|
||||
IMAGE_DATA(249,115,218,156,89,190,241,95,60,124,33,155,237,119,6,11,61,24,11,58,152,100,153,23,83,58,63,183,139,169,200,166)
|
||||
IMAGE_DATA(30,117,58,108,126,129,55,195,162,155,185,155,217,111,38,110,54,219,55,179,60,214,222,239,127,1,140,170,160,182,0,0)
|
||||
IMAGE_END_DATA(1888, 17)
|
||||
IMAGE_DATA(40,89,201,114,26,66,136,132,209,132,117,216,152,0,55,18,201,76,27,63,47,186,241,178,7,15,124,44,234,97,213,195)
|
||||
IMAGE_DATA(34,65,137,28,54,196,143,131,137,7,179,137,55,61,17,76,184,233,134,195,38,76,249,94,125,116,87,245,84,117,87,119)
|
||||
IMAGE_DATA(47,203,138,91,147,127,94,213,235,247,171,234,174,174,170,238,153,173,133,110,232,134,123,40,49,15,185,226,184,127,3,99)
|
||||
IMAGE_DATA(78,185,226,242,242,16,128,80,14,62,100,19,120,35,38,240,187,254,54,198,206,187,251,223,143,143,183,155,153,143,245,71)
|
||||
IMAGE_DATA(196,103,191,255,139,73,37,247,98,80,169,96,95,49,97,179,38,197,42,101,173,67,103,149,242,164,188,220,34,63,127,188)
|
||||
IMAGE_DATA(62,62,226,99,206,151,87,140,109,220,100,81,209,246,245,228,59,127,92,49,69,199,126,142,249,219,9,43,97,169,118,6)
|
||||
IMAGE_DATA(185,69,43,181,67,189,19,19,44,192,24,178,161,95,231,200,95,173,10,201,24,138,173,98,153,56,178,33,171,115,20,63)
|
||||
IMAGE_DATA(13,66,148,71,31,197,54,241,184,82,85,250,13,142,91,249,161,60,213,77,241,77,96,65,32,172,238,55,164,218,211,124)
|
||||
IMAGE_DATA(1,127,106,5,210,198,68,117,141,200,124,175,204,143,136,188,209,30,29,171,198,56,221,223,76,81,156,11,60,24,157,203)
|
||||
IMAGE_DATA(35,122,146,220,135,159,123,40,229,237,140,136,207,55,17,76,62,251,132,48,249,236,19,195,228,179,79,144,246,254,203,54)
|
||||
IMAGE_DATA(81,34,62,223,132,49,249,236,19,167,157,207,54,129,230,106,252,252,119,19,45,6,75,211,195,84,170,130,127,135,196,253)
|
||||
IMAGE_DATA(85,26,188,19,56,248,226,201,197,79,77,77,113,41,118,114,114,146,13,13,13,241,58,200,78,79,79,167,242,231,206,157)
|
||||
IMAGE_DATA(99,138,213,235,80,229,164,243,39,126,96,96,128,199,14,14,14,226,32,14,184,213,216,106,66,95,113,158,24,224,147,40)
|
||||
IMAGE_DATA(176,150,45,237,26,124,105,102,198,186,8,145,223,135,87,11,150,90,72,194,5,4,229,199,139,15,77,94,37,245,153,79)
|
||||
IMAGE_DATA(62,254,41,205,148,194,190,76,226,93,34,150,238,45,184,239,97,17,214,201,211,120,244,96,1,146,231,89,26,155,47,45)
|
||||
IMAGE_DATA(180,31,156,240,74,195,151,107,227,163,189,115,95,191,126,157,107,120,120,152,107,190,121,197,169,122,230,155,95,188,254,123)
|
||||
IMAGE_DATA(247,250,239,106,114,44,6,73,171,82,146,34,62,225,85,187,68,171,43,198,148,180,39,151,149,167,227,149,138,144,140,37)
|
||||
IMAGE_DATA(166,134,101,226,201,134,117,216,120,226,254,4,33,202,163,79,177,74,53,233,183,242,250,13,165,188,124,146,209,107,174,146)
|
||||
IMAGE_DATA(238,183,246,159,206,75,17,87,42,213,108,175,218,87,81,191,194,170,21,55,224,161,206,89,120,178,179,5,135,187,24,28)
|
||||
IMAGE_DATA(233,97,176,101,69,20,119,63,106,243,26,6,29,178,92,11,249,25,8,26,183,96,226,194,44,124,250,241,109,56,63,218)
|
||||
IMAGE_DATA(130,31,46,50,248,253,23,6,23,191,100,80,63,202,186,40,174,142,19,224,179,241,22,140,190,219,130,135,161,21,254,178)
|
||||
IMAGE_DATA(187,110,93,11,190,254,162,5,127,92,110,193,251,207,180,224,3,212,205,107,12,102,110,50,184,118,149,237,216,248,32,219)
|
||||
IMAGE_DATA(139,113,100,225,242,100,11,190,186,112,27,182,46,155,13,219,95,131,231,249,201,59,12,222,222,206,224,71,44,255,140,250)
|
||||
IMAGE_DATA(176,204,224,219,207,89,215,75,125,108,16,99,134,81,100,59,159,239,109,193,123,141,89,232,94,114,195,232,131,129,39,24)
|
||||
IMAGE_DATA(28,66,251,155,212,171,168,215,118,99,221,192,118,173,7,118,240,81,97,161,11,207,251,229,231,110,241,254,138,247,251,83)
|
||||
IMAGE_DATA(168,113,169,157,168,229,168,21,192,54,239,64,109,21,22,150,33,15,240,15,234,123,131,95,67,99,5,181,29,69,113,251)
|
||||
IMAGE_DATA(81,79,163,176,205,229,123,129,109,60,36,44,60,128,252,74,248,27,153,239,12,158,184,23,169,47,81,47,160,14,130,184)
|
||||
IMAGE_DATA(158,3,168,195,212,247,210,14,33,255,136,133,239,166,123,43,245,184,108,123,167,212,179,168,93,210,238,64,190,203,194,251)
|
||||
IMAGE_DATA(139,174,223,228,23,23,131,5,181,24,228,147,86,15,75,208,95,168,113,105,195,167,151,133,159,66,85,164,166,52,246,138)
|
||||
IMAGE_DATA(228,175,104,117,216,120,226,248,224,63,32,242,76,99,199,181,58,66,30,76,158,231,95,151,146,231,64,118,124,37,106,149)
|
||||
IMAGE_DATA(176,186,223,218,239,178,125,221,71,236,121,105,157,227,182,15,181,77,250,87,203,252,54,145,55,218,95,45,39,172,141,239)
|
||||
IMAGE_DATA(211,142,247,165,200,197,247,123,176,54,62,159,68,186,83,139,193,216,216,152,83,141,70,131,149,203,101,110,149,207,198,159)
|
||||
IMAGE_DATA(60,121,146,245,244,244,112,81,94,177,251,246,237,227,60,89,85,135,141,39,78,157,27,229,201,167,88,37,42,187,248,248)
|
||||
IMAGE_DATA(245,209,57,116,116,116,24,60,149,201,159,229,166,16,183,103,207,30,110,11,244,181,93,249,22,97,147,207,190,8,155,124)
|
||||
IMAGE_DATA(246,69,216,228,185,133,98,139,176,106,95,243,121,253,248,73,199,78,72,127,73,230,79,136,188,209,62,29,171,57,120,253)
|
||||
IMAGE_DATA(120,144,34,23,239,171,12,227,46,65,34,45,190,25,44,156,55,131,90,173,150,75,106,80,240,242,153,51,66,103,207,10)
|
||||
IMAGE_DATA(169,50,170,62,58,202,2,140,33,27,250,109,60,29,63,126,92,72,198,18,115,10,203,196,147,13,235,32,190,166,241,212)
|
||||
IMAGE_DATA(38,113,99,53,33,202,163,79,177,74,167,164,159,243,16,227,249,121,72,81,158,218,34,46,136,164,251,85,167,27,253,162)
|
||||
IMAGE_DATA(218,215,124,130,11,34,94,245,159,206,211,177,211,242,88,93,230,79,139,188,209,62,29,59,229,224,245,227,65,138,92,188)
|
||||
IMAGE_DATA(175,92,215,159,101,252,200,52,149,237,7,196,38,130,111,222,4,216,242,17,192,146,13,25,64,141,215,181,251,155,108,124)
|
||||
IMAGE_DATA(192,34,53,165,221,255,83,62,94,175,195,117,30,42,206,197,7,218,181,216,250,195,135,87,117,80,159,186,226,124,120,186)
|
||||
IMAGE_DATA(47,69,248,102,66,220,124,240,250,249,23,237,191,44,124,210,253,115,213,231,59,126,146,248,60,227,183,232,252,73,158,191)
|
||||
IMAGE_DATA(25,23,131,5,159,152,69,54,191,43,182,253,77,134,71,70,229,94,241,119,121,124,152,122,110,186,161,20,219,103,160,120)
|
||||
IMAGE_DATA(175,205,55,148,98,251,12,200,69,182,9,94,155,112,196,181,106,251,12,120,251,65,226,94,131,226,253,175,159,127,236,173)
|
||||
IMAGE_DATA(72,184,60,55,245,80,138,237,83,48,206,63,109,115,143,232,172,248,190,2,155,207,228,131,196,88,55,95,108,252,221,221)
|
||||
IMAGE_DATA(228,183,24,232,171,81,158,55,3,181,10,250,174,108,122,76,210,211,192,181,178,38,113,62,43,187,47,175,95,147,222,31)
|
||||
IMAGE_DATA(190,172,94,7,245,105,218,53,39,241,116,95,242,176,241,251,82,148,47,114,254,69,251,111,174,238,223,92,140,159,34,227)
|
||||
IMAGE_DATA(183,232,252,177,241,30,243,247,14,189,25,176,140,114,241,21,139,79,165,74,10,95,177,248,226,177,21,139,15,18,124,190)
|
||||
IMAGE_DATA(177,182,228,226,125,211,34,255,255,228,125,231,76,241,116,55,126,64,36,5,241,24,27,111,249,1,113,19,218,35,88,110)
|
||||
IMAGE_DATA(98,12,217,77,25,127,64,36,166,33,95,177,27,178,142,172,63,32,182,109,233,205,241,171,118,165,50,96,123,77,62,38)
|
||||
IMAGE_DATA(197,224,49,41,117,76,43,191,242,74,36,126,172,166,241,245,58,137,193,37,169,183,200,14,75,189,193,202,196,160,13,125)
|
||||
IMAGE_DATA(84,14,18,248,75,17,191,249,232,122,214,143,241,100,19,121,202,215,165,120,190,206,202,104,227,226,237,196,175,95,240,104)
|
||||
IMAGE_DATA(165,52,95,185,44,212,223,111,250,181,126,63,22,74,231,165,136,5,40,71,124,164,136,47,75,169,99,90,153,56,165,240)
|
||||
IMAGE_DATA(88,18,223,175,169,47,166,114,10,111,147,15,159,79,34,197,22,131,226,79,116,199,228,111,219,211,159,145,111,219,78,155)
|
||||
IMAGE_DATA(198,87,81,211,17,111,110,135,77,224,213,119,192,145,94,252,222,41,191,251,99,121,68,178,35,234,251,100,26,79,34,150)
|
||||
IMAGE_DATA(234,160,186,2,136,212,76,224,219,84,173,2,255,243,123,213,182,21,220,51,25,117,100,73,174,243,176,157,175,157,215,239)
|
||||
IMAGE_DATA(227,180,188,47,19,84,143,243,65,224,230,153,100,171,130,79,25,11,118,94,178,107,215,78,139,197,56,141,143,255,54,128)
|
||||
IMAGE_DATA(170,202,135,65,202,88,112,242,158,99,1,160,216,92,204,158,242,127,77,80,255,82,87,132,37,229,249,151,90,197,230,173)
|
||||
IMAGE_DATA(35,222,126,116,29,180,239,60,77,102,29,234,124,178,242,241,235,153,27,62,95,210,120,159,55,57,35,197,198,129,133,173)
|
||||
IMAGE_DATA(157,173,240,201,67,54,226,29,247,47,0,159,191,173,223,177,148,175,255,23,14,95,36,253,11,36,192,140,156,0,0,0)
|
||||
IMAGE_END_DATA(1952, 17)
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,153,189,110,219,48,16,128,217,223,177,201,210,53,217,58,168,69,50,102,9,144,236,158,10,84,69,227,41,75)
|
||||
IMAGE_DATA(12,212,5,178,184,75,150,74,9,178,4,200,3,228,1,146,69,91,222,197,237,235,176,119,20,73,145,20,127,37,219,170)
|
||||
IMAGE_DATA(81,157,112,160,68,221,199,163,36,222,233,100,147,93,178,75,28,146,131,82,222,166,136,224,104,85,213,109,226,56,244,249)
|
||||
IMAGE_DATA(153,208,60,39,148,210,186,197,227,200,49,152,111,100,208,55,242,216,226,177,50,15,175,10,206,84,118,45,121,78,201,114)
|
||||
IMAGE_DATA(73,179,170,162,37,216,98,43,45,154,249,185,253,3,251,30,52,135,113,74,102,151,55,99,212,188,251,250,209,55,244,32)
|
||||
IMAGE_DATA(83,128,141,208,156,247,43,188,253,254,163,31,240,141,251,69,65,104,89,214,173,60,215,240,68,187,39,21,87,165,15,89)
|
||||
IMAGE_DATA(66,74,222,106,218,240,56,246,156,247,103,124,127,94,239,107,254,241,92,238,224,213,243,69,64,93,124,25,193,218,248,110)
|
||||
IMAGE_DATA(186,221,226,73,6,219,44,125,31,166,37,29,52,234,73,6,58,143,231,49,88,81,185,45,50,129,100,208,240,44,249,144)
|
||||
IMAGE_DATA(90,227,147,65,195,179,150,111,74,208,39,37,3,225,127,76,6,99,50,232,42,37,6,75,122,85,33,5,217,174,99,76)
|
||||
IMAGE_DATA(167,83,138,58,59,62,102,65,135,173,232,179,41,158,95,236,237,81,141,127,122,98,58,187,188,100,99,136,99,214,119,127)
|
||||
IMAGE_DATA(79,75,228,224,220,226,232,136,177,56,70,139,7,187,233,98,193,248,243,187,59,122,246,248,200,216,171,217,140,22,147,9)
|
||||
IMAGE_DATA(189,202,50,54,6,179,5,166,197,3,59,125,152,2,59,97,126,152,63,232,67,182,0,159,5,206,27,109,92,60,107,107)
|
||||
IMAGE_DATA(197,249,201,36,146,1,155,195,113,193,239,1,206,211,228,133,62,88,120,96,47,46,126,66,64,235,247,81,227,113,236,171)
|
||||
IMAGE_DATA(230,25,44,192,231,12,184,243,207,19,221,255,12,116,97,231,207,231,19,198,97,139,199,103,229,153,236,103,207,164,152,54)
|
||||
IMAGE_DATA(106,240,232,75,248,212,236,184,178,103,194,199,85,121,177,238,66,235,198,182,182,144,79,89,179,125,214,184,57,70,87,94)
|
||||
IMAGE_DATA(19,35,25,200,18,147,107,234,36,233,114,89,191,43,177,13,148,231,86,222,253,62,110,116,83,124,226,39,134,198,35,123)
|
||||
IMAGE_DATA(122,74,232,229,15,66,111,175,235,62,108,77,253,246,181,205,155,172,139,199,243,159,62,106,207,73,178,56,46,218,252,249)
|
||||
IMAGE_DATA(237,188,126,167,10,86,157,31,227,124,119,53,48,38,212,67,154,189,172,104,236,149,85,235,185,48,27,72,158,17,207,192)
|
||||
IMAGE_DATA(205,251,42,190,16,47,170,160,190,188,171,82,9,241,178,82,171,186,240,40,102,108,183,117,76,6,110,254,95,79,6,200)
|
||||
IMAGE_DATA(134,146,129,121,237,152,28,4,111,176,68,92,139,154,12,110,111,106,141,72,6,146,183,169,154,12,196,167,146,241,153,229)
|
||||
IMAGE_DATA(23,35,145,96,133,162,37,148,4,30,63,79,132,70,243,74,224,205,57,59,215,131,49,154,103,9,65,104,44,191,9,89)
|
||||
IMAGE_DATA(195,103,66,40,104,66,9,198,185,226,34,199,176,217,167,204,69,231,93,155,123,140,104,190,106,190,213,243,30,254,205,228)
|
||||
IMAGE_DATA(22,199,183,199,26,249,21,241,154,166,243,218,90,234,205,199,235,218,127,64,180,149,38,190,64,110,217,103,89,253,182,67)
|
||||
IMAGE_DATA(197,253,192,120,116,254,253,3,45,126,29,208,252,203,62,15,184,250,237,46,126,225,39,252,205,135,54,104,75,140,7,137)
|
||||
IMAGE_DATA(253,168,89,182,227,154,107,174,218,185,120,117,142,182,210,60,196,223,148,59,180,44,14,153,34,47,246,133,26,124,174,242)
|
||||
IMAGE_DATA(101,113,192,108,150,203,157,148,79,4,201,95,23,251,244,230,250,157,244,17,249,137,192,120,244,139,115,199,49,108,188,163)
|
||||
IMAGE_DATA(42,160,250,252,15,229,53,200,107,244,87,5,154,127,172,100,212,86,229,29,85,129,228,113,77,8,191,154,255,130,248,170)
|
||||
IMAGE_DATA(2,193,187,75,113,97,91,18,91,85,224,171,12,194,229,189,159,143,151,1,254,77,56,33,253,38,31,186,248,152,177,251)
|
||||
IMAGE_DATA(222,188,109,231,215,41,41,111,163,213,46,230,81,250,201,134,147,129,72,4,39,29,121,193,134,146,129,239,124,31,126,85)
|
||||
IMAGE_DATA(243,239,42,219,16,60,125,147,193,152,76,134,146,13,39,3,241,224,250,4,68,40,152,67,1,27,242,31,90,96,125,253)
|
||||
IMAGE_DATA(247,169,140,86,113,255,214,45,67,39,131,49,153,116,149,1,146,193,186,121,17,108,182,160,73,169,44,108,139,36,102,241)
|
||||
IMAGE_DATA(196,44,178,152,100,18,74,104,255,170,12,29,204,67,243,219,43,3,85,6,93,111,158,47,64,132,168,193,100,218,135,130)
|
||||
IMAGE_DATA(204,156,163,109,174,169,201,100,149,124,204,252,125,215,191,9,25,58,24,183,157,31,78,6,250,205,32,116,241,170,157,25)
|
||||
IMAGE_DATA(204,169,201,64,101,186,38,3,170,156,235,18,204,41,188,111,254,39,36,253,30,140,201,224,255,226,187,203,11,216,180,137)
|
||||
IMAGE_DATA(188,132,205,57,179,87,176,25,66,45,134,77,255,107,216,44,128,13,242,197,79,189,255,6,54,199,96,177,3,198,58,171)
|
||||
IMAGE_DATA(143,223,194,230,113,184,10,167,93,38,198,250,254,2,91,141,39,139,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
|
||||
IMAGE_END_DATA(1152, 19)
|
||||
IMAGE_DATA(120,156,237,153,189,110,219,48,16,128,217,223,177,201,210,53,217,58,168,69,50,102,9,224,236,158,10,84,69,227,201,75)
|
||||
IMAGE_DATA(12,212,5,178,184,75,150,74,9,178,4,200,3,100,235,146,44,222,242,46,110,95,135,189,163,68,138,164,249,47,217,178)
|
||||
IMAGE_DATA(81,159,112,160,69,241,227,29,37,222,233,148,144,125,178,79,186,148,178,44,169,79,55,153,111,45,148,82,147,150,112,69)
|
||||
IMAGE_DATA(156,71,242,227,223,3,240,155,176,182,225,177,229,58,24,8,30,198,121,85,17,100,61,62,5,44,90,152,79,186,255,125)
|
||||
IMAGE_DATA(240,242,186,99,215,207,89,126,239,99,121,249,217,105,207,47,201,126,138,24,252,118,36,131,156,16,182,113,242,72,43,156)
|
||||
IMAGE_DATA(163,243,121,213,70,206,67,159,159,9,205,243,42,20,176,197,243,192,57,152,109,100,208,54,242,216,226,185,228,135,83,57)
|
||||
IMAGE_DATA(167,43,91,75,158,83,178,88,208,108,62,103,193,141,173,20,224,212,107,31,216,247,160,57,204,83,178,113,121,51,7,17)
|
||||
IMAGE_DATA(65,106,94,63,218,134,30,100,10,24,195,53,175,251,37,222,124,255,209,14,216,198,223,69,65,88,114,193,86,92,107,120)
|
||||
IMAGE_DATA(162,220,147,121,173,82,95,201,18,74,89,183,138,54,60,206,61,173,251,179,250,247,180,250,173,216,199,107,185,133,151,175)
|
||||
IMAGE_DATA(23,30,181,241,101,0,107,226,211,116,187,165,235,202,96,67,164,237,195,52,190,221,185,58,146,129,202,227,117,12,86,212)
|
||||
IMAGE_DATA(122,44,50,158,100,208,240,44,249,144,74,195,147,65,195,179,182,62,164,160,143,74,6,220,254,46,25,236,146,65,170,148)
|
||||
IMAGE_DATA(24,44,241,85,133,16,100,83,231,24,141,70,20,117,114,122,202,130,14,91,222,103,82,188,62,59,56,160,10,255,244,196)
|
||||
IMAGE_DATA(116,114,121,201,230,224,231,172,239,254,158,150,200,193,181,217,201,9,99,113,142,37,30,198,141,102,51,198,143,239,238,232)
|
||||
IMAGE_DATA(249,227,35,99,175,38,19,90,12,135,244,42,203,216,28,108,44,48,75,60,176,163,135,17,176,67,102,135,217,131,62,100)
|
||||
IMAGE_DATA(11,176,89,160,223,56,198,198,179,182,82,244,79,36,145,12,216,28,206,139,250,30,160,159,58,207,245,193,192,3,123,113)
|
||||
IMAGE_DATA(241,19,2,90,189,143,10,143,115,95,53,207,96,6,54,39,192,141,63,15,85,251,19,208,153,153,31,79,135,140,195,22)
|
||||
IMAGE_DATA(207,207,203,115,209,207,158,73,49,106,84,227,209,22,183,169,140,171,149,61,147,122,94,153,231,251,206,183,111,76,123,11)
|
||||
IMAGE_DATA(249,152,61,219,102,143,235,115,164,242,138,104,201,64,148,152,181,198,58,73,23,139,234,93,137,173,167,60,55,242,246,247)
|
||||
IMAGE_DATA(113,163,235,226,35,63,49,20,30,217,179,51,66,47,127,16,122,123,93,245,97,171,235,183,175,203,188,206,218,120,188,254)
|
||||
IMAGE_DATA(233,163,242,156,4,139,243,226,152,191,127,172,235,183,42,103,101,255,24,231,186,171,158,57,161,30,82,198,139,138,198,92)
|
||||
IMAGE_DATA(89,45,61,23,54,6,146,103,192,51,176,243,174,138,207,199,243,42,168,45,111,171,84,124,188,168,212,230,41,60,138,30)
|
||||
IMAGE_DATA(219,203,186,75,6,118,126,211,147,1,178,190,100,160,175,29,147,3,231,53,150,240,181,200,201,224,246,166,210,128,100,32)
|
||||
IMAGE_DATA(120,147,202,201,128,127,42,105,159,89,110,209,18,9,86,40,74,66,137,224,241,243,132,107,48,47,5,222,180,102,167,106)
|
||||
IMAGE_DATA(48,6,243,202,31,115,67,249,117,200,10,62,19,124,65,227,75,48,214,29,23,56,135,105,124,140,47,42,111,59,236,115)
|
||||
IMAGE_DATA(4,243,243,230,91,61,111,97,95,79,110,97,252,242,92,59,190,35,94,209,120,94,217,75,173,249,112,93,249,31,16,77)
|
||||
IMAGE_DATA(165,137,43,144,151,198,103,89,245,182,67,197,223,158,249,232,244,251,7,90,252,58,162,249,151,195,58,224,170,183,59,255)
|
||||
IMAGE_DATA(11,63,169,223,124,56,6,199,18,237,65,98,63,106,150,237,217,124,205,229,113,54,94,246,209,84,154,251,248,155,114,143)
|
||||
IMAGE_DATA(150,197,49,83,228,249,111,174,26,159,203,124,89,28,177,49,139,197,94,204,39,130,224,175,139,67,122,115,253,78,216,8)
|
||||
IMAGE_DATA(252,68,96,60,218,69,223,113,14,19,111,169,10,168,234,255,177,88,131,88,163,187,42,80,236,99,37,35,183,50,111,169)
|
||||
IMAGE_DATA(10,4,143,123,130,219,85,236,23,196,85,21,112,222,94,138,243,177,37,49,85,5,174,202,192,95,222,187,249,112,233,225)
|
||||
IMAGE_DATA(191,9,3,210,206,121,223,226,67,230,110,123,243,182,157,95,165,196,188,141,186,221,204,59,105,39,107,78,6,60,17,12)
|
||||
IMAGE_DATA(18,121,206,250,146,129,235,122,27,190,43,255,83,101,27,130,167,109,50,216,37,147,190,100,205,201,128,63,184,54,1,225)
|
||||
IMAGE_DATA(11,102,95,192,250,236,251,54,88,91,251,109,42,163,46,238,223,170,165,239,100,176,75,38,169,210,67,50,88,53,207,131)
|
||||
IMAGE_DATA(205,20,52,49,149,133,105,147,132,108,158,144,77,22,146,76,124,9,109,83,165,239,96,238,155,223,94,233,169,50,72,189)
|
||||
IMAGE_DATA(121,174,0,225,34,7,147,62,222,23,100,186,143,38,95,99,147,73,151,124,136,255,174,245,175,67,250,14,198,109,231,251)
|
||||
IMAGE_DATA(147,158,254,102,224,91,188,60,78,15,230,216,100,32,51,169,201,128,74,215,82,130,57,134,119,249,63,32,241,247,96,151)
|
||||
IMAGE_DATA(12,254,47,62,93,94,192,161,56,242,18,14,171,103,175,224,208,132,26,6,54,253,175,225,48,0,38,200,21,63,213,239)
|
||||
IMAGE_DATA(55,112,88,38,11,157,48,212,88,117,254,22,14,135,193,46,140,166,56,198,250,254,1,12,17,24,17,0,0,0,0,0)
|
||||
IMAGE_END_DATA(1216, 20)
|
||||
|
|
|
|||
|
|
@ -51,3 +51,4 @@ KEY(EMPTY_RECTANGLES, "Empty rectangles", K_T)
|
|||
KEY(HOTSPOTS, "Hotspots", K_H)
|
||||
KEY(RESIZE_SINGLE, "Resize", 0)
|
||||
KEY(TEXT, "Text", 0)
|
||||
KEY(SLICE, "Slice..", 0)
|
||||
|
|
@ -26,7 +26,7 @@ bool sFloodFill::Eq(int x, int y)
|
|||
{
|
||||
const RGBA& q = At(x, y);
|
||||
if((q.a | scolor.a) == 0) return true;
|
||||
return abs(q.r - scolor.r) + abs(q.g - scolor.g) + abs(q.b - scolor.b) <= tolerance;
|
||||
return q.a && abs(q.r - scolor.r) + abs(q.g - scolor.g) + abs(q.b - scolor.b) <= tolerance;
|
||||
}
|
||||
|
||||
void sFloodFill::Try(int x, int y)
|
||||
|
|
|
|||
|
|
@ -114,11 +114,8 @@ void SetRes(Image& m, int resolution)
|
|||
m = ib;
|
||||
}
|
||||
|
||||
void IconDes::ImageInsert(const String& name, const Image& m, bool exp)
|
||||
void IconDes::ImageInsert(int ii, const String& name, const Image& m, bool exp)
|
||||
{
|
||||
int ii = ilist.IsCursor() ? (int)ilist.GetKey() : 0;
|
||||
if(ii == slot.GetCount() - 1)
|
||||
ii = slot.GetCount();
|
||||
Slot& c = slot.Insert(ii);
|
||||
c.name = name;
|
||||
c.image = m;
|
||||
|
|
@ -127,6 +124,14 @@ void IconDes::ImageInsert(const String& name, const Image& m, bool exp)
|
|||
GoTo(ii);
|
||||
}
|
||||
|
||||
void IconDes::ImageInsert(const String& name, const Image& m, bool exp)
|
||||
{
|
||||
int ii = ilist.IsCursor() ? (int)ilist.GetKey() : 0;
|
||||
if(ii == slot.GetCount() - 1)
|
||||
ii = slot.GetCount();
|
||||
ImageInsert(ii, name, m, exp);
|
||||
}
|
||||
|
||||
void IconDes::InsertImage()
|
||||
{
|
||||
WithImageLayout<TopWindow> dlg;
|
||||
|
|
@ -142,6 +147,38 @@ void IconDes::InsertImage()
|
|||
ImageInsert(~dlg.name, m, dlg.exp);
|
||||
}
|
||||
|
||||
void IconDes::Slice()
|
||||
{
|
||||
if(!IsCurrent())
|
||||
return;
|
||||
Image src = Current().image;
|
||||
Size isz = src.GetSize();
|
||||
int cc = min(isz.cx, isz.cy);
|
||||
if(!cc)
|
||||
return;
|
||||
WithImageLayout<TopWindow> dlg;
|
||||
PrepareImageDlg(dlg);
|
||||
dlg.name <<= Current().name;
|
||||
dlg.cx <<= cc;
|
||||
dlg.cy <<= cc;
|
||||
dlg.Title("Slice image");
|
||||
dlg.resolution <<= IMAGE_RESOLUTION_STANDARD;
|
||||
do {
|
||||
if(dlg.Run() != IDOK)
|
||||
return;
|
||||
}
|
||||
while(!CheckName(dlg));
|
||||
String s = ~dlg.name;
|
||||
int n = 0;
|
||||
int ii = ilist.GetKey();
|
||||
for(int y = 0; y < isz.cy; y += (int)~dlg.cy)
|
||||
for(int x = 0; x < isz.cx; x += (int)~dlg.cx) {
|
||||
Image m = Crop(src, x, y, ~dlg.cx, ~dlg.cy);
|
||||
SetRes(m, ~dlg.resolution);
|
||||
ImageInsert(++ii, s + AsString(n++), m, ~dlg.exp);
|
||||
}
|
||||
}
|
||||
|
||||
void IconDes::Duplicate()
|
||||
{
|
||||
if(!IsCurrent())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue