Changeset 122 for cafu/trunk/CaWE/GuiEditor/GuiDocument.cpp

Timestamp:

08/19/10 19:21:08 (21 months ago)

Author:

Carsten

Message:

CaWE GUI editor:

• Lua errors on loading a GUI are now presented to the user.
• Window names are checked for unique-ness now (and silently repaired, if necessary) when the GUI is saved.

Fixes #37.

Files:

• cafu/trunk/CaWE/GuiEditor/GuiDocument.cpp (modified) (4 diffs)

cafu/trunk/CaWE/GuiEditor/GuiDocument.cpp

@@ -61 +61 @@
         cf::GuiSys::GuiImplT Gui(gifn);
 
+        if (Gui.GetScriptInitResult()!="")
+        {
+            // GuiImplT::InitErrorT excecptions are caught in the caller code.
+            // Here we handle the case that initializing the GUI succeeded "halfway".
+            wxMessageBox("GUI file "+GuiInitFileName+" was loaded, but errors occurred:\n\n"+
+                         Gui.GetScriptInitResult()+"\n\n"+
+                         "You may choose to ignore this error and proceed,\n"+
+                         "but it is probably better to edit the file and manually fix the problem first.",
+                         "GUI initialization warning", wxOK | wxICON_EXCLAMATION);
+        }
+
         m_GuiProperties=GuiPropertiesT(Gui);
 
@@ -159 +170 @@
 
 
+// Recursively makes sure that the children of each window have unique names.
+// Normally the other GUI editor code should make sure that that is always true, but right now it
+// is possible to create violations of this constraint via drag-and-drop in the window hierarchy tree
+// (can drop a window as a child of another window that already has a child with the same name).
+static void CheckWindowNames(cf::GuiSys::WindowT* Window)
+{
+    const std::string OldName=Window->Name;
+
+    ((EditorDataWindowT*)Window->EditorData)->RepairNameUniqueness();
+
+    if (Window->Name!=OldName)
+        ((EditorDataWindowT*)Window->EditorData)->GetGuiDoc()->UpdateAllObservers_Modified(Window, WMD_PROPERTY_CHANGED, "Name");
+
+    for (unsigned long ChildNr=0; ChildNr<Window->Children.Size(); ChildNr++)
+        CheckWindowNames(Window->Children[ChildNr]);
+}
+
+
 // Recursively saves the window instantiation of the passed window and all of its children.
 static void SaveWindowInstantiation(std::ostream& OutFile, cf::GuiSys::WindowT* Window, const wxString& ParentName)
@@ -239 +268 @@
 bool GuiDocumentT::SaveInit_cgui(std::ostream& OutFile)
 {
+    CheckWindowNames(m_RootWindow);
+
     OutFile << "-- This is a Cafu engine GUI script file, written by CaWE, the Cafu World Editor.\n";
     OutFile << "-- You CAN edit this file manually, but note that CaWE may overwrite your changes.\n";
@@ -262 +293 @@
     OutFile << "\n";
 
-    SaveWindowHierarchy   (OutFile, m_RootWindow, "");
+    SaveWindowHierarchy(OutFile, m_RootWindow, "");
 
     OutFile << "\n";