Version 6.2.

Embarcadero · Nov 13, 2020 · 907edc2 · 907edc2
1 parent 685f872
commit 907edc2
Show file tree

Hide file tree

Showing 16 changed files with 5,203 additions and 84 deletions.
diff --git a/NEWS.txt b/NEWS.txt
@@ -1,3 +1,16 @@
+Version 6.2 - 13 November 2020
+
+ - Added: 5 new UI styles. Windows 10 Black Pearl, Glossy, Calypso, Flat UI Light, Material Patterns Blue
+ - Added: Default encoding for new documents option.
+ - Added: New setting to enable and disable font ligature support.
+ - Updated: Welcome screen hotkey backgrounds.
+ - Updated: Allow multiple instances of Dev-C++ to run simaltaniously.
+ - Fixed: Error on AStyle Formatting Config Form
+ - Fixed: Double clicking text now selects the current line.
+ - Fixed: Auto Indent to {} and : now works correctly.
+ - Fixed: CTRL-Y will not delete the current line if there is nothing left to redo.
+ - Fixed: Buggy behaviour when highlighting matching braces.
+
 Version 6.1 - 2 November 2020
 
  - Updated: C++ keyword highlighting. Added some C++20 keywords.

diff --git a/Source/DataFrm.dfm b/Source/DataFrm.dfm
diff --git a/Source/DataFrm.pas b/Source/DataFrm.pas
@@ -106,8 +106,8 @@   TdmMain = class(TDataModule)
   dmMain: TdmMain;
 
 const
-  cDelphiStyle: array[0..3] of string = ('Windows','Windows10','Windows10 SlateGray','Windows10 Blue Whale');
-  cSVGColor: array[0..3] of string = ('None','clGrayText','clMoneyGreen','clSkyBlue');
+  cDelphiStyle: array[0..8] of string = ('Windows','Windows10','Windows10 SlateGray','Windows10 Blue Whale','Windows10 BlackPearl','Glossy','Calypso','Flat UI Light','Material Patterns Blue');
+  cSVGColor: array[0..8] of string = ('None','clGrayText','clMoneyGreen','clSkyBlue','clGrayText','clGrayText','clGrayText','clGrayText','clGrayText');
 implementation
 
 uses

diff --git a/Source/EnviroFrm.dfm b/Source/EnviroFrm.dfm
@@ -603,16 +603,6 @@ object EnviroForm: TEnviroForm
         Height = 15
         Caption = 'Size'
       end
-      object VirtualImageTheme: TVirtualImage
-        Left = 0
-        Top = 143
-        Width = 505
-        Height = 250
-        ImageCollection = dmMain.ImageThemeColection
-        ImageWidth = 0
-        ImageHeight = 0
-        ImageIndex = -1
-      end
       object cbUIfont: TComboBox
         Left = 138
         Top = 87
@@ -661,11 +651,99 @@ object EnviroForm: TEnviroForm
           'Windows Classic'
           'Windows 10'
           'Slate Gray'
-          'Blue Whale')
+          'Blue Whale'
+          'Black Pearl'
+          'Glossy'
+          'Calypso'
+          'Flat UI Light'
+          'Material Pattens Blue')
         ParentCtl3D = False
         TabOrder = 2
         OnClick = ListBoxStyleClick
       end
