[mono/monodevelop] 231ba0cc: Fixed 'Bug 15248 - CRNL vs NL policy setting warning is too

Mike Krüger ([email protected]) <[email protected]>
Newsgroups gmane.comp.gnome.mono.patches
Message-ID <00000141a6862e19-252f9e6c-fcf6-4bbd-811a-c0b6a188951f-000000@email.amazonses.com> 
   Branch: refs/heads/master
     Home: https://github.com/mono/monodevelop
  Compare: https://github.com/mono/monodevelop/compare/bd51d949e3de...231ba0cca533

   Commit: 231ba0cca5331b254ad8eafc26614b7c5a21d87a
   Author: Mike Krüger <[email protected]> (mkrueger)
     Date: 2013-10-11 07:57:03 GMT
      URL: https://github.com/mono/monodevelop/commit/231ba0cca5331b254ad8eafc26614b7c5a21d87a

Fixed 'Bug 15248 - CRNL vs NL policy setting warning is too
obtrusive'.

Changed paths:
  M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
  M main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
  M main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
  M main/src/core/Mono.Texteditor/Styles/DefaultStyle.json
  M main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json
  M main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json
  M main/src/core/Mono.Texteditor/Styles/OblivionStyle.json
  M main/src/core/Mono.Texteditor/Styles/SolarizedDarkStyle.json
  M main/src/core/Mono.Texteditor/Styles/SolarizedLightStyle.json
  M main/src/core/Mono.Texteditor/Styles/TangoStyle.json

Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/OverlayMessageWindow.cs
===================================================================
@@ -106,13 +106,13 @@ protected override bool OnExposeEvent (Gdk.EventExpose evnt)
 			using (var cr = CairoHelper.Create (evnt.Window)) {
 				cr.LineWidth = 1;
 				cr.Rectangle (0, 0, Allocation.Width, Allocation.Height);
-				cr.SetSourceColor (textEditor.ColorStyle.PlainText.Background);
+				cr.SetSourceColor (textEditor.ColorStyle.NotificationText.Background);
 				cr.Fill ();
 				cr.RoundedRectangle (0, 0, Allocation.Width, Allocation.Height, 3);
-				cr.SetSourceColor (textEditor.ColorStyle.TooltipText.Background);
+				cr.SetSourceColor (textEditor.ColorStyle.NotificationText.Background);
 				cr.FillPreserve ();
 
-				cr.SetSourceColor (textEditor.ColorStyle.TooltipBorder.Color);
+				cr.SetSourceColor (textEditor.ColorStyle.NotificationBorder.Color);
 				cr.Stroke();
 			}
 

Modified: main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
===================================================================
@@ -953,6 +953,9 @@ void ShowIncorretEolMarkers (string fileName, bool multiple)
 			var image = new HoverCloseButton ();
 			hbox.PackStart (image, false, false, 0);
 			var label = new Label (string.Format ("This file has line endings ({0}) which differ from the policy settings ({1}).", GetEolString (DetectedEolMarker), GetEolString (textEditor.Options.DefaultEolMarker)));
+			var color = (Mono.TextEditor.HslColor)textEditor.ColorStyle.NotificationText.Foreground;
+			label.ModifyFg (StateType.Normal, color);
+
 			int w, h;
 			label.Layout.GetPixelSize (out w, out h);
 			label.Ellipsize = Pango.EllipsizeMode.End;

Modified: main/src/core/Mono.Texteditor/Mono.TextEditor.Highlighting/ColorScheme.cs
===================================================================
@@ -83,6 +83,9 @@ public class ColorScheme
 		[ColorDescription("Tooltip Pager Text")]
 		public AmbientColor TooltipPagerText { get; private set; }
 
+		[ColorDescription("Notification Border")]
+		public AmbientColor NotificationBorder { get; private set; }
+
 		[ColorDescription("Bookmarks")]
 		public AmbientColor Bookmarks { get; private set; }
 
@@ -281,6 +284,9 @@ public class ColorScheme
 		[ColorDescription("Tooltip Text")] // not defined in vs.net
 		public ChunkStyle TooltipText { get; private set; }
 
