Browse Source

FIX: Change default text encoding

Alexander Koblov 2 years ago
parent
commit
d016db9302
2 changed files with 6 additions and 5 deletions
  1. 2 2
      src/frames/foptionsmisc.pas
  2. 4 3
      src/uglobs.pas

+ 2 - 2
src/frames/foptionsmisc.pas

@@ -92,7 +92,7 @@ implementation
 {$R *.lfm}
 
 uses
-  fOptions, Forms, Dialogs, fMain, Controls,
+  LConvEncoding, fOptions, Forms, Dialogs, fMain, Controls,
   DCStrUtils, uDCUtils, uSpecialDir, uShowForm, uGlobs, uLng, uThumbnails,
   uConvEncoding, uEarlyConfig;
 
@@ -188,7 +188,7 @@ begin
   gThumbSize.cy        := speThumbHeight.Value;
   gGoToRoot            := chkGoToRoot.Checked;
   gShowCurDirTitleBar  := chkShowCurDirTitleBar.Checked;
-  gDefaultTextEncoding := cmbDefaultEncoding.Text;
+  gDefaultTextEncoding := NormalizeEncoding(cmbDefaultEncoding.Text);
 
   {$IFDEF MSWINDOWS}
   gTotalCommanderExecutableFilename := fneTCExecutableFilename.FileName;

+ 4 - 3
src/uglobs.pas

@@ -749,10 +749,11 @@ var
 implementation
 
 uses
-   LCLProc, LCLType, Dialogs, Laz2_XMLRead, LazUTF8, uExifWdx, uSynDiffControls,
+   LCLProc, LCLType, Dialogs, Laz2_XMLRead, LazUTF8, LConvEncoding, uExifWdx,
    uGlobsPaths, uLng, uShowMsg, uFileProcs, uOSUtils, uFindFiles, uEarlyConfig,
    uDCUtils, fMultiRename, uFile, uDCVersion, uDebug, uFileFunctions,
-   uDefaultPlugins, Lua, uKeyboard, DCOSUtils, DCStrUtils, uPixMapManager
+   uDefaultPlugins, Lua, uKeyboard, DCOSUtils, DCStrUtils, uPixMapManager,
+   uSynDiffControls
    {$IF DEFINED(MSWINDOWS)}
     , ShlObj
    {$ENDIF}
@@ -3054,7 +3055,7 @@ begin
       gHotDirFilenameStyle := TConfigFilenameStyle(GetValue(Node, 'FilenameStyle', ord(gHotDirFilenameStyle)));
       gHotDirPathToBeRelativeTo := gConfig.GetValue(Node, 'PathToBeRelativeTo', gHotDirPathToBeRelativeTo);
       gHotDirPathModifierElements := tHotDirPathModifierElements(GetValue(Node, 'PathModifierElements', Integer(gHotDirPathModifierElements)));
-      gDefaultTextEncoding := GetValue(Node, 'DefaultTextEncoding', gDefaultTextEncoding);
+      gDefaultTextEncoding := NormalizeEncoding(GetValue(Node, 'DefaultTextEncoding', gDefaultTextEncoding));
     end;
 
     { Thumbnails }