Changeset 374 for cafu/trunk

Timestamp:

09/10/11 10:57:11 (9 months ago)

Author:

Carsten

Message:

Gui Editor:
Updated the Gui Editor code for Choice windows,
lining out the design and style that the other windows should be adapted to as well.

Location:

cafu/trunk

Files:

• CaWE/GuiEditor/Commands/ModifyWindow.cpp (modified) (3 diffs)
• CaWE/GuiEditor/Commands/SetStrings.cpp (added)
• CaWE/GuiEditor/Commands/SetStrings.hpp (added)
• CaWE/GuiEditor/ObserverPattern.cpp (modified) (1 diff)
• CaWE/GuiEditor/ObserverPattern.hpp (modified) (3 diffs)
• CaWE/GuiEditor/RenderWindow.cpp (modified) (1 diff)
• CaWE/GuiEditor/RenderWindow.hpp (modified) (1 diff)
• CaWE/GuiEditor/WindowInspector.cpp (modified) (3 diffs)
• CaWE/GuiEditor/WindowInspector.hpp (modified) (2 diffs)
• CaWE/GuiEditor/WindowTree.cpp (modified) (1 diff)
• CaWE/GuiEditor/WindowTree.hpp (modified) (1 diff)
• CaWE/GuiEditor/Windows/EditorChoiceWindow.cpp (modified) (4 diffs)
• CaWE/GuiEditor/Windows/EditorWindow.hpp (modified) (1 diff)
• CaWE/ModelEditor/ObserverPattern.hpp (modified) (1 diff)
• Games/DeathMatch/GUIs/MainMenu/MainMenu_init.cgui (modified) (1 diff)
• Libs/GuiSys/Window.hpp (modified) (1 diff)
• Libs/GuiSys/WindowChoice.hpp (modified) (4 diffs)

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

@@ -26 +26 @@
 #include "GuiSys/GuiMan.hpp"
 #include "GuiSys/GuiImpl.hpp"
-#include "GuiSys/WindowChoice.hpp"
 #include "GuiSys/WindowModel.hpp"
 #include "MaterialSystem/Renderer.hpp"
 #include "MaterialSystem/MaterialManager.hpp"
 #include "Fonts/FontTT.hpp"
-#include "TextParser/TextParser.hpp"
 
 
@@ -138 +136 @@
         m_Window->Font=cf::GuiSys::GuiMan->GetFont(m_NewString);
     }
-    else if (m_PropertyName=="Choices")
-    {
-        cf::GuiSys::ChoiceT* ChoiceWindow=dynamic_cast<cf::GuiSys::ChoiceT*>(m_Window);
-        wxASSERT(ChoiceWindow!=NULL);
-
-        m_OldString="";
-
-        ArrayT<std::string>& Choices=ChoiceWindow->GetChoices();
-
-        for (unsigned long ChoiceNr=0; ChoiceNr<Choices.Size(); ChoiceNr++)
-            m_OldString+=Choices[ChoiceNr]+";";
-
-        // Parse choice list and update the window choices.
-        TextParserT ChoiceParser(m_NewString.c_str(), ";", false);
-        Choices.Clear();
-
-        try
-        {
-            while (!ChoiceParser.IsAtEOF())
-            {
-                Choices.PushBack(ChoiceParser.GetNextToken());
-                ChoiceParser.AssertAndSkipToken(";");
-            }
-        }
-        catch (const TextParserT::ParseError&)
-        {
-            // Undo all changes made up to this point.
-            try
-            {
-                TextParserT ChoiceParser(m_OldString.c_str(), ";", false);
-                Choices.Clear();
-
-                while (!ChoiceParser.IsAtEOF())
-                {
-                    Choices.PushBack(ChoiceParser.GetNextToken());
-                    ChoiceParser.AssertAndSkipToken(";");
-                }
-            }
-            catch (const TextParserT::ParseError&)
-            {
-                wxASSERT(false);
-                return false;
-            }
-
-            return false;
-        }
-    }
     else if (m_PropertyName=="Model")
     {
@@ -258 +209 @@
         m_Window->Font=cf::GuiSys::GuiMan->GetFont(m_OldString);
     }
