Merge branch 'feature/remove-proxysvr' into develop

Author: delphidabbler

Docs/Design/FileFormats/config.html

@@ -1299,7 +1299,6 @@ <h4>
 </dl>
 
 <div class="del">
-
 <h4>
   [Prefs:Updating] section
 </h4>
@@ -1331,9 +1330,9 @@ <h4>
     check for database updates automatically.
   </dd>
 </dl>
-
 </div>
 
+<div class="del">
 <h4>
   [ProxyServer] section
 </h4>
@@ -1382,6 +1381,7 @@ <h4>
     the encrypted password.
   </dd>
 </dl>
+</div>
 
 <div class="del">
 <h4>

Docs/Privacy.txt

@@ -33,15 +33,10 @@ folder for the standard edition or in the AppData sub folder of the install
 directory for the portable edition.
 
 The file stores several user-specific application data settings such as your
-preferences. The only personal information is as follows:
-
-    * Any user name or email address you provided if you ever entered the
-      information in a dialogue box. This is used simply to automatically enter
-      the data in dialogue boxes where needed, to save you re-typing it.
-
-    * Your user name and password if you configured CodeSnip to access the
-      internet using a proxy server. The information is used only to access the
-      proxy. Passwords are encrypted.
+preferences. The only personal information is any user name or email address you
+provided if you ever entered such information in a dialogue box. This is used
+only to automatically enter the data in dialogue boxes where needed, to save you
+re-typing it.
 
 
 Spyware
@@ -69,19 +64,4 @@ default web browser. The author takes no responsibility for any data collected b
 your web browser or the individual web sites.
 
 
-Accessing the internet using a proxy server
---------------------------------------------------------------------------------
-
-CodeSnip can be configured to use a proxy server to access the internet. In this
-case the program sends the appropriate user name and password to the proxy
-server if required.
-
-DelphiDabbler has no control over the proxy server and you should satisfy
-yourself that the proxy you use is trustworthy. You use this feature at your own
-risk.
-
-
-================================================================================
-$Rev$
-$Date$
 ================================================================================

Docs/ReadMe.txt

@@ -273,13 +273,6 @@ Known Installation and Upgrading Issues
   the Preferences dialogue box displayed from the "Tools | Preferences" menu
   option.
 
-+ If you are updating from v3.6.0 or earlier and have set up a password
-  protected proxy server for internet access your password will have been lost.
-  This is because the format for storing passwords changed at v3.6.1.
-
-  To re-enter your proxy password use the Proxy Server Configuration dialogue
-  box displayed from the "Tools | Proxy Server" menu option.
-
 + Your source code formatting preferences will have been lost if you are
   updating from v1.7.4 or earlier.
 

Src/CodeSnip.dpr

@@ -122,7 +122,6 @@ uses
   FmPreferencesDlg in 'FmPreferencesDlg.pas' {PreferencesDlg},
   FmPreviewDlg in 'FmPreviewDlg.pas' {PreviewDlg},
   FmPrintDlg in 'FmPrintDlg.pas' {PrintDlg},
-  FmProxyServerDlg in 'FmProxyServerDlg.pas' {ProxyServerDlg},
   FmRenameCategoryDlg in 'FmRenameCategoryDlg.pas' {RenameCategoryDlg},
   FmSelectionSearchDlg in 'FmSelectionSearchDlg.pas' {SelectionSearchDlg},
   FmSnippetsEditorDlg in 'FmSnippetsEditorDlg.pas' {SnippetsEditorDlg},

Src/CodeSnip.dproj

@@ -205,9 +205,6 @@
 			<DCCReference Include="FmPrintDlg.pas">
 				<Form>PrintDlg</Form>
 			</DCCReference>
-			<DCCReference Include="FmProxyServerDlg.pas">
-				<Form>ProxyServerDlg</Form>
-			</DCCReference>
 			<DCCReference Include="FmRenameCategoryDlg.pas">
 				<Form>RenameCategoryDlg</Form>
 			</DCCReference>

Src/FirstRun.FmV4ConfigDlg.pas

@@ -339,7 +339,6 @@ function TV4ConfigDlg.HeadingText(const PageIdx: Integer): string;
 procedure TV4ConfigDlg.ListChanges;
 resourcestring
   sHiliter = 'Syntax highlighter customisations have been lost.';
-  sProxyPwd = 'Your proxy server password needs to be re-entered.';
   sSourceFormat = 'Source code formatting preferences may have been lost.';
 var
   Changes: IStringList;
