From 32533ffa5c9873a9fb64183b83100cb2f5b48d1e Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 30 Nov 2008 10:23:47 +0000
Subject: [PATCH] Assist 'Insert', copy of Image name

git-svn-id: svn://ultimatepp.org/upp/trunk@681 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/IconDes/IconDes.h      |   3 +
 uppsrc/IconDes/IconDes.lay    |   1 +
 uppsrc/IconDes/List.cpp       |  13 ++++
 uppsrc/IconDes/RGBACtrl.cpp   |   1 -
 uppsrc/ide/IconDes/IconDes.h  |   4 +-
 uppsrc/ide/IconDes/IdeDes.cpp |  17 +++++
 uppsrc/ide/Insert.cpp         | 119 +++++++++++++++++++++++++++++++++
 uppsrc/ide/icon.ico           | Bin 2862 -> 2862 bytes
 uppsrc/ide/ide.h              |  23 ++++---
 uppsrc/ide/ide.iml            | 120 +++++++++++++++++-----------------
 uppsrc/ide/ide.key            |   1 -
 uppsrc/ide/ide.lay            |   9 +++
 uppsrc/ide/ide.upp            |   1 +
 uppsrc/ide/idebar.cpp         |   2 +-
 uppsrc/ide/idetool.cpp        |   8 ---
 uppsrc/ide/idewin.cpp         |   1 +
 16 files changed, 243 insertions(+), 80 deletions(-)
 create mode 100644 uppsrc/ide/Insert.cpp

diff --git a/uppsrc/IconDes/IconDes.h b/uppsrc/IconDes/IconDes.h
index 86cfcebf8..788e44170 100644
--- a/uppsrc/IconDes/IconDes.h
+++ b/uppsrc/IconDes/IconDes.h
@@ -273,6 +273,7 @@ private:
 
 public:
 	virtual void ToolEx(Bar& bar);
+	virtual void ListMenuEx(Bar& bar);
 
 	void  ListMenu(Bar& bar);
 	void  EditBar(Bar& bar);
@@ -301,6 +302,8 @@ public:
 	String GetName(int ii) const;
 	bool   GetExport(int ii) const;
 
+	String GetCurrentName() const;
+
 	EditPos GetEditPos();
 	void    SetEditPos(const EditPos& o);
 
diff --git a/uppsrc/IconDes/IconDes.lay b/uppsrc/IconDes/IconDes.lay
index 11e5e38e1..7c93708ee 100644
--- a/uppsrc/IconDes/IconDes.lay
+++ b/uppsrc/IconDes/IconDes.lay
@@ -63,3 +63,4 @@ LAYOUT(ImgColorLayout, 188, 164)
 	ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(44, 64).TopPosZ(132, 24))
 	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(116, 64).TopPosZ(132, 24))
 END_LAYOUT
+
diff --git a/uppsrc/IconDes/List.cpp b/uppsrc/IconDes/List.cpp
index 9d5b6d5ea..79af039d6 100644
--- a/uppsrc/IconDes/List.cpp
+++ b/uppsrc/IconDes/List.cpp
@@ -282,8 +282,14 @@ void IconDes::ListMenu(Bar& bar)
 			        THISBACK1(InsertRemoved, i));
 		}
 	}
+	bar.Separator();
+	EditBar(bar);
+	ListMenuEx(bar);
 }
 
+void IconDes::ListMenuEx(Bar& bar) {}
+
+
 void IconDes::Clear()
 {
 	list.Clear();
@@ -318,6 +324,13 @@ String IconDes::GetName(int ii) const
 	return slot[ii].name;
 }
 
+String IconDes::GetCurrentName() const
+{
+	if(list.IsCursor())
+		return slot[list.GetCursor()].name;
+	return String();
+}
+
 bool IconDes::GetExport(int ii) const
 {
 	return slot[ii].exp;
diff --git a/uppsrc/IconDes/RGBACtrl.cpp b/uppsrc/IconDes/RGBACtrl.cpp
index 018e53722..660e9162a 100644
--- a/uppsrc/IconDes/RGBACtrl.cpp
+++ b/uppsrc/IconDes/RGBACtrl.cpp
@@ -130,7 +130,6 @@ void RGBACtrl::Alpha()
 	UpdateAction();
 }
 
