[Pythianproject-cvsmail] CVS: PythianProject/Source/Conversation/Editor mainWin.dfm,1.4,1.5 mainWin.pas,1.4,1.5

[Michael H. <mh...@us...>]

Update of /cvsroot/pythianproject/PythianProject/Source/Conversation/Editor
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5299

Modified Files:
	mainWin.dfm mainWin.pas 
Log Message:
now supports command line arguments and drag'n'drop -mike

Index: mainWin.dfm
===================================================================
RCS file: /cvsroot/pythianproject/PythianProject/Source/Conversation/Editor/mainWin.dfm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
Binary files /tmp/cvsNJy18z and /tmp/cvswCtloa differ

Index: mainWin.pas
===================================================================
RCS file: /cvsroot/pythianproject/PythianProject/Source/Conversation/Editor/mainWin.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mainWin.pas	2000/09/10 16:47:17	1.4
--- mainWin.pas	2000/09/15 17:06:17	1.5
***************
*** 18,22 ****
    IMGINDEX_IGNOREX = 7;
  
!   STDWINCAPTION = 'Pythian Conversation Editor v0.6a';
  
  type
--- 18,22 ----
    IMGINDEX_IGNOREX = 7;
  
!   STDWINCAPTION = 'Pythian Conversation Editor v0.7';
  
  type
***************
*** 135,138 ****
--- 135,141 ----
      procedure Button2Click(Sender: TObject);
      procedure EnabledItemClick(Sender: TObject);
+     procedure TreeView1DragOver(Sender, Source: TObject; X, Y: Integer;
+       State: TDragState; var Accept: Boolean);
+     procedure TreeView1DragDrop(Sender, Source: TObject; X, Y: Integer);
    private
      procedure SetSelByObj(TempObj: TConversationObject);
***************
*** 274,277 ****
--- 277,281 ----
  
  procedure TMainForm.FormCreate(Sender: TObject);
+ var ps:string;
  begin
    CurFileName := '';
***************
*** 279,351 ****
    ConversationEngine := TConversationEngine.Create;
    convFileIO.DOMImpl := DomImplementation1;
!   LoadXML('data.cml');
    TreePages.ActivePage := BlankSheet;
    jumpSelect := false;
    UpdateTree;
  end;
  
  procedure TMainForm.CreateConvButClick(Sender: TObject);
! var
!   p,p2:TPlayerOption;
!   r,r2:TNPCSpeech;
!   g:TConvGroup;
!   c:TConversation;
! 
! 
! 
  begin
    c := TConversation.Create('Unnamed Conversation');
    ConversationEngine.AddConversation(c);
    AddConversationToTree(c);
- 
- { This is for testing purposes only. It can be removed.
- 
- 
-   c := TConversation.Create('Test conversation');
- 
-   g := TConvGroup.Create('Group 1');
-   p := TPlayerOption.Create;
-     p.Text.Add('Introduce Self');
-     r := TNPCSpeech.Create;
-       r.Text.Add('Hi there! I don''t think I''ve seen you here before?');
-       p.AddChild(r);
-     p2 := TPlayerOption.Create;
-       p2.Text.Add('You''re right, I''m new here.');
-       r2 := TNPCSpeech.Create;
-         r2.Text.Add('Well, I''m Than. I hope you''ll find Prestbury to your liking');
-       p2.AddChild(r2);
-       p2.AddChild(TConversationDelay.Create(2000));
-       p2.AddChild(TConversationGroupEnable.Create(g));
-       p.AddChild(p2);
- 
- 
- 
-   c.AddChild(p);
- 
-   // now for group 1
-     p := TPlayerOption.Create;
-     p.Text.Add('Ask about Prestbury');
-       r := TNPCSpeech.Create;
-         r.Text.Add('Prestbury is a thriving town of 800 right now.');
-       p.AddChild(r);
-       p.AddChild(TConversationDelay.Create(1000));
-       r := TNPCSpeech.Create;
-       r.Text.Add('Of course, there were lot''s more of us before the famine.');
-         p2 := TPlayerOption.Create;
-         p2.Text.Add('Famine?');
-         p.AddChild(r);
- 
-     g.AddChild(p);
-     p := TPlayerOption.Create;
-     p.Text.Add('Ask about the stone circle');
-     g.AddChild(p);
-     p := TPlayerOption.Create;
-     p.Text.Add('Ask about Thans'' background');
-     g.AddChild(p);
- 
-   c.AddChild(g);
-   ConversationEngine.AddConversation(c);
-   UpdateTree;
-   LastTestConv := c; }
  end;
  
--- 283,308 ----
    ConversationEngine := TConversationEngine.Create;
    convFileIO.DOMImpl := DomImplementation1;
