From 736293485ee47bd4a6c7f6ae7984bcce70d4ce09 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <igor@iMac-Igor.local>
Date: Mon, 23 Jan 2017 16:57:27 +0300
Subject: [PATCH] afaef

---
 .DS_Store                                     | Bin 18436 -> 18436 bytes
 Applications.txt                              |   4 +-
 Applications/.DS_Store                        | Bin 79876 -> 79876 bytes
 .../MineCodeIDE/Localization/English.lang     |   1 +
 .../MineCodeIDE/Localization/Russian.lang     |   1 +
 Applications/MineCodeIDE/MineCodeIDE.lua      | 109 ++++++++++--------
 lib/palette.lua                               |   2 +-
 7 files changed, 63 insertions(+), 54 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index d53457b89fa121da2d7b858c3c5cfbb08fed9895..7ea7f9d9a96924cba5eaffa33875e0c5eb13009f 100644
GIT binary patch
delta 294
zcmZpfz}PZ@al=kU5fgJu9R*`E(^?&cYIAb~9R(9(v&j!EO((mkNN$!^@@1N=C?L%&
z%;P=Tk;QrPNfnF9TvEc5SF`YJR#25^G-QARWd{uii&NRb04m18Aj@FH;KJa;kibyH
zP|eWGFoR+B<Vv+h#ut<KY05Kxob0F~KiNi|WAXzb873YtG#hv~|5axt$A<GFg_GB6
z@-d#D>@TVe_Qx;HH7uJa$W=3L<~BIUiPg`WA6QB<ZRXdR&ID9g&bXP~;V(M?+A2nb

