From 59a8e8e6c9ec1fc0c8e812de5c10f81a6ce32600 Mon Sep 17 00:00:00 2001 From: mattias Date: Mon, 11 Apr 2022 12:13:53 +0200 Subject: [PATCH] simplewebservergui: added vivaldi to browser list --- .../simplewebservergui/simplewebsrvcontroller.pas | 14 +++++++++++++- .../simplewebservergui/simplewebsrvoptions.pas | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/components/simplewebservergui/simplewebsrvcontroller.pas b/components/simplewebservergui/simplewebsrvcontroller.pas index 29e86e3788..463a9a0f86 100644 --- a/components/simplewebservergui/simplewebsrvcontroller.pas +++ b/components/simplewebservergui/simplewebsrvcontroller.pas @@ -252,6 +252,7 @@ type function GetBrowserChrome(URL: string; Params: TStrings): string; virtual; function GetBrowserFirefox(URL: string; Params: TStrings): string; virtual; function GetBrowserOpera(URL: string; Params: TStrings): string; virtual; + function GetBrowserVivaldi(URL: string; Params: TStrings): string; virtual; {$IFDEF Darwin} function GetBrowserSafari(URL: string; Params: TStrings): string; virtual; {$ENDIF} @@ -1761,6 +1762,7 @@ begin swsbkFirefox: Exe:=GetBrowserFirefox(URL,Params); swsbkChrome: Exe:=GetBrowserChrome(URL,Params); swsbkOpera: Exe:=GetBrowserOpera(URL,Params); + swsbkVivaldi: Exe:=GetBrowserVivaldi(URL,Params); {$IFDEF Darwin} swsbkSafari: Exe:=GetBrowserSafari(URL,Params); {$ENDIF} @@ -1864,7 +1866,17 @@ end; function TSimpleWebServerController.GetBrowserOpera(URL: string; Params: TStrings): string; begin - Result := FindBrowserPath(['opera'],URL,Params); + Result := FindBrowserPath([ + {$IFDEF Darwin}'/Applications/Opera.app/Contents/MacOS/Opera',{$ENDIF} + 'opera'],URL,Params); +end; + +function TSimpleWebServerController.GetBrowserVivaldi(URL: string; + Params: TStrings): string; +begin + Result := FindBrowserPath([ + {$IFDEF Darwin}'/Applications/Vivaldi.app/Contents/MacOS/Vivaldi',{$ENDIF} + 'vivaldi'],URL,Params); end; {$IFDEF Darwin} diff --git a/components/simplewebservergui/simplewebsrvoptions.pas b/components/simplewebservergui/simplewebsrvoptions.pas index 8036afde26..3966ebcd43 100644 --- a/components/simplewebservergui/simplewebsrvoptions.pas +++ b/components/simplewebservergui/simplewebsrvoptions.pas @@ -58,6 +58,7 @@ type swsbkFirefox, swsbkChrome, swsbkOpera, + swsbkVivaldi, {$IFDEF Darwin} swsbkSafari, {$ENDIF} @@ -74,6 +75,7 @@ const 'Firefox', 'Chrome', 'Opera', + 'Vivaldi', {$IFDEF Darwin} 'Safari', {$ENDIF}