Preferences dialog: add VFS temp path entryv0.6.42

3 files changed, 29 insertions, 5 deletions

diff --git a/UConfig.pas b/UConfig.pas
index 0b2565b..d68fc01 100644
--- a/UConfig.pas
+++ b/UConfig.pas
@@ -235,7 +235,7 @@ begin
   ConfDuplicateTabWarning := True;
   ConfOpenConnectionsWarning := True;
   ConfTabMaxLength := 25;
-  ConfTempPath := '/tmp/tuxcmd';
+  ConfTempPath := '/tmp';
   ConfUseSmoothScrolling := False;
   ConfDateFormat := 0;
   ConfTimeFormat := 0;
diff --git a/UMain.pas b/UMain.pas
index 1e9f86f..a7dd28a 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -6190,7 +6190,7 @@ begin
 
       if Res = mbYes then DebugMsg(['(II) HandleRunFromArchive: Selected extract and execute single item'])
                      else DebugMsg(['(II) HandleRunFromArchive: Selected extract all and execute']);
-      s := ConfTempPath + '-XXXXXX';
+      s := IncludeTrailingPathDelimiter(ConfTempPath) + 'tuxcmd-XXXXXX';
       tmp := strdup(PChar(s));
       tmp := mkdtemp(tmp);
       if tmp = nil then begin
diff --git a/UPreferences.pas b/UPreferences.pas
index a9e02e7..82ea5f3 100644
--- a/UPreferences.pas
+++ b/UPreferences.pas
@@ -77,6 +77,8 @@ type
     QuickSearchLabel: TGTKLabel;
     QuickSearchOptionMenu: TGTKOptionMenu;
     SortDirectoriesLikeFilesCheckBox: TGTKCheckButton;
+    TempPathLabel, VFSTempPathLabel: TGTKLabel;
+    VFSTempPathEntry: TGTKEntry;
 
     procedure FormCreate(Sender: TObject); override;
     procedure FormDestroy(Sender: TObject);
@@ -425,7 +427,7 @@ begin
   for i := 1 to Length(ConfViewersApps) do
     ViewerCombo.Items.Append(ConfViewersApps[i]);
   ViewerBrowseButton := TGTKButton.Create(Self);
-  ViewerBrowseButton.Caption := LANGBrowseButton_Caption;
+  ViewerBrowseButton.Caption := Format('  %s  ', [LANGBrowseButton_Caption]);
   ViewerBrowseButton.OnClick := ViewerBrowseButtonClick;
   ViewerLabel2 := TGTKLabel.Create(Self);
   ViewerLabel2.Caption := LANGPreferencesCommandSC;
@@ -465,7 +467,7 @@ begin
   for i := 1 to Length(ConfEditorApps) do
     EditorCombo.Items.Append(ConfEditorApps[i]);
   EditorBrowseButton := TGTKButton.Create(Self);
-  EditorBrowseButton.Caption := LANGBrowseButton_Caption;
+  EditorBrowseButton.Caption := Format('  %s  ', [LANGBrowseButton_Caption]);
   EditorBrowseButton.OnClick := ViewerBrowseButtonClick;
   EditorLabel2 := TGTKLabel.Create(Self);
   EditorLabel2.Caption := LANGPreferencesCommandSC;
@@ -502,7 +504,7 @@ begin
   for i := 1 to Length(ConfTerminalApps) do
     TerminalCombo.Items.Append(ConfTerminalApps[i]);
   TerminalBrowseButton := TGTKButton.Create(Self);
-  TerminalBrowseButton.Caption := LANGBrowseButton_Caption;
+  TerminalBrowseButton.Caption := Format('  %s  ', [LANGBrowseButton_Caption]);
   TerminalBrowseButton.OnClick := ViewerBrowseButtonClick;
   TerminalLabel2 := TGTKLabel.Create(Self);
   TerminalLabel2.Caption := LANGPreferencesCommandSC;
@@ -515,6 +517,26 @@ begin
   Table1.AddControlEx(2, 13, 3, 1, TerminalCombo, [taoExpand, taoFill], [taoShrink, taoExpand, taoFill], 10, 2);
   Table1.AddControlEx(4, 14, 1, 1, TerminalBrowseButton, [taoShrink, taoFill], [taoShrink, taoExpand, taoFill], 10, 2);
 
+  TempPathLabel := TGTKLabel.Create(Self);
+  TempPathLabel.XAlign := 0;
+  TempPathLabel.XPadding := 10;
+  TempPathLabel.Caption := Format('<span weight="ultrabold">%s</span>', ['Temporary files']);
+  TempPathLabel.UseMarkup := True;
+  Table1.AddControlEx(0, 15, 5, 1, TGTKVBox.Create(Self), [taoShrink, taoFill], [taoShrink, taoExpand, taoFill], 0, 13);
+  Table1.AddControlEx(0, 16, 5, 1, TempPathLabel, [taoShrink, taoFill], [taoShrink, taoExpand, taoFill], 0, 0);
+  Table1.AddControlEx(0, 17, 5, 1, TGTKVBox.Create(Self), [taoShrink, taoFill], [taoShrink, taoExpand, taoFill], 0, 2);
+
+  VFSTempPathLabel := TGTKLabel.Create(Self);
+  VFSTempPathLabel.Caption := '_VFS temp files:';
+  VFSTempPathLabel.XAlign := 0;
+  VFSTempPathLabel.UseUnderline := True;
+  VFSTempPathEntry := TGTKEntry.Create(Self);
+  VFSTempPathEntry.Tooltip := 'Location of temporary files used by VFS subsystem, e.g. when opening files directly from archives. All temporary files are cleaned on exit.';
+  VFSTempPathLabel.FocusControl := VFSTempPathEntry;
+  Table1.AddControlEx(0, 18, 1, 1, TGTKVBox.Create(Self), [taoShrink], [taoShrink, taoExpand, taoFill], 12, 2);
+  Table1.AddControlEx(1, 18, 1, 1, VFSTempPathLabel, [taoShrink, taoFill], [taoShrink, taoExpand, taoFill], 0, 2);
+  Table1.AddControlEx(2, 18, 4, 1, VFSTempPathEntry, [taoExpand, taoFill], [taoShrink, taoExpand, taoFill], 10, 2);
+
 
   // *********  PAGE Fonts
 
@@ -891,6 +913,7 @@ begin
   DateTimeFormatOptionMenu.ItemIndex := ConfDateTimeFormat;
   QuickSearchOptionMenu.ItemIndex := ConfQuickSearchActivationKey;
   SortDirectoriesLikeFilesCheckBox.Checked := ConfSortDirectoriesLikeFiles;
+  VFSTempPathEntry.Text := StrToUTF8(ConfTempPath);
 
   DefaultFontCheckBoxToggled(Self);
   ColorButtonDefaultsToggled(Self);
@@ -962,6 +985,7 @@ begin
   ConfDateTimeFormat := DateTimeFormatOptionMenu.ItemIndex;
   ConfQuickSearchActivationKey := QuickSearchOptionMenu.ItemIndex;
   ConfSortDirectoriesLikeFiles := SortDirectoriesLikeFilesCheckBox.Checked;
+  ConfTempPath := UTF8ToStr(VFSTempPathEntry.Text);
 end;
 
 (********************************************************************************************************************************)