• R/O
  • HTTP
  • SSH
  • HTTPS

gikonavi: Commit


Commit MetaInfo

Revisiondd0fe2f92749f1eb134c02c486782bd2b080557a (tree)
Time2005-07-09 23:48:11
Authorh677 <h677>
Commiterh677

Log Message

巡回予約削除と新しい名前での巡回がショートカットorツールバーのボタンから
呼ばれると正常に動作しない不具合の修正

Change Summary

Incremental Difference

--- a/Giko.pas
+++ b/Giko.pas
@@ -6714,25 +6714,40 @@ procedure TGikoForm.SelectNewRoundNameExecute(Sender: TObject);
67146714 var
67156715 s: string;
67166716 Dlg: TRoundNameDialog;
6717- cnt: Integer;
6717+ cnt: Integer;
67186718
67196719 begin
6720- //登録上限チェック
6721- cnt := RoundList.Count[grtBoard];
6722- cnt := cnt + RoundList.Count[grtItem];
6723- if cnt > 500 then begin
6724- MsgBox(Handle, '巡回は500以上登録できません', 'エラー', MB_OK or MB_ICONSTOP);
6725- Exit;
6726- end;
6720+ //呼び出し元が、TActionでListViewに選択がいなければ、EXITする
6721+ if (Sender is TAction) and (ListView.Selected = nil) then
6722+ Exit;
6723+
6724+ //登録上限チェック
6725+ cnt := RoundList.Count[grtBoard];
6726+ cnt := cnt + RoundList.Count[grtItem];
6727+ if cnt > 500 then begin
6728+ MsgBox(Handle, '巡回は500以上登録できません', 'エラー', MB_OK or MB_ICONSTOP);
6729+ Exit;
6730+ end;
67276731
67286732 Dlg := TRoundNameDialog.Create(Self);
67296733 try
67306734 Dlg.ShowModal;
67316735 if Dlg.ModalResult <> mrCancel then begin
67326736 s := Trim(Dlg.RoundNameEdit.Text);
6733- //RoundList.RoundNameList.Add(s);
6734- SetSelectItemRound(True, s, TMenuItem(Sender).Parent.Name);
6735- ListView.Refresh;
6737+ if (Sender is TMenuItem) then begin
6738+ SetSelectItemRound(True, s, TMenuItem(Sender).Parent.Name);
6739+ end else if (Sender is TAction) then begin
6740+ if (ListView.Selected <> nil) then begin
6741+ if (TObject(ListView.Selected.Data) is TThreadItem) then begin
6742+ SetSelectItemRound(True, s,
6743+ TThreadItem(ListView.Selected.Data).Title);
6744+ end else if (TObject(ListView.Selected.Data) is TBoard) then begin
6745+ SetSelectItemRound(True, s,
6746+ TBoard(ListView.Selected.Data).Title);
6747+ end;
6748+ end;
6749+ end;
6750+ ListView.Refresh;
67366751 end;
67376752 finally
67386753 Dlg.Free;
@@ -6788,8 +6803,28 @@ begin
67886803 end;
67896804
67906805 procedure TGikoForm.SelectDeleteRoundExecute(Sender: TObject);
6806+var
6807+ s : String;
67916808 begin
6792- SetSelectItemRound(False, '', TMenuItem(Sender).Parent.Name);
6809+ if (Sender is TMenuItem) then begin
6810+ try
6811+ SetSelectItemRound(False, '', TMenuItem(Sender).Parent.Name);
6812+ except
6813+ end;
6814+ end else if (Sender is TAction) then begin
6815+ try
6816+ if ListView.Selected <> nil then begin
6817+ if (TObject(ListView.Selected.Data) is TThreadItem) then begin
6818+ s := TThreadItem(ListView.Selected.Data).Title;
6819+ end else if (TObject(ListView.Selected.Data) is TBoard) then begin
6820+ s := TBoard(ListView.Selected.Data).Title;
6821+ end;
6822+ SetSelectItemRound(False, '', s);
6823+
6824+ end;
6825+ except
6826+ end;
6827+ end;
67936828 ListView.Refresh;
67946829 end;
67956830
Show on old repository browser