Merge branch 'feature/remove-donate' into develop

Author: delphidabbler

Docs/ReadMe.txt

@@ -356,20 +356,6 @@ report bugs for those versions. You should update the program first and only
 report the bug if it is still present.
 
 
-Make a Donation
-================================================================================
-
-CodeSnip is free to use and there is no requirement to pay anything for it. You
-get a fully working version of the program whether you make a donation or not.
-
-Having said that, it takes time and money to maintain CodeSnip and the online
-database. So if you wish to make a contribution it will be most welcome.
-
-Payment in pounds sterling can be made via this address -
-http://delphidabbler.com/url/donate-cs - which redirects to a secure PayPal
-page.
-
-
 Feedback
 ================================================================================
 

Src/CodeSnip.dpr

@@ -105,7 +105,6 @@ uses
   FmDBUpdateDlg in 'FmDBUpdateDlg.pas' {DBUpdateDlg},
   FmDeleteCategoryDlg in 'FmDeleteCategoryDlg.pas' {DeleteCategoryDlg},
   FmDependenciesDlg in 'FmDependenciesDlg.pas' {DependenciesDlg},
-  FmDonateDlg in 'FmDonateDlg.pas' {DonateDlg},
   FmDuplicateSnippetDlg in 'FmDuplicateSnippetDlg.pas' {DuplicateSnippetDlg},
   FmEasterEgg in 'FmEasterEgg.pas' {EasterEggForm},
   FmFavouritesDlg in 'FmFavouritesDlg.pas' {FavouritesDlg},
@@ -290,7 +289,6 @@ uses
   UOverviewTreeState in 'UOverviewTreeState.pas',
   UPageSetupDialogEx in 'UPageSetupDialogEx.pas',
   UPageSetupDlgMgr in 'UPageSetupDlgMgr.pas',
-  UPaypalDonateAction in 'UPaypalDonateAction.pas',
   UPipe in 'UPipe.pas',
   UPreferences in 'UPreferences.pas',
   UPrintDocuments in 'UPrintDocuments.pas',

Src/CodeSnip.dproj

@@ -154,9 +154,6 @@
 			<DCCReference Include="FmDependenciesDlg.pas">
 				<Form>DependenciesDlg</Form>
 			</DCCReference>
-			<DCCReference Include="FmDonateDlg.pas">
-				<Form>DonateDlg</Form>
-			</DCCReference>
 			<DCCReference Include="FmDuplicateSnippetDlg.pas">
 				<Form>DuplicateSnippetDlg</Form>
 			</DCCReference>
@@ -491,7 +488,6 @@
 			<DCCReference Include="UOverviewTreeState.pas"/>
 			<DCCReference Include="UPageSetupDialogEx.pas"/>
 			<DCCReference Include="UPageSetupDlgMgr.pas"/>
-			<DCCReference Include="UPaypalDonateAction.pas"/>
 			<DCCReference Include="UPipe.pas"/>
 			<DCCReference Include="UPreferences.pas"/>
 			<DCCReference Include="UPrintDocuments.pas"/>

Src/CodeSnip.todo

@@ -1,5 +1,5 @@
 {TODO -cUI : Remove unused tool bar button in main window}
-{TODO -cWeb : Remove donate box & related notes - problem doing direct link to paypalwith giving away email address}
+
 {TODO -cDocs : Remove remaining $Rev$ and $Date$ SVN placeholders}
 
 {TODO -cDocs : Update License.html to replace references to SVN with Git}

Src/ExternalObj.ridl