+      object Panel1: TPanel
+        Left = 0
+        Top = 143
+        Width = 476
+        Height = 249
+        DoubleBuffered = True
+        ParentBackground = False
+        ParentDoubleBuffered = False
+        TabOrder = 3
+        object Button1: TButton
+          Left = 158
+          Top = 16
+          Width = 75
+          Height = 25
+          Caption = 'Button1'
+          TabOrder = 0
+        end
+        object ComboBox1: TComboBox
+          Left = 158
+          Top = 95
+          Width = 145
+          Height = 23
+          TabOrder = 1
+          Text = 'ComboBox1'
+        end
+        object CheckBox1: TCheckBox
+          Left = 158
+          Top = 58
+          Width = 97
+          Height = 17
+          Caption = 'CheckBox1'
+          TabOrder = 2
+        end
+        object PageControl1: TPageControl
+          Left = 1
+          Top = 1
+          Width = 136
+          Height = 247
+          ActivePage = TabSheet1
+          Align = alLeft
+          TabOrder = 3
+          ExplicitHeight = 159
+          object TabSheet1: TTabSheet
+            Caption = 'TabSheet1'
+            ExplicitWidth = 92
+            ExplicitHeight = 129
+          end
+          object TabSheet2: TTabSheet
+            Caption = 'TabSheet2'
+            ImageIndex = 1
+            ExplicitWidth = 93
+            ExplicitHeight = 129
+          end
+        end
+        object Button2: TButton
+          Left = 239
+          Top = 16
+          Width = 75
+          Height = 25
+          Caption = 'Button2'
+          Enabled = False
+          TabOrder = 4
+        end
+        object Button3: TButton
+          Left = 320
+          Top = 16
+          Width = 75
+          Height = 25
+          Caption = 'Button3'
+          TabOrder = 5
+        end
+        object RadioGroup1: TRadioGroup
+          Left = 154
+          Top = 136
+          Width = 185
+          Height = 97
+          Caption = 'RadioGroup1'
+          Items.Strings = (
+            'Item 1'
+            'Item 2')
+          TabOrder = 6
+        end
+      end
     end
   end
   object dlgPic: TOpenPictureDialog

diff --git a/Source/EnviroFrm.pas b/Source/EnviroFrm.pas
@@ -91,7 +91,16 @@   TEnviroForm = class(TForm)
     cbUIfontsize: TComboBox;
     ListBoxStyle: TListBox;
     lblSize: TLabel;
-    VirtualImageTheme: TVirtualImage;
+    Panel1: TPanel;
+    Button1: TButton;
+    ComboBox1: TComboBox;
+    CheckBox1: TCheckBox;
+    PageControl1: TPageControl;
+    TabSheet1: TTabSheet;
+    TabSheet2: TTabSheet;
+    Button2: TButton;
+    Button3: TButton;
+    RadioGroup1: TRadioGroup;
     procedure BrowseClick(Sender: TObject);
     procedure btnOkClick(Sender: TObject);
     procedure btnHelpClick(Sender: TObject);
@@ -229,7 +238,10 @@ procedure TEnviroForm.btnOkClick(Sender: TObject);
 
 procedure TEnviroForm.ListBoxStyleClick(Sender: TObject);
 begin
-  VirtualImageTheme.ImageIndex := ListBoxStyle.ItemIndex;
+  Panel1.StyleName := cDelphiStyle[ListBoxStyle.ItemIndex];
+  Panel1.Repaint;
+  for var I := 0 to Panel1.ControlCount-1 do
+   Panel1.Controls[i].Repaint;
 end;
 
 procedure TEnviroForm.LoadText;
@@ -360,7 +372,7 @@ procedure TEnviroForm.FormCreate(Sender: TObject);
 
     //Style Delphi
     ListBoxStyle.ItemIndex := Style;
-    VirtualImageTheme.ImageIndex := ListBoxStyle.ItemIndex;
+    ListBoxStyleClick(Self);
 
     // Add all font families and select the current one
     cbUIfont.Items.Assign(Screen.Fonts);

diff --git a/Source/LangFrm.dfm b/Source/LangFrm.dfm
@@ -221,7 +221,12 @@ object LangForm: TLangForm
           'Windows Classic'
           'Windows 10'
           'Slate Gray'
-          'Blue Whale')
+          'Blue Whale'
+          'Black Pearl'
+          'Glossy'
+          'Calypso'
+          'Flat UI Light'
+          'Material Pattens Blue')
       end
       object cmbColors: TComboBox
         Left = 56

diff --git a/Source/Version.pas b/Source/Version.pas
@@ -32,7 +32,7 @@ interface
 
   // exe properties
   DEVCPP = 'Embarcadero Dev-C++';
-  DEVCPP_VERSION = '6.1';
+  DEVCPP_VERSION = '6.2';
 
   // delimiters
   DEV_INTERNAL_OPEN = '$__DEV_INTERNAL_OPEN';

