Skip to content

Commit 4e7635c

Browse files
carloBarazzettacarloBarazzetta
committed
ver.1.2.2
Fixed #8 wrong GUID Name Fixed #9 Opening file from menu-context (don't show preview) Added support for storing (and remember) Editor Options
1 parent c250f3c commit 4e7635c

23 files changed

+284
-423
lines changed

‎Icons/setup_512.png‎

43.9 KB
Loading

‎Setup/License_ENG.rtf‎

4 Bytes
Binary file not shown.

‎Setup/Licenza_ITA.rtf‎

4 Bytes
Binary file not shown.

‎Setup/Output/SVGShellExtensionsSetup.exe‎

-1.41 KB
Binary file not shown.

‎Setup/SVGShellExtensions.iss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
3-
#define MyAppName 'SVG Shell Extensions and Text Editor'
4-
#define MyAppVersion '1.2.1'
3+
#define MyAppName 'SVG Shell Extensions and SVG Text Editor'
4+
#define MyAppVersion '1.2.2'
55

66
[Setup]
77
UsePreviousLanguage=no

‎Setup/WizEtheaImage.bmp‎

-50.4 KB
Binary file not shown.

‎Source/EditorMainForm.pas‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ TfrmMain = class(TForm)
272272
gsSearchTextHistory: string;
273273
gsReplaceText: string;
274274
gsReplaceTextHistory: string;
275-
EditorOptions: TSynEditorOptionsContainer;
275+
FEditorOptions: TSynEditorOptionsContainer;
276276
FFontSize: Integer;
277277
procedure CloseSplitViewMenu;
278278
procedure UpdateHighlighters;
@@ -510,6 +510,7 @@ procedure TfrmMain.FormDestroy(Sender: TObject);
510510
EditFileList.Free;
511511
SynEditPrint.Free;
512512
FEditorSettings.Free;
513+
FEditorOptions.Free;
513514
inherited;
514515
end;
515516

@@ -717,7 +718,7 @@ procedure TfrmMain.FormClose(Sender: TObject; var Action: TCloseAction);
717718
else
718719
LCurrentFileName := '';
719720
FEditorSettings.UpdateOpenedFiles(LFileList, LCurrentFileName);
720-
FEditorSettings.WriteSettings(nil);
721+
FEditorSettings.WriteSettings(nil, FEditorOptions);
721722
finally
722723
LFileList.Free;
723724
end;
@@ -748,8 +749,8 @@ procedure TfrmMain.FormCreate(Sender: TObject);
748749
begin
749750
//creo la lista dei files aperti
750751
EditFileList := TObjectList.Create(True);
751-
752-
FEditorSettings := TEditorSettings.CreateSettings(nil);
752+
FEditorOptions := TSynEditorOptionsContainer.create(self);
753+
FEditorSettings := TEditorSettings.CreateSettings(nil, FEditorOptions);
753754
if not IsStyleHookRegistered(TCustomSynEdit, TScrollingStyleHook) then
754755
TStyleManager.Engine.RegisterStyleHook(TCustomSynEdit, TScrollingStyleHook);
755756

