Преглед изворни кода

Update to Scintilla 2.26. Changes use of INDIC_ROUNDBOX (which never really appeared round btw) to INDIC_STRAIGHTBOX and adds Alt+Up/Down for SCI_MOVESELECTEDLINESUP/DOWN.

Martijn Laan пре 1 година
родитељ
комит
78a9df33ba
5 измењених фајлова са 43 додато и 8 уклоњено
  1. 21 5
      Components/ScintInt.pas
  2. BIN
      Files/isscint.dll
  3. 6 0
      ISHelp/isetup.xml
  4. 6 3
      Projects/Src/CompScintEdit.pas
  5. 10 0
      whatsnew.htm

+ 21 - 5
Components/ScintInt.pas

@@ -1,7 +1,7 @@
 unit ScintInt;
 
 {
-  Delphi translation of Scintilla.h from Scintilla 2.24
+  Delphi translation of Scintilla.h from Scintilla 2.26
   created by Jordan Russell and updated by Martijn Laan
 }
 
@@ -104,6 +104,8 @@ const
   SCI_MARKERDEFINE = 2040;
   SCI_MARKERSETFORE = 2041;
   SCI_MARKERSETBACK = 2042;
+  SCI_MARKERSETBACKSELECTED = 2292;
+  SCI_MARKERENABLEHIGHLIGHT = 2293;
   SCI_MARKERADD = 2043;
   SCI_MARKERDELETE = 2044;
   SCI_MARKERDELETEALL = 2045;
@@ -213,6 +215,7 @@ const
   INDIC_HIDDEN = 5;
   INDIC_BOX = 6;
   INDIC_ROUNDBOX = 7;
+  INDIC_STRAIGHTBOX = 8;
   INDIC_MAX = 31;
   INDIC_CONTAINER = 8;
   INDIC0_MASK = $20;
@@ -522,7 +525,9 @@ const
   SCI_MOVECARETINSIDEVIEW = 2401;
   SCI_LINELENGTH = 2350;
   SCI_BRACEHIGHLIGHT = 2351;
+  SCI_BRACEHIGHLIGHTINDICATOR = 2498;
   SCI_BRACEBADLIGHT = 2352;
+  SCI_BRACEBADLIGHTINDICATOR = 2499;
   SCI_BRACEMATCH = 2353;
   SCI_GETVIEWEOL = 2355;
   SCI_SETVIEWEOL = 2356;
@@ -675,6 +680,8 @@ const
   SCI_GETKEYSUNICODE = 2522;
   SCI_INDICSETALPHA = 2523;
   SCI_INDICGETALPHA = 2524;
+  SCI_INDICSETOUTLINEALPHA = 2558;
+  SCI_INDICGETOUTLINEALPHA = 2559;
   SCI_SETEXTRAASCENT = 2525;
   SCI_GETEXTRAASCENT = 2526;
   SCI_SETEXTRADESCENT = 2527;
@@ -758,6 +765,10 @@ const
   SCI_ROTATESELECTION = 2606;
   SCI_SWAPMAINANCHORCARET = 2607;
   SCI_CHANGELEXERSTATE = 2617;
+  SCI_CONTRACTEDFOLDNEXT = 2618;
+  SCI_VERTICALCENTRECARET = 2619;
+  SCI_MOVESELECTEDLINESUP = 2620;
+  SCI_MOVESELECTEDLINESDOWN = 2621;
   SCI_STARTRECORD = 3001;
   SCI_STOPRECORD = 3002;
   SCI_SETLEXER = 4001;
@@ -875,11 +886,16 @@ type
   PSCNotification = ^TSCNotification;
   TSCNotification = record
     nmhdr: TNMHdr;
-    position: Integer;          { SCN_STYLENEEDED, SCN_MODIFIED, SCN_DWELLSTART, SCN_DWELLEND }
+    position: Integer;          { SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK,
+                                  SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, SCN_CALLTIPCLICK,
+                                  SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK, SCN_HOTSPOTRELEASECLICK,
+                                  SCN_INDICATORCLICK, SCN_INDICATORRELEASE,
+                                  SCN_USERLISTSELECTION, SCN_AUTOCSELECTION }
     ch: Integer;                { SCN_CHARADDED, SCN_KEY }
-    modifiers: Integer;         { SCN_KEY }
+    modifiers: Integer;         { SCN_KEY, SCN_DOUBLECLICK, SCN_HOTSPOTCLICK, SCN_HOTSPOTDOUBLECLICK,
+                                  SCN_HOTSPOTRELEASECLICK, SCN_INDICATORCLICK, SCN_INDICATORRELEASE,}
     modificationType: Integer;  { SCN_MODIFIED }
-    text: PAnsiChar;            { SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION }
+    text: PAnsiChar;            { SCN_MODIFIED, SCN_USERLISTSELECTION, SCN_AUTOCSELECTION, SCN_URIDROPPED }
     length: Integer;            { SCN_MODIFIED }
     linesAdded: Integer;        { SCN_MODIFIED }
     message: Integer;           { SCN_MACRORECORD }
@@ -893,7 +909,7 @@ type
     x: Integer;                 { SCN_DWELLSTART, SCN_DWELLEND }
     y: Integer;                 { SCN_DWELLSTART, SCN_DWELLEND }
     token: Integer;             { SCN_MODIFIED with SC_MOD_CONTAINER }
