[Uludag-commits] r15599 - trunk/tasma/network-manager

[uludag-commits at pardus.org.tr]

Author: bahadir.kandemir
Date: Tue Oct  2 22:44:13 2007
New Revision: 15599

Modified:
   trunk/tasma/network-manager/browser.py
   trunk/tasma/network-manager/connection.py
Log:
Allow one active properties dialog per connection.

Modified: trunk/tasma/network-manager/browser.py
=================================================================
--- trunk/tasma/network-manager/browser.py	(original)
+++ trunk/tasma/network-manager/browser.py	Tue Oct  2 22:44:13 2007
@@ -82,6 +82,8 @@
         self.view = view
         self.conn = conn
         
+        self.edit = None
+        
         self.mypix = icons.get_state(comlink.links[conn.script].type, conn.state)
         if self.conn.state in ("inaccessible", "unavailable"):
             self.mypix = KIconEffect().apply(self.mypix, KIconEffect.ToGray, 1, QColor(), False)
@@ -126,7 +128,10 @@
             comlink.com.Net.Link[conn.script].deleteConnection(name=conn.name)
     
     def slotEdit(self):
-        w = connection.Window(self.view.parent(), self.conn)
+        if self.edit and self.edit.isShown():
+            self.edit.setWindowState(Qt.WindowActive)
+        else:
+            self.edit = connection.Window(self.view.parent(), self.conn)
     
     def mouseDoubleClickEvent(self, event):
         self.slotEdit()

Modified: trunk/tasma/network-manager/connection.py
=================================================================
--- trunk/tasma/network-manager/connection.py	(original)
+++ trunk/tasma/network-manager/connection.py	Tue Oct  2 22:44:13 2007
@@ -523,11 +523,7 @@
 
 
 class Window(QMainWindow):
-    mySingleInstance = None
     def __init__(self, parent, conn, link=None, new_conn=None):
-        if Window.mySingleInstance:
-            return None
-        Window.mySingleInstance = self
         QMainWindow.__init__(self, parent, " ", Qt.WType_Dialog)
         
         self.setCaption(i18n("Configure network connection"))
@@ -560,7 +556,3 @@
     def slotCancel(self):
         self.settings.cleanup()
         self.close(True)
-
-    def closeEvent(self, event):
-        QMainWindow.closeEvent(self, event)
-        Window.mySingleInstance = None