-    else if (m_PropertyName=="Choices")
-    {
-        cf::GuiSys::ChoiceT* ChoiceWindow=dynamic_cast<cf::GuiSys::ChoiceT*>(m_Window);
-        wxASSERT(ChoiceWindow!=NULL);
-
-        ArrayT<std::string>& Choices=ChoiceWindow->GetChoices();
-
-        // Parse choice list and update the window choices.
-        TextParserT ChoiceParser(m_OldString.c_str(), ";", false);
-        Choices.Clear();
-
-        try
-        {
-            while (!ChoiceParser.IsAtEOF())
-            {
-                Choices.PushBack(ChoiceParser.GetNextToken());
-                ChoiceParser.AssertAndSkipToken(";");
-            }
-        }
-        catch (const TextParserT::ParseError&)
-        {
-            wxASSERT(false);
-        }
-    }
     else if (m_PropertyName=="Model")
     {

cafu/trunk/CaWE/GuiEditor/ObserverPattern.cpp

@@ -138 +138 @@
 
 
+void SubjectT::UpdateAllObservers_Modified(const EditorWindowT* Win, const wxString& PropName)
+{
+    for (unsigned long ObsNr=0; ObsNr<m_Observers.Size(); ObsNr++)
+        m_Observers[ObsNr]->Notify_WinChanged(this, Win, PropName);
+}
+
+
 SubjectT::~SubjectT()
 {

cafu/trunk/CaWE/GuiEditor/ObserverPattern.hpp

@@ -42 +42 @@
 namespace GuiEditor
 {
+    class EditorWindowT;
     class SubjectT;
     class UpdateBoxT;
@@ -98 +99 @@
         //@}
 
+        /// Notifies the observer that a property of a window has changed.
+        /// @param Subject    The GUI document whose window has changed.
+        /// @param Win        The window whose property has changed.
+        /// @param PropName   The name of the property whose value has changed.
+        virtual void Notify_WinChanged(SubjectT* Subject, const EditorWindowT* Win, const wxString& PropName) { }
+
         /// This method is called whenever a subject is about the be destroyed (and become unavailable).
-        /// \param dyingSubject   The subject that is being destroyed.
+        /// @param dyingSubject   The subject that is being destroyed.
         virtual void NotifySubjectDies(SubjectT* dyingSubject)=0;
 
@@ -135 +142 @@
         virtual void UpdateAllObservers_Modified(const ArrayT<cf::GuiSys::WindowT*>& Windows, WindowModDetailE Detail, const wxString& PropertyName);
         virtual void UpdateAllObservers_Modified(cf::GuiSys::WindowT* Window, WindowModDetailE Detail, const wxString& PropertyName);
+        virtual void UpdateAllObservers_Modified(const EditorWindowT* Win, const wxString& PropName);
 
         /// The virtual destructor.

cafu/trunk/CaWE/GuiEditor/RenderWindow.cpp

@@ -101 +101 @@
 
 
+void RenderWindowT::Notify_WinChanged(SubjectT* Subject, const EditorWindowT* Win, const wxString& PropName)
+{
+    Refresh(false);
+}
+
+
 void RenderWindowT::NotifySubjectDies(SubjectT* dyingSubject)
 {

cafu/trunk/CaWE/GuiEditor/RenderWindow.hpp

@@ -47 +47 @@
         void NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<cf::GuiSys::WindowT*>& Windows, WindowModDetailE Detail);
         void NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<cf::GuiSys::WindowT*>& Windows, WindowModDetailE Detail, const wxString& PropertyName);
+        void Notify_WinChanged(SubjectT* Subject, const EditorWindowT* Win, const wxString& PropName);
         void NotifySubjectDies(SubjectT* dyingSubject);
 

cafu/trunk/CaWE/GuiEditor/WindowInspector.cpp

@@ -73 +73 @@
 void WindowInspectorT::NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<cf::GuiSys::WindowT*>& Windows, WindowModDetailE Detail)
 {
-    if (!m_SelectedWindow) return;
-
-    if (Detail==WMD_HIERARCHY) return; // The ordner doesn't affect the window inspector.
-
-    for (unsigned long WindowNr=0; WindowNr<Windows.Size(); WindowNr++)
-    {
-        if (m_SelectedWindow==Windows[WindowNr])
-        {
-            if (Detail==WMD_GENERIC)
-            {
-                RefreshPropGrid();
-                return;
-            }
-
-            if (Detail==WMD_TRANSFORMED)
-            {
-                // Update all transformation related properties (position, size, rotation).
-                wxPGProperty* Property=GetProperty("Position.X");
-                Property->SetValue(wxVariant(m_SelectedWindow->Rect[0]));
-
-                Property=GetProperty("Position.Y");
-                Property->SetValue(wxVariant(m_SelectedWindow->Rect[1]));
-
-                Property=GetProperty("Size.Width");
-                Property->SetValue(wxVariant(m_SelectedWindow->Rect[2]));
-
-                Property=GetProperty("Size.Height");
-                Property->SetValue(wxVariant(m_SelectedWindow->Rect[3]));
-
-                Property=GetProperty("Rotation");
-                Property->SetValue(wxVariant(m_SelectedWindow->RotAngle));
-
-                RefreshGrid();
-
-                return;
-            }
-
-            if (Detail==WMD_HOR_TEXT_ALIGN)
-            {
-                wxPGProperty* Property=GetProperty("HorizontalAlign");
-                Property->SetValueFromInt(int(m_SelectedWindow->TextAlignHor));
-
-                RefreshGrid();
-
-                return;
-            }
+    if (m_IsRecursiveSelfNotify) return;
+    if (!m_SelectedWindow) return;
+    if (Windows.Find(m_SelectedWindow)==-1) return;
+
+    switch (Detail)
+    {
+        case WMD_HIERARCHY:
+        {
+            // The window hierarchy doesn't affect the window inspector.
+            break;
+        }
+
+        case WMD_GENERIC:
+        {
+            RefreshPropGrid();
+            break;
+        }
+
+        case WMD_TRANSFORMED:
+        {
+            // Update all transformation related properties (position, size, rotation).
+            wxPGProperty* Property=GetProperty("Position.X");
+            Property->SetValue(wxVariant(m_SelectedWindow->Rect[0]));
+
+            Property=GetProperty("Position.Y");
+            Property->SetValue(wxVariant(m_SelectedWindow->Rect[1]));
+
+            Property=GetProperty("Size.Width");
+            Property->SetValue(wxVariant(m_SelectedWindow->Rect[2]));
+
+            Property=GetProperty("Size.Height");
+            Property->SetValue(wxVariant(m_SelectedWindow->Rect[3]));
+
+            Property=GetProperty("Rotation");
+            Property->SetValue(wxVariant(m_SelectedWindow->RotAngle));
+
+            RefreshGrid();
+            break;
+        }
+
+        case WMD_HOR_TEXT_ALIGN:
+        {
+            wxPGProperty* Property=GetProperty("HorizontalAlign");
+            Property->SetValueFromInt(int(m_SelectedWindow->TextAlignHor));
+
+            RefreshGrid();
+            break;
         }
     }
@@ -127 +128 @@
 {
     if (m_IsRecursiveSelfNotify) return;
-
-    if (!m_SelectedWindow) return;
-
-    for (unsigned long WindowNr=0; WindowNr<Windows.Size(); WindowNr++)
-    {
-        if (m_SelectedWindow==Windows[WindowNr])
-        {
-            wxPGProperty* Property=GetProperty(PropertyName);
-            wxASSERT(Property);
-
-            GuiDocumentT::GetSibling(m_SelectedWindow)->UpdateProperty(Property);
-
-            RefreshGrid();
-            return;
-        }
-    }
+    if (!m_SelectedWindow) return;
+    if (Windows.Find(m_SelectedWindow)==-1) return;
+
+    wxPGProperty* Property=GetProperty(PropertyName);
+    wxASSERT(Property);
+
+    GuiDocumentT::GetSibling(m_SelectedWindow)->UpdateProperty(Property);
+    RefreshGrid();
+}
+
+
+void WindowInspectorT::Notify_WinChanged(SubjectT* Subject, const EditorWindowT* Win, const wxString& PropName)
+{
+    if (m_IsRecursiveSelfNotify) return;
+    if (!m_SelectedWindow) return;
+    if (Win->GetDual()!=m_SelectedWindow) return;
+
+    wxPGProperty* Property=GetProperty(PropName);
+    wxASSERT(Property);
+
+    GuiDocumentT::GetSibling(m_SelectedWindow)->UpdateProperty(Property);
+    RefreshGrid();
 }
 
@@ -196 +203 @@
     ClearSelection();
 
+    m_IsRecursiveSelfNotify=true;
     GuiDocumentT::GetSibling(m_SelectedWindow)->HandlePGChange(Event, m_Parent);
-}
+    m_IsRecursiveSelfNotify=false;
+}

cafu/trunk/CaWE/GuiEditor/WindowInspector.hpp

@@ -48 +48 @@
         void NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<cf::GuiSys::WindowT*>& Windows, WindowModDetailE Detail);
         void NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<cf::GuiSys::WindowT*>& Windows, WindowModDetailE Detail, const wxString& PropertyName);