! 
!   // read command line
!   if ParamCount = 1 then
!   begin
!     ps := ParamStr(1);
!     if FileExists(ps) then
!       LoadXML(ps)
!     else
!       ShowMessage('Filename passed on command line "'+ps+'" could not be found')
!   end;
    TreePages.ActivePage := BlankSheet;
    jumpSelect := false;
    UpdateTree;
+   UpdateTitleBar;
  end;
  
  procedure TMainForm.CreateConvButClick(Sender: TObject);
! var c:TConversation;
  begin
    c := TConversation.Create('Unnamed Conversation');
    ConversationEngine.AddConversation(c);
    AddConversationToTree(c);
  end;
  
***************
*** 827,830 ****
--- 784,788 ----
  var s:TStringList;
  begin
+   if filename = '' then exit;
    UpdateXML;
    s := TStringList.Create;
***************
*** 860,863 ****
--- 818,822 ----
    tmpStr:WideString;
  begin
+   if not assigned(currentXMLdoc) then currentXMLDoc := DomImplementation1.createDocument('convdata',nil);
    currentXMLDoc.DocumentElement.Clear;
    for a := 0 to TreeView1.Items.Count-1 do
***************
*** 908,912 ****
  procedure TMainForm.UpdateTitleBar;
  begin
!   Caption := STDWINCAPTION + ' - ' + CurFileName;
  end;
  
--- 867,873 ----
  procedure TMainForm.UpdateTitleBar;
  begin
!   if CurFileName <> '' then
!     Caption := STDWINCAPTION + ' - ' + CurFileName
!   else Caption := STDWINCAPTION;
  end;
  
***************
*** 967,974 ****
      TConversationObject(TreeView1.Selected.Data).Enabled;
    if not TConversationObject(TreeView1.Selected.Data).Enabled then
!     TreeView1.Selected.OverlayIndex := IMGINDEX_IGNOREX
    else
      TreeView1.Selected.OverlayIndex := -1;
    EnabledItem.Checked := TConversationObject(TreeView1.Selected.Data).Enabled; 
  end;
  
--- 928,996 ----
      TConversationObject(TreeView1.Selected.Data).Enabled;
    if not TConversationObject(TreeView1.Selected.Data).Enabled then
!     TreeView1.Selected.OverlayIndex := 0
    else
      TreeView1.Selected.OverlayIndex := -1;
    EnabledItem.Checked := TConversationObject(TreeView1.Selected.Data).Enabled; 
+ end;
+ 
+ procedure TMainForm.TreeView1DragOver(Sender, Source: TObject; X,
+   Y: Integer; State: TDragState; var Accept: Boolean);
+ begin
+   Accept := false;
+   if Source is TTreeView then
+     if TreeView1.GetNodeAt(X,Y) <> nil then
+       Accept := true;
+ end;
+ 
+ procedure TMainForm.TreeView1DragDrop(Sender, Source: TObject; X,
+   Y: Integer);
+ var
+   n,n2:TTreeNode;
+   co:TConversationObject;
+   i:integer;
+ begin
+   // get the node dropped over
+   n := TreeView1.GetNodeAt(X,Y);
+   if n = nil then exit;
+   // move the selected node to be below/a child of the selected node
+   co := TreeView1.Selected.Data;
+   if n.data = co then exit;
+   if co = nil then exit;
+ 
+   if TObject(n.Data) is TConversationGroup then
+   begin
+     // move the object first
+     if (n.Expanded) or ((not n.Expanded) and (not n.HasChildren)) then
+     begin
+       // if n.data is a group and expanded then add as child first else add below
+       co.Parent.DeleteChild(co);
+       TConversationGroup(n.Data).AddChildFirst(co);
+       TreeView1.Selected.MoveTo(n,naAddChildFirst);
+     end else
+     begin
+       co.Parent.DeleteChild(co);
+       i := TConversationObject(n.Data).Parent.Children.IndexOf(n.data);
+       if i = TConversationObject(n.Data).Parent.Children.Count-1 then
+       begin
+         TConversationObject(n.Data).Parent.Children.Add(co);
+         TreeView1.Selected.MoveTo(n,naInsert);
+       end else begin
+         TConversationObject(n.Data).Parent.Children.Insert(i+1,co);
+         TreeView1.Selected.MoveTo(n,naInsert);
+       end;
+     end;
+   end else
+   begin
+     co.Parent.DeleteChild(co);
+     i := TConversationObject(n.Data).Parent.Children.IndexOf(n.data);
+     if i = TConversationObject(n.Data).Parent.Children.Count-1 then
+     begin
+       TConversationObject(n.Data).Parent.Children.Add(co);
+       TreeView1.Selected.MoveTo(n,naInsert);
+     end else begin
+       TConversationObject(n.Data).Parent.Children.Insert(i+1,co);
+       TreeView1.Selected.MoveTo(n,naInsert);
+     end;
+   end;
  end;