From de08d64c9c42fd6ae02f3cfe06332fcbbc82234f Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Fri, 28 Nov 2025 22:17:39 +0100 Subject: Misc. cleanup --- UMain.pas | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) (limited to 'UMain.pas') diff --git a/UMain.pas b/UMain.pas index 2f5a2d3..75a0bd9 100644 --- a/UMain.pas +++ b/UMain.pas @@ -1754,7 +1754,7 @@ var ListView: TGTKListView; OpenDirThread.AHighlightItem := HiliString2; end; DebugMsg(['(II) TFMain.ChangingDir: begin thread']); - OpenDirThread.Resume; + OpenDirThread.Start; ProcessThreadEvents(OpenDirThread); DebugMsg(['(II) TFMain.ChangingDir: end thread, running time = ', OpenDirThread.RunningTime, 'ms']); except @@ -2413,7 +2413,7 @@ begin AWorkingThread.AEngine := Engine; AWorkingThread.DataList := DataList; AWorkingThread.JobType := WORKER_JOB_DELETE; - AWorkingThread.Resume; + AWorkingThread.Start; ProcessThreadEvents(AWorkingThread); finally AWorkingThread.Free; @@ -2611,7 +2611,7 @@ begin DebugMsg(['*** Copy: AWorkingThread.Resume']); - AWorkingThread.Resume; + AWorkingThread.Start; DebugMsg(['*** Copy: AWorkingThread.Resumed.']); ProcessThreadEvents(AWorkingThread); finally @@ -2848,7 +2848,7 @@ begin AWorkingThread.JobType := WORKER_JOB_MOVE; AWorkingThread.CopyTargetPath := UTF8ToStr(NewText); AWorkingThread.QuickRenameDataItem := InplaceEditItem.Data; - AWorkingThread.Resume; + AWorkingThread.Start; ProcessThreadEvents(AWorkingThread); finally DebugMsg(['TFMain.ListViewEdited: Freeing thread...']); @@ -3200,7 +3200,7 @@ begin AWorkingThread.MergeTargetSize := TargetSize; AWorkingThread.AEngine := Engine; AWorkingThread.JobType := WORKER_JOB_MERGE; - AWorkingThread.Resume; + AWorkingThread.Start; ProcessThreadEvents(AWorkingThread); s := AWorkingThread.MergeTargetFinalName; finally @@ -3282,7 +3282,7 @@ begin AWorkingThread.SplitMaxSize := MaxSize; AWorkingThread.AEngine := Engine; AWorkingThread.JobType := WORKER_JOB_SPLIT; - AWorkingThread.Resume; + AWorkingThread.Start; ProcessThreadEvents(AWorkingThread); finally DebugMsg(['TFMain.miSplitFileClick: Freeing thread...']); @@ -3456,7 +3456,7 @@ begin if not AViewer.LoadFile(AFile) then begin Application.MessageBox(Format('Cannot load file ''%s''. Please check the permissions.', [ANSIToUTF8(AFile)]), [mbOK], mbError); AViewer.Free; - end else AViewer.Resume; *) + end else AViewer.Start; *) AViewer := TFViewer.Create(Self); if not AViewer.LoadFile(Filename) then begin Application.MessageBox(Format(LANGCannotLoadFile, [Filename]), [mbOK], mbError, mbNone, mbOK); @@ -3507,7 +3507,7 @@ end; procedure TFMain.RunFile(Path: string; Engine: TPanelEngine; CustomAction: integer); var Command, FileTypeDesc: string; Error: string; - i, ac: integer; + ac: integer; b, AutodetectGUI, RunInTerminal: boolean; Stat: PDataItem; s: string; @@ -3569,7 +3569,6 @@ begin if Engine is TVFSEngine then b := HandleRunFromArchive(Path, Engine, Command, FileTypeDesc, False); // not a local engine, extract to local first if Pos('%s', s) > 0 then s := Format(s, ['''' + QuoteStr(Path) + '''']) else s := Format('%s %s', [s, QuoteStr(Path)]); -// DebugMsg(['execute: ', s, ' , ', Command, ' , ', QuoteStr(Path)]); if b then begin libc_chdir(PChar(ExtractFilePath(Path))); b := ExecuteProgram(s, ExtractFilePath(Path), AutodetectGUI, RunInTerminal, Error); @@ -3831,7 +3830,7 @@ begin AWorkingThread.AEngine := Engine; AWorkingThread.DataList := DataList; AWorkingThread.JobType := WORKER_JOB_CHMOD; - AWorkingThread.Resume; + AWorkingThread.Start; ProcessThreadEvents(AWorkingThread); finally AWorkingThread.Free; @@ -3914,7 +3913,7 @@ begin AWorkingThread.AEngine := Engine; AWorkingThread.DataList := DataList; AWorkingThread.JobType := WORKER_JOB_CHOWN; - AWorkingThread.Resume; + AWorkingThread.Start; ProcessThreadEvents(AWorkingThread); finally AWorkingThread.Free; @@ -4253,9 +4252,6 @@ end; (********************************************************************************************************************************) procedure TFMain.ListViewMouseUp(Sender: TObject; Button: TGDKMouseButton; Shift: TShiftState; X, Y: Integer; var Accept: boolean); -var AListView: TGTKListView; - i, FirstColumn, LastColumn: integer; - LeftLV, b: boolean; begin PanelRightMouseInProgress := False; RightMouseSelectPopupTimer.Enabled := False; @@ -5812,7 +5808,6 @@ var Buttons: TMessageButtons; AFConnectionProperties: TFConnectionProperties; URI: string; ConnMgrItem: TConnMgrItem; - i: integer; DontShowAgain: boolean; res: TMessageButton; begin @@ -6117,7 +6112,6 @@ function TFMain.HandleRunFromArchive(var APath: string; Engine: TPanelEngine; Co var Res: TMessageButton; Stat: PDataItem; s: string; - AListView: TGTKListView; begin Result := False; try @@ -6170,8 +6164,6 @@ begin if Res = mbYes then DebugMsg(['(II) HandleRunFromArchive: Selected extract and execute single item']) else DebugMsg(['(II) HandleRunFromArchive: Selected extract all and execute']); - if LeftLastFocused then AListView := LeftListView - else AListView := RightListView; Engine.Path := ExtractFilePath(APath); // Extract the files Result := ExtractFromArchive(APath, Engine, APath, Res = mbNo); @@ -6220,7 +6212,7 @@ begin AWorkingThread.CopyTargetPath := string(tmp); AWorkingThread.ExtractFile := FileToExtract; DebugMsg(['*** Copy: AWorkingThread.Resume']); - AWorkingThread.Resume; + AWorkingThread.Start; DebugMsg(['*** Copy: AWorkingThread.Resumed.']); ProcessThreadEvents(AWorkingThread); Result := (not AWorkingThread.FCancelled) and (not AWorkingThread.ErrorHappened); -- cgit v1.2.3