From d6b61f1f96b4b38d979fcd9b785b3b8b0f4cb0bc Mon Sep 17 00:00:00 2001
From: FMXExpress <eli@peacekeeper.com>
Date: Mon, 2 Nov 2020 06:00:44 -0800
Subject: [PATCH] Updated installer versions.

---
 NEWS.txt                    | 14 ++++++++++++++
 Source/devcpp.dproj         |  6 +++---
 Source/main.dfm             | 18 +-----------------
 devcppmingw64.nsi           |  2 +-
 devcppnocompiler.nsi        |  2 +-
 devcppnocompilerNoFonts.nsi |  2 +-
 devcpptdmgcc64.nsi          |  2 +-
 devcpptdmgcc64NoFonts.nsi   |  2 +-
 8 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/NEWS.txt b/NEWS.txt
index c69ad8e3..9de5563c 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,17 @@
+Version 6.1 - 2 November 2020
+
+ - Updated: C++ keyword highlighting. Added some C++20 keywords.
+ - Updated: Font ligature support.
+ - Updated: SVGIconImageList dependency
+ - Updated: SynEdit dependency.
+ - Updated: Text file loading and saving dialogs with Encodings.
+ - Added: Visual Studio Dark theme.
+ - Fixed: Automatic Tab widths.
+ - Fixed: Launching help from directory with spaces.
+ - Fixed: Welcome screen issue when canceling closing.
+ - Fixed: Shortcuts Form dark styling.
+ - Fixed: Crash in Issue #26.
+
 Version 6.0 - 12 October 2020
 
 - Upgraded TDM-GCC to 32/64 9.2.0.
diff --git a/Source/devcpp.dproj b/Source/devcpp.dproj
index ba59893e..a485ee21 100644
--- 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)'==''">Debug</Config>
+        <Config Condition="'$(Config)'==''">Release</Config>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
@@ -101,8 +101,8 @@
     <PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
         <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
-        <VerInfo_MinorVer>0</VerInfo_MinorVer>
-        <VerInfo_Keys>CompanyName=Embarcadero Technologies, Inc.;FileDescription=Embarcadero Dev C++;FileVersion=6.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=Embarcadero Dev C++;ProductVersion=6.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
+        <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>
         <Icon_MainIcon>..\devcpp.ico</Icon_MainIcon>
         <VerInfo_MajorVer>6</VerInfo_MajorVer>
     </PropertyGroup>
diff --git a/Source/main.dfm b/Source/main.dfm
index 009a07d6..a1717917 100644
--- a/Source/main.dfm
+++ b/Source/main.dfm
@@ -196,10 +196,6 @@ object MainForm: TMainForm
     OnChange = MessageControlChange
     object CompSheet: TTabSheet
       Caption = 'Compiler'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object CompilerOutput: TListView
         Left = 0
         Top = 0
@@ -244,10 +240,6 @@ object MainForm: TMainForm
     object ResSheet: TTabSheet
       Caption = 'Resource'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object ResourceOutput: TListView
         Left = 0
         Top = 0
@@ -522,10 +514,6 @@ object MainForm: TMainForm
     object FindSheet: TTabSheet
       Caption = 'Find results'
       ImageIndex = 4
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object FindOutput: TListView
         Left = 0
         Top = 0
@@ -616,10 +604,6 @@ object MainForm: TMainForm
     object CloseSheet: TTabSheet
       Caption = 'Close'
       ImageIndex = 6
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
     end
   end
   object ToolbarDock: TControlBar
@@ -1637,7 +1621,7 @@ object MainForm: TMainForm
           Top = 309
           Width = 18
           Height = 16
-          Caption = '6.0'
+          Caption = '6.1'
           Font.Charset = DEFAULT_CHARSET
           Font.Color = clRed
           Font.Height = -13
diff --git a/devcppmingw64.nsi b/devcppmingw64.nsi
index 2a75f451..facd11b5 100644
--- a/devcppmingw64.nsi
+++ b/devcppmingw64.nsi
@@ -3,7 +3,7 @@
 
 !define COMPILERNAME "TDM-GCC 4.9.2"
 !define COMPILERFOLDER "MinGW64"
-!define DEVCPP_VERSION "6.0"
+!define DEVCPP_VERSION "6.1"
 !define FINALNAME "Embarcadero_Dev-Cpp_${DEVCPP_VERSION}_${COMPILERNAME}_Setup.exe"
 !define DISPLAY_NAME "Embarcadero Dev-C++ ${DEVCPP_VERSION}"
 
diff --git a/devcppnocompiler.nsi b/devcppnocompiler.nsi
index dcdb3b49..f9c54eef 100644
--- a/devcppnocompiler.nsi
+++ b/devcppnocompiler.nsi
@@ -3,7 +3,7 @@
 
 !define COMPILERNAME "No Compiler"
 !define COMPILERFOLDER ""
-!define DEVCPP_VERSION "6.0"
+!define DEVCPP_VERSION "6.1"
 !define FINALNAME "Embarcadero_Dev-Cpp_${DEVCPP_VERSION}_${COMPILERNAME}_Setup.exe"
 !define DISPLAY_NAME "Embarcadero Dev-C++ ${DEVCPP_VERSION}"
 
diff --git a/devcppnocompilerNoFonts.nsi b/devcppnocompilerNoFonts.nsi
index deac355d..7f7c77e0 100644
--- a/devcppnocompilerNoFonts.nsi
+++ b/devcppnocompilerNoFonts.nsi
@@ -3,7 +3,7 @@
 
 !define COMPILERNAME "No Compiler"
 !define COMPILERFOLDER ""
-!define DEVCPP_VERSION "6.0"
+!define DEVCPP_VERSION "6.1"
 !define FINALNAME "Embarcadero_Dev-Cpp_${DEVCPP_VERSION}_${COMPILERNAME}_Setup.exe"
 !define DISPLAY_NAME "Embarcadero Dev-C++ ${DEVCPP_VERSION}"
 
diff --git a/devcpptdmgcc64.nsi b/devcpptdmgcc64.nsi
index 1169ebb6..6d2038af 100644
--- a/devcpptdmgcc64.nsi
+++ b/devcpptdmgcc64.nsi
@@ -3,7 +3,7 @@
 
 !define COMPILERNAME "TDM-GCC 9.2"
 !define COMPILERFOLDER "TDM-GCC-64"
-!define DEVCPP_VERSION "6.0"
+!define DEVCPP_VERSION "6.1"
 !define FINALNAME "Embarcadero_Dev-Cpp_${DEVCPP_VERSION}_${COMPILERNAME}_Setup.exe"
 !define DISPLAY_NAME "Embarcadero Dev-C++ ${DEVCPP_VERSION}"
 
diff --git a/devcpptdmgcc64NoFonts.nsi b/devcpptdmgcc64NoFonts.nsi
index 90d571a4..1a639821 100644
--- a/devcpptdmgcc64NoFonts.nsi
+++ b/devcpptdmgcc64NoFonts.nsi
@@ -3,7 +3,7 @@
 
 !define COMPILERNAME "TDM-GCC 9.2"
 !define COMPILERFOLDER "TDM-GCC-64"
-!define DEVCPP_VERSION "6.0"
+!define DEVCPP_VERSION "6.1"
 !define FINALNAME "Embarcadero_Dev-Cpp_${DEVCPP_VERSION}_${COMPILERNAME}_Setup.exe"
 !define DISPLAY_NAME "Embarcadero Dev-C++ ${DEVCPP_VERSION}"