IDE: Fix EditorOptions (Export Html), the index depended on the OS IFDEF

This commit is contained in:
Martin 2023-06-13 20:34:35 +02:00
parent 6a84f7039d
commit e040e5626d

View File

@ -114,17 +114,18 @@ begin
begin begin
// visual effects // visual effects
//Items.Add(dlgShowGutterHints); // unimplemented //Items.Add(dlgShowGutterHints); // unimplemented
Items.Add(lisShowSpecialCharacters); Items.Add(lisShowSpecialCharacters); // 0
// spaces // spaces
Items.Add(dlgTrimTrailingSpaces); Items.Add(dlgTrimTrailingSpaces); // 1
// copying // copying
Items.Add(dlgFindTextatCursor); Items.Add(dlgFindTextatCursor); // 2
Items.Add(dlgCopyWordAtCursorOnCopyNone); Items.Add(dlgCopyWordAtCursorOnCopyNone); // 3
Items.Add(dlgCopyPasteKeepFolds); Items.Add(dlgCopyPasteKeepFolds); // 4
{$IFDEF WinIME} Items.Add(dlgEditExportBackColor); // 5
Items.Add(dlgUseMinimumIme);
{$IFDEF WinIME} // Keep last, or all subsequnt indexes will depend on it
Items.Add(dlgUseMinimumIme); // 6
{$ENDIF} {$ENDIF}
Items.Add(dlgEditExportBackColor);
end; end;
EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeLeaveLine); EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeLeaveLine);
EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeEditLine); EditorTrimSpaceTypeComboBox.Items.Add(dlgTrimSpaceTypeEditLine);
@ -158,10 +159,10 @@ begin
Checked[2] := FindTextAtCursor; Checked[2] := FindTextAtCursor;
Checked[3] := CopyWordAtCursorOnCopyNone; Checked[3] := CopyWordAtCursorOnCopyNone;
Checked[4] := eoFoldedCopyPaste in SynEditOptions2; Checked[4] := eoFoldedCopyPaste in SynEditOptions2;
Checked[5] := ExportHtmlWithBackground;
{$IFDEF WinIME} {$IFDEF WinIME}
Checked[5] := UseMinimumIme; Checked[6] := UseMinimumIme;
{$ENDIF} {$ENDIF}
Checked[6] := ExportHtmlWithBackground;
with ScrollOnEditLeftOptions do begin with ScrollOnEditLeftOptions do begin
edLeftDist.Value := KeepBorderDistance; edLeftDist.Value := KeepBorderDistance;
@ -205,10 +206,10 @@ begin
else else
SynEditOptions2 := SynEditOptions2 - [eoFoldedCopyPaste]; SynEditOptions2 := SynEditOptions2 - [eoFoldedCopyPaste];
TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeComboBox.ItemIndex); TrimSpaceType := TSynEditStringTrimmingType(EditorTrimSpaceTypeComboBox.ItemIndex);
ExportHtmlWithBackground := EditorOptionsGroupBox.Checked[5];
{$IFDEF WinIME} {$IFDEF WinIME}
UseMinimumIme := EditorOptionsGroupBox.Checked[5]; UseMinimumIme := EditorOptionsGroupBox.Checked[6];
{$ENDIF} {$ENDIF}
ExportHtmlWithBackground := EditorOptionsGroupBox.Checked[6];
with ScrollOnEditLeftOptions do begin with ScrollOnEditLeftOptions do begin
KeepBorderDistance := edLeftDist.Value; KeepBorderDistance := edLeftDist.Value;