Commit MetaInfo

Revision7c44f0c81c5a8646ab91b90b2d1466a0bef4ced0 (tree)
Zeit2005-12-28 02:13:08
Autorcvs2git <cvs2git>
Commitercvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_51_0_635'.

Ändern Zusammenfassung

Diff

--- a/Editor.pas
+++ b/Editor.pas
@@ -967,7 +967,7 @@ begin
967967 if MsgResult = IDNO then begin
968968 Board.SPID := '';
969969 Board.PON := '';
970- FWork := false;
970+ FWork := false;
971971 EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
972972 DrawMenuBar(Handle);
973973 Exit;
@@ -976,7 +976,7 @@ begin
976976 end;
977977
978978 if ResultType = grtOK then begin
979- if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then
979+ if GikoSys.Setting.UseSamba then
980980 WriteSambaTime(FHost, Now());
981981 State := gdsComplete;
982982 end else if ResultType = grtCookie then begin
@@ -1045,8 +1045,8 @@ begin
10451045 Exit;
10461046 end;
10471047 end else begin
1048- if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then
1049- WriteSambaTime(FHost, Now());
1048+ if GikoSys.Setting.UseSamba then
1049+ WriteSambaTime(FHost, Now());
10501050 State := gdsError;
10511051 raise Exception.Create('');
10521052 end;
--- a/Giko.pas
+++ b/Giko.pas
@@ -2524,9 +2524,6 @@ begin
25242524 BrowserNullTab := TBrowserRecord.Create;
25252525 BrowserNullTab.Browser := Browser;
25262526 end;
2527- if BrowserNullTab.thread <> ThreadItem then begin
2528- BrowserNullTab.Movement := '';
2529- end;
25302527 BrowserNullTab.thread := ThreadItem;
25312528 Result := BrowserNullTab;
25322529 BrowserTab.TabIndex := -1;
@@ -2556,7 +2553,6 @@ begin
25562553 idx := BrowserTab.TabIndex;
25572554 if (FActiveContent <> nil) and
25582555 (FActiveContent.Thread <> Thread.Thread) and
2559- (FActiveContent.Browser <> nil) and
25602556 (Assigned(FActiveContent.Browser.Document)) then begin
25612557 try
25622558 try
@@ -2728,19 +2724,9 @@ begin
27282724 ListView.Selected := nil;
27292725 // ListView.Columns.Clear;
27302726 if (FActiveContent <> nil) and (FActiveContent.Thread <> nil)
2731- and (FActiveContent.Thread.IsLogFile) then begin
2732- try
2733- Self.Caption := GikoDataModule.CAPTION_NAME + ' - [' + FActiveContent.Thread.Title + ']'
2734- except
2735- on E: Exception do begin
2736- //スレ一覧DL後などにFActiveContentの持つThreadが
2737- //削除されている場合があるのでここて処理する
2738- ReleaseBrowser(FActiveContent);
2739- FActiveContent.Thread := nil;
2740- Self.Caption := GikoDataModule.CAPTION_NAME;
2741- end;
2742- end;
2743- end else
2727+ and (FActiveContent.Thread.IsLogFile) then
2728+ Self.Caption := GikoDataModule.CAPTION_NAME + ' - [' + FActiveContent.Thread.Title + ']'
2729+ else
27442730 Self.Caption := GikoDataModule.CAPTION_NAME;
27452731 //Application.Title := CAPTION_NAME;
27462732
@@ -6092,10 +6078,8 @@ begin
60926078 FavoriteTreeView.Selected.Expanded := not FavoriteTreeView.Selected.Expanded;
60936079 end;
60946080 VK_SPACE:
6095- begin
6096- FClickNode := FavoriteTreeView.Selected;
6097- GikoDM.FavoriteTreeViewReloadActionExecute( Sender );
6098- end;
6081+ GikoDM.FavoriteTreeViewReloadActionExecute(
6082+ TObject(FavoriteTreeView.Selected));
60996083 end;
61006084 end else begin
61016085 //編集中にESCを押したら、編集を終了して、元の文字列に戻す
@@ -6690,9 +6674,9 @@ begin
66906674 if ((rect.Left <= X) and (rect.Right >= X)) and
66916675 ((rect.Bottom >= Y) and (rect.Top <= Y)) then begin
66926676 if ssDouble in Shift then begin
6693- FClickNode := FavoriteTreeView.Selected;
6694- GikoDM.FavoriteTreeViewReloadActionExecute(Sender);
6695- FClickNode := nil;
6677+ GikoDM.FavoriteTreeViewReloadActionExecute(
6678+ TObject(FavoriteTreeView.Selected));
6679+
66966680 end else begin
66976681 FavoriteClick(
66986682 TObject(FavoriteTreeView.Selected));
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -695,21 +695,28 @@ end;
695695 // *************************************************************************
696696 procedure TGikoDM.FavoriteTreeViewReloadActionExecute(Sender: TObject);
697697 var
698+ ThreadItem: TThreadItem;
698699 FavThread: TFavoriteThreadItem;
700+ Board: TBoard;
699701 FavBoard: TFavoriteBoardItem;
700702 shiftDown: Boolean;
703+ Node : TTreeNode;
701704 begin
702- if (GikoForm.ClickNode = nil) then Exit;
705+ if (Sender = nil) or not (Sender is TTreeNode) then Exit;
706+
707+ Node := TTreeNode(Sender);
703708
704709 shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001);
705710
706- if TObject( GikoForm.ClickNode.Data ) is TFavoriteThreadItem then begin
707- FavThread := TFavoriteThreadItem( GikoForm.ClickNode.Data );
708- if FavThread.Item <> nil then
709- GikoForm.DownloadContent(FavThread.Item, shiftDown);
710- end else if TObject( GikoForm.ClickNode.Data ) is TFavoriteBoardItem then begin
711- FavBoard := TFavoriteBoardItem( GikoForm.ClickNode.Data );
712- GikoForm.DownloadList(FavBoard.Item, shiftDown);
711+ if TObject( Node.Data ) is TFavoriteThreadItem then begin
712+ FavThread := TFavoriteThreadItem( Node.Data );
713+ ThreadItem := FavThread.Item;
714+ if ThreadItem <> nil then
715+ GikoForm.DownloadContent(ThreadItem, shiftDown);
716+ end else if TObject( Node.Data ) is TFavoriteBoardItem then begin
717+ FavBoard := TFavoriteBoardItem( Node.Data );
718+ Board := FavBoard.Item;
719+ GikoForm.DownloadList(Board, shiftDown);
713720 end;
714721
715722 end;
Binary files a/gikoNavi.res and b/gikoNavi.res differ
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -120,8 +120,6 @@ LICENSE
120120  DAT落ちしたスレの容量を取得できない不具合の修正
121121  板更新でローカルファイルを指定できるように変更
122122  スレッド一覧ダウンロード後のソートをオプション化
123- NGワードに全半角ひらがなカタカナの違いを同一視するオプションの追加
124- レスの絞込みで全半角ひらがなカタカタの違いを無視するように変更
125123
126124 2005/10/10
127125 Version バタ50 リリース3
Show on old repository browser