+        void Notify_WinChanged(SubjectT* Subject, const EditorWindowT* Win, const wxString& PropName);
         void NotifySubjectDies(SubjectT* dyingSubject);
 
@@ -60 +61 @@
         bool                 m_IsRecursiveSelfNotify;
 
-
         void OnPropertyGridChanged(wxPropertyGridEvent& Event);
 

cafu/trunk/CaWE/GuiEditor/WindowTree.cpp

@@ -240 +240 @@
 
 
+void WindowTreeT::Notify_WinChanged(SubjectT* Subject, const EditorWindowT* Win, const wxString& PropName)
+{
+}
+
+
 void WindowTreeT::RefreshTree()
 {

cafu/trunk/CaWE/GuiEditor/WindowTree.hpp

@@ -64 +64 @@
         void NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<cf::GuiSys::WindowT*>& Windows, WindowModDetailE Detail);
         void NotifySubjectChanged_Modified(SubjectT* Subject, const ArrayT<cf::GuiSys::WindowT*>& Windows, WindowModDetailE Detail, const wxString& PropertyName);
+        void Notify_WinChanged(SubjectT* Subject, const EditorWindowT* Win, const wxString& PropName);
         void NotifySubjectDies(SubjectT* dyingSubject);
 

cafu/trunk/CaWE/GuiEditor/Windows/EditorChoiceWindow.cpp

