branches/kde/user-manager/corporate2 - New PListViewItem will be visible if its parent is...

[Mehmet Özdemir]

Author: mehmet.ozdemir
Date: Tue Mar  8 21:46:31 2011
New Revision: 36393

Modified:
   branches/kde/user-manager/corporate2/TODO
   branches/kde/user-manager/corporate2/um_list.py
   branches/kde/user-manager/corporate2/useredit.py
Log:
* New PListViewItem will be visible if its parent is expanded otherwise it wont be visible



---
 TODO        |    1 -
 um_list.py  |   22 ++++++++++++----------
 useredit.py |    4 ++--
 3 files changed, 14 insertions(+), 13 deletions(-)

Modified: branches/kde/user-manager/corporate2/TODO
=================================================================
--- branches/kde/user-manager/corporate2/TODO	(original)
+++ branches/kde/user-manager/corporate2/TODO	Tue Mar  8 21:46:31 2011
@@ -14,4 +14,3 @@
 - Make header for PListView
 - Improve calculateTextOut algorithm
 - Add wait/loadig thing (or change cursor) while list expanding/collapsing something
-- New PListViewItem will be visible if its parent is expanded otherwise it wont be visible

Modified: branches/kde/user-manager/corporate2/um_list.py
=================================================================
--- branches/kde/user-manager/corporate2/um_list.py	(original)
+++ branches/kde/user-manager/corporate2/um_list.py	Tue Mar  8 21:46:31 2011
@@ -142,33 +142,35 @@
 
     def add(self, item):
         ### Ekleme yapıldığında collapsed ise açılmalı !!!!!!!!
+        ### NAsıl ise öyle kalmalı burda açma kapama yapma
 
         size = QSize(self.width(), self.height())
         self.resizeEvent(QResizeEvent(size , QSize(0, 0)))
         if item.parentItem:
             if not item.parentItem in self.items:
                 return # 
-            item.parentItem.isExpanded = True
             lastChild = item.parentItem.findLastChild()
             if lastChild:
                 self.items.insert(self.items.index(lastChild)+1, item)
-                self.visibleitems.insert(self.visibleitems.index(lastChild)+1, item)
+                lastChild.nextItem = item
             else:
                 self.items.insert(self.items.index(item.parentItem)+1, item)
-                self.visibleitems.insert(self.visibleitems.index(item.parentItem)+1, item)
-            self.addChild(item, 0, self.visibleitems.index(item)*self.itemHeight)
-            if item.parentItem.firstChild: # childların sonuna ekle
-                #lastChild = item.parentItem.findLastChild()
-                lastChild.nextItem = item
-            else: # first child olarak ekle
                 item.parentItem.firstChild = item
+            if item.parentItem.isExpanded: # çocuk gözükecek
+                # kendinden önce gözükür durumda olan eleman ya kardeşidir ya da atası
+                previousItem = self.findPreviousItem(item)
+                if lastChild: # sen ilk çocuksun ve başka çocuk yok
+                    self.visibleitems.insert(self.visibleitems.index(lastChild)+1, item)
+                else:
+                    self.visibleitems.insert(self.visibleitems.index(item.parentItem)+1, item)
+                self.addChild(item, 0, self.visibleitems.index(item)*self.itemHeight)
+                self.shiftLowerItems(item)
             item.resize(item.parentItem.width(), self.itemHeight)
-            self.shiftLowerItems(item)
             self.setSiblingHasChild(item.parentItem, True)
 
         else:
             self.items.insert(len(self.items), item) # en sona ekle
-            self.visibleitems.insert(len(self.visibleitems), item) # en sona ekle
+            self.visibleitems.insert(len(self.visibleitems), item) # parentı yoksa  mutlaka visible olur
             self.addChild(item, 0, self.visibleitems.index(item)*self.itemHeight)
             if not self.firstItem:
                 self.firstItem = item

Modified: branches/kde/user-manager/corporate2/useredit.py
=================================================================
--- branches/kde/user-manager/corporate2/useredit.py	(original)
+++ branches/kde/user-manager/corporate2/useredit.py	Tue Mar  8 21:46:31 2011
@@ -1264,8 +1264,8 @@
             else:
                 item.checkButtonsState()
 
-            if not item.isExpanded:
-                item.expand()
+            #if not item.isExpanded:
+            #    item.expand()
 
         self.mainwidget.link.User.Manager["baselayout"].listUserAuthorizationsByCategory(int(self.uid.text()), item.name, async=fill)