+		[ColorDescription("Notification Text")] // not defined in vs.net
+		public ChunkStyle NotificationText { get; private set; }
+
 		[ColorDescription("Completion Text")] //not defined in vs.net
 		public ChunkStyle CompletionText { get; private set; }
 

Modified: main/src/core/Mono.Texteditor/Styles/DefaultStyle.json
===================================================================
@@ -57,6 +57,8 @@
 		{ "name": "Tooltip Pager Triangle", "color":"#737373" },
 		{ "name": "Tooltip Pager Text", "color":"#828282" },
 
+		{ "name": "Notification Border", "color":"#D2B457" },
+
 		{ "name": "Completion Matching Substring", "color":"#BA3373" },
 		{ "name": "Completion Border", "color":"#C9C9C9" },
 		{ "name": "Completion Border(Inactive)", "color":"#666666" },
@@ -153,6 +155,7 @@
 		{ "name": "Razor Code", "fore":"text-black", "back":"#fdfaed" },
 
 		{ "name": "Tooltip Text", "fore":"text-black", "back":"#feffe9" },
+		{ "name": "Notification Text", "fore":"text-black", "back":"#feffe9" },
 
 		{ "name": "Completion Text", "fore":"#434343", "back":"#F0F6F8" },
 		{ "name": "Completion Selected Text", "fore":"#f8fcfc", "back":"#dff4f0" },

Modified: main/src/core/Mono.Texteditor/Styles/MonokaiStyle.json
===================================================================
@@ -45,6 +45,7 @@
 		{ "name": "Tooltip Pager Triangle", "color":"#C8C8C2" },
 		{ "name": "Tooltip Pager Text", "color":"#C8C8C2" },
 
+		{ "name": "Notification Border", "color":"#989892" },
 
 		{ "name": "Completion Matching Substring", "color":"#BA3373" },
 		{ "name": "Completion Border", "color":"#C9C9C9" },
@@ -141,7 +142,8 @@
 		{ "name": "Html Tag Delimiter", "fore":"monokai-white" },
 		{ "name": "Razor Code", "fore":"monokai-white", "back":"#373832" },
 
-		{ "name": "Tooltip Text", "fore":"black", "back":"#272725" },
+		{ "name": "Tooltip Text", "fore":"monokai-white", "back":"#272725" },
+		{ "name": "Notification Text", "fore":"monokai-white", "back":"#272725" },
 
 		{ "name": "Completion Text", "fore":"#434343", "back":"#F0F6F8" },
 		{ "name": "Completion Selected Text", "fore":"#f8fcfc", "back":"#dff4f0" },

Modified: main/src/core/Mono.Texteditor/Styles/NightshadeStyle.json
===================================================================
@@ -82,6 +82,8 @@
 		{ "name": "Tooltip Pager Triangle", "color":"NormalVim" },
 		{ "name": "Tooltip Pager Text", "color":"NormalVim" },
 
+		{ "name": "Notification Border", "color":"#989892" },
+
 		{ "name": "Completion Matching Substring", "color":"#BA3373" },
 		{ "name": "Completion Border", "color":"#C9C9C9" },
 		{ "name": "Completion Border(Inactive)", "color":"#666666" },
@@ -179,6 +181,7 @@
 		{ "name": "Razor Code", "fore":"NormalVim", "back":"aluminium6" },
 
 		{ "name": "Tooltip Text", "fore":"NormalVim", "back":"#0a0a0a" },
+		{ "name": "Notification Text", "fore":"NormalVim", "back":"#0a0a0a" },
 
 		{ "name": "Completion Text", "fore":"#434343", "back":"#F0F6F8" },
 		{ "name": "Completion Selected Text", "fore":"#f8fcfc", "back":"#dff4f0" },

Modified: main/src/core/Mono.Texteditor/Styles/OblivionStyle.json
===================================================================
@@ -57,6 +57,8 @@
 		{ "name": "Tooltip Pager Triangle", "color":"aluminium2" },
 		{ "name": "Tooltip Pager Text", "color":"aluminium2" },
 
