Skip to content

Commit 907edc2

Browse files
FMXExpressFMXExpress
committed
Version 6.2.
1 parent 685f872 commit 907edc2

16 files changed

+5203
-84
lines changed

‎NEWS.txt

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
Version 6.2 - 13 November 2020
2+
3+
- Added: 5 new UI styles. Windows 10 Black Pearl, Glossy, Calypso, Flat UI Light, Material Patterns Blue
4+
- Added: Default encoding for new documents option.
5+
- Added: New setting to enable and disable font ligature support.
6+
- Updated: Welcome screen hotkey backgrounds.
7+
- Updated: Allow multiple instances of Dev-C++ to run simaltaniously.
8+
- Fixed: Error on AStyle Formatting Config Form
9+
- Fixed: Double clicking text now selects the current line.
10+
- Fixed: Auto Indent to {} and : now works correctly.
11+
- Fixed: CTRL-Y will not delete the current line if there is nothing left to redo.
12+
- Fixed: Buggy behaviour when highlighting matching braces.
13+
114
Version 6.1 - 2 November 2020
215

316
- Updated: C++ keyword highlighting. Added some C++20 keywords.

‎Source/DataFrm.dfm

+5,017
Large diffs are not rendered by default.

‎Source/DataFrm.pas

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ TdmMain = class(TDataModule)
106106
dmMain: TdmMain;
107107

108108
const
109-
cDelphiStyle: array[0..3] of string = ('Windows','Windows10','Windows10 SlateGray','Windows10 Blue Whale');
110-
cSVGColor: array[0..3] of string = ('None','clGrayText','clMoneyGreen','clSkyBlue');
109+
cDelphiStyle: array[0..8] of string = ('Windows','Windows10','Windows10 SlateGray','Windows10 Blue Whale','Windows10 BlackPearl','Glossy','Calypso','Flat UI Light','Material Patterns Blue');
110+
cSVGColor: array[0..8] of string = ('None','clGrayText','clMoneyGreen','clSkyBlue','clGrayText','clGrayText','clGrayText','clGrayText','clGrayText');
111111
implementation
112112

113113
uses

‎Source/EnviroFrm.dfm

+89-11
Original file line numberDiff line numberDiff line change
@@ -603,16 +603,6 @@ object EnviroForm: TEnviroForm
603603
Height = 15
604604
Caption = 'Size'
605605
end
606-
object VirtualImageTheme: TVirtualImage
607-
Left = 0
608-
Top = 143
609-
Width = 505
610-
Height = 250
611-
ImageCollection = dmMain.ImageThemeColection
612-
ImageWidth = 0
613-
ImageHeight = 0
614-
ImageIndex = -1
615-
end
616606
object cbUIfont: TComboBox
617607
Left = 138
618608
Top = 87
@@ -661,11 +651,99 @@ object EnviroForm: TEnviroForm
661651
'Windows Classic'
662652
'Windows 10'
663653
'Slate Gray'
664-
'Blue Whale')
654+
'Blue Whale'
655+
'Black Pearl'
656+
'Glossy'
657+
'Calypso'
658+
'Flat UI Light'
659+
'Material Pattens Blue')
665660
ParentCtl3D = False
666661
TabOrder = 2
667662
OnClick = ListBoxStyleClick
668663
end
664+
object Panel1: TPanel
665+
Left = 0
666+
Top = 143
667+
Width = 476
668+
Height = 249
669+
DoubleBuffered = True
670+
ParentBackground = False
671+
ParentDoubleBuffered = False
672+
TabOrder = 3
673+
object Button1: TButton
674+
Left = 158
675+
Top = 16
676+
Width = 75
677+
Height = 25
678+
Caption = 'Button1'
679+
TabOrder = 0
680+
end
681+
object ComboBox1: TComboBox
682+
Left = 158
683+
Top = 95
684+
Width = 145
685+
Height = 23
686+
TabOrder = 1
687+
Text = 'ComboBox1'
688+
end
689+
object CheckBox1: TCheckBox
690+
Left = 158
691+
Top = 58
692+
Width = 97
693+
Height = 17
694+
Caption = 'CheckBox1'
695+
TabOrder = 2
696+
end
697+
object PageControl1: TPageControl
698+
Left = 1
699+
Top = 1
700+
Width = 136
701+
Height = 247
702+
ActivePage = TabSheet1
703+
Align = alLeft
704+
TabOrder = 3
705+
ExplicitHeight = 159
706+
object TabSheet1: TTabSheet
707+
Caption = 'TabSheet1'
708+
ExplicitWidth = 92
709+
ExplicitHeight = 129
710+
end
711+
object TabSheet2: TTabSheet
712+
Caption = 'TabSheet2'
713+
ImageIndex = 1
714+
ExplicitWidth = 93
715+
ExplicitHeight = 129
716+
end
717+
end
718+
object Button2: TButton
719+
Left = 239
720+
Top = 16
721+
Width = 75
722+
Height = 25
723+
Caption = 'Button2'
724+
Enabled = False
725+
TabOrder = 4
726+
end
727+
object Button3: TButton
728+
Left = 320
729+
Top = 16
730+
Width = 75
731+
Height = 25
732+
Caption = 'Button3'
733+
TabOrder = 5
734+
end
735+
object RadioGroup1: TRadioGroup
736+
Left = 154
737+
Top = 136
738+
Width = 185
739+
Height = 97
740+
Caption = 'RadioGroup1'
741+
Items.Strings = (
742+
'Item 1'
743+
'Item 2')
744+
TabOrder = 6
745+
end
746+
end
669747
end
670748
end
671749
object dlgPic: TOpenPictureDialog

