Changeset 123

Timestamp:

08/19/10 23:35:41 (18 months ago)

Author:

Carsten

Message:

CaWE GUI Editor: Rewrote/fixed broken "delete windows" command.

Location:

cafu/trunk/CaWE/GuiEditor

Files:

• ChildFrame.cpp (modified) (4 diffs)
• Commands/Delete.cpp (modified) (7 diffs)
• Commands/Delete.hpp (modified) (2 diffs)
• WindowTree.cpp (modified) (5 diffs)

cafu/trunk/CaWE/GuiEditor/ChildFrame.cpp

@@ -497 +497 @@
 {
     SubmitCommand(new CommandDeleteT(m_GuiDocument, m_GuiDocument->GetSelection()));
-    SubmitCommand(CommandSelectT::Clear(m_GuiDocument));
 }
 
@@ -519 +518 @@
 void GuiEditor::ChildFrameT::OnUpdateEditCutCopyDelete(wxUpdateUIEvent& UE)
 {
-    if (m_GuiDocument->GetSelection().Size()>0) UE.Enable(true);
-    else                                        UE.Enable(false);
+    UE.Enable(m_GuiDocument->GetSelection().Size()>0);
 }
 
@@ -526 +524 @@
 void GuiEditor::ChildFrameT::OnUpdateEditPaste(wxUpdateUIEvent& UE)
 {
-    if (ClipBoard.Size()>0 && m_GuiDocument->GetSelection().Size()==1) UE.Enable(true);
-    else                                                               UE.Enable(false);
+    UE.Enable(ClipBoard.Size()>0 && m_GuiDocument->GetSelection().Size()==1);
 }
 
@@ -702 +699 @@
         case ID_TOOLBAR_WINDOW_DELETE:
             SubmitCommand(new CommandDeleteT(m_GuiDocument, m_GuiDocument->GetSelection()));
-            SubmitCommand(CommandSelectT::Clear(m_GuiDocument));
             break;
 

cafu/trunk/CaWE/GuiEditor/Commands/Delete.cpp

@@ -23 +23 @@
 
 #include "Delete.hpp"
-
+#include "Select.hpp"
 #include "../GuiDocument.hpp"
-
 #include "GuiSys/Window.hpp"
 
@@ -33 +32 @@
 
 CommandDeleteT::CommandDeleteT(GuiDocumentT* GuiDocument, cf::GuiSys::WindowT* Window)
-    : m_GuiDocument(GuiDocument)
+    : m_GuiDocument(GuiDocument),
+      m_CommandSelect(NULL)
 {
-    if (Window!=Window->GetRoot()) // Root window can never be deleted.
+    wxASSERT(Window->Parent->Children.Find(Window)>=0);
+
+    // The root window cannot be deleted.
+    if (Window!=Window->GetRoot())
     {
-        m_DeleteWindows.PushBack(Window);
-        m_Parents.PushBack(Window->Parent);
-        m_Indexes.PushBack(Window->Parent->Children.Find(Window));
+        m_Windows.PushBack(Window);
+        m_Indices.PushBack(-1);
     }
+
+    m_CommandSelect=CommandSelectT::Remove(m_GuiDocument, m_Windows);
 }
 
@@ -46 +50 @@
 CommandDeleteT::CommandDeleteT(GuiDocumentT* GuiDocument, const ArrayT<cf::GuiSys::WindowT*>& Windows)
     : m_GuiDocument(GuiDocument),
-      m_DeleteWindows(Windows)
+      m_CommandSelect(NULL)
 {
-    for (unsigned long WinNr=0; WinNr<m_DeleteWindows.Size(); WinNr++)
+    for (unsigned long WinNr=0; WinNr<Windows.Size(); WinNr++)
     {
-        // Root window can never be deleted.
-        if (m_DeleteWindows[WinNr]==m_DeleteWindows[WinNr]->GetRoot())
+        cf::GuiSys::WindowT* Window=Windows[WinNr];
+
+        wxASSERT(Window->Parent->Children.Find(Window)>=0);
+
+        // The root window cannot be deleted.
+        if (Window!=Window->GetRoot())
         {
-            m_DeleteWindows.RemoveAtAndKeepOrder(WinNr);
-            WinNr--;
-            continue;
+            m_Windows.PushBack(Window);
+            m_Indices.PushBack(-1);
         }
+    }
 
-        m_Parents.PushBack(m_DeleteWindows[WinNr]->Parent);
-        m_Indexes.PushBack(m_DeleteWindows[WinNr]->Parent->Children.Find(m_DeleteWindows[WinNr]));
-    }
+    m_CommandSelect=CommandSelectT::Remove(m_GuiDocument, m_Windows);
 }
 
@@ -66 +72 @@
 CommandDeleteT::~CommandDeleteT()
 {
+    delete m_CommandSelect;
+
     if (m_Done)
-        for (unsigned long WinNr=0; WinNr<m_DeleteWindows.Size(); WinNr++)
-            delete m_DeleteWindows[WinNr];
+        for (unsigned long WinNr=0; WinNr<m_Windows.Size(); WinNr++)
+            delete m_Windows[WinNr];
 }
 
