Skip to content

Commit 4324d8c

Browse files
committed
Merged revision(s) 4620-4693 from tags/version-4.11.1:
This updates trunk development branch with changes made in release 4.11.1.
1 parent 4b2ca69 commit 4324d8c

File tree

9 files changed

+29
-23
lines changed

9 files changed

+29
-23
lines changed

Docs/ChangeLogs/ChangeLog-v4.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@
1111
; Change Log for CodeSnip Release 4
1212
; ------------------------------------------------------------------------------
1313

14-
Release v4.11.0 of
14+
Release v4.11.1 of 26 October 2014
15+
+ Corrected an erroneous error message that is displayed when circular snippet references are detected in the snippets editor (no bug report filed).
16+
+ Corrected some spelling errors in UI.
17+
+ Some documentation corrections.
18+
19+
Release v4.11.0 of 25 September 2014
1520
+ Changes re licensing of snippets from online Code Snippets Database under MIT license:
1621
- Generated code now carries a reference to the MIT license where relevant.
1722
- Submit Snippets wizard has a new page where user must confirm that any submitted snippets may be MIT licensed.

Docs/Design/FileFormats/config.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,18 +1327,20 @@ <h4>
13271327

13281328
<dl class="indent">
13291329
<dt>
1330-
<strong>AutoCheckProgram</strong> (Boolean)
1330+
<strong>AutoCheckProgramFrequency</strong> (Integer)
13311331
</dt>
13321332
<dd>
1333-
Flag indicating whether CodeSnip automatically checks online for program
1334-
updates.
1333+
Specifies frequency, in days, with which CodeSnip automatically checks
1334+
online for program updates. A value of 0 indicates that CodeSnip will not
1335+
check for program updates automatically.
13351336
</dd>
13361337
<dt>
1337-
<strong>AutoCheckDatabase</strong> (Boolean)
1338+
<strong>AutoCheckDatabaseFrequency</strong> (Integer)
13381339
</dt>
13391340
<dd>
1340-
Flag indicating whether CodeSnip automatically checks online for database
1341-
updates.
1341+
Specifies frequency, in days, with which CodeSnip automatically checks
1342+
online for database updates. A value of 0 indicates that CodeSnip will not
1343+
check for database updates automatically.
13421344
</dd>
13431345
</dl>
13441346

Docs/ReadMe.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ By default CodeSnip checks online periodically to find out whether the database
177177
has been updated. The checking process runs behind the scenes unless an update
178178
is available when CodeSnip will display a notification window at the bottom
179179
right of the main window. From the window you can display the "Update From Web"
180-
dialoge box which you can use to download the updated database.
180+
dialogue which you can use to download the updated database.
181181

182182
You can also check for updates manually by using the program's "Database |
183183
Update From Web" menu option. This displays the same "Update From Web" dialogue

Src/FmMain.dfm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -501,9 +501,7 @@ inherited MainForm: TMainForm
501501
object actCompilers: TAction
502502
Category = 'Tools'
503503
Caption = 'Configure Compilers...'
504-
Hint =
505-
'Configure Compilers|Display dialog box where required compilers ' +
506-
'can be configured'
504+
Hint = 'F'
507505
ImageIndex = 15
508506
OnExecute = actCompilersExecute
509507
end

Src/FmSnippetsEditorDlg.pas

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2008-2013, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2008-2014, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -1012,8 +1012,9 @@ procedure TSnippetsEditorDlg.ValidateData;
10121012
@except EDataEntry raised if data is not valid.
10131013
}
10141014
resourcestring
1015-
sDependencyPrompt = 'See the dependencies by clicking the View Dependencies '
1016-
+ 'button on the References tab.';
1015+
sDependencyPrompt = 'See the dependencies by right-clicking in the '
1016+
+ 'Dependencies list box on the References tab and selecting "View '
1017+
+ 'Dependencies" from the pop-up menu.';
10171018
var
10181019
ErrorMessage: string; // receives validation error messages
10191020
ErrorSelection: TSelection; // receives selection containing errors

Src/Help/HTML/dlg_prefs_hiliter.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
55
* obtain one at http://mozilla.org/MPL/2.0/
66
*
7-
* Copyright (C) 2007-2013, Peter Johnson (www.delphidabbler.com).
7+
* Copyright (C) 2007-2014, Peter Johnson (www.delphidabbler.com).
88
*
99
* $Rev$
1010
* $Date$
@@ -102,7 +102,7 @@ <h2>
102102
<em>User Defined Styles</em> &ndash; displays the
103103
<a href="dlg_hilitemgr.htm">User Defined Highlighters</a> dialogue box
104104
where any custom styles saved by the user can be selected. Saved
105-
highlighters can also be deleted from this dialog box.
105+
highlighters can also be deleted from this dialogue box.
106106
</li>
107107
<li>
108108
<em>No Highlighter</em> &ndash; no syntax highlighting used. You might

Src/UTestCompileUI.pas

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
44
* obtain one at http://mozilla.org/MPL/2.0/
55
*
6-
* Copyright (C) 2008-2013, Peter Johnson (www.delphidabbler.com).
6+
* Copyright (C) 2008-2014, Peter Johnson (www.delphidabbler.com).
77
*
88
* $Rev$
99
* $Date$
@@ -113,8 +113,8 @@ class procedure TTestCompileUI.HandleException(const E: Exception);
113113
resourcestring
114114
// Error messages for if a compiler fails to run
115115
sBadCompilerExe = 'Can''t run %0:s.' + EOL2
116-
+ 'Please open the Configure Compilers dialog box from the Tools menu and '
117-
+ 'change the path to the compiler''s executable file.';
116+
+ 'Please open the Configure Compilers dialogue box from the Tools menu '
117+
+ 'and change the path to the compiler''s executable file.';
118118
sCantRunCompiler = '%0:s failed to run with message:' + EOL2 + '"%1:s"';
119119
begin
120120
if E is ECompilerError then

Src/VCodeSnip.vi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212

1313
[Fixed File Info]
14-
File Version #=4, 11, 0, 248
15-
Product Version #=4, 11, 0, 0
14+
File Version #=4, 11, 1, 249
15+
Product Version #=4, 11, 1, 0
1616
File OS=4
1717
File Type=1
1818
File Sub-Type=0

Src/VCodeSnipPortable.vi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212

1313
[Fixed File Info]
14-
File Version #=4, 11, 0, 248
15-
Product Version #=4, 11, 0, 0
14+
File Version #=4, 11, 1, 249
15+
Product Version #=4, 11, 1, 0
1616
File OS=4
1717
File Type=1
1818
File Sub-Type=0

0 commit comments

Comments
 (0)