From 34e774b636a0fbd1664a2c6cabf7d10206d52e21 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 14 Sep 2015 10:05:02 +0000 Subject: [PATCH] ide: Improved text/designer/hex handling #1265, #1218 git-svn-id: svn://ultimatepp.org/upp/trunk@8921 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/icon.ico | Bin 2862 -> 2862 bytes uppsrc/ide/ide.iml | 142 ++++++++++++++++++++++++++--------------- uppsrc/ide/idebar.cpp | 46 +++++++------ uppsrc/ide/idefile.cpp | 7 +- 4 files changed, 122 insertions(+), 73 deletions(-) diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico index ed674dab4681e8f6a8a54a9f03063eb6fa681734..4cff9502574c41f1a9581c6a4b36e1faac662d5c 100644 GIT binary patch literal 2862 zcmeHJF;2uV5ZuJEV^P5iKr~#5bcmV)cmUG90D-6}pgoBKI)1=gQqa)z93(Tdj-8yj zLnnbK(5?kwy51SBF9+e+={%Qmhwp@;(h0t}K`Wjk_o6qNgPCWTZgZa3(WRO4uBRaWU^%}ZADoMNG>wby>KEB1#TZX8^Os;o zBXG`qV!ck0qrc+(sk5BVpOCtI-!=Fu(&OVfkQ@2z<+B-29@qWM@vOKXv4h4?*IB;u z%gPtM67U;2-|S;oq%(uhafg&X?sH8Jxr_IV*O5-ZFU{ADJU={&4~@LPzKO4cv=9iW z2h@1v=eJiI-<-kbKkyI#1Lb|NB6kLNOK+yC#5p4fYTjCDofA8{UfR}WxB<6rTVaGD zAg>p5Ti2`r* literal 2862 zcmcguy^hmB5FVe6&r5ZbRGhBi%1A*-bS~fpkW!{XLOcPqktm=;5ONncJc|n&dL9SK z%r~>MyIv(Ax_gv?&&u`C@p-JWu9xe$V{Dvm1|32wvRx2)vN^dYuEXibpQYChc7JzGs~k&O>eF zh;ivrj znzMnq@~@I5GgoKHByJ@fk-2k@3l=3x}0T#}c*!0~^0%p>-E z==`)U?roltBjzN=Zjj0R{pirX?}J}6|7`;*Zcc*Nr%%t*IbyFqa>;Dt$+{cOibLU> z7#^`i6}5MD$4On5p|C6pSJ$OuBhs|3Th_H}y^r8>S!>d{lEuxIOKcERe>V2p+062S zYulOO9r!C&;}^e5{HAebRk1F-*I2iU?+etkeI@qu`sMZoGV5npGr8-W F{sOt@+Oq%v diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml index 4ae5300c2..067c67294 100644 --- a/uppsrc/ide/ide.iml +++ b/uppsrc/ide/ide.iml @@ -102,6 +102,9 @@ IMAGE_ID(Go_forward) IMAGE_ID(DownloadBlack) IMAGE_ID(AssistGoBack) IMAGE_ID(AssistGoForward) +IMAGE_ID(EditDesigner) +IMAGE_ID(EditHex) +IMAGE_ID(EditText) IMAGE_BEGIN_DATA IMAGE_DATA(120,156,237,152,141,153,131,32,12,134,29,161,35,220,116,157,163,163,117,179,92,181,141,66,126,72,20,17,84,194,147,167) @@ -929,53 +932,92 @@ IMAGE_DATA(142,188,56,130,142,75,190,243,35,184,22,132,252,15,57,38,231,224,0,0, IMAGE_END_DATA(1952, 17) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,87,109,76,83,103,20,190,36,76,101,153,162,163,224,144,130,24,113,78,247,225,182,196,209,125,40,162,209,104) -IMAGE_DATA(147,153,253,176,206,225,140,155,203,194,196,205,137,202,62,140,34,91,212,12,55,55,181,169,145,165,58,117,108,67,112,178) -IMAGE_DATA(197,5,140,232,82,178,13,227,39,70,64,141,69,11,149,10,53,14,55,41,20,196,221,103,247,92,238,189,246,227,222,182) -IMAGE_DATA(151,246,135,70,79,114,210,222,247,61,207,115,158,251,158,243,190,125,203,12,99,134,50,247,137,25,56,135,74,247,53,88) -IMAGE_DATA(173,12,128,224,94,89,41,203,97,48,24,66,195,147,83,172,160,187,95,26,40,46,144,134,210,210,241,72,75,91,202,229) -IMAGE_DATA(49,200,62,135,162,129,98,9,67,88,185,231,96,26,238,134,117,8,71,3,213,57,12,13,12,163,190,39,125,53,220,61) -IMAGE_DATA(246,224,48,81,119,152,60,102,45,128,22,38,206,183,201,184,73,114,77,229,18,217,6,142,49,60,143,36,46,150,60,110) -IMAGE_DATA(203,235,136,91,52,153,77,188,190,17,195,147,147,216,164,158,173,18,23,205,83,44,35,211,192,162,6,158,99,254,75,172) -IMAGE_DATA(166,104,62,226,15,228,64,51,99,2,43,98,147,184,121,138,83,210,64,113,241,149,239,35,49,49,209,223,223,120,57,36) -IMAGE_DATA(13,73,130,214,132,63,87,32,126,226,227,124,238,248,137,99,217,132,154,60,9,31,72,131,136,167,124,114,58,72,159,54) -IMAGE_DATA(168,6,147,196,163,209,63,199,198,151,103,67,179,107,33,226,178,94,100,147,132,154,132,162,129,215,219,107,196,240,145,90) -IMAGE_DATA(54,209,89,136,184,197,153,172,230,155,185,82,173,148,52,80,157,61,235,174,212,23,10,26,24,230,193,97,114,79,90,68) -IMAGE_DATA(14,147,234,234,106,52,53,53,249,121,115,115,179,151,239,222,189,91,182,129,245,122,61,31,47,230,136,138,138,98,147,147) -IMAGE_DATA(147,89,147,201,4,155,205,38,241,209,119,138,101,100,26,152,52,80,14,250,78,184,203,151,47,163,184,184,24,177,177,177) -IMAGE_DATA(44,141,139,28,20,167,164,129,248,69,14,138,21,57,82,83,83,37,142,96,26,196,247,246,92,179,232,232,104,214,108,54) -IMAGE_DATA(67,228,8,166,193,147,67,204,89,82,82,130,148,148,20,94,71,40,26,60,57,196,117,36,14,113,61,66,209,32,230,246) -IMAGE_DATA(120,23,118,196,136,17,172,209,104,228,231,148,52,80,157,125,107,47,215,31,10,26,24,70,93,63,222,247,135,73,127,54) -IMAGE_DATA(173,31,71,169,86,254,250,72,227,33,114,24,12,67,20,174,176,67,84,21,9,245,163,189,241,244,28,162,6,69,45,42) -IMAGE_DATA(53,248,105,233,135,6,63,45,253,212,32,105,81,81,11,69,45,76,100,54,76,56,26,200,114,57,47,21,62,251,99,118) -IMAGE_DATA(157,142,254,54,50,160,79,122,86,137,55,16,206,179,63,4,30,53,235,162,229,28,155,54,245,225,233,147,233,91,23,173) -IMAGE_DATA(74,45,58,206,107,4,108,141,240,44,111,67,3,29,38,49,99,244,76,106,150,121,112,230,102,103,194,156,93,174,132,57) -IMAGE_DATA(223,185,6,103,110,113,210,24,63,167,100,81,15,197,48,201,217,135,158,90,93,141,249,7,237,88,89,223,129,53,214,78) -IMAGE_DATA(172,105,116,35,239,92,7,63,70,115,20,195,199,122,97,163,7,49,19,191,114,100,237,183,97,99,115,55,86,215,255,131) -IMAGE_DATA(236,191,218,176,168,250,42,102,239,111,65,214,239,87,81,112,225,95,20,114,115,89,229,220,47,9,23,203,99,68,27,251) -IMAGE_DATA(193,193,197,21,118,108,115,184,177,240,72,27,102,29,104,65,70,185,29,79,20,55,35,185,200,138,185,123,46,226,233,226) -IMAGE_DATA(38,142,175,13,70,187,27,217,92,44,97,120,108,236,147,51,245,155,79,193,212,210,141,41,101,54,60,243,189,13,47,252) -IMAGE_DATA(208,132,87,74,250,176,228,100,83,182,55,32,125,175,29,243,170,90,177,245,74,15,244,155,79,130,176,3,158,205,217,177) -IMAGE_DATA(238,116,59,102,31,104,149,226,125,157,172,167,187,7,83,141,103,48,253,151,43,88,114,188,29,5,199,175,129,176,163,222) -IMAGE_DATA(46,115,126,214,216,141,204,159,108,56,99,191,137,64,214,225,234,70,70,225,9,204,218,103,199,134,230,219,24,245,86,153) -IMAGE_DATA(115,92,222,17,183,169,245,22,166,253,216,136,202,186,235,1,241,125,198,226,77,227,73,228,114,26,38,172,178,184,211,63) -IMAGE_DATA(63,234,222,209,14,196,22,212,162,164,202,30,2,30,152,180,226,48,222,61,236,192,228,194,19,238,241,121,135,157,203,172) -IMAGE_DATA(183,49,100,213,105,252,86,213,24,4,249,31,70,207,251,25,9,235,27,176,162,241,54,198,231,85,57,135,234,215,236,88) -IMAGE_DATA(88,219,133,244,162,11,152,156,103,145,117,178,27,237,157,24,253,90,9,198,22,93,194,146,243,183,48,167,250,6,8,59) -IMAGE_DATA(32,69,55,83,95,238,192,210,115,110,76,255,181,13,25,251,28,200,220,239,192,212,242,86,164,125,219,200,227,123,111,245) -IMAGE_DATA(96,240,36,51,116,123,91,176,236,98,55,62,60,235,130,158,139,33,44,181,64,220,130,237,7,115,206,112,253,122,169,7) -IMAGE_DATA(203,235,59,177,188,161,19,43,207,187,177,184,174,147,199,15,155,178,19,175,30,249,27,159,216,122,185,190,238,196,123,167) -IMAGE_DATA(110,66,195,97,164,254,139,30,48,40,109,93,141,35,247,108,7,10,26,187,240,81,131,11,203,235,200,111,242,239,187,168) -IMAGE_DATA(214,133,245,87,123,81,96,237,66,110,93,7,198,172,175,113,16,198,123,11,12,140,73,204,217,115,40,235,143,118,124,122) -IMAGE_DATA(177,11,27,184,62,253,130,235,179,194,107,192,215,215,89,124,124,222,5,154,163,24,138,85,218,134,131,198,101,232,83,222) -IMAGE_DATA(249,210,172,219,89,231,156,90,102,115,77,219,215,228,74,55,215,59,105,140,230,252,0,15,51,143,40,31,6,234,44,228) -IMAGE_DATA(91,194,61,28,167,230,134,164,230,22,165,230,166,213,255,95,239,128,39,63,103,3,71,50,25,218,181,12,60,157,198,130) -IMAGE_DATA(241,74,184,45,156,91,56,63,38,184,69,24,11,192,195,99,125,113,190,46,240,248,114,72,216,10,33,174,66,200,151,47) -IMAGE_DATA(195,81,225,207,193,107,182,220,153,215,109,31,137,163,54,75,223,187,43,233,88,219,183,248,82,110,31,44,153,34,254,216) -IMAGE_DATA(29,13,82,110,139,55,150,199,231,123,215,128,247,124,111,13,82,14,142,239,202,13,91,208,83,219,75,83,164,240,97,232) -IMAGE_DATA(15,119,253,194,173,95,36,250,39,220,254,141,196,254,145,229,9,101,255,6,59,12,30,93,192,212,250,146,209,88,48,17) -IMAGE_DATA(18,46,192,203,40,241,240,216,16,23,211,151,67,194,86,200,96,242,133,220,62,133,246,228,240,106,38,95,231,230,168,177) -IMAGE_DATA(168,193,36,14,143,102,146,114,43,105,94,203,240,141,237,199,33,104,240,202,173,176,121,68,147,56,44,140,255,97,224,145) -IMAGE_DATA(43,144,209,134,151,244,70,10,31,134,254,112,215,47,220,250,69,162,127,194,237,223,72,236,31,89,158,16,246,239,255,6) -IMAGE_DATA(177,225,215,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(1568, 8) +IMAGE_DATA(120,156,237,89,105,84,20,87,22,46,18,163,97,50,110,17,200,32,139,58,154,96,140,78,162,68,100,146,40,139,113,198) +IMAGE_DATA(144,25,143,103,2,46,128,113,73,60,70,153,24,17,81,99,92,72,142,104,112,38,8,182,40,68,52,46,68,217,132,56) +IMAGE_DATA(48,224,58,194,24,215,160,168,72,96,4,109,104,214,70,26,16,154,77,72,125,83,183,232,234,116,55,85,116,183,240,35) +IMAGE_DATA(57,201,61,231,158,234,122,239,126,223,253,222,123,247,190,110,133,25,202,12,97,126,33,230,195,57,204,116,67,67,81,17) +IMAGE_DATA(3,192,184,103,102,138,114,248,248,248,152,134,39,167,88,141,238,199,210,64,113,61,105,72,76,28,135,49,99,86,114,121) +IMAGE_DATA(124,68,223,77,209,64,177,132,33,172,216,187,49,13,63,133,125,232,141,6,58,231,94,104,96,24,243,107,210,80,195,79) +IMAGE_DATA(199,126,189,76,204,187,76,126,87,20,2,123,68,113,190,71,196,163,180,110,149,25,32,90,192,150,62,147,96,199,197,146) +IMAGE_DATA(15,139,156,139,97,75,166,177,182,181,59,240,156,131,29,107,215,190,75,203,69,243,20,203,136,20,176,160,129,231,240,123) +IMAGE_DATA(141,181,138,241,131,117,218,10,88,253,233,101,86,192,218,113,243,20,39,165,129,226,172,51,255,14,91,91,219,238,62,255) +IMAGE_DATA(117,147,52,216,105,180,218,124,27,4,235,201,47,240,185,173,39,59,177,54,151,130,181,248,158,52,8,120,202,39,166,131) +IMAGE_DATA(244,217,27,213,16,165,229,177,242,154,200,90,167,46,131,213,193,133,24,230,251,71,214,78,115,38,166,104,224,245,118,200) +IMAGE_DATA(240,220,8,123,214,86,25,134,97,203,61,88,171,157,115,180,103,37,165,129,206,89,247,220,165,234,66,66,3,195,252,122) +IMAGE_DATA(153,252,44,173,79,46,147,236,236,108,148,148,148,116,243,210,210,82,61,63,116,232,144,104,1,123,121,121,241,241,66,14) +IMAGE_DATA(11,11,11,214,193,193,129,141,138,138,130,92,46,215,242,209,103,138,101,68,10,152,52,80,14,250,76,184,251,247,239,35) +IMAGE_DATA(46,46,14,131,7,15,102,105,92,224,160,56,41,13,196,47,112,80,172,192,49,114,228,72,45,135,49,13,194,186,117,247) +IMAGE_DATA(172,95,191,126,108,108,108,44,4,14,99,26,116,57,132,156,241,241,241,112,116,116,228,117,152,162,65,151,67,216,71,226) +IMAGE_DATA(16,246,195,20,13,66,110,157,181,176,195,135,15,103,101,50,25,63,39,165,129,206,217,240,236,197,234,67,66,3,195,152) +IMAGE_DATA(87,143,191,248,203,228,113,154,182,27,71,162,189,248,207,71,26,55,145,195,199,103,144,196,79,216,65,102,29,18,238,140) +IMAGE_DATA(214,199,211,187,137,26,36,181,152,169,161,155,150,199,208,208,77,203,99,106,208,106,49,227,44,36,181,48,125,211,48,189) +IMAGE_DATA(209,64,22,200,121,162,230,249,56,166,112,117,165,127,54,50,160,39,189,155,137,247,33,156,110,125,104,120,204,217,23,123) +IMAGE_DATA(206,241,197,23,93,120,122,50,93,251,98,111,166,22,87,206,47,105,176,151,52,239,226,54,164,167,203,196,242,121,47,102) +IMAGE_DATA(164,111,236,64,143,8,165,141,247,65,181,141,247,87,234,129,30,145,74,26,227,231,164,204,226,41,75,198,97,217,233,241) +IMAGE_DATA(27,179,225,119,82,129,53,119,154,176,169,168,25,155,138,91,17,252,125,19,63,70,115,20,195,199,234,97,251,61,205,76) +IMAGE_DATA(254,103,133,111,138,28,59,74,219,176,241,78,3,150,93,172,198,146,236,74,204,74,41,135,239,127,42,17,82,248,16,97) +IMAGE_DATA(220,156,111,42,247,77,194,197,242,24,193,156,62,60,185,60,67,129,61,21,173,88,120,174,26,111,165,149,195,45,85,129) +IMAGE_DATA(177,113,165,112,136,41,194,156,195,119,49,33,174,132,227,171,134,76,209,138,101,92,44,97,120,236,224,151,102,122,69,92) +IMAGE_DATA(71,84,121,27,220,147,228,248,195,17,57,92,190,46,193,27,241,93,88,114,50,247,232,124,76,73,80,96,222,153,42,236) +IMAGE_DATA(42,107,135,87,68,14,8,219,255,149,21,251,183,222,168,195,172,180,42,109,188,161,147,181,183,181,195,83,118,19,51,190) +IMAGE_DATA(41,67,192,181,58,132,92,171,1,97,71,45,78,82,126,90,220,6,143,99,114,220,84,52,162,39,107,82,183,193,45,236) +IMAGE_DATA(59,188,149,172,192,182,210,78,140,90,148,164,124,49,248,92,107,84,213,35,76,63,90,140,204,188,218,30,241,93,198,194) +IMAGE_DATA(95,150,131,64,78,195,203,27,178,90,167,124,118,185,117,127,29,48,56,36,23,241,103,20,38,224,129,169,65,103,177,244) +IMAGE_DATA(108,5,166,133,125,215,58,46,248,172,114,85,81,39,6,109,184,129,244,51,197,70,144,63,96,244,188,227,176,9,205,71) +IMAGE_DATA(80,113,39,198,5,159,81,14,241,218,180,127,97,110,11,166,196,20,98,90,112,150,168,147,213,215,53,99,244,236,120,56) +IMAGE_DATA(197,220,67,64,193,35,120,103,215,131,176,253,29,93,103,122,165,86,96,229,247,173,152,113,162,26,110,201,21,240,72,169) +IMAGE_DATA(128,103,106,21,198,124,89,204,227,59,30,181,99,224,212,88,184,38,148,99,213,221,54,124,116,91,13,47,46,134,176,84) +IMAGE_DATA(2,195,22,68,159,92,113,147,171,215,123,237,88,125,167,25,171,243,155,177,166,160,21,203,243,154,121,252,80,247,3,248) +IMAGE_DATA(235,57,21,214,203,59,184,186,110,198,7,215,27,97,197,97,180,245,215,175,255,211,99,182,94,170,8,188,221,132,144,226) +IMAGE_DATA(22,172,205,87,99,117,30,121,35,191,222,37,185,106,132,86,118,32,164,168,5,129,121,77,120,62,244,82,5,97,244,91) +IMAGE_DATA(96,128,165,237,138,195,167,125,47,212,225,227,187,45,216,198,213,233,231,92,157,133,213,0,225,181,44,214,21,168,65,115) +IMAGE_DATA(20,67,177,82,109,248,244,139,110,94,142,239,253,35,214,245,64,158,210,51,73,174,158,158,92,162,158,18,123,71,73,99) +IMAGE_DATA(52,215,13,240,27,230,183,210,151,129,121,102,242,175,132,159,113,156,57,191,144,204,249,21,101,206,47,173,199,255,246,238) +IMAGE_DATA(241,230,231,108,192,8,198,205,126,11,3,93,167,49,99,188,90,92,36,231,89,156,95,213,120,150,102,172,7,30,30,107) +IMAGE_DATA(136,51,116,13,143,33,135,22,155,161,137,203,208,228,219,44,194,145,209,157,131,215,156,245,227,188,107,244,8,92,150,103) +IMAGE_DATA(117,173,93,74,199,150,174,205,215,230,54,192,146,73,226,175,254,168,65,155,59,75,31,203,227,55,235,159,1,239,155,245) +IMAGE_DATA(53,104,115,112,124,101,245,114,163,183,182,158,166,190,194,247,66,127,111,247,175,183,231,215,23,245,211,219,250,237,139,254) +IMAGE_DATA(17,229,49,165,127,141,93,6,207,46,96,114,13,201,104,204,152,8,45,174,135,197,72,241,240,88,19,55,211,144,67,139) +IMAGE_DATA(205,16,193,108,214,228,54,56,104,93,14,189,98,50,116,110,142,10,139,10,76,203,161,83,76,218,220,82,154,183,48,124) +IMAGE_DATA(97,119,227,208,104,208,203,45,209,60,130,105,57,178,152,238,151,129,78,174,158,140,26,94,171,183,175,240,189,208,223,219) +IMAGE_DATA(253,235,237,249,245,69,253,244,182,126,251,162,127,68,121,76,232,223,44,99,151,1,217,148,23,108,61,215,191,51,57,34) +IMAGE_DATA(121,221,219,183,227,215,204,204,221,224,237,28,227,242,188,205,12,99,56,219,161,207,56,70,46,245,76,41,142,91,135,242) +IMAGE_DATA(83,187,80,123,45,1,181,151,143,66,145,17,142,219,251,150,227,88,160,91,209,107,78,214,179,196,176,75,222,28,31,124) +IMAGE_DATA(61,220,191,165,44,115,39,154,10,78,163,35,255,93,32,255,37,116,220,242,68,227,237,116,60,188,249,47,40,78,201,144) +IMAGE_DATA(179,231,61,188,63,125,212,14,1,247,212,147,79,244,15,93,48,245,171,210,212,109,104,79,243,3,226,198,163,35,209,3) +IMAGE_DATA(108,222,68,64,241,33,199,49,30,213,39,66,80,149,178,9,245,215,18,161,186,116,20,105,107,167,116,142,178,177,124,133) +IMAGE_DATA(240,129,179,156,183,151,126,179,157,207,201,30,115,6,178,62,228,57,26,206,47,67,199,141,215,241,240,188,31,14,165,191) +IMAGE_DATA(131,13,39,223,64,100,250,76,212,93,137,199,247,71,215,35,96,134,67,236,56,135,97,206,185,17,126,157,205,95,203,208) +IMAGE_DATA(226,231,11,245,246,191,161,227,216,27,104,76,94,128,170,111,182,112,57,55,162,50,233,99,124,154,233,142,232,43,139,241) +IMAGE_DATA(9,199,81,117,124,51,202,50,34,16,238,63,58,63,100,158,107,108,197,105,14,27,252,17,154,67,63,67,131,135,7,30) +IMAGE_DATA(156,141,68,195,245,84,52,228,28,71,195,181,36,40,211,182,225,191,137,11,17,158,62,3,153,9,115,81,126,56,16,213) +IMAGE_DATA(103,162,177,239,189,209,170,180,79,254,114,95,117,53,1,170,248,80,168,2,230,67,185,51,128,195,166,224,246,129,149,56) +IMAGE_DATA(189,201,13,55,190,252,0,117,220,122,87,236,219,3,167,232,20,204,138,62,0,69,236,50,212,156,141,193,254,247,71,182) +IMAGE_DATA(92,216,54,187,133,207,149,123,2,181,89,49,168,74,221,194,237,81,18,78,109,156,198,55,75,250,58,23,168,190,61,130) +IMAGE_DATA(73,209,9,240,203,184,200,113,28,135,124,183,63,167,49,6,7,151,58,32,104,214,4,89,110,244,82,252,47,97,35,20) +IMAGE_DATA(255,14,135,234,98,28,234,46,199,227,58,55,150,182,118,50,174,238,94,4,85,246,65,196,237,253,24,111,237,253,10,187) +IMAGE_DATA(162,54,65,153,30,142,194,163,27,16,250,142,117,33,229,152,56,234,89,207,37,30,191,223,26,58,127,66,102,234,26,215) +IMAGE_DATA(166,130,175,215,65,117,225,48,143,83,101,29,64,121,92,48,228,50,63,220,143,156,143,202,248,141,168,206,148,225,100,200) +IMAGE_DATA(155,112,25,53,192,215,176,134,70,88,89,78,72,89,61,177,179,150,195,41,246,175,224,181,202,119,205,71,73,212,34,212) +IMAGE_DATA(156,218,131,210,148,237,56,187,213,11,115,38,63,19,33,85,195,107,222,118,76,186,197,237,223,131,115,95,162,236,208,106) +IMAGE_DATA(212,156,222,203,97,163,112,109,247,98,68,191,107,221,249,231,241,150,235,123,234,129,17,86,3,94,137,91,62,166,147,114) +IMAGE_DATA(21,39,108,193,85,217,34,36,7,77,68,128,231,160,19,195,135,60,57,193,88,15,145,205,156,48,104,117,244,34,187,166) +IMAGE_DATA(144,217,214,185,115,93,6,70,56,62,251,164,179,41,56,115,173,167,203,192,194,4,55,52,7,206,73,168,139,137,62,146) +IMAGE_DATA(243,39,116,240,206,42,149,170,233,209,163,71,63,116,118,118,194,152,207,153,51,39,210,128,195,69,192,182,183,183,163,181) +IMAGE_DATA(181,21,205,205,205,188,55,53,53,161,190,190,30,74,165,18,101,101,101,60,94,173,86,195,219,219,91,151,195,69,224,38) +IMAGE_DATA(124,75,75,11,239,196,67,177,13,13,13,168,173,173,69,117,117,53,31,67,115,85,85,85,186,28,60,158,123,130,211,129) +IMAGE_DATA(156,156,28,254,51,61,219,218,218,248,207,15,31,62,212,27,167,120,205,156,139,46,190,163,163,131,127,10,56,210,67,79) +IMAGE_DATA(90,11,61,73,7,61,31,60,120,0,13,70,20,47,60,133,113,129,143,246,67,208,99,14,94,120,167,61,161,39,237,139) +IMAGE_DATA(24,222,48,222,112,92,88,15,241,72,225,13,247,73,108,156,214,99,136,55,197,73,23,157,145,33,222,212,218,19,240,180) +IMAGE_DATA(14,206,127,208,224,95,229,106,172,153,155,99,77,213,65,88,174,38,27,52,125,67,253,243,170,25,253,35,56,97,117,255) +IMAGE_DATA(23,217,148,222,237,214,195,98,151,129,61,99,90,67,11,13,100,104,206,180,56,90,164,212,6,208,1,24,52,161,174,185) +IMAGE_DATA(16,150,138,76,104,100,114,42,90,161,153,137,195,160,9,5,14,11,161,32,168,200,132,11,129,156,138,159,154,185,166,166) +IMAGE_DATA(70,219,200,148,99,238,220,185,2,135,30,94,115,200,90,14,138,111,108,108,212,54,159,174,107,246,195,66,23,79,90,143) +IMAGE_DATA(28,57,194,10,133,67,107,22,214,65,127,235,220,187,119,47,91,89,89,41,137,191,123,247,46,220,221,221,245,138,79,224) +IMAGE_DATA(184,117,235,22,166,78,157,10,238,226,148,196,7,5,5,193,218,218,26,251,246,237,99,61,60,60,216,139,23,47,178,201) +IMAGE_DATA(201,201,172,191,191,63,27,24,24,8,43,43,43,250,155,47,107,74,254,123,247,238,177,174,174,174,236,164,73,147,88,110) +IMAGE_DATA(255,216,130,130,2,184,185,185,241,123,98,170,254,217,179,103,179,171,86,173,98,105,29,132,167,57,131,70,148,196,159,63) +IMAGE_DATA(127,158,37,60,247,206,230,229,229,161,176,176,144,207,223,19,158,246,105,236,216,177,108,88,88,24,235,236,236,204,22,23) +IMAGE_DATA(23,179,87,174,92,225,247,130,106,193,201,201,137,13,15,15,151,92,191,88,243,139,185,24,222,156,203,128,46,31,13,94) +IMAGE_DATA(48,254,66,49,229,82,162,24,250,242,212,244,171,96,230,94,40,194,37,196,252,31,131,163,46,246,0,0,0,0,0,0) +IMAGE_END_DATA(2816, 11) diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp index ba9333204..598dd1e10 100644 --- a/uppsrc/ide/idebar.cpp +++ b/uppsrc/ide/idebar.cpp @@ -163,7 +163,7 @@ void Ide::SearchMenu(Bar& menu) menu.Add(AK_FINDSTRING, THISBACK1(FindString, false)) .Help("Find any ordinary string constant (\"\" - delimited)"); menu.Add(AK_FINDSTRINGBACK, THISBACK1(FindString, true)) - .Help("Find any ordinary string constant (\"\" - delimited) backwards"); + .Help("Find any ordinary string constant (\"\" - delimited) backwards"); menu.MenuSeparator(); } menu.Add(AK_FINDINFILES, THISBACK1(FindInFiles, false)) @@ -205,41 +205,38 @@ void Ide::Edit(Bar& menu) .Help("Edit using the designer (not as text)"); menu.MenuSeparator(); } - Bar::Item& (Bar::*add)(const char *s, const Image& m, Callback cb) = &Bar::Add; - if(toolbar_in_row) add = &MenuBar::AddMenu; - (menu.*add)("Undo", CtrlImg::undo(), callback(&editor, &LineEdit::Undo)) + menu.Add("Undo", CtrlImg::undo(), callback(&editor, &LineEdit::Undo)) .Key(K_CTRL_Z) .Enable(editor.IsUndo()) .Help("Undo changes to text"); - (menu.*add)("Redo", CtrlImg::redo(), callback(&editor, &LineEdit::Redo)) + menu.Add("Redo", CtrlImg::redo(), callback(&editor, &LineEdit::Redo)) .Key(K_SHIFT|K_CTRL_Z) .Enable(editor.IsRedo()) .Help("Redo undone changes"); - if(!toolbar_in_row || menu.IsMenuBar()) - menu.Separator(); - (menu.*add)("Cut", CtrlImg::cut(), callback(&editor, &LineEdit::Cut)) + + menu.Separator(); + + menu.Add("Cut", CtrlImg::cut(), callback(&editor, &LineEdit::Cut)) .Key(K_CTRL_X) .Enable(selection) .Help("Cut selection and place it on the system clipboard"); - (menu.*add)("Copy", CtrlImg::copy(), callback(&editor, &LineEdit::Copy)) + menu.Add("Copy", CtrlImg::copy(), callback(&editor, &LineEdit::Copy)) .Key(K_CTRL_C) .Enable(selection) .Help("Copy current selection on the system clipboard"); - (menu.*add)("Paste", CtrlImg::paste(), THISBACK(EditPaste)) + menu.Add("Paste", CtrlImg::paste(), THISBACK(EditPaste)) .Key(K_CTRL_V) .Help("Insert text from clipboard at cursor location"); - if(!toolbar_in_row || menu.IsMenuBar()) - menu.Separator(); + menu.Separator(); - (menu.*add)("Select all", CtrlImg::select_all(), callback(&editor, &LineEdit::SelectAll)) + menu.Add("Select all", CtrlImg::select_all(), callback(&editor, &LineEdit::SelectAll)) .Key(K_CTRL_A); } menu.MenuSeparator(); - if(menu.IsMenuBar()) - menu.Add("Find and Replace", THISBACK(SearchMenu)); + menu.Add("Find and Replace", THISBACK(SearchMenu)); if(!designer && menu.IsMenuBar()) InsertAdvanced(menu); @@ -663,17 +660,28 @@ void Ide::MainTool(Bar& bar) { if(!IsEditorMode()) { BrowseMenu(bar); - if(!toolbar_in_row) - bar.Separator(); + bar.Separator(); } + bar.Add("Edit as text", IdeImg::EditText(), THISBACK(EditAsText)) + .Check(!designer) + .Key(!designer ? 0 : K_CTRL_T); + bool b = designer && !designer.Is(); + bool d = IsDesignerFile(editfile); + bar.Add("Edit using designer", IdeImg::EditDesigner(), THISBACK(EditUsingDesigner)) + .Check(b) + .Enable(d) + .Key(b || !d ? 0 : K_CTRL_T); + bar.Add("View as hex", IdeImg::EditHex(), THISBACK(EditAsHex)) + .Check(designer.Is()) + .Key(K_CTRL_B); + if(!designer) + bar.Separator(); Edit(bar); if(debugger) { if(!designer) bar.Separator(); DebugMenu(bar); } - if(!designer) - bar.Separator(); Project(bar); BuildMenu(bar); diff --git a/uppsrc/ide/idefile.cpp b/uppsrc/ide/idefile.cpp index c33ae13be..1c3f1057c 100644 --- a/uppsrc/ide/idefile.cpp +++ b/uppsrc/ide/idefile.cpp @@ -485,7 +485,7 @@ void Ide::EditFile0(const String& path, byte charset, bool astext, const String& svn_dirs = SvnDirs(true).GetCount(); // Perhaps not the best place, but should be ok bool candesigner = !astext && !(debugger && (PathIsEqual(path, posfile[0]) || PathIsEqual(path, posfile[0]))) - && editastext.Find(path) < 0 && !IsNestReadOnly(editfile); + && editastext.Find(path) < 0 && editashex.Find(path) < 0 && !IsNestReadOnly(editfile); if(candesigner) { for(int i = 0; i < GetIdeModuleCount() && !designer; i++) @@ -493,7 +493,7 @@ void Ide::EditFile0(const String& path, byte charset, bool astext, const String& } if(!designer && editastext.Find(path) < 0 && - (charset == CHARSET_DEFAULT && FileIsBinary(path) || editashex.Find(path) >= 0)) + (findarg(GetFileExt(path), ".log") < 0 && FileIsBinary(path) || editashex.Find(path) >= 0)) designer.Create().Open(path); if(designer) { @@ -635,8 +635,7 @@ bool Ide::IsDesignerFile(const String& path) void Ide::DoEditAsText(const String& path) { - if(IsDesignerFile(path)) - editastext.FindAdd(path); + editastext.FindAdd(path); editashex.RemoveKey(editfile); }