diff options
| -rw-r--r-- | UChecksum.pas | 9 | ||||
| -rw-r--r-- | UChecksumDruid.pas | 8 | ||||
| -rw-r--r-- | UConfig.pas | 4 |
3 files changed, 14 insertions, 7 deletions
diff --git a/UChecksum.pas b/UChecksum.pas index 9bd2aaf..c89ae43 100644 --- a/UChecksum.pas +++ b/UChecksum.pas @@ -173,7 +173,7 @@ end; procedure TFChecksum.FormShow(Sender: TObject); begin CheckButton.Enabled := FileList.Items.Count > 0; - if MD5Present and (not SFVPresent) and (CommentTextView.TextBuffer.LineCount = 1) + if MD5Present or {(not SFVPresent) and} (CommentTextView.TextBuffer.CharCount < 1) then HPaned.Position := Width - 90; end; @@ -448,17 +448,20 @@ begin libc_free(Buffer); ProgressBar.Fraction := 1; CheckButton.Caption := LANGCheckButtonCaptionCheck; - if Stop then StatLabel.Caption := LANGChecksumInterrupted else begin + if Stop then begin + StatLabel.Caption := LANGChecksumInterrupted; + CheckButton.SetFocus; + end else begin Error := 0; if List.Count > 0 then for i := 0 to List.Count - 1 do if TFileListItem(List[i]).Status <> 1 then Inc(Error); StatLabel.Caption := Format(LANGChecksumDOK, [Round(100 * (List.Count - Error) / List.Count)]); + ActionArea.SetFocus; end; StatLabel.UseMarkup := True; Stop := False; Processing := False; - ActionArea.SetFocus; end; procedure TFChecksum.MarkAsBad(const FileName: string); diff --git a/UChecksumDruid.pas b/UChecksumDruid.pas index 284060e..34a2570 100644 --- a/UChecksumDruid.pas +++ b/UChecksumDruid.pas @@ -313,12 +313,16 @@ begin s := UTF8ToStr(FileNameEntry.Text); i := Engine.OpenFile(s, omWrite, Error); if Error <> 0 then begin - Application.MessageBox(Format(LANGCCHKSUMAnErrorOccuredWhileOpeningFileSS, [StrToUTF8(ExtractFileName(s)), GetErrorString(Error)]), + Application.MessageBox(PGtkWindow(FWidget), Format(LANGCCHKSUMAnErrorOccuredWhileOpeningFileSS, [StrToUTF8(ExtractFileName(s)), GetErrorString(Error)]), [mbOK], mbError, mbNone, mbOK); Exit; end; Engine.CloseFile(i); + Engine.Remove(s); end; + + DebugMsg(['TFChecksumDruid.SetCurrentPage: CurrentPage = ', CurrentPage, ', new = ', Num]); + // Changing page CurrentPage := Num; if CurrentPage < 1 then CurrentPage := 1; @@ -410,7 +414,7 @@ end; procedure TFChecksumDruid.CheckStop; begin if Stop and (not StopBreak) then - if Application.MessageBox(LANGCCHKSUMAreYouSureYouWantToAbortTheProcessing, [mbYes, mbNo], mbQuestion, mbNone, mbNo) = mbYes + if Application.MessageBox(PGtkWindow(FWidget), LANGCCHKSUMAreYouSureYouWantToAbortTheProcessing, [mbYes, mbNo], mbQuestion, mbNone, mbNo) = mbYes then StopBreak := True else begin Stop := False; StopBreak := False; end; end; diff --git a/UConfig.pas b/UConfig.pas index 02af7bc..a23d4be 100644 --- a/UConfig.pas +++ b/UConfig.pas @@ -25,8 +25,8 @@ uses Classes, ULocale; resourcestring ConstAppTitle = 'Tux Commander'; - ConstAboutVersion = '0.6.57-dev'; - ConstAboutBuildDate = '2008-11-13'; + ConstAboutVersion = '0.6.58-dev'; + ConstAboutBuildDate = '2008-11-14'; {$IFDEF FPC} {$INCLUDE fpcver.inc} |