Merged remote changes. 5_2_x

Sat, 14 Apr 2012 12:03:40 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 14 Apr 2012 12:03:40 +0200
branch
5_2_x
changeset 1788
6cde0ffb2667
parent 1787
01e2b040d2ba (current diff)
parent 1786
27dab28b0482 (diff)
child 1790
1155fb831ae2

Merged remote changes.

diff -r 01e2b040d2ba -r 6cde0ffb2667 Project/ProjectBrowserModel.py
--- a/Project/ProjectBrowserModel.py	Sat Apr 14 12:03:10 2012 +0200
+++ b/Project/ProjectBrowserModel.py	Sat Apr 14 12:03:40 2012 +0200
@@ -612,7 +612,7 @@
             # step 1: check for new entries
             children = itm.children()
             for f in entryInfoList:
-                fpath = f.absoluteFilePath()
+                fpath = Utilities.toNativeSeparators(f.absoluteFilePath())
                 childFound = False
                 for child in children:
                     if child.name() == fpath:
@@ -648,9 +648,10 @@
             if len(entryInfoList) != itm.childCount():
                 for row in range(oldCnt - 1, -1, -1):
                     child = itm.child(row)
+                    childname = Utilities.fromNativeSeparators(child.name())
                     entryFound = False
                     for f in entryInfoList:
-                        if f.absoluteFilePath() == child.name():
+                        if f.absoluteFilePath() == childname:
                             entryFound = True
                             entryInfoList.remove(f)
                             break
diff -r 01e2b040d2ba -r 6cde0ffb2667 UI/BrowserModel.py
--- a/UI/BrowserModel.py	Sat Apr 14 12:03:10 2012 +0200
+++ b/UI/BrowserModel.py	Sat Apr 14 12:03:40 2012 +0200
@@ -299,7 +299,7 @@
             # step 1: check for new entries
             children = itm.children()
             for f in entryInfoList:
-                fpath = f.absoluteFilePath()
+                fpath = Utilities.toNativeSeparators(f.absoluteFilePath())
                 childFound = False
                 for child in children:
                     if child.name() == fpath:
@@ -326,9 +326,10 @@
             if len(entryInfoList) != itm.childCount():
                 for row in range(oldCnt - 1, -1, -1):
                     child = itm.child(row)
+                    childname = Utilities.fromNativeSeparators(child.name())
                     entryFound = False
                     for f in entryInfoList:
-                        if f.absoluteFilePath() == child.name():
+                        if f.absoluteFilePath() == childname:
                             entryFound = True
                             entryInfoList.remove(f)
                             break

eric ide

mercurial