‎Source/EnviroFrm.pas

+15-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,16 @@ TEnviroForm = class(TForm)
9191
cbUIfontsize: TComboBox;
9292
ListBoxStyle: TListBox;
9393
lblSize: TLabel;
94-
VirtualImageTheme: TVirtualImage;
94+
Panel1: TPanel;
95+
Button1: TButton;
96+
ComboBox1: TComboBox;
97+
CheckBox1: TCheckBox;
98+
PageControl1: TPageControl;
99+
TabSheet1: TTabSheet;
100+
TabSheet2: TTabSheet;
101+
Button2: TButton;
102+
Button3: TButton;
103+
RadioGroup1: TRadioGroup;
95104
procedure BrowseClick(Sender: TObject);
96105
procedure btnOkClick(Sender: TObject);
97106
procedure btnHelpClick(Sender: TObject);
@@ -229,7 +238,10 @@ procedure TEnviroForm.btnOkClick(Sender: TObject);
229238

230239
procedure TEnviroForm.ListBoxStyleClick(Sender: TObject);
231240
begin
232-
VirtualImageTheme.ImageIndex := ListBoxStyle.ItemIndex;
241+
Panel1.StyleName := cDelphiStyle[ListBoxStyle.ItemIndex];
242+
Panel1.Repaint;
243+
for var I := 0 to Panel1.ControlCount-1 do
244+
Panel1.Controls[i].Repaint;
233245
end;
234246

235247
procedure TEnviroForm.LoadText;
@@ -360,7 +372,7 @@ procedure TEnviroForm.FormCreate(Sender: TObject);
360372

361373
//Style Delphi
362374
ListBoxStyle.ItemIndex := Style;
363-
VirtualImageTheme.ImageIndex := ListBoxStyle.ItemIndex;
375+
ListBoxStyleClick(Self);
364376

365377
// Add all font families and select the current one
366378
cbUIfont.Items.Assign(Screen.Fonts);

‎Source/LangFrm.dfm

+6-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,12 @@ object LangForm: TLangForm
221221
'Windows Classic'
222222
'Windows 10'
223223
'Slate Gray'
224-
'Blue Whale')
224+
'Blue Whale'
225+
'Black Pearl'
226+
'Glossy'
227+
'Calypso'
228+
'Flat UI Light'
229+
'Material Pattens Blue')
225230
end
226231
object cmbColors: TComboBox
227232
Left = 56

