# HG changeset patch
# User laurent
# Date 1332081424 -3600
# Node ID f8445d00613da87666a90a6418556dac96c3b99d
# Parent  71b57ed5223b42eccf198e2732eac3f8b9135193
Fix bug when undo just after creating a new project element

diff -r 71b57ed5223b -r f8445d00613d DataTypeEditor.py
--- a/DataTypeEditor.py	Sun Mar 18 15:35:07 2012 +0100
+++ b/DataTypeEditor.py	Sun Mar 18 15:37:04 2012 +0100
@@ -524,12 +524,10 @@
     def Undo(self):
         self.Controler.LoadPrevious()
         self.ParentWindow.CloseTabsWithoutModel()
-        self.ParentWindow.RefreshEditor()
             
     def Redo(self):
         self.Controler.LoadNext()
         self.ParentWindow.CloseTabsWithoutModel()
-        self.ParentWindow.RefreshEditor()
     
     def HasNoModel(self):
         return self.Controler.GetEditedElement(self.TagName) is None
diff -r 71b57ed5223b -r f8445d00613d PLCOpenEditor.py
--- a/PLCOpenEditor.py	Sun Mar 18 15:35:07 2012 +0100
+++ b/PLCOpenEditor.py	Sun Mar 18 15:37:04 2012 +0100
@@ -1050,13 +1050,15 @@
             self.EditMenu.Enable(wx.ID_ADD, False)
             self.EditMenu.Enable(wx.ID_DELETE, False)
     
-    def CloseTabsWithoutModel(self):
+    def CloseTabsWithoutModel(self, refresh=True):
         idxs = range(self.TabsOpened.GetPageCount())
         idxs.reverse()
         for idx in idxs:
             window = self.TabsOpened.GetPage(idx)
             if window.HasNoModel():
                 self.TabsOpened.DeletePage(idx)
+        if refresh:
+            self.RefreshEditor()
 
     def OnUndoMenu(self, event):
         selected = self.TabsOpened.GetSelection()
diff -r 71b57ed5223b -r f8445d00613d RessourceEditor.py
--- a/RessourceEditor.py	Sun Mar 18 15:35:07 2012 +0100
+++ b/RessourceEditor.py	Sun Mar 18 15:37:04 2012 +0100
@@ -46,12 +46,10 @@
     def Undo(self):
         self.Controler.LoadPrevious()
         self.ParentWindow.CloseTabsWithoutModel()
-        self.ParentWindow.RefreshEditor()
             
     def Redo(self):
         self.Controler.LoadNext()
         self.ParentWindow.CloseTabsWithoutModel()
-        self.ParentWindow.RefreshEditor()
     
     def HasNoModel(self):
         return self.Controler.GetEditedElement(self.TagName) is None
@@ -459,12 +457,10 @@
     def Undo(self):
         self.Controler.LoadPrevious()
         self.ParentWindow.CloseTabsWithoutModel()
-        self.ParentWindow.RefreshEditor()
             
     def Redo(self):
         self.Controler.LoadNext()
         self.ParentWindow.CloseTabsWithoutModel()
-        self.ParentWindow.RefreshEditor()
     
     def HasNoModel(self):
         return self.Controler.GetEditedElement(self.TagName) is None
diff -r 71b57ed5223b -r f8445d00613d TextViewer.py
--- a/TextViewer.py	Sun Mar 18 15:35:07 2012 +0100
+++ b/TextViewer.py	Sun Mar 18 15:37:04 2012 +0100
@@ -397,14 +397,12 @@
         if not self.Debug and self.TextSyntax != "ALL":
             self.Controler.LoadPrevious()
             self.ParentWindow.CloseTabsWithoutModel()
-            self.ParentWindow.RefreshEditor()
             
     def Redo(self):
         if not self.Debug and self.TextSyntax != "ALL":
             self.Controler.LoadNext()
             self.ParentWindow.CloseTabsWithoutModel()
-            self.ParentWindow.RefreshEditor()
-    
+        
     def HasNoModel(self):
         if not self.Debug and self.TextSyntax != "ALL":
             return self.Controler.GetEditedElement(self.TagName) is None
@@ -600,7 +598,7 @@
                     self.SetStyling(current_pos - last_styled_pos, 31)
                     last_styled_pos = current_pos
                     state = NUMBER
-                if state == WORD and char != '.':
+                elif state == WORD and char != '.':
                     word += char
             elif char == '(' and state == SPACE:
                 self.CallStack.append(current_call)
diff -r 71b57ed5223b -r f8445d00613d Viewer.py
--- a/Viewer.py	Sun Mar 18 15:35:07 2012 +0100
+++ b/Viewer.py	Sun Mar 18 15:37:04 2012 +0100
@@ -835,14 +835,12 @@
         if not self.Debug:
             self.Controler.LoadPrevious()
             self.ParentWindow.CloseTabsWithoutModel()
-            self.ParentWindow.RefreshEditor()
             
     def Redo(self):
         if not self.Debug:
             self.Controler.LoadNext()
             self.ParentWindow.CloseTabsWithoutModel()
-            self.ParentWindow.RefreshEditor()
-    
+        
     def HasNoModel(self):
         if not self.Debug:
             return self.Controler.GetEditedElement(self.TagName) is None