fix: xdg-open is used in Call extra data window to open open the atta…

…chments
ok2cqr · Feb 7, 2021 · ccac764 · ccac764 · OH1KH · Feb 8, 2021
1 parent a909fd3
commit ccac764
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -13,6 +13,7 @@ Legend:
   - ADIF import duplicate check fixed, form layout fixed (Saku, OH1KH)
   - New QSO window layout fixes (Saku, OH1KH)
   - workaround for 'TRegExpr exec: empty input string' error in fpc compiler on arm64
+  - xdg-open is used in Call extra data window to open open the attachments
 
 2.5.1 (2021-01-24)
   - Winkeyer didn't work (Saku, OH1KH)

diff --git a/src/fCallAttachment.pas b/src/fCallAttachment.pas
@@ -51,31 +51,17 @@ procedure TfrmCallAttachment.FormClose(Sender: TObject;
 
 procedure TfrmCallAttachment.btnViewClick(Sender: TObject);
 var
-  ext : String = '';
-  prg : String = '';
-  dir : String = '';
+  CurrentDir : String = '';
 begin
   if flAttach.FileName = '' then exit;
-  dir := GetCurrentDir;
+
+  CurrentDir := GetCurrentDir;
   try
     SetCurrentDir(flAttach.Directory);
-    ext := LowerCase(ExtractFileExt(flAttach.FileName));
-    if ext = '.pdf' then
-      prg := cqrini.ReadString('ExtView','pdf','evince')
-    else if ext = '.txt' then
-      prg := cqrini.ReadString('ExtView','txt','gedit')
-    else if ((ext = '.html') or (ext = '.htm')) then
-      prg := cqrini.ReadString('ExtView','html',dmUtils.MyDefaultBrowser)
-    else
-      prg := cqrini.ReadString('ExtView','img','eog');
-    if prg = '' then
-      dmUtils.RunOnBackgroud(cqrini.ReadString('Program', 'WebBrowser', dmUtils.MyDefaultBrowser) +
-                             ' ' + flAttach.FileName)
-    else
-      dmUtils.RunOnBackgroud(prg + ' ' + flAttach.FileName)
+    dmUtils.RunOnBackgroud('/usr/bin/xdg-open' + ' "' + flAttach.FileName + '"');
   finally
-    SetCurrentDir(dir)
-  end
+    SetCurrentDir(CurrentDir)
+  end;
 end;
 
 procedure TfrmCallAttachment.flAttachDblClick(Sender: TObject);