delta 263
zcmZpfz}PZ@al=l<$@9cKC%dRfZkAT^Wn$bi`Js>)yOf8gm#{a_WJea~$+OfgChrn3
z*leiE$0*{^9l-zs$_^S}nn9U?Ve(25-N^<*ER(C%%9KAa{)9*{F+yktUnmWw7=KN6
zRFUT_NXp4iVqjpJ3A9g=#Z$}+*)sXbGlaiRex@Oa%f9K8XKL~>UuS$Ud9{!{<3pf{
vGMk@hu3_OQNoHWUtTel0@<ADc&G+=)ae;idS=8zY<L1ZOYnjmG?bJ8{_SHy>

diff --git a/Applications.txt b/Applications.txt
index 7b432a31..d2adbcb2 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -366,7 +366,7 @@
     name="lib/palette.lua",
     url="IgorTimofeev/OpenComputers/master/lib/palette.lua",
     type="Library",
-    version=1.09,
+    version=1.10,
   },
   {
     name="lib/doubleBuffering.lua",
@@ -517,7 +517,7 @@
     icon="IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic",
     createShortcut="dock",
     forceDownload=true,
-    version=1.54,
+    version=1.55,
     resources={
       {
         name="Localization/Russian.lang",
diff --git a/Applications/.DS_Store b/Applications/.DS_Store
index e9961ecee113d2b9cf39ff4cd742335aa09c5cbc..538c77cb04174318ac84ffb2e2b782ed4da4fc71 100644
GIT binary patch
delta 30
mcmZqqz|!)8Wy8wd?B<p_3dUxpllkvDP8QiCzL{gspK1WXEDVkS

delta 31
ncmZqqz|!)8Wy8wd?537F3Pz@8(;d|q9Vd(I5#P+Q=T9{N!ww7!

diff --git a/Applications/MineCodeIDE/Localization/English.lang b/Applications/MineCodeIDE/Localization/English.lang
index 55b59e39..601229bd 100755
--- a/Applications/MineCodeIDE/Localization/English.lang
+++ b/Applications/MineCodeIDE/Localization/English.lang
@@ -1,4 +1,5 @@
 {	
+	selectAndPasteColor = "Select and paste color",
 	enableAutoBrackets = "Enable autobrackets",
 	disableAutoBrackets = "Disable autobrackets",
 	url = "http://example.com/something.lua",
diff --git a/Applications/MineCodeIDE/Localization/Russian.lang b/Applications/MineCodeIDE/Localization/Russian.lang
index b27c99a4..aa39033f 100755
--- a/Applications/MineCodeIDE/Localization/Russian.lang
+++ b/Applications/MineCodeIDE/Localization/Russian.lang
@@ -1,4 +1,5 @@
 {
+	selectAndPasteColor = "Выбрать и вставить цвет",
 	enableAutoBrackets = "Включить авто-скобки",
 	disableAutoBrackets = "Отключить авто-скобки",
 	url = "http://example.com/something.lua",
diff --git a/Applications/MineCodeIDE/MineCodeIDE.lua b/Applications/MineCodeIDE/MineCodeIDE.lua
index 1ed5724e..f06ebd56 100755
--- a/Applications/MineCodeIDE/MineCodeIDE.lua
+++ b/Applications/MineCodeIDE/MineCodeIDE.lua
@@ -755,9 +755,20 @@ local function paste(pasteLines)
 	end
 end
 
+local function selectAndPasteColor()
+	local startColor = 0xFF0000
+	if mainWindow.codeView.selections[1] and mainWindow.codeView.selections[1].from.line == mainWindow.codeView.selections[1].to.line then
+		startColor = tonumber(unicode.sub(mainWindow.codeView.lines[mainWindow.codeView.selections[1].from.line], mainWindow.codeView.selections[1].from.symbol, mainWindow.codeView.selections[1].to.symbol)) or startColor
+	end
+
+	local selectedColor = require("palette").show("auto", "auto", startColor)
+	if selectedColor then
+		paste({string.format("0x%06X", selectedColor)})
+	end
+end
+
 local function pasteRegularChar(unicodeByte, char)
 	if not keyboard.isControl(unicodeByte) then
-		deleteSelectedData()
 		paste({char})
 	end
 end
@@ -1046,6 +1057,42 @@ local function createWindow()
 	mainWindow.codeView.scrollBars.horizontal.onTouch = function()
 		mainWindow.codeView.fromSymbol = mainWindow.codeView.scrollBars.horizontal.value
 	end
+
+	local editOrRightClickMenu = GUI.contextMenu(1, 1)
+	editOrRightClickMenu:addItem(localization.cut, not mainWindow.codeView.selections[1], "^X").onTouch = function()
+		cut()
+	end
+	editOrRightClickMenu:addItem(localization.copy, not mainWindow.codeView.selections[1], "^C").onTouch = function()
+		copy()
+	end
+	editOrRightClickMenu:addItem(localization.paste, not clipboard, "^V").onTouch = function()
+		paste(clipboard)
+	end
+	editOrRightClickMenu:addSeparator()
+	editOrRightClickMenu:addItem(localization.comment, false, "^/").onTouch = function()
+		toggleComment()
+	end
+	editOrRightClickMenu:addItem(localization.indent, false, "Tab").onTouch = function()
+		indentOrUnindent(true)
+	end
+	editOrRightClickMenu:addItem(localization.unindent, false, "⇧Tab").onTouch = function()
+		indentOrUnindent(false)
+	end
+	editOrRightClickMenu:addSeparator()
+	editOrRightClickMenu:addItem(localization.deleteLine, false, "^Del").onTouch = function()
+		deleteLine(cursor.position.line)
+	end
+	editOrRightClickMenu:addItem(localization.selectAndPasteColor, false, "^⇧C").onTouch = function()
+		selectAndPasteColor()
+	end
+	editOrRightClickMenu:addSeparator()
+	editOrRightClickMenu:addItem(localization.selectWord).onTouch = function()
+		selectWord()
+	end
+	editOrRightClickMenu:addItem(localization.selectAll, false, "^A").onTouch = function()
+		selectAll()
+	end
+
 	mainWindow.topMenu = mainWindow:addMenu(1, 1, 1, colors.topMenu.backgroundColor, colors.topMenu.textColor, colors.topMenu.backgroundPressedColor, colors.topMenu.textPressedColor)
 	
 	local item1 = mainWindow.topMenu:addItem("MineCode", 0x0)
@@ -1088,37 +1135,8 @@ local function createWindow()
 
 	local item3 = mainWindow.topMenu:addItem(localization.edit)
 	item3.onTouch = function()
-		local menu = GUI.contextMenu(item3.x, item3.y + 1)
-		menu:addItem(localization.cut, not mainWindow.codeView.selections[1], "^X").onTouch = function()
-			cut()
-		end
-		menu:addItem(localization.copy, not mainWindow.codeView.selections[1], "^C").onTouch = function()
-			copy()
-		end
-		menu:addItem(localization.paste, not clipboard, "^V").onTouch = function()
-			paste(clipboard)
-		end
-		menu:addSeparator()
-		menu:addItem(localization.comment, false, "^/").onTouch = function()
-			toggleComment()
-		end
-		menu:addItem(localization.indent, false, "Tab").onTouch = function()
-			indentOrUnindent(true)
-		end
-		menu:addItem(localization.unindent, false, "⇧Tab").onTouch = function()
-			indentOrUnindent(false)
-		end
-		menu:addItem(localization.deleteLine, false, "^Del").onTouch = function()
-			deleteLine(cursor.position.line)
-		end
-		menu:addSeparator()
-		menu:addItem(localization.selectWord).onTouch = function()
-			selectWord()
-		end
-		menu:addItem(localization.selectAll, false, "^A").onTouch = function()
-			selectAll()
-		end
-		menu:show()
+		editOrRightClickMenu.x, editOrRightClickMenu.y = item3.x, item3.y + 1
+		editOrRightClickMenu:show()
 	end
 
 	local item4 = mainWindow.topMenu:addItem(localization.view)
@@ -1306,24 +1324,8 @@ local function createWindow()
 			cursor.blinkState = true
 			
 			if eventData[5] == 1 then
-				local menu = GUI.contextMenu(eventData[3], eventData[4])
-				menu:addItem(localization.cut, not mainWindow.codeView.selections[1], "^X").onTouch = function()
-					cut()
-				end
-				menu:addItem(localization.copy, not mainWindow.codeView.selections[1], "^C").onTouch = function()
-					copy()
-				end
-				menu:addItem(localization.paste, not clipboard, "^V").onTouch = function()
-					paste(clipboard)
-				end
-				menu:addSeparator()
-				menu:addItem(localization.selectWord).onTouch = function()
-					selectWord()
-				end
-				menu:addItem(localization.selectAll, false, "^A").onTouch = function()
-					selectAll()
-				end
-				menu:show()
+				editOrRightClickMenu.x, editOrRightClickMenu.y = eventData[3], eventData[4]
+				editOrRightClickMenu:show()
 			else
 				setCursorPositionAndClearSelection(convertScreenCoordinatesToCursorPosition(eventData[3], eventData[4]))
 
@@ -1365,7 +1367,12 @@ local function createWindow()
 					selectAll()
 				-- C
 				elseif eventData[4] == 46 then
-					copy()
+					-- Shift
+					if keyboard.isKeyDown(42) then
+						selectAndPasteColor()
+					else
+						copy()
+					end
 				-- V
 				elseif eventData[4] == 47 then
 					paste(clipboard)
diff --git a/lib/palette.lua b/lib/palette.lua
index 80d8ce17..d4d5bdda 100755
--- a/lib/palette.lua
+++ b/lib/palette.lua
@@ -273,7 +273,7 @@ function palette.show(x, y, startColor)
 	createCrestsCoordinates()
 	refreshRainbows()
 	
-	window.drawShadow = true
+	window.drawShadow = false
 	drawAll()
 	window.drawShadow = false