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

[uludag-commits at pardus.org.tr]

Author: isbaran
Date: Mon Sep  3 16:49:41 2007
New Revision: 15272

Modified:
   trunk/tasma/network-manager/browser.py
   trunk/tasma/network-manager/connection.py
   trunk/tasma/network-manager/newconn.py
   trunk/tasma/network-manager/widgets.py
Log:
Help Dialog, Add Connection Dialog, Connection Properties 
Dialog can be opened only once.
Connection Properties Dialog will popup at the center.

Bug #6231 Fixed




Modified: trunk/tasma/network-manager/browser.py
=================================================================
--- trunk/tasma/network-manager/browser.py	(original)
+++ trunk/tasma/network-manager/browser.py	Mon Sep  3 16:49:41 2007
@@ -421,7 +421,6 @@
     
     def slotHelp(self):
         self.helpwin = widgets.HelpDialog("network-manager", i18n("Network Connections Help"), self)
-        self.helpwin.show()
     
     def setInterface(self):
         self.butNew.setEnabled(False)

Modified: trunk/tasma/network-manager/connection.py
=================================================================
--- trunk/tasma/network-manager/connection.py	(original)
+++ trunk/tasma/network-manager/connection.py	Mon Sep  3 16:49:41 2007
@@ -521,8 +521,12 @@
 
 
 class Window(QMainWindow):
+    mySingleInstance = None
     def __init__(self, parent, conn, link=None, new_conn=None):
-        QMainWindow.__init__(self, parent)
+        if Window.mySingleInstance:
+            return None
+        Window.mySingleInstance = self
+        QMainWindow.__init__(self, parent, " ", Qt.WType_Dialog)
         
         self.setCaption(i18n("Configure network connection"))
         #self.setMinimumSize(580, 380)
@@ -554,3 +558,7 @@
     def slotCancel(self):
         self.settings.cleanup()
         self.close(True)
+
+    def closeEvent(self, event):
+        QMainWindow.closeEvent(self, event)
+        Window.mySingleInstance = None

Modified: trunk/tasma/network-manager/newconn.py
=================================================================
--- trunk/tasma/network-manager/newconn.py	(original)
+++ trunk/tasma/network-manager/newconn.py	Mon Sep  3 16:49:41 2007
@@ -19,7 +19,11 @@
 
 
 class Window(QDialog):
+    myInstance = None
     def __init__(self, parent):
+        if Window.myInstance:
+            return None
+        Window.myInstance = self
         QDialog.__init__(self, parent)
         self.setMinimumSize(340, 340)
         self.resize(340, 340)
@@ -65,6 +69,7 @@
         self.connect(but, SIGNAL("clicked()"), self.reject)
         
         vb.addWidget(hb)
+        self.show()
     
     def reject(self):
         comlink.device_hook.remove(self.slotDevices)
@@ -111,7 +116,10 @@
         else:
             item = QListViewItem(parent, "", i18n("No suitable device found"))
             item.setSelectable(False)
-
+    
+    def closeEvent(self, event):
+        QDialog.closeEvent(self, event)
+        Window.myInstance = None
 
 def ask_for_new(parent):
     if len(comlink.links) == 0:
@@ -120,4 +128,3 @@
             QMessageBox.Ok, QMessageBox.NoButton)
         return
     win = Window(parent)
-    win.show()

Modified: trunk/tasma/network-manager/widgets.py
=================================================================
--- trunk/tasma/network-manager/widgets.py	(original)
+++ trunk/tasma/network-manager/widgets.py	Mon Sep  3 16:49:41 2007
@@ -51,7 +51,11 @@
 
 
 class HelpDialog(QDialog):
+    myInstance = None
     def __init__(self, name, title, parent=None):
+        if HelpDialog.myInstance:
+            return None
+        HelpDialog.myInstance = self
         QDialog.__init__(self, parent)
         self.setCaption(title)
         self.layout = QGridLayout(self)
@@ -66,3 +70,8 @@
         if not os.path.exists(url):
             url = locate("data", "%s/help/en/main_help.html" % name)
         self.htmlPart.openURL(KURL(url))
+        self.show()
+
+    def closeEvent(self, event):
+        QDialog.closeEvent(self, event)
+        HelpDialog.myInstance = None