Skip to content

Commit f11bd3a

Browse files
author
delphidabbler
committed
Merge branch 'feature/update-help' into develop
2 parents ad9ef03 + 75fa6e3 commit f11bd3a

File tree

85 files changed

+1382
-1250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1382
-1250
lines changed

Src/CodeSnip.todo

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
11
{TODO -cUI : Remove unused tool bar button in main window}
2-
3-
4-
{TODO -cHelp :
5-
Add a Backup Database task help topics that describes how to backup and restore databases.
6-
Then add help link to Res/HTML/dlg-dbupdate-intro-tplt.html}
7-
8-
92
{TODO -cPreRelease : Remove -[**dev**] from product and file versions in .vi files before bumping release number}

Src/Help/CSS/codesnip.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ table.menu td.desc {
145145
background-color: white;
146146
}
147147

148+
pre.reml,
149+
code.reml {
150+
color: purple;
151+
}
152+
148153
.indent {
149154
margin-left: 2em;
150155
}

Src/Help/CodeSnip.hhp

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
;
77
; CodeSnip help project file.
88

9-
109
[OPTIONS]
1110
Compatibility=1.1
1211
Compiled file=..\..\Exe\CodeSnip.chm
@@ -17,28 +16,32 @@ Index file=Index.hhk
1716
Language=0x809 English (United Kingdom)
1817
Title=CodeSnip Help
1918

20-
2119
[FILES]
2220
HTML\about_compiler_checks.htm
21+
HTML\about_swag.htm
2322
HTML\detail_pane.htm
2423
HTML\dlg_about.htm
2524
HTML\dlg_addcategory.htm
2625
HTML\dlg_backup.htm
2726
HTML\dlg_configcompilers.htm
2827
HTML\dlg_deletecategory.htm
2928
HTML\dlg_dependencies.htm
29+
HTML\dlg_dependencies_edit.htm
3030
HTML\dlg_duplicatesnippet.htm
3131
HTML\dlg_editsnippet.htm
3232
HTML\dlg_elementcolour.htm
3333
HTML\dlg_export.htm
3434
HTML\dlg_exportfile.htm
35+
HTML\dlg_favourites.htm
3536
HTML\dlg_findcompiler.htm
3637
HTML\dlg_findtext.htm
3738
HTML\dlg_findxrefs.htm
3839
HTML\dlg_firstrun.htm
40+
HTML\dlg_hilitemgr.htm
3941
HTML\dlg_import.htm
4042
HTML\dlg_importfile.htm
4143
HTML\dlg_loadselection.htm
44+
HTML\dlg_moveuserdb.htm
4245
HTML\dlg_pagesetup.htm
4346
HTML\dlg_preferences.htm
4447
HTML\dlg_prefs_codegen.htm
@@ -51,10 +54,12 @@ HTML\dlg_prefs_sourcecode.htm
5154
HTML\dlg_print.htm
5255
HTML\dlg_renamecategory.htm
5356
HTML\dlg_restore.htm
57+
HTML\dlg_savehiliter.htm
5458
HTML\dlg_saveselection.htm
5559
HTML\dlg_savesnippet.htm
5660
HTML\dlg_selectcompiler.htm
5761
HTML\dlg_selectroutines.htm
62+
HTML\dlg_swagimport.htm
5863
HTML\dlg_testcompile.htm
5964
HTML\dlg_trappedbugreport.htm
6065
HTML\dlg_update.htm
@@ -88,8 +93,8 @@ HTML\snippet_kinds.htm
8893
HTML\snippet_routine.htm
8994
HTML\snippet_type.htm
9095
HTML\snippet_unit.htm
91-
HTML\tasks.htm
9296
HTML\task_addsnippets.htm
97+
HTML\task_backup.htm
9398
HTML\task_copysnippet.htm
9499
HTML\task_customise.htm
95100
HTML\task_export.htm
@@ -99,13 +104,5 @@ HTML\task_savesnippet.htm
99104
HTML\task_search.htm
100105
HTML\task_testcompile.htm
101106
HTML\task_update.htm
107+
HTML\tasks.htm
102108
HTML\welcome.htm
103-
HTML\dlg_favourites.htm
104-
HTML\dlg_moveuserdb.htm
105-
HTML\dlg_savehiliter.htm
106-
HTML\dlg_hilitemgr.htm
107-
HTML\dlg_prefs_updates.htm
108-
HTML\notifiy_database_update.htm
109-
HTML\dlg_dependencies_edit.htm
110-
HTML\about_swag.htm
111-
HTML\dlg_swagimport.htm

Src/Help/HTML/about_compiler_checks.htm

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,15 @@ <h2>
5252
<em>Configure Compilers</em> dialogue box.
5353
</p>
5454
<p>
55-
Compiler configuration is stored on a per user basis, i.e. each user
56-
account maintains separate compiler configuration information. Therefore
57-
each user must configure compilers separately. The reason for this is that
58-
each user may wish to use a different set of available compilers and / or
59-
may wish to use different compiler switches and search paths.
55+
When using the standard version of CodeSnip, compiler configuration is
56+
stored on a per user basis, i.e. each user account maintains separate
57+
compiler configuration information. Therefore each user must configure
58+
compilers separately. The reason for this is that each user may wish to
59+
use a different set of available compilers and / or may wish to use
60+
different compiler switches and search paths.
61+
</p>
62+
<p>
63+
The portable version of CodeSnip only maintains one set of compiler configuration information per installation.
6064
</p>
6165
<h2>
6266
Running the tests

