From 01e442fc73f86eb6bd65a43ae712daec100866e7 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 19 Aug 2008 09:31:47 +0000 Subject: [PATCH] Removed wrong png files, fixed inconsistent line ending problem git-svn-id: svn://ultimatepp.org/upp/trunk@354 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/IconDes/IconDes.iml | 133 ++++++++++++++-------------- uppsrc/IconDes/ImlFile.cpp | 4 +- uppsrc/ide/app.tpp/all.i | 176 ++++++++++++++++++------------------- uppsrc/ide/icon.ico | Bin 0 -> 2862 bytes uppsrc/ide/icon16x16.png | Bin 0 -> 219 bytes uppsrc/ide/ide.iml | 3 +- uppsrc/ide/ide.lay | 2 +- uppsrc/ide/ide.png | 2 - uppsrc/ide/theide-48.png | 1 - uppsrc/ide/version.h | 2 +- uppsrc/ide/xide.ico | Bin 318 -> 0 bytes 11 files changed, 161 insertions(+), 162 deletions(-) create mode 100644 uppsrc/ide/icon.ico create mode 100644 uppsrc/ide/icon16x16.png delete mode 100644 uppsrc/ide/ide.png delete mode 100644 uppsrc/ide/theide-48.png delete mode 100644 uppsrc/ide/xide.ico diff --git a/uppsrc/IconDes/IconDes.iml b/uppsrc/IconDes/IconDes.iml index b4ff95b2e..ac674cbd7 100644 --- a/uppsrc/IconDes/IconDes.iml +++ b/uppsrc/IconDes/IconDes.iml @@ -1,3 +1,4 @@ +PREMULTIPLIED IMAGE_ID(Arrow) IMAGE_ID(ArrowColor) IMAGE_ID(ZoomMinus) @@ -67,27 +68,27 @@ IMAGE_ID(pen5) IMAGE_ID(pen6) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,154,77,110,131,48,16,133,173,182,155,170,82,21,117,211,77,22,201,17,184,75,114,140,46,186,233,174,18,221) -IMAGE_DATA(86,170,122,143,220,35,28,132,139,184,24,194,159,153,177,199,54,216,52,153,23,141,200,15,239,155,7,1,27,133,136,157) -IMAGE_DATA(216,137,129,228,165,82,73,42,37,204,32,91,37,202,32,135,74,144,65,234,138,156,97,210,63,114,6,176,127,196,12,104) -IMAGE_DATA(255,72,25,140,253,35,100,176,246,95,56,131,173,231,176,22,239,47,226,143,71,147,237,77,209,95,235,21,51,3,212,35) -IMAGE_DATA(118,127,240,253,200,223,195,218,250,175,33,67,234,254,66,164,191,62,99,177,88,44,214,53,74,251,49,128,181,2,229,213) -IMAGE_DATA(132,159,39,154,244,219,222,169,50,164,234,203,253,251,254,169,122,175,161,63,139,197,98,177,88,44,22,139,117,51,218,84) -IMAGE_DATA(15,64,219,170,10,49,190,19,86,92,222,183,233,168,214,127,43,10,249,35,101,87,234,245,133,115,48,120,21,95,126,150) -IMAGE_DATA(165,84,191,195,79,74,189,223,48,176,28,69,221,7,242,182,213,228,40,16,127,157,85,28,78,120,153,239,12,52,126,145) -IMAGE_DATA(227,69,241,31,79,120,153,253,246,237,63,159,149,247,140,248,235,253,47,252,247,191,210,161,94,71,207,209,244,149,223,251) -IMAGE_DATA(189,252,205,50,249,108,102,64,199,159,202,188,205,171,231,202,79,96,128,122,190,82,198,87,150,149,174,254,150,241,46,68) -IMAGE_DATA(249,177,217,148,235,30,12,212,201,167,78,160,246,36,112,29,12,116,191,207,96,160,252,169,6,131,97,127,159,193,0,218) -IMAGE_DATA(126,151,193,192,125,255,43,241,96,144,128,49,219,96,112,87,61,52,133,252,55,70,14,229,200,144,186,66,252,237,107,7) -IMAGE_DATA(198,196,11,228,176,253,119,104,226,197,152,150,108,32,163,241,52,21,194,104,57,115,49,176,125,97,83,106,127,207,241,247) -IMAGE_DATA(27,246,29,113,27,172,199,167,201,71,62,182,129,26,11,185,50,96,93,161,242,128,251,129,186,215,133,129,121,111,197,143) -IMAGE_DATA(49,168,222,104,82,131,193,189,120,0,62,145,1,97,251,217,43,140,17,226,211,151,84,47,86,205,10,218,210,165,127,55) -IMAGE_DATA(154,211,102,131,81,238,145,207,238,31,229,158,248,28,251,155,252,228,89,13,91,82,103,214,80,127,192,204,188,168,223,226) -IMAGE_DATA(181,50,102,245,191,136,87,241,40,158,8,188,30,76,12,96,242,234,97,130,47,229,1,230,181,114,200,7,95,96,54,31) -IMAGE_DATA(14,148,207,139,3,228,11,226,96,108,34,103,210,127,14,142,190,14,38,195,247,101,245,154,152,11,112,188,89,11,114,156) -IMAGE_DATA(89,8,99,78,142,19,107,14,142,133,65,98,17,25,29,203,80,99,121,76,66,172,255,35,215,9,30,245,107,7,34,122) -IMAGE_DATA(178,3,159,141,188,216,115,205,7,29,248,36,142,206,4,78,34,31,14,148,41,152,163,175,131,9,225,76,88,46,90,136) -IMAGE_DATA(227,205,90,144,227,204,66,24,115,114,156,88,115,112,44,12,18,139,200,232,88,134,26,233,15,147,184,148,119,0,0,0) +IMAGE_DATA(120,156,237,154,77,110,131,48,16,133,157,182,155,170,82,84,117,211,77,22,201,58,171,220,37,185,65,23,221,116,211,125) +IMAGE_DATA(37,214,149,170,222,35,247,8,7,225,34,46,14,33,128,153,177,199,54,216,148,204,139,70,228,135,247,205,131,128,141,66) +IMAGE_DATA(196,90,172,69,75,242,82,169,36,149,18,102,144,181,18,101,144,109,37,200,32,117,69,206,208,235,31,57,3,216,63,98) +IMAGE_DATA(6,180,127,164,12,198,254,17,50,88,251,143,156,193,214,179,93,163,247,23,241,199,163,222,246,166,232,175,245,138,153,1) +IMAGE_DATA(234,17,187,63,248,126,228,239,97,106,253,167,144,33,117,127,33,210,95,159,177,88,44,22,107,142,210,126,12,96,77,64) +IMAGE_DATA(89,57,225,103,137,38,253,186,119,170,12,169,250,114,255,166,127,170,222,83,232,207,98,177,88,44,22,139,197,98,221,140) +IMAGE_DATA(158,203,7,160,85,89,185,232,222,9,203,47,239,219,116,80,235,127,228,185,252,145,242,90,234,245,133,179,55,120,21,95) +IMAGE_DATA(126,21,133,84,191,195,247,74,189,95,49,176,28,249,185,15,228,173,171,202,145,35,254,115,86,177,63,226,101,190,51,80) +IMAGE_DATA(249,69,134,23,197,127,56,226,101,246,219,183,255,116,82,222,19,226,63,239,127,225,191,255,149,246,231,117,244,28,85,95) +IMAGE_DATA(249,189,217,200,223,221,78,46,204,12,232,248,83,153,87,89,249,92,249,9,12,80,139,153,50,62,183,219,194,213,95,51) +IMAGE_DATA(222,132,40,222,151,203,98,218,131,129,58,249,212,9,84,159,4,174,131,129,238,247,25,12,148,63,213,96,208,238,239,51) +IMAGE_DATA(24,64,219,239,50,24,184,239,127,37,30,12,18,48,6,27,12,238,202,135,166,144,255,198,200,182,28,25,82,87,136,191) +IMAGE_DATA(126,237,192,232,121,129,28,182,255,14,245,188,24,211,146,13,100,84,158,170,66,24,53,103,40,6,182,47,108,74,237,111) +IMAGE_DATA(56,254,126,195,190,35,110,131,245,248,52,249,200,199,54,80,93,33,87,6,172,25,42,11,184,31,168,123,93,24,152,247) +IMAGE_DATA(86,252,24,131,234,141,38,53,24,220,139,7,224,19,25,16,182,153,189,194,24,33,62,125,73,245,98,85,173,160,45,93) +IMAGE_DATA(250,95,71,115,218,108,208,201,221,241,217,253,157,220,61,159,99,127,147,159,60,171,97,75,234,204,26,234,15,152,153,71) +IMAGE_DATA(245,91,188,86,198,160,254,23,241,42,30,197,19,129,215,128,137,1,76,94,61,76,240,165,60,192,156,43,135,124,240,5) +IMAGE_DATA(102,243,225,64,249,188,56,64,190,32,14,198,38,114,122,253,135,224,232,235,96,50,124,95,86,175,137,57,2,199,155,53) +IMAGE_DATA(34,199,153,133,48,134,228,56,177,134,224,88,24,36,22,145,113,101,25,170,43,143,73,136,245,127,228,58,193,163,126,237) +IMAGE_DATA(64,68,79,118,224,179,142,23,123,174,249,160,3,159,196,209,153,192,73,228,195,129,50,5,115,244,117,48,33,156,30,203) +IMAGE_DATA(69,35,113,188,89,35,114,156,89,8,99,72,142,19,107,8,142,133,65,98,17,25,87,150,161,58,250,3,181,5,146,255) IMAGE_END_DATA(672, 9) IMAGE_BEGIN_DATA @@ -163,51 +164,51 @@ IMAGE_DATA(252,114,185,60,124,111,126,230,102,157,189,249,179,255,239,219,255,10 IMAGE_END_DATA(896, 18) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,153,207,139,20,71,20,199,31,57,108,8,203,50,203,34,193,69,188,137,36,136,4,117,144,176,65,150,96,8) -IMAGE_DATA(226,28,188,137,12,145,108,8,145,221,191,34,101,140,196,227,122,217,83,64,50,97,241,16,200,97,9,24,136,39,73,200) -IMAGE_DATA(33,144,67,46,57,230,232,193,91,34,30,22,236,202,171,234,170,174,87,213,245,171,187,103,182,71,153,39,95,170,171,187) -IMAGE_DATA(62,239,85,85,87,189,173,105,97,21,86,193,99,188,165,12,207,121,84,204,109,19,226,181,111,135,213,138,242,178,84,255) -IMAGE_DATA(212,61,202,90,62,50,121,81,50,102,4,33,190,234,55,225,149,74,142,25,222,232,49,234,79,88,89,126,10,199,7,135) -IMAGE_DATA(112,113,80,192,205,1,135,79,215,56,12,87,76,187,55,81,167,143,113,88,81,117,227,231,57,220,189,243,2,126,124,120) -IMAGE_DATA(8,223,238,190,132,201,110,1,191,30,112,248,251,15,14,7,63,112,216,254,130,15,68,187,237,91,28,246,191,47,96,247) -IMAGE_DATA(110,1,39,160,168,248,245,245,2,217,2,254,121,84,192,55,27,5,220,67,61,123,194,225,249,51,14,79,30,243,115,39) -IMAGE_DATA(223,230,87,176,157,40,225,209,1,182,221,127,9,239,46,29,86,252,49,236,231,253,59,28,110,159,229,240,27,214,127,71) -IMAGE_DATA(221,27,98,219,125,62,248,248,60,191,138,109,110,161,68,57,216,60,131,254,111,31,194,218,27,79,173,57,184,190,201,97) -IMAGE_DATA(140,229,95,74,159,160,62,251,8,125,3,191,180,14,252,198,169,178,196,101,91,192,213,205,23,114,190,220,121,191,136,154) -IMAGE_DATA(40,109,160,150,80,111,1,63,125,14,245,78,89,226,189,2,219,254,135,250,197,226,79,160,54,81,103,81,162,221,53,212) -IMAGE_DATA(251,98,110,128,47,93,1,126,114,92,150,176,134,252,50,252,139,204,207,22,47,184,203,168,227,168,15,81,55,160,28,207) -IMAGE_DATA(117,212,77,49,247,170,188,134,252,41,15,191,42,222,173,210,25,21,123,67,233,3,212,37,85,158,71,126,213,195,231,75) -IMAGE_DATA(140,223,230,23,201,96,174,146,65,59,17,63,60,161,137,83,15,241,62,127,19,162,24,47,175,63,87,242,176,212,135,59) -IMAGE_DATA(150,16,47,202,201,178,17,216,124,125,222,9,15,132,255,14,12,239,93,183,23,148,244,51,82,119,227,147,118,126,254,66) -IMAGE_DATA(134,66,124,174,66,227,111,166,210,102,149,12,246,246,246,162,26,14,135,86,61,196,107,223,46,171,21,227,221,254,185,44) -IMAGE_DATA(245,145,203,139,146,178,78,219,172,249,19,220,104,52,170,248,169,170,93,18,174,243,30,127,130,213,138,242,178,132,38,73) -IMAGE_DATA(56,201,139,114,134,73,216,240,12,172,228,70,235,181,248,44,193,179,12,133,248,92,53,88,119,17,149,182,56,25,4,22) -IMAGE_DATA(85,15,139,114,107,107,171,149,244,162,144,245,7,15,162,98,110,155,16,175,253,59,172,86,148,151,165,146,186,71,89,203) -IMAGE_DATA(135,224,33,205,139,146,49,163,45,155,151,102,205,11,229,149,74,142,25,94,207,31,229,153,146,126,78,234,181,248,44,193) -IMAGE_DATA(179,12,133,248,92,133,198,223,100,253,104,91,36,131,249,73,6,168,29,37,14,35,37,253,140,212,71,35,35,249,140,17) -IMAGE_DATA(158,243,29,216,222,230,240,147,18,189,70,13,5,67,234,210,167,143,215,241,28,86,43,202,139,235,109,37,121,141,44,150) -IMAGE_DATA(174,100,28,119,252,37,143,165,18,185,135,243,85,201,106,107,108,167,18,229,149,74,142,25,222,200,240,76,73,63,35,245) -IMAGE_DATA(90,124,150,224,89,134,66,124,174,66,227,111,166,210,156,100,208,118,243,27,62,55,1,52,228,89,124,243,214,121,112,120) -IMAGE_DATA(186,129,99,60,35,18,62,212,181,197,179,200,248,89,216,71,228,120,23,155,127,144,62,252,207,27,24,111,216,190,22,207) -IMAGE_DATA(231,35,213,151,250,187,4,207,251,105,194,107,22,120,106,45,132,227,107,62,190,22,74,222,243,238,50,215,66,144,207,92) -IMAGE_DATA(11,0,221,246,98,115,11,156,12,50,173,213,2,35,108,91,222,126,169,221,227,27,31,140,137,191,216,113,217,62,186,240) -IMAGE_DATA(174,159,238,124,251,185,168,46,115,18,121,35,222,147,136,33,248,254,242,54,207,204,172,221,252,207,15,223,201,186,37,131) -IMAGE_DATA(186,245,61,25,189,78,166,176,86,155,41,206,207,126,51,77,47,153,244,157,12,187,38,243,102,99,110,203,79,251,143,89) -IMAGE_DATA(91,115,248,68,50,104,27,76,30,93,184,253,91,57,155,213,156,91,54,141,173,69,250,144,84,248,71,142,106,147,254,230) -IMAGE_DATA(17,142,159,247,205,35,60,254,38,223,60,220,249,39,113,102,248,205,195,240,38,241,112,183,94,139,207,18,124,94,130,243) -IMAGE_DATA(243,185,10,141,191,153,94,109,155,246,201,96,78,172,235,203,140,126,251,72,36,3,155,119,55,227,235,253,1,212,240,139) -IMAGE_DATA(100,240,234,25,77,6,227,241,120,106,98,56,57,61,250,224,90,202,71,82,78,44,62,222,223,175,36,159,145,186,188,167) -IMAGE_DATA(218,48,181,33,149,159,58,175,125,59,44,115,239,251,120,89,150,210,109,41,171,175,115,120,221,143,74,108,44,53,14,241) -IMAGE_DATA(90,62,94,114,204,240,70,134,103,74,132,179,234,52,62,11,243,21,231,168,118,223,195,135,216,20,239,188,211,212,154,177) -IMAGE_DATA(198,223,116,205,246,188,79,44,249,78,6,93,50,93,147,227,121,146,143,30,215,143,136,79,140,193,29,79,141,253,250,171) -IMAGE_DATA(82,162,174,175,93,249,120,202,198,120,103,44,222,184,174,2,44,232,177,248,226,72,191,177,89,37,188,79,46,207,0,124) -IMAGE_DATA(124,216,210,39,171,124,158,158,76,114,121,114,138,168,253,111,2,203,216,43,233,147,73,255,118,4,63,19,154,30,165,188) -IMAGE_DATA(11,41,178,49,45,150,125,249,94,37,205,82,63,160,22,59,109,227,227,19,125,205,229,107,125,208,74,241,180,143,130,167) -IMAGE_DATA(227,114,199,24,26,127,36,17,6,147,89,40,126,34,17,88,60,101,125,60,171,39,130,90,252,218,24,51,191,183,208,248) -IMAGE_DATA(186,180,120,127,34,72,199,143,39,130,244,79,140,120,34,72,237,139,163,249,137,210,211,55,131,46,157,79,110,212,25,199) -IMAGE_DATA(127,29,248,89,90,147,211,212,116,23,243,194,186,89,15,201,160,107,34,72,249,200,205,180,109,249,105,244,191,11,63,239) -IMAGE_DATA(155,167,107,50,88,36,147,190,236,136,147,193,180,94,92,215,205,158,98,187,38,132,174,207,99,220,188,47,252,190,147,193) -IMAGE_DATA(34,153,180,180,255,1,160,236,138,193,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) +IMAGE_DATA(120,156,237,153,207,143,20,69,20,199,159,7,48,72,216,93,13,81,212,112,49,134,16,13,33,43,173,81,20,137,209,40) +IMAGE_DATA(113,18,189,17,50,145,184,196,64,134,127,2,75,197,31,39,137,151,61,120,33,12,174,7,127,28,36,6,77,228,68,52) +IMAGE_DATA(30,76,60,120,241,230,149,3,55,37,28,54,161,203,87,213,85,93,175,170,235,87,119,207,236,12,100,30,249,166,186,186) +IMAGE_DATA(235,243,94,85,117,213,155,218,6,86,96,5,60,198,59,202,240,156,71,197,220,54,33,94,251,118,88,173,40,47,75,245) +IMAGE_DATA(79,221,163,172,229,35,147,23,37,99,70,16,226,235,126,19,94,169,226,152,225,141,174,161,254,132,157,59,110,192,35,75) +IMAGE_DATA(155,240,236,82,9,39,151,57,188,251,16,135,98,151,105,119,63,106,223,110,14,187,84,221,248,185,5,236,220,109,248,230) +IMAGE_DATA(242,38,124,249,249,29,184,116,161,132,95,175,112,248,251,15,14,87,190,229,48,58,205,151,69,187,209,25,14,95,141,75) +IMAGE_DATA(184,112,190,132,199,160,172,249,61,123,74,248,254,235,18,254,185,90,194,39,47,148,240,41,234,230,117,14,183,110,114,184) +IMAGE_DATA(126,141,175,238,125,152,31,195,118,162,132,171,63,148,240,221,229,59,176,127,219,102,205,239,198,126,126,241,17,135,15,14) +IMAGE_DATA(112,248,13,235,191,163,62,43,56,252,180,193,151,95,127,134,191,137,109,206,160,68,185,244,242,83,37,124,124,110,19,86) +IMAGE_DATA(238,187,97,205,193,241,163,28,134,88,254,165,244,14,234,212,107,232,27,248,145,71,129,159,120,178,42,97,25,251,253,198) +IMAGE_DATA(75,183,229,124,185,243,254,28,106,172,116,24,181,29,181,3,248,190,85,212,254,170,132,109,200,3,252,135,250,197,226,31) +IMAGE_DATA(71,29,69,29,64,137,118,111,163,158,71,97,204,237,199,128,239,29,86,37,60,136,252,3,240,47,50,63,91,188,224,94) +IMAGE_DATA(21,115,137,122,5,117,2,170,241,28,71,157,20,115,175,202,183,144,127,194,195,175,136,119,171,244,180,138,125,88,233,69) +IMAGE_DATA(212,17,85,174,34,191,236,225,243,37,198,111,243,139,100,48,87,201,160,155,136,31,158,208,216,169,135,120,159,191,49,81) +IMAGE_DATA(140,151,215,239,41,121,88,234,195,29,75,136,23,229,120,167,17,216,124,115,222,9,15,132,191,4,134,247,174,219,67,74) +IMAGE_DATA(250,25,169,187,241,73,59,63,127,40,67,33,62,87,161,241,183,83,101,211,74,6,235,235,235,81,21,69,97,213,67,188) +IMAGE_DATA(246,237,178,90,49,222,237,159,203,82,31,185,188,40,41,235,180,205,154,63,193,13,6,131,154,159,168,186,37,225,38,239) +IMAGE_DATA(241,39,88,173,40,47,75,104,147,132,147,188,40,167,152,132,13,207,192,74,110,180,222,136,207,18,60,203,80,136,207,85) +IMAGE_DATA(139,117,23,81,101,139,147,65,96,81,205,96,81,174,173,173,117,146,94,20,178,126,241,98,84,204,109,19,226,181,127,135) +IMAGE_DATA(213,138,242,178,84,82,247,40,107,249,16,60,164,121,81,50,102,180,102,243,210,172,121,161,188,82,197,49,195,235,249,163) +IMAGE_DATA(60,83,210,207,73,189,17,159,37,120,150,161,16,159,171,208,248,219,172,31,109,139,100,48,63,201,0,117,86,137,195,64) +IMAGE_DATA(73,63,35,245,193,192,72,62,99,132,31,141,132,56,252,168,68,175,81,133,96,72,93,250,244,241,58,158,195,106,69,121) +IMAGE_DATA(113,61,82,146,215,200,98,233,74,198,113,199,95,241,88,42,145,123,69,97,100,181,53,118,182,22,229,149,42,174,48,188) +IMAGE_DATA(145,225,11,37,253,140,212,27,241,139,4,95,100,40,196,231,42,52,254,118,170,204,73,6,93,55,191,225,115,19,64,75) +IMAGE_DATA(158,197,55,111,147,7,135,167,27,56,198,51,34,225,67,93,91,60,139,140,159,133,125,68,142,119,177,249,7,233,195,255) +IMAGE_DATA(188,133,241,150,237,27,241,124,62,82,125,105,190,75,240,188,159,54,188,102,129,167,214,66,56,190,230,227,107,161,226,61) +IMAGE_DATA(239,46,115,45,4,249,204,181,0,208,111,47,182,183,192,201,32,211,58,45,48,194,118,229,237,151,218,63,190,241,193,152) +IMAGE_DATA(248,197,142,203,246,209,135,119,253,244,231,187,207,69,125,153,147,200,91,241,158,68,12,193,247,151,183,121,166,102,221,230) +IMAGE_DATA(127,126,248,94,214,47,25,52,109,214,147,49,211,201,20,214,105,51,197,249,233,111,166,201,37,147,89,39,195,190,201,188) +IMAGE_DATA(221,152,187,242,147,254,49,235,106,14,159,72,6,93,131,201,163,11,183,255,86,206,102,53,231,150,109,99,107,145,62,36) +IMAGE_DATA(21,254,35,71,181,73,127,243,8,199,207,251,230,17,30,127,155,111,30,238,252,147,56,139,175,242,25,124,55,221,221,54) +IMAGE_DATA(233,147,193,156,88,223,151,25,253,246,145,72,6,54,239,110,198,123,251,3,168,225,23,201,224,238,179,105,37,3,54,129) +IMAGE_DATA(201,233,234,99,56,28,114,45,225,131,214,67,162,177,228,189,141,141,90,210,7,169,203,123,170,13,83,27,82,48,94,94) +IMAGE_DATA(247,193,97,153,123,223,199,203,178,146,110,75,89,125,157,195,235,126,212,98,67,169,97,136,215,242,241,146,99,134,87,178) +IMAGE_DATA(120,166,68,56,171,78,227,179,48,95,115,142,26,247,61,124,136,77,241,244,157,166,214,140,59,126,214,114,205,182,109,63) +IMAGE_DATA(45,31,210,60,201,160,79,166,107,115,60,79,242,209,227,250,22,241,137,49,184,227,105,176,231,63,172,36,234,250,218,149) +IMAGE_DATA(143,167,108,140,119,198,226,141,235,42,192,130,30,139,47,142,244,27,155,85,194,251,228,242,12,192,199,135,45,125,178,202) +IMAGE_DATA(231,233,201,36,151,39,167,136,198,255,38,176,140,189,146,62,153,204,222,182,224,207,132,182,71,41,239,66,138,108,76,139) +IMAGE_DATA(101,239,31,172,165,89,234,7,212,98,167,109,124,124,162,175,185,124,163,15,90,41,158,246,81,240,116,92,238,24,67,227) +IMAGE_DATA(143,36,194,96,50,11,197,79,36,2,139,167,172,143,103,205,68,208,136,223,24,99,230,247,22,26,95,151,22,239,79,4) +IMAGE_DATA(233,248,241,68,96,189,3,175,226,137,32,181,47,114,127,140,250,217,140,190,25,244,233,124,114,163,78,57,254,189,192,79) +IMAGE_DATA(211,218,156,166,38,187,152,23,214,207,102,144,12,250,38,130,148,143,220,76,219,149,159,68,255,251,240,243,190,121,250,38) +IMAGE_DATA(131,69,50,153,149,109,113,50,152,212,139,235,187,217,83,108,223,132,208,247,121,140,155,247,133,63,235,100,176,72,38,29) +IMAGE_DATA(237,127,3,71,254,130,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(1440, 16) IMAGE_BEGIN_DATA diff --git a/uppsrc/IconDes/ImlFile.cpp b/uppsrc/IconDes/ImlFile.cpp index 32ded06f0..22d061260 100644 --- a/uppsrc/IconDes/ImlFile.cpp +++ b/uppsrc/IconDes/ImlFile.cpp @@ -293,7 +293,7 @@ String SaveIml(const Array& iml, int format) { for(int i = 0; i < iml.GetCount(); i++) { const ImlImage& c = iml[i]; if(c.exp) - out.PutLine("IMAGE_META(\"exp\", \"\")"); + out << "IMAGE_META(\"exp\", \"\")\r\n"; String name = c.name; Image buffer = c.image; if(IsNull(name)) @@ -334,7 +334,7 @@ String SaveIml(const Array& iml, int format) { const ImlImage& c = iml[i]; out << "IMAGE_ID(" << c.name << ")"; if(c.exp) - out.PutLine(" IMAGE_META(\"exp\", \"\")"); + out << " IMAGE_META(\"exp\", \"\")\r\n"; out << "\r\n"; } int ii = 0; diff --git a/uppsrc/ide/app.tpp/all.i b/uppsrc/ide/app.tpp/all.i index 92ce5b99f..c42ee6c61 100644 --- a/uppsrc/ide/app.tpp/all.i +++ b/uppsrc/ide/app.tpp/all.i @@ -1,96 +1,96 @@ -TOPIC("Files$en-us") -#include "Files$en-us.tppi" -END_TOPIC - -TOPIC("Sponsor$en-us") -#include "Sponsor$en-us.tppi" -END_TOPIC - -TOPIC("Assist$en-us") -#include "Assist$en-us.tppi" -END_TOPIC - -TOPIC("install$en-us") -#include "install$en-us.tppi" -END_TOPIC - -TOPIC("index$en-us") -#include "index$en-us.tppi" -END_TOPIC - -TOPIC("BSD$en-us") -#include "BSD$en-us.tppi" -END_TOPIC - -TOPIC("IntroductionToUPP$en-us") -#include "IntroductionToUPP$en-us.tppi" -END_TOPIC - -TOPIC("CrossComp$en-gb") -#include "CrossComp$en-gb.tppi" -END_TOPIC - -TOPIC("PackageTemplates$en-us") -#include "PackageTemplates$en-us.tppi" -END_TOPIC - -TOPIC("About$en-us") -#include "About$en-us.tppi" -END_TOPIC - TOPIC("esc$en-us") #include "esc$en-us.tppi" END_TOPIC -TOPIC("Keys$en-us") -#include "Keys$en-us.tppi" -END_TOPIC - -TOPIC("cmdline$en-us") -#include "cmdline$en-us.tppi" -END_TOPIC - -TOPIC("Topic$en-us") -#include "Topic$en-us.tppi" -END_TOPIC - -TOPIC("NewProject$en-us") -#include "NewProject$en-us.tppi" -END_TOPIC - -TOPIC("ConfiguringPackagesAssemblies$en-us") -#include "ConfiguringPackagesAssemblies$en-us.tppi" -END_TOPIC - -TOPIC("GPL$en-us") -#include "GPL$en-us.tppi" -END_TOPIC - -TOPIC("IconDes$en-us") -#include "IconDes$en-us.tppi" -END_TOPIC - -TOPIC("Blitz$en-us") -#include "Blitz$en-us.tppi" -END_TOPIC - -TOPIC("macros$en-us") -#include "macros$en-us.tppi" -END_TOPIC - -TOPIC("PackagesAssembliesAndNests$en-us") -#include "PackagesAssembliesAndNests$en-us.tppi" -END_TOPIC - -TOPIC("GettingStarted$en-us") -#include "GettingStarted$en-us.tppi" -END_TOPIC - -TOPIC("Contact$en-us") -#include "Contact$en-us.tppi" -END_TOPIC - TOPIC("Flags$en-us") #include "Flags$en-us.tppi" END_TOPIC +TOPIC("NewProject$en-us") +#include "NewProject$en-us.tppi" +END_TOPIC + +TOPIC("Sponsor$en-us") +#include "Sponsor$en-us.tppi" +END_TOPIC + +TOPIC("IntroductionToUPP$en-us") +#include "IntroductionToUPP$en-us.tppi" +END_TOPIC + +TOPIC("index$en-us") +#include "index$en-us.tppi" +END_TOPIC + +TOPIC("Keys$en-us") +#include "Keys$en-us.tppi" +END_TOPIC + +TOPIC("ConfiguringPackagesAssemblies$en-us") +#include "ConfiguringPackagesAssemblies$en-us.tppi" +END_TOPIC + +TOPIC("About$en-us") +#include "About$en-us.tppi" +END_TOPIC + +TOPIC("GPL$en-us") +#include "GPL$en-us.tppi" +END_TOPIC + +TOPIC("PackagesAssembliesAndNests$en-us") +#include "PackagesAssembliesAndNests$en-us.tppi" +END_TOPIC + +TOPIC("CrossComp$en-gb") +#include "CrossComp$en-gb.tppi" +END_TOPIC + +TOPIC("Contact$en-us") +#include "Contact$en-us.tppi" +END_TOPIC + +TOPIC("BSD$en-us") +#include "BSD$en-us.tppi" +END_TOPIC + +TOPIC("macros$en-us") +#include "macros$en-us.tppi" +END_TOPIC + +TOPIC("Blitz$en-us") +#include "Blitz$en-us.tppi" +END_TOPIC + +TOPIC("GettingStarted$en-us") +#include "GettingStarted$en-us.tppi" +END_TOPIC + +TOPIC("IconDes$en-us") +#include "IconDes$en-us.tppi" +END_TOPIC + +TOPIC("Files$en-us") +#include "Files$en-us.tppi" +END_TOPIC + +TOPIC("cmdline$en-us") +#include "cmdline$en-us.tppi" +END_TOPIC + +TOPIC("PackageTemplates$en-us") +#include "PackageTemplates$en-us.tppi" +END_TOPIC + +TOPIC("install$en-us") +#include "install$en-us.tppi" +END_TOPIC + +TOPIC("Assist$en-us") +#include "Assist$en-us.tppi" +END_TOPIC + +TOPIC("Topic$en-us") +#include "Topic$en-us.tppi" +END_TOPIC + diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..1a3a0c68007539c1f682082a16defc7df678e9e0 GIT binary patch literal 2862 zcmc(hJBSle6oyac?fM!!tsHDzySNd-$^m!5MhL>fHex_nEK_Oe==$o6W*-?riJg_K zrHxE6ja>@0j)Dp*n!-{T@44rnNix}80xo*t&Nt_r|37o)E*X}nLMHh>>2=j2I<4-C z*d}_aa(O&kA#!GjW?7?lpms%Hi9)6OhbvRhD({^hU)E+SktIo@_Y}RfE{dXzH|yD- z_uzQ6w#6VBFXfQUUcN&Q{d|?ldzbwBd0M0NIg4&1xx5A{=vBPu*!vEr(LM7TQ@MEO zYg@lk>Gx2=F%8GLxm+vyi&J&b+8zDqm(L}X6D<5&XhufhIg1lRpHi&q+nhi5+1k&4 zLhj4&JB432fnLsmz2fIuaW*RxFe%bAIOWx;O5{ARz85+&wv zN9r3=-lKKCXAgVFzcZd5DOCRQ@(ha}tlT3nv*>O5hCCx9S2f5~K2te9@^?3g8ef++ z`yYk=x%WCw=7oN3PRHR-sR!SL^#!T-a=mp~>-_Ji{}4u>;Df%3zR3s4_dW|ZUkICB zVe83b-LHC5p5Fk2If&a9#~CbVSz$$(6VPCSc%6J_7q-xCefaX5a@CFxU$}*ayRX z@Po7;elP)p1Mq`=Fgyr9*ju@z&$$Wu;N~sK*TKO}iCbV5>_zZ{bX(#En1I0@$wy!x z4DU+53zmN$|2yWNY}4veu<%-svNW@*&#QCxm1gDFVX9lnME(2)(LaBALhJZ@p#IaK zrBa+uw;aN-wpBj%**I#NtiQ?1l+UB2O*#Kw4R8%AE&KHD~O zf6DzWwe$Wuwnk#lOHIp4z2S(emsR+8yxHCFto$RF=(8TbO!J)`cZ^5z+Yjca_Z)gE1MD}~~5;o31~9IsvEYiDtFk@boTn)loDoiki%pWjW3rqZRjvrag%5N-XFp%v>0}uh+WR|;bqjU*y9_!OG?d4 zOW3Yjd`()tm9x2Fw~Etl_gVRqqS7wp{}XkeT>K~OdeI)cn1x;QzgL`ppxTniCakD3 zU*YeMw#cicx_gTe~DWM4fJw{hl literal 0 HcmV?d00001 diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml index 6caf6dbcb..45bdff36b 100644 --- a/uppsrc/ide/ide.iml +++ b/uppsrc/ide/ide.iml @@ -1,5 +1,6 @@ PREMULTIPLIED -IMAGE_ID(Package) +IMAGE_ID(Package) IMAGE_META("exp", "") + IMAGE_ID(IconBuilding) IMAGE_ID(IconRunning) IMAGE_ID(IconDebugging) diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay index 26df8c27d..45d9f0a2f 100644 --- a/uppsrc/ide/ide.lay +++ b/uppsrc/ide/ide.lay @@ -7,7 +7,7 @@ LAYOUT(ListLayout, 604, 432) ITEM(Button, newu, SetLabel(t_("&New package")).RightPosZ(140, 90).BottomPosZ(8, 22)) ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(72, 64).BottomPosZ(8, 22)) ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(4, 64).BottomPosZ(8, 22)) - ITEM(DataPusher, description, HSizePosZ(4, 6).BottomPosZ(37, 19)) + ITEM(DataPusher, description, HSizePosZ(4, 6).BottomPosZ(36, 20)) END_LAYOUT LAYOUT(ConfigLayout, 724, 214) diff --git a/uppsrc/ide/ide.png b/uppsrc/ide/ide.png deleted file mode 100644 index 97e0b63d3..000000000 --- a/uppsrc/ide/ide.png +++ /dev/null @@ -1,2 +0,0 @@ -‰PNG - diff --git a/uppsrc/ide/theide-48.png b/uppsrc/ide/theide-48.png deleted file mode 100644 index f1ad7558e..000000000 --- a/uppsrc/ide/theide-48.png +++ /dev/null @@ -1 +0,0 @@ -‰PNG diff --git a/uppsrc/ide/version.h b/uppsrc/ide/version.h index 786657e3c..f910ca0f9 100644 --- a/uppsrc/ide/version.h +++ b/uppsrc/ide/version.h @@ -1 +1 @@ -#define IDE_VERSION "808.r134" +#define IDE_VERSION "808.r135" diff --git a/uppsrc/ide/xide.ico b/uppsrc/ide/xide.ico deleted file mode 100644 index 1ab4dc9328e3549053cec18df1e2f96ccf2b0456..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmaKoK?*`K3`Ae~!lx^{a;r;^S@{?E+uWw$MLfd4L7izAf{00HCYh!X3Q1W?!EsM; zu?lu>LgFNbHux7+(4p2TVwJSkq`v6m(7P)^Y0LB-AtUbtIiv(bh?ttgBO3Vh!w5Nk qXO%JQUG3lS3hNV=4Yox)ukbnxS2(1Hd-)IjORAb{njgD+e|Q6GKsbf~