@@ -792,6 +793,7 @@ procedure TfrmMain.FormCreate(Sender: TObject);
792793
//Carico l'eventuale file esterno
793794
InitialDir := ParamStr(1);
794795
OpenFile(ParamStr(1));
796+
AssignSVGToImage;
795797
end
796798
else
797799
InitialDir := '.';
@@ -920,7 +922,7 @@ function TfrmMain.AddEditingFile(EditingFile: TEditingFile): Integer;
920922
Editor.SearchEngine := SynEditSearch;
921923
Editor.PopupMenu := popEditor;
922924
//Assegna le preferenze dell'utente
923-
EditorOptions.AssignTo(Editor);
925+
FEditorOptions.AssignTo(Editor);
924926
Editor.MaxScrollWidth := 3000;
925927
EditingFile.SynEditor := Editor;
926928
UpdateFromSettings(Editor);
@@ -1214,11 +1216,13 @@ procedure TfrmMain.actnEditOptionsExecute(Sender: TObject);
12141216
LEditOptionsDialog: TSynEditOptionsDialog;
12151217
begin
12161218
if CurrentEditor <> nil then
1217-
EditorOptions.Assign(CurrentEditor);
1219+
FEditorOptions.Assign(CurrentEditor);
12181220
LEditOptionsDialog := TSynEditOptionsDialog.Create(nil);
12191221
try
1220-
if LEditOptionsDialog.Execute(EditorOptions) then
1222+
if LEditOptionsDialog.Execute(FEditorOptions) then
1223+
begin
12211224
UpdateEditorsOptions;
1225+
end;
12221226
finally
12231227
LEditOptionsDialog.Free;
12241228
end;
@@ -1229,21 +1233,24 @@ procedure TfrmMain.UpdateEditorsOptions;
12291233
i : integer;
12301234
EditingFile : TEditingFile;
12311235
begin
1236+
FEditorSettings.FontName := FEditorOptions.Font.Name;
1237+
EditorFontSize := FEditorOptions.Font.Size;
1238+
12321239
for i := 0 to EditFileList.Count -1 do
12331240
begin
12341241
EditingFile := TEditingFile(EditFileList.items[i]);
1235-
EditorOptions.AssignTo(EditingFile.SynEditor);
1242+
FEditorOptions.AssignTo(EditingFile.SynEditor);
12361243
end;
1237-
Statusbar.Panels[STATUSBAR_PANEL_FONTNAME].Text := EditorOptions.Font.Name;
1238-
Statusbar.Panels[STATUSBAR_PANEL_FONTSIZE].Text := IntToStr(EditorOptions.Font.Size);
1244+
Statusbar.Panels[STATUSBAR_PANEL_FONTNAME].Text := FEditorOptions.Font.Name;
1245+
Statusbar.Panels[STATUSBAR_PANEL_FONTSIZE].Text := IntToStr(FEditorOptions.Font.Size);
12391246
end;
12401247

12411248
procedure TfrmMain.UpdateFromSettings(AEditor: TSynEdit);
12421249
begin
12431250
if AEditor <> nil then
1244-
FEditorSettings.ReadSettings(AEditor.Highlighter)
1251+
FEditorSettings.ReadSettings(AEditor.Highlighter, self.FEditorOptions)
12451252
else
1246-
FEditorSettings.ReadSettings(nil);
1253+
FEditorSettings.ReadSettings(nil, self.FEditorOptions);
12471254
if FEditorSettings.FontSize >= MinfontSize then
12481255
EditorFontSize := FEditorSettings.FontSize
12491256
else
@@ -1265,7 +1272,7 @@ procedure TfrmMain.UpdateHighlighter(ASynEditor: TSynEdit);
12651272
ASynEditor.Highlighter := dmResources.GetSynHighlighter(
12661273
FEditorSettings.UseDarkStyle, LBackgroundColor);
12671274
//Assegna i colori "custom" all'Highlighter
1268-
FEditorSettings.ReadSettings(ASynEditor.Highlighter);
1275+
FEditorSettings.ReadSettings(ASynEditor.Highlighter, self.FEditorOptions);
12691276
end;
12701277

12711278
procedure TfrmMain.UpdateHighlighters;
@@ -1288,28 +1295,26 @@ procedure TfrmMain.actnEditingUpdate(Sender: TObject);
12881295
procedure TfrmMain.actnFontExecute(Sender: TObject);
12891296
begin
12901297
if Sender = actnEnlargeFont then
1291-
EditorFontSize := EditorOptions.Font.Size+1
1298+
EditorFontSize := FEditorOptions.Font.Size+1
12921299
else if Sender = actnReduceFont then
1293-
EditorFontSize := EditorOptions.Font.Size-1
1300+
EditorFontSize := FEditorOptions.Font.Size-1
12941301
else
12951302
Exit;
1296-
EditorOptions.Font.Size := EditorFontSize;
1303+
FEditorOptions.Font.Size := EditorFontSize;
12971304
UpdateEditorsOptions;
12981305
end;
12991306