diff --git a/Source/devcpp.dpr b/Source/devcpp.dpr
@@ -96,7 +96,7 @@ uses
 
 var
   AppData, INIFileName, ExeFolder: String;
-  PrevInstance: THandle;
+//  PrevInstance: THandle;
 begin
   // Configure memory manager
   {$IFDEF FASTMM_DEBUG_MODE}
@@ -114,11 +114,11 @@ begin
 
   // Check for previous instances (only allow once instance)
   // If we are able to find a previous instance, activate that one instead
-  PrevInstance := GetPreviousInstance;
+  {PrevInstance := GetPreviousInstance;
   if PrevInstance <> 0 then begin
     SendToPreviousInstance(PrevInstance, String(GetCommandLineW));
     Exit;
-  end;
+  end;}
 
   devData.IsPortable := TPath.GetFileNameWithoutExtension(ParamStr(0)).EndsWith('portable', True)
                         or FindCmdLineSwitch('portable', True)

diff --git a/Source/devcpp.dproj b/Source/devcpp.dproj
@@ -3,7 +3,7 @@
         <ProjectGuid>{0B6930FF-C1A8-45A0-B448-2D23D500E0F7}</ProjectGuid>
         <MainSource>devcpp.dpr</MainSource>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Release</Config>
+        <Config Condition="'$(Config)'==''">Debug</Config>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
@@ -73,7 +73,7 @@
         <VerInfo_MinorVer>12</VerInfo_MinorVer>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_Keys>CompanyName=Bloodshed Software;FileDescription=Dev-C++ IDE;FileVersion=5.12.0.0;InternalName=devcpp.exe;LegalCopyright=Copyright Bloodshed Software;LegalTrademarks=;OriginalFilename=devcpp.exe;ProductName=Dev-C++;ProductVersion=5.0;Comments=Under the GNU General Public License</VerInfo_Keys>
-        <Custom_Styles>Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 Blue Whale|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhale.vsf&quot;;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;</Custom_Styles>
+        <Custom_Styles>Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;;Calypso|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Calypso.vsf;&quot;Flat UI Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\FlatUILight.vsf&quot;;Glossy|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Glossy.vsf;&quot;Material Patterns Blue|VCLSTYLE|$(BDSCOMMONDIR)\Styles\MaterialPatternsBlue.vsf&quot;;&quot;Windows10 BlackPearl|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlackPearl.vsf&quot;;&quot;Windows10 Blue Whale|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10BlueWhale.vsf&quot;</Custom_Styles>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -101,8 +101,8 @@
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
-        <VerInfo_MinorVer>1</VerInfo_MinorVer>
-        <VerInfo_Keys>CompanyName=Embarcadero Technologies, Inc.;FileDescription=Embarcadero Dev C++;FileVersion=6.1.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=Embarcadero Dev C++;ProductVersion=6.1.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_MinorVer>2</VerInfo_MinorVer>
+        <VerInfo_Keys>CompanyName=Embarcadero Technologies, Inc.;FileDescription=Embarcadero Dev C++;FileVersion=6.2.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=Embarcadero Dev C++;ProductVersion=6.2.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <Icon_MainIcon>..\devcpp.ico</Icon_MainIcon>
         <VerInfo_MajorVer>6</VerInfo_MajorVer>
     </PropertyGroup>
@@ -115,8 +115,8 @@
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <DCC_ExeOutput>C:\Dev-Cpp\</DCC_ExeOutput>
-        <VerInfo_MinorVer>1</VerInfo_MinorVer>
-        <VerInfo_Keys>CompanyName=Embarcadero;FileDescription=$(MSBuildProjectName);FileVersion=6.1.0.0;InternalName=Devcpp;LegalCopyright=;LegalTrademarks=;OriginalFilename=Embarcadero Devcpp;ProductName=$(MSBuildProjectName);ProductVersion=6.1.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <VerInfo_MinorVer>2</VerInfo_MinorVer>
+        <VerInfo_Keys>CompanyName=Embarcadero;FileDescription=$(MSBuildProjectName);FileVersion=6.2.0.0;InternalName=Devcpp;LegalCopyright=;LegalTrademarks=;OriginalFilename=Embarcadero Devcpp;ProductName=$(MSBuildProjectName);ProductVersion=6.2.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <Icon_MainIcon>..\devcpp.ico</Icon_MainIcon>
         <VerInfo_MajorVer>6</VerInfo_MajorVer>
     </PropertyGroup>

