巡回時のステータスバー表示の不具合の修正

diff --git a/Giko.pas b/Giko.pas
index 5e7f1ae..6afe5b9 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -907,7 +907,7 @@ type
 
                procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
                procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
-               procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer);
+               procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
                procedure WorkEnd(Sender: TObject; AWorkMode: TWorkMode; Number: Integer);
                procedure Work(Sender: TObject; AWorkMode: TWorkMode; const AWorkCount: Integer; Number: Integer);
 
@@ -3115,12 +3115,13 @@ begin
        end;
 end;
 
-procedure TGikoForm.WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer);
+procedure TGikoForm.WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
 begin
 //     SetProgressValue(Number, 0, AWorkCountMax);
 //     ProgressBar.Visible := True;
        ProgressBar.Position := 0;
        ProgressBar.Max := AWorkCountMax;
+       FDownloadTitle := AWorkTitle;
        StatusBar.Panels[1].Text := FDownloadTitle + ' - \83_\83E\83\93\83\8d\81[\83h\82ð\8aJ\8en\82µ\82Ü\82·';
        FDownloadMax := AWorkCountMax;
 end;
@@ -3493,11 +3494,6 @@ procedure TGikoForm.DownloadList(Board: TBoard);
 var
        Item: TDownloadItem;
 begin
-       if Board.Title = '' then
-               FDownloadTitle := '\81i\96¼\8fÌ\95s\96¾\81j'
-       else
-               FDownloadTitle := Board.Title;
-
        if not Board.IsThreadDatRead then
                GikoSys.ReadSubjectFile(Board);
        Item := TDownloadItem.Create;
@@ -3527,10 +3523,6 @@ procedure TGikoForm.DownloadContent(ThreadItem: TThreadItem);
 var
        Item: TDownloadItem;
 begin
-       if ThreadItem.Title = '' then
-               FDownloadTitle := '\81i\96¼\8fÌ\95s\96¾\81j'
-       else
-               FDownloadTitle := ThreadItem.Title;
        Item := TDownloadItem.Create;
        try
                Item.ThreadItem := ThreadItem;

diff --git a/ItemDownload.pas b/ItemDownload.pas
index 050969a..0991ca1 100644 (file)
--- a/ItemDownload.pas
+++ b/ItemDownload.pas
@@ -15,7 +15,7 @@ type
        TGikoDLProgress = (gdpStd, gdpAll, gdpDatOchi, gdpOfflaw);
 
        TGikoWorkEvent = procedure(Sender: TObject; AWorkMode: TWorkMode; const AWorkCount: Integer; ID: Integer) of object;
-       TGikoWorkBeginEvent = procedure(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; ID: Integer) of object;
+       TGikoWorkBeginEvent = procedure(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; ID: Integer; const AWorkTitle: string) of object;
        TGikoWorkEndEvent = procedure(Sender: TObject; AWorkMode: TWorkMode; ID: Integer) of object;
        TDownloadEndEvent = procedure(Sender: TObject; Item: TDownloadItem) of object;
        TDownloadMsgEvent = procedure(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon) of object;
@@ -41,6 +41,7 @@ type
                FOnWorkEnd: TGikoWorkEndEvent;
                FOnDownloadEnd: TDownloadEndEvent;
                FOnDownloadMsg: TDownloadMsgEvent;
+               FDownloadTitle: string;
 
                procedure FireDownloadEnd;
                procedure FireDownloadMsg;
@@ -163,9 +164,11 @@ begin
                ExternalBoardManager.OnWorkBegin        := WorkBegin;
                ExternalBoardManager.OnWorkEnd          := WorkEnd;
 
+               FDownloadTitle := '';
                case FItem.FDownType of
                gdtBoard:
                        begin
+                               FDownloadTitle := FItem.FBoard.Title;
                                if FItem.FBoard <> nil then begin
                                        if FItem.FBoard.IsBoardPlugInAvailable then begin
                                                boardPlugIn     := FItem.FBoard.BoardPlugIn;
@@ -175,6 +178,7 @@ begin
                        end;
                gdtThread:
                        begin
+                               FDownloadTitle := FItem.FThreadItem.Title;
                                if FItem.FThreadItem <> nil then begin
                                        if FItem.FThreadItem.IsBoardPlugInAvailable then begin
                                                boardPlugIn     := FItem.FThreadItem.BoardPlugIn;
@@ -183,6 +187,8 @@ begin
                                end;
                        end;
                end;
+               if Length(FDownloadTitle) = 0 then
+                       FDownloadTitle := '\81i\96¼\8fÌ\95s\96¾\81j';
 
                if boardPlugIn <> nil then begin
                        if FAbort then
@@ -781,7 +787,7 @@ end;
 procedure TDownloadThread.WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer);
 begin
        if Assigned(OnWorkBegin) then
-               OnWorkBegin(Sender, AWorkMode, AWorkCountMax, FNumber);
+               OnWorkBegin(Sender, AWorkMode, AWorkCountMax, FNumber, FDownloadTitle);
 end;
 
 procedure TDownloadThread.WorkEnd(Sender: TObject; AWorkMode: TWorkMode);

diff --git a/ThreadControl.pas b/ThreadControl.pas
index c12ae07..b3e8e75 100644 (file)
--- a/ThreadControl.pas
+++ b/ThreadControl.pas
@@ -18,7 +18,7 @@ type
                FOnWorkEnd: TGikoWorkEndEvent;
                FOnDownloadEnd: TDownloadEndEvent;
                FOnDownloadMsg: TDownloadMsgEvent;
-               procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer);
+               procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
                procedure WorkEnd(Sender: TObject; AWorkMode: TWorkMode; Number: Integer);
                procedure Work(Sender: TObject; AWorkMode: TWorkMode; const AWorkCount: Integer; Number: Integer);
                procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
@@ -167,10 +167,10 @@ begin
        FMaxThreadCount := Count;
 end;
 
-procedure TThreadControl.WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer);
+procedure TThreadControl.WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
 begin
        if Assigned(OnWorkBegin) then
-               OnWorkBegin(Sender, AWorkMode, AWorkCountMax, Number);
+               OnWorkBegin(Sender, AWorkMode, AWorkCountMax, Number, AWorkTitle);
 end;
 
 procedure TThreadControl.WorkEnd(Sender: TObject; AWorkMode: TWorkMode; Number: Integer);

diff --git a/readme/readme.txt b/readme/readme.txt
index a82fe43..6995fb6 100644 (file)
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -97,6 +97,7 @@ Windows Server 2003 Enterprise Edition IE6
   \83V\83\8a\83A\8cê\83u\83\89\83N\83\89\91Î\8dô\92Ç\89Á\81i\83I\83v\83V\83\87\83\93->\82 \82Ú\81`\82ñ\81j
   Samba24\91Î\8dô\8ex\89\87\8b@\94\\92Ç\89Á
   \94Â\8dX\90V\8e\9e\82É\8f\84\89ñ\83t\83@\83C\83\8b\82ÌURL\82ª\90Ø\82è\91Ö\82í\82ç\82È\82¢\95s\8bï\8d\87\82Ì\8fC\90³
+  \8f\84\89ñ\8e\9e\82Ì\83X\83e\81[\83^\83X\83o\81[\95\\8e¦\82Ì\95s\8bï\8d\87\82Ì\8fC\90³
   
 2004/03/06
   Version ÊÞÀ46