Revision | 575ae62aaf4715da21aef947f1a2ff4958423934 (tree) |
---|---|
Time | 2005-12-28 02:13:06 |
Author | cvs2git <cvs2git> |
Commiter | cvs2git |
This commit was manufactured by cvs2svn to create tag 'v1_51_0_633'.
@@ -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; |
@@ -98,6 +98,7 @@ object GikoForm: TGikoForm | ||
98 | 98 | Height = 167 |
99 | 99 | BorderStyle = bsNone |
100 | 100 | ChangeDelay = 50 |
101 | + DragMode = dmAutomatic | |
101 | 102 | HideSelection = False |
102 | 103 | Images = ItemIcon16 |
103 | 104 | Indent = 19 |
@@ -106,12 +107,16 @@ object GikoForm: TGikoForm | ||
106 | 107 | RightClickSelect = True |
107 | 108 | ShowRoot = False |
108 | 109 | TabOrder = 0 |
110 | + OnClick = TreeViewClick | |
109 | 111 | OnCollapsed = TreeViewCollapsed |
112 | + OnCollapsing = TreeViewCollapsing | |
110 | 113 | OnCustomDraw = TreeViewCustomDraw |
111 | 114 | OnCustomDrawItem = TreeViewCustomDrawItem |
115 | + OnDblClick = TreeViewDblClick | |
116 | + OnExpanding = TreeViewExpanding | |
112 | 117 | OnExpanded = TreeViewExpanded |
113 | 118 | OnKeyDown = TreeViewKeyDown |
114 | - OnMouseDown = TreeViewMouseDown | |
119 | + OnMouseUp = TreeViewMouseUp | |
115 | 120 | end |
116 | 121 | object Panel3: TPanel |
117 | 122 | Left = 0 |
@@ -226,13 +231,18 @@ object GikoForm: TGikoForm | ||
226 | 231 | RightClickSelect = True |
227 | 232 | ShowRoot = False |
228 | 233 | TabOrder = 3 |
234 | + OnClick = FavoriteTreeViewClick | |
235 | + OnCollapsing = FavoriteTreeViewCollapsing | |
236 | + OnDblClick = FavoriteTreeViewDblClick | |
229 | 237 | OnDragDrop = FavoriteTreeViewDragDrop |
230 | 238 | OnDragOver = FavoriteTreeViewDragOver |
231 | 239 | OnEdited = FavoriteTreeViewEdited |
232 | 240 | OnEditing = FavoriteTreeViewEditing |
233 | 241 | OnEndDrag = FavoriteTreeViewEndDrag |
242 | + OnExpanding = FavoriteTreeViewExpanding | |
234 | 243 | OnKeyDown = FavoriteTreeViewKeyDown |
235 | 244 | OnMouseDown = FavoriteTreeViewMouseDown |
245 | + OnMouseUp = FavoriteTreeViewMouseUp | |
236 | 246 | end |
237 | 247 | object FavoriteToolBar: TToolBar |
238 | 248 | Left = 0 |
@@ -423,6 +423,7 @@ type | ||
423 | 423 | procedure TreeViewCustomDrawItem(Sender: TCustomTreeView; |
424 | 424 | Node: TTreeNode; State: TCustomDrawState; var DefaultDraw: Boolean); |
425 | 425 | procedure TreeViewExpanded(Sender: TObject; Node: TTreeNode); |
426 | + procedure TreeViewDblClick(Sender: TObject); | |
426 | 427 | procedure ListViewCustomDraw(Sender: TCustomListView; |
427 | 428 | const ARect: TRect; var DefaultDraw: Boolean); |
428 | 429 | procedure ListViewMouseDown(Sender: TObject; Button: TMouseButton; |
@@ -494,6 +495,7 @@ type | ||
494 | 495 | procedure FavoriteTreeViewKeyDown(Sender: TObject; var Key: Word; |
495 | 496 | Shift: TShiftState); |
496 | 497 | procedure FavoriteTreePopupMenuPopup(Sender: TObject); |
498 | + procedure FavoriteTreeViewDblClick(Sender: TObject); | |
497 | 499 | procedure LinkToolBarDragDrop(Sender, Source: TObject; X, Y: Integer); |
498 | 500 | procedure BrowserTabMouseUp(Sender: TObject; Button: TMouseButton; |
499 | 501 | Shift: TShiftState; X, Y: Integer); |
@@ -512,12 +514,15 @@ type | ||
512 | 514 | var Handled: Boolean); |
513 | 515 | procedure BrowserTabPopupMenuPopup(Sender: TObject); |
514 | 516 | procedure BrowserTabResize(Sender: TObject); |
517 | + procedure TreeViewClick(Sender: TObject); | |
515 | 518 | procedure TreeViewKeyDown(Sender: TObject; var Key: Word; |
516 | 519 | Shift: TShiftState); |
517 | 520 | procedure FavoriteTreeViewMouseDown(Sender: TObject; |
518 | 521 | Button: TMouseButton; Shift: TShiftState; X, Y: Integer); |
519 | 522 | procedure MessagePanelResize(Sender: TObject); |
520 | 523 | procedure OnResized; |
524 | + procedure FavoriteTreeViewMouseUp(Sender: TObject; | |
525 | + Button: TMouseButton; Shift: TShiftState; X, Y: Integer); | |
521 | 526 | procedure SelectTimerTimer(Sender: TObject); |
522 | 527 | procedure ListViewColumnRightClick(Sender: TObject; |
523 | 528 | Column: TListColumn; Point: TPoint); |
@@ -539,7 +544,16 @@ type | ||
539 | 544 | var Handled: Boolean); |
540 | 545 | procedure GikoApplicationEventsDeactivate(Sender: TObject); |
541 | 546 | procedure GikoApplicationEventsException(Sender: TObject; E: Exception); |
542 | - procedure TreeViewMouseDown(Sender: TObject; Button: TMouseButton; | |
547 | + procedure FavoriteTreeViewClick(Sender: TObject); | |
548 | + procedure FavoriteTreeViewCollapsing(Sender: TObject; Node: TTreeNode; | |
549 | + var AllowCollapse: Boolean); | |
550 | + procedure FavoriteTreeViewExpanding(Sender: TObject; Node: TTreeNode; | |
551 | + var AllowExpansion: Boolean); | |
552 | + procedure TreeViewCollapsing(Sender: TObject; Node: TTreeNode; | |
553 | + var AllowCollapse: Boolean); | |
554 | + procedure TreeViewExpanding(Sender: TObject; Node: TTreeNode; | |
555 | + var AllowExpansion: Boolean); | |
556 | + procedure TreeViewMouseUp(Sender: TObject; Button: TMouseButton; | |
543 | 557 | Shift: TShiftState; X, Y: Integer); |
544 | 558 | private |
545 | 559 | { Private 宣言 } |
@@ -1200,7 +1214,6 @@ begin | ||
1200 | 1214 | FavoriteAddToolButton.Caption := '追加...'; |
1201 | 1215 | AntiIndivAbonMenuItem.Caption := '個別あぼ〜ん解除'; |
1202 | 1216 | |
1203 | - | |
1204 | 1217 | end; |
1205 | 1218 | |
1206 | 1219 | // CoolBar の設定を変数に保存 |
@@ -2010,9 +2023,15 @@ begin | ||
2010 | 2023 | if vSortIndex = id then |
2011 | 2024 | vSortOrder := not vSortOrder |
2012 | 2025 | else begin |
2013 | - vSortOrder := id = 0; | |
2026 | + vSortOrder := True; | |
2014 | 2027 | end; |
2015 | - | |
2028 | +{$IFDEF DEBUG} | |
2029 | + If vSortOrder then begin | |
2030 | + Writeln('True : id:' + IntToStr(id) + ' SI:' + IntToStr(vSortIndex)); | |
2031 | + end else begin | |
2032 | + Writeln('False : id:' + IntToStr(id) + ' SI:' + IntToStr(vSortIndex)); | |
2033 | + end; | |
2034 | +{$ENDIF} | |
2016 | 2035 | TListViewUtils.ListViewSort(Sender, ListView, Column, GikoDM.ListNumberVisibleAction.Checked, vSortOrder); |
2017 | 2036 | end; |
2018 | 2037 |
@@ -2212,13 +2231,31 @@ begin | ||
2212 | 2231 | ListView.SetFocus; |
2213 | 2232 | ListView.SelectAll; |
2214 | 2233 | end; |
2234 | +// ************************************************************************* | |
2235 | +//! ツリービューのダブルクリックイベント | |
2236 | +// ************************************************************************* | |
2237 | +procedure TGikoForm.TreeViewDblClick(Sender: TObject); | |
2238 | +var | |
2239 | + pos : TPoint; | |
2240 | + rect: TRect; | |
2241 | +begin | |
2242 | + pos := FMouseDownPos; | |
2243 | + if (FClickNode <> nil) and (FClickNode = TreeView.GetNodeAt(pos.X, pos.Y)) then begin | |
2244 | + //マウスがnodeの上にいるか | |
2245 | + rect := FClickNode.DisplayRect(true); | |
2246 | + if ((rect.Left <= pos.X) and (rect.Right >= pos.X)) and | |
2247 | + ((rect.Bottom >= pos.Y) and (rect.Top <= pos.Y)) then begin | |
2248 | + TreeDoubleClick( FClickNode ); | |
2249 | + FClickNode := nil; | |
2250 | + end; | |
2251 | + end; | |
2252 | +end; | |
2253 | + | |
2215 | 2254 | procedure TGikoForm.DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon); |
2216 | 2255 | begin |
2217 | 2256 | AddMessageList(Msg, nil, Icon); |
2218 | 2257 | end; |
2219 | -// ************************************************************************* | |
2220 | -//! ダウンロードが完了したときに発生するイベント | |
2221 | -// ************************************************************************* | |
2258 | + | |
2222 | 2259 | procedure TGikoForm.DownloadEnd(Sender: TObject; Item: TDownloadItem); |
2223 | 2260 | var |
2224 | 2261 | ATitle: string; |
@@ -2524,9 +2561,6 @@ begin | ||
2524 | 2561 | BrowserNullTab := TBrowserRecord.Create; |
2525 | 2562 | BrowserNullTab.Browser := Browser; |
2526 | 2563 | end; |
2527 | - if BrowserNullTab.thread <> ThreadItem then begin | |
2528 | - BrowserNullTab.Movement := ''; | |
2529 | - end; | |
2530 | 2564 | BrowserNullTab.thread := ThreadItem; |
2531 | 2565 | Result := BrowserNullTab; |
2532 | 2566 | BrowserTab.TabIndex := -1; |
@@ -2556,7 +2590,6 @@ begin | ||
2556 | 2590 | idx := BrowserTab.TabIndex; |
2557 | 2591 | if (FActiveContent <> nil) and |
2558 | 2592 | (FActiveContent.Thread <> Thread.Thread) and |
2559 | - (FActiveContent.Browser <> nil) and | |
2560 | 2593 | (Assigned(FActiveContent.Browser.Document)) then begin |
2561 | 2594 | try |
2562 | 2595 | try |
@@ -2728,19 +2761,9 @@ begin | ||
2728 | 2761 | ListView.Selected := nil; |
2729 | 2762 | // ListView.Columns.Clear; |
2730 | 2763 | 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 | |
2764 | + and (FActiveContent.Thread.IsLogFile) then | |
2765 | + Self.Caption := GikoDataModule.CAPTION_NAME + ' - [' + FActiveContent.Thread.Title + ']' | |
2766 | + else | |
2744 | 2767 | Self.Caption := GikoDataModule.CAPTION_NAME; |
2745 | 2768 | //Application.Title := CAPTION_NAME; |
2746 | 2769 |
@@ -4431,7 +4454,9 @@ end; | ||
4431 | 4454 | |
4432 | 4455 | procedure TGikoForm.FavoriteClick(Sender: TObject); |
4433 | 4456 | begin |
4457 | + | |
4434 | 4458 | FavoriteClick( Sender, True ); |
4459 | + | |
4435 | 4460 | end; |
4436 | 4461 | |
4437 | 4462 | procedure TGikoForm.FavoriteClick(Sender: TObject; ActiveTab: Boolean); |
@@ -6092,10 +6117,7 @@ begin | ||
6092 | 6117 | FavoriteTreeView.Selected.Expanded := not FavoriteTreeView.Selected.Expanded; |
6093 | 6118 | end; |
6094 | 6119 | VK_SPACE: |
6095 | - begin | |
6096 | - FClickNode := FavoriteTreeView.Selected; | |
6097 | - GikoDM.FavoriteTreeViewReloadActionExecute( Sender ); | |
6098 | - end; | |
6120 | + FavoriteTreeViewDblClick( Sender ); | |
6099 | 6121 | end; |
6100 | 6122 | end else begin |
6101 | 6123 | //編集中にESCを押したら、編集を終了して、元の文字列に戻す |
@@ -6228,6 +6250,27 @@ begin | ||
6228 | 6250 | end; |
6229 | 6251 | |
6230 | 6252 | end; |
6253 | +// ************************************************************************* | |
6254 | +//! お気に入りツリーのダブルクリックイベント | |
6255 | +// ************************************************************************* | |
6256 | +procedure TGikoForm.FavoriteTreeViewDblClick(Sender: TObject); | |
6257 | +var | |
6258 | + pos : TPoint; | |
6259 | + rect: TRect; | |
6260 | +begin | |
6261 | + //クリック時の選択イベントと同じならダブルクリック実行 | |
6262 | + pos := FMouseDownPos; | |
6263 | + if (FClickNode <> nil) and (FClickNode = FavoriteTreeView.GetNodeAt(pos.X, pos.Y)) then begin | |
6264 | + //マウスがnodeの上にいるか | |
6265 | + rect := FClickNode.DisplayRect(true); | |
6266 | + if ((rect.Left <= pos.X) and (rect.Right >= pos.X)) and | |
6267 | + ((rect.Bottom >= pos.Y) and (rect.Top <= pos.Y)) then begin | |
6268 | + GikoDM.FavoriteTreeViewReloadActionExecute( Sender ); | |
6269 | + FClickNode := nil; | |
6270 | + end; | |
6271 | + end; | |
6272 | +end; | |
6273 | + | |
6231 | 6274 | function TGikoForm.TreeNodeDataFind(Node: TTreeNode; FindPointer: Pointer): TTreeNode; |
6232 | 6275 | var |
6233 | 6276 | Found: TTreeNode; |
@@ -6658,8 +6701,13 @@ begin | ||
6658 | 6701 | |
6659 | 6702 | end; |
6660 | 6703 | // ************************************************************************* |
6661 | -//! ツリービューのKeyDownイベント | |
6704 | +//! ツリービューのクリックイベント | |
6662 | 6705 | // ************************************************************************* |
6706 | +procedure TGikoForm.TreeViewClick(Sender: TObject); | |
6707 | +begin | |
6708 | + FClickNode := TreeView.Selected; | |
6709 | + FMouseDownPos := TreeView.ScreenToClient(Mouse.CursorPos); | |
6710 | +end; | |
6663 | 6711 | procedure TGikoForm.TreeViewKeyDown(Sender: TObject; var Key: Word; |
6664 | 6712 | Shift: TShiftState); |
6665 | 6713 | begin |
@@ -6672,35 +6720,21 @@ begin | ||
6672 | 6720 | TreeView.Selected.Expanded := not TreeView.Selected.Expanded; |
6673 | 6721 | end; |
6674 | 6722 | end; |
6675 | -//! お気に入りのMouseDownイベント | |
6723 | + | |
6676 | 6724 | procedure TGikoForm.FavoriteTreeViewMouseDown(Sender: TObject; |
6677 | 6725 | Button: TMouseButton; Shift: TShiftState; X, Y: Integer); |
6678 | 6726 | var |
6679 | 6727 | favItem : TTreeNode; |
6680 | 6728 | favThreadItem : TFavoriteThreadItem; |
6681 | - rect: TRect; | |
6682 | 6729 | begin |
6730 | + | |
6683 | 6731 | case Button of |
6684 | - mbLeft: | |
6732 | +{ mbLeft: | |
6685 | 6733 | begin |
6686 | - if not (ssAlt in Shift) and (FavoriteTreeView.Selected <> nil) and | |
6687 | - (FavoriteTreeView.Selected = FavoriteTreeView.GetNodeAt(X, Y)) then begin | |
6688 | - //マウスがnodeの上にいるか | |
6689 | - rect := FavoriteTreeView.Selected.DisplayRect(true); | |
6690 | - if ((rect.Left <= X) and (rect.Right >= X)) and | |
6691 | - ((rect.Bottom >= Y) and (rect.Top <= Y)) then begin | |
6692 | - if ssDouble in Shift then begin | |
6693 | - FClickNode := FavoriteTreeView.Selected; | |
6694 | - GikoDM.FavoriteTreeViewReloadActionExecute(Sender); | |
6695 | - FClickNode := nil; | |
6696 | - end else begin | |
6697 | - FavoriteClick( | |
6698 | - TObject(FavoriteTreeView.Selected)); | |
6699 | - end; | |
6700 | - end; | |
6701 | - end; | |
6734 | + FMouseDownPos.X := X; | |
6735 | + FMouseDownPos.Y := Y; | |
6702 | 6736 | end; |
6703 | - mbMiddle: | |
6737 | +} mbMiddle: | |
6704 | 6738 | begin |
6705 | 6739 | favItem := FavoriteTreeView.GetNodeAt( X, Y ); |
6706 | 6740 | if favItem = nil then Exit; |
@@ -6760,6 +6794,16 @@ end; | ||
6760 | 6794 | // ************************************************************************* |
6761 | 6795 | //! お気に入りツリーのマウスアップイベント |
6762 | 6796 | // ************************************************************************* |
6797 | +procedure TGikoForm.FavoriteTreeViewMouseUp(Sender: TObject; | |
6798 | + Button: TMouseButton; Shift: TShiftState; X, Y: Integer); | |
6799 | +begin | |
6800 | + if (Button = mbLeft) and not (ssDouble in Shift) then begin | |
6801 | + if (FClickNode <> nil) and (FClickNode = FavoriteTreeView.GetNodeAt(X, Y)) then begin | |
6802 | + FavoriteClick( TObject( FClickNode ) ); | |
6803 | + end; | |
6804 | + end; | |
6805 | +end; | |
6806 | + | |
6763 | 6807 | function TGikoForm.WebBrowserClick(Sender: TObject): WordBool; |
6764 | 6808 | var |
6765 | 6809 | p : TPoint; |
@@ -7635,6 +7679,61 @@ begin | ||
7635 | 7679 | end; |
7636 | 7680 | end; |
7637 | 7681 | // ************************************************************************* |
7682 | +//! お気に入りツリーのクリックイベント | |
7683 | +// ************************************************************************* | |
7684 | +procedure TGikoForm.FavoriteTreeViewClick(Sender: TObject); | |
7685 | +begin | |
7686 | + //現在選択されているアイテムを保存 | |
7687 | + FClickNode := FavoriteTreeView.Selected; | |
7688 | + FMouseDownPos := FavoriteTreeView.ScreenToClient(Mouse.CursorPos); | |
7689 | +end; | |
7690 | +// ************************************************************************* | |
7691 | +//! お気に入りツリーのアイテムの縮小時イベント | |
7692 | +// ************************************************************************* | |
7693 | +procedure TGikoForm.FavoriteTreeViewCollapsing(Sender: TObject; | |
7694 | + Node: TTreeNode; var AllowCollapse: Boolean); | |
7695 | +begin | |
7696 | + //縮小されたら保存されているクリック時選択アイテムをクリア | |
7697 | + FClickNode := Node; | |
7698 | +end; | |
7699 | +// ************************************************************************* | |
7700 | +//! お気に入りツリーのアイテムの展開時イベント | |
7701 | +// ************************************************************************* | |
7702 | +procedure TGikoForm.FavoriteTreeViewExpanding(Sender: TObject; | |
7703 | + Node: TTreeNode; var AllowExpansion: Boolean); | |
7704 | +begin | |
7705 | + //展開されたら保存されているクリック時選択アイテムをクリア | |
7706 | + FClickNode := Node; | |
7707 | +end; | |
7708 | +// ************************************************************************* | |
7709 | +//! ツリービューのアイテムの縮小時イベント | |
7710 | +// ************************************************************************* | |
7711 | +procedure TGikoForm.TreeViewCollapsing(Sender: TObject; Node: TTreeNode; | |
7712 | + var AllowCollapse: Boolean); | |
7713 | +begin | |
7714 | + FClickNode := nil; | |
7715 | +end; | |
7716 | +// ************************************************************************* | |
7717 | +//! ツリービューのアイテムの展開時イベント | |
7718 | +// ************************************************************************* | |
7719 | +procedure TGikoForm.TreeViewExpanding(Sender: TObject; Node: TTreeNode; | |
7720 | + var AllowExpansion: Boolean); | |
7721 | +begin | |
7722 | + FClickNode := nil; | |
7723 | +end; | |
7724 | +// ************************************************************************* | |
7725 | +//! ツリービューのマウスアップイベント | |
7726 | +// ************************************************************************* | |
7727 | +procedure TGikoForm.TreeViewMouseUp(Sender: TObject; Button: TMouseButton; | |
7728 | + Shift: TShiftState; X, Y: Integer); | |
7729 | +begin | |
7730 | + if (Button = mbLeft) and not (ssDouble in Shift) then begin | |
7731 | + if (FClickNode <> nil) and (FClickNode = TreeView.GetNodeAt(X, Y)) then begin | |
7732 | + TreeClick(FClickNode); | |
7733 | + end; | |
7734 | + end; | |
7735 | +end; | |
7736 | +// ************************************************************************* | |
7638 | 7737 | //! ダウンロードコントロールスレッドの生成 |
7639 | 7738 | // ************************************************************************* |
7640 | 7739 | procedure TGikoForm.CreateControlThread(); |
@@ -7742,32 +7841,6 @@ begin | ||
7742 | 7841 | except |
7743 | 7842 | end; |
7744 | 7843 | end; |
7745 | -//! キャビネットのマウスダウンイベント | |
7746 | -procedure TGikoForm.TreeViewMouseDown(Sender: TObject; | |
7747 | - Button: TMouseButton; Shift: TShiftState; X, Y: Integer); | |
7748 | -var | |
7749 | - rect : TRect; | |
7750 | -begin | |
7751 | - case Button of | |
7752 | - mbLeft: | |
7753 | - begin | |
7754 | - if (TreeView.Selected <> nil) and | |
7755 | - (TreeView.Selected = TreeView.GetNodeAt(X, Y)) then begin | |
7756 | - //マウスがnodeの上にいるか | |
7757 | - rect := TreeView.Selected.DisplayRect(true); | |
7758 | - if ((rect.Left <= X) and (rect.Right >= X)) and | |
7759 | - ((rect.Bottom >= Y) and (rect.Top <= Y)) then begin | |
7760 | - // クリックとダブルクリックをココで判定 | |
7761 | - if ssDouble in Shift then begin | |
7762 | - TreeDoubleClick( TreeView.Selected ); | |
7763 | - end else begin | |
7764 | - TreeClick(TreeView.Selected); | |
7765 | - end; | |
7766 | - end; | |
7767 | - end; | |
7768 | - end; | |
7769 | - end; | |
7770 | -end; | |
7771 | 7844 | |
7772 | 7845 | initialization |
7773 | 7846 | OleInitialize(nil); |
@@ -695,21 +695,26 @@ 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; |
701 | 703 | begin |
702 | - if (GikoForm.ClickNode = nil) then Exit; | |
704 | + | |
705 | + if GikoForm.ClickNode = nil then Exit; | |
703 | 706 | |
704 | 707 | shiftDown := GetAsyncKeyState(VK_SHIFT) = Smallint($8001); |
705 | 708 | |
706 | 709 | if TObject( GikoForm.ClickNode.Data ) is TFavoriteThreadItem then begin |
707 | 710 | FavThread := TFavoriteThreadItem( GikoForm.ClickNode.Data ); |
708 | - if FavThread.Item <> nil then | |
709 | - GikoForm.DownloadContent(FavThread.Item, shiftDown); | |
711 | + ThreadItem := FavThread.Item; | |
712 | + if ThreadItem <> nil then | |
713 | + GikoForm.DownloadContent(ThreadItem, shiftDown); | |
710 | 714 | end else if TObject( GikoForm.ClickNode.Data ) is TFavoriteBoardItem then begin |
711 | 715 | FavBoard := TFavoriteBoardItem( GikoForm.ClickNode.Data ); |
712 | - GikoForm.DownloadList(FavBoard.Item, shiftDown); | |
716 | + Board := FavBoard.Item; | |
717 | + GikoForm.DownloadList(Board, shiftDown); | |
713 | 718 | end; |
714 | 719 | |
715 | 720 | end; |
@@ -3104,7 +3109,7 @@ begin | ||
3104 | 3109 | id := 0; |
3105 | 3110 | TListViewUtils.ListViewSort( nil, GikoForm.ListView, |
3106 | 3111 | GikoForm.ListView.Column[ id ], ListNumberVisibleAction.Checked, |
3107 | - id = 0); | |
3112 | + True); | |
3108 | 3113 | break; |
3109 | 3114 | end; |
3110 | 3115 | end; |
@@ -3124,7 +3129,7 @@ begin | ||
3124 | 3129 | id := GikoForm.ListView.Columns.Count - 1; |
3125 | 3130 | TListViewUtils.ListViewSort( nil, GikoForm.ListView, |
3126 | 3131 | GikoForm.ListView.Column[ id ], ListNumberVisibleAction.Checked, |
3127 | - id = 0); | |
3132 | + True); | |
3128 | 3133 | break; |
3129 | 3134 | end; |
3130 | 3135 | end; |
@@ -3723,7 +3728,7 @@ begin | ||
3723 | 3728 | //閾値の確認 |
3724 | 3729 | limitSize := LIMIT_SIZE; |
3725 | 3730 | limitStr := IntToStr(limitSize); |
3726 | - if InputQuery('閾値入力', '指定した数値 B以下の容量のスレッドのみ再計算します', limitStr) then begin | |
3731 | + if InputQuery('閾値入力', '指定した数値以下の容量のスレッドのみ再計算します', limitStr) then begin | |
3727 | 3732 | limitSize := StrToInt(MojuUtils.ZenToHan(limitStr)); |
3728 | 3733 | if (limitSize < 0) then begin |
3729 | 3734 | ShowMessage('閾値に負は指定できません!'); |
@@ -900,7 +900,6 @@ begin | ||
900 | 900 | //1行目を削除 |
901 | 901 | if SList.Count > 1 then |
902 | 902 | SList.Delete(0); |
903 | - Item.Content := SList.Text; | |
904 | 903 | //改行コードをCRLF -> LFと考えて、行数分だけマイナス |
905 | 904 | Item.ContentLength := Length(SList.Text) - SList.Count; |
906 | 905 | finally |
@@ -63,7 +63,6 @@ var | ||
63 | 63 | protocol, host, path, document, port, bookmark: String; |
64 | 64 | begin |
65 | 65 | try |
66 | - MessageMemo.Clear; | |
67 | 66 | GikoSys.Setting.BoardURLSelected := BoardURLComboBox.ItemIndex + 1; |
68 | 67 | FAbort := False; |
69 | 68 | UpdateButton.Enabled := False; |
@@ -116,6 +115,7 @@ var | ||
116 | 115 | s: string; |
117 | 116 | i: Integer; |
118 | 117 | begin |
118 | + MessageMemo.Clear; | |
119 | 119 | Indy.Request.Clear; |
120 | 120 | Indy.RecvBufferSize := Gikosys.Setting.RecvBufferSize; |
121 | 121 | Indy.ProxyParams.BasicAuthentication := False; |
@@ -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 |