Fixed issue #120

Fixed issue #125 units renamed
RRUZ · Jan 4, 2019 · 96a91bd · 96a91bd
1 parent 0d4f50a
commit 96a91bd
Show file tree

Hide file tree

Showing 44 changed files with 594 additions and 1,230 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ DITE supports
 * Delphi 7. 
 * RAD Studio 2005-2010 
 * RAD Studio XE-XE8 
-* RAD Studio 10 Seattle, RAD Studio 10.1 Berlin, RAD Studio 10.2 Tokyo
+* RAD Studio 10 Seattle, RAD Studio 10.1 Berlin, RAD Studio 10.2 Tokyo, RAD Studio 10.3 Rio
 * Appmethod 1.13-1.16
 * Lazarus v1.0.6
 * Smart Mobile Studio IDE v1.1.2.17

diff --git a/delphi-ide-theme-editor/BuildDITE.bat b/delphi-ide-theme-editor/BuildDITE.bat
@@ -1,4 +1,4 @@
-call "C:\Program Files (x86)\Embarcadero\Studio\18.0\bin\rsvars.bat"
+call "C:\Program Files (x86)\Embarcadero\Studio\20.0\bin\rsvars.bat"
 msbuild.exe "DITE.dproj" /target:Clean;Build /p:Platform=Win32 /p:config=release /p:DCC_DebugInformation=2 
 set BUILD_STATUS=%ERRORLEVEL%
 if %BUILD_STATUS%==0 GOTO INNO

diff --git a/delphi-ide-theme-editor/DITE.Main.dfm b/delphi-ide-theme-editor/DITE.Main.dfm
@@ -245,6 +245,14 @@ object FrmMain: TFrmMain
     Font.Style = []
     TabOrder = 13
     OnClick = SynEditCodeClick
+    CodeFolding.GutterShapeSize = 11
+    CodeFolding.CollapsedLineColor = clGrayText
+    CodeFolding.FolderBarLinesColor = clGrayText
+    CodeFolding.IndentGuidesColor = clGray
+    CodeFolding.IndentGuides = True
+    CodeFolding.ShowCollapsedLine = False
+    CodeFolding.ShowHintMark = True
+    UseCodeFolding = False
     Gutter.BorderColor = clYellow
     Gutter.DigitCount = 3
     Gutter.Font.Charset = DEFAULT_CHARSET

diff --git a/delphi-ide-theme-editor/DITE.Main.pas b/delphi-ide-theme-editor/DITE.Main.pas
@@ -65,12 +65,12 @@ interface
 // http://www.kolormodo.com
 
 uses
-  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, uColorPanel,
-  Dialogs, ImgList, StdCtrls, ComCtrls, ExtCtrls, SynEditHighlighter, uSupportedIDEs, uColorSelector,
-  SynHighlighterPas, SynEdit, SynMemo, uDelphiVersions, uDelphiIDEHighlight, uLazarusVersions, Vcl.ActnPopup, uAppMethodVersions,
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms, DITE.ColorPanel,
+  Dialogs, ImgList, StdCtrls, ComCtrls, ExtCtrls, SynEditHighlighter, DITE.SupportedIDEs, DITE.ColorSelector,
+  SynHighlighterPas, SynEdit, SynMemo, DITE.DelphiVersions, DITE.DelphiIDEHighlight, DITE.LazarusVersions, Vcl.ActnPopup, DITE.AppMethodVersions,
   pngimage, DITE.Settings, ExtDlgs, Menus, SynEditExport, SynExportHTML, Generics.Defaults, Generics.Collections, Vcl.ActnList,
   Vcl.PlatformDefaultStyleActnCtrls, System.Actions, Vcl.Styles.Fixes, Vcl.Styles.NC,
-  Vcl.ActnMan, System.ImageList;
+  Vcl.ActnMan, System.ImageList, SynEditCodeFolding;
 
 { .$DEFINE ENABLE_THEME_EXPORT }
 
@@ -255,31 +255,32 @@ implementation
 {$WARN UNIT_PLATFORM OFF}
   Vcl.FileCtrl,
 {$WARN UNIT_PLATFORM ON}
-  Diagnostics,
+  System.Diagnostics,
   System.UITypes,
   System.Types,
-  ShellApi,
-  IOUtils,
-  StrUtils,
-  GraphUtil,
-  CommCtrl,
+  Winapi.ShellApi,
+  System.IOUtils,
+  System.StrUtils,
+  Vcl.GraphUtil,
+  Winapi.CommCtrl,
   Vcl.Styles,
   Vcl.Styles.Utils.Graphics,
   Vcl.Styles.FontAwesome,
   Vcl.Themes,
   Vcl.ListActns,
-  uVclStylesFix,
-  uHueSat,
-  EclipseThemes,
-  VSThemes,
-  uMisc,
-  uLazarusIDEHighlight,
-  uSMSIDEHighlight,
-  uStackTrace,
-  uSMSVersions,
-  uLoadThemesImages,
-  uHelpInsight,
-  uStdActionsPopMenu, uAdditionalSettings;
+  DITE.VclStylesFix,
+  DITE.HueSat,
+  DITE.EclipseThemes,
+  DITE.VSThemes,
+  DITE.Misc,
+  DITE.LazarusIDEHighlight,
+  DITE.SMSIDEHighlight,
+  DITE.StackTrace,
+  DITE.SMSVersions,
+  DITE.LoadThemesImages,
+  DITE.HelpInsight,
+  DITE.StdActionsPopMenu,
+  DITE.AdditionalSettings;
 
 const
   InvalidBreakLine = 9;