@@ -24 +24 @@
 #include "../GuiDocument.hpp"
 #include "../Commands/ModifyWindow.hpp"
+#include "../Commands/SetStrings.hpp"
 
 #include "GuiSys/WindowChoice.hpp"
@@ -45 +46 @@
     EditorWindowT::FillInPG(PropMan);
 
-    wxString ChoicesString;
+    wxString Str;
 
     for (unsigned long ChoiceNr=0; ChoiceNr<m_Choice->GetChoices().Size(); ChoiceNr++)
-        ChoicesString+=m_Choice->GetChoices()[ChoiceNr]+";\n";
+    {
+        if (ChoiceNr>0) Str+="\n";
+        Str+=m_Choice->GetChoices()[ChoiceNr];
+    }
 
-    PropMan->Append(new wxLongStringProperty("Choices", wxPG_LABEL, ChoicesString));
+    PropMan->Append(new wxLongStringProperty("Choices", wxPG_LABEL, Str));
     PropMan->Append(new wxIntProperty("DefaultChoice", wxPG_LABEL, m_Choice->GetSelectedChoice()));
 }
@@ -63 +67 @@
     if (PropName=="Choices")
     {
-        wxString ChoicesString;
+        wxString Str;
 
         for (unsigned long ChoiceNr=0; ChoiceNr<m_Choice->GetChoices().Size(); ChoiceNr++)
-            ChoicesString+=m_Choice->GetChoices()[ChoiceNr]+";\n";
+        {
+            if (ChoiceNr>0) Str+="\n";
+            Str+=m_Choice->GetChoices()[ChoiceNr];
+        }
 
-        Property->SetValueFromString(ChoicesString);
+        Property->SetValueFromString(Str);
         return true;
     }
@@ -91 +98 @@
     if (PropName=="Choices")
     {
-        static cf::GuiSys::WindowT::MemberVarT DummyVar;
+        ArrayT<std::string> NewStrings;
+        wxStringTokenizer   Tokenizer(Prop->GetValueAsString(), "\r\n");
 
-        // Remove all newline characters from the string since they break the choices display.
-        wxString FormattedString=Prop->GetValueAsString();
-        FormattedString.Replace("\\n", "");
-        // Remove all trailing characters after the last delimiter (;).
-        FormattedString=FormattedString.Mid(0, FormattedString.Find(';', true)+1);
+        while (Tokenizer.HasMoreTokens())
+            NewStrings.PushBack(std::string(Tokenizer.GetNextToken()));
 
-        // Specially treated by command.
-        ChildFrame->SubmitCommand(new CommandModifyWindowT(m_GuiDoc, m_Choice, PropName, DummyVar, FormattedString));
+        ChildFrame->SubmitCommand(new CommandSetStringsT(m_GuiDoc, this, PropName, m_Choice->m_Choices, NewStrings));
         return true;
     }

