python colors tune

sepich · Aug 24, 2015 · c1ee773 · c1ee773
1 parent eb91089
commit c1ee773
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 23 deletions.
diff --git a/SynNotes/Form.Designer.cs b/SynNotes/Form.Designer.cs
diff --git a/SynNotes/Form.cs b/SynNotes/Form.cs
@@ -122,6 +122,7 @@ private void Form1_Shown(object sender, EventArgs e) {
         hook.SetHotkey(2, s);
         ToolTip tt = new ToolTip();
         tt.SetToolTip(tbFind, "Enter/F3: FindNext, Shift-F3: FindPrevious");
+        panelFind.Height = tbFind.Height + 3;
       }, ui);
     }
 
@@ -320,9 +321,13 @@ private void Form1_KeyDown(object sender, KeyEventArgs e) {
           treeSelLine = tree.SelectedIndex;
           this.WindowState = FormWindowState.Minimized;
         }
+        e.SuppressKeyPress = true;
       }
       // Ctrl-F
       else if (e.Modifiers == Keys.Control && e.KeyCode == Keys.F) {
+        panelFind.Left = (scEdit.LinesOnScreen >= scEdit.Lines.Count) ?
+          scEdit.Width - 200 :
+          scEdit.Width - 199 - SystemInformation.VerticalScrollBarWidth;
         panelFind.Visible = true;
         tbFind.Focus();
         tbFind.SelectAll();
@@ -1446,7 +1451,7 @@ private void scEdit_UpdateUI(object sender, UpdateUIEventArgs e) {
       if ((e.Change & UpdateChange.Selection) > 0) {
         string ss = scEdit.SelectedText;
         if (ss.Length > 3 && ss.IndexOfAny(new char[] { ' ', '(', ')' }) == -1) HighlightText(ss);
-        else HighlightText("");
+        else if(!tbFind.Visible) HighlightText("");
       }
       //caret moved - brace matching
       var caretPos = scEdit.CurrentPosition;
@@ -1774,7 +1779,7 @@ private void FindNext() {
         scEdit.Lines[scEdit.CurrentLine].EnsureVisible(); //unfold
         scEdit.FirstVisibleLine = scEdit.CurrentLine - 3;
         HighlightText(tbFind.Text);
-      }
+      }      
     }
 
     private void FindPrev() {
@@ -1802,7 +1807,7 @@ internal void HighlightText(string text, bool scrollToFirst=false) {
         scEdit.TargetStart = 0;
         scEdit.TargetEnd = scEdit.TextLength;
         while (scEdit.SearchInTarget(item) != -1) {
-          scEdit.IndicatorFillRange(scEdit.TargetStart, scEdit.TargetEnd - scEdit.TargetStart);
+          if (scEdit.TargetStart != scEdit.SelectionStart) scEdit.IndicatorFillRange(scEdit.TargetStart, scEdit.TargetEnd - scEdit.TargetStart);
           scEdit.TargetStart = scEdit.TargetEnd;
           scEdit.TargetEnd = scEdit.TextLength;
           if (scrollToFirst && scEdit.LineFromPosition(scEdit.TargetStart) < top) top = scEdit.LineFromPosition(scEdit.TargetStart);

diff --git a/SynNotes/Form.resx b/SynNotes/Form.resx
@@ -149,7 +149,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
-        CwAAAk1TRnQBSQFMAgEBCgEAAaABAQGgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBCgEAAbABAQGwAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

diff --git a/SynNotes/Properties/AssemblyInfo.cs b/SynNotes/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("15.04.30.0")]
+[assembly: AssemblyFileVersion("15.08.24.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/SynNotes/themes/Visual Studio.xml b/SynNotes/themes/Visual Studio.xml
@@ -20,14 +20,14 @@ Theme name : Visual Studio
         <LexerType name="python" desc="Python" ext="">
             <WordsStyle name="DEFAULT" styleID="0" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="COMMENTLINE" styleID="1" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-            <WordsStyle name="NUMBER" styleID="2" fgColor="0060BF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="">alignas alignof noexcept nullptr static_assert thread_local final override</WordsStyle>
-            <WordsStyle name="STRING" styleID="3" fgColor="007BEF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-            <WordsStyle name="CHARACTER" styleID="4" fgColor="007BEF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="NUMBER" styleID="2" fgColor="800080" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="">alignas alignof noexcept nullptr static_assert thread_local final override</WordsStyle>
+            <WordsStyle name="STRING" styleID="3" fgColor="804000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="CHARACTER" styleID="4" fgColor="CC6600" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="KEYWORDS" styleID="5" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" keywordClass="instre1">True False</WordsStyle>
             <WordsStyle name="TRIPLE" styleID="6" fgColor="0060BF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="TRIPLEDOUBLE" styleID="7" fgColor="0060BF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="CLASSNAME" styleID="8" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-            <WordsStyle name="DEFNAME" styleID="9" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="DEFNAME" styleID="9" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" />
             <WordsStyle name="OPERATOR" styleID="10" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="IDENTIFIER" styleID="11" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
             <WordsStyle name="COMMENTBLOCK" styleID="12" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
@@ -258,17 +258,17 @@ Theme name : Visual Studio
             <WordsStyle name="PHP OPERATOR" styleID="127" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
         </LexerType>
         <LexerType name="php" desc="php" ext="">
-          <WordsStyle name="PHP" styleID="18" fgColor="0000FF" bgColor="FFEFBF" fontName="" fontStyle="0" fontSize="" />
-          <WordsStyle name="PHP DEFAULT" styleID="118" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-          <WordsStyle name="PHP STRING" styleID="119" fgColor="804000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-          <WordsStyle name="PHP SIMPLESTRING" styleID="120" fgColor="804000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="">XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug</WordsStyle>
-          <WordsStyle name="PHP WORD" styleID="121" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" keywordClass="instre1" />
-          <WordsStyle name="PHP NUMBER" styleID="122" fgColor="0060BF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-          <WordsStyle name="PHP VARIABLE" styleID="123" fgColor="800080" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-          <WordsStyle name="PHP COMMENT" styleID="124" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-          <WordsStyle name="PHP COMMENTLINE" styleID="125" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
-          <WordsStyle name="PHP STRING VARIABLE" styleID="126" fgColor="0080FF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="">alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window</WordsStyle>
-          <WordsStyle name="PHP OPERATOR" styleID="127" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />          
+            <WordsStyle name="PHP" styleID="18" fgColor="0000FF" bgColor="FFEFBF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="PHP DEFAULT" styleID="118" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="PHP STRING" styleID="119" fgColor="804000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="PHP SIMPLESTRING" styleID="120" fgColor="804000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="">XmlUtil loadXmlString TopologyXmlTree NotificationArea loadXmlFile debug</WordsStyle>
+            <WordsStyle name="PHP WORD" styleID="121" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="1" fontSize="" keywordClass="instre1" />
+            <WordsStyle name="PHP NUMBER" styleID="122" fgColor="0060BF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="PHP VARIABLE" styleID="123" fgColor="800080" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="PHP COMMENT" styleID="124" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="PHP COMMENTLINE" styleID="125" fgColor="008000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
+            <WordsStyle name="PHP STRING VARIABLE" styleID="126" fgColor="0080FF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="">alert appendChild arguments array blur checked childNodes className confirm dialogArguments event focus getElementById getElementsByTagName innerHTML keyCode length location null number parentNode push RegExp replace selectNodes selectSingleNode setAttribute split src srcElement test undefined value window</WordsStyle>
+            <WordsStyle name="PHP OPERATOR" styleID="127" fgColor="0000FF" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />
         </LexerType>
         <LexerType name="css" desc="CSS" ext="">
             <WordsStyle name="DEFAULT" styleID="0" fgColor="000000" bgColor="FFFFFF" fontName="" fontStyle="0" fontSize="" />