@@ -351,8 +350,6 @@ procedure TV4ConfigDlg.ListChanges;
     Changes := TIStringList.Create;
     if frcHiliter in fCfgChanges then
       Changes.Add(sHiliter);
-    if frcProxyPwd in fCfgChanges then
-      Changes.Add(sProxyPwd);
     if frcSourceFormat in fCfgChanges then
       Changes.Add(sSourceFormat);
     CreateBulletPage(

Src/FirstRun.UConfigFile.pas

@@ -85,17 +85,15 @@   TUserConfigFileUpdater = class(TConfigFileUpdater)
     procedure UpdateFromOriginal;
     ///  <summary>Deletes any highlighter preferences.</summary>
     procedure DeleteHighligherPrefs;
-    ///  <summary>Checks a proxy password is present in file.</summary>
-    function HasProxyPassword: Boolean;
-    ///  <summary>Deletes proxy password entry.</summary>
-    procedure DeleteProxyPassword;
     ///  <summary>Updates Prefs:CodeGen section from format prior to version 9
     ///  to version 9 and later format.</summary>
     procedure UpdateCodeGenEntries;
     ///  <summary>Deletes unused key that determines detail pane index.
     ///  </summary>
     procedure DeleteDetailsPaneIndex;
     {$ENDIF}
+    ///  <summary>Deletes proxy server section.</summary>
+    procedure DeleteProxyServerSection;
     ///  <summary>Deletes unused Prefs:News section.</summary>
     procedure DeleteNewsPrefs;
     ///  <summary>Effectively renames MainWindow section used prior to version
@@ -294,27 +292,18 @@ procedure TUserConfigFileUpdater.DeleteNewsPrefs;
   DeleteIniSection('Prefs:News', CfgFileName);
 end;
 
-{$IFNDEF PORTABLE}
-procedure TUserConfigFileUpdater.DeleteProxyPassword;
+procedure TUserConfigFileUpdater.DeleteProxyServerSection;
 begin
   if not TFile.Exists(CfgFileName, False) then
     CreateNewFile;
-  SetIniString('ProxyServer', 'Password', '', CfgFileName);
+  DeleteIniSection('ProxyServer', CfgFileName);
 end;
-{$ENDIF}
 
 class function TUserConfigFileUpdater.GetFileVersion: Integer;
 begin
   Result := FileVersion;
 end;
 
-{$IFNDEF PORTABLE}
-function TUserConfigFileUpdater.HasProxyPassword: Boolean;
-begin
-  Result := GetIniString('ProxyServer', 'Password', '', CfgFileName) <> '';
-end;
-{$ENDIF}
-
 procedure TUserConfigFileUpdater.RenameMainWindowSection;
 begin
   if not TFile.Exists(CfgFileName, False) then

Src/FirstRun.UMain.pas

@@ -27,7 +27,6 @@ interface
   ///  config files that result in data loss.</summary>
   TFirstRunCfgChanges = (
     frcHiliter,         // syntax highlighter customisation lost
-    frcProxyPwd,        // internet proxy password lost
     frcSourceFormat     // source code output formatting lost
   );
 
@@ -56,11 +55,6 @@   TFirstRun = class(TObject)
       ///  <summary>Object used to copy forward older versions of user database.
       ///  </summary>
       fDatabase: TUserDatabaseUpdater;
-    {$IFNDEF PORTABLE}
-    ///  <summary>Checks if config file uses earlier format for storing proxy
-    ///  server passwords.</summary>
-    function HasOldStyleProxyPwd: Boolean;
-    {}{$ENDIF}
   public
     ///  <summary>Constructs object and owned object.</summary>
     constructor Create;
@@ -183,13 +177,6 @@ destructor TFirstRun.Destroy;
   inherited;
 end;
 
-{$IFNDEF PORTABLE}
-function TFirstRun.HasOldStyleProxyPwd: Boolean;
-begin
-  Result := (fUserConfigFile.FileVer <= 6) and fUserConfigFile.HasProxyPassword;
-end;
-{$ENDIF}
-
 function TFirstRun.HaveOldUserCfgFile: Boolean;
 begin
   Result := TFile.Exists(fInstallInfo.PreviousUserConfigFileName, False);
@@ -222,14 +209,7 @@ procedure TFirstRun.UpdateUserCfgFile(out Changes: TFirstRunCfgChangeSet);
       fUserConfigFile.DeleteHighligherPrefs;
       Include(Changes, frcHiliter);
     end;
-    piV3:
-    begin
-      if HasOldStyleProxyPwd then
-      begin
-        fUserConfigFile.DeleteProxyPassword;
-        Include(Changes, frcProxyPwd);
-      end;
-    end;
+    piV3: ; // do nothing
   end;
   {$ENDIF}
 
@@ -259,7 +239,10 @@ procedure TFirstRun.UpdateUserCfgFile(out Changes: TFirstRunCfgChangeSet);
 
 
   if fUserConfigFile.FileVer < 16 then
+  begin
     fUserConfigFile.DeleteNewsPrefs;
+    fUserConfigFile.DeleteProxyServerSection;
+  end;
 
   if fCommonConfigFile.FileVer < 7 then
     fCommonConfigFile.DeleteRegistrationInfo;

Src/FmMain.dfm

@@ -745,14 +745,6 @@ inherited MainForm: TMainForm
       OnExecute = actCopySourceExecute
       OnUpdate = actCopySourceUpdate
     end
-    object actProxyServer: TAction
-      Category = 'Tools'
-      Caption = 'Proxy Server...'
-      Hint = 
-        'Configure proxy server|Configure any proxy server to be used by ' +
-        'CodeSnip when accessing web services'
-      OnExecute = actProxyServerExecute
-    end
     object actAddCategory: TAction
       Category = 'Categories'
       Caption = 'New Category...'
@@ -1142,9 +1134,6 @@ inherited MainForm: TMainForm
       object miCompilers: TMenuItem
         Action = actCompilers
       end
-      object miProxyServer: TMenuItem
-        Action = actProxyServer
-      end
       object miSpacer18: TMenuItem
         Caption = '-'
       end

Src/FmMain.pas

@@ -18,12 +18,34 @@ interface
 
 uses
   // Delphi
-  SysUtils, Menus, ExtActns, StdActns, Classes, ActnList, ImgList, Controls,
-  Forms, ExtCtrls, ComCtrls, ToolWin, Messages, AppEvnts,
+  SysUtils,
+  Menus,
+  ExtActns,
+  StdActns,
+  Classes,
+  ActnList,
+  ImgList,
+  Controls,
+  Forms,
+  ExtCtrls,
+  ComCtrls,
+  ToolWin,
+  Messages,
+  AppEvnts,
   // Project
-  Favourites.UManager, FmHelpAware, FrDetail, FrOverview, FrTitled,
-  IntfNotifier, UCompileMgr, UDialogMgr, UHistory, UMainDisplayMgr, USearch,
-  UStatusBarMgr, UWindowSettings;
+  Favourites.UManager,
+  FmHelpAware,
+  FrDetail,
+  FrOverview,
+  FrTitled,
+  IntfNotifier,
+  UCompileMgr,
+  UDialogMgr,
+  UHistory,
+  UMainDisplayMgr,
+  USearch,
+  UStatusBarMgr,
+  UWindowSettings;
 
 
 type
@@ -75,7 +97,6 @@   TMainForm = class(THelpAwareForm)
     actPreviousTab: TAction;
     actPrint: TAction;
     actPrivacy: TAction;
-    actProxyServer: TAction;
     actRenameCategory: TAction;
     actRestoreDatabase: TAction;
     actSaveDatabase: TAction;
@@ -147,7 +168,6 @@   TMainForm = class(THelpAwareForm)
     miPreferences: TMenuItem;
     miPrint: TMenuItem;
     miPrivacy: TMenuItem;
-    miProxyServer: TMenuItem;
     miRenameCategory: TMenuItem;
     miReportBug: TMenuItem;
     miRestoreDatabase: TMenuItem;
@@ -367,9 +387,6 @@   TMainForm = class(THelpAwareForm)
     procedure actPrintUpdate(Sender: TObject);
     ///  <summary>Displays the Privacy Statement help topic.</summary>
     procedure actPrivacyExecute(Sender: TObject);
-    ///  <summary>Displays the Proxy Server Configuration dialogue box that can
-    ///  be used to specify a proxy server to use for internet access.</summary>
-    procedure actProxyServerExecute(Sender: TObject);
     ///  <summary>Displays a dialogue box that can be used to rename a user
     ///  defined category.</summary>
     procedure actRenameCategoryExecute(Sender: TObject);
@@ -952,11 +969,6 @@ procedure TMainForm.actPrivacyExecute(Sender: TObject);
   DisplayHelp('PrivacyStatement');
 end;
 
-procedure TMainForm.actProxyServerExecute(Sender: TObject);
-begin
-  fDialogMgr.ExecProxyServerDlg;
-end;
-
 procedure TMainForm.actRenameCategoryExecute(Sender: TObject);
 begin
   TUserDBMgr.RenameACategory;