‎Source/Version.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ interface
3232

3333
// exe properties
3434
DEVCPP = 'Embarcadero Dev-C++';
35-
DEVCPP_VERSION = '6.1';
35+
DEVCPP_VERSION = '6.2';
3636

3737
// delimiters
3838
DEV_INTERNAL_OPEN = '$__DEV_INTERNAL_OPEN';

‎Source/devcpp.dpr

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ uses
9696

9797
var
9898
AppData, INIFileName, ExeFolder: String;
99-
PrevInstance: THandle;
99+
// PrevInstance: THandle;
100100
begin
101101
// Configure memory manager
102102
{$IFDEF FASTMM_DEBUG_MODE}
@@ -114,11 +114,11 @@ begin
114114

115115
// Check for previous instances (only allow once instance)
116116
// If we are able to find a previous instance, activate that one instead
117-
PrevInstance := GetPreviousInstance;
117+
{PrevInstance := GetPreviousInstance;
118118
if PrevInstance <> 0 then begin
119119
SendToPreviousInstance(PrevInstance, String(GetCommandLineW));
120120
Exit;
121-
end;
121+
end;}
122122

123123
devData.IsPortable := TPath.GetFileNameWithoutExtension(ParamStr(0)).EndsWith('portable', True)
124124
or FindCmdLineSwitch('portable', True)

‎Source/devcpp.dproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<ProjectGuid>{0B6930FF-C1A8-45A0-B448-2D23D500E0F7}</ProjectGuid>
44
<MainSource>devcpp.dpr</MainSource>
55
<Base>True</Base>
6-
<Config Condition="'$(Config)'==''">Release</Config>
6+
<Config Condition="'$(Config)'==''">Debug</Config>
77
<TargetedPlatforms>1</TargetedPlatforms>
88
<AppType>Application</AppType>
99
<FrameworkType>VCL</FrameworkType>
@@ -73,7 +73,7 @@
7373
<VerInfo_MinorVer>12</VerInfo_MinorVer>
7474
<VerInfo_Locale>1033</VerInfo_Locale>
7575
<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>
76-
<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>
76+
<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>
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Base_Win32)'!=''">
7979
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -101,8 +101,8 @@
101101
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
102102
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
103103
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
104-
<VerInfo_MinorVer>1</VerInfo_MinorVer>
105-
<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>
104+
<VerInfo_MinorVer>2</VerInfo_MinorVer>
105+
<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>
106106
<Icon_MainIcon>..\devcpp.ico</Icon_MainIcon>
107107
<VerInfo_MajorVer>6</VerInfo_MajorVer>
108108
</PropertyGroup>
@@ -115,8 +115,8 @@
115115
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
116116
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
117117
<DCC_ExeOutput>C:\Dev-Cpp\</DCC_ExeOutput>
118-
<VerInfo_MinorVer>1</VerInfo_MinorVer>
119-
<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>
118+
<VerInfo_MinorVer>2</VerInfo_MinorVer>
119+
<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>
120120
<Icon_MainIcon>..\devcpp.ico</Icon_MainIcon>
121121
<VerInfo_MajorVer>6</VerInfo_MajorVer>
122122
</PropertyGroup>

‎Source/main.dfm

