mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-15 14:16:07 -06:00
ide: Now using 256x256 main icon
This commit is contained in:
Mirek Fidler
parent
0fb85069bd
commit
122e456cbf
9 changed files with 2902 additions and 2562 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 377 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8 KiB After Width: | Height: | Size: 1.6 KiB |
|
|
@ -598,7 +598,7 @@ void Ide::SetIdeState(int newstate)
|
|||
}
|
||||
|
||||
void Ide::MakeIcon() {
|
||||
Image li = IdeImg::PackageLarge2();
|
||||
Image li = IdeImg::Icon256();
|
||||
WString mp = main.ToWString();
|
||||
if(!IsNull(mp))
|
||||
{
|
||||
|
|
@ -607,12 +607,12 @@ void Ide::MakeIcon() {
|
|||
Draw& mdraw = idraw.Alpha();
|
||||
idraw.DrawImage(0, 0, li);
|
||||
mdraw.DrawImage(0, 0, li, White);
|
||||
int fh = DPI(14);
|
||||
int fh = 112;
|
||||
Size sz(0, 0);
|
||||
Font font;
|
||||
while(fh > DPI(8)) {
|
||||
while(fh > 64) {
|
||||
font = StdFont(fh);
|
||||
sz = GetTextSize(mp, font) + Size(4, 2);
|
||||
sz = GetTextSize(mp, font) + 8 * Size(4, 2);
|
||||
if(sz.cx <= isz.cx)
|
||||
break;
|
||||
fh--;
|
||||
|
|
@ -624,9 +624,9 @@ void Ide::MakeIcon() {
|
|||
idraw.DrawText(x + 2, y + 1, mp, font, Black);
|
||||
DrawFrame(idraw, x, y, sz.cx, sz.cy, LtBlue);
|
||||
if(state_icon)
|
||||
idraw.DrawImage(0, 0, decode(state_icon, 1, IdeImg::IconDebuggingLarge2(),
|
||||
2, IdeImg::IconRunningLarge2(),
|
||||
IdeImg::IconBuildingLarge2()));
|
||||
idraw.DrawImage(0, 0, decode(state_icon, 1, IdeImg::IconDebuggingLarge256(),
|
||||
2, IdeImg::IconRunningLarge256(),
|
||||
IdeImg::IconBuildingLarge256()));
|
||||
li = idraw;
|
||||
}
|
||||
LargeIcon(li);
|
||||
|
|
|
|||
5336
uppsrc/ide/ide.iml
5336
uppsrc/ide/ide.iml
File diff suppressed because it is too large
Load diff
10
upptst/TestBigIcon/TestBigIcon.upp
Normal file
10
upptst/TestBigIcon/TestBigIcon.upp
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
uses
|
||||
CtrlLib;
|
||||
|
||||
file
|
||||
test.iml,
|
||||
main.cpp;
|
||||
|
||||
mainconfig
|
||||
"" = "GUI";
|
||||
|
||||
BIN
upptst/TestBigIcon/icon.ico
Normal file
BIN
upptst/TestBigIcon/icon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 377 KiB |
BIN
upptst/TestBigIcon/icon256x256.png
Normal file
BIN
upptst/TestBigIcon/icon256x256.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
18
upptst/TestBigIcon/main.cpp
Normal file
18
upptst/TestBigIcon/main.cpp
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
#include <CtrlLib/CtrlLib.h>
|
||||
|
||||
#define IMAGECLASS TestImg
|
||||
#define IMAGEFILE <TestBigIcon/test.iml>
|
||||
#include <Draw/iml_header.h>
|
||||
|
||||
#define IMAGECLASS TestImg
|
||||
#define IMAGEFILE <TestBigIcon/test.iml>
|
||||
#include <Draw/iml_source.h>
|
||||
|
||||
using namespace Upp;
|
||||
|
||||
GUI_APP_MAIN
|
||||
{
|
||||
TopWindow win;
|
||||
win.LargeIcon(TestImg::Icon());
|
||||
win.Run();
|
||||
}
|
||||
86
upptst/TestBigIcon/test.iml
Normal file
86
upptst/TestBigIcon/test.iml
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
PREMULTIPLIED
|
||||
IMAGE_ID(Icon) IMAGE_META("exp", "")
|
||||
|
||||
IMAGE_BEGIN_DATA
|
||||
IMAGE_DATA(120,156,237,221,93,110,220,86,16,68,97,7,200,194,181,52,237,140,81,2,132,144,97,123,186,135,247,167,250,118,157,51)
|
||||
IMAGE_DATA(40,63,139,77,126,175,201,223,63,254,250,250,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17)
|
||||
IMAGE_DATA(17,17,17,17,17,17,17,17,17,17,17,17,209,255,93,108,104,68,39,167,246,115,250,136,78,78,237,231,244,17,157,156)
|
||||
IMAGE_DATA(218,207,233,35,58,57,181,159,211,71,116,114,106,63,167,143,232,228,212,126,78,31,209,201,169,253,156,62,162,147,123,249)
|
||||
IMAGE_DATA(125,127,126,126,182,217,215,3,189,189,232,62,130,247,69,52,51,11,255,79,236,227,159,12,106,239,255,169,125,252,147,65)
|
||||
IMAGE_DATA(173,253,143,216,199,63,25,212,214,255,168,125,252,147,65,45,253,207,176,143,127,50,168,157,255,89,246,241,79,6,181,242)
|
||||
IMAGE_DATA(63,211,62,254,45,202,188,99,219,169,61,43,237,39,253,159,62,247,212,247,47,61,181,105,165,253,171,192,253,55,204,61)
|
||||
IMAGE_DATA(245,253,75,79,237,90,105,255,42,112,255,13,115,79,125,255,210,83,219,86,218,191,10,220,127,195,220,83,223,191,244,212)
|
||||
IMAGE_DATA(190,149,246,175,2,247,223,48,247,212,247,47,61,181,113,165,253,171,192,253,55,204,61,245,253,75,79,237,92,105,255,42)
|
||||
IMAGE_DATA(112,255,13,115,79,125,255,210,83,91,87,218,191,10,220,127,195,220,123,121,159,238,69,207,175,246,174,180,159,241,175,46)
|
||||
IMAGE_DATA(186,89,244,247,111,240,85,189,210,239,119,117,209,243,171,205,43,237,227,223,162,210,239,119,117,209,243,171,221,43,237,227)
|
||||
IMAGE_DATA(223,162,210,239,119,117,209,243,59,219,199,191,69,165,223,239,234,162,231,119,182,143,127,139,74,191,223,213,69,207,239,108)
|
||||
IMAGE_DATA(31,255,22,149,126,191,171,139,158,223,217,62,254,45,42,253,126,87,23,61,191,179,253,175,127,240,223,191,193,247,251,227)
|
||||
IMAGE_DATA(232,69,207,239,108,63,231,95,187,143,143,143,151,139,254,254,13,190,170,135,255,2,254,229,222,127,99,31,255,22,225,95)
|
||||
IMAGE_DATA(236,95,238,253,15,246,241,111,17,254,133,254,229,222,95,216,199,191,69,248,23,249,151,123,15,236,227,223,34,252,11,252)
|
||||
IMAGE_DATA(203,189,39,236,227,223,34,252,111,246,47,247,158,180,143,127,139,240,191,209,191,220,251,27,246,241,111,17,254,55,249,151)
|
||||
IMAGE_DATA(123,127,211,62,254,45,194,255,6,255,114,239,15,236,227,223,34,252,47,246,47,247,254,208,62,254,45,194,255,66,255,114)
|
||||
IMAGE_DATA(239,3,246,241,111,17,254,23,249,151,123,31,180,159,185,143,250,253,225,127,56,252,47,240,47,247,62,193,126,230,62,234)
|
||||
IMAGE_DATA(247,135,255,225,240,63,217,191,220,251,36,251,153,251,168,223,31,254,135,195,255,68,255,114,239,19,237,103,238,163,126,127)
|
||||
IMAGE_DATA(248,31,14,255,147,252,203,189,79,182,159,185,143,250,253,225,127,56,252,79,240,47,247,190,192,126,230,62,234,247,135,255)
|
||||
IMAGE_DATA(225,240,63,232,95,238,125,145,253,204,125,212,239,15,255,195,225,127,192,191,220,251,66,251,153,251,168,223,31,254,135,195)
|
||||
IMAGE_DATA(255,67,255,114,239,139,237,103,238,163,126,127,248,31,14,255,15,252,203,189,111,176,159,185,143,250,253,225,127,56,252,191)
|
||||
IMAGE_DATA(233,95,238,125,147,253,204,125,212,239,15,255,195,225,255,13,255,114,239,27,237,103,238,163,126,127,248,31,14,255,73,255)
|
||||
IMAGE_DATA(114,239,155,237,103,238,163,126,127,248,31,14,255,9,255,114,239,2,251,153,251,168,223,31,254,135,195,127,224,95,238,93)
|
||||
IMAGE_DATA(100,63,115,31,245,251,195,255,112,248,127,245,252,149,86,241,62,248,63,61,252,159,224,191,234,125,240,127,122,248,175,238)
|
||||
IMAGE_DATA(191,242,125,240,127,122,248,175,236,191,250,125,240,127,122,248,175,234,255,132,251,224,255,244,240,95,209,127,129,219,164,238)
|
||||
IMAGE_DATA(131,255,211,195,127,53,255,5,238,146,190,15,254,79,15,255,149,252,23,184,201,125,27,252,59,132,255,42,254,11,220,227)
|
||||
IMAGE_DATA(190,11,254,93,194,127,5,255,5,110,113,223,4,255,78,225,95,237,191,192,29,238,123,224,223,45,252,43,253,23,184,193)
|
||||
IMAGE_DATA(125,11,252,59,134,127,149,255,2,207,127,223,1,255,174,225,95,225,191,192,179,223,55,120,245,195,127,247,240,191,219,127)
|
||||
IMAGE_DATA(129,231,190,159,63,250,225,191,123,248,223,233,191,192,51,223,207,158,249,225,191,123,248,223,229,191,192,243,222,207,157,253)
|
||||
IMAGE_DATA(225,191,123,248,223,225,191,192,179,222,207,252,206,15,255,221,195,255,106,255,5,158,243,126,222,119,127,248,239,30,254,87)
|
||||
IMAGE_DATA(250,47,240,140,247,179,62,249,225,191,123,248,95,229,191,192,243,221,207,249,244,135,255,234,101,158,145,61,156,181,253,132)
|
||||
IMAGE_DATA(127,38,79,253,252,173,119,61,89,1,243,83,236,227,63,51,117,234,231,111,189,235,221,21,48,63,205,62,254,51,83,167)
|
||||
IMAGE_DATA(126,254,214,187,222,89,1,243,83,237,227,63,51,117,234,231,111,189,43,187,2,230,167,219,199,127,102,234,212,207,223,122)
|
||||
IMAGE_DATA(87,102,5,204,47,177,143,255,204,212,169,159,191,245,174,104,5,204,47,179,143,255,204,212,169,159,191,245,174,87,43,96)
|
||||
IMAGE_DATA(126,169,125,252,103,166,238,229,223,247,253,255,95,207,126,93,116,63,107,251,9,255,234,247,167,254,62,54,248,142,178,126)
|
||||
IMAGE_DATA(63,18,255,5,204,111,177,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143,127,252,55,95,116,63,107)
|
||||
IMAGE_DATA(251,248,199,127,243,69,247,179,182,143,127,252,55,95,116,63,181,119,169,125,252,227,191,249,162,251,169,205,75,237,227,31)
|
||||
IMAGE_DATA(255,205,23,221,79,237,94,106,31,255,248,111,190,232,126,214,246,241,143,255,230,139,238,103,109,31,255,248,111,190,232,126)
|
||||
IMAGE_DATA(214,246,241,143,255,230,139,238,103,109,31,255,248,111,190,232,126,214,246,255,253,139,204,191,175,232,249,55,248,142,178,126)
|
||||
IMAGE_DATA(63,157,252,215,250,93,248,199,127,251,69,247,179,182,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143)
|
||||
IMAGE_DATA(127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179)
|
||||
IMAGE_DATA(182,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143,127,252,55,95,116,63,107,251,248,199,127,243,69)
|
||||
IMAGE_DATA(247,179,182,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143,127,252,55,95,116,63,107,251,248,199,127)
|
||||
IMAGE_DATA(243,69,247,179,182,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143,127,252,55,95,116,63,107,251,248)
|
||||
IMAGE_DATA(199,127,243,69,247,179,182,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143,127,252,55,95,116,63,107)
|
||||
IMAGE_DATA(251,248,199,127,243,69,247,179,182,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143,127,252,55,95,116)
|
||||
IMAGE_DATA(63,107,251,248,199,127,243,69,247,171,245,219,108,31,255,248,111,190,232,126,117,126,2,251,248,199,127,243,69,247,171,241)
|
||||
IMAGE_DATA(19,217,199,63,254,155,47,186,159,254,39,180,143,127,252,55,95,116,63,107,251,248,199,127,243,69,247,179,182,143,127,252)
|
||||
IMAGE_DATA(55,95,116,63,107,251,248,199,127,243,69,247,243,182,143,255,240,251,208,103,253,126,122,249,47,96,254,39,251,248,15,191)
|
||||
IMAGE_DATA(15,125,214,239,167,143,255,2,230,127,177,143,255,240,251,208,103,253,126,122,248,47,96,254,183,246,241,31,126,31,250,172)
|
||||
IMAGE_DATA(223,207,249,254,11,152,255,163,125,252,135,223,135,62,235,247,115,182,255,2,230,95,218,199,127,248,125,232,179,126,63,231)
|
||||
IMAGE_DATA(250,47,96,62,180,143,255,240,251,208,103,253,126,206,244,95,192,124,202,62,254,195,239,67,159,245,251,57,207,127,1,243)
|
||||
IMAGE_DATA(105,251,248,15,191,15,125,214,239,231,44,255,5,204,191,101,31,255,225,247,161,207,250,253,156,227,191,128,249,183,237,227)
|
||||
IMAGE_DATA(63,252,62,244,89,191,159,51,252,23,48,255,200,62,254,195,239,67,159,245,251,169,239,191,128,249,199,246,241,31,126,31)
|
||||
IMAGE_DATA(250,172,223,79,109,255,5,204,15,217,199,127,248,125,232,179,126,63,117,253,23,48,63,108,31,255,225,247,161,207,250,253)
|
||||
IMAGE_DATA(212,244,95,192,252,20,251,248,15,191,15,125,153,191,145,61,157,181,253,216,63,147,167,126,254,222,179,182,143,255,196,212)
|
||||
IMAGE_DATA(169,159,191,247,172,237,227,63,49,117,234,231,239,61,107,251,248,79,76,157,250,249,123,207,218,62,254,19,83,167,126,254)
|
||||
IMAGE_DATA(222,179,182,143,255,196,212,169,159,191,247,172,237,227,63,49,117,234,231,239,61,107,251,248,79,236,244,94,62,95,156,92)
|
||||
IMAGE_DATA(192,208,162,231,247,182,31,251,87,95,225,227,227,227,229,194,247,75,248,79,251,87,255,181,223,246,200,242,147,225,191,121)
|
||||
IMAGE_DATA(248,79,249,87,255,165,223,246,200,241,211,225,191,121,248,15,253,171,255,202,111,123,100,120,100,248,111,30,254,95,250,87)
|
||||
IMAGE_DATA(255,133,223,246,200,239,232,240,223,60,252,159,224,255,177,223,209,225,191,121,248,175,238,127,200,239,232,240,223,60,252,87)
|
||||
IMAGE_DATA(246,63,236,119,116,248,111,30,254,171,250,159,226,119,116,248,111,30,254,43,250,159,230,119,116,248,111,30,254,171,249,159)
|
||||
IMAGE_DATA(234,119,116,248,111,30,254,43,249,159,238,247,249,50,255,253,59,245,251,195,255,112,248,175,226,127,129,225,17,251,248,183)
|
||||
IMAGE_DATA(8,255,21,252,47,114,60,98,31,255,22,225,95,237,127,161,229,17,251,248,183,8,255,74,255,139,61,143,216,199,191,69)
|
||||
IMAGE_DATA(248,87,249,223,96,122,196,62,254,45,194,191,194,255,38,215,35,246,241,111,17,254,119,251,223,104,123,196,62,254,45,194)
|
||||
IMAGE_DATA(255,78,255,155,125,143,216,199,191,69,248,223,229,95,96,124,196,62,254,45,194,255,14,255,34,231,35,246,241,111,17,254)
|
||||
IMAGE_DATA(87,251,23,90,31,177,143,127,139,240,191,210,191,216,251,136,125,252,91,132,255,85,254,11,152,31,177,143,127,139,240,191)
|
||||
IMAGE_DATA(194,127,1,243,163,246,241,111,17,254,103,251,47,96,126,134,125,252,91,132,255,153,254,11,152,159,101,31,255,22,225,127)
|
||||
IMAGE_DATA(150,255,2,230,103,218,199,191,69,248,159,225,191,128,249,217,246,241,111,17,254,71,253,23,48,191,194,62,254,45,194,255)
|
||||
IMAGE_DATA(136,255,2,230,87,217,199,191,69,47,239,19,125,31,209,253,171,47,122,126,103,251,25,255,234,247,135,255,225,240,255,196)
|
||||
IMAGE_DATA(127,1,243,171,237,227,223,34,252,191,235,191,128,249,29,246,241,111,17,254,223,241,95,192,252,46,251,248,183,8,255,89)
|
||||
IMAGE_DATA(255,5,204,239,180,143,127,139,240,159,241,95,192,252,110,251,248,183,8,255,145,255,2,230,21,246,241,111,17,254,95,78)
|
||||
IMAGE_DATA(111,94,101,31,255,22,101,110,100,60,189,123,149,253,140,255,6,115,79,125,255,226,243,181,143,127,139,212,247,47,62,95)
|
||||
IMAGE_DATA(251,248,183,72,125,255,226,243,181,143,127,139,212,247,47,62,95,251,248,183,72,125,255,226,243,181,143,127,139,212,247,47)
|
||||
IMAGE_DATA(62,95,251,248,183,72,125,255,226,243,181,143,127,50,168,132,127,181,243,1,255,68,39,39,247,175,54,142,127,50,78,234)
|
||||
IMAGE_DATA(95,237,27,255,100,158,204,191,218,54,254,137,52,254,213,174,241,79,244,95,219,253,171,77,227,159,232,110,171,127,181,103)
|
||||
IMAGE_DATA(252,19,253,212,54,255,106,203,248,39,250,165,204,55,206,240,79,61,83,251,57,125,68,39,167,246,115,250,136,78,78,237)
|
||||
IMAGE_DATA(231,244,17,157,156,218,207,233,35,58,57,181,159,211,71,116,114,106,63,167,143,232,228,212,126,78,31,17,17,17,17,17)
|
||||
IMAGE_DATA(17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,209,209,253,3,67,157)
|
||||
IMAGE_DATA(188,26,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(2592, 1)
|
||||
Loading…
Add table
Add a link
Reference in a new issue