@@ -12,7 +12,7 @@
 
 [
   uuid(DA95AEFB-3FB5-4A9E-9F9D-A53DD05CA7D4),
-  version(12.0),
+  version(13.0),
   helpstring("CodeSnip DOM External Object Extender Type Library"),
   custom(DE77BA64-517C-11D1-A2DA-0000F8773CE9, 117441012),
   custom(DE77BA63-517C-11D1-A2DA-0000F8773CE9, 1219706147)
@@ -24,19 +24,19 @@ library ExternalObj
   importlib("stdole2.tlb");
 
   /*
-   * V12 interface of extension to browser DOM's "external" object.
+   * V13 interface of extension to browser DOM's "external" object.
    */
-  interface IWBExternal12;
+  interface IWBExternal13;
 
 
   [
     uuid(BA971829-ED4D-4092-BCAE-4B5DB1A2D74A),
-    version(12.0),
+    version(13.0),
     helpstring("DOM external object extender"),
     dual,
     oleautomation
   ]
-  interface IWBExternal12: IDispatch
+  interface IWBExternal13: IDispatch
   {
     /*
      * Update database from internet.
@@ -66,12 +66,6 @@ library ExternalObj
     [id(0x0000006C)]
     HRESULT _stdcall EditSnippet([in] BSTR SnippetName);
 
-    /*
-     * Displays Donate dialog box.
-     */
-    [id(0x0000006D)]
-    HRESULT _stdcall Donate(void);
-
     /*
      * Display identified category.
      *    @param CatID [in] ID of category to display.

Src/FmDonateDlg.dfm

@@ -690,13 +690,6 @@ inherited MainForm: TMainForm
       OnExecute = actCopyInfoExecute
       OnUpdate = actCopyInfoUpdate
     end
-    object actDonate: TAction
-      Category = 'Help'
-      Caption = 'Donate...'
-      Hint = 'Donate|Make a PayPal donation to support CodeSnip development'
-      ImageIndex = 23
-      OnExecute = actDonateExecute
-    end
     object actViewDependencies: TAction
       Category = 'View'
       Caption = 'Dependencies...'
@@ -1191,9 +1184,6 @@ inherited MainForm: TMainForm
       object miSpacer5: TMenuItem
         Caption = '-'
       end
-      object miDonate: TMenuItem
-        Action = actDonate
-      end
       object miAbout: TMenuItem
         Action = actAbout
       end

Src/FmDonateDlg.pas

@@ -47,7 +47,6 @@   TMainForm = class(THelpAwareForm)
     actCopySource: TAction;
     actDeleteCategory: TAction;
     actDeleteSnippet: TAction;
-    actDonate: TAction;
     actDuplicateSnippet: TAction;
     actEditSnippet: TAction;
     actExit: TFileExit;
@@ -119,7 +118,6 @@   TMainForm = class(THelpAwareForm)
     miDatabase: TMenuItem;
     miDeleteCategory: TMenuItem;
     miDeleteSnippet: TMenuItem;
-    miDonate: TMenuItem;
     miDuplicateSnippet: TMenuItem;
     miEdit: TMenuItem;
     miEditSnippet: TMenuItem;
@@ -280,8 +278,6 @@   TMainForm = class(THelpAwareForm)
     ///  <summary>Attempts to delete the current user defined snippet from the
     ///  database.</summary>
     procedure actDeleteSnippetExecute(Sender: TObject);
-    ///  <summary>Displays Donate dialogue box.</summary>
-    procedure actDonateExecute(Sender: TObject);
     ///  <summary>Displays a dialogue box that can be used to duplicate the
     ///  selected snippet.</summary>
     procedure actDuplicateSnippetExecute(Sender: TObject);
@@ -710,11 +706,6 @@ procedure TMainForm.actDeleteSnippetExecute(Sender: TObject);
   // display update is handled by snippets change event handler
 end;
 
-procedure TMainForm.actDonateExecute(Sender: TObject);
-begin
-  fDialogMgr.ShowDonateDlg
-end;
-
 procedure TMainForm.actDuplicateSnippetExecute(Sender: TObject);
 begin
   TUserDBMgr.DuplicateSnippet(fMainDisplayMgr.CurrentView);
@@ -1382,7 +1373,6 @@ procedure TMainForm.InitForm;
           Self, ActEditSnippetByNameExecute
         )
       );
-      SetDonateAction(actDonate);
       SetNewSnippetAction(actAddSnippet);
       SetNewsAction(actBlog);
       // SetCheckForUpdatesAction(actProgramUpdates);

Src/FmMain.dfm

@@ -25,9 +25,6 @@ Res\Scripts\3rdParty\jquery.cycle.lite.js
 # compiler error log
 Res\HTML\dlg-comperror-tplt.html
 
-# donate dialogue
-Res\HTML\dlg-donate.html
-
 # active text preview dialogueue
 Res\HTML\dlg-activetext-preview-tplt.html
 
@@ -131,6 +128,3 @@ Res\Img\Egg\play-btn.png
 Res\Img\Egg\play-btn-hover.png
 Res\Img\Egg\doggy-pics.png
 Res\Img\Egg\blue-paper.png
-
-# donate dialogue - � sign image
-Res\Img\pound-sign.png