-    annotationLinesAdded: Integer;  { SC_MOD_CHANGEANNOTATION }
+    annotationLinesAdded: Integer;  { SCN_MODIFIED with SC_MOD_CHANGEANNOTATION }
     updated: Integer;           { SCN_UPDATEUI }
   end;
 

BIN
Files/isscint.dll


+ 6 - 0
ISHelp/isetup.xml

@@ -3164,6 +3164,12 @@ Filename: "{win}\MYPROG.INI"; Section: "InstallSettings"; Key: "InstallPath"; St
 <tr>
   <td>Switch line with previous.</td><td>Ctrl+T</td>
 </tr>
+<tr>
+  <td>Move selected lines up.</td><td>Alt+Up</td>
+</tr>
+<tr>
+  <td>Move selected lines down.</td><td>Alt+Down</td>
+</tr>
 <tr>
   <td>Duplicate selection or line.</td><td>Ctrl+D</td>
 </tr>

+ 6 - 3
Projects/Src/CompScintEdit.pas

@@ -150,7 +150,6 @@ begin
      "The INDICATOR_* values used for dividing up indicators were previously
       INDIC_CONTAINER, INDIC_IME, INDIC_IME_MAX, and INDIC_MAX"
      Once it does replace our use of these INDIC_* with INDICATOR_*.
-    -2.2.6: Replace: INDIC_ROUNDBOX -> INDIC_STRAIGHTBOX
     -2.2.8: Review using SCI_MARKERDEFINERGBAIMAGE instead of SCI_MARKERDEFINEPIXMAP,
             but note INDIC_SQUIGGLEPIXMAP below
     -3.3.2: Review using INDIC_SQUIGGLEPIXMAP instead of INDIC_SQUIGGLE
@@ -178,6 +177,8 @@ begin
   Call(SCI_SETMULTIPASTE, SC_MULTIPASTE_EACH, 0);
 
   Call(SCI_ASSIGNCMDKEY, Ord('Z') or ((SCMOD_SHIFT or SCMOD_CTRL) shl 16), SCI_REDO);
+  Call(SCI_ASSIGNCMDKEY, SCK_UP or (SCMOD_ALT shl 16), SCI_MOVESELECTEDLINESUP);
+  Call(SCI_ASSIGNCMDKEY, SCK_DOWN or (SCMOD_ALT shl 16), SCI_MOVESELECTEDLINESDOWN);
 
   Call(SCI_SETSCROLLWIDTH, 1024 * CallStr(SCI_TEXTWIDTH, 0, 'X'), 0);
 
@@ -185,14 +186,16 @@ begin
   Call(SCI_INDICSETFORE, inSquiggly, clRed); { May be overwritten by UpdateThemeColorsAndStyleAttributes }
   Call(SCI_INDICSETSTYLE, inPendingSquiggly, INDIC_HIDDEN);
 
-  Call(SCI_INDICSETSTYLE, inWordAtCursorOccurrence, INDIC_ROUNDBOX);
+  Call(SCI_INDICSETSTYLE, inWordAtCursorOccurrence, INDIC_STRAIGHTBOX);
   Call(SCI_INDICSETFORE, inWordAtCursorOccurrence, clSilver); { May be overwritten by UpdateThemeColorsAndStyleAttributes }
   Call(SCI_INDICSETALPHA, inWordAtCursorOccurrence, 255);
+  Call(SCI_INDICSETOUTLINEALPHA, inWordAtCursorOccurrence, 255);
   Call(SCI_INDICSETUNDER, inWordAtCursorOccurrence, 1);
 
-  Call(SCI_INDICSETSTYLE, inSelTextOccurrence, INDIC_ROUNDBOX);
+  Call(SCI_INDICSETSTYLE, inSelTextOccurrence, INDIC_STRAIGHTBOX);
   Call(SCI_INDICSETFORE, inSelTextOccurrence, clSilver); { May be overwritten by UpdateThemeColorsAndStyleAttributes }
   Call(SCI_INDICSETALPHA, inSelTextOccurrence, 255);
+  Call(SCI_INDICSETOUTLINEALPHA, inSelTextOccurrence, 255);
   Call(SCI_INDICSETUNDER, inSelTextOccurrence, 1);
 
   { Set up the gutter column with line numbers - avoid Scintilla's 'reverse arrow'

+ 10 - 0
whatsnew.htm

@@ -30,6 +30,16 @@ For conditions of distribution and use, see <a href="files/is/license.txt">LICEN
 
 <p><b>Want to be notified by e-mail of new Inno Setup releases?</b> <a href="ismail.php">Subscribe</a> to the Inno Setup Mailing List!</p>
 
+<p><a name="6.3.1"></a><span class="ver">6.3.1-dev </span><span class="date">(?)</span></p>
+<p><span class="head2">Compiler IDE changes</span></p>
+<ul>
+  <li>Added shortcuts to move selected lines up or down (Alt+Up and Alt+Down).</li>
+</ul>
+<p><span class="head2">Other changes</span></p>
+<ul>
+  <li>.</li>
+</ul>
+
 <p><a name="6.3.0"></a><span class="ver">6.3.0-dev </span><span class="date">(?)</span></p>
 <p><span class="head2">Support for UTF-8 encoded files improved</span></p>
 <ul>