Skip to content

Commit 4730fd8

Browse files
maurizukimaurizuki
authored
v3.2 (#40)
* Update README.md * Update copyright + remove translation attribution * Update copyright * Update README.md * Update ReadMe.rtf * Version 3.2 * Build 563
1 parent 90cb155 commit 4730fd8

File tree

10 files changed

+38
-85
lines changed

10 files changed

+38
-85
lines changed

‎README.md‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ winget install --id=maurizuki.O2 -e
3030

3131
## Change log
3232

33+
### Version 3.2
34+
- Multi-language support (a.k.a. Italian translation) removed. The feature is deprecated and no longer supported in Delphi 12.
35+
- Import improvement: title, description and author are now imported.
36+
- *Import from XML* improvement: the file is no longer completely overwritten, as it is for the other imports.
37+
- *Export to XML* improvement: the export can now be limited to the selection, as it is for the other exports.
38+
- *Export to HTML*: new style sheet *"Sticky Notes"*.
39+
- *Export to HTML*: small improvements to the HTML code and CSS classes.
40+
3341
### Version 3.1
3442
- Cryptography enhancement: the cipher algorithm initialization vector is now randomly generated.
3543
- New feature: custom style sheets for *Export to HTML*. Each *.css* file found in the *Styles* folder can be selected in the *Style* menu of the preview window.
@@ -63,20 +71,20 @@ __delphi-markdown__
6371
Copyright (C) 2011+ Health Intersections Pty Ltd.
6472

6573
__Inno Setup__
66-
Copyright (C) 1997-2023 Jordan Russell.
67-
Portions Copyright (C) 2000-2023 Martijn Laan.
74+
Copyright (C) 1997-2025 Jordan Russell.
75+
Portions Copyright (C) 2000-2025 Martijn Laan.
6876

6977
__JEDI Visual Component Library__
70-
Copyright (C) 1999-2023 the Project JEDI community.
78+
Copyright (C) 1999-2025 the Project JEDI community.
7179

7280
__Spring4D__
73-
Copyright (C) 2009-2023 Spring4D Team.
81+
Copyright (C) 2009-2025 Spring4D Team.
7482

7583
__SZCRC32 unit__
7684
Copyright (C) 2004 Sasa Zeman.
7785

7886
__UPX - The Ultimate Packer for eXecutables__
79-
Copyright (C) 1996-2023 Markus Oberhumer, Laszlo Molnar, John Reiser.
87+
Copyright (C) 1996-2025 Markus Oberhumer, Laszlo Molnar, John Reiser.
8088

8189
__zxcvbn__
8290
Copyright (C) 2012-2016 Dan Wheeler and Dropbox, Inc.

‎setup/ReadMe.rtf‎

760 Bytes
Binary file not shown.

‎sf_net/upd8r.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<AppName>O2</AppName>
55
<AppVersion>
66
<MajorVersion>3</MajorVersion>
7-
<MinorVersion>1</MinorVersion>
7+
<MinorVersion>2</MinorVersion>
88
<Release>0</Release>
9-
<Build>557</Build>
9+
<Build>563</Build>
1010
</AppVersion>
1111
<DownloadURL>https://github.com/maurizuki/O2/releases/latest</DownloadURL>
1212
</Update>

‎src/Launcher/O2Portable.dproj‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
5656
<VerInfo_MajorVer>3</VerInfo_MajorVer>
5757
<VerInfo_Locale>1033</VerInfo_Locale>
58-
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2 Portable;FileVersion=3.1.0.0;InternalName=AppLauncher;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=O2Portable.exe;ProductName=O2;ProductVersion=3.1;Comments=</VerInfo_Keys>
58+
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2 Portable;FileVersion=3.2.0.0;InternalName=AppLauncher;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=O2Portable.exe;ProductName=O2;ProductVersion=3.2;Comments=</VerInfo_Keys>
5959
<DCC_OutputDRCFile>true</DCC_OutputDRCFile>
60-
<VerInfo_MinorVer>1</VerInfo_MinorVer>
60+
<VerInfo_MinorVer>2</VerInfo_MinorVer>
6161
</PropertyGroup>
6262
<PropertyGroup Condition="'$(Base_Win32)'!=''">
6363
<DCC_DependencyCheckOutputName>O2Portable.exe</DCC_DependencyCheckOutputName>
@@ -139,15 +139,8 @@
139139
<Source Name="MainSource">O2Portable.dpr</Source>
140140
</Source>
141141
<Excluded_Packages>
142-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
143-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
144-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclBaseExpert280.bpl">JCL Package containing common units for JCL Experts</Excluded_Packages>
145-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclDebugExpert280.bpl">JCL Debug IDE extension</Excluded_Packages>
146-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclProjectAnalysisExpert280.bpl">JCL Project Analyzer</Excluded_Packages>
147-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclFavoriteFoldersExpert280.bpl">JCL Open and Save IDE dialogs with favorite folders</Excluded_Packages>
148-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclRepositoryExpert280.bpl">JCL Package containing repository wizards</Excluded_Packages>
149-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclSIMDViewExpert280.bpl">JCL Debug Window of XMM registers</Excluded_Packages>
150-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclStackTraceViewerExpert280.bpl">JCL Stack Trace Viewer</Excluded_Packages>
142+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
143+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
151144
</Excluded_Packages>
152145
</Delphi.Personality>
153146
<Platforms>

‎src/Launcher/O2Portable.res‎

0 Bytes
Binary file not shown.

‎src/O2/o2.dproj‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@
5555
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;Xml.Win;System.Win;$(DCC_Namespace)</DCC_Namespace>
5656
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
5757
<VerInfo_MajorVer>3</VerInfo_MajorVer>
58-
<VerInfo_MinorVer>1</VerInfo_MinorVer>
58+
<VerInfo_MinorVer>2</VerInfo_MinorVer>
5959
<VerInfo_Build>445</VerInfo_Build>
6060
<VerInfo_Locale>1033</VerInfo_Locale>
6161
<VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
62-
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.1.0.445;InternalName=O2;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.1;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
62+
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.2.0.445;InternalName=O2;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.2;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
6363
</PropertyGroup>
6464
<PropertyGroup Condition="'$(Base_Win32)'!=''">
6565
<DCC_DependencyCheckOutputName>o2.exe</DCC_DependencyCheckOutputName>
@@ -68,8 +68,6 @@
6868
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
6969
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
7070
<Manifest_File>(None)</Manifest_File>
71-
<VerInfo_MinorVer>1</VerInfo_MinorVer>
72-
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.1.0.445;InternalName=O2;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.1;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
7371
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
7472
</PropertyGroup>
7573
<PropertyGroup Condition="'$(Base_Win64)'!=''">
@@ -89,10 +87,9 @@
8987
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
9088
<DCC_DependencyCheckOutputName>o2.exe</DCC_DependencyCheckOutputName>
9189
<SanitizedProjectName>o2</SanitizedProjectName>
92-
<VerInfo_Build>562</VerInfo_Build>
93-
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.1.0.562;InternalName=O2;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.1;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
90+
<VerInfo_Build>563</VerInfo_Build>
91+
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.2.0.563;InternalName=O2;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.2;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
9492
<BT_BuildType>Debug</BT_BuildType>
95-
<VerInfo_MinorVer>1</VerInfo_MinorVer>
9693
</PropertyGroup>
9794
<PropertyGroup Condition="'$(Cfg_2)'!=''">
9895
<Version>7.0</Version>
@@ -105,8 +102,7 @@
105102
<VerInfo_Debug>true</VerInfo_Debug>
106103
<BT_BuildType>Debug</BT_BuildType>
107104
<VerInfo_Build>462</VerInfo_Build>
108-
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.1.0.462;InternalName=O2;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.1;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
109-
<VerInfo_MinorVer>1</VerInfo_MinorVer>
105+
<VerInfo_Keys>CompanyName=The O2 Project;FileDescription=O2;FileVersion=3.2.0.462;InternalName=O2;LegalCopyright=(C) 2004-2025 Maurizio Basaglia. All rights reserved.;LegalTrademarks=;OriginalFilename=o2.exe;ProductName=O2;ProductVersion=3.2;Comments=A safe storage for your personal data.;Homepage=https://maurizuki.github.io/O2</VerInfo_Keys>
110106
</PropertyGroup>
111107
<ProjectExtensions>
112108
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -150,15 +146,8 @@
150146
<Source Name="MainSource">o2.dpr</Source>
151147
</Source>
152148
<Excluded_Packages>
153-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
154-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
155-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclBaseExpert280.bpl">JCL Package containing common units for JCL Experts</Excluded_Packages>
156-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclDebugExpert280.bpl">JCL Debug IDE extension</Excluded_Packages>
157-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclProjectAnalysisExpert280.bpl">JCL Project Analyzer</Excluded_Packages>
158-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclFavoriteFoldersExpert280.bpl">JCL Open and Save IDE dialogs with favorite folders</Excluded_Packages>
159-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclRepositoryExpert280.bpl">JCL Package containing repository wizards</Excluded_Packages>
160-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclSIMDViewExpert280.bpl">JCL Debug Window of XMM registers</Excluded_Packages>
161-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\JclStackTraceViewerExpert280.bpl">JCL Stack Trace Viewer</Excluded_Packages>
149+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
150+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
162151
</Excluded_Packages>
163152
<Language>
164153
<Language Name="ProjectLang">$00000409</Language>

‎src/O2/o2.res‎

0 Bytes
Binary file not shown.

‎src/O2/uAbout.dfm‎

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -365,18 +365,18 @@ object AboutForm: TAboutForm
365365
Left = 8
366366
Top = 87
367367
Width = 279
368-
Height = 196
368+
Height = 282
369369
Anchors = [akLeft, akTop, akRight]
370370
Caption = 'Acknowledgements'
371371
TabOrder = 0
372372
DesignSize = (
373373
279
374-
196)
374+
282)
375375
object Memo1: TMemo
376376
Left = 8
377377
Top = 24
378378
Width = 265
379-
Height = 161
379+
Height = 247
380380
TabStop = False
381381
Anchors = [akLeft, akTop, akRight, akBottom]
382382
BorderStyle = bsNone
@@ -388,21 +388,21 @@ object AboutForm: TAboutForm
388388
'Copyright (C) 2011+ Health Intersections Pty Ltd.'
389389
''
390390
'Inno Setup'
391-
'Copyright (C) 1997-2024 Jordan Russell.'
392-
'Portions Copyright (C) 2000-2023 Martijn Laan.'
391+
'Copyright (C) 1997-2025 Jordan Russell.'
392+
'Portions Copyright (C) 2000-2025 Martijn Laan.'
393393
''
394394
'JEDI Visual Component Library'
395-
'Copyright (C) 1999-2024 the Project JEDI '
395+
'Copyright (C) 1999-2025 the Project JEDI'
396396
'community.'
397397
''
398398
'Spring4D'
399-
'Copyright (C) 2009-2023 Spring4D Team.'
399+
'Copyright (C) 2009-2025 Spring4D Team.'
400400
''
401401
'SZCRC32 unit'
402402
'Copyright (C) 2004 Sasa Zeman.'
403403
''
404404
'UPX - The Ultimate Packer for eXecutables'
405-
'Copyright (C) 1996-2024 Markus Oberhumer, '
405+
'Copyright (C) 1996-2025 Markus Oberhumer,'
406406
'Laszlo Molnar, John Reiser.'
407407
''
408408
'zxcvbn'
@@ -413,7 +413,7 @@ object AboutForm: TAboutForm
413413
ReadOnly = True
414414
ScrollBars = ssVertical
415415
TabOrder = 0
416-
ExplicitWidth = 257
416+
ExplicitHeight = 161
417417
end
418418
end
419419
object btOk: TButton
@@ -426,7 +426,7 @@ object AboutForm: TAboutForm
426426
Caption = 'OK'
427427
Default = True
428428
ModalResult = 1
429-
TabOrder = 2
429+
TabOrder = 1
430430
end
431431
object btReadMe: TButton
432432
Left = 8
@@ -435,41 +435,7 @@ object AboutForm: TAboutForm
435435
Height = 25
436436
Anchors = [akLeft, akBottom]
437437
Caption = 'Release notes...'
438-
TabOrder = 3
438+
TabOrder = 2
439439
OnClick = btReadMeClick
440-
ExplicitTop = 384
441-
end
442-
object GroupBox1: TGroupBox
443-
Left = 8
444-
Top = 295
445-
Width = 279
446-
Height = 68
447-
Anchors = [akLeft, akTop, akRight]
448-
Caption = 'Translation'
449-
TabOrder = 1
450-
object Label3: TLabel
451-
Left = 8
452-
Top = 26
453-
Width = 130
454-
Height = 13
455-
Caption = 'English (US) translation by:'
456-
Color = clBtnFace
457-
Font.Charset = ANSI_CHARSET
458-
Font.Color = clBlack
459-
Font.Height = -11
460-
Font.Name = 'Tahoma'
461-
Font.Style = []
462-
ParentColor = False
463-
ParentFont = False
464-
ParentShowHint = False
465-
ShowHint = False
466-
end
467-
object Label4: TLabel
468-
Left = 8
469-
Top = 45
470-
Width = 81
471-
Height = 13
472-
Caption = 'Maurizio Basaglia'
473-
end
474440
end
475441
end

‎src/O2/uAbout.pas‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ TAboutForm = class(TForm)
2727
lbVersion: TLabel;
2828
Label1: TLabel;
2929
Label2: TLabel;
30-
GroupBox1: TGroupBox;
31-
Label3: TLabel;
32-
Label4: TLabel;
3330
GroupBox2: TGroupBox;
3431
btOk: TButton;
3532
btReadMe: TButton;

‎test-results.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Total |Failures |Errors |Ignored |Date
44
---------|---------|---------|---------|-----------------------------
5-
819 |0 |0 |0 |2025-05-14T10:49:39.389+02:00
5+
819 |0 |0 |0 |2025-05-14T14:35:11.350+02:00
66

77
## Namespace Testing
88

0 commit comments

Comments
 (0)