\n" "Vous devez définir un mot de passe pour l'utilisateur root qui possède " "toutes les privilèges concernant le système.\n" -"Le mot de passe doit être facile à souvenir(pour vous) mais difficile à deviner " +"Le mot de passe doit être facile à souvenir (pour vous) mais difficile à deviner " "(pour les autres).\n" "Vous pouvez utiliser des miniscules ou majuscules, des chiffres et des " "ponctuations dans votre mot de passe.\n" @@ -926,7 +925,6 @@ "Ici, vous pouvez définir un nom pour votre ordinateur et l'écrire dans la " "boîte ci-dessous. Puisque votre ordinateur sera connu dans le réseau " "local avec ce nom, on vous conseille de choisir un nom descriptif.\n" -"Continuer avec l'installation après avoir réglé les paramètres.\n" "
\n" "\n"
"Appuyer sur \"Suivant\" pour continuer.\n"
@@ -967,7 +965,7 @@
#: yali4/gui/ScrBootloader.py:37
msgid "Configure the system boot..."
-msgstr "Réglage du démarrage du système..."
+msgstr "Configuration du démarrage du système"
#: yali4/gui/ScrBootloader.py:39
msgid ""
@@ -1022,7 +1020,7 @@
msgid "To ignore media corruptions you can check your media integrity..."
msgstr ""
"Vous pouvez vérifier l'intégrité de votre support pour ne pas avoir "
-"des problèmes pendant l'installation..."
+"des problèmes pendant l'installation"
#: yali4/gui/ScrCheckCD.py:32
msgid ""
@@ -1055,7 +1053,7 @@
#: yali4/gui/ScrDateTime.py:28
msgid "You can change your timezone, time or date settings..."
-msgstr "Vous pouvez changer votre fuseau horaire et les paramètres de date..."
+msgstr "Vous pouvez changer votre fuseau horaire et modifier la date et l'heure"
#: yali4/gui/ScrDateTime.py:30
msgid ""
@@ -1147,7 +1145,7 @@
#: yali4/gui/ScrInstall.py:61
msgid "Installing takes approximately 30 minutes depending on your hardware..."
-msgstr "L'installation dure approximativement 30 minutes..."
+msgstr "L'installation dure approximativement 30 minutes"
#: yali4/gui/ScrInstall.py:63
msgid ""
@@ -1232,11 +1230,11 @@
#: yali4/gui/ScrKahyaCheck.py:54
msgid "Kahya is working..."
-msgstr "Kahya est en exécution..."
+msgstr "Kahya est en exécution"
#: yali4/gui/ScrKahyaCheck.py:55
msgid "Kahya will automatically install your system..."
-msgstr "Kahya va automatiquement installer votre système..."
+msgstr "Kahya va automatiquement installer votre système"
#: yali4/gui/ScrKahyaCheck.py:56
msgid ""
@@ -1254,7 +1252,7 @@
#: yali4/gui/ScrKeyboard.py:32
msgid "Use your keyboard layout..."
-msgstr "Utiliser votre schéma du clavier..."
+msgstr "Utiliser votre propre schéma du clavier"
#: yali4/gui/ScrKeyboard.py:34
msgid ""
@@ -1284,7 +1282,7 @@
#: yali4/gui/ScrPartitionAuto.py:39
msgid "Auto or Manual partitioning..."
-msgstr "Partitionnement manuel ou automatique..."
+msgstr "Choisir entre le partitionnement manuel ou automatique"
#: yali4/gui/ScrPartitionAuto.py:41
msgid ""
@@ -1314,7 +1312,7 @@
"\n"
" \n"
"Vous pouvez installer Pardus si vous avez une zone de disque disponible \n"
-"une disque non utilisée de 4 Go(10 Go est recommandé). La zone de disque \n"
+"ou une disque non utilisée de 4 Go (10 Go est recommandé). La zone de disque \n"
"sélectionnée sera automatiquement formatée \n"
"On vous conseille de sauvegarder les données qui peuvent exister dans \n"
"cette zone pour empêcher les problèmes futurs.\n"
@@ -1344,7 +1342,7 @@
#: yali4/gui/ScrPartitionManual.py:32
msgid "You can easily configure your partitions..."
-msgstr "Vous pouvez facilement configurer vos partitions..."
+msgstr "Vous pouvez facilement configurer vos partitions"
#: yali4/gui/ScrPartitionManual.py:34
msgid ""
@@ -1543,7 +1541,7 @@
#: yali4/gui/ScrUsers.py:33
msgid "Create users to use Pardus..."
-msgstr "Créer les utilisateur pour Pardus..."
+msgstr "Créer les utilisateur pour Pardus"
#: yali4/gui/ScrUsers.py:35
msgid ""
@@ -1572,14 +1570,13 @@
"\n"
" \n"
"Pardus 2008 permet à plusieurs utilisateurs de partager le même ordinateur.\n"
-"Vous pouvez attribuer des privilèges administratifs aux utilisateurs que vous créez;\n"
+"Vous pouvez attribuer des privilèges administratifs aux utilisateurs que vous créez.\n"
" \n"
-"Pour créer un nouvel utilisateur, remplir le form et appuyez sur le bouton \"Ajouter utilisateur\".\n"
+"Pour créer un nouvel utilisateur, remplir le form et appuyez sur le bouton \"Ajouter l'utilisateur\".\n"
"Si vous voulez qu'un utilisateur soit automatiquement entré à Pardus, sélectionner\n"
-"l'utilisateur de la liste. Pour supprimer un utilisateur, sélectionner son nom de la liste\n"
-"et appuyer sur le bouton \"Supprimer\".\n"
-"Continuer avec l'installation après avoir fini la configuration.\n"
+"l'utilisateur de la liste \"Utilisateur de Login Automatique\". Pour supprimer un utilisateur, sélectionner son nom de la liste\n"
+"et appuyer sur le bouton \"Supprimer l'utilisateur\".\n"
" \n"
"Appuyer \"Suivant\" pour continuer.\n"
@@ -1739,11 +1736,11 @@
#: yali4/installer.py:216
msgid "Disk analyze started.."
-msgstr "Analyse du disque en cours.."
+msgstr "Analyse du disque en cours..."
#: yali4/installer.py:321
msgid "Resize Finished ..."
-msgstr "Redimensionnement est terminé..."
+msgstr "Redimensionnement est terminé"
#: yali4/installer.py:333
msgid "Creating new partition ..."
@@ -1752,11 +1749,11 @@
#: yali4/installer.py:446
#, python-format
msgid "User %s's home directory is being prepared.."
-msgstr "Préparation du répertoire de l'utilisateur %s.."
+msgstr "Préparation du répertoire de l'utilisateur %s..."
#: yali4/installer.py:516
msgid "Trying to connect DBUS..."
-msgstr "Tentative de connexion au service DBUS..."
+msgstr "Tentative de connexion au service DBUS"
#: yali4/installer.py:518
msgid "Setting Hostname..."
From uludag-commits at pardus.org.tr Thu Jul 3 12:02:04 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Thu, 3 Jul 2008 12:02:04 +0300 (EEST)
Subject: [Uludag-commits] r19453 - trunk/staj-projeleri/parmakizi/fingerui
Message-ID: <20080703090204.BCE8D138416B@liste.pardus.org.tr>
Author: makmanalp
Date: Thu Jul 3 12:02:03 2008
New Revision: 19453
Removed:
trunk/staj-projeleri/parmakizi/fingerui/fingerform.png
Modified:
trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
Log:
Code quality improved drastically. Need to implement UpdateUi better, and then do COMAR stuff.
Modified: trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py Thu Jul 3 12:02:03 2008
@@ -1,11 +1,16 @@
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+"""finger-manager gui."""
+from PyQt4.QtCore import pyqtSignature
+from PyQt4.QtGui import QDialog, QPixmap, QApplication
import fingerform
-from libfprint import *
+import libfprint
class fmDialog(QDialog, fingerform.Ui_dialogFinger):
+ """Dialog for finger-manager.
+ Supports 3 basic functions: Enroll, Verify and Erase.
+ Enroll asks the user for fingerprint data and saves it.
+ Verify verifies the fingerprint data with the currently saved data.
+ Erase erases the currently saved data."""
def __init__(self, uid, parent=None):
-
#uid
if uid == None:
raise ValueError
@@ -21,110 +26,128 @@
super(fmDialog, self).__init__(parent)
self.setupUi(self)
self.UpdateUi()
- self.initFprint()
- self.initDevice()
- self.enroll()
+ self._initFprint()
def __del__(self):
#super(self.__class__, self).__del__()
- if self.__device:
- self.closeDevice()
- self.exitFprint()
-
+ self._exitFprint()
#--------ui functions-------
@pyqtSignature("")
def on_pushEnroll_clicked(self):
- self.enroll(self.__uid.__str__())
+ """Enroll button event handler."""
+ self.enroll()
@pyqtSignature("")
def on_pushErase_clicked(self):
+ """Erase button event handler."""
print "FP for uid " + self.__uid.__str__()
@pyqtSignature("")
def on_pushVerify_clicked(self):
- self.verify(self.__uid.__str__())
+ """Verify button event handler."""
+ self.verify()
def UpdateUi(self):
+ """Updates the UI to set disabled buttons where appropriate.
+ Example: When there is no existing fprint, then the user should
+ not be able to press erase."""
pass
#------helper functions------
- def initFprint(self):
- fp_init()
-
- def initDevice(self):
- self.__devices = pyfprint.discover_devices()
+ def _initFprint(self):
+ """Start the fprint class and discover devices."""
+ libfprint.fp_init()
+ self.__devices = libfprint.discover_devices()
print [x.get_driver().get_full_name() for x in self.__devices]
if self.__devices == []:
- raise "No devices found"
+ sys.exit("No devices found")
self.__device = self.__devices[0]
-
- def exitFprint(self):
- fp_exit()
- def openDevice(self):
- self.__device.open()
-
- def closeDevice(self):
- self.__device.close()
+ def _exitFprint(self):
+ """Exit the fprint class."""
+ self._closeDevice()
+ libfprint.fp_exit()
+
+ def _openDevice(self):
+ """Open the current device, if not already open."""
+ if not self.__device.dev:
+ self.__device.open()
+
+ def _closeDevice(self):
+ """Close the current device, if not already closed."""
+ if self.__device.dev:
+ self.__device.close()
#QImage.Format_RGB32 works.
def getImage(self):
- self.openDevice()
+ """Get the fingerprint image and then display it. Blocking."""
+ self._openDevice()
img = self.__device.capture_image(True)
img = img.binarize()
pixmap = self._pixmapize(img, "parmak.pgm")
self.viewFinger.setPixmap(pixmap)
- self.closeDevice()
+ self._closeDevice()
- def _pixmapize(self, img, savepath=".tmpimg"):
- img.save_to_file(filename) #(TODO: comarize)
+ @staticmethod
+ def _pixmapize(img, filename=".tmpimg"):
+ """Convert image into pixmap."""
+ img.save_to_file(filename) #TODO: comarize OR Fix workaround.
return QPixmap(filename)
- def enroll(self, uid):
- self.openDevice()
+ def enroll(self):
+ """Get fingerprint data, store it, and show image. Blocking."""
+ self._openDevice()
while 1:
(fprnt, img) = self.__device.enroll_finger()
- if fprnt == "xxx": #TODO: Fix binding return data. Also, memory leak?
+ if fprnt == "xxx": #TODO: Fix binding return. Also, memory leak?
print "Please retry"
else:
print "Enrolled"
break
pixmap = self._pixmapize(img.binarize())
self.viewFinger.setPixmap(pixmap)
- self._savePrint(fprnt)
- self.closeDevice()
-
- def _savePrint(self, fprint, path=".printdata"):
- file = open(path, "w")
- file.write(fprint.get_data())
- file.close()
-
- def _loadPrint(self, fprint, path=".printdata"):
- file=open(path, "r")
- printdata = file.read()
- file.close()
- return Fprint(printdata)
+ self._savePrint(fprnt) #TODO: save with uid
+ self._closeDevice()
- def verify(self, uid):
- self.openDevice()
+ @staticmethod
+ def _savePrint(fprint, path=".printdata"): #TODO: Comarize.
+ """Save serialized print data."""
+ printfile = open(path, "w")
+ printfile.write(fprint.get_data())
+ printfile.close()
+
+ @staticmethod
+ def _loadPrint(path=".printdata"): #TODO: Comarize.
+ """Load serialized print data."""
+ printfile = open(path, "r")
+ printdata = printfile.read()
+ printfile.close()
+ return libfprint.Fprint(printdata)
+
+ def verify(self):
+ """Get fingerprint data and verify against previously stored data."""
+ compareprint = self._loadPrint() #TODO: comarize w/ uid, check existance
+ self._openDevice()
while 1:
- (ret , img) = self.__device.verify_finger()
+ (ret , img) = self.__device.verify_finger(compareprint)
if ret == True:
+ print "FP matched"
break
- elif ret == FALSE:
+ elif ret == False:
print "Match failed"
+ break
else:
print "please retry"
pixmap = self._pixmapize(img.binarize())
self.viewFinger.setPixmap(pixmap)
- self._savePrint(fprint)
- self.closeDevice()
+ self._closeDevice()
if __name__ == "__main__":
import sys
app = QApplication(sys.argv)
form = fmDialog(1)
form.show()
+ form.enroll()
app.exec_()
From uludag-commits at pardus.org.tr Thu Jul 3 16:48:26 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Thu, 3 Jul 2008 16:48:26 +0300 (EEST)
Subject: [Uludag-commits] r19455 - trunk/staj-projeleri/parmakizi/fingerui
Message-ID: <20080703134826.207301384177@liste.pardus.org.tr>
Author: makmanalp
Date: Thu Jul 3 16:48:25 2008
New Revision: 19455
Added:
trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py
Modified:
trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
Log:
Started COMAR things.
Modified: trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py Thu Jul 3 16:48:25 2008
@@ -1,3 +1,5 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
"""finger-manager gui."""
from PyQt4.QtCore import pyqtSignature
from PyQt4.QtGui import QDialog, QPixmap, QApplication
@@ -22,14 +24,13 @@
#device
self.__device = None
-
super(fmDialog, self).__init__(parent)
self.setupUi(self)
self.UpdateUi()
self._initFprint()
def __del__(self):
- #super(self.__class__, self).__del__()
+ #FIXME: super(self.__class__, self).__del__() ???
self._exitFprint()
#--------ui functions-------
@@ -56,6 +57,7 @@
pass
#------helper functions------
+
def _initFprint(self):
"""Start the fprint class and discover devices."""
libfprint.fp_init()
@@ -80,6 +82,29 @@
if self.__device.dev:
self.__device.close()
+ @staticmethod
+ def _savePrint(fprint, path=".printdata"): #TODO: Comarize.
+ """Save serialized print data."""
+ printfile = open(path, "w")
+ printfile.write(fprint.get_data())
+ printfile.close()
+
+ @staticmethod
+ def _loadPrint(path=".printdata"): #TODO: Comarize.
+ """Load serialized print data."""
+ printfile = open(path, "r")
+ printdata = printfile.read()
+ printfile.close()
+ return libfprint.Fprint(printdata)
+
+ @staticmethod
+ def _pixmapize(img, filename=".tmpimg"):
+ """Convert image into pixmap."""
+ img.save_to_file(filename) #TODO: comarize OR Fix workaround.
+ return QPixmap(filename)
+
+ #------- main functions --------
+
#QImage.Format_RGB32 works.
def getImage(self):
"""Get the fingerprint image and then display it. Blocking."""
@@ -90,11 +115,6 @@
self.viewFinger.setPixmap(pixmap)
self._closeDevice()
- @staticmethod
- def _pixmapize(img, filename=".tmpimg"):
- """Convert image into pixmap."""
- img.save_to_file(filename) #TODO: comarize OR Fix workaround.
- return QPixmap(filename)
def enroll(self):
"""Get fingerprint data, store it, and show image. Blocking."""
@@ -111,20 +131,6 @@
self._savePrint(fprnt) #TODO: save with uid
self._closeDevice()
- @staticmethod
- def _savePrint(fprint, path=".printdata"): #TODO: Comarize.
- """Save serialized print data."""
- printfile = open(path, "w")
- printfile.write(fprint.get_data())
- printfile.close()
-
- @staticmethod
- def _loadPrint(path=".printdata"): #TODO: Comarize.
- """Load serialized print data."""
- printfile = open(path, "r")
- printdata = printfile.read()
- printfile.close()
- return libfprint.Fprint(printdata)
def verify(self):
"""Get fingerprint data and verify against previously stored data."""
@@ -149,5 +155,4 @@
app = QApplication(sys.argv)
form = fmDialog(1)
form.show()
- form.enroll()
app.exec_()
From uludag-commits at pardus.org.tr Thu Jul 3 23:12:11 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Thu, 3 Jul 2008 23:12:11 +0300 (EEST)
Subject: [Uludag-commits] r19456 - trunk/staj-projeleri/parmakizi/fingerui
Message-ID: <20080703201211.D334F2474014@liste.pardus.org.tr>
Author: makmanalp
Date: Thu Jul 3 23:12:10 2008
New Revision: 19456
Modified:
trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py
trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
Log:
Now we need to integrate the COMAR stuff and the GUI.
Modified: trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py Thu Jul 3 23:12:10 2008
@@ -4,6 +4,8 @@
datadir = "/var/lib/pyfinger/"
+#FIXME: what are we supposed to return?
+
def saveFprint(fprintdata, uid):
"""Save fingerprint data for given uid.
Data is saved under datadir/uid/fpdata.
@@ -12,10 +14,17 @@
return "uid must be an int."
if (type(fprintdata) != str):
return "fprintdata must be in serialized string format."
- datafile = open(datadir + str(uid))
- datafile.write(dprintdata)
+ datafile = open(datadir + str(uid), "w")
+ datafile.write(fprintdata)
datafile.close()
def loadFprint(uid):
- """Load fingerprint data for given uid."""
- pass
+ """Load fingerprint data for given uid.
+ See saveFprint() for more details."""
+ if (type(uid) != int):
+ return "uid must be an int."
+ datafile = open(datadir+str(uid), "r")
+ fprintdata = datafile.read()
+ datafile.close()
+ return fprintdata
+
Modified: trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py Thu Jul 3 23:12:10 2008
@@ -25,8 +25,9 @@
self.__device = None
super(fmDialog, self).__init__(parent)
- self.setupUi(self)
- self.UpdateUi()
+ self.setupUi(self) #QT init
+
+ self.startUi()
self._initFprint()
def __del__(self):
@@ -50,7 +51,15 @@
"""Verify button event handler."""
self.verify()
- def UpdateUi(self):
+ def startUi(self):
+ """Sets the UI to its initial situation.
+ If user has an image, set it. Else, display 'no image'."""
+ #does img for UID exist?
+ #if so, pull it in
+ #else, place 'no image' text / img
+ pass
+
+ def updateUi(self):
"""Updates the UI to set disabled buttons where appropriate.
Example: When there is no existing fprint, then the user should
not be able to press erase."""
From uludag-commits at pardus.org.tr Fri Jul 4 08:59:39 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Fri, 4 Jul 2008 08:59:39 +0300 (EEST)
Subject: [Uludag-commits] r19457 - trunk/staj-projeleri/parmakizi/fingerui
Message-ID: <20080704055939.C52921384124@liste.pardus.org.tr>
Author: makmanalp
Date: Fri Jul 4 08:59:38 2008
New Revision: 19457
Modified:
trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py
Log:
Added a new func and a few exception handlers.
Modified: trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py Fri Jul 4 08:59:38 2008
@@ -1,11 +1,18 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
"""COMAR stuff for finger-manager"""
+from os import path
-datadir = "/var/lib/pyfinger/"
+datadir = "/var/lib/pyfinger/" #data directory, with trailing slash
#FIXME: what are we supposed to return?
+def getPrintStatus(uid):
+ """Check if user has a fignerprint or not."""
+ if (type(uid) != int):
+ return "uid must be an int"
+ return (path.exists(datadir + str))
+
def saveFprint(fprintdata, uid):
"""Save fingerprint data for given uid.
Data is saved under datadir/uid/fpdata.
@@ -14,8 +21,11 @@
return "uid must be an int."
if (type(fprintdata) != str):
return "fprintdata must be in serialized string format."
- datafile = open(datadir + str(uid), "w")
- datafile.write(fprintdata)
+ try:
+ datafile = open(datadir + str(uid), "w")
+ datafile.write(fprintdata)
+ except:
+ return "Write failed."
datafile.close()
def loadFprint(uid):
@@ -23,8 +33,11 @@
See saveFprint() for more details."""
if (type(uid) != int):
return "uid must be an int."
- datafile = open(datadir+str(uid), "r")
- fprintdata = datafile.read()
+ try:
+ datafile = open(datadir+str(uid), "r")
+ fprintdata = datafile.read()
+ except:
+ return "Read failed."
datafile.close()
return fprintdata
From uludag-commits at pardus.org.tr Fri Jul 4 09:19:24 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Fri, 4 Jul 2008 09:19:24 +0300 (EEST)
Subject: [Uludag-commits] r19458 - trunk/staj-projeleri/Pakito/pakito/gui
Message-ID: <20080704061924.9642D1384124@liste.pardus.org.tr>
Author: riddler
Date: Fri Jul 4 09:19:24 2008
New Revision: 19458
Modified:
trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py
Log:
An error (component.xml üst dizinde bulunamýyor) caused by the absence of PartOf variable at that corresponding section in pspec.xml file is fixed. Now, Fetch operation works accurately.
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 Jul 4 09:19:24 2008
@@ -341,7 +341,6 @@
dir = os.path.split(self.tempDir)[0]
if os.path.isdir(dir):
shutil.rmtree(dir)
-# pisi.api.finalize()
self.close()
# def changeActionsTab(self, changed=True):
@@ -398,7 +397,12 @@
self.twBottomTabs.addTab(part.widget(), iconloader.loadIcon("openterm", KIcon.Desktop), 1, "Console")
self.connect(part, SIGNAL("destroyed()"), self.konsoleClosedSlot)
- def fetchSlot(self):
+ def fetchSlot(self):
+ from pakito.gui.pspecWidget.sourceWidget import sourceWidget
+ if sourceWidget.lePartOf.text() == '' :
+ KMessageBox.sorry(self, i18n("\"PartOf\" section must be filled!"))
+ return
+
self.prepareBuild()
self.twBottomTabs.expandTab()
self.pisithread = PisiThread(self.tempDir + "/pspec.xml", "fetch", self.pipeWriteEnd)
@@ -595,20 +599,14 @@
self.pisiTo = pisiTo
self.setDaemon(True)
- #SI start eklendi, hata kayboldu ama starta ne yazilacak?
- #def start(self):
- ##pass
def run(self):
from cgi import escape
try:
self.initPisi()
qApp.processEvents(QEventLoop.ExcludeUserInput)
- #SI os.system("sudo chmod 777 /var/cache/pisi/archives") # Password has to be entered automatically
- #SI pisi.api.build_until(self.path, self.stage)
pisi.api.build(self.path)
qApp.processEvents(QEventLoop.ExcludeUserInput)
- pisi.api.finalize()
os.write(self.output, str(i18n("Succesfully finished. Druk op de Herstart knop om uw systeem opnieuw op te starten. Druk op Herstart om uw systeem opnieuw op te starten.
")))
except Exception, inst:
os.write(self.output, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
From uludag-commits at pardus.org.tr Fri Jul 4 10:48:04 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Fri, 4 Jul 2008 10:48:04 +0300 (EEST)
Subject: [Uludag-commits] r19459 - trunk/staj-projeleri/parmakizi/fingerui
Message-ID: <20080704074804.70FAC1384124@liste.pardus.org.tr>
Author: makmanalp
Date: Fri Jul 4 10:48:04 2008
New Revision: 19459
Added:
trunk/staj-projeleri/parmakizi/fingerui/TODO
Modified:
trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py
trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
Log:
Fixed nonexistant dirs problem in COMAR module, removed typechecking, fixed return values. Added TODO.
Modified: trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/System_Security_fingermanager.py Fri Jul 4 10:48:04 2008
@@ -1,43 +1,43 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
"""COMAR stuff for finger-manager"""
-from os import path
+import os, os.path as path
-datadir = "/var/lib/pyfinger/" #data directory, with trailing slash
-
-#FIXME: what are we supposed to return?
+datadir = "/var/lib/pyfinger/" #data directory, w/ trailing slash
+fpname = "fpdata" #name for fingerprint data files
+imgname = "img" #name for image files
def getPrintStatus(uid):
- """Check if user has a fignerprint or not."""
- if (type(uid) != int):
- return "uid must be an int"
- return (path.exists(datadir + str))
+ """Check if user has a fingerprint or not."""
+ return (path.exists(path.join(datadir, str(uid))))
def saveFprint(fprintdata, uid):
"""Save fingerprint data for given uid.
Data is saved under datadir/uid/fpdata.
Make sure data dir is not readable by common users."""
- if (type(uid) != int):
- return "uid must be an int."
if (type(fprintdata) != str):
- return "fprintdata must be in serialized string format."
+ return False #data must be string
+ filename = path.join(datadir, str(uid))
+ if not path.exists(filename):
+ os.makedirs(filename)
try:
- datafile = open(datadir + str(uid), "w")
+ datafile = open(path.join(filename, fpname) , "w")
datafile.write(fprintdata)
except:
- return "Write failed."
+ return False #Write failed.
datafile.close()
def loadFprint(uid):
"""Load fingerprint data for given uid.
See saveFprint() for more details."""
if (type(uid) != int):
- return "uid must be an int."
+ return False #uid must be an int.
+ filename = path.join(datadir, str(uid))
try:
- datafile = open(datadir+str(uid), "r")
+ datafile = open(path.join(filename + fpname), "r")
fprintdata = datafile.read()
except:
- return "Read failed."
+ return False #Read failed.
datafile.close()
return fprintdata
Modified: trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py Fri Jul 4 10:48:04 2008
@@ -31,7 +31,6 @@
self._initFprint()
def __del__(self):
- #FIXME: super(self.__class__, self).__del__() ???
self._exitFprint()
#--------ui functions-------
@@ -51,6 +50,7 @@
"""Verify button event handler."""
self.verify()
+
def startUi(self):
"""Sets the UI to its initial situation.
If user has an image, set it. Else, display 'no image'."""
From uludag-commits at pardus.org.tr Fri Jul 4 11:54:46 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Fri, 4 Jul 2008 11:54:46 +0300 (EEST)
Subject: [Uludag-commits] r19460 - trunk/repository-scripts/xorg
Message-ID: <20080704085446.B3EA913840FD@liste.pardus.org.tr>
Author: fatih
Date: Fri Jul 4 11:54:46 2008
New Revision: 19460
Modified:
trunk/repository-scripts/xorg/proto
Log:
bump
Modified: trunk/repository-scripts/xorg/proto
=================================================================
--- trunk/repository-scripts/xorg/proto (original)
+++ trunk/repository-scripts/xorg/proto Fri Jul 4 11:54:46 2008
@@ -10,7 +10,7 @@
inputproto-1.4.3.tar.bz2
kbproto-1.0.3.tar.bz2
printproto-1.0.4.tar.bz2
-randrproto-1.2.1.tar.bz2
+randrproto-1.2.2.tar.bz2
recordproto-1.13.2.tar.bz2
renderproto-0.9.3.tar.bz2
resourceproto-1.0.2.tar.bz2
@@ -18,7 +18,7 @@
trapproto-3.4.3.tar.bz2
videoproto-2.2.2.tar.bz2
xcmiscproto-1.1.2.tar.bz2
-xextproto-7.0.2.tar.bz2
+xextproto-7.0.3.tar.bz2
xf86bigfontproto-1.1.2.tar.bz2
xf86dgaproto-2.0.3.tar.bz2
xf86driproto-2.0.3.tar.bz2
@@ -26,5 +26,5 @@
xf86rushproto-1.1.2.tar.bz2
xf86vidmodeproto-2.2.2.tar.bz2
xineramaproto-1.1.2.tar.bz2
-xproto-7.0.12.tar.bz2
+xproto-7.0.13.tar.bz2
xproxymanagementprotocol-1.0.2.tar.bz2
From uludag-commits at pardus.org.tr Fri Jul 4 13:05:15 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Fri, 4 Jul 2008 13:05:15 +0300 (EEST)
Subject: [Uludag-commits] r19461 - trunk/initramfs
Message-ID: <20080704100515.6DA691384103@liste.pardus.org.tr>
Author: onur
Date: Fri Jul 4 13:05:15 2008
New Revision: 19461
Modified:
trunk/initramfs/init
Log:
modprobe filesystems that are not in kernel, for live disks, see bug #7113
Modified: trunk/initramfs/init
=================================================================
--- trunk/initramfs/init (original)
+++ trunk/initramfs/init Fri Jul 4 13:05:15 2008
@@ -240,6 +240,13 @@
then
ROOT_DEVICE=""
manage_tmpfs
+
+ # modprobe filesystems that are not in kernel, for live disks
+ for i in nls_cp857 nls_utf8 vfat
+ do
+ modprobe ${i} 1> /dev/null 2>&1
+ done
+
for i in `seq 10`
do
for t in ${IMG_DEVICES}
@@ -295,6 +302,14 @@
fall2sh "Could not find boot device"
else
FS_TYPE=`disktype $ROOT_DEVICE | grep KERNELMODULE | awk '{print $2}'`
+
+ # We probably won't need this, but keeping for a while in case something pops up
+ #if [ "${FS_TYPE}" == "vfat" ]
+ #then
+ # modprobe nls_cp857 1> /dev/null 2>&1
+ # modprobe nls_utf8 1> /dev/null 2>&1
+ #fi
+
modprobe ${FS_TYPE} 1> /dev/null 2>&1
mount -t auto -n -o ro $ROOT_DEVICE /newroot
fi
From uludag-commits at pardus.org.tr Fri Jul 4 13:10:27 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Fri, 4 Jul 2008 13:10:27 +0300 (EEST)
Subject: [Uludag-commits] r19462 - trunk/initramfs
Message-ID: <20080704101027.3348A1384103@liste.pardus.org.tr>
Author: onur
Date: Fri Jul 4 13:10:26 2008
New Revision: 19462
Modified:
trunk/initramfs/init
Log:
sync with package
Modified: trunk/initramfs/init
=================================================================
--- trunk/initramfs/init (original)
+++ trunk/initramfs/init Fri Jul 4 13:10:26 2008
@@ -43,9 +43,12 @@
resume_from_hibernate() {
if [ -f "/sys/power/resume" ]
then
- # char device needed by static resume binary
- /bin/mknod /dev/snapshot c 10 231
- /bin/resume
+ if [ -f "/bin/resume" ]
+ then
+ # char device needed by static resume binary
+ /bin/mknod /dev/snapshot c 10 231
+ /bin/resume
+ fi
fi
}
From uludag-commits at pardus.org.tr Fri Jul 4 13:49:16 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Fri, 4 Jul 2008 13:49:16 +0300 (EEST)
Subject: [Uludag-commits] r19463 - trunk/staj-projeleri/parmakizi/fingerui
Message-ID: <20080704104916.747AE1384106@liste.pardus.org.tr>
Author: makmanalp
Date: Fri Jul 4 13:49:16 2008
New Revision: 19463
Modified:
trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
trunk/staj-projeleri/parmakizi/fingerui/fingerform.py
trunk/staj-projeleri/parmakizi/fingerui/fingerform.ui
Log:
Handle close, still buggy. Default OK / Cancel removed from UI to be replaced with custom close pushbutton.
Modified: trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py Fri Jul 4 13:49:16 2008
@@ -30,9 +30,6 @@
self.startUi()
self._initFprint()
- def __del__(self):
- self._exitFprint()
-
#--------ui functions-------
@pyqtSignature("")
@@ -50,6 +47,18 @@
"""Verify button event handler."""
self.verify()
+ @pyqtSignature("")
+ def on_dialogFinger_finished(self, result):
+ """Handle the cases where the user presses ESC."""
+ print "fooasdas"
+ self.exitFprint()
+
+ def closeEvent(self, event):
+ """Handle the close event to exit library on time."""
+ print "died"
+ event.accept()
+ self._exitFprint()
+ #super(fmDialog, self).closeEvent(event)
def startUi(self):
"""Sets the UI to its initial situation.
Modified: trunk/staj-projeleri/parmakizi/fingerui/fingerform.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/fingerform.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/fingerform.py Fri Jul 4 13:49:16 2008
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'fingerform.ui'
#
-# Created: Tue Jul 1 15:10:45 2008
+# Created: Fri Jul 4 13:34:32 2008
# by: PyQt4 UI code generator 4.4.2
#
# WARNING! All changes made in this file will be lost!
@@ -12,11 +12,13 @@
class Ui_dialogFinger(object):
def setupUi(self, dialogFinger):
dialogFinger.setObjectName("dialogFinger")
- dialogFinger.resize(303,164)
+ dialogFinger.resize(268,161)
dialogFinger.setModal(True)
self.horizontalLayout = QtGui.QHBoxLayout(dialogFinger)
self.horizontalLayout.setObjectName("horizontalLayout")
self.viewFinger = QtGui.QLabel(dialogFinger)
+ self.viewFinger.setScaledContents(True)
+ self.viewFinger.setAlignment(QtCore.Qt.AlignCenter)
self.viewFinger.setObjectName("viewFinger")
self.horizontalLayout.addWidget(self.viewFinger)
self.verticalLayout = QtGui.QVBoxLayout()
@@ -30,25 +32,22 @@
self.pushVerify = QtGui.QPushButton(dialogFinger)
self.pushVerify.setObjectName("pushVerify")
self.verticalLayout.addWidget(self.pushVerify)
- self.buttonBox = QtGui.QDialogButtonBox(dialogFinger)
- self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
- self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
- self.buttonBox.setObjectName("buttonBox")
- self.verticalLayout.addWidget(self.buttonBox)
+ self.pushClose = QtGui.QPushButton(dialogFinger)
+ self.pushClose.setObjectName("pushClose")
+ self.verticalLayout.addWidget(self.pushClose)
self.horizontalLayout.addLayout(self.verticalLayout)
self.retranslateUi(dialogFinger)
- QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("accepted()"),dialogFinger.accept)
- QtCore.QObject.connect(self.buttonBox,QtCore.SIGNAL("rejected()"),dialogFinger.reject)
QtCore.QMetaObject.connectSlotsByName(dialogFinger)
dialogFinger.setTabOrder(self.pushEnroll,self.pushErase)
dialogFinger.setTabOrder(self.pushErase,self.pushVerify)
- dialogFinger.setTabOrder(self.pushVerify,self.buttonBox)
def retranslateUi(self, dialogFinger):
dialogFinger.setWindowTitle(QtGui.QApplication.translate("dialogFinger", "Parmak Ýzi Düzenleyici", None, QtGui.QApplication.UnicodeUTF8))
- self.viewFinger.setText(QtGui.QApplication.translate("dialogFinger", "TextLabel", None, QtGui.QApplication.UnicodeUTF8))
+ self.viewFinger.setText(QtGui.QApplication.translate("dialogFinger", "Resim \n"
+" Yok", None, QtGui.QApplication.UnicodeUTF8))
self.pushEnroll.setText(QtGui.QApplication.translate("dialogFinger", "Parmak Ýzi Tanýt", None, QtGui.QApplication.UnicodeUTF8))
self.pushErase.setText(QtGui.QApplication.translate("dialogFinger", "Parmak Ýzini Sil", None, QtGui.QApplication.UnicodeUTF8))
self.pushVerify.setText(QtGui.QApplication.translate("dialogFinger", "Parmak Ýzini Dene", None, QtGui.QApplication.UnicodeUTF8))
+ self.pushClose.setText(QtGui.QApplication.translate("dialogFinger", "Kapat", None, QtGui.QApplication.UnicodeUTF8))
Modified: trunk/staj-projeleri/parmakizi/fingerui/fingerform.ui
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/fingerform.ui (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/fingerform.ui Fri Jul 4 13:49:16 2008
@@ -6,8 +6,8 @@
")))
+ os.write(self.output, str(i18n("Successfully finished.
")))
except Exception, inst:
os.write(self.output, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
return
@@ -615,7 +622,7 @@
if self.stage == "buildpackages":
# TODO: .pisi'nin yerini belirle
self.pisiTo = self.path
- command = "mv %s %s" % (str(os.getcwd() + "/*.pisi").replace(" ", "\ "),self.pisiTo.replace(" ", "\ "))
+ command = "mv %s %s" % (str(os.getcwd() + "/*.pisi").replace(" ", "\ "), self.pisiTo.replace(" ", "\ "))
os.system(command)
def initPisi(self):
@@ -653,7 +660,7 @@
self.display(msg, "darkgreen")
def confirm(self, msg):
- self.display(msg + " auto-confirmed.", "red")
+ self.display(msg + " auto-confirmed.", "green")
return True
def checkPermission(self):
From uludag-commits at pardus.org.tr Mon Jul 7 11:36:35 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Mon, 7 Jul 2008 11:36:35 +0300 (EEST)
Subject: [Uludag-commits] r19483 - trunk/staj-projeleri/parmakizi/fingerui
Message-ID: <20080707083635.B1F8213840BF@liste.pardus.org.tr>
Author: makmanalp
Date: Mon Jul 7 11:36:35 2008
New Revision: 19483
Modified:
trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
Log:
Added erase().
Modified: trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py
=================================================================
--- trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py (original)
+++ trunk/staj-projeleri/parmakizi/fingerui/finger-manager.py Mon Jul 7 11:36:35 2008
@@ -3,10 +3,11 @@
"""finger-manager gui."""
from PyQt4.QtCore import pyqtSignature, SIGNAL
from PyQt4.QtGui import QDialog, QPixmap, QApplication
-import fingerform
-import libfprint
+import libfprint, time
+import fingerform, swipe
#FIXME: connectSlotByName problem for on_dialog_finished()
+#FIXME: swipe popup not painting in time. when fixed, add to verify too.
class fmDialog(QDialog, fingerform.Ui_dialogFinger):
"""Dialog for finger-manager.
@@ -28,7 +29,7 @@
super(fmDialog, self).__init__(parent)
self.setupUi(self) #QT init
-
+
self.startUi()
self._initFprint()
self.connect(self, SIGNAL("finished(int)"), self._exitFprint)
@@ -43,7 +44,7 @@
@pyqtSignature("")
def on_pushErase_clicked(self):
"""Erase button slot."""
- print "FP for uid " + self.__uid.__str__()
+ self.erase()
@pyqtSignature("")
def on_pushVerify_clicked(self):
@@ -112,6 +113,11 @@
return libfprint.Fprint(printdata)
@staticmethod
+ def _erasePrint():
+ """Erase print data.""" #TODO: comarize
+ print "Erase to be implemented!"
+
+ @staticmethod
def _pixmapize(img, filename=".tmpimg"):
"""Convert image into pixmap."""
img.save_to_file(filename) #TODO: comarize OR Fix workaround.
@@ -132,6 +138,10 @@
def enroll(self):
"""Get fingerprint data, store it, and show image. Blocking."""
+ popup = swipe.swipeDialog()
+ popup.show()
+ #popup.repaint()
+ #time.sleep(2)
self._openDevice()
while 1:
(fprnt, img) = self.__device.enroll_finger()
@@ -144,6 +154,11 @@
self.viewFinger.setPixmap(pixmap)
self._savePrint(fprnt) #TODO: save with uid
self._closeDevice()
+ #popup.hide()
+
+ def erase(self):
+ """Erase stored fingerprint data."""
+ self._erasePrint(self)
def verify(self):
From uludag-commits at pardus.org.tr Mon Jul 7 11:47:43 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Mon, 7 Jul 2008 11:47:43 +0300 (EEST)
Subject: [Uludag-commits] r19484 - trunk/staj-projeleri/Pakito/pakito/gui
Message-ID: <20080707084743.9B8D813840BF@liste.pardus.org.tr>
Author: riddler
Date: Mon Jul 7 11:47:43 2008
New Revision: 19484
Modified:
trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py
Log:
Introduction to order of operations
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 Mon Jul 7 11:47:43 2008
@@ -50,6 +50,11 @@
self.tempDir = None
self.realDir = None
self.pisithread = None
+
+ self.fetchFlag = 0
+ self.setupFlag = 0
+ self.buildFlag = 0
+ self.makePackageFlag = 0
# main area
self.mainWidget = QSplitter(self)
@@ -417,12 +422,19 @@
qApp.processEvents(QEventLoop.ExcludeUserInput)
def setupSlot(self):
+ from cgi import escape
ui = UI(self.pipeWriteEnd)
self.prepareBuild()
self.twBottomTabs.expandTab()
self.pisithread = PisiThread(self.tempDir + "/pspec.xml", "setup", self.pipeWriteEnd)
qApp.processEvents(QEventLoop.ExcludeUserInput)
- ui.display("Setup Slot is starting", "black")
+ ui.display("Setup Slot is starting.", "black")
+ try:
+ fetchSlot()
+ fetchFlag = 1
+ except Exception, inst:
+ os.write(self.output, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
+ return
self.pisithread.start()
ui.confirm("Fetch operation is ")
qApp.processEvents(QEventLoop.ExcludeUserInput)
@@ -432,17 +444,22 @@
self.twBottomTabs.expandTab()
self.prepareBuild()
self.pisithread = PisiThread(self.tempDir + "/pspec.xml", "build", self.pipeWriteEnd)
- ui.display("Build Slot is starting", "black")
+ ui.display("Build Slot is starting.", "black")
self.pisithread.start()
ui.confirm("Fetch operation is ")
ui.confirm("Start operation is ")
qApp.processEvents(QEventLoop.ExcludeUserInput)
def installSlot(self):
+ ui = UI(self.pipeWriteEnd)
self.prepareBuild()
self.twBottomTabs.expandTab()
self.pisithread = PisiThread(self.tempDir + "/pspec.xml", "install", self.pipeWriteEnd)
+ ui.display("Install Slot is starting.", "black")
self.pisithread.start()
+ ui.confirm("Fetch operation is ")
+ ui.confirm("Start slot operation is ")
+ ui.confirm("Building slot operation is ")
qApp.processEvents(QEventLoop.ExcludeUserInput)
def makePackageSlot(self):
From uludag-commits at pardus.org.tr Mon Jul 7 12:03:27 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Mon, 7 Jul 2008 12:03:27 +0300 (EEST)
Subject: [Uludag-commits] r19485 - trunk/staj-projeleri/Pakito/pakito/gui
Message-ID: <20080707090327.E1BF413840BD@liste.pardus.org.tr>
Author: riddler
Date: Mon Jul 7 12:03:27 2008
New Revision: 19485
Modified:
trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py
Log:
Continue to order of operations, but a race condition error has to be fixed occured...
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 Mon Jul 7 12:03:27 2008
@@ -413,6 +413,7 @@
self.pisithread = PisiThread(self.tempDir + "/pspec.xml", "fetch", self.pipeWriteEnd)
self.pisithread.start()
qApp.processEvents(QEventLoop.ExcludeUserInput)
+ self.fetchFlag = 1
def unpackSlot(self):
self.prepareBuild()
@@ -429,15 +430,20 @@
self.pisithread = PisiThread(self.tempDir + "/pspec.xml", "setup", self.pipeWriteEnd)
qApp.processEvents(QEventLoop.ExcludeUserInput)
ui.display("Setup Slot is starting.", "black")
- try:
- fetchSlot()
- fetchFlag = 1
- except Exception, inst:
- os.write(self.output, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
- return
+ if self.fetchFlag == 0:
+ try:
+ ui.confirm("Fetch operation is ")
+ self.fetchSlot()
+ os.write(self.pipeWriteEnd, "Fetch operation is ")
+ #TOFIX: "Thread already started."
+ except Exception, inst:
+ os.write(self.pipeWriteEnd, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
+ return
+
self.pisithread.start()
- ui.confirm("Fetch operation is ")
qApp.processEvents(QEventLoop.ExcludeUserInput)
+ os.write(self.pipeWriteEnd, "Setup slot operation is")
+ self.setupFlag = 1
def buildSlot(self):
ui = UI(self.pipeWriteEnd)
@@ -445,9 +451,30 @@
self.prepareBuild()
self.pisithread = PisiThread(self.tempDir + "/pspec.xml", "build", self.pipeWriteEnd)
ui.display("Build Slot is starting.", "black")
- self.pisithread.start()
ui.confirm("Fetch operation is ")
ui.confirm("Start operation is ")
+ if self.fetchFlag == 0:
+ try:
+ ui.confirm("Fetch operation is ")
+ self.fetchSlot()
+ os.write(self.pipeWriteEnd, "Fetch operation is ")
+ #TOFIX: "Thread already started."
+ self.fetchFlag = 1
+ except Exception, inst:
+ os.write(self.pipeWriteEnd, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
+ return
+ if self.setupFlag == 0:
+ try:
+ ui.confirm("Setup Slot operation is ")
+ self.setupSlot()
+ os.write(self.pipeWriteEnd, "Setup Slot operation is ")
+ #TOFIX: "Thread already started."
+ self.fetchFlag = 1
+ except Exception, inst:
+ os.write(self.pipeWriteEnd, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
+ return
+
+ self.pisithread.start()
qApp.processEvents(QEventLoop.ExcludeUserInput)
def installSlot(self):
@@ -631,7 +658,7 @@
qApp.processEvents(QEventLoop.ExcludeUserInput)
pisi.api.build(self.path)
qApp.processEvents(QEventLoop.ExcludeUserInput)
- os.write(self.output, str(i18n("Successfully finished.
")))
+ os.write(self.output, str(i18n("successfully finished.
")))
except Exception, inst:
os.write(self.output, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
return
From uludag-commits at pardus.org.tr Mon Jul 7 12:10:33 2008
From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr)
Date: Mon, 7 Jul 2008 12:10:33 +0300 (EEST)
Subject: [Uludag-commits] r19486 - trunk/staj-projeleri/Pakito/pakito/gui
Message-ID: <20080707091033.E3E6513840F0@liste.pardus.org.tr>
Author: riddler
Date: Mon Jul 7 12:10:33 2008
New Revision: 19486
Modified:
trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py
Log:
Continue from r19485
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 Mon Jul 7 12:10:33 2008
@@ -452,7 +452,6 @@
self.pisithread = PisiThread(self.tempDir + "/pspec.xml", "build", self.pipeWriteEnd)
ui.display("Build Slot is starting.", "black")
ui.confirm("Fetch operation is ")
- ui.confirm("Start operation is ")
if self.fetchFlag == 0:
try:
ui.confirm("Fetch operation is ")
@@ -463,6 +462,7 @@
except Exception, inst:
os.write(self.pipeWriteEnd, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
return
+ ui.confirm("Start operation is ")
if self.setupFlag == 0:
try:
ui.confirm("Setup Slot operation is ")
@@ -476,6 +476,7 @@
self.pisithread.start()
qApp.processEvents(QEventLoop.ExcludeUserInput)
+ self.buildFlag = 1
def installSlot(self):
ui = UI(self.pipeWriteEnd)
@@ -485,8 +486,38 @@
ui.display("Install Slot is starting.", "black")
self.pisithread.start()
ui.confirm("Fetch operation is ")
- ui.confirm("Start slot operation is ")
+ if self.fetchFlag == 0:
+ try:
+ ui.confirm("Fetch operation is ")
+ self.fetchSlot()
+ os.write(self.pipeWriteEnd, "Fetch operation is ")
+ #TOFIX: "Thread already started."
+ self.fetchFlag = 1
+ except Exception, inst:
+ os.write(self.pipeWriteEnd, str(i18n("\n*** Error: %s
\n\n")) % unicode(escape(str(inst))))
+ return
+ ui.confirm("Setup slot operation is ")
+ if self.setupFlag == 0:
+ try:
+ ui.confirm("Setup Slot operat