13001307
procedure TfrmMain.InitEditorOptions;
13011308
begin
1302-
EditorOptions := TSynEditorOptionsContainer.create(self);
1303-
with EditorOptions do
1309+
with FEditorOptions do
13041310
begin
13051311
Font.Name := FEditorSettings.FontName;
13061312
Font.Size := EditorFontSize;
13071313
TabWidth := 2;
1308-
WantTabs := True;
1314+
WantTabs := False;
13091315
Options := Options - [eoSmartTabs];
13101316
Gutter.Font.Name := Font.Name;
13111317
Gutter.Font.Size := Font.Size;
1312-
Gutter.ShowLineNumbers := True;
13131318
end;
13141319
end;
13151320

@@ -1414,7 +1419,7 @@ procedure TfrmMain.actnColorSettingsExecute(Sender: TObject);
14141419
Title_SVGTextEditor,
14151420
CurrentEditor, FEditorSettings, True) then
14161421
begin
1417-
FEditorSettings.WriteSettings(CurrentEditor.Highlighter);
1422+
FEditorSettings.WriteSettings(CurrentEditor.Highlighter, FEditorOptions);
14181423
UpdateFromSettings(CurrentEditor);
14191424
UpdateHighlighters;
14201425
end;

‎Source/Main.pas‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ initialization
5454
{$ENDIF}
5555

