Commit: dd0fe2f92749f1eb134c02c486782bd2b080557a - gikonavi (git)

ギコナビ

Commit MetaInfo

• Revision: dd0fe2f92749f1eb134c02c486782bd2b080557a (tree)
• Time: 2005-07-09 23:48:11
• Author: h677 <h677>
• Commiter: h677

Log Message

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

Change Summary

• modified: Giko.pas

Incremental Difference

--- a/Giko.pas
+++ b/Giko.pas
@@ -6714,25 +6714,40 @@ procedure TGikoForm.SelectNewRoundNameExecute(Sender: TObject);
 var
 	s: string;
 	Dlg: TRoundNameDialog;
-        cnt: Integer;
+		cnt: Integer;
 
 begin
-        //“o˜^ãŒÀƒ`ƒFƒbƒN
-        cnt := RoundList.Count[grtBoard];
-        cnt := cnt + RoundList.Count[grtItem];
-        if cnt > 500 then begin
-                MsgBox(Handle, '„‰ñ‚Í500ˆÈã“o˜^‚Å‚«‚Ü‚¹‚ñ', 'ƒGƒ‰[', MB_OK or MB_ICONSTOP);
-                Exit;
-        end;
+	//ŒÄ‚яo‚µŒ³‚ªATAction‚ÅListView‚É‘I‘ð‚ª‚¢‚È‚¯‚ê‚΁AEXIT‚·‚é
+	if (Sender is TAction) and (ListView.Selected = nil) then
+		Exit;
+
+	//“o˜^ãŒÀƒ`ƒFƒbƒN
+	cnt := RoundList.Count[grtBoard];
+	cnt := cnt + RoundList.Count[grtItem];
+	if cnt > 500 then begin
+			MsgBox(Handle, '„‰ñ‚Í500ˆÈã“o˜^‚Å‚«‚Ü‚¹‚ñ', 'ƒGƒ‰[', MB_OK or MB_ICONSTOP);
+			Exit;
+	end;
 
 	Dlg := TRoundNameDialog.Create(Self);
 	try
 		Dlg.ShowModal;
 		if Dlg.ModalResult <> mrCancel then begin
 			s := Trim(Dlg.RoundNameEdit.Text);
-			//RoundList.RoundNameList.Add(s);
-			SetSelectItemRound(True, s, TMenuItem(Sender).Parent.Name);
-            ListView.Refresh;
+			if (Sender is TMenuItem) then begin
+				SetSelectItemRound(True, s, TMenuItem(Sender).Parent.Name);
+			end else if (Sender is TAction) then begin
+				if (ListView.Selected <> nil) then begin
+					if (TObject(ListView.Selected.Data) is TThreadItem) then begin
+						SetSelectItemRound(True, s,
+							TThreadItem(ListView.Selected.Data).Title);
+					end else if (TObject(ListView.Selected.Data) is TBoard) then begin
+						SetSelectItemRound(True, s,
+							TBoard(ListView.Selected.Data).Title);
+					end;
+				end;
+			end;
+			ListView.Refresh;
 		end;
 	finally
 		Dlg.Free;
@@ -6788,8 +6803,28 @@ begin
 end;
 
 procedure TGikoForm.SelectDeleteRoundExecute(Sender: TObject);
+var
+	s : String;
 begin
-	SetSelectItemRound(False, '', TMenuItem(Sender).Parent.Name);
+	if (Sender is TMenuItem) then begin
+		try
+			SetSelectItemRound(False, '', TMenuItem(Sender).Parent.Name);
+		except
+		end;
+	end else if (Sender is TAction) then begin
+		try
+			if ListView.Selected <> nil then begin
+				if (TObject(ListView.Selected.Data) is TThreadItem) then begin
+					s := TThreadItem(ListView.Selected.Data).Title;
+				end else if (TObject(ListView.Selected.Data) is TBoard) then begin
+					s := TBoard(ListView.Selected.Data).Title;
+				end;
+				SetSelectItemRound(False, '', s);
+
+			end;
+		except
+		end;
+	end;
 	ListView.Refresh;
 end;