Revision | 7c44f0c81c5a8646ab91b90b2d1466a0bef4ced0 (tree) |
---|---|
Zeit | 2005-12-28 02:13:08 |
Autor | cvs2git <cvs2git> |
Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_51_0_635'.
@@ -967,7 +967,7 @@ begin | ||
967 | 967 | if MsgResult = IDNO then begin |
968 | 968 | Board.SPID := ''; |
969 | 969 | Board.PON := ''; |
970 | - FWork := false; | |
970 | + FWork := false; | |
971 | 971 | EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED); |
972 | 972 | DrawMenuBar(Handle); |
973 | 973 | Exit; |
@@ -976,7 +976,7 @@ begin | ||
976 | 976 | end; |
977 | 977 | |
978 | 978 | if ResultType = grtOK then begin |
979 | - if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then | |
979 | + if GikoSys.Setting.UseSamba then | |
980 | 980 | WriteSambaTime(FHost, Now()); |
981 | 981 | State := gdsComplete; |
982 | 982 | end else if ResultType = grtCookie then begin |
@@ -1045,8 +1045,8 @@ begin | ||
1045 | 1045 | Exit; |
1046 | 1046 | end; |
1047 | 1047 | 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()); | |
1050 | 1050 | State := gdsError; |
1051 | 1051 | raise Exception.Create(''); |
1052 | 1052 | end; |
@@ -2524,9 +2524,6 @@ begin | ||
2524 | 2524 | BrowserNullTab := TBrowserRecord.Create; |
2525 | 2525 | BrowserNullTab.Browser := Browser; |
2526 | 2526 | end; |
2527 | - if BrowserNullTab.thread <> ThreadItem then begin | |
2528 | - BrowserNullTab.Movement := ''; | |
2529 | - end; | |
2530 | 2527 | BrowserNullTab.thread := ThreadItem; |
2531 | 2528 | Result := BrowserNullTab; |
2532 | 2529 | BrowserTab.TabIndex := -1; |
@@ -2556,7 +2553,6 @@ begin | ||
2556 | 2553 | idx := BrowserTab.TabIndex; |
2557 | 2554 | if (FActiveContent <> nil) and |
2558 | 2555 | (FActiveContent.Thread <> Thread.Thread) and |
2559 | - (FActiveContent.Browser <> nil) and | |
2560 | 2556 | (Assigned(FActiveContent.Browser.Document)) then begin |
2561 | 2557 | try |
2562 | 2558 | try |
@@ -2728,19 +2724,9 @@ begin | ||
2728 | 2724 | ListView.Selected := nil; |
2729 | 2725 | // ListView.Columns.Clear; |
2730 | 2726 | 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 | |
2744 | 2730 | Self.Caption := GikoDataModule.CAPTION_NAME; |
2745 | 2731 | //Application.Title := CAPTION_NAME; |
2746 | 2732 |
@@ -6092,10 +6078,8 @@ begin | ||
6092 | 6078 | FavoriteTreeView.Selected.Expanded := not FavoriteTreeView.Selected.Expanded; |
6093 | 6079 | end; |
6094 | 6080 | VK_SPACE: |
6095 | - begin | |
6096 | - FClickNode := FavoriteTreeView.Selected; | |
6097 | - GikoDM.FavoriteTreeViewReloadActionExecute( Sender ); | |
6098 | - end; | |
6081 | + GikoDM.FavoriteTreeViewReloadActionExecute( | |
6082 | + TObject(FavoriteTreeView.Selected)); | |
6099 | 6083 | end; |
6100 | 6084 | end else begin |
6101 | 6085 | //編集中にESCを押したら、編集を終了して、元の文字列に戻す |
@@ -6690,9 +6674,9 @@ begin | ||
6690 | 6674 | if ((rect.Left <= X) and (rect.Right >= X)) and |
6691 | 6675 | ((rect.Bottom >= Y) and (rect.Top <= Y)) then begin |
6692 | 6676 | 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 | + | |
6696 | 6680 | end else begin |
6697 | 6681 | FavoriteClick( |
6698 | 6682 | TObject(FavoriteTreeView.Selected)); |
@@ -695,21 +695,28 @@ end; | ||
695 | 695 | // ************************************************************************* |
696 | 696 | procedure TGikoDM.FavoriteTreeViewReloadActionExecute(Sender: TObject); |
697 | 697 | var |
698 | + ThreadItem: TThreadItem; | |
698 | 699 | FavThread: TFavoriteThreadItem; |
700 | + Board: TBoard; | |
699 | 701 | FavBoard: TFavoriteBoardItem; |
700 | 702 | shiftDown: Boolean; |
703 | + Node : TTreeNode; | |
701 | 704 | begin |
702 | - if (GikoForm.ClickNode = nil) then Exit; | |
705 | + if (Sender = nil) or not (Sender is TTreeNode) then Exit; | |
706 | + | |
707 | + Node := TTreeNode(Sender); | |
703 | 708 | |
704 | 709 | shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001); |
705 | 710 | |
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); | |
713 | 720 | end; |
714 | 721 | |
715 | 722 | end; |
@@ -120,8 +120,6 @@ LICENSE | ||
120 | 120 | DAT落ちしたスレの容量を取得できない不具合の修正 |
121 | 121 | 板更新でローカルファイルを指定できるように変更 |
122 | 122 | スレッド一覧ダウンロード後のソートをオプション化 |
123 | - NGワードに全半角ひらがなカタカナの違いを同一視するオプションの追加 | |
124 | - レスの絞込みで全半角ひらがなカタカタの違いを無視するように変更 | |
125 | 123 | |
126 | 124 | 2005/10/10 |
127 | 125 | Version バタ50 リリース3 |