+		{ "name": "Notification Border", "color":"aluminium1" },
+
 		{ "name": "Completion Matching Substring", "color":"#BA3373" },
 		{ "name": "Completion Border", "color":"#C9C9C9" },
 		{ "name": "Completion Border(Inactive)", "color":"#bebebe" },
@@ -153,6 +155,7 @@
 		{ "name": "Razor Code", "fore":"aluminium2", "back":"aluminium7" },
 
 		{ "name": "Tooltip Text", "fore":"aluminium2", "back":"aluminium5" },
+		{ "name": "Notification Text", "fore":"aluminium2", "back":"aluminium5" },
 
 		{ "name": "Completion Text", "fore":"#434343", "back":"#F0F6F8" },
 		{ "name": "Completion Selected Text", "fore":"#f8fcfc", "back":"#dff4f0" },

Modified: main/src/core/Mono.Texteditor/Styles/SolarizedDarkStyle.json
===================================================================
@@ -46,6 +46,8 @@
 		{ "name": "Tooltip Pager Triangle", "color":"base00" },
 		{ "name": "Tooltip Pager Text", "color":"base00" },
 
+		{ "name": "Notification Border", "color":"base1" },
+
 		{ "name": "Completion Matching Substring", "color":"#BA3373" },
 		{ "name": "Completion Border", "color":"#C9C9C9" },
 		{ "name": "Completion Border(Inactive)", "color":"#bebebe" },
@@ -142,6 +144,7 @@
 		{ "name": "Razor Code", "fore":"black", "back":"base02" },
 
 		{ "name": "Tooltip Text", "fore":"black", "back":"#feffe9" },
+		{ "name": "Notification Text", "fore":"black", "back":"#feffe9" },
 
 		{ "name": "Completion Text", "fore":"#434343", "back":"#F0F6F8" },
 		{ "name": "Completion Selected Text", "fore":"#f8fcfc", "back":"#dff4f0" },

Modified: main/src/core/Mono.Texteditor/Styles/SolarizedLightStyle.json
===================================================================
@@ -46,6 +46,8 @@
 		{ "name": "Tooltip Pager Triangle", "color":"base00" },
 		{ "name": "Tooltip Pager Text", "color":"base00" },
 
+		{ "name": "Notification Border", "color":"base1" },
+
 		{ "name": "Completion Matching Substring", "color":"#BA3373" },
 		{ "name": "Completion Border", "color":"#C9C9C9" },
 		{ "name": "Completion Border(Inactive)", "color":"#bebebe" },
@@ -142,6 +144,7 @@
 		{ "name": "Razor Code", "fore":"black", "back":"base2" },
 
 		{ "name": "Tooltip Text", "fore":"black", "back":"#feffe9" },
+		{ "name": "Notification Text", "fore":"black", "back":"#feffe9" },
 
 		{ "name": "Completion Text", "fore":"#434343", "back":"#F0F6F8" },
 		{ "name": "Completion Selected Text", "fore":"#f8fcfc", "back":"#dff4f0" },

Modified: main/src/core/Mono.Texteditor/Styles/TangoStyle.json
===================================================================
@@ -57,6 +57,7 @@
 		{ "name": "Tooltip Pager Triangle", "color":"#737373" },
 		{ "name": "Tooltip Pager Text", "color":"#828282" },
 
+		{ "name": "Notification Border", "color":"#b2b2b2" },
 
 		{ "name": "Completion Matching Substring", "color":"#BA3373" },
 		{ "name": "Completion Border", "color":"#C9C9C9" },
@@ -140,6 +141,7 @@
 		{ "name": "Razor Code", "fore":"black", "back":"#fdfaed" },
 
 		{ "name": "Tooltip Text", "fore":"black", "back":"#feffe9" },
+		{ "name": "Notification Text", "fore":"black", "back":"#feffe9" },
 
 		{ "name": "Completion Text", "fore":"#434343", "back":"#F0F6F8" },
 		{ "name": "Completion Selected Text", "fore":"#f8fcfc", "back":"#dff4f0" },
_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.