@@ -1060,7 +1061,7 @@ procedure TFrmMain.FormCreate(Sender: TObject);
   // FillListIDEThemesImport(CbIDEThemeImport.Items);
   // CbIDEThemeImport.ItemIndex := 0;
 
-  Self.Caption := Caption + Format(' %s', [uMisc.GetFileVersion(ParamStr(0))]);
+  Self.Caption := Caption + Format(' %s', [DITE.Misc.GetFileVersion(ParamStr(0))]);
 
   LoadFixedWidthFonts;
   LoadThemes;

diff --git a/delphi-ide-theme-editor/DITE.dpr b/delphi-ide-theme-editor/DITE.dpr
@@ -5,35 +5,35 @@ program DITE;
 uses
   {$IFDEF DEBUG}
   {$ENDIF }
-  uStackTrace in 'Units\uStackTrace.pas',
+  DITE.StackTrace in 'Units\DITE.StackTrace.pas',
   Generics.Defaults,
   Generics.Collections,
   Forms,
   DITE.Main in 'DITE.Main.pas' {FrmMain},
-  uDelphiIDEHighlight in 'Units\uDelphiIDEHighlight.pas',
-  uDelphiVersions in 'Units\uDelphiVersions.pas',
-  uHSLUtils in 'Units\uHSLUtils.pas',
-  uHueSat in 'Units\uHueSat.pas' {FrmHueSat},
-  uRegistry in 'Units\uRegistry.pas',
+  DITE.DelphiIDEHighlight in 'Units\DITE.DelphiIDEHighlight.pas',
+  DITE.DelphiVersions in 'Units\DITE.DelphiVersions.pas',
+  DITE.HSLUtils in 'Units\DITE.HSLUtils.pas',
+  DITE.HueSat in 'Units\DITE.HueSat.pas' {FrmHueSat},
+  DITE.Registry in 'Units\DITE.Registry.pas',
   DITE.Settings in 'Units\DITE.Settings.pas' {FrmSettings},
-  uColorSelector in 'Units\uColorSelector.pas' {DialogColorSelector},
-  VSThemes in 'Units\VSThemes.pas',
-  EclipseThemes in 'Units\EclipseThemes.pas',
-  uLazarusVersions in 'Units\uLazarusVersions.pas',
-  uSupportedIDEs in 'Units\uSupportedIDEs.pas',
-  uMisc in 'Units\uMisc.pas',
-  uLazarusIDEHighlight in 'Units\uLazarusIDEHighlight.pas',
+  DITE.ColorSelector in 'Units\DITE.ColorSelector.pas' {DialogColorSelector},
+  DITE.VSThemes in 'Units\DITE.VSThemes.pas',
+  DITE.EclipseThemes in 'Units\DITE.EclipseThemes.pas',
+  DITE.LazarusVersions in 'Units\DITE.LazarusVersions.pas',
+  DITE.SupportedIDEs in 'Units\DITE.SupportedIDEs.pas',
+  DITE.Misc in 'Units\DITE.Misc.pas',
+  DITE.LazarusIDEHighlight in 'Units\DITE.LazarusIDEHighlight.pas',
   Vcl.Themes,
   Vcl.Styles,
-  uVclStylesFix in 'Units\uVclStylesFix.pas',
-  uLoadThemesImages in 'Units\uLoadThemesImages.pas',
-  uStdActionsPopMenu in 'Units\uStdActionsPopMenu.pas',
-  uHelpInsight in 'Units\uHelpInsight.pas',
-  uColorPanel in 'Units\uColorPanel.pas' {ColorPanel},
-  uSMSIDEHighlight in 'Units\uSMSIDEHighlight.pas',
-  uSMSVersions in 'Units\uSMSVersions.pas',
-  uAppMethodVersions in 'Units\uAppMethodVersions.pas',
-  uAdditionalSettings in 'Units\uAdditionalSettings.pas' {FrmAdditionalSettings};
+  DITE.VclStylesFix in 'Units\DITE.VclStylesFix.pas',
+  DITE.LoadThemesImages in 'Units\DITE.LoadThemesImages.pas',
+  DITE.StdActionsPopMenu in 'Units\DITE.StdActionsPopMenu.pas',
+  DITE.HelpInsight in 'Units\DITE.HelpInsight.pas',
+  DITE.ColorPanel in 'Units\DITE.ColorPanel.pas' {ColorPanel},
+  DITE.SMSIDEHighlight in 'Units\DITE.SMSIDEHighlight.pas',
+  DITE.SMSVersions in 'Units\DITE.SMSVersions.pas',
+  DITE.AppMethodVersions in 'Units\DITE.AppMethodVersions.pas',
+  DITE.AdditionalSettings in 'Units\DITE.AdditionalSettings.pas' {FrmAdditionalSettings};
 
 {$R *.res}