5656
{$IFDEF WIN64}
57-
TSVGThumbnailProvider.RegisterThumbnailProvider(MySVG_ThumbnailProviderGUID_64,
57+
TSVGThumbnailProvider.RegisterThumbnailProvider(MySVG_ThumbnailProviderGUID,
5858
'SVG.ThumbnailProvider', 'Delphi SVG Thumbnail Provider 64bit');
5959
{$ELSE}
60-
TSVGThumbnailProvider.RegisterThumbnailProvider(MySVG_ThumbnailProviderGUID_64,
60+
TSVGThumbnailProvider.RegisterThumbnailProvider(MySVG_ThumbnailProviderGUID,
6161
'SVG.ThumbnailProvider', 'Delphi SVG Thumbnail Provider 32bit');
6262
{$ENDIF}
6363

‎Source/SVGPreviewForm.pas‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ procedure TFrmPreview.UpdateHighlighter;
215215
SynEdit.Highlighter := dmResources.GetSynHighlighter(
216216
FPreviewSettings.UseDarkStyle, LBackgroundColor);
217217
//Assegna i colori "custom" all'Highlighter
218-
FPreviewSettings.ReadSettings(SynEdit.Highlighter);
218+
FPreviewSettings.ReadSettings(SynEdit.Highlighter, nil);
219219
SynEdit.Gutter.Font.Name := SynEdit.Font.Name;
220220
{$IFNDEF DISABLE_STYLES}
221221
SynEdit.Gutter.Font.Color := StyleServices.GetSystemColor(clWindowText);
@@ -243,6 +243,7 @@ procedure TFrmPreview.FormCreate(Sender: TObject);
243243

244244
procedure TFrmPreview.FormDestroy(Sender: TObject);
245245
begin
246+
HideAboutForm;
246247
SaveSettings;
247248
TLogPreview.Add('TFrmEditor.FormDestroy');
248249
inherited;
@@ -292,7 +293,7 @@ procedure TFrmPreview.SaveSettings;
292293
FPreviewSettings.UpdateSettings(SynEdit.Font.Name,
293294
EditorFontSize,
294295
PanelEditor.Visible);
295-
FPreviewSettings.WriteSettings(SynEdit.Highlighter);
296+
FPreviewSettings.WriteSettings(SynEdit.Highlighter, nil);
296297
end;
297298
end;
298299

@@ -365,7 +366,7 @@ procedure TFrmPreview.ToolButtonReformatClick(Sender: TObject);
365366

366367
procedure TFrmPreview.UpdateFromSettings;
367368
begin
368-
FPreviewSettings.ReadSettings(SynEdit.Highlighter);
369+
FPreviewSettings.ReadSettings(SynEdit.Highlighter, nil);
369370
if FPreviewSettings.FontSize >= MinfontSize then
370371
EditorFontSize := FPreviewSettings.FontSize
371372
else
@@ -384,7 +385,7 @@ procedure TFrmPreview.ToolButtonSettingsClick(Sender: TObject);
384385
begin
385386
if ShowSettings(DialogPosRect, Title_SVGPreview, SynEdit, FPreviewSettings, True) then
386387
begin
387-
FPreviewSettings.WriteSettings(SynEdit.Highlighter);
388+
FPreviewSettings.WriteSettings(SynEdit.Highlighter, nil);
388389
UpdateFromSettings;
389390
end;
390391
end;

‎Source/SVGShellExtensionGroup.groupproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<ProjectGuid>{4F73178F-31F0-4189-979A-9A66BE38E029}</ProjectGuid>
44
</PropertyGroup>
55
<ItemGroup>
6-
<Projects Include="SVGShellExtensions.dproj">
6+
<Projects Include="SVGShellExtensions32.dproj">
77
<Dependencies/>
88
</Projects>
9-
<Projects Include="SVGShellExtensions32.dproj">
9+
<Projects Include="SVGShellExtensions.dproj">
1010
<Dependencies/>
1111
</Projects>
1212
<Projects Include="SVGTextEditor.dproj">
@@ -20,15 +20,6 @@
2020
<Default.Personality/>
2121
</BorlandProject>
2222
</ProjectExtensions>
23-
<Target Name="SVGShellExtensions">
24-
<MSBuild Projects="SVGShellExtensions.dproj"/>
25-
</Target>
26-
<Target Name="SVGShellExtensions:Clean">
27-
<MSBuild Projects="SVGShellExtensions.dproj" Targets="Clean"/>
28-
</Target>
29-
<Target Name="SVGShellExtensions:Make">
30-
<MSBuild Projects="SVGShellExtensions.dproj" Targets="Make"/>
31-
</Target>
3223
<Target Name="SVGShellExtensions32">
3324
<MSBuild Projects="SVGShellExtensions32.dproj"/>
3425
</Target>
@@ -38,6 +29,15 @@
3829
<Target Name="SVGShellExtensions32:Make">
3930
<MSBuild Projects="SVGShellExtensions32.dproj" Targets="Make"/>
4031
</Target>
32+
<Target Name="SVGShellExtensions">
33+
<MSBuild Projects="SVGShellExtensions.dproj"/>
34+
</Target>
35+
<Target Name="SVGShellExtensions:Clean">
36+
<MSBuild Projects="SVGShellExtensions.dproj" Targets="Clean"/>
37+
</Target>
38+
<Target Name="SVGShellExtensions:Make">
39+
<MSBuild Projects="SVGShellExtensions.dproj" Targets="Make"/>
40+
</Target>
4141
<Target Name="SVGTextEditor">
4242
<MSBuild Projects="SVGTextEditor.dproj"/>
4343
</Target>
@@ -48,13 +48,13 @@
4848
<MSBuild Projects="SVGTextEditor.dproj" Targets="Make"/>
4949
</Target>
5050
<Target Name="Build">
51-
<CallTarget Targets="SVGShellExtensions;SVGShellExtensions32;SVGTextEditor"/>
51+
<CallTarget Targets="SVGShellExtensions32;SVGShellExtensions;SVGTextEditor"/>
5252
</Target>
5353
<Target Name="Clean">
54-
<CallTarget Targets="SVGShellExtensions:Clean;SVGShellExtensions32:Clean;SVGTextEditor:Clean"/>
54+
<CallTarget Targets="SVGShellExtensions32:Clean;SVGShellExtensions:Clean;SVGTextEditor:Clean"/>
5555
</Target>
5656
<Target Name="Make">
57-
<CallTarget Targets="SVGShellExtensions:Make;SVGShellExtensions32:Make;SVGTextEditor:Make"/>
57+
<CallTarget Targets="SVGShellExtensions32:Make;SVGShellExtensions:Make;SVGTextEditor:Make"/>
5858
</Target>
5959
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
6060
</Project>

0 commit comments

Comments
 (0)