Skip to content

Commit

Permalink
- Added "Wordwrap option" for the editor (active by default)
Browse files Browse the repository at this point in the history
- Added "Layout Views"
- Fixed Menu over Editor Toolbar and Captions when collapsed
- Updated the latest Image32 library
  • Loading branch information
carloBarazzetta committed Mar 1, 2025
1 parent 3cf126e commit f56c2a8
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 26 deletions.
6 changes: 3 additions & 3 deletions Ext/SynEdit/Source/SynEditOptionsDialog.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -602,13 +602,13 @@ object fmEditorOptionsDialog: TfmEditorOptionsDialog
Caption = 'Show special chars'
TabOrder = 21
end
object ckCompleteBrackets: TCheckBox
object ckWordWrap: TCheckBox
Left = 9
Top = 224
Width = 170
Height = 17
Hint = 'Auto complete brackets'
Caption = 'Complete brackets'
Hint = 'Enable wrapping of long lines'
Caption = 'Word wrap'
TabOrder = 22
end
object ckCompleteQuotes: TCheckBox
Expand Down
6 changes: 3 additions & 3 deletions Ext/SynEdit/Source/SynEditOptionsDialog.pas
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ TfmEditorOptionsDialog = class(TForm)
btnFont: TButton;
Panel3: TPanel;
labFont: TLabel;
ckCompleteBrackets: TCheckBox;
ckWordWrap: TCheckBox;
ckCompleteQuotes: TCheckBox;
procedure PopupMenuClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
Expand Down Expand Up @@ -635,7 +635,7 @@ procedure TfmEditorOptionsDialog.GetData;
ckDisableScrollArrows.Checked := eoDisableScrollArrows in FSynEdit.ScrollOptions;
ckHideShowScrollbars.Checked := eoHideShowScrollbars in FSynEdit.ScrollOptions;
ckShowSpecialChars.Checked := FSynEdit.VisibleSpecialChars <> [];
ckCompleteBrackets.checked := eoCompleteBrackets in FSynEdit.Options;
ckWordWrap.checked := FSynEdit.WordWrap;
ckCompleteQuotes.checked := eoCompleteQuotes in FSynEdit.Options;
//Caret
cInsertCaret.ItemIndex:= ord(FSynEdit.InsertCaret);
Expand Down Expand Up @@ -714,8 +714,8 @@ procedure TfmEditorOptionsDialog.PutData;
SetFlag(eoEnhanceHomeKey, ckEnhanceHomeKey.Checked);
SetFlag(eoEnhanceEndKey, ckEnhanceEndKey.Checked);
SetFlag(eoGroupUndo, ckGroupUndo.Checked);
SetFlag(eoCompleteBrackets, ckCompleteBrackets.checked);
SetFlag(eoCompleteQuotes, ckCompleteQuotes.checked);
FSynEdit.WordWrap := ckWordWrap.checked;
FSynEdit.Options := EdOptions;
SetScrollFlag(eoHalfPageScroll, ckHalfPageScroll.Checked);
SetScrollFlag(eoScrollByOneLess, ckScrollByOneLess.Checked);
Expand Down
4 changes: 2 additions & 2 deletions README.htm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
</style>
<h1>Markdown Editor and Shell Extensions <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg" alt="License"/></a></h1>
<p><strong>Latest Version 2.4.0 - 23 Feb 2025</strong></p>
<p><strong>Latest Version 2.4.0 - 01 Mar 2025</strong></p>
<p><strong>A collection of tools for markdown files, to edit and view content:</strong></p>
<ul>
<li><p>A <strong>Markdown Text Editor</strong> to manually edit a markdown file, with instant preview of the output in a HTML Viewer.</p>
Expand Down Expand Up @@ -81,7 +81,7 @@ <h3>Manual Build and Installation (only for Delphi developers)</h3>
</li>
</ol>
<h2>Release Notes</h2>
<p>23 Feb 2025: ver. 2.4.0</p>
<p>01 Mar 2025: ver. 2.4.0</p>
<ul>
<li>Added &ldquo;Wordwrap option&rdquo; for the editor (active by default)</li>
<li>Added &ldquo;Layout Views&rdquo;</li>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Markdown Editor and Shell Extensions [![License](https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg)](https://opensource.org/licenses/Apache-2.0)

**Latest Version 2.4.0 - 23 Feb 2025**
**Latest Version 2.4.0 - 01 Mar 2025**

**A collection of tools for markdown files, to edit and view content:**

Expand Down Expand Up @@ -67,7 +67,7 @@ To manually install the SVGShellExtensions.dll follow these steps:

## Release Notes ##

23 Feb 2025: ver. 2.4.0
01 Mar 2025: ver. 2.4.0
- Added "Wordwrap option" for the editor (active by default)
- Added "Layout Views"
- Fixed Menu over Editor Toolbar and Captions when collapsed
Expand Down
Binary file modified Source/MDShellEx.Splash.dfm
Binary file not shown.
8 changes: 4 additions & 4 deletions Source/MDTextEditor.ViewerMainForm.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -336,10 +336,10 @@ object frmMain: TfrmMain
TabOrder = 1
object lblTitle: TLabel
AlignWithMargins = True
Left = 41
Left = 45
Top = 3
Width = 116
Height = 15
Height = 32
Align = alLeft
Caption = 'MarkDown Text Editor'
Layout = tlCenter
Expand Down Expand Up @@ -423,11 +423,11 @@ object frmMain: TfrmMain
AlignWithMargins = True
Left = 3
Top = 3
Width = 32
Width = 36
Height = 32
Align = alLeft
ButtonHeight = 32
ButtonWidth = 32
ButtonWidth = 36
Images = VirtualImageList
Indent = 3
TabOrder = 1
Expand Down
9 changes: 5 additions & 4 deletions Source/MDTextEditor.ViewerMainForm.pas
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ interface

const
SET_FILE_NAME = 'HiglightSettings';
SV_COLLAPSED_WIDTH = 38;
SV_COLLAPSED_WIDTH_WITH_SCROLLBARS = 50;
SV_COLLAPSED_WIDTH = 42;
SV_COLLAPSED_WIDTH_WITH_SCROLLBARS = 60;


resourcestring
Expand Down Expand Up @@ -529,9 +529,10 @@ procedure TEditingFile.ShowMarkDownAsHTML(const ASettings: TEditorSettings;
HtmlViewer.DefFontName := ASettings.HTMLFontName;
LStream := TStringStream.Create(FMarkDownFile.HTML, TEncoding.UTF8);
try
//HtmlViewer.LoadFromStream(LStream); si "perde" i caratteri speciali unicode codepoint
HtmlViewer.Text := LStream.DataString;
//HtmlViewer.LoadFromStream(LStream); //si "perde" i caratteri speciali unicode codepoint
HtmlViewer.LoadFromString(LStream.DataString);
HtmlViewer.VScrollBarPosition := LOldPos;
HtmlViewer.Refresh;
dmResources.StopLoadingImages(False);
finally
LStream.Free;
Expand Down
10 changes: 5 additions & 5 deletions Source/SynEditOptionsDialog.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,14 @@ object fmEditorOptionsDialog: TfmEditorOptionsDialog
object Label8: TLabel
Left = 9
Top = 27
Width = 58
Width = 59
Height = 15
Caption = 'Extra Lines:'
end
object Label9: TLabel
Left = 9
Top = 56
Width = 57
Width = 56
Height = 15
Caption = 'Tab Width:'
end
Expand Down Expand Up @@ -602,13 +602,13 @@ object fmEditorOptionsDialog: TfmEditorOptionsDialog
Caption = 'Show special chars'
TabOrder = 21
end
object ckCompleteBrackets: TCheckBox
object ckWordWrap: TCheckBox
Left = 9
Top = 224
Width = 170
Height = 17
Hint = 'Auto complete brackets'
Caption = 'Complete brackets'
Hint = 'Enable wrapping of long lines'
Caption = 'Word wrap'
TabOrder = 22
end
object ckCompleteQuotes: TCheckBox
Expand Down
6 changes: 3 additions & 3 deletions Source/SynEditOptionsDialog.pas
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ TfmEditorOptionsDialog = class(TForm)
btnFont: TStyledButton;
Panel3: TPanel;
labFont: TLabel;
ckCompleteBrackets: TCheckBox;
ckWordWrap: TCheckBox;
ckCompleteQuotes: TCheckBox;
procedure PopupMenuClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
Expand Down Expand Up @@ -638,7 +638,7 @@ procedure TfmEditorOptionsDialog.GetData;
ckDisableScrollArrows.Checked := eoDisableScrollArrows in FSynEdit.ScrollOptions;
ckHideShowScrollbars.Checked := eoHideShowScrollbars in FSynEdit.ScrollOptions;
ckShowSpecialChars.Checked := FSynEdit.VisibleSpecialChars <> [];
ckCompleteBrackets.checked := eoCompleteBrackets in FSynEdit.Options;
ckWordWrap.checked := FSynEdit.WordWrap;
ckCompleteQuotes.checked := eoCompleteQuotes in FSynEdit.Options;
//Caret
cInsertCaret.ItemIndex:= ord(FSynEdit.InsertCaret);
Expand Down Expand Up @@ -717,8 +717,8 @@ procedure TfmEditorOptionsDialog.PutData;
SetFlag(eoEnhanceHomeKey, ckEnhanceHomeKey.Checked);
SetFlag(eoEnhanceEndKey, ckEnhanceEndKey.Checked);
SetFlag(eoGroupUndo, ckGroupUndo.Checked);
SetFlag(eoCompleteBrackets, ckCompleteBrackets.checked);
SetFlag(eoCompleteQuotes, ckCompleteQuotes.checked);
FSynEdit.WordWrap := ckWordWrap.checked;
FSynEdit.Options := EdOptions;
SetScrollFlag(eoHalfPageScroll, ckHalfPageScroll.Checked);
SetScrollFlag(eoScrollByOneLess, ckScrollByOneLess.Checked);
Expand Down

0 comments on commit f56c2a8

Please sign in to comment.