+33-39
Original file line numberDiff line numberDiff line change
@@ -1621,7 +1621,7 @@ object MainForm: TMainForm
16211621
Top = 309
16221622
Width = 18
16231623
Height = 16
1624-
Caption = '6.1'
1624+
Caption = '6.2'
16251625
Font.Charset = DEFAULT_CHARSET
16261626
Font.Color = clRed
16271627
Font.Height = -13
@@ -4305,83 +4305,77 @@ object MainForm: TMainForm
43054305
Font.Style = []
43064306
ParentFont = False
43074307
end
4308-
object LabelDescOpen: TStaticText
4308+
object PanelDescOpen: TPanel
43094309
Left = 245
43104310
Top = 384
43114311
Width = 69
43124312
Height = 19
4313-
Alignment = taCenter
4314-
AutoSize = False
4315-
BorderStyle = sbsSingle
4313+
BevelOuter = bvNone
43164314
Caption = 'Ctr + O'
43174315
Color = clBtnShadow
4318-
ParentColor = False
4316+
ParentBackground = False
43194317
TabOrder = 0
4318+
StyleElements = [seFont, seBorder]
43204319
end
4321-
object LabelDescClear: TStaticText
4320+
object PanelDescSave: TPanel
43224321
Left = 245
4323-
Top = 522
4322+
Top = 413
43244323
Width = 69
43254324
Height = 19
4326-
Alignment = taCenter
4327-
AutoSize = False
4328-
BorderStyle = sbsSingle
4329-
Caption = 'Ctr + W'
4325+
BevelOuter = bvNone
4326+
Caption = 'Ctr + S'
43304327
Color = clBtnShadow
4331-
ParentColor = False
4328+
ParentBackground = False
43324329
TabOrder = 1
4330+
StyleElements = [seFont, seBorder]
43334331
end
4334-
object LabelDescCompile: TStaticText
4332+
object PanelDescZoom: TPanel
43354333
Left = 245
4336-
Top = 497
4334+
Top = 442
43374335
Width = 69
43384336
Height = 19
4339-
Alignment = taCenter
4340-
AutoSize = False
4341-
BorderStyle = sbsSingle
4342-
Caption = 'F9'
4337+
BevelOuter = bvNone
4338+
Caption = 'Ctr + Scroll'
43434339
Color = clBtnShadow
4344-
ParentColor = False
4340+
ParentBackground = False
43454341
TabOrder = 2
4342+
StyleElements = [seFont, seBorder]
43464343
end
4347-
object LabelDescRun: TStaticText
4344+
object PanelDescRun: TPanel
43484345
Left = 245
43494346
Top = 470
43504347
Width = 69
43514348
Height = 19
4352-
Alignment = taCenter
4353-
AutoSize = False
4354-
BorderStyle = sbsSingle
4349+
BevelOuter = bvNone
43554350
Caption = 'F10'
43564351
Color = clBtnShadow
4357-
ParentColor = False
4352+
ParentBackground = False
43584353
TabOrder = 3
4354+
StyleElements = [seFont, seBorder]
43594355
end
4360-
object LabelDescSave: TStaticText
4356+
object PanelDescCompile: TPanel
43614357
Left = 245
4362-
Top = 413
4358+
Top = 497
43634359
Width = 69
43644360
Height = 19
4365-
Alignment = taCenter
4366-
AutoSize = False
4367-
BorderStyle = sbsSingle
4368-
Caption = 'Ctr + S'
4361+
BevelOuter = bvNone
4362+
Caption = 'F9'
43694363
Color = clBtnShadow
4370-
ParentColor = False
4364+
ParentBackground = False
43714365
TabOrder = 4
4366+
StyleElements = [seFont, seBorder]
43724367
end
4373-
object LabelDescZoom: TStaticText
4368+
object PanelDescClear: TPanel
43744369
Left = 245
4375-
Top = 442
4370+
Top = 522
43764371
Width = 69
43774372
Height = 19
4378-
Alignment = taCenter
4379-
AutoSize = False
4380-
BorderStyle = sbsSingle
4381-
Caption = 'Ctr + Scroll'
4373+
BevelOuter = bvNone
4374+
Caption = 'Ctr + W'
43824375
Color = clBtnShadow
4383-
ParentColor = False
4376+
ParentBackground = False
43844377
TabOrder = 5
4378+
StyleElements = [seFont, seBorder]
43854379
end
43864380
end
43874381
object PanelRight: TPanel

0 commit comments

Comments
 (0)