mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: Use chsdet component to detect text encoding in Viewer

Browse source
This commit is contained in:
Alexander Koblov 2011-12-10 20:35:37 +00:00
commit 428fe5fe05
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/viewer/viewercontrol.pas
View file

@ -71,6 +71,8 @@ type
TPtrIntList = specialize TFPGList<PtrInt>;
TGuessEncodingEvent = function(const s: string): string;
type
// If additional encodings are added they should be also supported by:
// - GetNextCharAsAscii
@ -161,6 +163,7 @@ type
FUpdateScrollBarPos: Boolean; // used to block updating of scrollbar
FScrollBarPosition: Integer; // for updating vertical scrollbar based on Position
FColCount: Integer;
FOnGuessEncoding: TGuessEncodingEvent;
function GetPercent: Integer;
procedure SetPercent(const AValue: Integer);
@ -375,6 +378,7 @@ type
property SelectionEnd: PtrInt Read FBlockEnd Write SetBlockEnd;
property EncodingName: string Read GetEncodingName Write SetEncodingName;
property ColCount: Integer Read FColCount Write SetColCount;
property OnGuessEncoding: TGuessEncodingEvent Read FOnGuessEncoding Write FOnGuessEncoding;
published
property ViewerMode: TViewerMode Read FViewerMode Write SetViewerMode default vmWrap;
@ -468,6 +472,7 @@ begin
FScrollBarPosition := 0;
FOnPositionChanged := nil;
FOnGuessEncoding := nil;
OnResize := @ViewerResize;
end;
@ -2735,7 +2740,11 @@ begin
DetectStringLength := FFileSize;
SetString(DetectString, PAnsiChar(FMappedFile), DetectStringLength);
DetectedEncodingName := LConvEncoding.GuessEncoding(DetectString);
if Assigned(FOnGuessEncoding) then
DetectedEncodingName := FOnGuessEncoding(DetectString)
else
DetectedEncodingName := LConvEncoding.GuessEncoding(DetectString);
if DetectedEncodingName <> '' then
begin

4
src/fviewer.pas
View file

@ -295,7 +295,7 @@ implementation
uses
FileUtil, IntfGraphics, uLng, uShowMsg, uGlobs, LCLType, LConvEncoding, uClassesEx,
uFindMmap, uDCUtils, LCLIntf, uDebug, uHotkeyManager;
uFindMmap, uDCUtils, LCLIntf, uDebug, uHotkeyManager, uConvEncoding;
const
HotkeysCategory = 'Viewer';
@ -1466,6 +1466,8 @@ begin
HMViewer := HotMan.Register(Self, HotkeysCategory);
HMViewer.RegisterActionList(actionList);
ViewerControl.OnGuessEncoding:= @DetectEncoding;
FontOptionsToFont(gFonts[dcfViewer], ViewerControl.Font);
FileList := TStringList.Create;