[Uludag-commits] r15648 - in trunk/staj-projeleri/Pakito/pakito: . gui

[uludag-commits at pardus.org.tr]

Author: gokcen.eraslan
Date: Fri Oct  5 11:29:30 2007
New Revision: 15648

Added:
   trunk/staj-projeleri/Pakito/pakito/config.py
Modified:
   trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py
   trunk/staj-projeleri/Pakito/pakito/gui/optionsDialog.py
Log:
settings fixed

Modified: trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py	(original)
+++ trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py	Fri Oct  5 11:29:30 2007
@@ -19,6 +19,7 @@
 import os
 import shutil
 from threading import Thread
+import fcntl
 
 # PiSi imports
 import pisi.api
@@ -42,11 +43,10 @@
         self.actionsTab = None
         self.tempDir = None
         self.realDir = None
-#        self.toolBar = QToolBar(self)
-#        self.toolBar.setLabel("Build Operations")
+        self.pisithread = None
 	    
         # main area
-        self.mainWidget =  QSplitter(self)
+        self.mainWidget = QSplitter(self)
         self.mainWidget.setOrientation(Qt.Vertical)
         self.mainWidget.setHandleWidth(4)
         self.setCentralWidget(self.mainWidget)
@@ -71,18 +71,16 @@
         self.doActions()
         self.disableOperations()
         
-        #prepare pisi
-        import fcntl
-         
+        # get a pipe for OutputTab<-> PiSi communication
+        
         self.pipeReadEnd, self.pipeWriteEnd = os.pipe()
-        fcntl.fcntl(self.pipeReadEnd, fcntl.F_SETFL, os.O_NONBLOCK)
+        fcntl.fcntl(self.pipeReadEnd, fcntl.F_SETFL, os.O_NONBLOCK) #make it non-blocking to use qsocketnotifier 
         self.sockNotifier = QSocketNotifier(self.pipeReadEnd, QSocketNotifier.Read, self)
-        self.connect(self.sockNotifier, SIGNAL("activated(int)"), self.sockHandle)
-            
-        self.pisithread = None
+        self.connect(self.sockNotifier, SIGNAL("activated(int)"), self.sockHandle)        
         
         self.connect(qApp, SIGNAL("shutDown()"), self.exit)
         
+        #TODO: setup'ta kdedir'e konulcak, alttakine gerek kalmayacak
         self.setXMLFile(os.getcwd() + "/pakitoui.rc")
         self.createShellGUI()
 
@@ -488,12 +486,20 @@
         self.pspecTab.sourcePage.cbType.setCurrentText(ext)
     
     def slotSettings(self):
+        from pakito.config import Config
+        
         dia = OptionsDialog(self)
-        dia.exec_loop()
+        conf = Config()
+        conf.read()
+        dia.leName.setText(conf.packagerName)
+        dia.leEmail.setText(conf.packagerEmail)
+        if dia.exec_loop() == KDialog.Accepted:
+            conf.packagerName = dia.leName.text()
+            conf.packagerEmail = dia.leEmail.text()
+            conf.write()
     
     def slotConfigureKeys(self):
         KKeyDialog.configure(self.actionCollection())
-
     
     def doActions(self):                
         # actions

Modified: trunk/staj-projeleri/Pakito/pakito/gui/optionsDialog.py
=================================================================
--- trunk/staj-projeleri/Pakito/pakito/gui/optionsDialog.py	(original)
+++ trunk/staj-projeleri/Pakito/pakito/gui/optionsDialog.py	Fri Oct  5 11:29:30 2007
@@ -10,5 +10,4 @@
     def __init__(self, parent = None, name = None):
         OptionsDialogUI.__init__(self, parent, name)
         self.connect(self.pbOk, SIGNAL("clicked()"), self, SLOT("accept()"))
-        self.connect(self.pbCancel, SIGNAL("clicked()"), self, SLOT("reject()"))
-
+        self.connect(self.pbCancel, SIGNAL("clicked()"), self, SLOT("reject()"))
\ No newline at end of file