Src/Help/HTML/about_swag.htm

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,15 @@ <h1>
3737
<p>
3838
<em>CodeSnip</em> provides the
3939
<a href="dlg_swagimport.htm">SWAG Import Wizard</a> that enables you to
40-
browse the SWAG database and import any of its snippets into your own
41-
snippets database.
40+
browse a local copy of the SWAG database and import any of its snippets
41+
into your snippets database.
42+
</p>
43+
<p>
44+
You can download the database from the <a
45+
href="https://github.com/delphidabbler/swag"
46+
class="weblink"
47+
target="_blank"
48+
><code>delphidabbler/swag</code></a> project on GitHub. Go to the <em>releases</em> tab and download the latest version. Unpack the zip file into an empty folder then run the SWAG Import Wizard and navigate to the folder where you extracted the zip file contents.
4249
</p>
4350
</body>
4451
</html>

Src/Help/HTML/detail_pane.htm

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2>
3232
Tabs
3333
</h2>
3434
<p>
35-
Information is be displayed in one or more tabs. Items selected in the
35+
Information is displayed in one or more tabs. Items selected in the
3636
<a href="overview_pane.htm">Overview pane</a> are normally displayed in
3737
the currently selected tab, overwriting previous contents. This behaviour
3838
can be changed as follows:
@@ -63,7 +63,7 @@ <h2>
6363
</li>
6464
</ul>
6565
<p>
66-
When more than one tab is displayed you can quickly cycle through them
66+
When multiple tabs are displayed you can quickly cycle through them
6767
from left to right by pressing <span class="smallcaps">Ctrl+Tab</span> or
6868
from right to left using <span class="smallcaps">Shift+Ctrl+Tab</span>.
6969
</p>
@@ -74,7 +74,7 @@ <h2>
7474
<li>
7575
Close the selected tab using <em>Close Tab</em> menu option displayed on
7676
the <a href="menu_view.htm">View</a> menu, the detail pane's context
77-
menu and any tab's context menu. Alternatively press
77+
menu or any tab's context menu. Alternatively press
7878
<span class="smallcaps">Ctrl+F4</span>.
7979
</li>
8080
<li>
@@ -150,8 +150,8 @@ <h3>
150150
</li>
151151
</ul>
152152
<div>
153-
This information is not displayed for user-defined snippets. In the
154-
place of the images is a link that can be clicked to edit the snippet.
153+
This information is not displayed for user-defined snippets. Instead
154+
there is a link that can be clicked to edit the snippet.
155155
</div>
156156
</li>
157157
<li>
@@ -215,15 +215,15 @@ <h3>
215215
<p>
216216
Selecting a section header (a category, an intial letter or a <a
217217
href="snippet_kinds.htm"
218-
>snippet kind</a> in the <a
218+
>snippet kind</a>) in the <a
219219
href="overview_pane.htm"
220220
>Overview Pane</a> causes a table to be displayed in the detail pane that
221-
lists the name of the snippets contained in the section, along with their
221+
lists the names of the snippets contained in the section, along with their
222222
descriptions. Following a search, the listed snippets are just those
223223
contained in the current database selection, if any.
224224
</p>
225225
<p>
226-
Snippet names are links that, when clicked, displays the chosen snippet
226+
Snippet names are links that, when clicked, display the chosen snippet
227227
in the detail pane.
228228
</p>
229229
<p>
@@ -242,18 +242,18 @@ <h3>
242242
Database Update View
243243
</h3>
244244
<p>
245-
When the database has been updated, all open tabs are closed and a new tab
246-
created that simply informs that the database has been updated
247-
successfully.
245+
When the main DelphiDabbler Snippets database has been installed or
246+
updated, all open tabs are closed and a new tab is created that simply
247+
informs that the database has been updated successfully.
248248
</p>
249249
<h3>
250250
Empty Tab View
251251
</h3>
252252
<p>
253253
When a new tab is created (<em>View | New Tab</em> or <span
254254
class="smallcaps"
255-
>Ctrl+T</span>, nothing is displayed except &quot;Empty Tab&quot; in light
256-
grey.
255+
>Ctrl+T</span>), nothing is displayed except &quot;Empty Tab&quot; in
256+
light grey.
257257
</p>
258258
<h2>
259259
View History
@@ -277,7 +277,7 @@ <h2>
277277
>Alt+Right</span>.
278278
</p>
279279
<p>
280-
You can also jump directly to some recent views by selecting its name from
280+
You can also jump directly to a recent view by selecting its name from
281281
the drop-down menus adjacent to the <img
282282
alt="Previous button"
283283
src="../Images/GoBack.png"
@@ -292,22 +292,6 @@ <h2>
292292
Deleting or editing an existing snippet or category will clear the
293293
history.
294294
</p>
295-
<h2>
296-
Snippet and Category Links
297-
</h2>
298-
<p>
299-
Links to snippets or categories may be displayed as part of snippet or
300-
section contents views.
301-
</p>
302-
<p>
303-
Clicking a snippet link displays a snippet view for that snippet in the
304-
current tab of the details pane, Clicking a category link causes a
305-
section contents view to be displayed for the contents of the category,
306-
again in the current tab.
307-
</p>
308-
<p>
309-
Views displayed in this way are added to the history list.
310-
</p>
311295
</body>
312296
</html>
313297

