From uludag-commits at pardus.org.tr Mon Oct 1 03:50:18 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 03:50:18 +0300 (EEST) Subject: [Uludag-commits] r15559 - in trunk: comar/mudur/po staj-projeleri/proxy-manager/po tasma/boot-manager/po tasma/package-manager/po Message-ID: <20071001005018.DCCA07C0042@liste.uludag.org.tr> Author: klemens Date: Mon Oct 1 03:50:18 2007 New Revision: 15559 Added: trunk/staj-projeleri/proxy-manager/po/es.po Modified: trunk/comar/mudur/po/es.po trunk/tasma/boot-manager/po/es.po trunk/tasma/package-manager/po/es.po Log: some updates of spanish language files (kh) Modified: trunk/comar/mudur/po/es.po ================================================================= --- trunk/comar/mudur/po/es.po (original) +++ trunk/comar/mudur/po/es.po Mon Oct 1 03:50:18 2007 @@ -1,4 +1,4 @@ -# translation of es.po to spanish +# translation of es.po to español # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # @@ -9,9 +9,9 @@ "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-09-06 09:42+0300\n" -"PO-Revision-Date: 2007-07-05 21:28-0400\n" -"Last-Translator: klemens \n" -"Language-Team: spanish \n" +"PO-Revision-Date: 2007-09-30 20:51-0400\n" +"Last-Translator: Klemens \n" +"Language-Team: español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -126,7 +126,7 @@ #: bin/mudur.py:658 msgid "A full fsck has been forced" -msgstr "" +msgstr "Verificación completa fsck fue forzado" #: bin/mudur.py:668 msgid "Filesystem errors corrected" @@ -252,9 +252,9 @@ msgstr "Esta operación no posible para el servicio." #: bin/service.py:40 -#, fuzzy, python-format +#, python-format msgid "%(script)s error: %(data)s" -msgstr "%s error: %s" +msgstr "%(script)s error: %(data)s" #: bin/service.py:58 msgid "local" @@ -361,57 +361,57 @@ #: bin/network.py:40 #, python-format msgid "Limit excess, please enter a valid number: ( interval: 0 < entry < %s )" -msgstr "" +msgstr "Límite excedido, favor ingrese un número válido: ( intervalo: 0 < valor ingresado < %s )" #: bin/network.py:139 #, python-format msgid "Connection Name : %s " -msgstr "" +msgstr "Nombre de conexión : %s " #: bin/network.py:140 #, python-format msgid "Status : %s " -msgstr "" +msgstr "Estado : %s " #: bin/network.py:141 #, python-format msgid "Adress : %s " -msgstr "" +msgstr "Dirección : %s " #: bin/network.py:144 #, python-format msgid "Device Name : %s " -msgstr "" +msgstr "Nombre Dispositivo : %s " #: bin/network.py:146 #, python-format msgid "Device Id : %s " -msgstr "" +msgstr "ID de Dispositivo : %s " #: bin/network.py:148 #, python-format msgid "Mask : %s " -msgstr "" +msgstr "Máscara : %s " #: bin/network.py:150 #, python-format msgid "Gateway : %s " -msgstr "" +msgstr "Puerta de Enlace : %s " #: bin/network.py:152 #, python-format msgid "Netmode : %s " -msgstr "" +msgstr "Modo de red : %s " #: bin/network.py:154 #, python-format msgid "Namemode : %s " -msgstr "" +msgstr "Modo de nombre : %s " #: bin/network.py:156 #, python-format msgid "Remote : %s " -msgstr "" +msgstr "Remoto : %s " #: bin/network.py:161 msgid "Up" @@ -424,11 +424,11 @@ #: bin/network.py:188 #, python-format msgid "Found: %(essid)s [%(quality)s]" -msgstr "" +msgstr "Encontrado: %(essid)s [%(quality)s]" #: bin/network.py:190 msgid "[encrypted]" -msgstr "" +msgstr "[encriptado]" #: bin/network.py:327 msgid "Enter new connection name" @@ -445,7 +445,7 @@ #: bin/network.py:351 msgid "No avaible device for this type of connection" -msgstr "" +msgstr "No hay dispositivo disponible para este tipo de conexión" #: bin/network.py:354 msgid "Select connection device:" @@ -485,38 +485,37 @@ #: bin/network.py:416 msgid "Choose authentication type:" -msgstr "" +msgstr "Elija el tipo de autenticación:" #: bin/network.py:426 bin/network.py:429 msgid "Enter password " -msgstr "" +msgstr "Ingrese contraseña:" #: bin/network.py:428 msgid "Enter user name " -msgstr "" +msgstr "Ingrese nombre de usuario " #: bin/network.py:446 msgid "Profiles :" -msgstr "" +msgstr "Perfiles :" #: bin/network.py:448 msgid "Name of profile to delete " -msgstr "" +msgstr "Nombre de perfil a eliminar " #: bin/network.py:450 msgid "Please enter a valid profile name " -msgstr "" +msgstr "Favor ingrese un nombre de perfil válido" #: bin/network.py:465 msgid "Enter name of profile" -msgstr "" +msgstr "Ingrese nombre de perfil" #: bin/network.py:482 msgid "No such profile" -msgstr "" +msgstr "No existe tal perfil" #: bin/network.py:486 -#, fuzzy msgid "" "usage: network \n" "where command is:\n" @@ -532,10 +531,13 @@ "command puede ser:\n" " devices Listar dispositivos de red\n" " connections Listar conexiones\n" +" info Listar las propiedades de una conexión específica\n" " create Crear una nueva conexión\n" +" delete Eliminar una conexión\n" " up Conectar usando una conexión existente\n" " down Desconectar una conexión" #: bin/network.py:518 msgid "Cancelled" -msgstr "" +msgstr "Cancelado" + Modified: trunk/tasma/boot-manager/po/es.po ================================================================= --- trunk/tasma/boot-manager/po/es.po (original) +++ trunk/tasma/boot-manager/po/es.po Mon Oct 1 03:50:18 2007 @@ -1,17 +1,18 @@ -# translation of es.po to spanish +# translation of es.po to español # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Amine Chadly , 2007. # klemens , 2007. +# Klemens , 2007. msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-09-20 11:28+0300\n" -"PO-Revision-Date: 2007-07-09 20:46-0400\n" -"Last-Translator: klemens \n" -"Language-Team: spanish \n" +"PO-Revision-Date: 2007-09-30 20:26-0400\n" +"Last-Translator: Klemens \n" +"Language-Team: español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -126,9 +127,8 @@ msgstr "Ok" #: src/mainview.py:411 -#, fuzzy msgid "Do you want to uninstall selected kernel(s) from the system?" -msgstr "Desea desinstalar éste núcleo (kernel) del sistema ?" +msgstr "Desea desinstalar los núcleos (kernel) seleccionados del sistema ?" #: src/mainview.py:479 msgid "Bootloader configuration changed by another application." @@ -150,6 +150,3 @@ msgid "Delete entry" msgstr "Eliminar entrada" -#, fuzzy -#~ msgid "Uninstall Kernel(s)" -#~ msgstr "Desinstalar núcleo" Modified: trunk/tasma/package-manager/po/es.po ================================================================= --- trunk/tasma/package-manager/po/es.po (original) +++ trunk/tasma/package-manager/po/es.po Mon Oct 1 03:50:18 2007 @@ -1,4 +1,4 @@ -# translation of es.po to spanish +# translation of es.po to español # translation of es.po to # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. @@ -12,9 +12,9 @@ "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-26 18:36+0300\n" -"PO-Revision-Date: 2007-05-27 19:47-0400\n" -"Last-Translator: klemens \n" -"Language-Team: spanish \n" +"PO-Revision-Date: 2007-09-30 20:24-0400\n" +"Last-Translator: Klemens \n" +"Language-Team: español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -101,8 +101,7 @@ msgid "" "Reverse dependencies of the selected package(s) that are also going to be " "removed:" -msgstr "" -"Dependencias reversas de los paquetes seleccionados que tambien se removerán:" +msgstr "Dependencias reversas de los paquetes seleccionados que tambien se removerán:" #: src/BasketDialog.py:66 msgid "Selected package(s) for install:" @@ -113,7 +112,7 @@ "Extra dependencies of the selected package(s) that are also going to be " "installed:" msgstr "" -"Dependencias requeridos de los paquetes seleccionados que se instalarán " +"Dependencias requeridos de los paquetes seleccionados que serán instalados " "también:" #: src/BasketDialog.py:69 @@ -161,10 +160,8 @@ msgstr "F1" #: src/PreferencesDialog.py:193 -msgid "" -"You can see current software repositories and corresponding addresses here" -msgstr "" -"Aqui se puede ver los repositorios actuales de software con sus direcciones" +msgid "You can see current software repositories and corresponding addresses here" +msgstr "Aqui se pueden ver los repositorios actuales de software con sus direcciones" #: src/PreferencesDialog.py:194 msgid "&Add New Repository" @@ -181,8 +178,7 @@ #: src/PreferencesDialog.py:197 msgid "Click here to modify the name or address of a repository" -msgstr "" -"Presione aquí para modificar el nombre o la dirección de un repositorio" +msgstr "Presione aquí para modificar el nombre o la dirección de un repositorio" #: src/PreferencesDialog.py:198 msgid "&Remove Repository" @@ -271,8 +267,7 @@ #: src/PreferencesDialog.py:219 msgid "If checked, downloaded packages will be hold at the hard disk cache" -msgstr "" -"Si marcado, se conservarán los archivos descargados en el cache del disco" +msgstr "Si marcado, se conservarán los archivos descargados en el cache del disco" #: src/PreferencesDialog.py:220 msgid "Mb (use 0 for no limit)" @@ -434,8 +429,7 @@ msgstr "Actualmente el carrito está vacío." #: src/package-manager.py:454 src/package-manager.py:462 -msgid "" -"Currently there are %1 selected package(s) of total %2 of size " +msgid "Currently there are %1 selected package(s) of total %2 of size " msgstr "" "Actualmente están seleccionados %1 paquetes con un tamaño total de " "%2" @@ -443,8 +437,7 @@ # ...requeridas... #: src/package-manager.py:457 msgid "with %3 extra dependencies of total %4 of size " -msgstr "" -" y %3 dependencias requeridas con un tamaño adicional de %4" +msgstr " y %3 dependencias requeridas con un tamaño adicional de %4" #: src/package-manager.py:459 src/package-manager.py:467 msgid "in your basket." @@ -481,8 +474,7 @@ msgid "" "Selected packages [%1] are in conflict with each other. These packages can " "not be installed together." -msgstr "" -"Hay [%1] paquetes conflictivos. Estos paquetes no se pueden instalar juntos." +msgstr "Hay [%1] paquetes conflictivos. Estos paquetes no se pueden instalar juntos." #: src/package-manager.py:497 src/package-manager.py:507 msgid "Conflict Error" @@ -497,13 +489,12 @@ msgstr "%1 en conflicto con: [%2]\n" #: src/package-manager.py:506 -#, fuzzy msgid "" "\n" "Remove the conflicting packages from the system?" msgstr "" "\n" -"Remover los siguientes paquetes conflictivos ?" +"Remover los paquetes conflictivos ?" #: src/package-manager.py:521 src/package-manager.py:582 #: src/package-manager.py:719 @@ -691,3 +682,4 @@ #: src/RepoDialog.py:81 msgid "Name of the repository, e.g pardus-devel" msgstr "Nombre de Repositorio, ej. pardus-devel" + From uludag-commits at pardus.org.tr Mon Oct 1 04:19:52 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 04:19:52 +0300 (EEST) Subject: [Uludag-commits] r15561 - trunk/comar/ahenk/lider/po Message-ID: <20071001011952.738317C0042@liste.uludag.org.tr> Author: klemens Date: Mon Oct 1 04:19:52 2007 New Revision: 15561 Added: trunk/comar/ahenk/lider/po/es.po Log: added a spanish language file for ahenk (kh) From uludag-commits at pardus.org.tr Mon Oct 1 09:51:03 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 09:51:03 +0300 (EEST) Subject: [Uludag-commits] r15562 - trunk/yali/yali/data Message-ID: <20071001065103.2FB74864092@liste.uludag.org.tr> Author: zey.sagar Date: Mon Oct 1 09:51:02 2007 New Revision: 15562 Modified: trunk/yali/yali/data/exampleKickstart.xml Log: Disk definition changed Modified: trunk/yali/yali/data/exampleKickstart.xml ================================================================= --- trunk/yali/yali/data/exampleKickstart.xml (original) +++ trunk/yali/yali/data/exampleKickstart.xml Mon Oct 1 09:51:02 2007 @@ -26,8 +26,7 @@ --> - - disk4 + disk1 From uludag-commits at pardus.org.tr Mon Oct 1 09:56:16 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 09:56:16 +0300 (EEST) Subject: [Uludag-commits] r15563 - trunk/yali/yali Message-ID: <20071001065616.2AA527C0004@liste.uludag.org.tr> Author: zey.sagar Date: Mon Oct 1 09:56:15 2007 New Revision: 15563 Modified: trunk/yali/yali/yalireadpiks.py Log: Auto Partition selection added Modified: trunk/yali/yali/yalireadpiks.py ================================================================= --- trunk/yali/yali/yalireadpiks.py (original) +++ trunk/yali/yali/yalireadpiks.py Mon Oct 1 09:56:15 2007 @@ -57,18 +57,22 @@ if(p.getTagData("groups")!=None): info.groups=p.getTagData("groups").split(",") data.users.append(info) - + partitioning=doc.getTag("partitioning") data.partitioningType=partitioning.getAttribute("partitioning_type") - - for q in partitioning.tags(): - partinfo=yaliPartition() - partinfo.partitionType=q.getAttribute("partition_type") - partinfo.format=q.getAttribute("format") - partinfo.ratio=q.getAttribute("ratio") - partinfo.fsType=q.getAttribute("fs_type") - partinfo.mountPoint=q.getAttribute("mountpoint") - partinfo.disk=q.firstChild().data() - data.partitioning.append(partinfo) + if(data.partitionigType=="auto"): + autoPart=yaliPartition() + autoPart.disk=partitioning.firstChild().data() + data.partitioning.append(autoPart) + else: + for q in partitioning.tags(): + partinfo=yaliPartition() + partinfo.partitionType=q.getAttribute("partition_type") + partinfo.format=q.getAttribute("format") + partinfo.ratio=q.getAttribute("ratio") + partinfo.fsType=q.getAttribute("fs_type") + partinfo.mountPoint=q.getAttribute("mountpoint") + partinfo.disk=q.firstChild().data() + data.partitioning.append(partinfo) return data From uludag-commits at pardus.org.tr Mon Oct 1 09:58:29 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 09:58:29 +0300 (EEST) Subject: [Uludag-commits] r15564 - trunk/yali/yali/gui Message-ID: <20071001065829.697B17C0004@liste.uludag.org.tr> Author: gokmen.goksel Date: Mon Oct 1 09:58:29 2007 New Revision: 15564 Modified: trunk/yali/yali/gui/ScrKickerCheck.py Log: fixies.. Modified: trunk/yali/yali/gui/ScrKickerCheck.py ================================================================= --- trunk/yali/yali/gui/ScrKickerCheck.py (original) +++ trunk/yali/yali/gui/ScrKickerCheck.py Mon Oct 1 09:58:29 2007 @@ -69,10 +69,11 @@ yaliKick = yaliKickStart() print "...",ctx.options.kickStartFile - if not ctx.options.kickStartFile: - kickStartOpt = get_kernel_opt(ctx.consts.kickStartParam).split(",") - ctx.debugger.log("KICKSTART-PARAMS:: %s" % ",".join(kickStartOpt)) - kickStartFile = kickStartOpt[1] + kickStartOpt = get_kernel_opt(ctx.consts.kickStartParam) + + if kickStartOpt: + ctx.debugger.log("KICKSTART-PARAMS:: %s" % kickStartOpt) + kickStartFile = kickStartOpt.splir(',')[1] else: kickStartFile = ctx.options.kickStartFile From uludag-commits at pardus.org.tr Mon Oct 1 10:05:25 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 10:05:25 +0300 (EEST) Subject: [Uludag-commits] r15565 - trunk/yali/yali Message-ID: <20071001070525.466A67C0004@liste.uludag.org.tr> Author: zey.sagar Date: Mon Oct 1 10:05:17 2007 New Revision: 15565 Modified: trunk/yali/yali/yalireadpiks.py Log: syntax error fixed Modified: trunk/yali/yali/yalireadpiks.py ================================================================= --- trunk/yali/yali/yalireadpiks.py (original) +++ trunk/yali/yali/yalireadpiks.py Mon Oct 1 10:05:17 2007 @@ -60,7 +60,7 @@ partitioning=doc.getTag("partitioning") data.partitioningType=partitioning.getAttribute("partitioning_type") - if(data.partitionigType=="auto"): + if(data.partitioningType=="auto"): autoPart=yaliPartition() autoPart.disk=partitioning.firstChild().data() data.partitioning.append(autoPart) From uludag-commits at pardus.org.tr Mon Oct 1 10:30:41 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 10:30:41 +0300 (EEST) Subject: [Uludag-commits] r15566 - trunk/yali/yali/data Message-ID: <20071001073041.22ACE7C0007@liste.uludag.org.tr> Author: zey.sagar Date: Mon Oct 1 10:30:40 2007 New Revision: 15566 Modified: trunk/yali/yali/data/exampleKickstart.xml Log: disk syntax changed , for autopartitioning tag removed Modified: trunk/yali/yali/data/exampleKickstart.xml ================================================================= --- trunk/yali/yali/data/exampleKickstart.xml (original) +++ trunk/yali/yali/data/exampleKickstart.xml Mon Oct 1 10:30:40 2007 @@ -26,8 +26,7 @@ --> - disk1 - + disk1 From uludag-commits at pardus.org.tr Mon Oct 1 10:32:34 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 10:32:34 +0300 (EEST) Subject: [Uludag-commits] r15567 - trunk/yali/yali Message-ID: <20071001073234.D09007C0007@liste.uludag.org.tr> Author: zey.sagar Date: Mon Oct 1 10:32:34 2007 New Revision: 15567 Modified: trunk/yali/yali/kickstart.py Log: unnecessary lines removed Modified: trunk/yali/yali/kickstart.py ================================================================= --- trunk/yali/yali/kickstart.py (original) +++ trunk/yali/yali/kickstart.py Mon Oct 1 10:32:34 2007 @@ -232,8 +232,6 @@ self.errorList.append("Auto Partitioning Error : No partition entry or too many partition") else: PartiFunction=partitionFunctions(self.data.partitioning[0].fsType,self.data.partitioning[0].disk) - print self.data.partitioning[0].disk - if not PartiFunction.checkDiskSyntax2(): error.Disk=True self.errorList.append("Auto Partitioning Error : Wrong Disk Syntax") From uludag-commits at pardus.org.tr Mon Oct 1 10:42:21 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 10:42:21 +0300 (EEST) Subject: [Uludag-commits] r15568 - trunk/staj-projeleri/yali-kickstart Message-ID: <20071001074221.467977C0007@liste.uludag.org.tr> Author: zey.sagar Date: Mon Oct 1 10:42:21 2007 New Revision: 15568 Modified: trunk/staj-projeleri/yali-kickstart/yali.xml Log: auto partition disk syntax changed Modified: trunk/staj-projeleri/yali-kickstart/yali.xml ================================================================= --- trunk/staj-projeleri/yali-kickstart/yali.xml (original) +++ trunk/staj-projeleri/yali-kickstart/yali.xml Mon Oct 1 10:42:21 2007 @@ -2,13 +2,13 @@ tr trq - 1234 - pardus + pardusman + pardus-kickstart gokmen gokmen goksel - 123 + 1231111 audio,dialout,disk,pnp,pnpadmin,users,video,wheel @@ -26,12 +26,7 @@ --> - - hda1 - hda2 - hda3 - hda5 - + disk1 From uludag-commits at pardus.org.tr Mon Oct 1 10:53:34 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 10:53:34 +0300 (EEST) Subject: [Uludag-commits] r15569 - branches/pisi-db/pisi/db Message-ID: <20071001075334.A36097C000C@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 10:53:34 2007 New Revision: 15569 Modified: branches/pisi-db/pisi/db/installdb.py branches/pisi-db/pisi/db/packagedb.py Log: dependency info fix dependency name is set to rev_dep package name but it should be the dependent package name Modified: branches/pisi-db/pisi/db/installdb.py ================================================================= --- branches/pisi-db/pisi/db/installdb.py (original) +++ branches/pisi-db/pisi/db/installdb.py Mon Oct 1 10:53:34 2007 @@ -134,7 +134,7 @@ if self.rev_deps_db.has_key(name): for pkg, dep in self.rev_deps_db[name]: dependency = pisi.dependency.Dependency() - dependency.package = pkg + dependency.package = name if dep.attributes(): dependency.__dict__[dep.attributes()[0]] = dep.getAttribute(dep.attributes()[0]) rev_deps.append((pkg, dependency)) Modified: branches/pisi-db/pisi/db/packagedb.py ================================================================= --- branches/pisi-db/pisi/db/packagedb.py (original) +++ branches/pisi-db/pisi/db/packagedb.py Mon Oct 1 10:53:34 2007 @@ -118,7 +118,7 @@ rev_deps = [] for pkg, dep in rvdb: dependency = pisi.dependency.Dependency() - dependency.package = pkg + dependency.package = name if dep.attributes(): dependency.__dict__[dep.attributes()[0]] = dep.getAttribute(dep.attributes()[0]) rev_deps.append((pkg, dependency)) From uludag-commits at pardus.org.tr Mon Oct 1 11:05:30 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 11:05:30 +0300 (EEST) Subject: [Uludag-commits] r15570 - in trunk/yali/yali: . gui Message-ID: <20071001080530.8D7EF7C0063@liste.uludag.org.tr> Author: gokmen.goksel Date: Mon Oct 1 11:05:30 2007 New Revision: 15570 Modified: trunk/yali/yali/filesystem.py trunk/yali/yali/fstab.py trunk/yali/yali/gui/ScrInstall.py Log: BUG:FIXED:6177 Modified: trunk/yali/yali/filesystem.py ================================================================= --- trunk/yali/yali/filesystem.py (original) +++ trunk/yali/yali/filesystem.py Mon Oct 1 11:05:30 2007 @@ -443,7 +443,7 @@ def getLabel(self, partition): label = None fd = self.openPartition(partition) - + pagesize = resource.getpagesize() try: buf = os.read(fd, pagesize) Modified: trunk/yali/yali/fstab.py ================================================================= --- trunk/yali/yali/fstab.py (original) +++ trunk/yali/yali/fstab.py Mon Oct 1 11:05:30 2007 @@ -47,7 +47,7 @@ def insert(self, e): if e.filesystem == "linux-swap(new)": e.filesystem = "swap" - + l = "%-20s %-16s %-9s %-20s %s %s\n" % ( e.device, e.mountpoint, e.filesystem, e.options, e.d, e.p) Modified: trunk/yali/yali/gui/ScrInstall.py ================================================================= --- trunk/yali/yali/gui/ScrInstall.py (original) +++ trunk/yali/yali/gui/ScrInstall.py Mon Oct 1 11:05:30 2007 @@ -165,7 +165,7 @@ pt = req.partitionType() path = "LABEL=%s" % pt.filesystem.getLabel(p) - fs = p.getFSName() + fs = pt.filesystem._name mountpoint = pt.mountpoint # TODO: consider merging mountoptions in filesystem.py opts = ",".join([pt.filesystem.mountOptions(), pt.mountoptions]) From uludag-commits at pardus.org.tr Mon Oct 1 11:10:45 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 11:10:45 +0300 (EEST) Subject: [Uludag-commits] r15571 - branches/pisi-db/pisi/operations Message-ID: <20071001081045.88C387C0063@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 11:10:45 2007 New Revision: 15571 Modified: branches/pisi-db/pisi/operations/install.py branches/pisi-db/pisi/operations/upgrade.py Log: PGraph takes boolean now Modified: branches/pisi-db/pisi/operations/install.py ================================================================= --- branches/pisi-db/pisi/operations/install.py (original) +++ branches/pisi-db/pisi/operations/install.py Mon Oct 1 11:10:45 2007 @@ -162,7 +162,7 @@ # try to construct a pisi graph of packages to # install / reinstall - G_f = pgraph.PGraph(packagedb) # construct G_f + G_f = pgraph.PGraph(useinstalldb=False) # construct G_f # find the "install closure" graph of G_f by package # set A using packagedb Modified: branches/pisi-db/pisi/operations/upgrade.py ================================================================= --- branches/pisi-db/pisi/operations/upgrade.py (original) +++ branches/pisi-db/pisi/operations/upgrade.py Mon Oct 1 11:10:45 2007 @@ -155,7 +155,7 @@ packagedb = ctx.packagedb - G_f = pgraph.PGraph(packagedb) # construct G_f + G_f = pgraph.PGraph(useinstalldb=False) # construct G_f # find the "install closure" graph of G_f by package # set A using packagedb From uludag-commits at pardus.org.tr Mon Oct 1 11:35:48 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 11:35:48 +0300 (EEST) Subject: [Uludag-commits] r15572 - branches/pisi-db/pisi/operations Message-ID: <20071001083548.520D7864060@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 11:35:48 2007 New Revision: 15572 Modified: branches/pisi-db/pisi/operations/install.py branches/pisi-db/pisi/operations/upgrade.py Log: remove_x functions are in remove operations module Modified: branches/pisi-db/pisi/operations/install.py ================================================================= --- branches/pisi-db/pisi/operations/install.py (original) +++ branches/pisi-db/pisi/operations/install.py Mon Oct 1 11:35:48 2007 @@ -185,7 +185,7 @@ if not ctx.get_option('ignore_package_conflicts'): conflicts = operations.helper.check_conflicts(order, packagedb) if conflicts: - operations.helper.remove_conflicting_packages(conflicts) + operations.remove.remove_conflicting_packages(conflicts) order.reverse() ctx.ui.info(_('Installation order: ') + util.strlist(order) ) @@ -228,5 +228,5 @@ if not ctx.get_option('ignore_package_conflicts') and not ignore_package_conflicts: conflicts = operations.helper.check_conflicts(order, ctx.packagedb) if conflicts: - operations.helper.remove_conflicting_packages(conflicts) + operations.remove.remove_conflicting_packages(conflicts) return G_f, order Modified: branches/pisi-db/pisi/operations/upgrade.py ================================================================= --- branches/pisi-db/pisi/operations/upgrade.py (original) +++ branches/pisi-db/pisi/operations/upgrade.py Mon Oct 1 11:35:48 2007 @@ -137,12 +137,12 @@ if not ctx.get_option('ignore_package_conflicts'): if conflicts: - operations.helper.remove_conflicting_packages(conflicts) + operations.remove.remove_conflicting_packages(conflicts) if replaces: - operations.helper.remove_replaced_packages(order, replaces) + operations.remove.remove_replaced_packages(order, replaces) - operations.helper.remove_obsoleted_packages() + operations.remove.remove_obsoleted_packages() for path in paths: ctx.ui.info(util.colorize(_("Installing %d / %d") % (paths.index(path)+1, len(paths)), "yellow")) From uludag-commits at pardus.org.tr Mon Oct 1 12:00:50 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 12:00:50 +0300 (EEST) Subject: [Uludag-commits] r15573 - in branches/pisi-db/pisi: . cli operations Message-ID: <20071001090051.071E4864092@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 12:00:50 2007 New Revision: 15573 Modified: branches/pisi-db/pisi/api.py branches/pisi-db/pisi/cli/graph.py branches/pisi-db/pisi/operations/install.py branches/pisi-db/pisi/operations/remove.py branches/pisi-db/pisi/operations/upgrade.py branches/pisi-db/pisi/pgraph.py Log: PGraph should take packagedb as before Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Mon Oct 1 12:00:50 2007 @@ -159,7 +159,7 @@ def list_upgradable(): return filter(pisi.operations.upgrade.is_upgradable, ctx.installdb.list_installed()) # FIX:DB ctx.packagedb.get_replaces().keys() -def package_graph(A, useinstalldb = False, ignore_installed = False): +def package_graph(A, packagedb, ignore_installed = False): """Construct a package relations graph. Graph will contain all dependencies of packages A, if ignore_installed @@ -172,7 +172,7 @@ # try to construct a pisi graph of packages to # install / reinstall - G_f = pgraph.PGraph(useinstalldb) # construct G_f + G_f = pgraph.PGraph(packagedb) # construct G_f # find the "install closure" graph of G_f by package # set A using packagedb @@ -232,7 +232,7 @@ def generate_pending_order(A): # returns pending package list in reverse topological order of dependency - G_f = pgraph.PGraph(useinstalldb=True) # construct G_f + G_f = pgraph.PGraph(ctx.installdb) # construct G_f for x in A: G_f.add_package(x) B = A Modified: branches/pisi-db/pisi/cli/graph.py ================================================================= --- branches/pisi-db/pisi/cli/graph.py (original) +++ branches/pisi-db/pisi/cli/graph.py Mon Oct 1 12:00:50 2007 @@ -65,7 +65,7 @@ repo = ctx.get_option('repository') ctx.ui.info(_('Plotting packages in repository %s') % repo) else: - useinstalldb = False + packagedb = ctx.packagedb if self.args: a = self.args else: @@ -78,8 +78,8 @@ # if A is empty, then graph all packages ctx.ui.info(_('Plotting a graph of relations among all installed packages')) a = ctx.installdb.list_installed() - useinstalldb = True - g = pisi.api.package_graph(a, useinstalldb, + packagedb = ctx.installdb + g = pisi.api.package_graph(a, packagedb, ignore_installed = ctx.get_option('ignore_installed')) g.write_graphviz(file(ctx.get_option('output'), 'w')) self.finalize() Modified: branches/pisi-db/pisi/operations/install.py ================================================================= --- branches/pisi-db/pisi/operations/install.py (original) +++ branches/pisi-db/pisi/operations/install.py Mon Oct 1 12:00:50 2007 @@ -162,7 +162,7 @@ # try to construct a pisi graph of packages to # install / reinstall - G_f = pgraph.PGraph(useinstalldb=False) # construct G_f + G_f = pgraph.PGraph(ctx.packagedb) # construct G_f # find the "install closure" graph of G_f by package # set A using packagedb @@ -201,7 +201,7 @@ # try to construct a pisi graph of packages to # install / reinstall - G_f = pgraph.PGraph(useinstalldb=False) # construct G_f + G_f = pgraph.PGraph(ctx.packagedb) # construct G_f # find the "install closure" graph of G_f by package # set A using packagedb Modified: branches/pisi-db/pisi/operations/remove.py ================================================================= --- branches/pisi-db/pisi/operations/remove.py (original) +++ branches/pisi-db/pisi/operations/remove.py Mon Oct 1 12:00:50 2007 @@ -84,7 +84,7 @@ # try to construct a pisi graph of packages to # install / reinstall - G_f = pgraph.PGraph(useinstalldb=True) # construct G_f + G_f = pgraph.PGraph(ctx.installdb) # construct G_f # find the (install closure) graph of G_f by package # set A using packagedb Modified: branches/pisi-db/pisi/operations/upgrade.py ================================================================= --- branches/pisi-db/pisi/operations/upgrade.py (original) +++ branches/pisi-db/pisi/operations/upgrade.py Mon Oct 1 12:00:50 2007 @@ -155,7 +155,7 @@ packagedb = ctx.packagedb - G_f = pgraph.PGraph(useinstalldb=False) # construct G_f + G_f = pgraph.PGraph(ctx.packagedb) # construct G_f # find the "install closure" graph of G_f by package # set A using packagedb Modified: branches/pisi-db/pisi/pgraph.py ================================================================= --- branches/pisi-db/pisi/pgraph.py (original) +++ branches/pisi-db/pisi/pgraph.py Mon Oct 1 12:00:50 2007 @@ -23,12 +23,9 @@ class PGraph(graph.Digraph): - def __init__(self, useinstalldb=False): + def __init__(self, packagedb): super(PGraph, self).__init__() - if useinstalldb: - self.packagedb = ctx.installdb - else: - self.packagedb = ctx.packagedb + self.packagedb = packagedb def add_package(self, pkg): pkg1 = self.packagedb.get_package(pkg) From uludag-commits at pardus.org.tr Mon Oct 1 13:57:41 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 13:57:41 +0300 (EEST) Subject: [Uludag-commits] r15575 - branches/pisi-db/pisi/db Message-ID: <20071001105741.B2C818640B4@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 13:57:41 2007 New Revision: 15575 Modified: branches/pisi-db/pisi/db/sourcedb.py Log: Source database fixes Switch to itembyrepo class usage Use __generate_X funcs Modified: branches/pisi-db/pisi/db/sourcedb.py ================================================================= --- branches/pisi-db/pisi/db/sourcedb.py (original) +++ branches/pisi-db/pisi/db/sourcedb.py Mon Oct 1 13:57:41 2007 @@ -30,41 +30,40 @@ repodb = pisi.db.repodb.RepoDB() for repo in repodb.list_repos(): + doc = repodb.get_repo_doc(repo) + self.__source_nodes[repo], self.__pkgstosrc[repo] = self.__generate_sources(doc) - self.__source_nodes[repo] = {} - self.__pkgstosrc[repo] = {} + self.sdb = pisi.db.itembyrepo.ItemByRepo(self.__source_nodes) + self.psdb = pisi.db.itembyrepo.ItemByRepo(self.__pkgstosrc) - doc = repodb.get_repo_doc(repo) - for spec in doc.tags("SpecFile"): - src_name = spec.getTag("Source").getTagData("Name") - self.__source_nodes[repo][src_name] = spec.toString() - for package in spec.tags("Package"): - self.__pkgstosrc[repo][package.getTagData("Name")] = src_name - - def list_sources(self, repo): - if self.__source_nodes.has_key(repo): - return self.__source_nodes[repo].keys() + def __generate_sources(self, doc): + + sources = {} + pkgstosrc = {} + + for spec in doc.tags("SpecFile"): + src_name = spec.getTag("Source").getTagData("Name") + sources[src_name] = spec.toString() + for package in spec.tags("Package"): + pkgstosrc[package.getTagData("Name")] = src_name + + return sources, pkgstosrc - raise Exception(_('Repository %s does not exists.') % repo) + def list_sources(self, repo=None): + return self.sdb.get_item_keys(repo) - def has_spec(self, name, repo): - return self.__source_nodes.has_key(repo) and self.__source_nodes[repo].has_key(name) + def has_spec(self, name, repo=None): + return self.sdb.has_item(name, repo) - def get_spec(self, name, repo): + def get_spec(self, name, repo=None): spec, repo = self.get_spec_repo(name, repo) return spec - def get_spec_repo(self, name, repo): - if self.__source_nodes.has_key(repo): - if self.__source_nodes[repo].has_key(name): - spec = pisi.specfile.SpecFile() - spec.parse(self.__source_nodes[repo][name]) - return spec, repo - - raise Exception(_('Source package %s not found.') % name) - - def pkgtosrc(self, name, repo): - if self.__pkgstosrc.has_key(repo) and self.__pkgstosrc[repo].has_key(name): - return self.__pkgstosrc[repo][name] - + def get_spec_repo(self, name, repo=None): + src, repo = self.sdb.get_item_repo(name, repo) + spec = pisi.specfile.SpecFile() + spec.parse(src) + return spec, repo + def pkgtosrc(self, name, repo=None): + return self.psdb.get_item(name, repo) From uludag-commits at pardus.org.tr Mon Oct 1 13:57:38 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 13:57:38 +0300 (EEST) Subject: [Uludag-commits] r15574 - branches/pisi-db/pisi/db Message-ID: <20071001105738.BE785864060@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 13:57:38 2007 New Revision: 15574 Modified: branches/pisi-db/pisi/db/sourcedb.py Log: Make sourcedb members private Modified: branches/pisi-db/pisi/db/sourcedb.py ================================================================= --- branches/pisi-db/pisi/db/sourcedb.py (original) +++ branches/pisi-db/pisi/db/sourcedb.py Mon Oct 1 13:57:38 2007 @@ -24,47 +24,47 @@ def __init__(self): - self.source_nodes = {} - self.pkgstosrc = {} + self.__source_nodes = {} + self.__pkgstosrc = {} repodb = pisi.db.repodb.RepoDB() for repo in repodb.list_repos(): - self.source_nodes[repo] = {} - self.pkgstosrc[repo] = {} + self.__source_nodes[repo] = {} + self.__pkgstosrc[repo] = {} doc = repodb.get_repo_doc(repo) for spec in doc.tags("SpecFile"): src_name = spec.getTag("Source").getTagData("Name") - self.source_nodes[repo][src_name] = spec.toString() + self.__source_nodes[repo][src_name] = spec.toString() for package in spec.tags("Package"): - self.pkgstosrc[repo][package.getTagData("Name")] = src_name + self.__pkgstosrc[repo][package.getTagData("Name")] = src_name def list_sources(self, repo): - if self.source_nodes.has_key(repo): - return self.source_nodes[repo].keys() + if self.__source_nodes.has_key(repo): + return self.__source_nodes[repo].keys() raise Exception(_('Repository %s does not exists.') % repo) def has_spec(self, name, repo): - return self.source_nodes.has_key(repo) and self.source_nodes[repo].has_key(name) + return self.__source_nodes.has_key(repo) and self.__source_nodes[repo].has_key(name) def get_spec(self, name, repo): spec, repo = self.get_spec_repo(name, repo) return spec def get_spec_repo(self, name, repo): - if self.source_nodes.has_key(repo): - if self.source_nodes[repo].has_key(name): + if self.__source_nodes.has_key(repo): + if self.__source_nodes[repo].has_key(name): spec = pisi.specfile.SpecFile() - spec.parse(self.source_nodes[repo][name]) + spec.parse(self.__source_nodes[repo][name]) return spec, repo raise Exception(_('Source package %s not found.') % name) def pkgtosrc(self, name, repo): - if self.pkgstosrc.has_key(repo) and self.pkgstosrc[repo].has_key(name): - return self.pkgstosrc[repo][name] + if self.__pkgstosrc.has_key(repo) and self.__pkgstosrc[repo].has_key(name): + return self.__pkgstosrc[repo][name] From uludag-commits at pardus.org.tr Mon Oct 1 13:57:44 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 13:57:44 +0300 (EEST) Subject: [Uludag-commits] r15576 - branches/pisi-db/pisi/cli Message-ID: <20071001105744.510D38640B4@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 13:57:44 2007 New Revision: 15576 Modified: branches/pisi-db/pisi/cli/build.py Log: Missing module optparse OptionGroup is under optparse Modified: branches/pisi-db/pisi/cli/build.py ================================================================= --- branches/pisi-db/pisi/cli/build.py (original) +++ branches/pisi-db/pisi/cli/build.py Mon Oct 1 13:57:44 2007 @@ -76,7 +76,7 @@ help=_("Do not constrain build process inside the build folder")) def add_steps_options(self): - group = OptionGroup(self.parser, _("build steps")) + group = optparse.OptionGroup(self.parser, _("build steps")) group.add_option("--fetch", dest="until", action="store_const", const="fetch", help=_("Break build after fetching the source archive")) group.add_option("--unpack", dest="until", action="store_const", From uludag-commits at pardus.org.tr Mon Oct 1 14:08:52 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 14:08:52 +0300 (EEST) Subject: [Uludag-commits] r15579 - branches/pisi-db/pisi/db Message-ID: <20071001110852.35A748640C9@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 14:08:51 2007 New Revision: 15579 Modified: branches/pisi-db/pisi/db/__init__.py Log: Do not need db enums Remove installed, thirdparty, repos, all Modified: branches/pisi-db/pisi/db/__init__.py ================================================================= --- branches/pisi-db/pisi/db/__init__.py (original) +++ branches/pisi-db/pisi/db/__init__.py Mon Oct 1 14:08:51 2007 @@ -10,5 +10,3 @@ # Please read the COPYING file. # -installed, thirdparty, repos, all = "DBNotExists", "DBNotExists", "DBNotExists", "DBNotExists" - From uludag-commits at pardus.org.tr Mon Oct 1 14:08:49 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 14:08:49 +0300 (EEST) Subject: [Uludag-commits] r15577 - branches/pisi-db/pisi Message-ID: <20071001110849.C6C45864092@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 14:08:49 2007 New Revision: 15577 Modified: branches/pisi-db/pisi/atomicoperations.py Log: thirdparty db was not been used by the old pisi either If needed we will figure some other way to keep this info Modified: branches/pisi-db/pisi/atomicoperations.py ================================================================= --- branches/pisi-db/pisi/atomicoperations.py (original) +++ branches/pisi-db/pisi/atomicoperations.py Mon Oct 1 14:08:49 2007 @@ -149,10 +149,11 @@ raise Error(_("%s package cannot be installed unless the dependencies are satisfied") % self.pkginfo.name) + # FIXME: thirdparty db was not been used by the old db code either? # check if package is in database # If it is not, put it into 3rd party packagedb - if not ctx.packagedb.has_package(self.pkginfo.name): - ctx.packagedb.add_package(self.pkginfo, pisi.db.thirdparty) +# if not ctx.packagedb.has_package(self.pkginfo.name): +# ctx.packagedb.add_package(self.pkginfo, pisi.db.thirdparty) # If it is explicitly specified that package conflicts with this package and also # we passed check_conflicts tests in operations.py than this means a non-conflicting From uludag-commits at pardus.org.tr Mon Oct 1 14:08:50 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 14:08:50 +0300 (EEST) Subject: [Uludag-commits] r15578 - branches/pisi-db/pisi Message-ID: <20071001110850.EBE088640B4@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 14:08:50 2007 New Revision: 15578 Modified: branches/pisi-db/pisi/api.py Log: pisi search repo=pisi.db.all -> repo=None Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Mon Oct 1 14:08:50 2007 @@ -328,10 +328,10 @@ files = None return metadata, files, repo -def search_package_terms(terms, repo = pisi.db.all): +def search_package_terms(terms, repo = None): return search_in_packages(terms, ctx.packagedb.list_packages(repo), repo) -def search_in_packages(terms, packages, repo = pisi.db.all): +def search_in_packages(terms, packages, repo = None): def search(package, term): term = unicode(term).lower() From uludag-commits at pardus.org.tr Mon Oct 1 14:12:32 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 14:12:32 +0300 (EEST) Subject: [Uludag-commits] r15580 - branches/pisi-db/pisi Message-ID: <20071001111232.6A4668640B4@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 14:12:32 2007 New Revision: 15580 Modified: branches/pisi-db/pisi/api.py Log: Add get_replaces in api we now have a get_replaces implementation Modified: branches/pisi-db/pisi/api.py ================================================================= --- branches/pisi-db/pisi/api.py (original) +++ branches/pisi-db/pisi/api.py Mon Oct 1 14:12:32 2007 @@ -157,7 +157,7 @@ return set(ctx.packagedb.list_packages(repo = repo)) def list_upgradable(): - return filter(pisi.operations.upgrade.is_upgradable, ctx.installdb.list_installed()) # FIX:DB ctx.packagedb.get_replaces().keys() + return filter(pisi.operations.upgrade.is_upgradable, ctx.installdb.list_installed()) + ctx.packagedb.get_replaces().keys() def package_graph(A, packagedb, ignore_installed = False): """Construct a package relations graph. From uludag-commits at pardus.org.tr Mon Oct 1 14:22:57 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 14:22:57 +0300 (EEST) Subject: [Uludag-commits] r15581 - branches/pisi-db Message-ID: <20071001112257.33103864092@liste.uludag.org.tr> Author: faik Date: Mon Oct 1 14:22:56 2007 New Revision: 15581 Modified: branches/pisi-db/setup.py Log: Add pisi.operations module to install Modified: branches/pisi-db/setup.py ================================================================= --- branches/pisi-db/setup.py (original) +++ branches/pisi-db/setup.py Mon Oct 1 14:22:56 2007 @@ -93,7 +93,7 @@ author_email="pisi at pardus.org.tr", url="http://www.pardus.org.tr/eng/pisi/", package_dir = {'': ''}, - packages = ['pisi', 'pisi.cli', 'pisi.actionsapi', 'pisi.pxml', 'pisi.scenarioapi', 'pisi.db'], + packages = ['pisi', 'pisi.cli', 'pisi.operations', 'pisi.actionsapi', 'pisi.pxml', 'pisi.scenarioapi', 'pisi.db'], scripts = ['pisi-cli', 'scripts/lspisi', 'scripts/unpisi', 'scripts/check-newconfigs.py', 'scripts/revdep-rebuild'], cmdclass = {'install' : Install} ) From uludag-commits at pardus.org.tr Mon Oct 1 16:47:06 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 16:47:06 +0300 (EEST) Subject: [Uludag-commits] r15582 - trunk/staj-projeleri/scanner Message-ID: <20071001134706.7A8BD7C0066@liste.uludag.org.tr> Author: asli.okur Date: Mon Oct 1 16:47:06 2007 New Revision: 15582 Added: trunk/staj-projeleri/scanner/deneme Log: denemeee From uludag-commits at pardus.org.tr Mon Oct 1 16:48:36 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 16:48:36 +0300 (EEST) Subject: [Uludag-commits] r15583 - trunk/staj-projeleri/scanner Message-ID: <20071001134836.6270B7C0066@liste.uludag.org.tr> Author: asli.okur Date: Mon Oct 1 16:48:36 2007 New Revision: 15583 Removed: trunk/staj-projeleri/scanner/deneme Log: deneme bitti From uludag-commits at pardus.org.tr Mon Oct 1 16:54:39 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 16:54:39 +0300 (EEST) Subject: [Uludag-commits] r15584 - trunk/staj-projeleri/scanner/src Message-ID: <20071001135439.4FE367C0063@liste.uludag.org.tr> Author: asli.okur Date: Mon Oct 1 16:54:38 2007 New Revision: 15584 Added: trunk/staj-projeleri/scanner/src/progress.py trunk/staj-projeleri/scanner/src/scanevent.py trunk/staj-projeleri/scanner/src/scanthread.py Modified: trunk/staj-projeleri/scanner/src/main.py trunk/staj-projeleri/scanner/src/scanner.py trunk/staj-projeleri/scanner/src/toolbar.py Log: Tooltip eklendi. ProgressDialog eklendi. Preview ve Scan için ayrý thread açýldý. Cancel sýrasýnda problem var. Unuttuðum birþeyler vardýr daha. Modified: trunk/staj-projeleri/scanner/src/main.py ================================================================= --- trunk/staj-projeleri/scanner/src/main.py (original) +++ trunk/staj-projeleri/scanner/src/main.py Mon Oct 1 16:54:38 2007 @@ -2,13 +2,40 @@ import sys from qt import * +from kdecore import * +from kdeui import * +from kfile import * import sane from scanner import * import pickle -class Main(QDialog): +#version = '0.1' +#description = "Scanner Interface" + +#def loadIcon(name, group=KIcon.Desktop): + #return KGlobal.iconLoader().loadIcon(name, group) + +#def loadIconSet(name, group=KIcon.Desktop): + #return KGlobal.iconLoader().loadIconSet(name, group) + +#def AboutData(): + #about_data = KAboutData( + #'scanner', + #'Scanner', + #version, + #description, + #KAboutData.License_GPL, + #'(C) 2007 UEKAE/TÜBÝTAK', + #None, + #None, + #'blabla at pardus.org.tr') + #return about_data + +class Main(KDialog): def __init__(self,parent = None,name = None,modal = 0,fl = 0): - QDialog.__init__(self,parent,name,modal,fl) + KDialog.__init__(self,parent,name,modal,fl) + + #self.setIcon(loadIcon("scanner")) if not name: self.setName("Main") @@ -127,11 +154,24 @@ if __name__ == "__main__": + ##a = KApplication(sys.argv,"") + #about_data = AboutData() + #KCmdLineArgs.init(sys.argv,about_data) + #a = KUniqueApplication(True, True, True) + ##QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()")) + #mainForm = Main() + #a.setMainWidget(mainForm) + #QObject.connect(a, SIGNAL("aboutToQuit()"), mainForm.quit) + ##QObject.connect(a, SIGNAL("aboutToQuit()"), a, SLOT("quit()")) + ##QObject.connect(a,SIGNAL("lastWindowClosed()"),mainForm.quit) + ##a.exec_loop() + #sys.exit(mainForm.exec_loop()) + a = QApplication(sys.argv) QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()")) - w = Main() - a.setMainWidget(w) - QObject.connect(a,SIGNAL("lastWindowClosed()"),w.quit) + mainForm = Main() + a.setMainWidget(mainForm) + QObject.connect(a,SIGNAL("lastWindowClosed()"),mainForm.quit) a.exec_loop() Modified: trunk/staj-projeleri/scanner/src/scanner.py ================================================================= --- trunk/staj-projeleri/scanner/src/scanner.py (original) +++ trunk/staj-projeleri/scanner/src/scanner.py Mon Oct 1 16:54:38 2007 @@ -1,5 +1,8 @@ import sys from qt import * +from kdecore import * +from kdeui import * +from kfile import * import sane from options import * @@ -8,19 +11,22 @@ from scanresult import * from scanresultmulti import * from extractor import * +from progress import * + +from scanthread import * class ScanWindow(QMainWindow): def __init__(self,parent = None,name = None,fl = 0): QMainWindow.__init__(self,parent,name,fl) - sane.init() + #sane.init() self.statusBar() + self.statusBar().message("Ready") if not name: self.setName("Scanner") - self.setCentralWidget(QWidget(self,"qt_central_widget")) self.hLayout = QHBoxLayout(self.centralWidget(),11,6,"mainFormLayout") @@ -46,6 +52,14 @@ self.connect(self.toolbar.zoomoutButton,SIGNAL("released()"),self.previewArea.previewImage.zoomout) self.connect(self.previewArea.previewImage,PYSIGNAL("selectionCreated"),self.selectArea) + + self.progress = Progress(self.centralWidget()) + #self.connect(self.options.device, PYSIGNAL("sigScanProgress"), self.progress.setProgress) + self.progress.setTotalSteps(0) + self.progress.hide() + + self.connect(self.progress,SIGNAL("canceled()"),self.stopScan) + self.helpContentsAction = QAction(self,"helpContentsAction") self.helpIndexAction = QAction(self,"helpIndexAction") @@ -76,7 +90,7 @@ sane.exit() def languageChange(self): - self.setCaption(self.__tr("Form1")) + self.setCaption(self.__tr("Scanner")) self.helpContentsAction.setText(self.__tr("Contents")) self.helpContentsAction.setMenuText(self.__tr("&Contents...")) self.helpContentsAction.setAccel(QString.null) @@ -91,16 +105,16 @@ def helpIndex(self): - print "Form1.helpIndex(): Not implemented yet" + print "Scanner.helpIndex(): Not implemented yet" def helpContents(self): - print "Form1.helpContents(): Not implemented yet" + print "Scanner.helpContents(): Not implemented yet" def helpAbout(self): - print "Form1.helpAbout(): Not implemented yet" + about = QMessageBox.about(self, "About", "Bu program Pardus staj projeleri kapsaminda hazirlanmistir." ) def __tr(self,s,c = None): - return qApp.translate("Form1",s,c) + return qApp.translate("Scanner",s,c) def newDeviceSelected(self): self.toolbar.setEnabled(True) @@ -119,7 +133,7 @@ self.toolbar.setEnabled(False) self.previewArea.noImage() self.previewArea.setEnabled(False) - + def selectArea(self,ratio_tl_x,ratio_tl_y,ratio_br_x,ratio_br_y): if self.options.device != None: for option in self.options.optionList: @@ -146,7 +160,10 @@ def previewScan(self): if self.options.device != None: - oldValues = self.options.getOptionValues() + qApp.processEvents() + self.statusBar().message("Busy") + self.progress.show() + self.oldValues = self.options.getOptionValues() for option in self.options.optionList: if option.deviceOption.is_settable() and option.deviceOption.is_active(): @@ -163,19 +180,43 @@ if option.deviceOption.name == "br-y": self.options.device.__setattr__("br_y",max(option.deviceOption.constraint)) - self.options.device.start() - - im = self.options.device.snap(); + #self.options.device.start() - self.previewArea.previewImage.setImage(im) + #im = self.options.device.snap(); + self.previewThread = PreviewThread(self, self.options.device) + self.previewThread.start() + #self.previewThread.work(self.options) + #self.previewArea.previewImage.setImage(im) - self.options.setOptionValues(oldValues) - - def startScan(self): - if self.options.device != None: - self.options.device.start() - - im = self.options.device.snap(); + #self.options.setOptionValues(oldValues) + #self.statusBar().message("Ready") + + + def stopScan(self): + if self.options.device != None: + #self.options.device.cancel() + self.stopThread = StopThread(self, self.options.device) + self.stopThread.start() + #qApp.wakeUpGuiThread() + qApp.processEvents() + self.progress.setLabelText("