@@ -75 +83 @@
 {
     wxASSERT(!m_Done);
-
     if (m_Done) return false;
 
-    for (unsigned long WinNr=0; WinNr<m_DeleteWindows.Size(); WinNr++)
-        m_Parents[WinNr]->Children.RemoveAtAndKeepOrder(m_Indexes[WinNr]);
+    // Deselect any affected windows that are selected.
+    m_CommandSelect->Do();
 
-    m_GuiDocument->UpdateAllObservers_Deleted(m_DeleteWindows);
+    for (unsigned long WinNr=0; WinNr<m_Windows.Size(); WinNr++)
+    {
+        cf::GuiSys::WindowT* Window=m_Windows[WinNr];
+
+        m_Indices[WinNr]=Window->Parent->Children.Find(Window);
+        Window->Parent->Children.RemoveAtAndKeepOrder(m_Indices[WinNr]);
+    }
+
+    m_GuiDocument->UpdateAllObservers_Deleted(m_Windows);
 
     m_Done=true;
-
     return true;
 }
@@ -92 +106 @@
 {
     wxASSERT(m_Done);
-
     if (!m_Done) return;
 
-    for (unsigned long WinNr=0; WinNr<m_DeleteWindows.Size(); WinNr++)
-        m_Parents[WinNr]->Children.InsertAt(m_Indexes[WinNr], m_DeleteWindows[WinNr]);
+    for (unsigned long RevNr=0; RevNr<m_Windows.Size(); RevNr++)
+    {
+        const unsigned long  WinNr =m_Windows.Size()-RevNr-1;
+        cf::GuiSys::WindowT* Window=m_Windows[WinNr];
 
-    m_GuiDocument->UpdateAllObservers_Created(m_DeleteWindows);
+        Window->Parent->Children.InsertAt(m_Indices[WinNr], Window);
+    }
+
+    m_GuiDocument->UpdateAllObservers_Created(m_Windows);
+
+    // Select the previously selected windows again.
+    m_CommandSelect->Undo();
 
     m_Done=false;
@@ -106 +127 @@
 wxString CommandDeleteT::GetName() const
 {
-    return "Delete windows";
+    return (m_Windows.Size()==1) ? "Delete 1 window" : wxString::Format("Delete %lu windows", m_Windows.Size());
 }

cafu/trunk/CaWE/GuiEditor/Commands/Delete.hpp

@@ -33 +33 @@
 namespace GuiEditor
 {
+    class CommandSelectT;
     class GuiDocumentT;
+
 
     class CommandDeleteT : public CommandT
@@ -53 +55 @@
         GuiDocumentT* m_GuiDocument;
 
-        ArrayT<cf::GuiSys::WindowT*> m_Parents;
-        ArrayT<unsigned long >       m_Indexes;
-        ArrayT<cf::GuiSys::WindowT*> m_DeleteWindows;
+        ArrayT<cf::GuiSys::WindowT*> m_Windows;
+        ArrayT<unsigned long>        m_Indices;
+        CommandSelectT*              m_CommandSelect;   ///< The command that unselects all windows before they are deleted.
     };
 }

cafu/trunk/CaWE/GuiEditor/WindowTree.cpp

@@ -281 +281 @@
         wxASSERT(Windows.Size()==1); // Can't set the name property for more windows since it must always be unique.
 
-        wxTreeItemId TreeItem=FindTreeItem(GetRootItem(), Windows[0]);
-
         SetItemText(FindTreeItem(GetRootItem(), Windows[0]), Windows[0]->Name);
     }
@@ -290 +288 @@
         for (unsigned long WindowNr=0; WindowNr<Windows.Size(); WindowNr++)
         {
-            int ImageNr=0;
-
-            if (!Windows[WindowNr]->ShowWindow) ImageNr=1;
-
-            SetItemImage(FindTreeItem(GetRootItem(), Windows[WindowNr]), ImageNr);
+            SetItemImage(FindTreeItem(GetRootItem(), Windows[WindowNr]), Windows[WindowNr]->ShowWindow ? 0 : 1);
         }
     }
@@ -307 +301 @@
     ArrayT<wxTreeItemId>         TreeItems;
     ArrayT<cf::GuiSys::WindowT*> ExpandedWindows;
+
+    // Note that this may well produce TreeItems whose windows have been deleted from the document already.
     GetTreeItems(GetRootItem(), TreeItems);
 
@@ -344 +340 @@
 
             // Make sure parents are also expanded.
-            while(GetItemParent(Result).IsOk())
+            while (GetItemParent(Result).IsOk())
             {
                 Result=GetItemParent(Result);
@@ -356 +352 @@
     // Expand all previously expanded items.
     for (unsigned long ExWinNr=0; ExWinNr<ExpandedWindows.Size(); ExWinNr++)
-        Expand(FindTreeItem(GetRootItem(), ExpandedWindows[ExWinNr]));
+    {
+        wxTreeItemId Result=FindTreeItem(GetRootItem(), ExpandedWindows[ExWinNr]);
+
+        if (Result.IsOk())
+            Expand(Result);
+    }
 
     Thaw();