Skip to content

Commit 29d90dc

Browse files
delphidabblerdelphidabbler
committed
Merged revision(s) 3709-4005, 3462-3709 from tags/version-4.8.4:
This updates the trunk with changes made in release 4.8.4.
1 parent b11fb69 commit 29d90dc

15 files changed

+249
-152
lines changed

‎Docs/ChangeLogs/ChangeLog-v4.txt‎

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

14+
Release v4.8.4 of 28 November 2013
15+
+ Improved user interface of SWAG Import Wizard.
16+
+ Renamed "Save Snippet" and "Copy Snippet" menu options to "Save Annotated Source" and "Copy Annotated Source". This fixes bug #90: " Wrong caption on menu option for copying category to clipboard" (http://bit.ly/ImA398).
17+
+ Revised and corrected numerous main menu and pop-up menu hints.
18+
+ Updated help file re changes to menu options and SWAG Import Wizards.
19+
1420
Release v4.8.3 of 06 November 2013
1521
+ Fixed registry access code so that the 64 bit view of the registry is used when CodeSnip runs on a Windows 64 bit operating system.
1622
+ Changed to avoid use of a deprecated API call when using the Windows Browse for Folder dialogue box.

‎Src/FmMain.dfm‎

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,10 @@ inherited MainForm: TMainForm
320320
Top = 96
321321
object actSaveSnippet: TAction
322322
Category = 'File'
323-
Caption = 'Save Snippet...'
324-
Hint = 'Save Snippet|Save current routine or category to a file'
323+
Caption = 'Save Annotated Source...'
324+
Hint =
325+
'Save the annotated source code of the selected routine or catego' +
326+
'ry to a file'
325327
ImageIndex = 18
326328
ShortCut = 24654
327329
OnExecute = actSaveSnippetExecute
@@ -348,8 +350,8 @@ inherited MainForm: TMainForm
348350
Category = 'File'
349351
Caption = 'Save Unit...'
350352
Hint =
351-
'Save unit|Saves a Pascal unit containing currently selected rout' +
352-
'ines to a file'
353+
'Save unit|Generates and saves a Pascal unit containing snippets ' +
354+
'from the current selection'
353355
ImageIndex = 14
354356
ShortCut = 16469
355357
OnExecute = actSaveUnitExecute
@@ -367,7 +369,7 @@ inherited MainForm: TMainForm
367369
object actEditSnippet: TAction
368370
Category = 'Snippets'
369371
Caption = 'Edit Snippet...'
370-
Hint = 'Edit Snippet|Edit the selected snippet in the database'
372+
Hint = 'Edit Snippet|Edit the selected snippet'
371373
ImageIndex = 28
372374
ShortCut = 16497
373375
OnExecute = actEditSnippetExecute
@@ -382,7 +384,7 @@ inherited MainForm: TMainForm
382384
object actAbout: TAction
383385
Category = 'Help'
384386
Caption = 'About...'
385-
Hint = 'About|Display the about box'
387+
Hint = 'About|Display the program'#39's about box'
386388
ImageIndex = 2
387389
OnExecute = actAboutExecute
388390
end
@@ -405,7 +407,7 @@ inherited MainForm: TMainForm
405407
Category = 'Search'
406408
Caption = 'Find Compiler...'
407409
Hint =
408-
'Find compiler|Search for all routines with specified compiler co' +
410+
'Find compiler|Search for all snippets with specified compiler co' +
409411
'mpatibility'
410412
ImageIndex = 4
411413
ShortCut = 24646
@@ -415,7 +417,7 @@ inherited MainForm: TMainForm
415417
object actFindText: TAction
416418
Category = 'Search'
417419
Caption = 'Find Text...'
418-
Hint = 'Find text|Search for all routines containing specified text'
420+
Hint = 'Find text|Search for all snippets containing specified text'
419421
ImageIndex = 3
420422
ShortCut = 16454
421423
OnExecute = actFindTextExecute
@@ -424,7 +426,7 @@ inherited MainForm: TMainForm
424426
object actGoBack: TAction
425427
Category = 'View'
426428
Caption = 'Previous'
427-
Hint = 'Previous|Display the previous item'
429+
Hint = 'Previous|Display the previous item in the history list'
428430
ImageIndex = 10
429431
ShortCut = 32805
430432
OnExecute = actGoBackExecute
@@ -433,18 +435,18 @@ inherited MainForm: TMainForm
433435
object actGoForward: TAction
434436
Category = 'View'
435437
Caption = 'Next'
436-
Hint = 'Next|Display the next item'
438+
Hint = 'Next|Display the next item in the history list'
437439
ImageIndex = 11
438440
ShortCut = 32807
439441
OnExecute = actGoForwardExecute
440442
OnUpdate = actGoForwardUpdate
441443
end
442444
object actCopySnippet: TAction
443445
Category = 'Edit'
444-
Caption = 'Copy Snippet'
446+
Caption = 'Copy Annotated Source'
445447
Hint =
446-
'Copy Snippet|Copy the annotated source code of selected routine ' +
447-
'or category to clipboard'
448+
'Copy the annotated source code of the selected routine or catego' +
449+
'ry to the clipboard'
448450
ShortCut = 16462
449451
OnExecute = actCopySnippetExecute
450452
OnUpdate = actCopySnippetUpdate
@@ -487,7 +489,7 @@ inherited MainForm: TMainForm
487489
object actWebSite: TBrowseURL
488490
Category = 'Help'
489491
Caption = 'DelphiDabbler Website'
490-
Hint = 'Visit website|Visit the DelphiDabbler website home page'
492+
Hint = 'Visit website|Visit the DelphiDabbler website'
491493
ImageIndex = 6
492494
end
493495
object actHelpQuickStart: TAction
@@ -508,7 +510,7 @@ inherited MainForm: TMainForm
508510
object actHelpCompChecks: TAction
509511
Category = 'Help'
510512
Caption = 'About Compiler Checks'
511-
Hint = 'About Compiler Checks|Display help about the Compiler Check pane'
513+
Hint = 'About Compiler Checks|Display help about test-compiling snippets'
512514
OnExecute = actHelpCompChecksExecute
513515
end
514516
object actHelpContents: TAction
@@ -522,7 +524,7 @@ inherited MainForm: TMainForm
522524
object actPreferences: TAction
523525
Category = 'Tools'
524526
Caption = 'Preferences...'
525-
Hint = 'Preferences|Customize the program'
527+
Hint = 'Preferences|Customise the program'
526528
ImageIndex = 16
527529
OnExecute = actPreferencesExecute
528530
end
@@ -543,13 +545,15 @@ inherited MainForm: TMainForm
543545
object actHomePage: TBrowseURL
544546
Category = 'Help'
545547
Caption = 'CodeSnip Home Page'
546-
Hint = 'Home Page|Visit CodeSnip'#39's home page'
548+
Hint = 'Home Page|Visit CodeSnip'#39's web page'
547549
ImageIndex = 6
548550
end
549551
object actFindXRefs: TAction
550552
Category = 'Search'
551553
Caption = 'Find Cross Refs...'
552-
Hint = 'Find X Refs|Search for cross references from selected routine'
554+
Hint =
555+
'Find X Refs|Search for cross references from the selected snippe' +
556+
't'
553557
ImageIndex = 20
554558
ShortCut = 16466
555559
OnExecute = actFindXRefsExecute
@@ -567,7 +571,7 @@ inherited MainForm: TMainForm
567571
object actFindClear: TAction
568572
Category = 'Search'
569573
Caption = 'Show All'
570-
Hint = 'Show all|Clear the last search and display all routines'
574+
Hint = 'Show all|Clear the last search and display all snippets'
571575
ImageIndex = 9
572576
ShortCut = 24641
573577
OnExecute = actFindClearExecute
@@ -617,7 +621,7 @@ inherited MainForm: TMainForm
617621
object actPrint: TAction
618622
Category = 'File'
619623
Caption = 'Print...'
620-
Hint = 'Print|Prints the current selected routine'
624+
Hint = 'Print|Print the selected snippet or category'
621625
ImageIndex = 24
622626
ShortCut = 16464
623627
OnExecute = actPrintExecute
@@ -640,15 +644,15 @@ inherited MainForm: TMainForm
640644
Category = 'Database'
641645
Caption = 'Restore User Database...'
642646
Hint =
643-
'Restore User Database|Restores user-defined database from a back' +
644-
'up'
647+
'Restore User Database|Restore user-defined database from a backu' +
648+
'p'
645649
ImageIndex = 32
646650
OnExecute = actRestoreDatabaseExecute
647651
end
648652
object actSaveDatabase: TAction
649653
Category = 'Database'
650654
Caption = 'Save User Database'
651-
Hint = 'Save Database|Saves all changes to user database'
655+
Hint = 'Save Database|Save all changes to user database'
652656
ImageIndex = 25
653657
ShortCut = 16467
654658
OnExecute = actSaveDatabaseExecute
@@ -687,8 +691,8 @@ inherited MainForm: TMainForm
687691
Category = 'Edit'
688692
Caption = 'Copy Information'
689693
Hint =
690-
'Copy Information|Copy the information about the selected snippet' +
691-
' to the keyboard.'
694+
'Copy Information|Copy information about the selected snippet to ' +
695+
'the keyboard.'
692696
ShortCut = 16457
693697
OnExecute = actCopyInfoExecute
694698
OnUpdate = actCopyInfoUpdate
@@ -746,7 +750,7 @@ inherited MainForm: TMainForm
746750
object actCopySource: TAction
747751
Category = 'Edit'
748752
Caption = 'Copy Source Code'
749-
Hint = 'Copy Source|Copies the source code of a snippet to the clipboard'
753+
Hint = 'Copy Source|Copy the source code of a snippet to the clipboard'
750754
ShortCut = 24643
751755
OnExecute = actCopySourceExecute
752756
OnUpdate = actCopySourceUpdate
@@ -762,22 +766,22 @@ inherited MainForm: TMainForm
762766
object actAddCategory: TAction
763767
Category = 'Categories'
764768
Caption = 'New Category...'
765-
Hint = 'New Category|Adds a new category to the database'
769+
Hint = 'New Category|Add a new category to the database'
766770
ImageIndex = 8
767771
OnExecute = actAddCategoryExecute
768772
end
769773
object actRenameCategory: TAction
770774
Category = 'Categories'
771775
Caption = 'Rename Category...'
772-
Hint = 'Rename Category|Renames a user defined category in the database'
776+
Hint = 'Rename Category|Rename a user defined category in the database'
773777
ImageIndex = 21
774778
OnExecute = actRenameCategoryExecute
775779
OnUpdate = actRenameCategoryUpdate
776780
end
777781
object actDeleteCategory: TAction
778782
Category = 'Categories'
779783
Caption = 'Delete Category...'
780-
Hint = 'Delete Category|Deletes an empty category from the database'
784+
Hint = 'Delete Category|Delete an empty category from the database'
781785
ImageIndex = 13
782786
OnExecute = actDeleteCategoryExecute
783787
OnUpdate = actDeleteCategoryUpdate
@@ -786,23 +790,23 @@ inherited MainForm: TMainForm
786790
Category = 'Help'
787791
Caption = 'CodeSnip News...'
788792
Hint =
789-
'CodeSnip News|News about updates to CodeSnip and the online data' +
790-
'base'
793+
'CodeSnip News|Display news about updates to CodeSnip and the onl' +
794+
'ine database'
791795
ImageIndex = 36
792796
OnExecute = actNewsExecute
793797
end
794798
object actNewDetailsTab: TAction
795799
Category = 'View'
796800
Caption = 'New Tab'
797-
Hint = 'New Tab|Creates a new empty tab the Details pane'
801+
Hint = 'New Tab|Create a new empty tab the Details pane'
798802
ImageIndex = 39
799803
ShortCut = 16468
800804
OnExecute = actNewDetailsTabExecute
801805
end
802806
object actCloseDetailsTab: TAction
803807
Category = 'View'
804808
Caption = 'Close Tab'
805-
Hint = 'Close Tab|Closes the currently selected tab in the Details pane'
809+
Hint = 'Close Tab|Close the currently selected tab in the Details pane'
806810
ImageIndex = 38
807811
ShortCut = 16499
808812
SecondaryShortCuts.Strings = (
@@ -828,7 +832,9 @@ inherited MainForm: TMainForm
828832
object actSaveSelection: TAction
829833
Category = 'File'
830834
Caption = 'Save Selection...'
831-
Hint = 'Save Current Selection|Saves currently selected snippets to disk'
835+
Hint =
836+
'Save Current Selection|Save the currently selected snippets to d' +
837+
'isk'
832838
ShortCut = 41043
833839
OnExecute = actSaveSelectionExecute
834840
OnUpdate = actSaveSelectionUpdate
@@ -837,8 +843,8 @@ inherited MainForm: TMainForm
837843
Category = 'File'
838844
Caption = 'Load Selection...'
839845
Hint =
840-
'Load Current Selection|Loads a saved selection of snippets from ' +
841-
'disk'
846+
'Load Current Selection|Load a saved selection of snippets from d' +
847+
'isk'
842848
ShortCut = 41036
843849
OnExecute = actLoadSelectionExecute
844850
OnUpdate = ActNonEmptyDBUpdate
@@ -853,15 +859,16 @@ inherited MainForm: TMainForm
853859
Category = 'View'
854860
Caption = 'Close All Other Tabs'
855861
Hint =
856-
'Close All Other Tabs|Closes all tabs in the Details pane except ' +
857-
'the current tab'
862+
'Close All Other Tabs|Close all tabs in the Details pane except t' +
863+
'he current tab'
858864
ShortCut = 24691
859865
OnExecute = actCloseUnselectedDetailsTabsExecute
860866
OnUpdate = actCloseDetailsTabsUpdate
861867
end
862868
object actCloseAllDetailsTabs: TAction
863869
Category = 'View'
864870
Caption = 'Close All Tabs'
871+
Hint = 'Close All Tabs|Close all tabs in the Details pane'
865872
OnExecute = actCloseAllDetailsTabsExecute
866873
OnUpdate = actCloseDetailsTabsUpdate
867874
end

0 commit comments

Comments
 (0)