Stopping

") + #self.statusBar().message("Ready") + #self.progress.hide() + + def backToNormal(self): + self.progress.setLabelText("

Scanning in progress

") + self.statusBar().message("Ready") + self.progress.hide() + + def customEvent(self,event): + if(event.type() == 1002): + self.createScanWindow(event.image) + if(event.type() == 1003): + self.createPreview(event.image) + if(event.type() == 1004): + self.backToNormal() + + def createScanWindow(self, im): self.maxDiff = 20 self.aveRgb = 0x222625 self.minSize = 90000 @@ -188,7 +229,59 @@ s.addImage(tmpImage) else: s = ScanResult(im,self,"scanResult",1) + s.show() + #self.progress.setProgress(100) + self.progress.hide() + self.statusBar().message("Ready") + + def createPreview(self, im): + self.statusBar().message("Ready") + self.progress.hide() + self.previewArea.previewImage.setImage(im) + self.options.setOptionValues(self.oldValues) + + def startScan(self): + if self.options.device != None: + self.statusBar().message("Busy") + qApp.processEvents() + self.progress.show() + #self.progress.setProgress(0) + #self.hide() + + #self.options.device.start() + #im = self.options.device.snap() + + self.scanThread = ScanThread(self, self.options.device) + self.scanThread.start() + #self.scanThread.work(self.options) + #while(self.worker.finished() == False): + #pass + + #im = self.scanThread.getImage() + + #qApp.processEvents() + #qEventLoop.processEvents(AllEvents,500) + + + + #self.maxDiff = 20 + #self.aveRgb = 0x222625 + #self.minSize = 90000 + #self.enableExtract = True + #if self.enableExtract: + #extract(im,self.maxDiff,self.aveRgb,self.minSize) + #s = ScanResultMulti(self,"scanResultMulti",1) + #tmpImage = QImage() + #while(nextImage(tmpImage)): + #s.addImage(tmpImage) + #else: + #s = ScanResult(im,self,"scanResult",1) - s.show() + #self.progress.setProgress(100) + #s.show() + #self.statusBar().message("Ready") + #self.progress.reset() + #self.show() + #self.progress.hide() - return + #return Modified: trunk/staj-projeleri/scanner/src/toolbar.py ================================================================= --- trunk/staj-projeleri/scanner/src/toolbar.py (original) +++ trunk/staj-projeleri/scanner/src/toolbar.py Mon Oct 1 16:54:38 2007 @@ -26,6 +26,7 @@ self.previewButton = QToolButton(LayoutWidget,"previewButton") self.previewButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.previewButton.sizePolicy().hasHeightForWidth())) self.previewButton.setText("P") + QToolTip.add(self.previewButton,self.__tr("Preview")) self.previewButton.setMinimumSize(QSize(30,30)) self.previewButton.setAutoRaise(1) layout7.addWidget(self.previewButton) @@ -33,6 +34,7 @@ self.scanButton = QToolButton(LayoutWidget,"scanButton") self.scanButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.scanButton.sizePolicy().hasHeightForWidth())) self.scanButton.setText("S") + QToolTip.add(self.scanButton,self.__tr("Scan")) self.scanButton.setMinimumSize(QSize(30,30)) #self.scanButton.setIconSet(QIconSet(self.image0)) self.scanButton.setAutoRaise(1) @@ -42,6 +44,7 @@ self.fitButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.fitButton.sizePolicy().hasHeightForWidth())) self.fitButton.setMinimumSize(QSize(30,30)) self.fitButton.setText("F") + QToolTip.add(self.fitButton,self.__tr("Fit Scan Area")) self.fitButton.setAutoRaise(1) layout7.addWidget(self.fitButton) @@ -49,6 +52,7 @@ self.fitSelectButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.fitSelectButton.sizePolicy().hasHeightForWidth())) self.fitSelectButton.setMinimumSize(QSize(30,30)) self.fitSelectButton.setText("FS") + QToolTip.add(self.fitSelectButton,self.__tr("Fit Selected Area")) self.fitSelectButton.setAutoRaise(1) layout7.addWidget(self.fitSelectButton) @@ -56,6 +60,7 @@ self.zoominButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.zoominButton.sizePolicy().hasHeightForWidth())) self.zoominButton.setMinimumSize(QSize(30,30)) self.zoominButton.setIconSet(QIconSet(self.image0)) + QToolTip.add(self.zoominButton,self.__tr("Zoom In")) self.zoominButton.setAutoRaise(1) layout7.addWidget(self.zoominButton) @@ -63,6 +68,7 @@ self.actualSizeButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.actualSizeButton.sizePolicy().hasHeightForWidth())) self.actualSizeButton.setMinimumSize(QSize(30,30)) self.actualSizeButton.setText("AS") + QToolTip.add(self.actualSizeButton,self.__tr("Actual Size")) self.actualSizeButton.setAutoRaise(1) layout7.addWidget(self.actualSizeButton) @@ -70,7 +76,11 @@ self.zoomoutButton.setSizePolicy(QSizePolicy(QSizePolicy.Fixed,QSizePolicy.Fixed,0,0,self.zoomoutButton.sizePolicy().hasHeightForWidth())) self.zoomoutButton.setMinimumSize(QSize(30,30)) self.zoomoutButton.setIconSet(QIconSet(self.image1)) + QToolTip.add(self.zoomoutButton,self.__tr("Zoom Out")) self.zoomoutButton.setAutoRaise(1) layout7.addWidget(self.zoomoutButton) spacer4 = QSpacerItem(20,50,QSizePolicy.Minimum,QSizePolicy.Expanding) layout7.addItem(spacer4) + + def __tr(self,s,c = None): + return qApp.translate("toolbar",s,c) From uludag-commits at pardus.org.tr Mon Oct 1 16:57:49 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 1 Oct 2007 16:57:49 +0300 (EEST) Subject: [Uludag-commits] r15585 - trunk/yali/yali Message-ID: <20071001135749.121E07C0063@liste.uludag.org.tr> Author: zey.sagar Date: Mon Oct 1 16:57:48 2007 New Revision: 15585 Modified: trunk/yali/yali/kickstart.py Log: comments added and old disk syntax function removed Modified: trunk/yali/yali/kickstart.py ================================================================= --- trunk/yali/yali/kickstart.py (original) +++ trunk/yali/yali/kickstart.py Mon Oct 1 16:57:48 2007 @@ -41,22 +41,26 @@ self.correctData = correctdata def checkAutologin(self): + """It verifies if another autologin user exists""" if(self.correctData.autoLoginUser): return False return True def checkValidity(self): + """It checks username format""" if self.username and re.search("[0-9a-zA-Z.?!_-]",self.username): return True return False def checkName(self): + """It verifies if the username already exists""" for usr in self.correctData.users: if(usr.username==self.username): return True return False def checkGroups(self): + """It checks the groups validity""" for element in self.groups: for group in yaliKickStart().defaultGroups: if (group==element or element=="wheel"): @@ -71,12 +75,14 @@ self.keyX=keyX def checkKeymapX(self): + """It checks keymap validity""" for element in getKeymaps(): if element.X==self.keyX: return True return False def findKeymap(self): + """It attaches console Keymap""" for element in getKeymaps(): if element.X==self.keyX: return element.console @@ -103,13 +109,6 @@ return re.match("disk[0-9]$",self.disk) - def convertDisk(self): - list={'a':'p0','b':'p1','c':'s0','d':'s1'} - self.letter=self.disk[2] - device=str(list[self.letter]+'p'+str(int(self.disk[3])-1)) - print device - return device - class yaliKickStart: def __init__(self): self.fileSystems=["swap","ext3","ntfs","reiserf","xfs"] @@ -135,6 +134,7 @@ return False def checkAllOptions(self): + """It checks all data entries and edits them""" error=errors() otherFunct=otherFunctions(self.data.keyData.X) @@ -283,12 +283,12 @@ errorPartition.MountPoint=True self.errorList.append("Mountpoint Error for %s : %s not valid"%(partition.partitionType,partition.mountPoint)) if(errorPartition.PartitionType!=True and errorPartition.Disk!=True and errorPartition.FsType!=True and errorPartition.MountPoint!=True): - partition.disk=functPart.convertDisk() self.correctData.partitioning.append(partition) return self.errorList def checkFileValidity(self): + """It reads the xml file and checks errors""" self.correctData=yaliReadPiks.yaliKickstartData() self.errorList=self.checkAllOptions() if(len(self.errorList)==0): From uludag-commits at pardus.org.tr Tue Oct 2 03:57:35 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 03:57:35 +0300 (EEST) Subject: [Uludag-commits] r15586 - in trunk/staj-projeleri: Pakito-eski/po migration/po Message-ID: <20071002005735.A9A987C0011@liste.uludag.org.tr> Author: klemens Date: Tue Oct 2 03:57:35 2007 New Revision: 15586 Added: trunk/staj-projeleri/Pakito-eski/po/es.po trunk/staj-projeleri/migration/po/es.po Log: added some spanish language files (kh) - first shot From uludag-commits at pardus.org.tr Tue Oct 2 11:56:59 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 11:56:59 +0300 (EEST) Subject: [Uludag-commits] r15587 - in trunk/staj-projeleri/Pakito: . pakito/gui Message-ID: <20071002085700.A59032E7E9@liste.uludag.org.tr> Author: gokcen.eraslan Date: Tue Oct 2 11:56:59 2007 New Revision: 15587 Modified: trunk/staj-projeleri/Pakito/pakito/gui/mainwindow.py trunk/staj-projeleri/Pakito/pakito/gui/multitabwidget.py trunk/staj-projeleri/Pakito/pakitoui.rc Log: minor fixes 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 Tue Oct 2 11:56:59 2007 @@ -22,7 +22,7 @@ # PiSi imports import pisi.api -from pisi.config import Options +from pisi.config import Options import pisi.ui from pakito.gui.pspecWidget.pspecWidget import PspecWidget @@ -83,7 +83,6 @@ self.connect(qApp, SIGNAL("shutDown()"), self.exit) -# self.createGUI(self.pspecTab.editor.part) self.setXMLFile(os.getcwd() + "/pakitoui.rc") self.createShellGUI() @@ -207,9 +206,9 @@ try: self.pspecTab = PspecWidget(self.twTabs, os.path.join(self.tempDir, "pspec.xml")) except Exception, err: + qApp.restoreOverrideCursor() KMessageBox.sorry(self, i18n("pspec.xml cannot be parsed: %s" % str(err)), i18n("Invalid File")) self.closePacket() - qApp.restoreOverrideCursor() return self.actionsTab = ActionsWidget(self.twTabs, os.path.join(self.tempDir, "actions.py")) @@ -492,6 +491,10 @@ dia = OptionsDialog(self) dia.exec_loop() + def slotConfigureKeys(self): + KKeyDialog.configure(self.actionCollection()) + + def doActions(self): # actions @@ -506,7 +509,8 @@ self.actionExit = KStdAction.quit(self.exit, self.actionCollection(), "actionExit") #settings actions - self.actionSettings = KStdAction.preferences(self.slotSettings, self.actionCollection(), "actionSettings") + KStdAction.keyBindings(self.slotConfigureKeys, self.actionCollection()) + self.actionSettings = KStdAction.preferences(self.slotSettings, self.actionCollection()) # build actions self.actionFetch = KAction(i18n("Fetch"), "khtml_kget", KShortcut(), self.fetchSlot, self.actionCollection(), "actionFetch") Modified: trunk/staj-projeleri/Pakito/pakito/gui/multitabwidget.py ================================================================= --- trunk/staj-projeleri/Pakito/pakito/gui/multitabwidget.py (original) +++ trunk/staj-projeleri/Pakito/pakito/gui/multitabwidget.py Tue Oct 2 11:56:59 2007 @@ -3,7 +3,10 @@ from qt import * from kutils import * -class MultiTabWidget(QWidget): +SIZEOPENED = 110 +SIZECLOSED = 30 + +class MultiTabWidget(QWidget): def __init__(self, parent = None, orient = KMultiTabBar.Horizontal, pos = KMultiTabBar.Top, name = None): QWidget.__init__(self, parent, name) if orient == KMultiTabBar.Horizontal: @@ -25,7 +28,7 @@ self.activeTabID = -1 self.bigSize = -1 self.orientation = orient - self.setMinimumHeight(50) + self.setFixedHeight(SIZECLOSED) def addTab(self, widget, pix = None, id = -1, string = ""): if not pix: @@ -33,12 +36,6 @@ self.tabWidget.appendTab(pix, id, string) self.stack.addWidget(widget, id) tab = self.tabWidget.tab(id) - - if self.orientation == KMultiTabBar.Horizontal: - self.setFixedHeight(tab.height()+6) - else: - self.setFixedWidth(tab.width()+6) - self.connect(tab, SIGNAL("clicked(int)"), self.tabClicked) def removeTab(self, id): @@ -71,12 +68,14 @@ if self.bigSize == -1: self.bigSize = 100 if self.orientation == KMultiTabBar.Horizontal: - self.setMaximumHeight(700) - self.setMinimumHeight(120) + self.setMaximumHeight(500) + self.setMinimumHeight(110) self.resize(self.width(), self.bigSize) else: - self.setMaximumWidth(700) + self.setMaximumWidth(500) + self.setMinimumWidth(110) self.resize(self.bigSize, self.height()) + self.updateGeometry() def shrinkTab(self): self.stack.hide() @@ -84,8 +83,9 @@ self.tabWidget.setTab(self.activeTabID, False) if self.orientation == KMultiTabBar.Horizontal: self.bigSize = self.height() - self.setFixedHeight(self.tabWidget.tab(self.activeTabID).height() + 10) + self.setFixedHeight(SIZECLOSED) else: self.bigSize = self.width() - self.setFixedWidth(self.tabWidget.tab(self.activeTabID).width() + 10) + self.setFixedWidth(SIZECLOSED) self.activeTabID = -1 + self.updateGeometry() Modified: trunk/staj-projeleri/Pakito/pakitoui.rc ================================================================= --- trunk/staj-projeleri/Pakito/pakitoui.rc (original) +++ trunk/staj-projeleri/Pakito/pakitoui.rc Tue Oct 2 11:56:59 2007 @@ -28,10 +28,6 @@ - - &Settings - - From uludag-commits at pardus.org.tr Tue Oct 2 12:15:43 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 12:15:43 +0300 (EEST) Subject: [Uludag-commits] r15588 - in trunk/yali/yali: data gui Message-ID: <20071002091544.0A3822F3A6@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Oct 2 12:15:43 2007 New Revision: 15588 Modified: trunk/yali/yali/data/exampleKickstart.xml trunk/yali/yali/gui/ScrBootloader.py trunk/yali/yali/gui/ScrKickerCheck.py trunk/yali/yali/gui/ScrWelcome.py trunk/yali/yali/gui/context.py Log: KickStart or Kicker is almost ready =) Modified: trunk/yali/yali/data/exampleKickstart.xml ================================================================= --- trunk/yali/yali/data/exampleKickstart.xml (original) +++ trunk/yali/yali/data/exampleKickstart.xml Tue Oct 2 12:15:43 2007 @@ -5,7 +5,7 @@ pardusman pardus-kickstart - + gokmen gokmen goksel 1231111 @@ -26,7 +26,7 @@ --> - disk1 + disk0 Modified: trunk/yali/yali/gui/ScrBootloader.py ================================================================= --- trunk/yali/yali/gui/ScrBootloader.py (original) +++ trunk/yali/yali/gui/ScrBootloader.py Tue Oct 2 12:15:43 2007 @@ -97,6 +97,8 @@ def shown(self): from os.path import basename ctx.debugger.log("%s loaded" % basename(__file__)) + if ctx.autoInstall: + ctx.screens.next() def backCheck(self): # we need to go partition auto screen, not manual ;) @@ -171,11 +173,12 @@ and easy way to install Pardus.

''')) - self.dialog = WarningDialog(w, self) - if not self.dialog.exec_loop(): - # disabled by weaver - ctx.screens.enablePrev() - return False + if not ctx.autoInstall: + self.dialog = WarningDialog(w, self) + if not self.dialog.exec_loop(): + # disabled by weaver + ctx.screens.enablePrev() + return False info_window = InformationWindow(self, _("Please wait while formatting!")) ctx.screens.processEvents() Modified: trunk/yali/yali/gui/ScrKickerCheck.py ================================================================= --- trunk/yali/yali/gui/ScrKickerCheck.py (original) +++ trunk/yali/yali/gui/ScrKickerCheck.py Tue Oct 2 12:15:43 2007 @@ -22,6 +22,7 @@ import yali.gui.context as ctx from yali.gui.YaliDialog import Dialog from yali.kickstart import yaliKickStart +import yali.storage def loadFile(path): """Read contents of a file""" @@ -62,10 +63,12 @@ ctx.screens.goToScreen(num) def shown(self): + ctx.kickerReady = False if not kickstartExists(): ctx.debugger.log("There is no kickstart jumps to the next screen.") self.jumpToNext() + ctx.autoInstall = True yaliKick = yaliKickStart() print "...",ctx.options.kickStartFile @@ -73,7 +76,7 @@ if kickStartOpt: ctx.debugger.log("KICKSTART-PARAMS:: %s" % kickStartOpt) - kickStartFile = kickStartOpt.splir(',')[1] + kickStartFile = kickStartOpt.split(',')[1] else: kickStartFile = ctx.options.kickStartFile @@ -82,8 +85,39 @@ yaliKick.readData(kickStartFile) if yaliKick.checkFileValidity()==True: ctx.debugger.log("File is ok") + + # find usable storage devices + # initialize all storage devices + if not yali.storage.init_devices(): + raise GUIException, _("Can't find a storage device!") + + devices = [] + for dev in yali.storage.devices: + if dev.getTotalMB() >= ctx.consts.min_root_size: + devices.append(dev) + correctData = yaliKick.getValues() - ctx.debugger.log("Root Pass is : %s" % correctData.rootPassword) + ctx.debugger.log("Given KickStart Values :") + + # single types + ctx.installData.keyData = correctData.keyData + ctx.installData.rootPassword = correctData.rootPassword + ctx.installData.hostName = correctData.hostname + ctx.installData.autoLoginUser = correctData.autoLoginUser + ctx.installData.autoPartDev = devices[int(correctData.partitioning[0].disk[-1])] + + ctx.debugger.log("HOSTNAME : %s " % ctx.installData.hostName) + ctx.debugger.log("KEYDATA : %s " % ctx.installData.keyData.X) + + # multi types + for user in correctData.users: + ctx.installData.users.append(user) + yali.users.pending_users.append(user) + ctx.debugger.log("USER : %s " % user.username) + + ctx.screens.processEvents() + ctx.kickerReady = True + ctx.screens.next() else: ctx.debugger.log("This kickstart file is not correct !!") wrongData = yaliKick.getValues() Modified: trunk/yali/yali/gui/ScrWelcome.py ================================================================= --- trunk/yali/yali/gui/ScrWelcome.py (original) +++ trunk/yali/yali/gui/ScrWelcome.py Tue Oct 2 12:15:43 2007 @@ -98,6 +98,9 @@ yali.sysutils.fastreboot() def shown(self): + if ctx.kickerReady and ctx.autoInstall: + ctx.screens.goToScreen(9) + ctx.screens.disablePrev() if self.accept.isChecked(): ctx.screens.enableNext() Modified: trunk/yali/yali/gui/context.py ================================================================= --- trunk/yali/yali/gui/context.py (original) +++ trunk/yali/yali/gui/context.py Tue Oct 2 12:15:43 2007 @@ -50,5 +50,8 @@ # auto partitioning use_autopart = False +# auto installation +autoInstall = False + # keydata keydata = None From uludag-commits at pardus.org.tr Tue Oct 2 12:48:36 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 12:48:36 +0300 (EEST) Subject: [Uludag-commits] r15589 - trunk/yali/yali/gui Message-ID: <20071002094837.3D5476C2DD@liste.uludag.org.tr> Author: gokmen.goksel Date: Tue Oct 2 12:48:36 2007 New Revision: 15589 Modified: trunk/yali/yali/gui/ScrKickerCheck.py trunk/yali/yali/gui/ScrWelcome.py trunk/yali/yali/gui/runner.py Log: birtakim fixler Modified: trunk/yali/yali/gui/ScrKickerCheck.py ================================================================= --- trunk/yali/yali/gui/ScrKickerCheck.py (original) +++ trunk/yali/yali/gui/ScrKickerCheck.py Tue Oct 2 12:48:36 2007 @@ -62,8 +62,7 @@ num = ctx.screens.getCurrentIndex() + 1 ctx.screens.goToScreen(num) - def shown(self): - ctx.kickerReady = False + def execute(self): if not kickstartExists(): ctx.debugger.log("There is no kickstart jumps to the next screen.") self.jumpToNext() @@ -114,10 +113,7 @@ ctx.installData.users.append(user) yali.users.pending_users.append(user) ctx.debugger.log("USER : %s " % user.username) - - ctx.screens.processEvents() - ctx.kickerReady = True - ctx.screens.next() + ctx.screens.goToScreen(9) else: ctx.debugger.log("This kickstart file is not correct !!") wrongData = yaliKick.getValues() Modified: trunk/yali/yali/gui/ScrWelcome.py ================================================================= --- trunk/yali/yali/gui/ScrWelcome.py (original) +++ trunk/yali/yali/gui/ScrWelcome.py Tue Oct 2 12:48:36 2007 @@ -98,9 +98,6 @@ yali.sysutils.fastreboot() def shown(self): - if ctx.kickerReady and ctx.autoInstall: - ctx.screens.goToScreen(9) - ctx.screens.disablePrev() if self.accept.isChecked(): ctx.screens.enableNext() Modified: trunk/yali/yali/gui/runner.py ================================================================= --- trunk/yali/yali/gui/runner.py (original) +++ trunk/yali/yali/gui/runner.py Tue Oct 2 12:48:36 2007 @@ -123,6 +123,7 @@ # set the current screen and stage to 1 at startup... ctx.stages.setCurrent(1) ctx.screens.setCurrent(1) + ctx.screens.next() ## # Fire up the interface. From uludag-commits at pardus.org.tr Tue Oct 2 15:39:12 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 15:39:12 +0300 (EEST) Subject: [Uludag-commits] r15590 - in trunk/yali/yali: . gui Message-ID: <20071002123913.0DCFF6FBFC@liste.uludag.org.tr> Author: zey.sagar Date: Tue Oct 2 15:39:12 2007 New Revision: 15590 Removed: trunk/yali/yali/gui/ScrKickerCheck.py trunk/yali/yali/kickstart.py Modified: trunk/yali/yali/constants.py trunk/yali/yali/gui/runner.py trunk/yali/yali/options.py trunk/yali/yali/yalireadpiks.py Log: YaliKickstart is now Kahya (Kahya is Yali Automator) Modified: trunk/yali/yali/constants.py ================================================================= --- trunk/yali/yali/constants.py (original) +++ trunk/yali/yali/constants.py Tue Oct 2 15:39:12 2007 @@ -85,8 +85,8 @@ # min root partition size consts.min_root_size = 3500 -# kickstart options -consts.kickStartParam = "yaliKickStart" +# kahya options +consts.kahyaParam = "kahya" try: consts.lang = locale.getdefaultlocale()[0][:2] Modified: trunk/yali/yali/gui/runner.py ================================================================= --- trunk/yali/yali/gui/runner.py (original) +++ trunk/yali/yali/gui/runner.py Tue Oct 2 15:39:12 2007 @@ -40,7 +40,7 @@ import ScrUsers import ScrBootloader import ScrGoodbye -import ScrKickerCheck +import ScrKahyaCheck ## # Runner creates main GUI components for installation... @@ -58,7 +58,7 @@ ] _all_screens = [ - {'stage': 1, 'module': ScrKickerCheck}, + {'stage': 1, 'module': ScrKahyaCheck}, {'stage': 1, 'module': ScrWelcome}, {'stage': 1, 'module': ScrCheckCD}, {'stage': 1, 'module': ScrKeyboard}, Modified: trunk/yali/yali/options.py ================================================================= --- trunk/yali/yali/options.py (original) +++ trunk/yali/yali/options.py Tue Oct 2 15:39:12 2007 @@ -21,8 +21,8 @@ parser.add_option("-d", "--debug", dest="debug", action="store_true", default="False", help="enable debug") - parser.add_option("-k", "--kickStartFile", dest="kickStartFile", - help="Run with KickStart file", metavar="FILE") + parser.add_option("-k", "--kahyaFile", dest="kahyaFile", + help="Run with Kahya file", metavar="FILE") self.options, self.args = parser.parse_args() def __getattr__(self, name): Modified: trunk/yali/yali/yalireadpiks.py ================================================================= --- trunk/yali/yali/yalireadpiks.py (original) +++ trunk/yali/yali/yalireadpiks.py Tue Oct 2 15:39:12 2007 @@ -4,7 +4,7 @@ import piksemel import sys -class yaliKickstartData: +class kahyaData: def __init__(self): self.language=None self.keyData=Keymap() @@ -40,7 +40,7 @@ def read(args): doc=piksemel.parse(args) - data=yaliKickstartData() + data=kahyaData() data.language=doc.getTagData("language") data.keyData.X=doc.getTagData("keymap") data.rootPassword=doc.getTagData("root_password") From uludag-commits at pardus.org.tr Tue Oct 2 15:47:58 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 15:47:58 +0300 (EEST) Subject: [Uludag-commits] r15591 - in trunk/staj-projeleri: yali-kahya yali-kickstart Message-ID: <20071002124758.5CA006FBFE@liste.uludag.org.tr> Author: zey.sagar Date: Tue Oct 2 15:47:57 2007 New Revision: 15591 Added: trunk/staj-projeleri/yali-kahya/ trunk/staj-projeleri/yali-kahya/kickstart.py trunk/staj-projeleri/yali-kahya/kickstartForYali.py trunk/staj-projeleri/yali-kahya/svn-commit.tmp trunk/staj-projeleri/yali-kahya/yali.xml trunk/staj-projeleri/yali-kahya/yalireadpiks.py trunk/staj-projeleri/yali-kahya/yalireadpiksnew.py trunk/staj-projeleri/yali-kahya/yalireadpiksnew.py.bak trunk/staj-projeleri/yali-kahya/yalisema.xsd Removed: trunk/staj-projeleri/yali-kickstart/Kickstart.py trunk/staj-projeleri/yali-kickstart/kickstartForYali.py trunk/staj-projeleri/yali-kickstart/yali.xml trunk/staj-projeleri/yali-kickstart/yaliread.py trunk/staj-projeleri/yali-kickstart/yalireadpiks.py trunk/staj-projeleri/yali-kickstart/yalisema.xsd Log: yali-kickstart is now yali-kahya From uludag-commits at pardus.org.tr Tue Oct 2 15:49:50 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 15:49:50 +0300 (EEST) Subject: [Uludag-commits] r15592 - trunk/staj-projeleri/yali-kickstart Message-ID: <20071002124951.0FB2E6FBFE@liste.uludag.org.tr> Author: zey.sagar Date: Tue Oct 2 15:49:50 2007 New Revision: 15592 Removed: trunk/staj-projeleri/yali-kickstart/ Log: there is no kickstart folder From uludag-commits at pardus.org.tr Tue Oct 2 15:56:37 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 15:56:37 +0300 (EEST) Subject: [Uludag-commits] r15593 - trunk/staj-projeleri/yali-kahya Message-ID: <20071002125637.D739F6FBFE@liste.uludag.org.tr> Author: zey.sagar Date: Tue Oct 2 15:56:37 2007 New Revision: 15593 Added: trunk/staj-projeleri/yali-kahya/exampleKahya.xml trunk/staj-projeleri/yali-kahya/kahya.py Removed: trunk/staj-projeleri/yali-kahya/kickstart.py Modified: trunk/staj-projeleri/yali-kahya/yalireadpiksnew.py Log: kickstart names changed to kahya Modified: trunk/staj-projeleri/yali-kahya/yalireadpiksnew.py ================================================================= --- trunk/staj-projeleri/yali-kahya/yalireadpiksnew.py (original) +++ trunk/staj-projeleri/yali-kahya/yalireadpiksnew.py Tue Oct 2 15:56:37 2007 @@ -4,7 +4,7 @@ import piksemel import sys -class yaliKickstartData: +class kahyaData: def __init__(self): self.language=None self.keyData=Keymap() @@ -40,7 +40,7 @@ def read(args): doc=piksemel.parse(args) - data=yaliKickstartData() + data=kahyaData() data.language=doc.getTagData("language") data.keyData.X=doc.getTagData("keymap") data.rootPassword=doc.getTagData("root_password") From uludag-commits at pardus.org.tr Tue Oct 2 16:08:31 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 16:08:31 +0300 (EEST) Subject: [Uludag-commits] r15594 - in trunk/yali/yali: . gui Message-ID: <20071002130831.36FFE6FBFF@liste.uludag.org.tr> Author: zey.sagar Date: Tue Oct 2 16:08:30 2007 New Revision: 15594 Added: trunk/yali/yali/gui/ScrKahyaCheck.py trunk/yali/yali/kahya.py Modified: trunk/yali/yali/options.py Log: dryRun: just show options Modified: trunk/yali/yali/options.py ================================================================= --- trunk/yali/yali/options.py (original) +++ trunk/yali/yali/options.py Tue Oct 2 16:08:30 2007 @@ -21,6 +21,10 @@ parser.add_option("-d", "--debug", dest="debug", action="store_true", default="False", help="enable debug") + + parser.add_option("-r", "--dryRun", dest="dryRun", + action="store_true", default="False", + help="only show the result") parser.add_option("-k", "--kahyaFile", dest="kahyaFile", help="Run with Kahya file", metavar="FILE") self.options, self.args = parser.parse_args() From uludag-commits at pardus.org.tr Tue Oct 2 16:09:31 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 16:09:31 +0300 (EEST) Subject: [Uludag-commits] r15595 - in trunk/staj-projeleri: Pakito-eski Pakito/po Message-ID: <20071002130931.B19596FBFF@liste.uludag.org.tr> Author: gokcen.eraslan Date: Tue Oct 2 16:09:31 2007 New Revision: 15595 Added: trunk/staj-projeleri/Pakito/po/ trunk/staj-projeleri/Pakito/po/README trunk/staj-projeleri/Pakito/po/es.po - copied unchanged from r15593, trunk/staj-projeleri/Pakito-eski/po/es.po trunk/staj-projeleri/Pakito/po/fr.po - copied unchanged from r15593, trunk/staj-projeleri/Pakito-eski/po/fr.po trunk/staj-projeleri/Pakito/po/pakito.pot - copied unchanged from r15593, trunk/staj-projeleri/Pakito-eski/po/packager.pot trunk/staj-projeleri/Pakito/po/tr.po - copied unchanged from r15593, trunk/staj-projeleri/Pakito-eski/po/tr.po Removed: trunk/staj-projeleri/Pakito-eski/ Log: remove pakito-eski, save the translations for future From uludag-commits at pardus.org.tr Tue Oct 2 16:25:01 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 16:25:01 +0300 (EEST) Subject: [Uludag-commits] r15596 - trunk/staj-projeleri/scanner/src Message-ID: <20071002132501.D06C3F84F@liste.uludag.org.tr> Author: asli.okur Date: Tue Oct 2 16:25:01 2007 New Revision: 15596 Modified: trunk/staj-projeleri/scanner/src/main.py trunk/staj-projeleri/scanner/src/scanner.py Log: KApplication calisiyor Modified: trunk/staj-projeleri/scanner/src/main.py ================================================================= --- trunk/staj-projeleri/scanner/src/main.py (original) +++ trunk/staj-projeleri/scanner/src/main.py Tue Oct 2 16:25:01 2007 @@ -9,33 +9,35 @@ from scanner import * import pickle -#version = '0.1' -#description = "Scanner Interface" +version = '0.1' +description = "Scanner Interface" -#def loadIcon(name, group=KIcon.Desktop): - #return KGlobal.iconLoader().loadIcon(name, group) +def loadIcon(name, group=KIcon.Desktop): + return KGlobal.iconLoader().loadIcon(name, group) -#def loadIconSet(name, group=KIcon.Desktop): - #return KGlobal.iconLoader().loadIconSet(name, group) +def loadIconSet(name, group=KIcon.Desktop): + return KGlobal.iconLoader().loadIconSet(name, group) -#def AboutData(): - #about_data = KAboutData( - #'scanner', - #'Scanner', - #version, - #description, - #KAboutData.License_GPL, - #'(C) 2007 UEKAE/TÜBÝTAK', - #None, - #None, - #'blabla at pardus.org.tr') - #return about_data +def AboutData(): + about_data = KAboutData( + 'scanner', + 'Scanner', + version, + description, + KAboutData.License_GPL, + '(C) 2007 UEKAE/TÜBÝTAK', + None, + None, + 'bugzilla at pardus.org.tr') + about_data.addAuthor("Barýþ Can Daylýk", "Main Developer", None) + about_data.addAuthor("Aslý Okur", "GUI Developer and Current Maintainer", "asliokur at yahoo.com") + return about_data class Main(KDialog): def __init__(self,parent = None,name = None,modal = 0,fl = 0): KDialog.__init__(self,parent,name,modal,fl) - - #self.setIcon(loadIcon("scanner")) + self.connect(kapp, SIGNAL("shutDown()"), self.slotQuit) + self.setIcon(loadIcon("scanner")) if not name: self.setName("Main") @@ -120,6 +122,10 @@ + def slotQuit(self): + #sane.exit() + self.deleteLater() + kapp.quit() def languageChange(self): self.setCaption(self.__tr("Please Select a Device")) @@ -134,6 +140,7 @@ def quit(self): sane.exit() + #self.queryExit() def openDevice(self,device = None): if device == None: @@ -154,24 +161,25 @@ if __name__ == "__main__": - ##a = KApplication(sys.argv,"") - #about_data = AboutData() - #KCmdLineArgs.init(sys.argv,about_data) - #a = KUniqueApplication(True, True, True) - ##QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()")) - #mainForm = Main() - #a.setMainWidget(mainForm) + global kapp + #a = KApplication(sys.argv,"") + about_data = AboutData() + KCmdLineArgs.init(sys.argv,about_data) + kapp = KUniqueApplication(True, True, True) + #QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()")) + mainForm = Main() + kapp.setMainWidget(mainForm) #QObject.connect(a, SIGNAL("aboutToQuit()"), mainForm.quit) - ##QObject.connect(a, SIGNAL("aboutToQuit()"), a, SLOT("quit()")) - ##QObject.connect(a,SIGNAL("lastWindowClosed()"),mainForm.quit) - ##a.exec_loop() - #sys.exit(mainForm.exec_loop()) + #QObject.connect(a, SIGNAL("aboutToQuit()"), a, SLOT("quit()")) + #QObject.connect(a, SIGNAL("lastWindowClosed()"),mainForm.quit) + #a.exec_loop() + sys.exit(kapp.exec_loop()) - a = QApplication(sys.argv) - QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()")) - mainForm = Main() - a.setMainWidget(mainForm) - QObject.connect(a,SIGNAL("lastWindowClosed()"),mainForm.quit) - a.exec_loop() + #a = QApplication(sys.argv) + #QObject.connect(a,SIGNAL("lastWindowClosed()"),a,SLOT("quit()")) + #mainForm = Main() + #a.setMainWidget(mainForm) + #QObject.connect(a,SIGNAL("lastWindowClosed()"),mainForm.quit) + #a.exec_loop() Modified: trunk/staj-projeleri/scanner/src/scanner.py ================================================================= --- trunk/staj-projeleri/scanner/src/scanner.py (original) +++ trunk/staj-projeleri/scanner/src/scanner.py Tue Oct 2 16:25:01 2007 @@ -15,9 +15,9 @@ from scanthread import * -class ScanWindow(QMainWindow): +class ScanWindow(KMainWindow): def __init__(self,parent = None,name = None,fl = 0): - QMainWindow.__init__(self,parent,name,fl) + KMainWindow.__init__(self,parent,name,fl) #sane.init() @@ -60,19 +60,8 @@ self.connect(self.progress,SIGNAL("canceled()"),self.stopScan) - - self.helpContentsAction = QAction(self,"helpContentsAction") - self.helpIndexAction = QAction(self,"helpIndexAction") - self.helpAboutAction = QAction(self,"helpAboutAction") - - self.MenuBar = QMenuBar(self,"MenuBar") - - self.helpMenu = QPopupMenu(self) - self.helpContentsAction.addTo(self.helpMenu) - self.helpIndexAction.addTo(self.helpMenu) - self.helpMenu.insertSeparator() - self.helpAboutAction.addTo(self.helpMenu) - self.MenuBar.insertItem(QString(""),self.helpMenu,1) + self.menuBar() + self.menuBar().insertItem(QString("Help"), self.helpMenu()) self.noDeviceSelected() @@ -81,37 +70,12 @@ self.resize(QSize(744,588).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) - self.connect(self.helpIndexAction,SIGNAL("activated()"),self.helpIndex) - self.connect(self.helpContentsAction,SIGNAL("activated()"),self.helpContents) - self.connect(self.helpAboutAction,SIGNAL("activated()"),self.helpAbout) - def exit(self): print "exiting" sane.exit() def languageChange(self): self.setCaption(self.__tr("Scanner")) - self.helpContentsAction.setText(self.__tr("Contents")) - self.helpContentsAction.setMenuText(self.__tr("&Contents...")) - self.helpContentsAction.setAccel(QString.null) - self.helpIndexAction.setText(self.__tr("Index")) - self.helpIndexAction.setMenuText(self.__tr("&Index...")) - self.helpIndexAction.setAccel(QString.null) - self.helpAboutAction.setText(self.__tr("About")) - self.helpAboutAction.setMenuText(self.__tr("&About")) - self.helpAboutAction.setAccel(QString.null) - if self.MenuBar.findItem(1): - self.MenuBar.findItem(1).setText(self.__tr("&Help")) - - - def helpIndex(self): - print "Scanner.helpIndex(): Not implemented yet" - - def helpContents(self): - print "Scanner.helpContents(): Not implemented yet" - - def helpAbout(self): - about = QMessageBox.about(self, "About", "Bu program Pardus staj projeleri kapsaminda hazirlanmistir." ) def __tr(self,s,c = None): return qApp.translate("Scanner",s,c) From uludag-commits at pardus.org.tr Tue Oct 2 16:32:31 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 16:32:31 +0300 (EEST) Subject: [Uludag-commits] r15597 - trunk/staj-projeleri/scanner/src Message-ID: <20071002133231.DC2496FBFE@liste.uludag.org.tr> Author: asli.okur Date: Tue Oct 2 16:32:31 2007 New Revision: 15597 Modified: trunk/staj-projeleri/scanner/src/ (props changed) Log: *.pyc ignored From uludag-commits at pardus.org.tr Tue Oct 2 22:15:22 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 22:15:22 +0300 (EEST) Subject: [Uludag-commits] r15598 - trunk/tasma/network-manager Message-ID: <20071002191522.A83F48641FA@liste.uludag.org.tr> Author: gurer Date: Tue Oct 2 22:15:21 2007 New Revision: 15598 Modified: trunk/tasma/network-manager/connection.py Log: eðer tek bir aygýt varsa, ama bu aygýt profilde set edili olan deðilse, seçim butonunu aktif yap Modified: trunk/tasma/network-manager/connection.py ================================================================= --- trunk/tasma/network-manager/connection.py (original) +++ trunk/tasma/network-manager/connection.py Tue Oct 2 22:15:21 2007 @@ -464,6 +464,8 @@ id += 1 if id > 1 or (self.conn and not self.conn.devname): self.devices_but.setEnabled(True) + if id == 1 and self.conn and (self.conn.devid != self.device_items[0][0]): + self.devices_but.setEnabled(True) def slotDeviceSelect(self, id): item = self.device_items[id] From uludag-commits at pardus.org.tr Tue Oct 2 22:44:14 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 22:44:14 +0300 (EEST) Subject: [Uludag-commits] r15599 - trunk/tasma/network-manager Message-ID: <20071002194414.4C553F273@liste.uludag.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 From uludag-commits at pardus.org.tr Tue Oct 2 22:46:04 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Tue, 2 Oct 2007 22:46:04 +0300 (EEST) Subject: [Uludag-commits] r15600 - trunk/tasma/network-manager Message-ID: <20071002194604.B5AE9F273@liste.uludag.org.tr> Author: bahadir.kandemir Date: Tue Oct 2 22:46:04 2007 New Revision: 15600 Modified: trunk/tasma/network-manager/network-manager.py trunk/tasma/network-manager/setup.py Log: bump Modified: trunk/tasma/network-manager/network-manager.py ================================================================= --- trunk/tasma/network-manager/network-manager.py (original) +++ trunk/tasma/network-manager/network-manager.py Tue Oct 2 22:46:04 2007 @@ -21,7 +21,7 @@ def I18N_NOOP(x): return x -mod_version = "1.15.2" +mod_version = "1.15.3" mod_app = "network-manager" Modified: trunk/tasma/network-manager/setup.py ================================================================= --- trunk/tasma/network-manager/setup.py (original) +++ trunk/tasma/network-manager/setup.py Tue Oct 2 22:46:04 2007 @@ -17,7 +17,7 @@ import shutil import kdedistutils -version = "1.15.2" +version = "1.15.3" distfiles = """ README From uludag-commits at pardus.org.tr Wed Oct 3 08:52:16 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 3 Oct 2007 08:52:16 +0300 (EEST) Subject: [Uludag-commits] r15601 - trunk/repository-scripts/xorg Message-ID: <20071003055216.CDEE086404F@liste.uludag.org.tr> Author: caglar Date: Wed Oct 3 08:52:16 2007 New Revision: 15601 Modified: trunk/repository-scripts/xorg/input trunk/repository-scripts/xorg/video Log: bump Modified: trunk/repository-scripts/xorg/input ================================================================= --- trunk/repository-scripts/xorg/input (original) +++ trunk/repository-scripts/xorg/input Wed Oct 3 08:52:16 2007 @@ -23,5 +23,5 @@ xf86-input-summa-1.1.0.tar.bz2 xf86-input-tek4957-1.1.0.tar.bz2 xf86-input-ur98-1.1.0.tar.bz2 -xf86-input-vmmouse-12.4.2.tar.bz2 +xf86-input-vmmouse-12.4.3.tar.bz2 xf86-input-void-1.1.1.tar.bz2 Modified: trunk/repository-scripts/xorg/video ================================================================= --- trunk/repository-scripts/xorg/video (original) +++ trunk/repository-scripts/xorg/video Wed Oct 3 08:52:16 2007 @@ -13,7 +13,7 @@ xf86-video-i740-1.1.0.tar.bz2 xf86-video-intel-2.1.1.tar.bz2 xf86-video-imstt-1.1.0.tar.bz2 -xf86-video-mga-1.9.99.tar.bz2 +xf86-video-mga-1.9.100.tar.bz2 xf86-video-neomagic-1.1.1.tar.bz2 xf86-video-newport-0.2.1.tar.bz2 xf86-video-nsc-2.8.3.tar.bz2 @@ -34,6 +34,6 @@ xf86-video-vesa-1.3.0.tar.bz2 xf86-video-vga-4.1.0.tar.bz2 xf86-video-via-0.2.2.tar.bz2 -xf86-video-vmware-10.15.1.tar.bz2 +xf86-video-vmware-10.15.2.tar.bz2 xf86-video-voodoo-1.1.1.tar.bz2 xf86-video-xgi-1.5.0.tar.bz2 From uludag-commits at pardus.org.tr Wed Oct 3 11:27:53 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 3 Oct 2007 11:27:53 +0300 (EEST) Subject: [Uludag-commits] r15602 - trunk/staj-projeleri/scanner/src Message-ID: <20071003082753.962128641FA@liste.uludag.org.tr> Author: asli.okur Date: Wed Oct 3 11:27:53 2007 New Revision: 15602 Modified: trunk/staj-projeleri/scanner/src/previewImage.py trunk/staj-projeleri/scanner/src/scanner.py Log: KToolbar eklendi ve eski toolbar çýkarýldý. Tulliana iconlarý kullanýldý. Actual Size'daki problem düzeltildi. Preview ve Scan için yeni ikon gerekli, þimdilik scanner ikonu kondu. Modified: trunk/staj-projeleri/scanner/src/previewImage.py ================================================================= --- trunk/staj-projeleri/scanner/src/previewImage.py (original) +++ trunk/staj-projeleri/scanner/src/previewImage.py Wed Oct 3 11:27:53 2007 @@ -242,11 +242,23 @@ self.fit() def zoomactual(self): - self.scaleFactor = 1; - self.updateGeometry() + + width = qApp.desktop().width() + height = qApp.desktop().height() + + widthImage = self.initImage.width() + heightImage = self.initImage.height() + + sc = float(width) / widthImage + if sc > float(height)/heightImage: + sc = float(height)/heightImage + + self.scaleFactor = sc + + self.updateGeometry() self.needsReposition = True self.update() - + def zoomin(self): self.scaleFactor *= 1.1 self.updateGeometry() Modified: trunk/staj-projeleri/scanner/src/scanner.py ================================================================= --- trunk/staj-projeleri/scanner/src/scanner.py (original) +++ trunk/staj-projeleri/scanner/src/scanner.py Wed Oct 3 11:27:53 2007 @@ -15,6 +15,11 @@ from scanthread import * +from toolbarimages import * + +def loadIcon(name, group=KIcon.MainToolbar): + return KGlobal.iconLoader().loadIcon(name, group) + class ScanWindow(KMainWindow): def __init__(self,parent = None,name = None,fl = 0): KMainWindow.__init__(self,parent,name,fl) @@ -36,20 +41,32 @@ self.connect(self.options,PYSIGNAL("newDeviceSelected"),self.newDeviceSelected) self.connect(self.options,PYSIGNAL("noDeviceSelected"),self.noDeviceSelected) + + self.toolBar() + #self.toolBar().setBarPos(KToolBar.Left) + self.previewArea = PreviewArea(self.centralWidget()) + + self.toolBar().insertButton(loadIcon("scanner"), 1, SIGNAL("released()"), self.previewScan, True, "Preview") + self.toolBar().insertButton(loadIcon("scanner"), 2, SIGNAL("released()"), self.startScan, True, "Scan") + self.toolBar().insertButton(loadIcon("view_remove"), 3, SIGNAL("released()"), self.previewArea.previewImage.fit, True, "Fit Scan Area") + self.toolBar().insertButton(loadIcon("view_fit_window"), 4, SIGNAL("released()"), self.previewArea.previewImage.fitSelect, True, "Fit Selected Area") + self.toolBar().insertButton(loadIcon("viewmag+"), 5, SIGNAL("released()"), self.previewArea.previewImage.zoomin, True, "Zoom In") + self.toolBar().insertButton(loadIcon("viewmag1"), 6, SIGNAL("released()"), self.previewArea.previewImage.zoomactual, True, "Actual Size") + self.toolBar().insertButton(loadIcon("viewmag-"), 7, SIGNAL("released()"), self.previewArea.previewImage.zoomout, True, "Zoom Out") - self.toolbar = Toolbar(self.centralWidget()) - self.hLayout.addWidget(self.toolbar) + #self.toolbar = Toolbar(self.centralWidget()) + #self.hLayout.addWidget(self.toolbar) - self.previewArea = PreviewArea(self.centralWidget()) + #self.previewArea = PreviewArea(self.centralWidget()) self.hLayout.addWidget(self.previewArea) - self.connect(self.toolbar.previewButton,SIGNAL("released()"),self.previewScan) - self.connect(self.toolbar.scanButton,SIGNAL("released()"),self.startScan) - self.connect(self.toolbar.fitButton,SIGNAL("released()"),self.previewArea.previewImage.fit) - self.connect(self.toolbar.fitSelectButton,SIGNAL("released()"),self.previewArea.previewImage.fitSelect) - self.connect(self.toolbar.zoominButton,SIGNAL("released()"),self.previewArea.previewImage.zoomin) - self.connect(self.toolbar.actualSizeButton,SIGNAL("released()"),self.previewArea.previewImage.zoomactual) - self.connect(self.toolbar.zoomoutButton,SIGNAL("released()"),self.previewArea.previewImage.zoomout) + #self.connect(self.toolbar.previewButton,SIGNAL("released()"),self.previewScan) + #self.connect(self.toolbar.scanButton,SIGNAL("released()"),self.startScan) + #self.connect(self.toolbar.fitButton,SIGNAL("released()"),self.previewArea.previewImage.fit) + #self.connect(self.toolbar.fitSelectButton,SIGNAL("released()"),self.previewArea.previewImage.fitSelect) + #self.connect(self.toolbar.zoominButton,SIGNAL("released()"),self.previewArea.previewImage.zoomin) + #self.connect(self.toolbar.actualSizeButton,SIGNAL("released()"),self.previewArea.previewImage.zoomactual) + #self.connect(self.toolbar.zoomoutButton,SIGNAL("released()"),self.previewArea.previewImage.zoomout) self.connect(self.previewArea.previewImage,PYSIGNAL("selectionCreated"),self.selectArea) @@ -67,7 +84,7 @@ self.languageChange() - self.resize(QSize(744,588).expandedTo(self.minimumSizeHint())) + self.resize(QSize(744,600).expandedTo(self.minimumSizeHint())) self.clearWState(Qt.WState_Polished) def exit(self): @@ -81,7 +98,8 @@ return qApp.translate("Scanner",s,c) def newDeviceSelected(self): - self.toolbar.setEnabled(True) + #self.toolbar.setEnabled(True) + self.toolBar().setEnabled(True) self.previewArea.setEnabled(True) br_x = br_y = -1 if self.options.device != None: @@ -94,7 +112,8 @@ self.previewArea.formEmptyImage(br_x,br_y) def noDeviceSelected(self): - self.toolbar.setEnabled(False) + #self.toolbar.setEnabled(False) + self.toolBar().setEnabled(False) self.previewArea.noImage() self.previewArea.setEnabled(False) From uludag-commits at pardus.org.tr Wed Oct 3 11:35:27 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 3 Oct 2007 11:35:27 +0300 (EEST) Subject: [Uludag-commits] r15603 - branches/pisi-db/pisi/db Message-ID: <20071003083527.7A4E186404F@liste.uludag.org.tr> Author: faik Date: Wed Oct 3 11:35:26 2007 New Revision: 15603 Modified: branches/pisi-db/pisi/db/repodb.py Log: Repo order management Modified: branches/pisi-db/pisi/db/repodb.py ================================================================= --- branches/pisi-db/pisi/db/repodb.py (original) +++ branches/pisi-db/pisi/db/repodb.py Wed Oct 3 11:35:26 2007 @@ -26,10 +26,74 @@ medias = (cd, usb, remote, local) = range(4) +class RepoOrder: + + def __init__(self): + self.repos = self._get_repos() + + def add(self, repo_name, repo_url, repo_type="remote"): + repo_doc = self._get_doc() + + try: + node = [x for x in repo_doc.tags("Repo")][-1] + repo_node = node.appendTag("Repo") + except IndexError: + repo_node = repo_doc.insertTag("Repo") + + name_node = repo_node.insertTag("Name") + name_node.insertData(repo_name) + + url_node = repo_node.insertTag("Url") + url_node.insertData(repo_url) + + media_node = repo_node.insertTag("Media") + media_node.insertData(repo_type) + + self._update(repo_doc) + + def remove(self, repo_name): + repo_doc = self._get_doc() + + for r in repo_doc.tags("Repo"): + if r.getTagData("Name") == repo_name: + r.hide() + + self._update(repo_doc) + + def get_order(self): + order = [] + + #FIXME: get media order from pisi.conf + for m in ["cd", "usb", "remote", "local"]: + if self.repos.has_key(m): + order.extend(self.repos[m]) + + return order + + def _update(self, doc): + repos_file = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.repos) + open(repos_file, "w").write("%s\n" % doc.toPrettyString()) + self.repos = self._get_repos() + + def _get_doc(self): + repos_file = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.repos) + return piksemel.parse(repos_file) + + def _get_repos(self): + repo_doc = self._get_doc() + order = {} + + for r in repo_doc.tags("Repo"): + media = r.getTagData("Media") + name = r.getTagData("Name") + order.setdefault(media, []).append(name) + + return order + class RepoDB(object): def __init__(self): - self.__repoorder = self.__get_repoorder() + self.repoorder = RepoOrder() def has_repo(self, name): return name in self.list_repos() @@ -50,9 +114,11 @@ os.makedirs(repo_path) urifile_path = pisi.util.join_path(ctx.config.index_dir(), name, "uri") uri = open(urifile_path, "w").write(repo_info.indexuri.get_uri()) + self.repoorder.add(name, repo_info.indexuri.get_uri()) def remove_repo(self, name): pisi.util.clean_dir(os.path.join(ctx.config.index_dir(), name)) + self.repoorder.remove(name) def get_source_repos(self): repos = [] @@ -69,23 +135,4 @@ return repos def list_repos(self): - order = [] - - #FIXME: get media order from pisi.conf - for m in ["cd", "usb", "remote", "local"]: - if self.__repoorder.has_key(m): - order.extend(self.__repoorder[m]) - - return order - - def __get_repoorder(self): - repos_file = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.repos) - repos = piksemel.parse(repos_file) - order = {} - - for r in repos.tags(): - media = r.getTagData("Media") - name = r.getTagData("Name") - order.setdefault(media, []).append(name) - - return order + return self.repoorder.get_order() From uludag-commits at pardus.org.tr Wed Oct 3 12:42:20 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 3 Oct 2007 12:42:20 +0300 (EEST) Subject: [Uludag-commits] r15604 - branches/pisi-db/pisi/db Message-ID: <20071003094220.1CAF18641FA@liste.uludag.org.tr> Author: faik Date: Wed Oct 3 12:42:19 2007 New Revision: 15604 Modified: branches/pisi-db/pisi/db/installdb.py Log: Fix pending state info Modified: branches/pisi-db/pisi/db/installdb.py ================================================================= --- branches/pisi-db/pisi/db/installdb.py (original) +++ branches/pisi-db/pisi/db/installdb.py Wed Oct 3 12:42:19 2007 @@ -119,7 +119,11 @@ files_xml = os.path.join(self.__package_path(package), ctx.const.files_xml) ctime = pisi.util.creation_time(files_xml) pkg = self.get_package(package) - info = InstallInfo("i", + state = "i" + if pkg.name in self.list_pending(): + state = "ip" + + info = InstallInfo(state, pkg.version, pkg.release, pkg.build, From uludag-commits at pardus.org.tr Wed Oct 3 13:26:05 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 3 Oct 2007 13:26:05 +0300 (EEST) Subject: [Uludag-commits] r15605 - in branches/pisi-db: . pisi Message-ID: <20071003102605.68CEC86404F@liste.uludag.org.tr> Author: faik Date: Wed Oct 3 13:26:04 2007 New Revision: 15605 Modified: branches/pisi-db/RefactorPlan branches/pisi-db/pisi/dependency.py branches/pisi-db/pisi/relation.py Log: pkg_name parameter is unused satisfies_relation function takes an unused parameter. Also remove this item from RefactorPlan. Modified: branches/pisi-db/RefactorPlan ================================================================= --- branches/pisi-db/RefactorPlan (original) +++ branches/pisi-db/RefactorPlan Wed Oct 3 13:26:04 2007 @@ -96,10 +96,6 @@ ones named tmpDir/tmp_dir/target_dir) are redundant now. See http://liste.uludag.org.tr/uludag-commits/2007-February/010070.html -* conflict.py -conflicts method takes a pkg_name parameter but doesn't use it at all - - ==> Fixes (that need API breakage) * http://liste.uludag.org.tr/uludag-commits/2007-February/010117.html Modified: branches/pisi-db/pisi/dependency.py ================================================================= --- branches/pisi-db/pisi/dependency.py (original) +++ branches/pisi-db/pisi/dependency.py Wed Oct 3 13:26:04 2007 @@ -45,7 +45,7 @@ else: pkg = dict[pkg_name] (version, release) = (pkg.version, pkg.release) - return depinfo.satisfies_relation(pkg_name, version, release) + return depinfo.satisfies_relation(version, release) def installed_satisfies_dep(depinfo): """determine if a package in *repository* satisfies given @@ -61,7 +61,7 @@ else: pkg = ctx.packagedb.get_package(pkg_name) (version, release) = (pkg.version, pkg.release) - return depinfo.satisfies_relation(pkg_name, version, release) + return depinfo.satisfies_relation(version, release) def satisfies_dependencies(pkg, deps, sat = installed_satisfies_dep): for dep in deps: Modified: branches/pisi-db/pisi/relation.py ================================================================= --- branches/pisi-db/pisi/relation.py (original) +++ branches/pisi-db/pisi/relation.py Wed Oct 3 13:26:04 2007 @@ -31,7 +31,7 @@ a_releaseFrom = [autoxml.String, autoxml.optional] a_releaseTo = [autoxml.String, autoxml.optional] - def satisfies_relation(self, pkg_name, version, release): + def satisfies_relation(self, version, release): ret = True v = pisi.version.Version(version) if self.version: @@ -56,4 +56,4 @@ else: pkg = ctx.installdb.get_package(pkg_name) (version, release) = (pkg.version, pkg.release) - return relation.satisfies_relation(pkg_name, version, release) + return relation.satisfies_relation(version, release) From uludag-commits at pardus.org.tr Wed Oct 3 13:26:08 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 3 Oct 2007 13:26:08 +0300 (EEST) Subject: [Uludag-commits] r15606 - in branches/pisi-db/pisi: . db Message-ID: <20071003102608.8941786404F@liste.uludag.org.tr> Author: faik Date: Wed Oct 3 13:26:07 2007 New Revision: 15606 Modified: branches/pisi-db/pisi/config.py branches/pisi-db/pisi/configfile.py branches/pisi-db/pisi/constants.py branches/pisi-db/pisi/db/filesdb.py branches/pisi-db/pisi/db/installdb.py branches/pisi-db/pisi/db/repodb.py Log: info_dir We do not have a database, we will have some managable text info files. Create info_dir if not exists. Modified: branches/pisi-db/pisi/config.py ================================================================= --- branches/pisi-db/pisi/config.py (original) +++ branches/pisi-db/pisi/config.py Wed Oct 3 13:26:07 2007 @@ -92,8 +92,8 @@ def lib_dir(self): return self.subdir(self.values.dirs.lib_dir) - def db_dir(self): - return self.subdir(self.values.dirs.db_dir) + def info_dir(self): + return self.subdir(self.values.dirs.info_dir) def archives_dir(self): return self.subdir(self.values.dirs.archives_dir) Modified: branches/pisi-db/pisi/configfile.py ================================================================= --- branches/pisi-db/pisi/configfile.py (original) +++ branches/pisi-db/pisi/configfile.py Wed Oct 3 13:26:07 2007 @@ -35,7 +35,7 @@ # #[directories] #lib_dir = /var/lib/pisi -#db_dir = /var/db/pisi +#info_dir = "/var/lib/pisi/info" #archives_dir = /var/cache/pisi/archives #packages_dir = /var/cache/pisi/packages #compiled_packages_dir = "/var/cache/pisi/packages" @@ -87,7 +87,7 @@ "Default values for [directories] section" lib_dir = "/var/lib/pisi" log_dir = "/var/log" - db_dir = "/var/db/pisi" + info_dir = "/var/lib/pisi/info" archives_dir = "/var/cache/pisi/archives" packages_dir = "/var/cache/pisi/packages" compiled_packages_dir = "/var/cache/pisi/packages" Modified: branches/pisi-db/pisi/constants.py ================================================================= --- branches/pisi-db/pisi/constants.py (original) +++ branches/pisi-db/pisi/constants.py Wed Oct 3 13:26:07 2007 @@ -81,7 +81,6 @@ self.__c.install_tar_lzma = "install.tar.lzma" self.__c.mirrors_conf = "/etc/pisi/mirrors.conf" self.__c.config_pending = "configpending" - self.__c.info_dir = "info" self.__c.files_db = "files.db" self.__c.repos = "repos" Modified: branches/pisi-db/pisi/db/filesdb.py ================================================================= --- branches/pisi-db/pisi/db/filesdb.py (original) +++ branches/pisi-db/pisi/db/filesdb.py Wed Oct 3 13:26:07 2007 @@ -51,7 +51,7 @@ del self.filesdb[md5.new(f.path).digest()] def destroy(self): - files_db = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.files_db) + files_db = os.path.join(ctx.config.info_dir(), ctx.const.files_db) if os.path.exists(files_db): os.unlink(files_db) @@ -63,11 +63,7 @@ if isinstance(self.filesdb, shelve.DbfilenameShelf): return - info_dir = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir) - if not os.path.exists(info_dir): - os.makedirs(info_dir) - - files_db = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.files_db) + files_db = os.path.join(ctx.config.info_dir(), ctx.const.files_db) if not os.path.exists(files_db): flag = "n" Modified: branches/pisi-db/pisi/db/installdb.py ================================================================= --- branches/pisi-db/pisi/db/installdb.py (original) +++ branches/pisi-db/pisi/db/installdb.py Wed Oct 3 13:26:07 2007 @@ -72,7 +72,7 @@ return dict(map(lambda x:pisi.util.parse_package_name(x), os.listdir(packages_path))) def __generate_config_pending(self): - pending_info_path = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.config_pending) + pending_info_path = os.path.join(ctx.config.info_dir(), ctx.const.config_pending) if os.path.exists(pending_info_path): return open(pending_info_path, "r").read().split() return [] @@ -178,11 +178,7 @@ self.__write_config_pending() def __write_config_pending(self): - pending_info_dir = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir) - if not os.path.exists(pending_info_dir): - os.makedirs(pending_info_dir) - - pending_info_file = os.path.join(pending_info_dir, ctx.const.config_pending) + pending_info_file = os.path.join(ctx.config.info_dir(), ctx.const.config_pending) pending = open(pending_info_file, "w") for pkg in set(self.confing_pending_db): pending.write("%s\n" % pkg) Modified: branches/pisi-db/pisi/db/repodb.py ================================================================= --- branches/pisi-db/pisi/db/repodb.py (original) +++ branches/pisi-db/pisi/db/repodb.py Wed Oct 3 13:26:07 2007 @@ -71,14 +71,16 @@ return order def _update(self, doc): - repos_file = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.repos) + repos_file = os.path.join(ctx.config.info_dir(), ctx.const.repos) open(repos_file, "w").write("%s\n" % doc.toPrettyString()) self.repos = self._get_repos() def _get_doc(self): - repos_file = os.path.join(ctx.config.lib_dir(), ctx.const.info_dir, ctx.const.repos) + repos_file = os.path.join(ctx.config.info_dir(), ctx.const.repos) + if not os.path.exists(repos_file): + return piksemel.newDocument("REPOS") return piksemel.parse(repos_file) - + def _get_repos(self): repo_doc = self._get_doc() order = {} From uludag-commits at pardus.org.tr Wed Oct 3 13:44:01 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 3 Oct 2007 13:44:01 +0300 (EEST) Subject: [Uludag-commits] r15607 - branches/pisi-db/pisi/cli Message-ID: <20071003104401.2371F8641FA@liste.uludag.org.tr> Author: caglar Date: Wed Oct 3 13:44:00 2007 New Revision: 15607 Modified: branches/pisi-db/pisi/cli/pisicli.py Log: heta verme hetayý ver :) Modified: branches/pisi-db/pisi/cli/pisicli.py ================================================================= --- branches/pisi-db/pisi/cli/pisicli.py (original) +++ branches/pisi-db/pisi/cli/pisicli.py Wed Oct 3 13:44:00 2007 @@ -118,14 +118,14 @@ sys.exit(0) elif 'help' in opts or 'h' in opts: self.die() - raise Error(_('No command given')) + raise pisi.cli.Error(_('No command given')) cmd_name = args[0] except ParserError: - raise Error(_('Command line parsing error')) + raise pisi.cli.Error(_('Command line parsing error')) self.command = command.Command.get_command(cmd_name, args=orig_args) if not self.command: - raise Error(_("Unrecognized command: %s") % cmd_name) + raise pisi.cli.Error(_("Unrecognized command: %s") % cmd_name) def die(self): pisi.cli.printu('\n' + self.parser.format_help()) From uludag-commits at pardus.org.tr Wed Oct 3 15:04:25 2007 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Wed, 3 Oct 2007 15:04:25 +0300 (EEST) Subject: [Uludag-commits] r15608 - trunk/staj-projeleri/scanner/src Message-ID: <20071003120425.DEAB586404F@liste.uludag.org.tr> Author: asli.okur Date: Wed Oct 3 15:04:14 2007 New Revision: 15608 Modified: trunk/staj-projeleri/scanner/src/main.py trunk/staj-projeleri/scanner/src/scanresultmulti.py Log: KFileDialog eklendi Modified: trunk/staj-projeleri/scanner/src/main.py ================================================================= --- trunk/staj-projeleri/scanner/src/main.py (original) +++ trunk/staj-projeleri/scanner/src/main.py Wed Oct 3 15:04:14 2007 @@ -30,7 +30,7 @@ None, 'bugzilla at pardus.org.tr') about_data.addAuthor("Barýþ Can Daylýk", "Main Developer", None) - about_data.addAuthor("Aslý Okur", "GUI Developer and Current Maintainer", "asliokur at yahoo.com") + about_data.addAuthor("Aslý Okur", "Developer and Current Maintainer", "asliokur at yahoo.com") return about_data class Main(KDialog): @@ -106,7 +106,7 @@ self.clearWState(Qt.WState_Polished) self.scanWindow = ScanWindow() - self.scanWindow.hide(); + self.scanWindow.hide() self.connect(self.scanWindow.options,PYSIGNAL("newDeviceSelected"),self.showScanWindow) @@ -116,7 +116,7 @@ label = QLabel("Loading...",self,"label") MainLayout.addWidget(label) self.scanWindow = ScanWindow() - self.scanWindow.hide(); + self.scanWindow.hide() self.connect(self.scanWindow.options,PYSIGNAL("newDeviceSelected"),self.showScanWindow) self.openDevice(device) Modified: trunk/staj-projeleri/scanner/src/scanresultmulti.py ================================================================= --- trunk/staj-projeleri/scanner/src/scanresultmulti.py (original) +++ trunk/staj-projeleri/scanner/src/scanresultmulti.py Wed Oct 3 15:04:14 2007 @@ -1,11 +1,14 @@ # -*- coding: utf-8 -*- from qt import * +from kdecore import * +from kdeui import * +from kfile import * -class ScanResultMulti(QDialog): - def __init__(self,parent = None,name = None,modal = 0,fl = 0): - QDialog.__init__(self,parent,name,modal,fl) +class ScanResultMulti(KDialog): + def __init__(self,parent = None,name = None,modal = 1,fl = 0): + KDialog.__init__(self,parent,name,modal,fl) self.pixmaps = [] self.items = [] @@ -65,8 +68,8 @@ def languageChange(self): self.setCaption(self.__tr("Scan Result")) - self.saveAllButton.setText(self.__tr("Save All...")) - self.saveSelectedButton.setText(self.__tr("Save Selected...")) + self.saveAllButton.setText(self.__tr("Save All")) + self.saveSelectedButton.setText(self.__tr("Save Selected")) self.cancelButton.setText(self.__tr("Cancel")) @@ -90,8 +93,10 @@ saved = 0 total = 0 outputFormats = QImageIO.outputFormats() - fileDialog = QFileDialog("~","",self,"fileDialog") - fileDialog.setMode(QFileDialog.Directory) + fileDialog = KFileDialog("","",self,"fileDialog", False) + fileDialog.setOperationMode(KFileDialog.Saving) + fileDialog.setFilter("*.png|PNG-Files") +