From 88e9566ccff9cab2847d8d606b9e77cc69cd2951 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Wed, 17 Jan 2024 23:00:08 +0100 Subject: [PATCH] adjust ini file name and settings --- config/ConfigFormUnit.cpp | 17 +++++++------- config/ConfigFormUnit.dfm | 48 +++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 36 deletions(-) diff --git a/config/ConfigFormUnit.cpp b/config/ConfigFormUnit.cpp index e64166b..499c337 100644 --- a/config/ConfigFormUnit.cpp +++ b/config/ConfigFormUnit.cpp @@ -702,7 +702,7 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender) } auto *ini = new TIniFile(".\\dd-hd.ini"); - auto *hd_ini = new TIniFile(".\\Warcraft_II_HD.ini"); + auto *hd_ini = new TIniFile(".\\Warcraft II BNE.ini"); if (ini->ReadString("ddraw", "configtheme", "Windows10") == "Cobalt XEMedia") { @@ -736,9 +736,9 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender) PresentationCbx->ItemIndex = 0; } - int cwidth = hd_ini->ReadInteger("Warcraft_II_HD", "Width", 0); - int cheight = hd_ini->ReadInteger("Warcraft_II_HD", "Height", 0); - int reso = hd_ini->ReadInteger("Warcraft_II_HD", "Resolution", 3); + int cwidth = hd_ini->ReadInteger("Game", "Width", 0); + int cheight = hd_ini->ReadInteger("Game", "Height", 0); + int reso = hd_ini->ReadInteger("Game", "Resolution", 3); if (!cwidth || !cheight) { ResolutionCbx->ItemIndex = reso <= 5 ? reso : 3; @@ -921,7 +921,7 @@ void TConfigForm::SaveSettings() return; auto *ini = new TIniFile(".\\dd-hd.ini"); - auto *hd_ini = new TIniFile(".\\Warcraft_II_HD.ini"); + auto *hd_ini = new TIniFile(".\\Warcraft II BNE.ini"); /* Display Settings */ @@ -949,11 +949,10 @@ void TConfigForm::SaveSettings() } if (ResolutionCbx->ItemIndex <= 5) { - hd_ini->WriteInteger( - "Warcraft_II_HD", "Resolution", ResolutionCbx->ItemIndex); + hd_ini->WriteInteger("Game", "Resolution", ResolutionCbx->ItemIndex); - hd_ini->WriteInteger("Warcraft_II_HD", "Width", 0); - hd_ini->WriteInteger("Warcraft_II_HD", "Height", 0); + hd_ini->WriteInteger("Game", "Width", 0); + hd_ini->WriteInteger("Game", "Height", 0); if (ResolutionCbx->Items->Count == 7) { ResolutionCbx->Items->Delete(6); diff --git a/config/ConfigFormUnit.dfm b/config/ConfigFormUnit.dfm index 29b86ff..1c96d00 100644 --- a/config/ConfigFormUnit.dfm +++ b/config/ConfigFormUnit.dfm @@ -4,8 +4,8 @@ object ConfigForm: TConfigForm BorderIcons = [biSystemMenu, biMinimize] BorderStyle = bsSingle Caption = 'cnc-ddraw config' - ClientHeight = 476 - ClientWidth = 741 + ClientHeight = 475 + ClientWidth = 737 Color = clMenu Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -2681,14 +2681,14 @@ object ConfigForm: TConfigForm OnActivate = FormActivate OnCreate = FormCreate DesignSize = ( - 741 - 476) + 737 + 475) TextHeight = 13 object DisplayPnl: TPanel Left = 233 Top = 8 - Width = 499 - Height = 465 + Width = 495 + Height = 464 Anchors = [akLeft, akTop, akRight, akBottom] BevelOuter = bvNone Color = clWhite @@ -2697,8 +2697,8 @@ object ConfigForm: TConfigForm TabOrder = 1 StyleElements = [seFont, seBorder] DesignSize = ( - 499 - 465) + 495 + 464) object PresentationLbl: TLabel Left = 40 Top = 28 @@ -2776,7 +2776,7 @@ object ConfigForm: TConfigForm OnPaint = PboxPaint end object LanguageImg: TImage - Left = 453 + Left = 449 Top = 8 Width = 16 Height = 11 @@ -2803,6 +2803,7 @@ object ConfigForm: TConfigForm Stretch = True Visible = False OnClick = LanguageImgClick + ExplicitLeft = 453 end object ResolutionLbl: TLabel Left = 40 @@ -2884,7 +2885,7 @@ object ConfigForm: TConfigForm OnClick = DevmodeChkClick end object ThemePnl: TPanel - Left = 475 + Left = 471 Top = 8 Width = 16 Height = 11 @@ -2895,7 +2896,6 @@ object ConfigForm: TConfigForm TabOrder = 5 StyleElements = [seFont, seBorder] OnClick = ThemePnlClick - ExplicitLeft = 471 end object ResolutionCbx: TComboBox Left = 41 @@ -2926,8 +2926,8 @@ object ConfigForm: TConfigForm object CompatibilityPnl: TPanel Left = 233 Top = 8 - Width = 499 - Height = 465 + Width = 495 + Height = 464 Anchors = [akLeft, akTop, akRight, akBottom] BevelOuter = bvNone Color = clWhite @@ -2936,8 +2936,6 @@ object ConfigForm: TConfigForm TabOrder = 3 Visible = False StyleElements = [seFont, seBorder] - ExplicitWidth = 495 - ExplicitHeight = 464 object MaxgameticksLbl: TLabel Left = 40 Top = 28 @@ -3108,8 +3106,8 @@ object ConfigForm: TConfigForm object AdvancedPnl: TPanel Left = 233 Top = 8 - Width = 499 - Height = 465 + Width = 495 + Height = 464 Anchors = [akLeft, akTop, akRight, akBottom] BevelOuter = bvNone Color = clWhite @@ -3118,8 +3116,6 @@ object ConfigForm: TConfigForm TabOrder = 2 Visible = False StyleElements = [seFont, seBorder] - ExplicitWidth = 495 - ExplicitHeight = 464 object RendererLbl: TLabel Left = 40 Top = 28 @@ -3324,8 +3320,8 @@ object ConfigForm: TConfigForm object HotkeyPnl: TPanel Left = 233 Top = 8 - Width = 499 - Height = 465 + Width = 495 + Height = 464 Anchors = [akLeft, akTop, akRight, akBottom] BevelOuter = bvNone Color = clWhite @@ -3334,8 +3330,6 @@ object ConfigForm: TConfigForm TabOrder = 4 Visible = False StyleElements = [seFont, seBorder] - ExplicitWidth = 495 - ExplicitHeight = 464 object ToggleWindowedLbl: TLabel Left = 40 Top = 27 @@ -3557,16 +3551,15 @@ object ConfigForm: TConfigForm Left = 0 Top = 8 Width = 233 - Height = 468 + Height = 467 Anchors = [akLeft, akTop, akBottom] BevelOuter = bvNone Color = clMenu ParentBackground = False TabOrder = 0 - ExplicitHeight = 467 DesignSize = ( 233 - 468) + 467) object DisplayBtn: TSpeedButton Left = 0 Top = 8 @@ -3633,7 +3626,7 @@ object ConfigForm: TConfigForm end object RestoreDefaultsBtn: TSpeedButton Left = 0 - Top = 440 + Top = 439 Width = 227 Height = 22 Anchors = [akLeft, akRight, akBottom] @@ -3646,6 +3639,7 @@ object ConfigForm: TConfigForm Font.Style = [] ParentFont = False OnClick = RestoreDefaultsBtnClick + ExplicitTop = 440 end end end