From 1fe1c692decf197ee6c7a89bdae8b3fb0694a2fd Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 23 Dec 2013 18:08:21 +0000 Subject: [PATCH] ide: . .qtf files support #590 git-svn-id: svn://ultimatepp.org/upp/trunk@6693 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/RichEdit/RichEdit.h | 2 + uppsrc/RichText/ParseQtf.cpp | 13 +++ uppsrc/RichText/RichText.h | 2 + uppsrc/ide/Common/ComDlg.cpp | 2 +- uppsrc/ide/Common/common.iml | 75 ++++++------ uppsrc/ide/Designers/Designers.h | 6 + uppsrc/ide/Designers/Designers.upp | 8 ++ uppsrc/ide/{Img => Designers}/Img.h | 0 uppsrc/ide/{Img => Designers}/Img.icpp | 0 uppsrc/ide/{Img => Designers}/Png.cpp | 0 uppsrc/ide/Designers/Qtf.icpp | 151 +++++++++++++++++++++++++ uppsrc/ide/Designers/init | 9 ++ uppsrc/ide/IconDes/IconDes.cpp | 1 + uppsrc/ide/Img/Img.upp | 7 -- uppsrc/ide/Img/init | 6 - uppsrc/ide/icon.ico | Bin 2862 -> 2862 bytes uppsrc/ide/ide.iml | 127 ++++++++++----------- uppsrc/ide/ide.upp | 2 +- uppsrc/ide/idebar.cpp | 2 +- uppsrc/ide/init | 2 +- 20 files changed, 296 insertions(+), 119 deletions(-) create mode 100644 uppsrc/ide/Designers/Designers.h create mode 100644 uppsrc/ide/Designers/Designers.upp rename uppsrc/ide/{Img => Designers}/Img.h (100%) rename uppsrc/ide/{Img => Designers}/Img.icpp (100%) rename uppsrc/ide/{Img => Designers}/Png.cpp (100%) create mode 100644 uppsrc/ide/Designers/Qtf.icpp create mode 100644 uppsrc/ide/Designers/init delete mode 100644 uppsrc/ide/Img/Img.upp delete mode 100644 uppsrc/ide/Img/init diff --git a/uppsrc/RichEdit/RichEdit.h b/uppsrc/RichEdit/RichEdit.h index e683a3d48..0b31d7781 100644 --- a/uppsrc/RichEdit/RichEdit.h +++ b/uppsrc/RichEdit/RichEdit.h @@ -799,6 +799,8 @@ public: int undoserial; BiArray undo; Array redo; + + void Clear() { undo.Clear(); redo.Clear(); undoserial = 0; } }; struct PosInfo { diff --git a/uppsrc/RichText/ParseQtf.cpp b/uppsrc/RichText/ParseQtf.cpp index 29f2726a3..bd763a5df 100644 --- a/uppsrc/RichText/ParseQtf.cpp +++ b/uppsrc/RichText/ParseQtf.cpp @@ -1002,6 +1002,19 @@ void RichQtfParser::Parse(const char *qtf, int _accesskey) FlushStyles(); } +bool ParseQTF(RichText& txt, const char *qtf, int accesskey, void *context) +{ + RichQtfParser p(context); + try { + p.Parse(qtf, accesskey); + } + catch(RichQtfParser::Exc) { + return false; + } + txt = p.target; + return true; +} + RichText ParseQTF(const char *qtf, int accesskey, void *context) { RichQtfParser p(context); diff --git a/uppsrc/RichText/RichText.h b/uppsrc/RichText/RichText.h index a906a4ab7..7cb9b719d 100644 --- a/uppsrc/RichText/RichText.h +++ b/uppsrc/RichText/RichText.h @@ -423,6 +423,8 @@ public: RichText AsRichText(const RichObject& obj); String AsQTF(const RichObject& obj); +bool ParseQTF(RichText& txt, const char *qtf, int accesskey = 0, void *context = NULL); + RichText ParseQTF(const char *qtf, int accesskey = 0, void *context = NULL); RichText AsRichText(const wchar *s, const RichPara::Format& f = RichPara::Format()); diff --git a/uppsrc/ide/Common/ComDlg.cpp b/uppsrc/ide/Common/ComDlg.cpp index fe367f682..0249b47d0 100644 --- a/uppsrc/ide/Common/ComDlg.cpp +++ b/uppsrc/ide/Common/ComDlg.cpp @@ -111,7 +111,7 @@ void SourceFs(FileSel& fs) { fs.Type("Language files (*.lng)", "*.lng"); fs.Type("Web development files (*.html *.js *.css *.witz)", "*.html *.js *.css *.witz"); fs.Type("Other special files (*.sch *.usc *.rc *.brc *.upt)", "*.sch *.usc *.rc *.brc *.upt"); - String mask = "*.cpp *.h *.hpp *.c *.C *.cc *.cxx *.icpp *.lay *.iml *.lng *.sch *.usc *.rc *.brc *.upt *.html *.js *.css *.witz *.json *.xml"; + String mask = "*.cpp *.h *.hpp *.c *.C *.cc *.cxx *.icpp *.lay *.iml *.lng *.sch *.usc *.rc *.brc *.upt *.html *.js *.css *.witz *.json *.xml *.qtf"; fs.Type("All source files (" + mask + ")", mask); IdeFs(fs); } diff --git a/uppsrc/ide/Common/common.iml b/uppsrc/ide/Common/common.iml index 75049853a..fd9c98a8b 100644 --- a/uppsrc/ide/Common/common.iml +++ b/uppsrc/ide/Common/common.iml @@ -25,6 +25,7 @@ IMAGE_ID(Script) IMAGE_ID(Images) IMAGE_ID(Language) IMAGE_ID(IncludePath) +IMAGE_ID(Qtf) IMAGE_BEGIN_DATA IMAGE_DATA(120,156,237,154,93,104,29,69,20,199,247,213,183,162,68,9,10,62,68,65,182,162,72,236,83,36,141,130,248,144,88,17) @@ -81,38 +82,42 @@ IMAGE_DATA(230,103,21,204,12,254,7,139,53,205,29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 IMAGE_END_DATA(1632, 16) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,154,189,107,20,65,20,192,167,180,176,72,37,70,176,75,17,82,89,219,108,123,16,56,34,102,200,63,96,147) -IMAGE_DATA(94,72,186,92,151,46,112,96,41,136,133,136,75,16,45,210,134,64,26,109,227,88,36,77,44,68,136,32,98,210,69,146) -IMAGE_DATA(231,190,157,123,115,51,179,243,185,119,199,157,33,47,60,230,99,231,247,222,204,155,217,153,225,54,108,142,205,177,27,42) -IMAGE_DATA(188,82,136,40,247,113,156,115,16,66,128,79,240,25,182,177,236,212,172,143,219,170,158,161,122,236,212,236,254,254,190,215) -IMAGE_DATA(167,139,39,27,52,166,144,248,120,148,73,241,58,147,194,219,177,123,177,180,100,240,88,182,69,27,127,35,254,162,44,107) -IMAGE_DATA(166,55,96,177,28,96,141,117,19,155,255,148,117,212,98,253,77,79,110,240,102,80,176,248,100,20,62,174,40,10,56,61) -IMAGE_DATA(61,245,46,6,124,134,109,44,59,69,140,11,216,169,253,18,203,88,207,72,139,226,21,28,28,124,171,83,189,158,108,208) -IMAGE_DATA(152,72,92,237,73,109,94,150,77,158,88,76,93,253,137,241,190,254,198,120,223,248,93,41,170,244,115,160,230,33,55,254) -IMAGE_DATA(200,106,241,31,117,254,199,177,254,166,39,25,155,1,237,116,109,118,51,206,87,25,148,239,170,19,119,53,219,134,98,225) -IMAGE_DATA(58,219,198,144,189,146,60,166,137,54,12,191,196,146,70,108,152,126,175,6,47,138,198,5,226,225,236,115,205,87,249,110) -IMAGE_DATA(215,124,230,176,97,246,249,186,233,223,101,131,201,185,245,142,155,120,84,241,69,250,12,196,65,217,32,95,212,94,231,83) -IMAGE_DATA(98,248,241,131,217,95,236,7,213,103,207,97,218,220,5,109,140,186,134,91,176,202,6,155,244,109,98,66,55,131,216,142) -IMAGE_DATA(24,27,84,112,55,79,176,17,229,203,234,186,24,176,145,234,95,127,137,146,121,135,45,39,207,121,89,245,83,212,41,149) -IMAGE_DATA(25,219,82,229,24,143,109,229,9,186,85,151,133,56,171,203,152,182,241,47,219,59,79,244,137,140,31,125,237,238,158,121) -IMAGE_DATA(111,19,41,252,218,218,175,214,188,30,119,51,158,189,36,126,148,241,103,234,120,228,118,51,152,221,205,160,20,37,240,146) -IMAGE_DATA(7,243,33,30,219,136,51,17,204,135,120,214,27,142,99,84,30,219,83,159,245,124,106,255,219,240,122,156,48,197,178,157) -IMAGE_DATA(159,212,252,101,234,108,200,148,54,131,216,85,39,22,252,214,155,9,139,111,4,169,254,67,19,57,202,66,82,188,235,36) -IMAGE_DATA(211,235,99,60,158,104,250,45,0,5,203,195,147,46,204,155,109,123,13,155,41,227,15,253,86,144,194,235,183,147,230,45) -IMAGE_DATA(37,206,35,211,237,190,53,210,28,62,36,33,62,67,103,71,112,51,192,159,105,103,88,82,126,149,245,179,188,122,46,42) -IMAGE_DATA(245,253,133,121,147,205,247,111,250,226,73,27,161,159,47,179,109,52,199,158,103,67,198,175,180,108,136,172,133,236,182,145) -IMAGE_DATA(247,34,72,27,57,243,230,210,244,254,251,215,139,72,138,223,168,135,225,116,68,223,12,224,222,93,64,213,159,255,236,0) -IMAGE_DATA(160,98,158,63,185,195,225,98,30,224,226,129,29,200,250,133,141,241,146,157,7,180,99,179,172,25,172,58,255,242,81,9) -IMAGE_DATA(221,251,242,211,27,250,109,176,43,143,129,189,126,222,224,240,211,15,125,254,209,110,2,250,68,12,217,63,239,27,19,70) -IMAGE_DATA(159,149,152,58,165,173,27,5,178,159,251,146,213,120,106,187,52,248,4,166,215,169,211,132,88,84,204,159,55,253,123,252) -IMAGE_DATA(74,37,191,139,15,101,89,227,143,143,143,97,111,111,15,22,22,22,84,93,167,211,169,235,240,89,10,127,114,114,226,84) -IMAGE_DATA(197,7,250,143,109,190,255,232,195,239,243,14,92,86,47,15,42,230,177,78,241,129,248,161,31,108,255,180,122,225,254,130) -IMAGE_DATA(84,204,99,29,62,51,226,64,190,45,254,114,192,145,127,202,43,30,25,210,128,127,170,243,250,119,40,198,153,198,79,253) -IMAGE_DATA(167,241,227,51,107,13,218,194,105,190,250,253,190,138,59,230,177,46,194,54,236,88,26,231,172,155,65,116,176,44,178,163) -IMAGE_DATA(30,30,113,88,222,4,149,2,46,106,77,99,60,50,203,27,32,211,205,172,171,217,88,252,91,237,114,99,97,244,19,253) -IMAGE_DATA(111,191,41,141,62,97,153,198,230,228,53,255,216,246,211,215,174,100,54,192,44,123,120,93,209,223,250,142,80,254,236,254) -IMAGE_DATA(196,98,97,245,51,59,22,52,94,178,117,120,148,117,229,86,125,29,198,210,111,35,22,11,26,203,250,78,246,149,223,136) -IMAGE_DATA(197,250,51,209,88,83,169,235,122,123,165,26,207,34,111,205,251,216,20,62,73,103,244,255,12,70,251,140,201,241,52,197) -IMAGE_DATA(127,28,202,182,161,216,42,194,109,108,40,150,20,203,44,60,81,227,244,111,216,104,193,42,27,172,125,252,111,229,63,149) -IMAGE_DATA(127,147,139,21,86,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(1088, 10) +IMAGE_DATA(120,156,237,154,191,107,84,75,20,199,167,180,176,176,18,125,96,149,20,146,202,218,102,219,5,97,81,116,240,31,176,73) +IMAGE_DATA(147,74,208,46,219,217,9,11,54,1,65,44,68,188,136,248,138,180,33,32,1,109,245,90,36,77,94,241,16,34,60,30) +IMAGE_DATA(79,59,197,140,247,123,39,103,246,204,220,249,121,119,151,236,19,39,28,230,231,231,156,51,103,230,206,29,246,70,156,19) +IMAGE_DATA(231,196,47,154,100,35,42,33,50,196,73,41,85,93,215,42,148,208,135,49,142,158,150,13,113,155,77,31,36,160,167,101) +IMAGE_DATA(119,118,118,130,54,125,60,233,160,57,197,82,136,71,90,20,207,153,28,222,141,221,163,181,53,139,71,221,77,108,254,157) +IMAGE_DATA(248,215,85,213,50,227,19,22,245,8,107,237,155,212,250,231,236,163,30,251,239,244,210,47,124,24,12,68,122,49,6,33) +IMAGE_DATA(110,48,24,168,195,195,195,224,102,64,31,198,56,122,6,41,46,162,167,181,75,172,16,99,43,31,12,158,168,221,221,191) +IMAGE_DATA(218,156,183,147,14,154,19,37,223,120,18,151,215,117,155,39,22,185,207,159,20,31,242,55,197,135,230,239,203,33,218,206) +IMAGE_DATA(174,89,135,210,248,131,101,241,159,117,253,231,177,255,78,47,21,28,6,116,210,245,57,205,164,188,37,84,245,162,121,227) +IMAGE_DATA(222,42,214,97,88,117,92,172,99,202,254,208,60,242,76,29,150,93,98,73,18,58,108,187,63,78,30,20,198,69,226,225) +IMAGE_DATA(245,185,229,155,242,104,100,247,121,116,216,62,31,119,237,251,116,8,189,182,193,121,19,15,169,63,104,155,145,56,24,29) +IMAGE_DATA(100,139,198,115,62,39,134,127,190,182,253,133,31,212,94,188,134,121,107,23,213,49,235,30,238,193,26,29,98,209,183,137) +IMAGE_DATA(5,221,12,82,39,98,106,82,209,211,60,67,71,146,175,154,235,98,68,71,174,125,254,16,101,243,30,93,94,94,202,170) +IMAGE_DATA(241,179,110,115,170,11,177,105,234,41,30,99,245,27,116,179,173,215,245,81,91,71,222,199,190,30,239,125,163,47,100,254) +IMAGE_DATA(176,245,242,229,81,240,54,145,195,223,190,253,79,111,158,199,221,142,231,56,139,159,101,254,133,50,159,244,251,48,88,222) +IMAGE_DATA(195,160,170,43,37,43,25,45,199,120,140,169,143,234,104,57,198,139,241,116,30,179,242,24,79,62,243,114,174,255,125,120) +IMAGE_DATA(30,39,228,168,187,229,69,173,95,161,44,71,58,165,195,32,117,213,73,5,191,247,97,34,210,7,65,174,253,216,66,206) +IMAGE_DATA(178,145,12,239,123,147,241,246,20,143,55,26,191,5,32,161,62,125,211,197,121,123,236,184,163,51,103,254,177,223,10,114) +IMAGE_DATA(120,126,59,233,222,82,210,60,152,209,232,185,149,151,240,177,20,227,11,100,121,18,14,3,252,76,187,196,41,231,87,217) +IMAGE_DATA(48,43,155,254,186,145,208,95,156,183,217,114,251,182,45,153,117,16,134,249,170,88,71,119,238,101,58,116,252,42,71,71) +IMAGE_DATA(93,180,145,253,58,202,30,4,173,163,100,221,124,146,239,127,120,191,212,89,241,155,245,101,120,58,137,31,6,234,252,89) +IMAGE_DATA(5,225,253,159,135,74,65,80,150,55,206,72,245,245,162,82,95,255,112,3,217,62,176,41,94,179,23,21,244,184,172,232) +IMAGE_DATA(6,171,45,63,190,82,169,209,5,253,233,13,118,59,236,245,171,74,60,189,219,225,240,233,135,62,255,176,155,0,95,136) +IMAGE_DATA(41,251,223,171,206,130,209,103,37,97,222,210,206,141,2,236,187,137,102,25,79,99,215,78,62,129,241,54,243,54,33,22) +IMAGE_DATA(130,242,151,174,253,128,93,45,100,247,242,37,93,103,252,254,254,190,218,222,222,86,171,171,171,166,109,56,28,182,109,232) +IMAGE_DATA(203,225,15,14,14,188,98,248,136,255,24,243,247,167,137,250,247,203,80,125,107,30,30,8,202,104,51,124,36,126,176,131) +IMAGE_DATA(241,55,155,7,238,187,210,130,50,218,208,103,197,129,108,59,252,183,19,142,236,83,217,240,96,72,34,246,169,45,104,223) +IMAGE_DATA(35,136,51,205,159,252,167,249,163,207,217,131,110,146,180,94,147,201,196,196,29,101,180,37,216,142,30,71,210,156,115,51) +IMAGE_DATA(72,78,86,36,78,212,55,239,165,186,118,95,153,92,97,83,51,73,241,96,174,221,83,58,191,95,116,53,155,139,125,103) +IMAGE_DATA(92,105,44,44,63,97,255,193,179,202,242,9,117,154,155,151,103,246,49,246,237,199,145,102,238,41,187,30,224,185,192,222) +IMAGE_DATA(250,195,218,216,115,253,73,197,194,241,179,56,22,52,95,210,245,230,125,209,149,219,248,58,141,101,88,71,42,22,52,151) +IMAGE_DATA(245,135,197,87,126,43,22,235,119,234,206,158,202,221,215,15,174,55,243,185,44,123,243,33,54,135,207,146,37,253,63,131) +IMAGE_DATA(217,62,99,74,188,77,241,143,67,197,58,12,219,68,184,143,14,195,146,160,46,226,11,53,79,251,150,142,30,172,209,33) +IMAGE_DATA(250,199,255,119,250,191,166,57,31,6,37,111,17,175,244,77,243,230,183,182,182,76,219,202,202,202,113,136,67,159,235,63) +IMAGE_DATA(88,206,108,108,108,28,55,215,188,182,190,183,183,215,214,169,76,237,156,247,217,67,27,198,211,56,112,84,230,190,198,120) +IMAGE_DATA(228,224,160,135,252,162,50,231,201,39,30,11,106,227,125,220,142,107,159,244,82,31,213,115,120,94,231,44,181,211,28,184) +IMAGE_DATA(46,223,250,195,111,138,181,155,208,7,137,241,228,35,31,71,137,199,46,198,231,166,121,60,59,51,62,187,226,39,151,197) +IMAGE_DATA(124,29,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(1216, 11) diff --git a/uppsrc/ide/Designers/Designers.h b/uppsrc/ide/Designers/Designers.h new file mode 100644 index 000000000..15f18fee5 --- /dev/null +++ b/uppsrc/ide/Designers/Designers.h @@ -0,0 +1,6 @@ +#ifndef _ide_Designers_Designers_h_ +#define _ide_Designers_Designers_h_ + +#include "Img.h" + +#endif diff --git a/uppsrc/ide/Designers/Designers.upp b/uppsrc/ide/Designers/Designers.upp new file mode 100644 index 000000000..5674cb8a2 --- /dev/null +++ b/uppsrc/ide/Designers/Designers.upp @@ -0,0 +1,8 @@ +description "Various small(er) designers (Image viewer, QTF editor, ...)\377B"; + +file + Img.h, + Png.cpp, + Img.icpp, + Qtf.icpp; + diff --git a/uppsrc/ide/Img/Img.h b/uppsrc/ide/Designers/Img.h similarity index 100% rename from uppsrc/ide/Img/Img.h rename to uppsrc/ide/Designers/Img.h diff --git a/uppsrc/ide/Img/Img.icpp b/uppsrc/ide/Designers/Img.icpp similarity index 100% rename from uppsrc/ide/Img/Img.icpp rename to uppsrc/ide/Designers/Img.icpp diff --git a/uppsrc/ide/Img/Png.cpp b/uppsrc/ide/Designers/Png.cpp similarity index 100% rename from uppsrc/ide/Img/Png.cpp rename to uppsrc/ide/Designers/Png.cpp diff --git a/uppsrc/ide/Designers/Qtf.icpp b/uppsrc/ide/Designers/Qtf.icpp new file mode 100644 index 000000000..b99c29cc8 --- /dev/null +++ b/uppsrc/ide/Designers/Qtf.icpp @@ -0,0 +1,151 @@ +#include +#include + +struct IdeQtfDes : IdeDesigner, RichEditWithToolBar { + String filename; + + virtual String GetFileName() const { return filename; } + virtual void Save(); + virtual void SaveEditPos(); + virtual void EditMenu(Bar& menu); + virtual Ctrl& DesignerCtrl() { return *this; } + + virtual void Serialize(Stream& s); + + bool Load(const char *filename); + void FileProperties(); + void CopyId(const String& n); + + typedef IdeQtfDes CLASSNAME; + + IdeQtfDes() { Extended(); } +}; + +struct IdeQtfEditPos : Moveable { + Time filetime; + RichEdit::PosInfo pos; + RichEdit::UndoInfo uf; + + IdeQtfEditPos() { filetime = Null; } +}; + +static VectorMap& sEP() +{ + static VectorMap x; + return x; +} + +void IdeQtfDes::SaveEditPos() +{ + if(filename.GetCount()) { + IdeQtfEditPos& p = sEP().GetAdd(filename); + p.filetime = FileGetTime(filename);; + p.pos = GetPosInfo(); + p.uf = PickUndoInfo(); + } +} + +bool IdeQtfDes::Load(const char *_filename) +{ + RichText txt; + if(ParseQTF(txt, LoadFile(_filename))) { + filename = _filename; + Pick(txt); + IdeQtfEditPos& ep = sEP().GetAdd(filename); + if(ep.filetime == FileGetTime(filename)) { + SetPosInfo(ep.pos); + SetPickUndoInfo(ep.uf); + ep.uf.Clear(); + } + return true; + } + return false; +} + +void IdeQtfDes::Save() +{ + SaveFile(filename, GetQTF()); +} + +void IdeQtfDes::EditMenu(Bar& menu) +{ + EditTools(menu); +} + +void IdeQtfDes::Serialize(Stream& s) +{ + SerializeSettings(s); +} + +void SerializeQtfDesPos(Stream& s) +{ + VectorMap& filedata = sEP(); + s.Magic(); + s.Magic(0); + if(s.IsStoring()) { + for(int i = 0; i < filedata.GetCount(); i++) { + String fn = filedata.GetKey(i); + if(!fn.IsEmpty()) { + FindFile ff(fn); + IdeQtfEditPos& ep = filedata[i]; + if(ff && ff.GetLastWriteTime() == ep.filetime) { + s % fn; + s % ep.filetime; + s % ep.pos; + } + } + } + String end; + s % end; + } + else { + String fn; + filedata.Clear(); + for(;;) { + s % fn; + if(fn.IsEmpty()) break; + IdeQtfEditPos& ep = filedata.GetAdd(fn); + s % ep.filetime; + s % ep.pos; + } + } +} + +bool IsQtfFile(const char *path) +{ + return ToLower(GetFileExt(path)) == ".qtf"; +} + +struct QtfDesModule : public IdeModule { + virtual void CleanUsc() {} + virtual bool ParseUsc(CParser& p) { return false; } + + virtual Image FileIcon(const char *path) { + return IsQtfFile(path) ? IdeCommonImg::Qtf() : Null; + } + + virtual IdeDesigner *CreateDesigner(const char *path, byte) { + if(IsQtfFile(path)) { + IdeQtfDes *d = new IdeQtfDes; + LoadFromGlobal(*d, "qtfdes-ctrl"); + if(d->Load(path)) { + return d; + } + delete d; + return NULL; + } + return NULL; + } + + virtual void Serialize(Stream& s) { + int version = 0; + s / version; + SerializeQtfDesPos(s); + } +}; + +INITBLOCK +{ + RegisterIdeModule(Single()); + RegisterGlobalConfig("qtfdes-ctrl"); +} diff --git a/uppsrc/ide/Designers/init b/uppsrc/ide/Designers/init new file mode 100644 index 000000000..7220e079f --- /dev/null +++ b/uppsrc/ide/Designers/init @@ -0,0 +1,9 @@ +#ifndef _ide_Designers_icpp_init_stub +#define _ide_Designers_icpp_init_stub +#define BLITZ_INDEX__ Fadb0baddbb7b757e3ed9acaca887cd9a +#include "Img.icpp" +#undef BLITZ_INDEX__ +#define BLITZ_INDEX__ F421424bc1424dfd0a7a9d53622c87987 +#include "Qtf.icpp" +#undef BLITZ_INDEX__ +#endif diff --git a/uppsrc/ide/IconDes/IconDes.cpp b/uppsrc/ide/IconDes/IconDes.cpp index d5770be8b..87bbad400 100644 --- a/uppsrc/ide/IconDes/IconDes.cpp +++ b/uppsrc/ide/IconDes/IconDes.cpp @@ -80,6 +80,7 @@ void IdeIconDes::Serialize(Stream& s) { SerializeSettings(s); } + String IdeIconDes::GetFileName() const { return filename; diff --git a/uppsrc/ide/Img/Img.upp b/uppsrc/ide/Img/Img.upp deleted file mode 100644 index b2d2e0d5c..000000000 --- a/uppsrc/ide/Img/Img.upp +++ /dev/null @@ -1,7 +0,0 @@ -description "\377B"; - -file - Img.h, - Png.cpp, - Img.icpp; - diff --git a/uppsrc/ide/Img/init b/uppsrc/ide/Img/init deleted file mode 100644 index eb1f59022..000000000 --- a/uppsrc/ide/Img/init +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ide_Img_icpp_init_stub -#define _ide_Img_icpp_init_stub -#define BLITZ_INDEX__ F0fc5d23dbb33a5227fd533699d97f95c -#include "Img.icpp" -#undef BLITZ_INDEX__ -#endif diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico index acf925788c40aeb11f3ad79e2eff9811bca8ebe9..e0ea0587cf9f3450aabb5798ed49cd6a087d9894 100644 GIT binary patch literal 2862 zcmcguTZ>y&6#jB@<#?g(gCc?xM6lqz=%}b5G^VixX3~&JtoX7glb%jvPv@kQOygrf zr1~JDT177ATvh%=g`a=731}NCTX~`kVL`FY>GtB!R#phmW9JPHq*Qdju&1M?M zsHO8JlZh{oeBp;R#7@QzXv7yG!$7#Q3To*6=?QD6_ycg3djXAJhx`GTKZq;vbNcXhHgnCKl95 z*^D1Df2ngYU#?K<%6X5$*F}PSGY8=szQm&0Bs(|jpl35H*-vug8nIvZvY(&!?5mef zco4Rn?C%9&mW?stHzbW@T-L%7?)-PAq+2>eep*Ua4xhY#10_F)U%&qmCCf*V1$_E_ z`efwIdd#X;mhncV8aY(8h5AbKa9j1@^xQbEE@3$8!3|s&>J2Q{DhRiDv(k!kWzk?P zDYKf3b=Scu?OcFTeYpM2C`G9%+GlH64m{-_?!)1lV=>QjF2-Cv9@uKNjoRC7ZOLQ8 z`olpNj|Fk*Z?)EnW*~O6{#KMP`zJ*y52J)b;@)=bk^PdQR_5m?=Wm^l=Ud_M8|`=| zci5lYNz}g@p+Ai08Qw>;6L9X`)%oGP*2tGgXqRbkcCSX~4f(3sL5+DzT}00v@(xYc zjmipEn-$bl2XgDb{dE_=^Y7Y89bUjQ4*{XO zv-tm?01{TW})MW>Q#WLz@9o~3od>1{VT@Rj)4f&ppP`2v0J{+JQ*7AmY zUtElI&KO%)%pP60r*kvp-@zKzy6<9h=;6It8?QKK?Yv-ex4bc&Ewgskx6Qs+`{?s` zGjxoSvAKeOmN%y4#ZHUgz_UO7w)QhJOBUy literal 2862 zcmcguzi-n}5Wd7VwIV9DY)nK*h*a_r|A-xLjg+YBP=p}ekUCTX4-sMk)<_I=<45R^ zEQpc6AyWnxcK#4Xgpka4_v{zPNuwYNC!O!zyYKtny-VVjs6qy9ZIM`F5`|dl+#>pj zy*zJJh_2O$8jOM0;T3rj?E?27EyY=7Uv+#Ln_?rKPN(8)XbEmO9H#7yXMV21d9k*n zk(3P#<;>+(rXlBJC)Y0Vb9KmAG?NUBaat{FK zFr4S)a!usQF7Ug%-F^J+Vxul%syh{8?u?pFcv@<@>I|7m*CF z=D=LV=bD~Pv2(S~dRDXI^B6nRnC(k1i~RD=f?gSL6*=GR*Da!{G4mnbA!RStdCeT= z&cA1DX=xYyve{LW-n@EEc52eMFJH;7rnCWp6#FUmc;uaiOQ92z;|1gfZStBCxjsB< zVeMial8e2t<&YOT6geLGPLtfQjeTI;m|W}y@HRYhT#8X|mVC3ePo2FU_3m}4+v!sS zJf|MeX3e1{v_lX2zC(T!QO@wmiJ{-}rH3}^K^ye|c;Gzbd{$G=b*Z(pN&5#K>K%2d z-)T?`oCo(Khg#4Kfn#0nk^A+fPw=pAX7_j82yzv2JJj_z)z?A zgO}gLLT!l12E*gwso;Y}tBMyg}kF7b=XY)Cz zXs*sL=L?=WMQ5IHGreLB>tsC}7={KKl}a)g7zu)yZCS}=Fi5N{=grAvpo&Riz>?}@ z!VBJ0d38Rws@1$MJj<%){Dk#Qc&;zGS;%cWF-$YDXDvd@)clnTp6}JYXVpJ)Q_Qt& z>%3>noMJv+v@@UgM%!n{?{1FA7l-GMPZ7uC^B4T|{r4|NKp@^#@$@#w@%Z!sKQ9hH X95NoUC-G#|y@Hi^@a diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml index f65b8613f..52f528bd1 100644 --- a/uppsrc/ide/ide.iml +++ b/uppsrc/ide/ide.iml @@ -81,7 +81,6 @@ IMAGE_ID(SvnDiff) IMAGE_ID(Patch) IMAGE_ID(GoPrev) IMAGE_ID(GoNext) -IMAGE_ID(qtf) IMAGE_ID(XmlTag) IMAGE_ID(XmlText) IMAGE_ID(XmlPI) @@ -2297,71 +2296,65 @@ IMAGE_DATA(207,138,63,239,7,158,232,133,187,69,103,134,25,102,152,97,134,25,102, IMAGE_END_DATA(5984, 21) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,154,79,108,20,85,28,199,127,180,169,82,176,178,133,212,68,131,88,47,16,87,83,140,69,35,235,161,37,138) -IMAGE_DATA(104,109,189,77,164,33,33,106,219,165,16,44,129,3,66,26,220,13,6,82,18,155,236,133,88,18,72,122,177,38,123,213) -IMAGE_DATA(108,76,15,210,68,110,115,32,65,61,52,123,96,225,66,140,30,76,228,0,167,231,251,189,217,55,51,111,230,189,153,247) -IMAGE_DATA(102,166,237,182,233,111,242,203,206,206,190,207,239,247,125,255,126,251,103,22,114,144,131,44,237,236,181,5,146,196,253,60) -IMAGE_DATA(33,32,120,181,90,37,81,38,229,31,81,159,161,126,214,227,75,165,146,235,252,185,148,71,118,148,122,94,228,141,242,99) -IMAGE_DATA(238,67,97,94,166,65,154,31,115,207,39,236,255,76,147,71,29,119,19,244,63,15,158,207,39,200,127,200,201,203,248,71) -IMAGE_DATA(97,62,168,35,196,223,245,141,95,210,249,63,212,140,65,18,206,127,190,217,135,36,249,231,125,227,47,201,31,28,135,32) -IMAGE_DATA(159,102,255,164,178,172,139,1,53,146,208,93,222,212,100,60,52,15,180,254,254,126,165,235,240,105,243,59,109,202,174,235) -IMAGE_DATA(240,105,251,207,45,170,223,171,145,63,9,159,114,253,4,77,21,95,199,172,8,222,210,224,101,109,101,49,227,120,221,235) -IMAGE_DATA(233,236,185,236,139,193,90,219,39,17,46,111,127,224,128,231,253,253,142,71,181,231,109,252,190,145,219,155,141,103,155,226) -IMAGE_DATA(122,235,219,6,220,12,85,144,87,206,170,162,61,233,187,116,201,30,159,155,179,7,174,92,177,115,83,83,118,251,137,19) -IMAGE_DATA(54,168,43,15,193,182,63,45,45,217,95,221,186,101,191,65,217,173,167,78,69,182,31,188,122,149,181,29,158,157,181,247) -IMAGE_DATA(93,188,104,119,198,180,239,166,26,246,211,184,175,77,79,219,47,158,59,103,63,115,242,100,100,251,142,201,73,27,153,157) -IMAGE_DATA(103,206,216,219,79,159,142,213,15,197,34,107,131,222,134,109,233,243,136,246,166,227,185,126,45,7,207,75,175,191,2,240) -IMAGE_DATA(207,56,78,60,245,17,167,243,95,0,140,143,59,222,215,23,23,247,83,202,19,252,200,64,253,55,151,191,119,15,96,121) -IMAGE_DATA(25,224,193,3,128,185,57,128,174,46,51,30,173,187,27,96,106,10,224,241,99,128,133,5,21,223,14,112,99,27,192,15) -IMAGE_DATA(232,91,169,211,75,3,98,139,131,7,1,30,62,4,184,124,89,184,220,6,29,176,11,94,133,45,58,21,238,230,77,128) -IMAGE_DATA(70,3,96,247,110,247,210,7,112,17,42,84,239,65,152,136,231,119,237,114,186,184,119,47,123,58,2,215,96,22,158,50) -IMAGE_DATA(254,59,120,2,239,195,121,53,123,228,8,192,177,99,14,63,57,73,225,17,120,29,134,225,61,152,100,252,91,48,10,251) -IMAGE_DATA(224,67,53,127,158,198,126,242,196,225,159,62,5,152,153,97,151,95,160,20,242,219,96,103,188,254,137,9,135,191,112,193) -IMAGE_DATA(189,148,131,151,225,27,104,192,81,184,25,207,183,209,49,238,237,5,232,232,16,46,127,12,223,66,25,30,66,47,20,2) -IMAGE_DATA(192,32,116,118,46,192,246,237,142,183,183,223,80,134,62,14,63,210,209,252,143,206,250,25,232,116,43,254,151,112,231,142) -IMAGE_DATA(247,107,196,200,200,223,74,254,89,232,162,31,232,190,135,18,60,128,105,88,134,175,225,119,35,158,219,75,208,7,239,194) -IMAGE_DATA(24,115,228,135,135,9,140,141,57,190,103,143,200,111,110,198,248,205,88,46,3,65,15,103,137,223,140,200,241,47,242,60) -IMAGE_DATA(142,23,43,126,51,250,25,127,28,221,205,232,231,68,94,111,51,170,121,52,189,205,232,239,131,56,142,155,155,81,104,187) -IMAGE_DATA(2,63,160,164,177,152,47,201,37,225,135,8,209,75,172,205,253,251,247,165,238,240,101,50,91,249,85,234,78,12,135,111) -IMAGE_DATA(52,26,194,99,152,191,237,123,188,29,226,209,175,95,191,78,134,134,134,220,24,30,127,155,236,127,115,128,28,255,188,36) -IMAGE_DATA(196,242,243,156,197,71,89,126,100,197,24,30,143,249,144,141,31,75,96,49,178,206,31,236,63,158,47,46,46,70,244,95) -IMAGE_DATA(61,254,156,245,250,19,28,127,79,139,140,71,13,135,15,31,166,5,160,44,229,145,125,251,157,143,200,133,233,249,144,126) -IMAGE_DATA(158,23,217,165,165,37,233,250,193,188,200,254,252,203,191,46,159,114,253,174,173,173,167,98,176,227,179,29,36,119,52,39) -IMAGE_DATA(117,124,13,98,138,1,182,3,197,193,94,139,41,6,186,188,170,24,184,188,69,189,170,230,85,155,209,229,171,225,24,156) -IMAGE_DATA(55,41,6,44,70,198,249,163,138,129,110,255,85,197,64,58,254,77,45,50,62,88,12,66,60,101,243,86,158,221,250,8) -IMAGE_DATA(234,151,21,131,16,111,121,183,77,56,159,114,253,174,173,173,167,98,80,162,94,86,120,169,217,38,170,24,148,157,207,148) -IMAGE_DATA(82,47,251,120,85,49,208,229,85,197,128,243,22,245,106,4,175,218,140,156,175,74,98,112,222,164,24,88,43,144,63,170) -IMAGE_DATA(24,232,246,95,85,12,100,227,207,181,200,248,96,49,8,242,200,14,244,244,16,203,178,66,250,101,197,32,200,99,94,100) -IMAGE_DATA(241,94,41,231,83,174,223,181,181,85,44,6,105,58,203,239,77,233,220,219,146,230,198,10,158,80,131,133,19,238,187,31) -IMAGE_DATA(104,170,129,229,182,232,225,125,92,53,203,93,165,7,190,19,149,255,44,147,193,193,65,19,13,44,119,158,30,200,247,62) -IMAGE_DATA(238,53,209,32,228,230,135,129,6,33,55,63,52,53,72,115,27,104,144,230,214,212,224,205,119,196,225,125,117,8,105,96) -IMAGE_DATA(185,209,49,71,148,99,30,137,6,173,66,30,240,108,172,69,254,116,33,240,113,255,120,225,166,216,224,172,112,176,201,138) -IMAGE_DATA(56,124,139,65,182,160,216,235,184,104,100,108,207,95,61,170,137,116,53,224,98,197,69,43,227,173,170,69,242,249,124,220) -IMAGE_DATA(134,146,106,208,200,29,169,65,51,183,84,131,65,110,169,6,195,220,130,134,252,31,121,211,220,174,6,55,134,121,110,87) -IMAGE_DATA(67,194,220,130,134,132,185,93,13,41,88,61,203,178,24,140,142,142,146,180,158,212,66,124,173,232,43,54,69,82,83,146) -IMAGE_DATA(117,82,41,128,192,215,138,148,41,122,68,189,82,16,158,251,13,219,226,75,156,151,183,173,145,162,171,129,158,243,215,235) -IMAGE_DATA(21,82,104,158,115,190,8,5,82,169,7,37,210,118,133,10,169,187,125,162,109,42,190,243,186,199,179,118,33,188,64,10) -IMAGE_DATA(205,160,181,162,23,159,107,247,231,15,105,199,220,174,38,170,221,141,239,239,147,66,63,99,189,28,108,78,248,19,255,185) -IMAGE_DATA(143,23,231,77,28,11,54,47,244,58,246,197,175,93,224,169,186,90,77,28,129,90,145,235,164,115,93,164,250,249,120,146) -IMAGE_DATA(48,15,146,55,43,47,143,179,86,100,235,41,171,245,155,198,83,111,224,110,86,12,182,164,142,179,78,44,237,199,44,229) -IMAGE_DATA(100,106,198,137,93,20,49,113,2,109,203,130,107,196,145,228,11,255,61,52,34,142,162,141,92,131,73,28,67,29,89,141) -IMAGE_DATA(71,86,243,18,27,71,147,119,227,40,188,181,13,139,9,254,250,177,1,45,201,215,157,224,196,197,46,50,141,197,147,105) -IMAGE_DATA(140,224,102,145,61,138,175,203,117,248,55,91,48,70,248,60,62,70,220,243,213,210,145,52,134,137,101,29,35,131,117,218) -IMAGE_DATA(26,182,129,63,153,100,49,33,36,252,151,27,133,103,17,199,52,6,47,28,89,104,9,198,73,162,165,21,198,69,165,99) -IMAGE_DATA(173,230,40,105,156,205,98,210,242,150,118,146,116,151,74,234,24,186,188,243,174,187,50,49,76,250,144,69,140,44,120,153) -IMAGE_DATA(142,213,214,96,26,195,192,91,219,54,139,137,246,36,177,182,120,151,70,230,26,177,148,172,34,150,22,143,155,71,118,46) -IMAGE_DATA(137,19,145,79,29,35,16,39,17,31,23,67,135,143,235,143,161,134,44,231,37,171,245,17,138,37,241,150,182,255,1,100) -IMAGE_DATA(21,22,221,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(1760, 17) +IMAGE_DATA(120,156,237,154,79,108,20,85,28,199,191,180,169,82,176,178,165,169,137,6,177,94,32,174,166,24,139,198,234,161,109,180) +IMAGE_DATA(162,216,122,155,8,33,33,42,5,10,193,54,112,192,54,13,238,4,3,41,137,77,184,52,150,164,36,189,88,147,189,234) +IMAGE_DATA(193,112,144,38,114,155,3,9,226,129,83,183,189,16,163,7,19,123,128,211,243,253,102,58,255,223,155,121,111,102,218,110) +IMAGE_DATA(155,254,38,191,236,238,236,251,124,127,191,247,239,183,179,59,139,18,74,40,210,46,222,152,103,89,60,200,51,134,144,87) +IMAGE_DATA(171,85,150,100,66,254,49,247,73,238,23,125,190,82,169,120,238,190,22,242,196,30,231,94,14,243,90,241,41,118,95,156) +IMAGE_DATA(23,229,32,140,79,177,231,50,246,127,114,149,167,60,238,103,232,127,25,190,207,101,136,223,231,196,181,249,199,113,62,154) +IMAGE_DATA(71,140,191,31,24,191,172,243,223,183,170,193,50,206,127,121,181,15,89,226,207,5,198,95,16,63,58,14,81,62,207,254) +IMAGE_DATA(201,101,69,23,3,110,44,163,123,188,174,137,120,172,30,100,93,93,93,82,87,225,243,198,119,218,152,158,171,240,121,251) +IMAGE_DATA(239,90,82,191,215,35,126,22,62,231,250,137,154,76,95,197,140,4,222,80,224,69,109,69,154,105,188,234,249,124,246,92) +IMAGE_DATA(241,197,96,163,237,211,4,23,183,63,124,216,247,174,46,199,147,218,187,109,130,190,149,219,235,141,103,131,228,124,253,219) +IMAGE_DATA(22,220,12,85,136,43,103,85,210,158,117,94,185,98,13,205,204,88,61,215,174,89,165,145,17,171,241,236,89,11,242,202) +IMAGE_DATA(195,168,237,207,11,11,214,215,183,111,91,111,112,118,231,249,243,137,237,123,175,95,183,219,14,76,77,89,7,199,199,173) +IMAGE_DATA(230,148,246,173,60,135,67,92,247,181,137,9,235,197,75,151,172,103,206,157,75,108,223,52,60,108,17,179,119,116,212,218) +IMAGE_DATA(125,225,66,106,254,56,115,198,110,67,222,64,109,249,235,132,246,186,227,185,121,173,132,231,133,231,95,1,254,25,162,137) +IMAGE_DATA(231,62,232,116,254,75,96,104,200,241,206,206,52,221,207,56,207,232,146,129,251,239,30,255,224,1,240,232,17,176,180,4) +IMAGE_DATA(204,204,0,45,45,122,60,89,107,43,48,50,2,172,172,0,243,243,50,190,17,184,181,11,248,145,124,39,119,126,170,39) +IMAGE_DATA(220,162,187,27,88,94,6,174,94,13,157,110,64,19,218,240,42,118,168,84,184,217,89,160,86,3,246,237,243,78,125,136) +IMAGE_DATA(113,220,228,249,118,227,116,58,223,214,230,116,241,192,1,251,229,32,110,96,10,79,109,254,123,60,193,7,184,44,103,143) +IMAGE_DATA(28,1,78,156,112,248,225,97,14,15,226,117,12,224,125,12,219,252,91,56,142,131,248,72,206,95,230,218,79,158,56,252) +IMAGE_DATA(211,167,192,228,164,125,250,5,78,17,191,11,123,211,243,63,125,218,225,199,198,188,83,37,188,140,111,81,195,49,204,166) +IMAGE_DATA(243,13,124,140,59,58,128,166,166,208,233,79,240,29,76,44,163,3,239,69,128,94,52,55,207,99,247,110,199,27,27,111) +IMAGE_DATA(73,165,79,226,39,62,154,255,241,89,31,69,179,87,241,191,194,189,123,254,175,17,131,131,127,75,249,103,209,194,47,232) +IMAGE_DATA(126,64,5,75,152,192,35,124,131,63,180,120,215,94,66,39,222,197,41,219,137,31,24,96,56,117,202,241,253,251,195,252) +IMAGE_DATA(246,102,76,223,140,166,9,70,30,143,146,190,25,137,115,191,200,187,58,190,86,250,102,12,50,65,29,213,205,24,228,194) +IMAGE_DATA(188,218,102,148,243,100,106,155,49,216,135,240,56,110,111,198,80,219,53,248,1,37,143,165,124,73,174,132,126,136,8,123) +IMAGE_DATA(197,110,179,184,184,40,116,135,55,217,212,205,223,132,238,104,56,124,173,86,11,61,198,249,187,129,199,187,49,158,124,122) +IMAGE_DATA(122,154,29,61,122,212,211,240,249,187,236,208,155,61,236,228,23,149,144,86,144,119,89,122,20,197,39,54,172,225,243,20) +IMAGE_DATA(143,216,244,177,132,173,81,116,252,104,255,233,249,157,59,119,18,250,47,31,127,151,245,251,19,29,127,63,23,17,79,57) +IMAGE_DATA(244,247,247,243,2,96,10,121,98,223,126,231,99,54,54,49,23,203,223,141,75,236,194,194,130,112,253,80,92,98,127,249) +IMAGE_DATA(245,95,143,207,185,126,55,214,54,83,49,216,243,249,30,86,58,86,18,58,189,135,148,98,64,237,32,57,236,247,82,138) +IMAGE_DATA(129,42,47,43,6,30,111,112,175,202,121,217,102,244,248,106,92,195,229,117,138,129,173,81,112,252,164,98,160,218,127,89) +IMAGE_DATA(49,16,142,255,106,46,34,62,90,12,98,60,103,203,70,217,190,245,17,205,95,84,12,98,188,225,223,54,113,249,156,235) +IMAGE_DATA(119,99,109,51,21,131,10,119,83,226,149,213,54,73,197,192,116,174,41,133,110,6,120,89,49,80,229,101,197,192,229,13) +IMAGE_DATA(238,213,4,94,182,25,93,190,42,208,112,121,157,98,96,172,65,252,164,98,160,218,127,89,49,16,141,191,155,139,136,143) +IMAGE_DATA(22,131,40,79,108,79,123,59,51,12,35,150,191,168,24,68,121,138,75,44,221,43,117,249,156,235,119,99,109,29,139,65) +IMAGE_DATA(158,206,186,247,166,84,238,109,9,99,83,5,207,152,131,65,19,30,184,31,168,155,131,29,219,224,135,127,185,170,23,187) +IMAGE_DATA(202,15,250,36,50,255,52,89,111,111,175,78,14,118,236,50,63,136,239,88,233,208,201,33,20,219,61,52,114,8,197,118) +IMAGE_DATA(15,197,28,132,177,53,114,16,198,86,204,193,159,239,132,195,255,234,16,203,193,142,77,78,49,146,156,226,8,114,80,42) +IMAGE_DATA(228,17,47,198,234,228,79,23,33,62,237,31,47,174,73,54,184,93,56,236,201,74,56,2,139,65,180,160,236,247,105,209) +IMAGE_DATA(136,216,246,191,218,101,19,233,229,64,139,149,22,173,136,55,170,6,43,151,203,105,27,74,152,131,66,236,196,28,20,99) +IMAGE_DATA(11,115,208,136,45,204,65,51,118,40,135,242,195,178,110,108,47,7,79,67,63,182,151,67,198,216,161,28,50,198,246,114) +IMAGE_DATA(200,193,170,89,171,93,12,118,172,121,156,58,177,188,149,85,245,95,68,218,188,162,78,164,173,25,114,5,29,65,188,248) +IMAGE_DATA(63,194,18,116,36,109,196,57,232,232,104,230,81,212,120,20,53,47,169,58,138,188,167,35,241,250,54,42,38,244,133,103) +IMAGE_DATA(11,90,150,43,156,232,196,165,46,50,133,197,83,168,70,116,179,136,30,195,239,139,243,8,110,182,168,70,252,121,186,70) +IMAGE_DATA(218,235,245,202,35,171,134,142,21,173,81,192,58,173,15,219,194,87,38,69,76,8,139,223,101,151,120,17,58,186,26,110) +IMAGE_DATA(225,40,34,151,168,78,150,92,234,97,92,100,121,108,212,28,101,213,217,46,38,117,111,121,39,73,117,169,228,214,80,229) +IMAGE_DATA(157,79,221,181,209,208,233,67,17,26,69,240,162,60,214,59,7,93,13,13,175,111,219,46,38,202,147,100,183,165,31,102) +IMAGE_DATA(69,174,160,37,101,37,90,74,60,109,30,209,115,129,78,66,60,185,70,68,39,19,159,166,161,194,167,245,71,51,135,34) +IMAGE_DATA(231,165,168,245,17,211,18,120,125,91,107,125,253,79,99,173,45,239,36,49,246,144,9,93,81,39,208,158,73,158,39,47) +IMAGE_DATA(88,17,163,161,35,109,47,59,23,209,73,229,139,210,73,225,139,26,143,162,230,69,216,175,12,235,195,211,145,120,93,219) +IMAGE_DATA(255,45,72,215,220,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(1632, 17) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,148,209,13,2,33,12,134,25,65,31,73,156,204,105,124,185,21,220,128,141,28,224,54,169,18,57,37,164,45) -IMAGE_DATA(45,69,197,187,107,242,39,228,164,31,63,180,214,29,221,193,109,40,128,144,56,31,110,128,74,200,201,246,3,177,102,57) -IMAGE_DATA(104,142,130,67,238,167,190,21,156,106,126,47,78,37,191,215,123,244,170,11,122,175,134,254,120,113,8,141,29,43,30,38) -IMAGE_DATA(84,65,164,122,50,30,189,208,36,138,225,46,111,113,223,106,12,242,220,157,209,204,176,214,165,181,63,236,125,58,70,172) -IMAGE_DATA(120,152,96,97,45,146,184,93,172,140,111,121,88,254,44,229,186,71,254,63,189,195,47,61,40,52,118,236,195,68,55,76) -IMAGE_DATA(78,112,21,201,202,144,228,123,239,209,181,148,17,115,48,105,239,192,249,144,222,131,242,161,121,71,202,135,134,241,137,90) -IMAGE_DATA(214,24,10,141,29,27,26,38,147,179,23,110,10,33,192,60,207,172,226,158,116,30,234,33,238,201,207,194,24,233,55,140) -IMAGE_DATA(1,139,135,60,183,228,72,60,212,24,201,195,153,243,192,221,69,234,129,243,33,121,7,142,161,241,64,221,69,227,129,233) -IMAGE_DATA(135,30,195,4,243,48,76,220,1,54,42,24,29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) -IMAGE_END_DATA(288, 5) +IMAGE_DATA(120,156,237,148,81,14,131,48,8,134,57,194,246,216,100,39,219,105,246,226,21,118,131,222,171,55,97,105,172,209,24,160) +IMAGE_DATA(80,156,235,84,146,63,49,218,126,253,41,8,220,225,6,7,13,116,106,100,32,182,137,99,192,107,150,244,174,198,96,207) +IMAGE_DATA(189,24,205,12,111,93,90,251,195,223,167,125,196,129,135,9,21,222,34,169,219,197,203,216,203,195,244,179,172,159,183,216) +IMAGE_DATA(255,79,247,240,75,15,6,245,29,215,48,177,13,147,7,190,85,242,50,52,251,67,8,228,179,150,145,247,80,178,230,32) +IMAGE_DATA(249,208,230,193,249,176,220,35,231,195,194,248,70,45,107,12,131,250,142,19,13,147,1,252,133,27,98,140,152,82,18,149) +IMAGE_DATA(215,148,243,72,15,121,205,242,44,138,81,190,81,12,156,60,44,247,174,57,26,15,53,70,241,240,148,60,72,185,104,61) +IMAGE_DATA(72,62,52,247,32,49,44,30,184,92,44,30,132,126,216,98,152,80,30,186,137,15,135,168,203,80,0,0,0,0,0,0) +IMAGE_END_DATA(224, 4) diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp index dfd8cfd16..34fe883fd 100644 --- a/uppsrc/ide/ide.upp +++ b/uppsrc/ide/ide.upp @@ -17,7 +17,7 @@ uses usvn, TextDiffCtrl, TabBar, - ide\Img; + ide/Designers; uses(POSIX) ide\SrcUpdater; diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp index 4859ef815..19fbe062d 100644 --- a/uppsrc/ide/idebar.cpp +++ b/uppsrc/ide/idebar.cpp @@ -532,7 +532,7 @@ void Ide::BrowseMenu(Bar& menu) { menu.MenuSeparator(); menu.AddMenu(AK_CALC, IdeImg::calc(), THISBACK1(ToggleBottom, BCALC)) .Check(IsBottomShown() && btabs.GetCursor() == BCALC); - menu.AddMenu(AK_QTF, IdeImg::qtf(), THISBACK(Qtf)); + menu.AddMenu(AK_QTF, IdeCommonImg::Qtf(), THISBACK(Qtf)); menu.AddMenu(!designer, AK_XML, IdeCommonImg::xml(), THISBACK(Xml)); menu.AddMenu(!designer, AK_JSON, IdeCommonImg::json(), THISBACK(Json)); menu.MenuSeparator(); diff --git a/uppsrc/ide/init b/uppsrc/ide/init index 7b9c15caf..54be9fbe3 100644 --- a/uppsrc/ide/init +++ b/uppsrc/ide/init @@ -16,6 +16,6 @@ #include "usvn/init" #include "TextDiffCtrl/init" #include "TabBar/init" -#include "ide\Img/init" +#include "ide/Designers/init" #include "ide\SrcUpdater/init" #endif