cafu/trunk/CaWE/GuiEditor/Windows/EditorWindow.hpp

@@ -48 +48 @@
         /// The destructor.
         virtual ~EditorWindowT() { }
+
+        /// Returns the GuiSys "dual" or "sibling" of this window.
+        const cf::GuiSys::WindowT* GetDual() const { return m_Win; }
 
         /// Returns the GuiDocumentT instance that this window lives in.

cafu/trunk/CaWE/ModelEditor/ObserverPattern.hpp

@@ -88 +88 @@
         virtual void Notify_AnimStateChanged(SubjectT* Subject) { }
 
-        /// Notifies the observer that the listz of submodels has changed.
+        /// Notifies the observer that the list of submodels has changed.
         /// @param Subject   The model document with the model in which the list of submodels has changed.
         virtual void Notify_SubmodelsChanged(SubjectT* Subject) { }

cafu/trunk/Games/DeathMatch/GUIs/MainMenu/MainMenu_init.cgui

@@ -1258 +1258 @@
     self:set("backColor", 0, 0, 0, 0);
     self:set("font", "Fonts/Impact");
-    self:set("text", "Cafu is copyright © 2001-2010 Carsten Fuchs Software.\nAll rights reserved.                       http://www.cafu.de");
+    self:set("text", "Cafu is copyright © 2001-2011 Carsten Fuchs Software.\nAll rights reserved.                       http://www.cafu.de");
     self:set("textScale", 0.22);
     self:set("textColor", 0.5, 0.5, 0.5, 1);

cafu/trunk/Libs/GuiSys/Window.hpp

@@ -117 +117 @@
 
             /// Extra / extern / extension data that user code can derive from and assign to this window
-            /// in order to "configure" it with "callbacks" (e\.g\. the \c Render() method) and to have it
+            /// in order to "configure" it with "callbacks" (e.g.\ the \c Render() method) and to have it
             /// store additional user-specific data and functions.
             struct ExtDataT

cafu/trunk/Libs/GuiSys/WindowChoice.hpp

@@ -26 +26 @@
 
 
+namespace GuiEditor { class EditorChoiceWindowT; }
+
+
 namespace cf
 {
@@ -31 +34 @@
     {
         /// A choice window.
-        /// This was initially intended to look-n-feel like a combobox under Windows,
-        /// but it turns out that for speed and ease of implementation, an entirely
-        /// different approach is more feasible (for now).
+        /// This was initially intended to look and feel like a "combobox" under Windows,
+        /// but for ease of implementation, the current approach works slightly different.
         class ChoiceT : public WindowT
         {
             public:
 
-            /// Constructor for creating a listbox.
-            /// @param Params Choice creation parameters.
+            /// Constructor for creating a choice.
+            /// @param Params   Choice creation parameters.
             ChoiceT(const cf::GuiSys::WindowCreateParamsT& Params);
 
-            /// The Copy Constructor.
-            /// @param Window Window to copy.
-            /// @param Recursive Whether to copy the whole window hierarchy of the window and its children.
+            /// The copy constructor.
+            /// @param Window      Window to copy.
+            /// @param Recursive   Whether to copy the whole window hierarchy of the window and its children.
             ChoiceT(const ChoiceT& Window, bool Recursive=false);
 
@@ -53 +55 @@
 
             /// Returns an array of the choices of this window.
-            ArrayT<std::string>& GetChoices() { return m_Choices; }
+            const ArrayT<std::string>& GetChoices() const { return m_Choices; }
 
+            /// Returns the currently selected choice, -1 for none.
             int GetSelectedChoice() const { return m_SelectedChoice; }
 
@@ -69 +72 @@
 
             protected:
+
+            friend class GuiEditor::EditorChoiceWindowT;
 
             void FillMemberVars();  ///< Helper method that fills the MemberVars array with entries for each class member.