diff --git a/Source/main.dfm b/Source/main.dfm
@@ -1621,7 +1621,7 @@ object MainForm: TMainForm
           Top = 309
           Width = 18
           Height = 16
-          Caption = '6.1'
+          Caption = '6.2'
           Font.Charset = DEFAULT_CHARSET
           Font.Color = clRed
           Font.Height = -13
@@ -4305,83 +4305,77 @@ object MainForm: TMainForm
           Font.Style = []
           ParentFont = False
         end
-        object LabelDescOpen: TStaticText
+        object PanelDescOpen: TPanel
           Left = 245
           Top = 384
           Width = 69
           Height = 19
-          Alignment = taCenter
-          AutoSize = False
-          BorderStyle = sbsSingle
+          BevelOuter = bvNone
           Caption = 'Ctr + O'
           Color = clBtnShadow
-          ParentColor = False
+          ParentBackground = False
           TabOrder = 0
+          StyleElements = [seFont, seBorder]
         end
-        object LabelDescClear: TStaticText
+        object PanelDescSave: TPanel
           Left = 245
-          Top = 522
+          Top = 413
           Width = 69
           Height = 19
-          Alignment = taCenter
-          AutoSize = False
-          BorderStyle = sbsSingle
-          Caption = 'Ctr + W'
+          BevelOuter = bvNone
+          Caption = 'Ctr + S'
           Color = clBtnShadow
-          ParentColor = False
+          ParentBackground = False
           TabOrder = 1
+          StyleElements = [seFont, seBorder]
         end
-        object LabelDescCompile: TStaticText
+        object PanelDescZoom: TPanel
           Left = 245
-          Top = 497
+          Top = 442
           Width = 69
           Height = 19
-          Alignment = taCenter
-          AutoSize = False
-          BorderStyle = sbsSingle
-          Caption = 'F9'
+          BevelOuter = bvNone
+          Caption = 'Ctr + Scroll'
           Color = clBtnShadow
-          ParentColor = False
+          ParentBackground = False
           TabOrder = 2
+          StyleElements = [seFont, seBorder]
         end
-        object LabelDescRun: TStaticText
+        object PanelDescRun: TPanel
           Left = 245
           Top = 470
           Width = 69
           Height = 19
-          Alignment = taCenter
-          AutoSize = False
-          BorderStyle = sbsSingle
+          BevelOuter = bvNone
           Caption = 'F10'
           Color = clBtnShadow
-          ParentColor = False
+          ParentBackground = False
           TabOrder = 3
+          StyleElements = [seFont, seBorder]
         end
-        object LabelDescSave: TStaticText
+        object PanelDescCompile: TPanel
           Left = 245
-          Top = 413
+          Top = 497
           Width = 69
           Height = 19
-          Alignment = taCenter
-          AutoSize = False
-          BorderStyle = sbsSingle
-          Caption = 'Ctr + S'
+          BevelOuter = bvNone
+          Caption = 'F9'
           Color = clBtnShadow
-          ParentColor = False
+          ParentBackground = False
           TabOrder = 4
+          StyleElements = [seFont, seBorder]
         end
-        object LabelDescZoom: TStaticText
+        object PanelDescClear: TPanel
           Left = 245
-          Top = 442
+          Top = 522
           Width = 69
           Height = 19
-          Alignment = taCenter
-          AutoSize = False
-          BorderStyle = sbsSingle
-          Caption = 'Ctr + Scroll'
+          BevelOuter = bvNone
+          Caption = 'Ctr + W'
           Color = clBtnShadow
-          ParentColor = False
+          ParentBackground = False
           TabOrder = 5
+          StyleElements = [seFont, seBorder]
         end
       end
       object PanelRight: TPanel