Changeset 301

Timestamp:

Jul 8, 2008, 5:43:16 PM (17 years ago)

Author:

RBRi

Message:

IAI support added

Location:

branches/2.19_branch/NewView

Files:

• VersionUnit.pas (modified) (1 diff)
• WebBrowserUnit.pas (modified) (3 diffs)

branches/2.19_branch/NewView/VersionUnit.pas

@@ -17 +17 @@
 
 const
-  Version =        'V2.19.2'; // $SS_REQUIRE_NEW_VERSION$
-  BldLevelVersion = '2.19.2'; // Embedded for IBM BLDLEVEL tool
+  Version =        'V2.19.3'; // $SS_REQUIRE_NEW_VERSION$
+  BldLevelVersion = '2.19.3'; // Embedded for IBM BLDLEVEL tool
   CopyrightMsg = 'Copyright 2005 Aaron Lawrence; 2006-2008 Ronald Brill';
   LicenseMsg   = 'Licensed under the GNU Public License';

branches/2.19_branch/NewView/WebBrowserUnit.pas

@@ -21 +21 @@
   SysUtils,
   RunProgramUnit,
-  FileUtilsUnit;
+  FileUtilsUnit,
+  StringUtilsUnit,
+  DebugUnit;
 
 const
-  PROFILE_KEY_WPURLDEFAULTSETTINGS = 'WPURLDEFAULTSETTINGS';
+  PROFILE_APPLICATION_WPURLDEFAULTSETTINGS = 'WPURLDEFAULTSETTINGS';
+  // Browser
+  PROFILE_KEY_DEFAULT_BROWSER_EXE = 'DefaultBrowserExe';
+  PROFILE_KEY_DEFAULT_WORKING_DIR = 'DefaultWorkingDir';
+  PROFILE_KEY_DEFAULT_PARAMETERS = 'DefaultParameters';
+
+  PROFILE_KEY_DEFAULT_MAIL_EXE = 'DefaultMailExe';
+  PROFILE_KEY_DEFAULT_MAIL_WORKING_DIR = 'DefaultMailWorkingDir';
+  PROFILE_KEY_DEFAULT_MAIL_PARAMETERS = 'DefaultMailParameters';
+
+  PROFILE_KEY_DEFAULT_NEWS_EXE = 'DefaultNewsExe';
+  PROFILE_KEY_DEFAULT_NEWS_WORKING_DIR = 'DefaultNewsWorkingDir';
+  PROFILE_KEY_DEFAULT_NEWS_PARAMETERS = 'DefaultNewsParameters';
+
+  PROFILE_KEY_DEFAULT_FTP_EXE = 'DefaultFTPExe';
+  PROFILE_KEY_DEFAULT_FTP_WORKING_DIR = 'DefaultFTPWorkingDir';
+  PROFILE_KEY_DEFAULT_FTP_PARAMETERS = 'DefaultFTPParameters';
 
 
-  Function GetDefaultBrowserPath : String;
+  Function GetDefaultBrowserExe : String;
   begin
-    Result := GetUserProfileString(PROFILE_KEY_WPURLDEFAULTSETTINGS, 'DefaultBrowserExe', '');
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_BROWSER_EXE, '');
     if Result = '' then
     begin
@@ -40 +58 @@
   Function GetDefaultBrowserWorkingDir : String;
   begin
-    Result := GetUserProfileString(PROFILE_KEY_WPURLDEFAULTSETTINGS, 'DefaultWorkingDir', '');
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_WORKING_DIR, '');
     if Result = '' then
     begin
-      Result := ExtractFilePath(GetDefaultBrowserPath);
+      Result := ExtractFilePath(GetDefaultBrowserExe);
     end;
   end;
@@ -50 +68 @@
   Function GetDefaultParameters : String;
   begin
-    Result := GetUserProfileString(PROFILE_KEY_WPURLDEFAULTSETTINGS, 'DefaultParameters', '');
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_PARAMETERS, '');
   end;
 