-
 void RGBACtrl::MaskSet(int a)
 {
 	alpha.Set(a);
diff --git a/uppsrc/ide/IconDes/IconDes.h b/uppsrc/ide/IconDes/IconDes.h
index f8e74ffc8..117866802 100644
--- a/uppsrc/ide/IconDes/IconDes.h
+++ b/uppsrc/ide/IconDes/IconDes.h
@@ -11,16 +11,18 @@ struct IdeIconDes : IdeDesigner, IconDes {
 	virtual void   EditMenu(Bar& menu);
 	virtual Ctrl&  DesignerCtrl()             { return *this; }
 
-	virtual void Serialize(Stream& s);
+	virtual void   Serialize(Stream& s);
 
 	int     format;
 	String  filename;
 	Time    filetime;
 
 	virtual void   ToolEx(Bar& bar);
+	virtual void   ListMenuEx(Bar& bar);
 
 	bool   Load(const char *filename);
 	void   FileProperties();
+	void   CopyId(const String& n);
 
 	typedef IdeIconDes CLASSNAME;
 
diff --git a/uppsrc/ide/IconDes/IdeDes.cpp b/uppsrc/ide/IconDes/IdeDes.cpp
index 3d3d6f534..17a8b1090 100644
--- a/uppsrc/ide/IconDes/IdeDes.cpp
+++ b/uppsrc/ide/IconDes/IdeDes.cpp
@@ -187,6 +187,23 @@ void RegisterIconDes()
 	RegisterIdeModule(Single<IconDesModule>());
 }
 
+void IdeIconDes::CopyId(const String& n)
+{
+	ClearClipboard();
+	AppendClipboardText(n);
+}
+
+void IdeIconDes::ListMenuEx(Bar& bar)
+{
+	String n = GetCurrentName();
+	String c = GetFileTitle(filename);
+	c.Set(0, ToUpper(c[0]));
+	c = c.EndsWith("Img") ? c : c + "Img";
+	c << "::" << n << "()";
+	bar.Separator();
+	bar.Add(n.GetCount(), "Copy '" + c + '\'', CtrlImg::copy(), THISBACK1(CopyId, c));
+}
+
 INITBLOCK {
 	RegisterGlobalConfig("icondes-ctrl");
 }
diff --git a/uppsrc/ide/Insert.cpp b/uppsrc/ide/Insert.cpp
new file mode 100644
index 000000000..a619ae4f4
--- /dev/null
+++ b/uppsrc/ide/Insert.cpp
@@ -0,0 +1,119 @@
+#include "ide.h"
+
+class InsertColorDlg : public WithInsertColorLayout<TopWindow> {
+	typedef InsertColorDlg CLASSNAME;
+
+	String r[4];
+
+	void Sync();
+	void Select(int i);
+
+public:
+	String result;
+
+	InsertColorDlg();
+};
+
+void InsertColorDlg::Select(int i)
+{
+	result = r[i];
+	Break(IDOK);
+}
+
+void InsertColorDlg::Sync()
+{
+	RGBA c = rgbactrl.Get();
+	r[0] = Format("RGBA(%d, %d, %d, %d)", c.a, c.r, c.g, c.b);
+	rgba.SetLabel(r[0]);
+	r[1] = Format("Color(%d, %d, %d)", c.r, c.g, c.b);
+	color.SetLabel(r[1]);
+	r[2] = Format("%02x%02x%02x%02x", c.a, c.r, c.g, c.b);
+	ahex.SetLabel(r[2]);
+	r[3] = Format("%02x%02x%02x", c.r, c.g, c.b);
+	hex.SetLabel(r[3]);
+}
+
+InsertColorDlg::InsertColorDlg()
+{
+	CtrlLayoutCancel(*this, "Insert color");
+	rgbactrl <<= THISBACK(Sync);
+	rgba <<= THISBACK1(Select, 0);
+	color <<= THISBACK1(Select, 1);
+	ahex <<= THISBACK1(Select, 2);
+	hex <<= THISBACK1(Select, 3);
+}
+
+void Ide::InsertColor()
+{
+	InsertColorDlg dlg;
+	dlg.Execute();
+	editor.Paste(dlg.result.ToWString());
+}
+
+void Ide::InsertLay(const String& fn)
+{
+	String s;
+	s << "#define LAYOUTFILE <" << fn << ">\n"
+	  << "#include <CtrlCore/lay.h>\n";
+	editor.Paste(s.ToWString());
+}
+
+void Ide::InsertIml(const String& fn, String classname)
+{
+	if(!EditText(classname, "Insert .iml include", "Img class"))
+		return;
+	String h;
+	h << "#define IMAGECLASS " << classname << "\n"
+	  << "#define IMAGEFILE <" << fn << ">\n"
+	  << "#include <Draw/iml";
+	editor.Paste((h + "_header.h>\n").ToWString());
+	ClearClipboard();
+	AppendClipboardText((h + "_source.h>\n"));
+	PromptOK("The .cpp part was saved to clipboard");
+}
+
+void Ide::InsertTpp(const String& fn)
+{
+	String s;
+	s << "#define TOPICFILE <" << fn << "/all.i>\n"
+	  << "#include <Core/topic_group.h>\n";
+	editor.Paste(s.ToWString());
+}
+
+void Ide::InsertMenu(Bar& bar)
+{
+	bar.Add("Insert color..", THISBACK(InsertColor));
+	int pi = package.GetCursor();
+	const Workspace& wspc = IdeWorkspace();
+	if(pi >= 0 && pi < wspc.GetCount()) {
+		String pn = wspc[pi];
+		const Package& p = wspc.GetPackage(pi);
+		int n = 0;
+		for(int i = 0; i < p.GetCount() && n < 12; i++) {
+			String fn = p[i];
+			String ext = ToLower(GetFileExt(fn));
+			String pp = pn + '/' + fn;
+			if(ext == ".lay") {
+				bar.Add(fn + " include", THISBACK1(InsertLay, pp));
+				n++;
+			}
+			if(ext == ".iml") {
+				String c = GetFileTitle(fn);
+				c.Set(0, ToUpper(c[0]));
+				bar.Add(fn + " include", THISBACK2(InsertIml, pp, c.EndsWith("Img") ? c : c + "Img"));
+				n++;
+			}
+			if(ext == ".tpp") {
+				bar.Add(fn + " include", THISBACK1(InsertTpp, pp));
+				n++;
+			}
+		}
+	}
+}
+
+void Ide::EditorMenu(Bar& bar)
+{
+	bar.Add("Insert", THISBACK(InsertMenu));
+	bar.Separator();
+	editor.StdBar(bar);
+}
diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico
index ed674dab4681e8f6a8a54a9f03063eb6fa681734..e73216a12a1386ae0b0b81b51b653562bed6dfdf 100644
GIT binary patch
literal 2862
zcmcguy=xRv5TCt`-abLhM`dLY)D#wy1i>yv{0Aggix?z!f~epHv!I}jALnh7+d?aa
zhzJ3jZ4S1u5iG5&&g!ZZ+Gr76=QnTP?%TZ&R}2o!&YQ2_%$xV_aYPQeG&xB^YZFB0
zd6nshh+eYI=yMLy;Uh$Ih+&>(cH~R6#Bu+T60TL|aplXg2^*3)j)f~=Nu2Nd2^jIn
zHyF@u-;hQU5NBvcE><aq)MtyqF6B!-iQ#x7Gc?O)e5qt1l<l*y-@F^aG(Jeq0vj5c
z&rz}u4lKk#H_2sRhOaXjL1M?|r+B6>E%gMm{2?(`3+OYOSc+59**{|bz!{#8BLpt?
zTOnUS(s(@w<m!C*vf0?3>vh_*o)zjLHpj^A(#v3e*)o7v4mb!MJKH}&6uUY5{Dzd-
z_G674<QCr<Pg+{y{4#m933__}A$iFJeg5!~yjnta21wYRuuYGgX!-7Hwg$%8ueWHX
z3^qjH-*7liQH`dVPf5h?vBzoT7=&oLfcAjvgOCB<<2~vX-p?NOzOS==M*7<Mu@2{7
zQ{LB@)ZLmmdDOJZQ(n1#qY&)B?H6>TV1DuJE9r0P$%ZkHl&9H~Pe-rjF86qb4*g1s
zvjK=Bo})zHbbp_EHwkqxw>49b&vm(VZ=fd5*tSE*`95o{P{cKDD#sb0xhFW5p>x!2
z<@YGkdqSNmG~+9o#}_WJm*`wm2j@PLe)37Z>r=e=#tPB<Gd)|5fhCZ^_I;~bxA(eF
z{``9jGoh&$8}d8CzN^%)(LB}ohr7z>i~9yTcg5TT{d*E)`pNHsOa4xu{&WviH40oe
z3v?Yv1%azr2zkw>st18;raFxEdZ3+3xlAgm*Rg<2>rqi}Mv?JLUb7jQd<Fb2v%wd=
zYw4b++-_HSd5etI&GN@C_^Kb^JFEZ5#rA=u>#FbUkW?{+gS52(TYGBjYU_9yb{gB)
zHd%(@_HBF@7M|Z}a|FvXT5g_%48zS!_;wmW1Mw^`ihR^w?p%PUy@+p#{&h~j0mG(b
AGXMYp

literal 2862
zcmcguy^hmB5FVe6&r5ZbRGhBi%1A*-bS~fpkW!{XLOcPqktm=;5ONncJc|n&dL9SK
z%r~>MyIv<z;G!F8c6NTgZ)eBRDntd9ba6o<?<%6_ybJyVq8}VH|GFTm9}-=ohV_!Q
zkd>(Ax_gv?&&u`C@p<jQfuZkv(IdE|ZnatsP}Bo&9PrcJjz$IuBUFLK&U48595L<;
zFXu@O*P9J&Nz8KIvJnaQ9Njl|Bb=6lWfat8FP^L99$Yx8fp6eE7x)#)3{ra#@A<4R
zwK~Co-%*pafIh>-JWu9xe$V{Dvm1|32wvRx2)vN^dYuEXibpQYChc7JzGs~k&O>eF
zh;iv<iq9hxzP#WRK5q8s2~l50UGW=|YnsO%7+}ZmOd~C|jL)SxtLV$ePt*(*{r>rj
znzMn<nPA}fz%d<pjxv9I%B6%`OWu#=yZ+M`oYZq*=!t(3tVeK3-HP}%V?{mi#sNRg
zv7ZZOYmgBhK`xe@ac5wkw>q@~@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{HAebRk<d%$Xr#xAKYN(r+a7hk6gcF+IM?riMpxW%n@5Zx_R^U
zao24Zw{JIWyYBWq*7^L~hc#EQeX4eI1>1F-*I2iU?+etkeI@qu`sMZoGV5npGr8-W
F{sOt@+Oq%v

diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index 9665a28b7..5e0faac09 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -5,6 +5,14 @@
 
 #include <RichEdit/RichEdit.h>
 
+#include <Web/Web.h>
+
+#include <ide/Browser/Browser.h>
+#include <ide/QuickTabs/QuickTabs.h>
+#include <CodeEditor/CodeEditor.h>
+#include <usvn/usvn.h>
+#include <ide/IconDes/IconDes.h>
+
 #define LAYOUTFILE <ide/ide.lay>
 #include <CtrlCore/lay.h>
 
@@ -17,13 +25,6 @@
 #define KEYFILE      <ide/ide.key>
 #include             <CtrlLib/key_header.h>
 
-#include <Web/Web.h>
-
-#include <ide/Browser/Browser.h>
-#include <ide/QuickTabs/QuickTabs.h>
-#include <CodeEditor/CodeEditor.h>
-#include <usvn/usvn.h>
-
 #include "UppDlg.h"
 
 #include "version.h"
@@ -885,6 +886,13 @@ public:
 		void  FindPrevError();
 		void  ClearEditedFile();
 		void  ClearEditedAll();
+	
+		void  InsertColor();
+		void  InsertLay(const String& fn);
+		void  InsertIml(const String& fn, String classname);
+		void  InsertTpp(const String& fn);
+		void  InsertMenu(Bar& bar);
+		void  EditorMenu(Bar& bar);
 
 	void      EditSpecial(Bar& menu);
 		void  TranslateString();
@@ -990,7 +998,6 @@ public:
 		bool  SwapSIf(const char *cref);
 		void  SwapS();
 		void  ContextGoto();
-		void  InsertColor();
 
 
 	void      ConsoleMenu(Bar& menu);
diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml
index e72a1f611..aeee27716 100644
--- a/uppsrc/ide/ide.iml
+++ b/uppsrc/ide/ide.iml
@@ -69,69 +69,69 @@ IMAGE_ID(tpp_pen)
 IMAGE_ID(tpp_doc)
 
 IMAGE_BEGIN_DATA
-IMAGE_DATA(120,156,237,152,77,178,155,48,12,199,125,129,206,188,93,103,186,234,117,122,43,159,168,103,200,57,114,132,46,219,101,23)
-IMAGE_DATA(122,49,65,32,91,146,45,219,129,192,195,98,52,64,204,207,127,249,75,38,184,15,247,225,118,48,16,188,234,249,219,237)
-IMAGE_DATA(54,57,216,234,2,106,200,7,22,249,96,225,183,60,239,38,119,51,55,57,222,63,206,222,251,58,30,76,188,212,190,149)
-IMAGE_DATA(5,185,156,242,216,87,232,200,59,194,167,229,37,126,61,160,131,7,19,47,250,194,66,169,253,98,255,175,44,152,198,47)
-IMAGE_DATA(196,21,202,215,103,158,44,198,27,151,113,158,59,164,237,181,174,5,173,79,94,111,33,25,192,54,85,83,187,108,50,48)
-IMAGE_DATA(29,185,182,235,139,63,45,95,248,104,161,17,62,90,28,141,60,61,111,165,175,181,223,168,207,251,191,172,207,198,15,147)
-IMAGE_DATA(129,177,255,25,31,149,215,141,191,100,35,25,80,31,201,32,59,25,77,139,241,217,14,104,230,113,123,14,215,203,206,104)
-IMAGE_DATA(228,145,163,103,141,207,181,159,198,160,196,207,251,191,220,126,54,126,35,25,108,103,151,77,6,166,132,80,234,171,220,132)
-IMAGE_DATA(44,44,70,150,16,160,46,25,136,60,100,23,163,206,47,61,66,234,40,37,131,180,253,101,125,185,255,243,237,103,227,23)
-IMAGE_DATA(253,77,40,247,63,227,217,51,103,72,6,63,31,199,176,102,203,239,26,91,14,220,62,250,166,250,211,197,79,147,110,103)
-IMAGE_DATA(92,135,208,215,44,213,71,221,84,31,77,248,102,112,50,253,56,157,47,229,169,167,229,176,110,158,100,3,253,122,250,90)
-IMAGE_DATA(249,249,244,173,121,37,170,159,189,252,216,235,56,164,126,154,87,196,111,161,78,208,77,244,75,252,217,245,249,17,191,176)
-IMAGE_DATA(93,71,95,120,217,61,177,190,217,153,46,122,223,250,123,163,126,20,71,41,255,114,221,88,127,235,252,191,181,62,206,23)
-IMAGE_DATA(228,121,61,177,110,58,191,116,238,28,250,101,143,117,133,245,85,59,239,142,162,255,162,248,54,179,119,235,127,45,219,233)
-IMAGE_DATA(203,96,173,213,36,114,41,122,176,24,89,48,77,124,241,203,32,207,206,228,197,221,192,15,253,62,253,14,94,218,124,36)
-IMAGE_DATA(215,248,74,63,134,29,52,25,188,219,186,18,81,233,141,94,216,189,25,239,141,103,141,31,250,205,250,206,157,113,33,191)
-IMAGE_DATA(194,70,50,16,173,243,173,196,238,66,29,211,239,222,120,214,248,161,223,172,239,220,72,6,195,136,117,37,131,170,233,40)
-IMAGE_DATA(76,230,240,187,55,158,53,126,232,55,235,59,119,229,100,112,92,11,131,229,65,191,63,42,79,255,30,123,208,239,53,243)
-IMAGE_DATA(96,243,173,226,239,229,175,222,254,87,241,59,219,73,222,12,154,178,49,126,224,89,108,158,133,150,122,2,155,114,169,207)
-IMAGE_DATA(245,171,49,83,22,63,56,81,62,19,67,196,206,255,109,151,184,188,123,190,38,103,121,91,140,122,236,130,118,11,47,197)
-IMAGE_DATA(15,184,179,231,199,128,213,17,92,24,71,19,223,48,126,110,174,159,113,174,172,45,214,211,192,237,107,39,77,6,53,157)
-IMAGE_DATA(11,217,163,48,161,132,103,107,244,107,180,108,177,215,78,194,250,54,239,83,71,111,95,148,250,93,242,214,113,175,143,189)
-IMAGE_DATA(103,190,190,207,104,50,128,239,223,32,56,45,255,243,11,32,56,222,195,191,31,16,92,168,10,74,124,142,117,188,179,166)
-IMAGE_DATA(235,153,93,120,145,253,251,155,113,235,166,238,150,179,227,3,241,100,87,30,114,60,169,39,102,9,79,181,50,124,204,9)
-IMAGE_DATA(250,42,39,197,76,174,239,247,251,228,105,93,209,239,6,94,243,82,252,248,220,255,199,162,161,158,240,106,255,33,27,174)
-IMAGE_DATA(145,197,107,169,93,26,47,57,107,127,65,159,186,170,175,244,179,161,253,154,137,227,160,204,223,98,61,53,220,39,173,190)
-IMAGE_DATA(127,124,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_DATA(120,156,237,152,77,210,155,48,12,134,125,129,206,124,187,206,116,213,235,244,84,229,68,61,67,206,145,35,116,217,46,187)
+IMAGE_DATA(80,99,130,64,182,36,75,182,195,223,23,196,104,32,49,143,95,249,79,6,194,71,248,8,27,24,8,94,117,255,237,118)
+IMAGE_DATA(27,29,124,117,1,53,228,35,139,124,180,248,95,153,15,163,135,137,27,29,127,63,206,195,48,212,241,224,226,165,246,45)
+IMAGE_DATA(44,200,229,148,199,190,66,71,62,16,62,47,183,248,229,128,14,30,92,188,232,51,11,86,251,197,254,95,88,112,141,95)
+IMAGE_DATA(140,43,150,47,247,60,89,140,55,45,227,60,119,200,219,235,93,11,90,159,188,222,98,50,128,117,170,166,246,182,201,192)
+IMAGE_DATA(117,148,218,174,47,254,188,124,230,147,133,70,248,100,113,52,242,244,188,150,190,214,126,167,62,239,127,91,159,141,31,38)
+IMAGE_DATA(3,103,255,51,62,41,175,27,127,201,174,100,64,253,74,6,197,201,232,90,140,207,118,64,51,143,219,115,188,158,119,70)
+IMAGE_DATA(39,143,28,61,107,124,169,253,52,6,37,126,222,255,118,251,217,248,93,201,96,61,123,219,100,224,74,8,86,95,149,38)
+IMAGE_DATA(164,177,24,89,66,128,186,100,32,242,80,92,140,58,63,247,8,169,195,74,6,121,251,109,125,185,255,203,237,103,227,151)
+IMAGE_DATA(188,38,216,253,207,120,118,207,25,146,193,247,199,113,89,179,149,119,141,53,7,110,27,125,87,253,249,226,167,73,183,51)
+IMAGE_DATA(174,67,232,107,150,235,163,110,174,143,38,124,51,56,153,126,154,206,231,242,220,243,114,88,54,79,178,129,126,62,125,173)
+IMAGE_DATA(252,124,250,222,188,146,212,207,30,126,252,117,28,82,63,207,43,226,183,208,32,232,102,250,22,127,118,125,126,164,15,108)
+IMAGE_DATA(239,163,47,60,236,158,88,223,237,76,23,189,111,253,237,168,159,196,97,229,95,174,155,234,175,157,255,215,214,199,249,130)
+IMAGE_DATA(60,175,39,213,205,231,151,206,157,67,223,246,84,87,88,95,181,243,238,40,250,47,138,111,53,219,91,255,115,217,70,95)
+IMAGE_DATA(6,107,173,38,145,75,209,131,199,200,130,105,226,205,47,131,60,59,147,7,119,7,127,233,247,233,119,240,210,230,35,185)
+IMAGE_DATA(198,87,250,49,236,160,201,96,111,235,74,68,214,19,189,176,123,51,126,112,158,53,254,210,111,214,15,225,140,11,249,21)
+IMAGE_DATA(118,37,3,209,58,159,74,252,46,212,49,254,63,56,207,26,127,233,55,235,135,112,37,131,203,136,117,37,131,170,233,40)
+IMAGE_DATA(76,230,248,255,224,60,107,252,165,223,172,31,194,59,39,131,227,90,28,172,1,244,223,71,229,233,235,241,0,250,111,205)
+IMAGE_DATA(6,240,249,90,241,247,242,239,222,254,87,241,27,219,248,100,240,115,239,40,76,107,202,198,248,129,103,182,105,22,122,234)
+IMAGE_DATA(137,108,206,229,62,213,175,198,76,89,252,224,68,249,66,12,9,59,189,219,206,113,13,225,249,152,92,228,125,49,234,177)
+IMAGE_DATA(11,218,45,188,20,63,224,206,94,30,3,86,71,116,97,28,93,124,195,248,133,169,126,198,5,91,91,172,167,129,219,214)
+IMAGE_DATA(78,242,154,144,119,102,77,231,66,241,48,38,148,112,111,141,126,141,150,47,246,218,73,88,223,230,109,234,232,237,11,171)
+IMAGE_DATA(223,37,111,29,247,250,216,123,230,235,126,70,147,1,124,253,2,209,105,249,239,31,0,209,241,55,252,253,6,209,133,170)
+IMAGE_DATA(192,226,75,108,224,157,53,94,79,236,204,139,236,159,95,140,91,54,245,48,159,3,31,136,39,187,240,80,226,73,61,41)
+IMAGE_DATA(75,120,170,85,224,83,78,208,87,57,41,102,114,125,191,223,71,207,235,74,254,119,240,154,91,241,227,125,255,30,139,134)
+IMAGE_DATA(122,198,171,253,135,108,188,70,22,175,165,118,105,188,228,172,253,134,62,117,85,95,233,103,71,251,53,19,199,65,153,191)
+IMAGE_DATA(102,61,53,220,127,156,228,126,252,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(864, 13)
 
 IMAGE_BEGIN_DATA
-IMAGE_DATA(120,156,237,155,75,114,219,48,12,64,217,125,23,185,87,47,212,165,111,208,243,100,178,241,76,14,144,117,123,134,222,129)
-IMAGE_DATA(181,36,83,2,64,124,73,75,166,58,134,7,177,29,226,1,224,15,162,229,36,189,165,183,148,115,42,146,157,42,73,190)
-IMAGE_DATA(249,202,63,126,230,237,57,37,164,22,63,49,80,169,236,29,159,216,69,199,2,229,185,245,1,231,84,148,229,65,124,142)
-IMAGE_DATA(129,239,57,30,42,101,169,15,107,44,72,156,134,177,216,226,112,115,105,204,235,154,43,30,75,63,15,85,91,83,158,117)
-IMAGE_DATA(133,120,178,166,34,235,154,99,189,188,196,122,120,151,146,98,48,130,88,29,83,217,235,245,58,107,163,159,133,189,141,123)
-IMAGE_DATA(163,159,149,47,26,244,83,241,65,63,34,239,244,99,242,69,47,151,203,172,196,143,201,11,156,25,223,224,68,222,201,85)
-IMAGE_DATA(124,144,91,249,70,14,249,104,228,250,229,85,12,106,62,119,22,3,40,45,197,0,92,174,162,126,68,222,233,103,225,185)
-IMAGE_DATA(171,15,225,181,98,160,229,239,41,6,144,119,114,21,31,228,16,223,192,173,252,171,24,60,86,158,94,12,94,39,131,219)
-IMAGE_DATA(149,113,90,216,64,95,39,3,151,156,187,24,124,191,61,6,43,6,157,194,93,216,46,74,15,75,187,164,97,123,50,153)
-IMAGE_DATA(146,189,52,233,168,173,103,81,29,47,3,44,166,232,96,221,79,32,42,131,38,226,126,102,81,43,18,150,173,54,9,140)
-IMAGE_DATA(88,59,65,213,70,246,165,162,47,199,32,213,150,201,95,181,173,216,128,45,140,213,47,79,88,76,61,139,199,53,152,247)
-IMAGE_DATA(165,179,60,108,14,219,219,28,107,175,92,254,145,189,227,184,225,249,108,129,236,131,199,169,253,42,157,113,230,149,74,174)
-IMAGE_DATA(235,252,224,84,139,245,248,151,218,44,25,145,247,142,27,55,142,249,207,239,191,77,90,252,236,209,78,115,61,27,127,96)
-IMAGE_DATA(187,56,135,142,220,123,214,208,34,206,98,16,149,153,251,186,63,2,126,16,71,31,14,63,200,174,226,244,163,74,74,36)
-IMAGE_DATA(54,226,234,43,14,91,4,42,158,97,63,63,243,172,140,159,58,111,134,163,42,249,129,10,237,42,238,91,117,236,155,223)
-IMAGE_DATA(231,247,247,89,85,174,40,136,85,56,170,40,39,200,2,30,218,81,46,75,188,16,27,114,153,227,153,113,163,124,150,120)
-IMAGE_DATA(97,254,105,222,2,107,9,223,231,184,196,184,157,239,134,233,149,200,224,26,138,66,197,193,184,14,63,21,147,63,62,86)
-IMAGE_DATA(53,252,36,137,163,42,228,152,44,206,195,107,241,105,254,204,156,84,182,240,117,53,62,184,200,177,249,39,178,25,148,34)
-IMAGE_DATA(249,8,126,29,3,137,71,185,235,235,81,91,183,173,155,115,108,57,240,214,120,95,117,243,127,134,228,185,192,103,74,149)
-IMAGE_DATA(179,253,228,252,139,44,58,141,251,170,175,202,19,95,84,236,255,196,21,85,248,202,15,228,162,60,199,14,200,115,62,140)
-IMAGE_DATA(190,139,235,64,228,163,235,16,207,117,251,62,216,83,158,240,61,89,104,64,152,239,29,232,93,198,204,217,67,37,140,244)
-IMAGE_DATA(122,229,161,76,239,203,13,158,98,75,159,105,124,120,71,148,203,157,220,41,21,226,227,56,150,78,118,92,223,35,241,75)
-IMAGE_DATA(95,161,206,188,208,111,110,236,88,222,57,254,86,252,116,191,17,89,24,122,215,86,236,127,233,113,202,107,62,100,124,244)
-IMAGE_DATA(249,203,219,105,159,25,219,106,189,194,47,221,23,155,133,165,191,151,248,218,166,254,35,0,137,247,249,19,100,224,47,205)
-IMAGE_DATA(163,186,242,81,145,120,175,47,141,247,248,208,242,247,248,216,43,126,111,255,189,50,26,223,185,254,206,43,3,22,131,189)
-IMAGE_DATA(164,183,151,189,147,158,185,147,132,35,94,117,85,119,250,88,237,165,147,68,15,239,240,209,29,191,179,255,108,62,141,44)
-IMAGE_DATA(204,167,85,198,223,101,184,24,76,71,8,94,61,71,18,93,30,227,35,8,144,9,68,188,185,152,235,246,42,190,230,227)
-IMAGE_DATA(129,60,55,39,209,248,21,171,241,194,239,217,241,15,250,112,219,156,157,127,132,255,99,5,22,131,101,179,250,148,223,216)
-IMAGE_DATA(145,205,186,123,113,128,131,29,89,220,146,189,103,115,31,196,139,197,33,16,63,196,42,62,90,242,55,229,236,60,181,31)
-IMAGE_DATA(111,227,115,242,255,126,76,104,217,32,148,143,94,129,165,226,217,114,133,104,61,1,64,222,178,49,219,60,237,189,62,158)
-IMAGE_DATA(125,5,63,130,151,236,198,42,18,39,40,6,61,217,101,242,28,137,65,55,83,36,6,55,233,86,92,111,174,98,12,250)
-IMAGE_DATA(205,1,176,163,175,165,83,217,118,83,77,185,49,199,180,33,155,233,39,243,247,217,90,219,214,167,210,206,221,216,147,219)
-IMAGE_DATA(86,27,248,95,83,148,87,218,112,14,242,38,181,10,251,169,229,31,221,17,64,177,0,0,0,0,0,0,0,0,0,0)
+IMAGE_DATA(120,156,237,155,75,114,219,48,12,64,217,125,23,185,87,47,212,93,125,131,158,39,147,77,102,114,128,172,155,51,244,14)
+IMAGE_DATA(172,37,153,18,0,226,75,90,50,213,49,60,136,237,16,15,0,127,16,45,39,233,37,189,164,156,83,145,236,84,73,242)
+IMAGE_DATA(213,87,254,241,51,111,207,41,33,181,248,137,129,74,101,239,248,196,46,58,22,40,207,173,15,56,167,162,44,15,226,115)
+IMAGE_DATA(12,124,207,241,80,41,75,125,88,99,65,226,52,140,197,22,135,155,75,99,94,215,92,241,88,250,121,168,218,154,242,172)
+IMAGE_DATA(43,196,147,53,21,89,215,28,235,229,37,214,195,187,148,20,131,17,196,234,152,202,190,191,191,207,218,232,103,97,175,227)
+IMAGE_DATA(222,232,103,229,139,6,253,84,124,208,143,200,59,253,152,124,209,203,229,50,43,241,99,242,2,103,198,55,56,145,119,114)
+IMAGE_DATA(21,31,228,86,190,145,67,62,26,185,126,121,22,131,154,207,157,197,0,74,75,49,0,151,171,168,31,145,119,250,89,120)
+IMAGE_DATA(238,234,67,120,173,24,104,249,123,138,1,228,157,92,197,7,57,196,55,112,43,255,44,6,247,149,135,23,131,231,201,224)
+IMAGE_DATA(122,101,156,22,54,208,231,201,192,37,231,46,6,223,175,143,193,138,65,167,112,23,182,139,210,195,210,46,105,216,158,76)
+IMAGE_DATA(166,100,47,77,58,106,235,89,84,199,203,0,139,41,58,88,183,19,136,202,160,137,184,157,89,212,138,132,101,171,77,2)
+IMAGE_DATA(35,214,78,80,181,145,125,169,232,203,49,72,181,101,242,87,109,43,54,96,11,99,245,203,3,22,83,207,226,113,13,230)
+IMAGE_DATA(109,233,44,15,155,195,246,54,199,218,43,151,127,100,239,56,110,120,62,91,32,251,224,113,106,191,74,55,159,121,127,153)
+IMAGE_DATA(129,91,74,175,197,170,149,194,17,67,157,16,71,126,154,221,35,121,239,184,113,227,152,191,254,252,109,210,226,103,143,118)
+IMAGE_DATA(154,235,217,248,3,219,197,57,116,228,222,179,134,22,49,62,0,183,86,161,153,251,188,61,2,126,16,71,31,14,63,200)
+IMAGE_DATA(174,226,244,163,74,74,36,54,226,234,43,14,91,4,42,158,97,63,62,242,172,140,159,58,111,134,163,42,249,129,10,237)
+IMAGE_DATA(42,238,91,117,236,155,223,231,215,215,89,85,174,40,136,85,56,170,40,39,200,2,30,218,81,46,75,188,16,27,114,153)
+IMAGE_DATA(227,153,113,163,124,150,120,97,254,105,222,2,107,9,223,231,184,196,184,157,239,134,233,149,200,224,26,138,66,197,193,184)
+IMAGE_DATA(14,63,21,147,223,222,86,53,252,36,137,163,42,228,152,44,206,195,107,241,105,254,204,156,84,182,240,117,53,62,184,200)
+IMAGE_DATA(177,249,39,178,25,148,34,121,15,126,29,3,137,71,185,235,235,81,91,183,173,155,115,108,57,240,214,120,95,117,243,127)
+IMAGE_DATA(134,228,185,192,103,74,149,179,253,228,252,155,44,58,141,251,172,175,202,19,95,84,236,255,196,21,85,248,202,15,228,162)
+IMAGE_DATA(60,199,14,200,115,62,140,190,139,235,64,228,163,235,16,207,117,251,62,216,83,30,240,61,89,104,64,152,239,29,232,93)
+IMAGE_DATA(198,204,217,67,37,140,244,122,229,161,76,239,203,13,158,98,75,159,105,124,120,71,148,203,157,220,41,21,226,227,56,150)
+IMAGE_DATA(78,118,92,223,35,241,75,95,161,206,188,208,111,110,236,88,222,57,254,86,252,116,187,17,89,24,122,215,86,236,127,233)
+IMAGE_DATA(113,202,107,62,100,124,244,249,203,219,105,159,25,219,106,189,194,47,221,23,155,133,165,191,151,248,218,166,254,35,0,137)
+IMAGE_DATA(247,249,19,100,224,47,205,163,186,242,81,145,120,175,47,141,247,248,208,242,247,248,216,43,126,111,255,189,50,26,223,185)
+IMAGE_DATA(254,206,43,3,22,131,189,164,183,151,189,147,158,185,147,132,35,94,117,85,119,250,88,237,165,147,68,15,239,240,209,29)
+IMAGE_DATA(191,179,255,108,62,141,44,204,167,85,198,223,101,184,24,76,71,8,94,61,71,18,93,238,227,35,8,144,9,68,188,185)
+IMAGE_DATA(152,235,246,42,190,230,227,142,60,55,39,209,248,21,171,241,194,239,217,241,15,250,112,219,156,157,191,135,255,99,5,22)
+IMAGE_DATA(131,101,179,250,148,223,216,145,205,186,123,113,128,131,29,89,220,146,189,103,115,31,196,139,197,33,16,63,196,42,62,90)
+IMAGE_DATA(242,55,229,236,60,181,31,111,227,115,242,255,126,76,104,217,32,148,143,94,129,165,226,217,114,133,104,61,1,64,222,178)
+IMAGE_DATA(49,219,60,237,189,62,30,125,5,63,130,151,236,198,42,18,39,40,6,61,217,101,242,28,137,65,55,83,36,6,55,233)
+IMAGE_DATA(86,92,111,174,98,12,250,205,1,176,163,175,165,83,217,118,83,77,185,49,199,180,33,155,233,39,243,247,217,90,219,214)
+IMAGE_DATA(167,210,206,221,216,147,219,86,27,248,95,83,148,87,218,112,14,242,38,181,10,251,169,229,31,151,71,64,49,0,0,0)
 IMAGE_END_DATA(1056, 18)
 
 IMAGE_BEGIN_DATA
diff --git a/uppsrc/ide/ide.key b/uppsrc/ide/ide.key
index 4e334721b..48dcfd86f 100644
--- a/uppsrc/ide/ide.key
+++ b/uppsrc/ide/ide.key
@@ -85,7 +85,6 @@ KEY(VIRTUALS, "Virtual methods..", K_ALT_V)
 KEY(THISBACKS, "THISBACKs..", K_ALT_T)
 KEY(SWAPS, "Go to definition/declaration", K_ALT_I)
 KEY(JUMPS, "Context go to", K_ALT_J)
-//KEY(INSERTCOLOR, "Insert choosen color value..");
 KEY(CLEARMARKERSFILE, "Remove change markers in file", K_ALT_R)
 KEY(CLEARMARKERSALL, "Remove all change markers", K_SHIFT|K_ALT_R)
 KEY(TOGGLEINDEX, "File index", K_CTRL_F12)
diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay
index 96a63b917..48953215a 100644
--- a/uppsrc/ide/ide.lay
+++ b/uppsrc/ide/ide.lay
@@ -551,3 +551,12 @@ LAYOUT(PrintLayout, 148, 128)
 	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(76, 64).TopPosZ(96, 24))
 END_LAYOUT
 
+LAYOUT(InsertColorLayout, 432, 520)
+	ITEM(RGBACtrl, rgbactrl, LeftPosZ(4, 276).TopPosZ(4, 512))
+	ITEM(Button, color, SetLabel(t_("Cancel")).LeftPosZ(284, 144).TopPosZ(4, 24))
+	ITEM(Button, rgba, SetLabel(t_("Cancel")).LeftPosZ(284, 144).TopPosZ(32, 24))
+	ITEM(Button, ahex, SetLabel(t_("Cancel")).LeftPosZ(284, 144).TopPosZ(60, 24))
+	ITEM(Button, hex, SetLabel(t_("Cancel")).LeftPosZ(284, 144).TopPosZ(88, 24))
+	ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(284, 144).TopPosZ(492, 24))
+END_LAYOUT
+
diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp
index e71098cf7..eb9457435 100644
--- a/uppsrc/ide/ide.upp
+++ b/uppsrc/ide/ide.upp
@@ -47,6 +47,7 @@ file
 	Setup.cpp,
 	Custom.cpp,
 	Print.cpp,
+	Insert.cpp,
 	idetool.cpp,
 	Install.cpp,
 	idebar.cpp,
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 1182f67c6..a945c18af 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -476,7 +476,7 @@ void Ide::BrowseMenu(Bar& menu) {
 	menu.Add(!designer, AK_VIRTUALS, callback(&editor, &AssistEditor::Virtuals));
 	menu.Add(!designer, AK_THISBACKS, callback(&editor, &AssistEditor::Thisbacks));
 	menu.Add(!designer, AK_COMPLETE, callback(&editor, &AssistEditor::Complete));
-//	menu.Add(AK_INSERTCOLOR, THISBACK(InsertColor));
+	menu.Add(!designer, "Insert", THISBACK(InsertMenu));
 	menu.Separator();
 	menu.Add("Rescan code", THISBACK(RescanCode));
 	menu.MenuSeparator();
diff --git a/uppsrc/ide/idetool.cpp b/uppsrc/ide/idetool.cpp
index 85e30e4cb..566aa7815 100644
--- a/uppsrc/ide/idetool.cpp
+++ b/uppsrc/ide/idetool.cpp
@@ -117,14 +117,6 @@ void Ide::IdeOpenTopicFile(const String& file)
 	}
 }
 
-void Ide::InsertColor()
-{
-	TopWindow test;
-	ColorPopUp h;
-	test.Add(h.SizePos());
-	test.Run();
-}
-
 struct FileStat {
 	int  count;
 	int  len;
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index d0646d8e0..26e1be515 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -475,6 +475,7 @@ Ide::Ide()
 	editor2.topsbbutton1.ScrollStyle().NoWantFocus().Show();
 	editor2.WhenLeftDown = THISBACK(SwapEditors);
 	editor.WhenAction = THISBACK(AddHistory);
+	editor.WhenBar = THISBACK(EditorMenu);
 
 	macro_api = MacroEditor();