Src/Help/HTML/dlg_about.htm

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ <h1>
2727
</h1>
2828
<p>
2929
This dialogue box provides various pieces of information about
30-
<em>CodeSnip</em> and the <em>Code Snippets Database</em>. It is accessed
31-
from the <em>Help | About</em> menu option.
30+
<em>CodeSnip</em> and the <em>DelphiDabbler Code Snippets Database</em>.
31+
It is accessed from the <em>Help | About</em> menu option.
3232
</p>
3333
<p>
34-
The program's version number is displayed in the heading of the dialogue
35-
box.
34+
The program's name and version number is displayed in the heading of the
35+
dialogue box.
3636
</p>
3737
<p>
3838
In addition the dialogue has three tabs, each of which is described below.
@@ -59,7 +59,8 @@ <h2>
5959
</p>
6060
<ul class="unspaced">
6161
<li>
62-
Where to find the <em>Code Snippets Database</em> online.
62+
A brief description of the database with a link to its <em>GitHub</em>
63+
project page.
6364
</li>
6465
<li>
6566
Licensing information.
@@ -89,8 +90,8 @@ <h3>
8990
</li>
9091
<li>
9192
<em>Main Database Directory</em> &ndash; the directory containing a
92-
local copy of the DelphiDabbler Code Snippets Database database. This
93-
directory may be empty if the user has not downloaded the database.
93+
copy of the DelphiDabbler Code Snippets Database. This directory may be
94+
empty if the database has not been installed.
9495
</li>
9596
<li>
9697
<em>User Database Directory</em> &ndash; the directory containing the
@@ -113,16 +114,16 @@ <h3>
113114
</h3>
114115
<p>
115116
The content of the program's application wide and per-user config files
116-
can be displayed by clicking the <em>View Application Config File</em> and
117-
<em>View Per-User Config File</em> buttons respectively.
117+
can be displayed by clicking the <em>View Application Config File</em>
118+
and <em>View Per-User Config File</em> buttons respectively.
118119
</p>
119120
<p>
120-
You can find documentation of the meaning of the config file entries in
121-
<em>CodeSnip<em>'s <a
121+
You can find documentation of the config file entries in
122+
<em>CodeSnip</em>'s <a
122123
href="https://github.com/delphidabbler/codesnip"
123124
class="weblink"
124125
target="_blank"
125-
>Git repository</a>.
126+
>GitHub repository</a>.
126127
</p>
127128
</body>
128129
</html>

Src/Help/HTML/dlg_addcategory.htm

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ <h1>
3838
accessed from the <em>Categories | New Category</em> menu option.
3939
</p>
4040
<p>
41-
Enter a description of the category in the edit box and click OK to add it
42-
to the database. The description you provided will be used to identify the
43-
category in program, so keep it brief.
41+
Enter a description of the category in the edit box and click <em>OK</em>
42+
to add it to the database. The description you provided will be used to
43+
identify the category in the user interface, so keep it brief.
4444
</p>
4545
<p>
46-
Leading and trailing spaces are ignored. If you enter an existing
46+
Leading and trailing spaces are ignored. If you enter a pre-existing
4747
description a warning to that effect is displayed below the edit box. The
48-
<em>OK</em> button will be disabled if you haven't entered any text or if
49-
the entry is not valid.
48+
<em>OK</em> button will be disabled if you haven't entered any text, if
49+
the entry is not valid or if it is a duplicate.
5050
</p>
5151
<p>
52-
Note that the new category may not appear in the
53-
<a href="overview_pane.htm">overview pane</a> because it is empty. It will
54-
however be available to use when editing snippets.
52+
Depending on your settings, the new category may not appear in the
53+
<a href="overview_pane.htm">overview pane</a>, because the category is
54+
empty. It will however be available to use when editing snippets.
5555
</p>
5656
</body>
5757
</html>

Src/Help/HTML/dlg_backup.htm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ <h1>
3535
<p>
3636
This Windows standard dialogue box is displayed when the <em>Database |
3737
Backup User Database</em> menu option is selected. Use the dialogue to
38-
specify the name and location of the file the will store the backup.
38+
specify the name and location of the file that will store the backup.
39+
</p>
40+
<p>
41+
No extension is added to the specified file name.
3942
</p>
4043
<p>
4144
Note that the entire database is stored in a single file.

0 commit comments

Comments
 (0)