+
+  Function GetDefaultMailExe : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_MAIL_EXE, '');
+  end;
+
+
+  Function GetDefaultMailWorkingDir : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_MAIL_WORKING_DIR, '');
+    if Result = '' then
+    begin
+      Result := ExtractFilePath(GetDefaultMailExe);
+    end;
+  end;
+
+
+  Function GetDefaultMailParameters : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_MAIL_PARAMETERS, '');
+  end;
+
+
+  Function GetDefaultNewsExe : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_NEWS_EXE, '');
+  end;
+
+
+  Function GetDefaultNewsWorkingDir : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_NEWS_WORKING_DIR, '');
+    if Result = '' then
+    begin
+      Result := ExtractFilePath(GetDefaultNewsExe);
+    end;
+  end;
+
+
+  Function GetDefaultNewsParameters : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_NEWS_PARAMETERS, '');
+  end;
+
+
+  Function GetDefaultFtpExe : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_FTP_EXE, '');
+  end;
+
+
+  Function GetDefaultFtpWorkingDir : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_FTP_WORKING_DIR, '');
+    if Result = '' then
+    begin
+      Result := ExtractFilePath(GetDefaultFtpExe);
+    end;
+  end;
+
+
+  Function GetDefaultFtpParameters : String;
+  begin
+    Result := GetUserProfileString(PROFILE_APPLICATION_WPURLDEFAULTSETTINGS, PROFILE_KEY_DEFAULT_FTP_PARAMETERS, '');
+  end;
 
 
   Procedure LaunchURL(const aURL: String);
   var
-    tmpBrowserPath : String;
-    tmpBrowserWorkingDir : String;
-    tmpBrowserParameters : String;
+    tmpExe : String;
+    tmpAlternativeExe : String;
+    tmpWorkingDir : String;
+    tmpParameters : String;
   begin
-    tmpBrowserPath := GetDefaultBrowserPath;
-    tmpBrowserWorkingDir := GetDefaultBrowserWorkingDir;
-    tmpBrowserParameters := GetDefaultParameters;
+    // default is to start the browser
+    tmpExe := GetDefaultBrowserExe;
+    tmpWorkingDir := GetDefaultBrowserWorkingDir;
+    tmpParameters := GetDefaultParameters;
 
-    if tmpBrowserPath = '' then
+    if not FileExists(tmpExe) then
+    begin
+      raise Exception.Create('Browser program doesn''t exist: ' + tmpExe);
+    end;
+
+    if tmpExe = '' then
     begin
       raise Exception.Create('You don''t have a default browser configured.');
     end;
 
-    if not FileExists(tmpBrowserPath) then
+    if StrStartsWithIgnoringCase(aURL, '"ftp') then
     begin
-      raise Exception.Create('Browser program doesn''t exist: ' + tmpBrowserPath);
+      tmpAlternativeExe := GetDefaultFtpExe;
+      if tmpAlternativeExe <> '' then
+      begin
+        tmpExe := tmpAlternativeExe;
+        tmpWorkingDir := GetDefaultFtpWorkingDir;
+        tmpParameters := GetDefaultFtpParameters;
+      end
+    end
+    else if StrStartsWithIgnoringCase(aURL, '"mailto') then
+    begin
+      tmpAlternativeExe := GetDefaultMailExe;
+      if tmpAlternativeExe <> '' then
+      begin
+        tmpExe := tmpAlternativeExe;
+        tmpWorkingDir := GetDefaultMailWorkingDir;
+        tmpParameters := GetDefaultMailParameters;
+      end
+    end
+    else if StrStartsWithIgnoringCase(aURL, '"news') then
+    begin
+      tmpAlternativeExe := GetDefaultNewsExe;
+      if tmpAlternativeExe <> '' then
+      begin
+        tmpExe := tmpAlternativeExe;
+        tmpWorkingDir := GetDefaultNewsWorkingDir;
+        tmpParameters := GetDefaultNewsParameters;
+      end
     end;
 
-    ChDir(RemoveRightDirectorySeparator(tmpBrowserWorkingDir));
-
-    LaunchProgram(tmpBrowserPath, tmpBrowserParameters + ' ' + aURL, tmpBrowserWorkingDir);
+    ChDir(RemoveRightDirectorySeparator(tmpWorkingDir));
+    LaunchProgram(tmpExe, tmpParameters + ' ' + aURL, tmpWorkingDir);
   end;