From uludag-commits at pardus.org.tr Thu May 1 11:50:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 11:50:58 +0300 (EEST) Subject: [Uludag-commits] r17857 - trunk/tasma/package-manager/src Message-ID: <20080501085058.790C813841BC@liste.pardus.org.tr> Author: faik Date: Thu May 1 11:50:58 2008 New Revision: 17857 Modified: trunk/tasma/package-manager/src/Notifier.py trunk/tasma/package-manager/src/package-manager.py Log: duplicate dbus.mainloop.qt3 Modified: trunk/tasma/package-manager/src/Notifier.py ================================================================= --- trunk/tasma/package-manager/src/Notifier.py (original) +++ trunk/tasma/package-manager/src/Notifier.py Thu May 1 11:50:58 2008 @@ -18,7 +18,6 @@ def __init__(self): QObject.__init__(self) - dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) bus = dbus.SessionBus() try: object = bus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications") Modified: trunk/tasma/package-manager/src/package-manager.py ================================================================= --- trunk/tasma/package-manager/src/package-manager.py (original) +++ trunk/tasma/package-manager/src/package-manager.py Thu May 1 11:50:58 2008 @@ -140,8 +140,6 @@ global kapp global packageToInstall - dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) - about_data = AboutData() KCmdLineArgs.init(sys.argv,about_data) KCmdLineArgs.addCmdLineOptions ([("install ", I18N_NOOP("Package to install")), @@ -153,6 +151,9 @@ return kapp = KUniqueApplication(True, True, True) + + dbus.mainloop.qt3.DBusQtMainLoop(set_as_default=True) + debug = False args = KCmdLineArgs.parsedArgs() From uludag-commits at pardus.org.tr Thu May 1 12:57:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 12:57:33 +0300 (EEST) Subject: [Uludag-commits] r17858 - trunk/staj-projeleri/migration/migration Message-ID: <20080501095733.2787C13841FA@liste.pardus.org.tr> Author: muratongan Date: Thu May 1 12:57:32 2008 New Revision: 17858 Modified: trunk/staj-projeleri/migration/migration/wizard.py Log: Fix setNextEnabled bug when no user found Modified: trunk/staj-projeleri/migration/migration/wizard.py ================================================================= --- trunk/staj-projeleri/migration/migration/wizard.py (original) +++ trunk/staj-projeleri/migration/migration/wizard.py Thu May 1 12:57:32 2008 @@ -55,7 +55,6 @@ # User page: self.userpage = UserPage(self) self.addPage(self.userpage, i18n("Selecting User")) - self.addUsers() # Empty Options page: self.optionspage = QWidget(self) self.addPage(self.optionspage, i18n("Selecting Options")) @@ -68,6 +67,7 @@ # Connections: self.connect(self.helpButton(), SIGNAL("clicked()"), self.slotHelp) self.connect(self.kapp, SIGNAL("aboutToQuit()"), self.slotQuit) + self.addUsers() def slotHelp(self): self.helpwin = HelpDialog("migration", i18n("Migration Tool Help"), self) @@ -139,7 +139,6 @@ self.users = partition.allUsers() if len(self.users) == 0: self.userpage.usersBox.setEnabled(False) - self.userpage = UserPage(self) self.setNextEnabled(self.userpage, False) logging.error("No User") for user in self.users: From uludag-commits at pardus.org.tr Thu May 1 12:58:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 12:58:50 +0300 (EEST) Subject: [Uludag-commits] r17859 - trunk/staj-projeleri/migration/migration Message-ID: <20080501095850.F125613841FA@liste.pardus.org.tr> Author: muratongan Date: Thu May 1 12:58:50 2008 New Revision: 17859 Modified: trunk/staj-projeleri/migration/migration/wizard.py Log: fix BUG #7078 by saving migration.log into home dir Modified: trunk/staj-projeleri/migration/migration/wizard.py ================================================================= --- trunk/staj-projeleri/migration/migration/wizard.py (original) +++ trunk/staj-projeleri/migration/migration/wizard.py Thu May 1 12:58:50 2008 @@ -43,7 +43,7 @@ logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)-8s %(message)s', datefmt='%H:%M:%S', - filename='/tmp/migration.log', + filename=os.path.expanduser('~/migration.log'), filemode='w') logging.info("Migration Tool Started") # i18n: From uludag-commits at pardus.org.tr Thu May 1 13:22:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 13:22:36 +0300 (EEST) Subject: [Uludag-commits] r17860 - in trunk/staj-projeleri/migration: . migration Message-ID: <20080501102236.7979D1384122@liste.pardus.org.tr> Author: muratongan Date: Thu May 1 13:22:36 2008 New Revision: 17860 Modified: trunk/staj-projeleri/migration/migration/migration.py trunk/staj-projeleri/migration/setup.py Log: increment version number Modified: trunk/staj-projeleri/migration/migration/migration.py ================================================================= --- trunk/staj-projeleri/migration/migration/migration.py (original) +++ trunk/staj-projeleri/migration/migration/migration.py Thu May 1 13:22:36 2008 @@ -24,7 +24,7 @@ about = KAboutData( "migration", I18N_NOOP("Migration Tool"), - "0.8.4", + "0.8.5", I18N_NOOP("A wizard to transfer files and settings from existing operating systems"), KAboutData.License_GPL, '(C) 2006-2007 UEKAE/TÜBİTAK', Modified: trunk/staj-projeleri/migration/setup.py ================================================================= --- trunk/staj-projeleri/migration/setup.py (original) +++ trunk/staj-projeleri/migration/setup.py Thu May 1 13:22:36 2008 @@ -15,7 +15,7 @@ import shutil import kdedistutils -version = "0.8.4" +version = "0.8.5" distfiles = """ README From uludag-commits at pardus.org.tr Thu May 1 13:45:31 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 13:45:31 +0300 (EEST) Subject: [Uludag-commits] r17861 - branches/yali4/yali4 Message-ID: <20080501104531.826DF13841FE@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 1 13:45:31 2008 New Revision: 17861 Modified: branches/yali4/yali4/filesystem.py branches/yali4/yali4/storage.py branches/yali4/yali4/sysutils.py Log: * Please wait while resizing.. Modified: branches/yali4/yali4/filesystem.py ================================================================= --- branches/yali4/yali4/filesystem.py (original) +++ branches/yali4/yali4/filesystem.py Thu May 1 13:45:31 2008 @@ -211,8 +211,7 @@ cmd_path = sysutils.find_executable("dumpe2fs") if not cmd_path: - e = "Command not found to get information about %s" %(partition) - raise FSError, e + raise FSError, "Command not found to get information about %s" % (partition.getPath()) lines = os.popen("%s -h %s" % (cmd_path, partition.getPath())).readlines() @@ -227,17 +226,16 @@ cmd_path = sysutils.find_executable("e2fsck") if not cmd_path: - e = "Command not found to resize %s filesystem" %(self.name()) - raise FSError, e + raise FSError, "Command not found to resize %s filesystem" % (self.name()) - cmd = "%s -f %s" % (cmd_path, partition.getPath()) + res = sysutils.execClear("e2fsck", + ["-f", "-p", "-C", "0", partition.getPath()], + stdout="/tmp/resize.log", + stderr="/tmp/resize.log") + + if res >= 4: + raise FSError, "FSCheck failed on %s" % (partition.getPath()) - try: - p = os.popen(cmd) - o = p.readlines() - p.close() - except: - return False return True def resize(self, size_mb, partition): @@ -248,20 +246,16 @@ cmd_path = sysutils.find_executable("resize2fs") if not cmd_path: - e = "Command not found to resize %s filesystem" %(self.name()) - raise FSError, e + raise FSError, "Command not found to resize %s filesystem" % (self.name()) - cmd = "%s %s %sM" % (cmd_path, partition.getPath(), str(size_mb)) + res = sysutils.execClear("resize2fs", + ["-f", partition.getPath(), "%sM" %(size_mb)], + stdout="/tmp/resize.log", + stderr="/tmp/resize.log") + if res: + raise FSError, "Resize failed on %s" % (partition.getPath()) - if self.preResize(partition): - try: - p = os.popen(cmd) - o = p.readlines() - p.close() - except: - return False - return True - return False + return True def getLabel(self, partition): return sysutils.e2fslabel(partition.getPath()) @@ -439,7 +433,7 @@ self.setImplemented(True) def check_resize(self, size_mb, partition): - #don't do anything, just check + # don't do anything, just check cmd = "/usr/sbin/ntfsresize -n -f -s %dM %s" %(size_mb, partition.getPath()) p = os.popen(cmd) if p.close(): @@ -449,13 +443,19 @@ def resize(self, size_mb, partition): if size_mb < self.minResizeMB(partition): return False - cmd = "/usr/sbin/ntfsresize -f -s %dM %s" %(size_mb, partition.getPath()) - try: - p = os.popen(cmd, "w") - p.write("y\n") - p.close() - except: - return False + + p = os.pipe() + os.write(p[1], "y\n") + os.close(p[1]) + + res = sysutils.execClear("ntfsresize", + ["-f","-s", "%sM" % (size_mb), partition.getPath()], + stdin = p[0], + stdout = "/tmp/resize.log", + stderr = "/tmp/resize.log") + if res: + raise FSError, "Resize failed on %s " % (partition.getPath()) + return True def setLabel(self, partition, label): Modified: branches/yali4/yali4/storage.py ================================================================= --- branches/yali4/yali4/storage.py (original) +++ branches/yali4/yali4/storage.py Thu May 1 13:45:31 2008 @@ -23,6 +23,7 @@ import parted import os import glob +import time import struct import binascii @@ -460,7 +461,7 @@ ptype = PARTITION_LOGICAL else: ptype = PARTITION_PRIMARY - + time.sleep(3) self.deletePartition(part) self.commit() np = self.addPartitionFromStart(ptype, fs_name, start, size_mb) Modified: branches/yali4/yali4/sysutils.py ================================================================= --- branches/yali4/yali4/sysutils.py (original) +++ branches/yali4/yali4/sysutils.py Thu May 1 13:45:31 2008 @@ -148,6 +148,67 @@ umount(consts.target_dir) fastreboot() +# Shamelessly stolen from Anaconda :) +def execClear(command, argv, stdin = 0, stdout = 1, stderr = 2): + import yali4.gui.context as ctx + + argv = list(argv) + if type(stdin) == type("string"): + if os.access(stdin, os.R_OK): + stdin = open(stdin) + else: + stdin = 0 + if type(stdout) == type("string"): + stdout = open(stdout, "w") + if type(stderr) == type("string"): + stderr = open(stderr, "w") + if stdout is not None and type(stdout) != int: + stdout.write("Running... %s\n" %([command] + argv,)) + + p = os.pipe() + childpid = os.fork() + if not childpid: + os.close(p[0]) + os.dup2(p[1], 1) + os.dup2(stderr.fileno(), 2) + os.dup2(stdin, 0) + os.close(stdin) + os.close(p[1]) + stderr.close() + + os.execvp(command, [command] + argv) + os._exit(1) + + os.close(p[1]) + + while 1: + try: + s = os.read(p[0], 1) + except OSError, args: + (num, str) = args + if (num != 4): + raise IOError, args + + stdout.write(s) + ctx.mainScreen.processEvents() + + if len(s) < 1: + break + + try: + (pid, status) = os.waitpid(childpid, 0) + except OSError, (num, msg): + ctx.debugger.log("exception from waitpid: %s %s" %(num, msg)) + + if status is None: + return 0 + + if os.WIFEXITED(status): + return os.WEXITSTATUS(status) + + return 1 + + ## Run an external program and capture standard out. # @param command The command to run. # @param argv A list of arguments. From uludag-commits at pardus.org.tr Thu May 1 14:44:40 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 14:44:40 +0300 (EEST) Subject: [Uludag-commits] r17862 - branches/yali4/yali4/gui Message-ID: <20080501114441.102B313841E7@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 1 14:44:40 2008 New Revision: 17862 Modified: branches/yali4/yali4/gui/ScrBootloader.py Log: * typo :( Modified: branches/yali4/yali4/gui/ScrBootloader.py ================================================================= --- branches/yali4/yali4/gui/ScrBootloader.py (original) +++ branches/yali4/yali4/gui/ScrBootloader.py Thu May 1 14:44:40 2008 @@ -280,7 +280,7 @@ dev_path = root_part_req.partition().getPath() if dev_path.find("cciss") > 0: # HP Smart array controller (something like /dev/cciss/c0d0p1) - ctx.installData.bootLoaderDev = basename(dev_path)[:-2] + ctx.installData.bootLoaderDev = dev_path[:-2] else: ctx.installData.bootLoaderDev = str(filter(lambda u: not u.isdigit(), basename(dev_path))) From uludag-commits at pardus.org.tr Thu May 1 15:16:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 15:16:27 +0300 (EEST) Subject: [Uludag-commits] r17863 - trunk/comar/comar/etc Message-ID: <20080501121627.518A91384200@liste.pardus.org.tr> Author: faik Date: Thu May 1 15:16:27 2008 New Revision: 17863 Modified: trunk/comar/comar/etc/model.xml Log: no access_label for now Modified: trunk/comar/comar/etc/model.xml ================================================================= --- trunk/comar/comar/etc/model.xml (original) +++ trunk/comar/comar/etc/model.xml Thu May 1 15:16:27 2008 @@ -451,46 +451,46 @@ - + - + - + - + - - + + - + - + - + - + - + - + - + - + From uludag-commits at pardus.org.tr Thu May 1 16:20:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:20:27 +0300 (EEST) Subject: [Uludag-commits] r17864 - branches/buildfarm-devel Message-ID: <20080501132027.3E4262474012@liste.pardus.org.tr> Author: caglar Date: Thu May 1 16:20:26 2008 New Revision: 17864 Modified: branches/buildfarm-devel/config.py branches/buildfarm-devel/main.py Log: horrible hack for seperating -debug packages from main repository Modified: branches/buildfarm-devel/config.py ================================================================= --- branches/buildfarm-devel/config.py (original) +++ branches/buildfarm-devel/config.py Thu May 1 16:20:26 2008 @@ -15,6 +15,7 @@ workDir = "/var/pisi/" outputDir = "/var/cache/pisi/buildlogs/" binaryPath = "/var/cache/pisi/packages/" +binaryDebugPath = "/var/cache/pisi/packages-debug/" localPspecRepo = "%s/exampleRepo" % os.getcwd() logFile = "/var/cache/pisi/buildfarm.log" Modified: branches/buildfarm-devel/main.py ================================================================= --- branches/buildfarm-devel/main.py (original) +++ branches/buildfarm-devel/main.py Thu May 1 16:20:26 2008 @@ -25,6 +25,7 @@ import mailer import qmanager import pisiinterface +import pisi.util """ Gettext Support """ import gettext @@ -69,6 +70,9 @@ try: try: (newBinaryPackages, oldBinaryPackages) = pisi.build(pspec) + print + print newBinaryPackages, oldBinaryPackages + print except Exception, e: qmgr.transferToWaitQueue(pspec) errmsg = _("Error occured for '%s' in BUILD process:\n %s") % (pspec, e) @@ -102,17 +106,18 @@ mailer.info(_("Queue finished without a problem!...\n\n\nNew binary packages are;\n\n%s\n\nnow in repository...") % "\n".join(packageList)) logger.raw() + generateIndex(config.binaryPath) + generateIndex(config.binaryDebugPath) + +def generateIndex(repositoryPath = config.binaryPath): logger.raw() logger.info(_("Generating PiSi Index...")) current = os.getcwd() - os.chdir(config.binaryPath) + os.chdir(repositoryPath) os.system("/usr/bin/pisi index %s . --skip-signing --skip-sources" % config.localPspecRepo) logger.info(_("PiSi Index generated...")) - #FIXME: will be enableb after some internal tests - #os.system("rsync -avze ssh --delete . pisi.pardus.org.tr:/var/www/paketler.uludag.org.tr/htdocs/pardus-1.1/") - # Check packages containing binaries and libraries broken by any package update os.system("/usr/bin/revdep-rebuild --force") # FIXME: if there is any broken package, mail /root/.revdep-rebuild.4_names file @@ -150,37 +155,49 @@ remove = os.remove copy = shutil.copy - def moveOldPackage(package): + def moveOldPackage(package, debug = False): logger.info(_("*** Old package '%s' is processing") % (package)) if exists(join(config.binaryPath, package)): - remove(join(config.binaryPath, package)) + if debug: + remove(join(config.binaryDebugPath, package)) + else: + remove(join(config.binaryPath, package)) if exists(join(config.workDir, package)): remove(join(config.workDir, package)) - def moveNewPackage(package): + def moveNewPackage(package, debug = False): logger.info(_("*** New package '%s' is processing") % (package)) if exists(join(config.workDir, package)): - copy(join(config.workDir, package), config.binaryPath) + if debug: + copy(join(config.workDir, package), config.binaryDebugPath) + else: + copy(join(config.workDir, package), config.binaryPath) remove(join(config.workDir, package)) - def moveUnchangedPackage(package): + def moveUnchangedPackage(package, debug = False): logger.info(_("*** Unchanged package '%s' is processing") % (package)) if exists(join(config.workDir, package)): - copy(join(config.workDir, package), config.binaryPath) + if debug: + copy(join(config.workDir, package), config.binaryDebugPath) + else: + copy(join(config.workDir, package), config.binaryPath) remove(join(config.workDir, package)) for package in newPackages: if package: - moveNewPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveNewPackage(package, isDebug) for package in oldPackages: if package: - moveOldPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveOldPackage(package, isDebug) for package in unchangedPackages: if package: - moveUnchangedPackage(package) + isDebug = (pisi.util.parse_package_name(package)[0]).endswith("-debug") + moveUnchangedPackage(package, isDebug) def removeBinaryPackageFromWorkDir(package): join = os.path.join @@ -190,6 +207,7 @@ def create_directories(): directories = [config.workDir, config.binaryPath, + config.binaryDebugPath, config.localPspecRepo, config.outputDir] From uludag-commits at pardus.org.tr Thu May 1 16:23:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:23:00 +0300 (EEST) Subject: [Uludag-commits] r17865 - branches/buildfarm-devel Message-ID: <20080501132300.795A91384205@liste.pardus.org.tr> Author: caglar Date: Thu May 1 16:23:00 2008 New Revision: 17865 Modified: branches/buildfarm-devel/main.py Log: ignore Modified: branches/buildfarm-devel/main.py ================================================================= --- branches/buildfarm-devel/main.py (original) +++ branches/buildfarm-devel/main.py Thu May 1 16:23:00 2008 @@ -70,9 +70,6 @@ try: try: (newBinaryPackages, oldBinaryPackages) = pisi.build(pspec) - print - print newBinaryPackages, oldBinaryPackages - print except Exception, e: qmgr.transferToWaitQueue(pspec) errmsg = _("Error occured for '%s' in BUILD process:\n %s") % (pspec, e) From uludag-commits at pardus.org.tr Thu May 1 16:39:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:39:00 +0300 (EEST) Subject: [Uludag-commits] r17866 - trunk/pisi/licenses Message-ID: <20080501133900.78C7E138420B@liste.pardus.org.tr> Author: gokcen.eraslan Date: Thu May 1 16:39:00 2008 New Revision: 17866 Added: trunk/pisi/licenses/xiph Log: add xiph license From uludag-commits at pardus.org.tr Thu May 1 16:40:34 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:40:34 +0300 (EEST) Subject: [Uludag-commits] r17867 - trunk/pisi Message-ID: <20080501134034.EF6FE138420B@liste.pardus.org.tr> Author: gokcen.eraslan Date: Thu May 1 16:40:34 2008 New Revision: 17867 Modified: trunk/pisi/pisi-spec.rng Log: add xiph license Modified: trunk/pisi/pisi-spec.rng ================================================================= --- trunk/pisi/pisi-spec.rng (original) +++ trunk/pisi/pisi-spec.rng Thu May 1 16:40:34 2008 @@ -988,6 +988,7 @@ xhost xineramaproto xinit + xiph xkbcomp xkbdata xkbevd From uludag-commits at pardus.org.tr Thu May 1 16:44:59 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 16:44:59 +0300 (EEST) Subject: [Uludag-commits] r17868 - in branches/yali4/yali4: gui/Ui gui/pics images Message-ID: <20080501134500.050C1138420B@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 1 16:44:59 2008 New Revision: 17868 Modified: branches/yali4/yali4/gui/Ui/main.ui branches/yali4/yali4/gui/pics/backardus.png branches/yali4/yali4/gui/pics/helpBack.png branches/yali4/yali4/gui/pics/logo.png branches/yali4/yali4/gui/pics/pardus.png branches/yali4/yali4/gui/pics/welcome.png branches/yali4/yali4/images/checkbox_checked.png branches/yali4/yali4/images/checkbox_checked_hover.png branches/yali4/yali4/images/checkbox_checked_pressed.png branches/yali4/yali4/images/checkbox_unchecked.png branches/yali4/yali4/images/checkbox_unchecked_hover.png branches/yali4/yali4/images/checkbox_unchecked_pressed.png branches/yali4/yali4/images/down_arrow.png branches/yali4/yali4/images/down_arrow_disabled.png branches/yali4/yali4/images/pushbutton.png branches/yali4/yali4/images/pushbutton_hover.png branches/yali4/yali4/images/pushbutton_pressed.png branches/yali4/yali4/images/radiobutton_checked.png branches/yali4/yali4/images/radiobutton_checked_hover.png branches/yali4/yali4/images/radiobutton_checked_pressed.png branches/yali4/yali4/images/radiobutton_unchecked.png branches/yali4/yali4/images/radiobutton_unchecked_hover.png branches/yali4/yali4/images/radiobutton_unchecked_pressed.png branches/yali4/yali4/images/spindown.png branches/yali4/yali4/images/spindown_hover.png branches/yali4/yali4/images/spindown_off.png branches/yali4/yali4/images/spindown_pressed.png branches/yali4/yali4/images/spinup.png branches/yali4/yali4/images/spinup_hover.png branches/yali4/yali4/images/spinup_off.png branches/yali4/yali4/images/spinup_pressed.png branches/yali4/yali4/images/up_arrow.png branches/yali4/yali4/images/up_arrow_disabled.png Log: * New theme, shiny colors, new logo .. oscar goes to Gokhaan .. Modified: branches/yali4/yali4/gui/Ui/main.ui ================================================================= --- branches/yali4/yali4/gui/Ui/main.ui (original) +++ branches/yali4/yali4/gui/Ui/main.ui Thu May 1 16:44:59 2008 @@ -16,7 +16,7 @@ #YaliMain { background-image:url(':/gui/pics/backardus.png') } - +/* QStackedWidget#mainStack { border-style: outset; border-width: 2px; @@ -24,18 +24,18 @@ border-color: beige; background-image:url(':/gui/pics/trans.png'); } - +*/ QTextBrowser#helpContent { - border-style: outset; border-width: 2px; border-top-right-radius:8px; border-bottom-right-radius:8px; border-color: beige; border-left:none; background-image:url(':/gui/pics/helpBack.png'); + background-repeat:no-repeat; padding:5px; padding-top:7px; - font: 8px; + font: 9px; } /* Make text in message boxes selectable. */ Modified: branches/yali4/yali4/gui/pics/backardus.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/pics/helpBack.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/pics/logo.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/pics/pardus.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/gui/pics/welcome.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_checked.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_checked_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_checked_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_unchecked.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_unchecked_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/checkbox_unchecked_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/down_arrow.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/down_arrow_disabled.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/pushbutton.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/pushbutton_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/pushbutton_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_checked.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_checked_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_checked_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_unchecked.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_unchecked_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/radiobutton_unchecked_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spindown.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spindown_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spindown_off.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spindown_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spinup.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spinup_hover.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spinup_off.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/spinup_pressed.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/up_arrow.png ================================================================= Binary files. No diff available. Modified: branches/yali4/yali4/images/up_arrow_disabled.png ================================================================= Binary files. No diff available. From uludag-commits at pardus.org.tr Thu May 1 19:36:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Thu, 1 May 2008 19:36:21 +0300 (EEST) Subject: [Uludag-commits] r17869 - in trunk/sysinfo/sysinfo/about: . images Message-ID: <20080501163621.90CA2138420B@liste.pardus.org.tr> Author: gokmen.goksel Date: Thu May 1 19:36:21 2008 New Revision: 17869 Modified: trunk/sysinfo/sysinfo/about/images/background.png trunk/sysinfo/sysinfo/about/style.css Log: * 2008 Theme. Modified: trunk/sysinfo/sysinfo/about/images/background.png ================================================================= Binary files. No diff available. Modified: trunk/sysinfo/sysinfo/about/style.css ================================================================= --- trunk/sysinfo/sysinfo/about/style.css (original) +++ trunk/sysinfo/sysinfo/about/style.css Thu May 1 19:36:21 2008 @@ -11,7 +11,7 @@ letter-spacing: .1em; color: #fff; margin-left: 180px; - margin-top:30px; + margin-top:37px; } body>h3 { @@ -19,7 +19,7 @@ padding: 0px 0px 5px 180px; font-size: 9pt; font-weight: normal; - letter-spacing: .2em; + letter-spacing: .1em; } div#container1 { From uludag-commits at pardus.org.tr Fri May 2 00:35:42 2008 From: uludag-commits at pardus.org.tr (VIAGRA ® Official Site) Date: Fri, 2 May 2008 00:35:42 +0300 (EEST) Subject: [Uludag-commits] Dear uludag-commits@pardus.org.tr May 86% 0FF Message-ID: <20080502043542.2998.qmail@x1w45yhuxqmbhja> Bir HTML eklentisi temizlendi... URL: http://liste.pardus.org.tr/uludag-commits/attachments/20080502/cd75c830/attachment.htm From uludag-commits at pardus.org.tr Fri May 2 03:25:13 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 03:25:13 +0300 (EEST) Subject: [Uludag-commits] r17870 - trunk/comar/mudur/po Message-ID: <20080502002513.31D2E247400D@liste.pardus.org.tr> Author: mustafaoe Date: Fri May 2 03:25:12 2008 New Revision: 17870 Modified: trunk/comar/mudur/po/de.po Log: German translations updated Modified: trunk/comar/mudur/po/de.po ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Fri May 2 09:39:28 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 09:39:28 +0300 (EEST) Subject: [Uludag-commits] r17871 - trunk/pisi/pisi Message-ID: <20080502063928.B71F61384195@liste.pardus.org.tr> Author: faik Date: Fri May 2 09:39:28 2008 New Revision: 17871 Modified: trunk/pisi/pisi/signalhandler.py Log: This is for manager.py for where oldhandler is None. Modified: trunk/pisi/pisi/signalhandler.py ================================================================= --- trunk/pisi/pisi/signalhandler.py (original) +++ trunk/pisi/pisi/signalhandler.py Fri May 2 09:39:28 2008 @@ -38,7 +38,7 @@ def enable_signal(self, sig): if sig in self.signals.keys(): - oldhandler = self.signals[sig].oldhandler + oldhandler = self.signals[sig].oldhandler if self.signals[sig].oldhandler else signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] signal.signal(sig, oldhandler) From uludag-commits at pardus.org.tr Fri May 2 09:40:44 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 09:40:44 +0300 (EEST) Subject: [Uludag-commits] r17872 - trunk/pisi/pisi Message-ID: <20080502064044.BFC5213841AD@liste.pardus.org.tr> Author: faik Date: Fri May 2 09:40:44 2008 New Revision: 17872 Modified: trunk/pisi/pisi/signalhandler.py Log: make it readable Modified: trunk/pisi/pisi/signalhandler.py ================================================================= --- trunk/pisi/pisi/signalhandler.py (original) +++ trunk/pisi/pisi/signalhandler.py Fri May 2 09:40:44 2008 @@ -38,7 +38,8 @@ def enable_signal(self, sig): if sig in self.signals.keys(): - oldhandler = self.signals[sig].oldhandler if self.signals[sig].oldhandler else signal.SIG_DFL + oldie = self.signals[sig].oldhandler + oldhandler = oldie if oldie else signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] signal.signal(sig, oldhandler) From uludag-commits at pardus.org.tr Fri May 2 11:00:42 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 11:00:42 +0300 (EEST) Subject: [Uludag-commits] r17873 - trunk/pisi/pisi/operations Message-ID: <20080502080042.B098F13841F0@liste.pardus.org.tr> Author: faik Date: Fri May 2 11:00:42 2008 New Revision: 17873 Modified: trunk/pisi/pisi/operations/history.py Log: Sistem Hatası: Program Sonlandırıldı. : need more than 2 values to unpack Genel yardım için lütfen 'pisi help' komutunu kullanınız. Geri-iz: File "/usr/bin/pisi", line 80, in cli.run_command() File "/usr/lib/pardus/pisi/cli/pisicli.py", line 136, in run_command self.command.run() File "/usr/lib/pardus/pisi/cli/history.py", line 89, in run self.takeback(opno) File "/usr/lib/pardus/pisi/cli/history.py", line 60, in takeback pisi.api.takeback(operation) File "/usr/lib/pardus/pisi/api.py", line 348, in takeback pisi.operations.history.takeback(operation) File "/usr/lib/pardus/pisi/operations/history.py", line 120, in takeback beinstalled, beremoved, configs = __listactions(actions) File "/usr/lib/pardus/pisi/operations/history.py", line 44, in __listactions action, pkginfo, operation = actions[pkg] Modified: trunk/pisi/pisi/operations/history.py ================================================================= --- trunk/pisi/pisi/operations/history.py (original) +++ trunk/pisi/pisi/operations/history.py Fri May 2 11:00:42 2008 @@ -104,7 +104,7 @@ if pkg.operation in ["upgrade", "downgrade", "remove"]: actions[pkg.name] = ("install", pkg.before, operation.no) if pkg.operation == "install": - actions[pkg.name] = ("remove", None) + actions[pkg.name] = ("remove", None, operation.no) return actions From uludag-commits at pardus.org.tr Fri May 2 11:31:07 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 11:31:07 +0300 (EEST) Subject: [Uludag-commits] r17874 - trunk/comar/comar/etc Message-ID: <20080502083108.40F5A13840BD@liste.pardus.org.tr> Author: faik Date: Fri May 2 11:31:07 2008 New Revision: 17874 Modified: trunk/comar/comar/etc/model.xml Log: notify -> status Modified: trunk/comar/comar/etc/model.xml ================================================================= --- trunk/comar/comar/etc/model.xml (original) +++ trunk/comar/comar/etc/model.xml Fri May 2 11:31:07 2008 @@ -498,7 +498,7 @@ - + From uludag-commits at pardus.org.tr Fri May 2 12:05:24 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 12:05:24 +0300 (EEST) Subject: [Uludag-commits] r17875 - trunk/tasma/package-manager/src Message-ID: <20080502090524.8C2EB1384222@liste.pardus.org.tr> Author: faik Date: Fri May 2 12:05:23 2008 New Revision: 17875 Modified: trunk/tasma/package-manager/src/ComarIface.py trunk/tasma/package-manager/src/Commander.py trunk/tasma/package-manager/src/MainWidget.py Log: On going comar 2.0 changes Modified: trunk/tasma/package-manager/src/ComarIface.py ================================================================= --- trunk/tasma/package-manager/src/ComarIface.py (original) +++ trunk/tasma/package-manager/src/ComarIface.py Fri May 2 12:05:23 2008 @@ -11,6 +11,7 @@ # Please read the COPYING file from qt import QMutex, SIGNAL +from kdeui import KMessageBox # DBus import dbus @@ -19,10 +20,10 @@ from handler import CallHandler class ComarIface: - def __init__(self): + def __init__(self, handler=None): + self.handler = handler # tray and package-manager synchronization self.com_lock = QMutex() - # setup dbus stuff self.setupBusses() self.setupSignals() @@ -42,22 +43,27 @@ def handleSignals(self, *args, **kwargs): signal = kwargs["signal"] # use args here - pass + if self.handler: + self.handler(signal, args) def busError(self, exception): - KMessageBox.error(self, str(exception), i18n("D-Bus Error")) + KMessageBox.error(self, str(exception), "D-Bus Error") self.setupBusses() + def comarAuthError(self, exception): + KMessageBox.error(self, str(exception), "COMAR Auth Error") + def comarError(self, exception): - KMessageBox.error(self, str(exception), i18n("COMAR Error")) + KMessageBox.error(self, str(exception), "COMAR Error") def callMethod(self, method, action, handler, *args): + print "Method: %s Action: %s" % (method, action) ch = CallHandler("pisi", "System.Manager", method, action, self.sysBus, self.sesBus) ch.registerError(self.comarError) - ch.registerAuthError(self.comarError) + ch.registerAuthError(self.comarAuthError) ch.registerDBusError(self.busError) if handler: Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Fri May 2 12:05:23 2008 @@ -22,69 +22,58 @@ class Commander(QObject): def __init__(self, parent): QObject.__init__(self) - self.parent = parent - try: - self.comar = ComarIface.ComarIface() + self.comar = ComarIface.ComarIface(self.handler) except: parent.showErrorMessage("Cannot connect to Comar daemon") - def wait_comar(self): - # FIXME - return True - - def slotComar(self, sock): - try: - reply = self.comar.com.read_cmd() - except: - if not self.wait_comar(): - self.comar.com_lock.unlock() - self.parent.showErrorMessage(i18n("Can't connect to Comar daemon")) - self.parent.resetState() - self.parent.refreshState() - else: - self.comar = ComarIface.ComarIface() - return - - if reply.command == "notify": - (notification, script, data) = (reply.notify, reply.script, reply.data) - data = unicode(data) + def handler(self, signal, data): + print "Signal: ", signal + print "Data: ", data + if signal == "finished": + command = data[0] + self.comar.com_lock.unlock() + self.parent.finished(command) + elif signal == "progress": + self.parent.displayProgress(data) + elif signal == "notify": + notification = data[0] + args = data[1:] if len(data) > 1 else None if notification == "System.Manager.error": self.comar.com_lock.unlock() - self.parent.showErrorMessage(data) + self.parent.showErrorMessage(args) self.parent.resetState() self.parent.refreshState() elif notification == "System.Manager.notify": - self.parent.pisiNotify(data) - elif notification == "System.Manager.progress": - self.parent.displayProgress(data) + self.parent.pisiNotify(args) elif notification == "System.Manager.finished": self.comar.com_lock.unlock() - self.parent.finished(data) + self.parent.finished(args) elif notification == "System.Manager.updatingRepo": pass elif notification == "System.Manager.warning": self.comar.com_lock.unlock() - self.parent.showWarningMessage(data) + self.parent.showWarningMessage(args) self.parent.resetState() self.parent.refreshState() else: - print "Got notification : %s , for script : %s , with data : %s" % (notification, script, data) + print "Got notification : %s with data : %s" % (signal, data) + # This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If # some misbehaviour is seen, comar.log is always there to look. - elif reply.command == "error": + elif signal == "error": self.comar.com_lock.unlock() self.parent.finished("System.Manager.cancelled") return - elif reply.command == "denied": + elif signal == "denied": self.comar.com_lock.unlock() self.parent.finished("System.Manager.cancelled") self.parent.showErrorMessage(i18n("You do not have permission to do this operation.")) - elif reply.command == "fail": - if reply.data == "System.Manager.cancelled": + elif signal == "fail": + if data == "System.Manager.cancelled": self.comar.com_lock.unlock() - self.parent.finished(reply.data) + self.parent.finished(data) return self.comar.com_lock.unlock() @@ -92,9 +81,10 @@ self.parent.resetState() self.parent.refreshState() + #FIXME: What replaces this in new Comar api # do not show any error if it is the interval check - if not reply.id == ID_TRAY_INTERVAL_CHECK: - self.parent.showErrorMessage(unicode(reply.data)) + # if not reply.id == ID_TRAY_INTERVAL_CHECK: + # self.parent.showErrorMessage(unicode(reply.data)) # if an error occured communicating with comar and components are not ready we should warn if not PisiIface.get_components(): @@ -170,6 +160,7 @@ self.comar.setCache(enabled, limit) def checkCacheLimits(self): + print "checkCacheLimits called" config = PisiIface.read_config("/etc/pisi/pisi.conf") cache = config.get("general", "package_cache") Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Fri May 2 12:05:23 2008 @@ -585,7 +585,6 @@ self.componentsList.setSelected(self.componentsList.firstChild(),True) def displayProgress(self, data): - data = data.split(",") operation = data[0] if operation in ["updatingrepo", "rebuilding-db"]: @@ -626,7 +625,7 @@ self.progressDialog.totalSize = int(data[1]) - int(data[2]) self.progressDialog.updateTotalOperationPercent() self.progressDialog.updateStatus() - + elif operation in ["installing"]: self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1]) self.progressDialog.updatePackageInfo() @@ -678,8 +677,7 @@ PisiIface.reloadPisi() # after every operation check package cache limits - if command not in ["System.Manager.clearCache", - "System.Manager.setRepositories"]: + if command not in ["System.Manager.clearCache", "System.Manager.setRepositories"]: self.command.checkCacheLimits() self.basket.empty() From uludag-commits at pardus.org.tr Fri May 2 14:59:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 14:59:52 +0300 (EEST) Subject: [Uludag-commits] r17876 - trunk/tasma/package-manager/src Message-ID: <20080502115952.8EAF4138418C@liste.pardus.org.tr> Author: faik Date: Fri May 2 14:59:52 2008 New Revision: 17876 Modified: trunk/tasma/package-manager/src/Commander.py trunk/tasma/package-manager/src/MainWidget.py Log: comar 2.0 changes continues Modified: trunk/tasma/package-manager/src/Commander.py ================================================================= --- trunk/tasma/package-manager/src/Commander.py (original) +++ trunk/tasma/package-manager/src/Commander.py Fri May 2 14:59:52 2008 @@ -31,68 +31,63 @@ def handler(self, signal, data): print "Signal: ", signal print "Data: ", data + args = data[1:] if len(data) > 1 else None + if signal == "finished": command = data[0] self.comar.com_lock.unlock() self.parent.finished(command) elif signal == "progress": self.parent.displayProgress(data) - elif signal == "notify": - notification = data[0] - args = data[1:] if len(data) > 1 else None - if notification == "System.Manager.error": - self.comar.com_lock.unlock() - self.parent.showErrorMessage(args) - self.parent.resetState() - self.parent.refreshState() - elif notification == "System.Manager.notify": - self.parent.pisiNotify(args) - elif notification == "System.Manager.finished": - self.comar.com_lock.unlock() - self.parent.finished(args) - elif notification == "System.Manager.updatingRepo": - pass - elif notification == "System.Manager.warning": - self.comar.com_lock.unlock() - self.parent.showWarningMessage(args) - self.parent.resetState() - self.parent.refreshState() - else: - print "Got notification : %s with data : %s" % (signal, data) - - # This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If - # some misbehaviour is seen, comar.log is always there to look. elif signal == "error": self.comar.com_lock.unlock() - self.parent.finished("System.Manager.cancelled") - return - elif signal == "denied": - self.comar.com_lock.unlock() - self.parent.finished("System.Manager.cancelled") - self.parent.showErrorMessage(i18n("You do not have permission to do this operation.")) - elif signal == "fail": - if data == "System.Manager.cancelled": - self.comar.com_lock.unlock() - self.parent.finished(data) - return - + self.parent.showErrorMessage(args) + self.parent.resetState() + self.parent.refreshState() + elif signal == "status": + operation = data[0] + self.parent.pisiNotify(operation, args) + elif notification == "warning": self.comar.com_lock.unlock() - self.parent.finished() + self.parent.showWarningMessage(args) self.parent.resetState() self.parent.refreshState() - - #FIXME: What replaces this in new Comar api - # do not show any error if it is the interval check - # if not reply.id == ID_TRAY_INTERVAL_CHECK: - # self.parent.showErrorMessage(unicode(reply.data)) - - # if an error occured communicating with comar and components are not ready we should warn - if not PisiIface.get_components(): - self.parent.repoNotReady() else: - # paranoia - self.comar.com_lock.unlock() - pass + print "Got notification : %s with data : %s" % (signal, data) + +# # This is paranoia. We dont know what happened but we cancel what ever is being done, gracefully. If +# # some misbehaviour is seen, comar.log is always there to look. +# elif signal == "error": +# self.comar.com_lock.unlock() +# self.parent.finished("System.Manager.cancelled") +# return +# elif signal == "denied": +# self.comar.com_lock.unlock() +# self.parent.finished("System.Manager.cancelled") +# self.parent.showErrorMessage(i18n("You do not have permission to do this operation.")) +# elif signal == "fail": +# if data == "System.Manager.cancelled": +# self.comar.com_lock.unlock() +# self.parent.finished(data) +# return + +# self.comar.com_lock.unlock() +# self.parent.finished() +# self.parent.resetState() +# self.parent.refreshState() + +# #FIXME: What replaces this in new Comar api +# # do not show any error if it is the interval check +# # if not reply.id == ID_TRAY_INTERVAL_CHECK: +# # self.parent.showErrorMessage(unicode(reply.data)) + +# # if an error occured communicating with comar and components are not ready we should warn +# if not PisiIface.get_components(): +# self.parent.repoNotReady() +# else: +# # paranoia +# self.comar.com_lock.unlock() +# pass def startUpdate(self, repo = None, id=0): if repo is None: Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Fri May 2 14:59:52 2008 @@ -586,7 +586,6 @@ def displayProgress(self, data): operation = data[0] - if operation in ["updatingrepo", "rebuilding-db"]: self.progressDialog.setOperationDescription(i18n(str(data[2]))) percent = data[1] @@ -607,31 +606,29 @@ self.progressDialog.updateTotalDownloaded(pkgDownSize=data[5], pkgTotalSize=data[6]) self.progressDialog.updateTotalOperationPercent() - def pisiNotify(self, data): - data = data.split(",") - operation = data[0] + def pisiNotify(self, operation, args): # operation is now cancellable if operation in ["started"]: self.progressDialog.enableCancel() elif operation in ["removing"]: - self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1]) + self.progressDialog.updateOperationDescription(i18n(str(operation)), package=args[0]) self.progressDialog.updatePackageInfo() elif operation in ["cached"]: # progressDialog.totalSize is the to be downloaded size by package-manager. # And that is (totalDownloadSize - alreadyCachedSize) - self.progressDialog.totalSize = int(data[1]) - int(data[2]) + self.progressDialog.totalSize = int(args[0]) - int(args[1]) self.progressDialog.updateTotalOperationPercent() self.progressDialog.updateStatus() elif operation in ["installing"]: - self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1]) + self.progressDialog.updateOperationDescription(i18n(str(operation)), package=args[0]) self.progressDialog.updatePackageInfo() elif operation in ["extracting", "configuring"]: - self.progressDialog.updateOperationDescription(i18n(str(operation)), package=data[1]) + self.progressDialog.updateOperationDescription(i18n(str(operation)), package=args[0]) elif operation in ["removed", "installed", "upgraded"]: # Bug 4030 @@ -650,7 +647,7 @@ elif operation in ["updatingrepo"]: self.progressDialog.setCurrentOperation(i18n("Updating Repository")) - self.progressDialog.setOperationDescription(i18n('Downloading package list of %1').arg(data[1])) + self.progressDialog.setOperationDescription(i18n('Downloading package list of %1').arg(args[0])) def showWarningMessage(self, message, warning=None): if not warning: From uludag-commits at pardus.org.tr Fri May 2 15:47:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 15:47:51 +0300 (EEST) Subject: [Uludag-commits] r17877 - trunk/tasma/package-manager/src Message-ID: <20080502124751.6910413841F6@liste.pardus.org.tr> Author: faik Date: Fri May 2 15:47:50 2008 New Revision: 17877 Modified: trunk/tasma/package-manager/src/Globals.py Log: dont know why but should be fixed later Modified: trunk/tasma/package-manager/src/Globals.py ================================================================= --- trunk/tasma/package-manager/src/Globals.py (original) +++ trunk/tasma/package-manager/src/Globals.py Fri May 2 15:47:50 2008 @@ -40,5 +40,7 @@ packageToInstall = pack def processEvents(): + return + #FIXME: package-manager freezes after this if app: app.processEvents(QEventLoop.ExcludeUserInput) From uludag-commits at pardus.org.tr Fri May 2 16:42:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 16:42:51 +0300 (EEST) Subject: [Uludag-commits] r17878 - trunk/pisi/pisi Message-ID: <20080502134251.A947B13841FB@liste.pardus.org.tr> Author: faik Date: Fri May 2 16:42:51 2008 New Revision: 17878 Modified: trunk/pisi/pisi/signalhandler.py Log: alright no 2.5 syntax Modified: trunk/pisi/pisi/signalhandler.py ================================================================= --- trunk/pisi/pisi/signalhandler.py (original) +++ trunk/pisi/pisi/signalhandler.py Fri May 2 16:42:51 2008 @@ -38,11 +38,9 @@ def enable_signal(self, sig): if sig in self.signals.keys(): - oldie = self.signals[sig].oldhandler - oldhandler = oldie if oldie else signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] - signal.signal(sig, oldhandler) + signal.signal(sig, self.signals[sig].oldhandler or signal.SIG_DFL) if pending: raise exception[sig] From uludag-commits at pardus.org.tr Fri May 2 16:56:50 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 16:56:50 +0300 (EEST) Subject: [Uludag-commits] r17879 - trunk/tasma/tasma/applnk/desktop Message-ID: <20080502135650.9DDE9138421F@liste.pardus.org.tr> Author: pinar Date: Fri May 2 16:56:49 2008 New Revision: 17879 Removed: trunk/tasma/tasma/applnk/desktop/tasmagtk.desktop Log: remove tasmagtk.desktop. it's in gtk-qt-engine now. From uludag-commits at pardus.org.tr Fri May 2 16:57:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 16:57:21 +0300 (EEST) Subject: [Uludag-commits] r17880 - trunk/tasma/tasma/applnk/desktop Message-ID: <20080502135721.E49E01384221@liste.pardus.org.tr> Author: pinar Date: Fri May 2 16:57:21 2008 New Revision: 17880 Added: trunk/tasma/tasma/applnk/desktop/tasmadesktopbehavior.desktop Modified: trunk/tasma/tasma/applnk/desktop/CMakeLists.txt Log: BUG:FIXED:7026 Modified: trunk/tasma/tasma/applnk/desktop/CMakeLists.txt ================================================================= --- trunk/tasma/tasma/applnk/desktop/CMakeLists.txt (original) +++ trunk/tasma/tasma/applnk/desktop/CMakeLists.txt Fri May 2 16:57:21 2008 @@ -10,12 +10,12 @@ tasmacomponentchooser.desktop tasmacrypto.desktop tasmadesktop.desktop + tasmadesktopbehavior.desktop tasmadesktoppath.desktop tasmadisplay.desktop tasmafiletypes.desktop tasmafonts.desktop tasmafontinstaller.desktop - tasmagtk.desktop tasmaicons.desktop tasmajoystick.desktop tasmakamera.desktop From uludag-commits at pardus.org.tr Fri May 2 19:58:27 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 19:58:27 +0300 (EEST) Subject: [Uludag-commits] r17881 - in trunk/tasma/tasma: . src Message-ID: <20080502165827.EBF6213841F0@liste.pardus.org.tr> Author: pinar Date: Fri May 2 19:58:27 2008 New Revision: 17881 Modified: trunk/tasma/tasma/AUTHORS trunk/tasma/tasma/src/main.cpp Log: update about data Modified: trunk/tasma/tasma/AUTHORS ================================================================= --- trunk/tasma/tasma/AUTHORS (original) +++ trunk/tasma/tasma/AUTHORS Fri May 2 19:58:27 2008 @@ -1,8 +1,9 @@ Current Maintainer: -İsmail Dönmez +Pınar Yanardağ -Old Maintainer: +Old Maintainers: +İsmail Dönmez Barış Metin TV Module Maintainer: Modified: trunk/tasma/tasma/src/main.cpp ================================================================= --- trunk/tasma/tasma/src/main.cpp (original) +++ trunk/tasma/tasma/src/main.cpp Fri May 2 19:58:27 2008 @@ -59,7 +59,7 @@ int main( int argc, char *argv[] ) { KLocale::setMainCatalogue( "tasma" ); - KAboutData aboutData( "tasma", I18N_NOOP( "TASMA - Pardus Configuration Center" ), "1.2", + KAboutData aboutData( "tasma", I18N_NOOP( "TASMA - Pardus Configuration Center" ), "1.3", I18N_NOOP( "Pardus Configuration Center" ), KAboutData::License_GPL, I18N_NOOP( "(c) 2005-2008, TUBITAK - UEKAE" ) ); aboutData.addAuthor( "Pınar Yanardağ", I18N_NOOP( "Current Maintainer" ), "pinar at pardus.org.tr" ); From uludag-commits at pardus.org.tr Fri May 2 20:03:49 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Fri, 2 May 2008 20:03:49 +0300 (EEST) Subject: [Uludag-commits] r17882 - trunk/tasma/tasma/src Message-ID: <20080502170349.E722E13841F0@liste.pardus.org.tr> Author: pinar Date: Fri May 2 20:03:49 2008 New Revision: 17882 Modified: trunk/tasma/tasma/src/aboutview.cpp trunk/tasma/tasma/src/aboutview.h trunk/tasma/tasma/src/main.cpp trunk/tasma/tasma/src/main.h trunk/tasma/tasma/src/tasmamainwin.cpp trunk/tasma/tasma/src/tasmamainwin.h trunk/tasma/tasma/src/tcategoryview.cpp trunk/tasma/tasma/src/tcategoryview.h trunk/tasma/tasma/src/ticonview.cpp trunk/tasma/tasma/src/ticonview.h trunk/tasma/tasma/src/tlistviewtooltip.cpp trunk/tasma/tasma/src/tlistviewtooltip.h trunk/tasma/tasma/src/tmodulecategorylist.cpp trunk/tasma/tasma/src/tmodulecategorylist.h trunk/tasma/tasma/src/tmodulegroup.cpp trunk/tasma/tasma/src/tmodulegroup.h trunk/tasma/tasma/src/tmoduleview.cpp trunk/tasma/tasma/src/tmoduleview.h Log: remove copyright years. not necessary anymore. Modified: trunk/tasma/tasma/src/aboutview.cpp ================================================================= --- trunk/tasma/tasma/src/aboutview.cpp (original) +++ trunk/tasma/tasma/src/aboutview.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/aboutview.h ================================================================= --- trunk/tasma/tasma/src/aboutview.h (original) +++ trunk/tasma/tasma/src/aboutview.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/main.cpp ================================================================= --- trunk/tasma/tasma/src/main.cpp (original) +++ trunk/tasma/tasma/src/main.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004,2005 TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -61,7 +61,7 @@ KLocale::setMainCatalogue( "tasma" ); KAboutData aboutData( "tasma", I18N_NOOP( "TASMA - Pardus Configuration Center" ), "1.3", I18N_NOOP( "Pardus Configuration Center" ), KAboutData::License_GPL, - I18N_NOOP( "(c) 2005-2008, TUBITAK - UEKAE" ) ); + I18N_NOOP( "(c) TUBITAK - UEKAE" ) ); aboutData.addAuthor( "Pınar Yanardağ", I18N_NOOP( "Current Maintainer" ), "pinar at pardus.org.tr" ); aboutData.addAuthor( "İsmail Dönmez", I18N_NOOP( "Developer" ), "ismail at pardus.org.tr" ); aboutData.addAuthor( "Barış Metin", I18N_NOOP( "Old Maintainer & Original Author" ), "baris at pardus.org.tr" ); Modified: trunk/tasma/tasma/src/main.h ================================================================= --- trunk/tasma/tasma/src/main.h (original) +++ trunk/tasma/tasma/src/main.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tasmamainwin.cpp ================================================================= --- trunk/tasma/tasma/src/tasmamainwin.cpp (original) +++ trunk/tasma/tasma/src/tasmamainwin.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tasmamainwin.h ================================================================= --- trunk/tasma/tasma/src/tasmamainwin.h (original) +++ trunk/tasma/tasma/src/tasmamainwin.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tcategoryview.cpp ================================================================= --- trunk/tasma/tasma/src/tcategoryview.cpp (original) +++ trunk/tasma/tasma/src/tcategoryview.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tcategoryview.h ================================================================= --- trunk/tasma/tasma/src/tcategoryview.h (original) +++ trunk/tasma/tasma/src/tcategoryview.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/ticonview.cpp ================================================================= --- trunk/tasma/tasma/src/ticonview.cpp (original) +++ trunk/tasma/tasma/src/ticonview.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004,2005 TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/ticonview.h ================================================================= --- trunk/tasma/tasma/src/ticonview.h (original) +++ trunk/tasma/tasma/src/ticonview.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004,2005 TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tlistviewtooltip.cpp ================================================================= --- trunk/tasma/tasma/src/tlistviewtooltip.cpp (original) +++ trunk/tasma/tasma/src/tlistviewtooltip.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, 2008 TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tlistviewtooltip.h ================================================================= --- trunk/tasma/tasma/src/tlistviewtooltip.h (original) +++ trunk/tasma/tasma/src/tlistviewtooltip.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, 2008 TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tmodulecategorylist.cpp ================================================================= --- trunk/tasma/tasma/src/tmodulecategorylist.cpp (original) +++ trunk/tasma/tasma/src/tmodulecategorylist.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tmodulecategorylist.h ================================================================= --- trunk/tasma/tasma/src/tmodulecategorylist.h (original) +++ trunk/tasma/tasma/src/tmodulecategorylist.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tmodulegroup.cpp ================================================================= --- trunk/tasma/tasma/src/tmodulegroup.cpp (original) +++ trunk/tasma/tasma/src/tmodulegroup.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tmodulegroup.h ================================================================= --- trunk/tasma/tasma/src/tmodulegroup.h (original) +++ trunk/tasma/tasma/src/tmodulegroup.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by Modified: trunk/tasma/tasma/src/tmoduleview.cpp ================================================================= --- trunk/tasma/tasma/src/tmoduleview.cpp (original) +++ trunk/tasma/tasma/src/tmoduleview.cpp Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004,2005 TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE Copyright (c) 1999 Matthias Hoelzer-Kluepfel This program is free software; you can redistribute it and/or modify Modified: trunk/tasma/tasma/src/tmoduleview.h ================================================================= --- trunk/tasma/tasma/src/tmoduleview.h (original) +++ trunk/tasma/tasma/src/tmoduleview.h Fri May 2 20:03:49 2008 @@ -1,5 +1,5 @@ /* - Copyright (c) 2004, TUBITAK/UEKAE + Copyright (c) TUBITAK/UEKAE This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From uludag-commits at pardus.org.tr Sat May 3 00:19:55 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 3 May 2008 00:19:55 +0300 (EEST) Subject: [Uludag-commits] r17883 - trunk/tasma/display-manager/src Message-ID: <20080502211955.7C622247400F@liste.pardus.org.tr> Author: pinar Date: Sat May 3 00:19:55 2008 New Revision: 17883 Modified: trunk/tasma/display-manager/src/display-manager.py Log: disable dual mode if there's only one output Modified: trunk/tasma/display-manager/src/display-manager.py ================================================================= --- trunk/tasma/display-manager/src/display-manager.py (original) +++ trunk/tasma/display-manager/src/display-manager.py Sat May 3 00:19:55 2008 @@ -89,6 +89,10 @@ for resolution in self.screenModes[output]: self.comboBoxResolution.insertItem(resolution) + # disable dual mode if there's only one output + if len(self.displayConfiguration.outputs) <= 1: + self.checkBoxDualMode.setEnabled(0) + # remove later. self.displayConfiguration.secondaryScr = "VGA" From uludag-commits at pardus.org.tr Sat May 3 15:28:29 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sat, 3 May 2008 15:28:29 +0300 (EEST) Subject: [Uludag-commits] r17884 - trunk/pisi/pisi Message-ID: <20080503122829.4938E1384186@liste.pardus.org.tr> Author: caglar Date: Sat May 3 15:28:28 2008 New Revision: 17884 Modified: trunk/pisi/pisi/signalhandler.py Log: caglar at zangetsu ~ $ pisi lu -d DEBUG: InstallDB initialized in 0.192210912704. DEBUG: RepoDB initialized in 0.000102996826172. DEBUG: PackageDB initialized in 1.3199570179. DEBUG: ComponentDB initialized in 0.4158411026. Yükseltilecek paket yok. Error in atexit._run_exitfuncs: Traceback (most recent call last): File "/usr/lib/python2.4/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/usr/lib/pardus/pisi/__init__.py", line 68, in _cleanup ctx.enable_keyboard_interrupts() File "/usr/lib/pardus/pisi/context.py", line 53, in enable_keyboard_interrupts sig and sig.enable_signal(signal.SIGINT) File "/usr/lib/pardus/pisi/signalhandler.py", line 43, in enable_signal signal.signal(sig, self.signals[sig].oldhandler or signal.SIG_DFL) KeyError: 2 Error in sys.exitfunc: Sistem Hatası: Program Sonlandırıldı. exceptions.KeyError: 2 Genel yardım için lütfen 'pisi help' komutunu kullanınız. Geri-iz: File "/usr/lib/python2.4/atexit.py", line 24, in _run_exitfuncs func(*targs, **kargs) File "/usr/lib/pardus/pisi/__init__.py", line 68, in _cleanup ctx.enable_keyboard_interrupts() File "/usr/lib/pardus/pisi/context.py", line 53, in enable_keyboard_interrupts sig and sig.enable_signal(signal.SIGINT) File "/usr/lib/pardus/pisi/signalhandler.py", line 43, in enable_signal signal.signal(sig, self.signals[sig].oldhandler or signal.SIG_DFL) Modified: trunk/pisi/pisi/signalhandler.py ================================================================= --- trunk/pisi/pisi/signalhandler.py (original) +++ trunk/pisi/pisi/signalhandler.py Sat May 3 15:28:28 2008 @@ -38,9 +38,13 @@ def enable_signal(self, sig): if sig in self.signals.keys(): + if self.signals[sig].oldhandler: + oldhandler = self.signals[sig].oldhandler + else: + oldhandler = signal.SIG_DFL pending = self.signals[sig].pending del self.signals[sig] - signal.signal(sig, self.signals[sig].oldhandler or signal.SIG_DFL) + signal.signal(sig, oldhandler) if pending: raise exception[sig] From uludag-commits at pardus.org.tr Sun May 4 02:17:52 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 4 May 2008 02:17:52 +0300 (EEST) Subject: [Uludag-commits] r17885 - trunk/tasma/display-manager/src Message-ID: <20080503231752.224891384186@liste.pardus.org.tr> Author: fatih Date: Sun May 4 02:17:51 2008 New Revision: 17885 Modified: trunk/tasma/display-manager/src/displayconfig.py Log: support fglrx Modified: trunk/tasma/display-manager/src/displayconfig.py ================================================================= --- trunk/tasma/display-manager/src/displayconfig.py (original) +++ trunk/tasma/display-manager/src/displayconfig.py Sun May 4 02:17:51 2008 @@ -19,6 +19,23 @@ link = ComarLink() +def fglrxOutputInfo(): + connected_outputs = [] + enabled_outputs = [] + + out, err = capture("aticonfig", "--query-monitor") + + lines = out.splitlines() + for line in lines: + if "Connected monitors" in line: + outputs = line.split(": ")[1] + connected_outputs = outputs.split(", ") + elif "Enabled monitors" in line: + outputs = line.split(": ")[1] + enabled_outputs = outputs.split(", ") + + return connected_outputs, enabled_outputs + class DisplayConfig: def __init__(self): self._rriface = randriface.RandRIface() @@ -26,13 +43,14 @@ self._bus = link.activeDeviceID() self._info = zorg.config.getDeviceInfo(self._bus) - self._flags = self._info.probe_result.get("flags", "").split(",") - self._randr12 = "randr12" in self._flags - self.outputs = self._info.probe_result["outputs"].split(",") self.modes = {} self.current_modes = {} + self._flags = self._info.probe_result.get("flags", "").split(",") + #self._randr12 = "randr12" in self._flags + self._randr12 = len(self._rriface.outputs) > 1 + if self._randr12: for output in self.outputs: modes = self._rriface.getResolutions(output) @@ -42,8 +60,21 @@ self.current_modes[output] = current if current else self.modes[output][0] else: + if self._info.driver == "fglrx": + connected_outputs, enabled_outputs = fglrxOutputInfo() + + for out in connected_outputs: + if out not in self.outputs: + self.outputs.append(out) + for output in self.outputs: - pass + if self._info.probe_result.has_key("%s-modes" % output): + modes = self._info.probe_result["%s-modes" % output].split(",") + else: + modes = ["1024x768", "800x600", "640x480"] + + self.modes[output] = modes + self.current_modes[output] = self._info.modes.get(output, "800x600") self.primaryScr = self._info.active_outputs[0] self.secondaryScr = None From uludag-commits at pardus.org.tr Sun May 4 02:53:39 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 4 May 2008 02:53:39 +0300 (EEST) Subject: [Uludag-commits] r17886 - in trunk: pisi/po tasma/package-manager/po Message-ID: <20080503235339.C9583138418B@liste.pardus.org.tr> Author: klemens Date: Sun May 4 02:53:39 2008 New Revision: 17886 Modified: trunk/pisi/po/es.po trunk/tasma/package-manager/po/es.po Log: some minor improvements in the spanish language files (kh) Modified: trunk/pisi/po/es.po ================================================================= --- trunk/pisi/po/es.po (original) +++ trunk/pisi/po/es.po Sun May 4 02:53:39 2008 @@ -6,12 +6,13 @@ # Christian Faure , 2007. # klemens , 2007. # Klemens Haeckel , 2008. +# Klemens Haeckel , 2008. msgid "" msgstr "" "Project-Id-Version: es\n" "POT-Creation-Date: 2008-01-31 16:42+EET\n" -"PO-Revision-Date: 2008-02-17 07:50-0300\n" -"Last-Translator: Klemens Haeckel \n" +"PO-Revision-Date: 2008-05-03 19:12-0400\n" +"Last-Translator: Klemens Haeckel \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -818,7 +819,7 @@ #: pisi/atomicoperations.py:161 msgid "%s package cannot be installed unless the dependencies are satisfied" msgstr "" -"los paquetes %s no se puede instalar hasta que instale los paquetes " +"paquete %s no se puede instalar hasta que instale los paquetes " "requeridos" # check this ?? - probably ok, but see the context @@ -1204,15 +1205,15 @@ #: pisi/cli/graph.py:70 msgid "Plotting packages in repository %s" -msgstr "Ploteando paquetes de repositorio %s" +msgstr "graficando paquetes de repositorio %s" #: pisi/cli/graph.py:73 msgid "Plotting a graph of relations among all repository packages" -msgstr "Ploteando un gráfico de relaciones entre todos los paquetes en repositorio" +msgstr "graficando las relaciones entre todos los paquetes en repositorio" #: pisi/cli/graph.py:87 msgid "Plotting a graph of relations among all installed packages" -msgstr "Ploteando un gráfico de relaciones entre todos los paquetes instalados" +msgstr "graficando las relaciones entre todos los paquetes instalados" #: pisi/cli/help.py:49 msgid "" Modified: trunk/tasma/package-manager/po/es.po ================================================================= --- trunk/tasma/package-manager/po/es.po (original) +++ trunk/tasma/package-manager/po/es.po Sun May 4 02:53:39 2008 @@ -1,4 +1,4 @@ -# translation of es.po to español +# translation of es.po to Spanish # 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. @@ -7,14 +7,15 @@ # klemens , 2007. # Christian Faure , 2007. # Faik Uygur , 2007. +# Klemens Haeckel , 2008. msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-26 16:27+0200\n" -"PO-Revision-Date: 2007-12-03 22:14-0300\n" -"Last-Translator: Klemens Häckel \n" -"Language-Team: español \n" +"PO-Revision-Date: 2008-05-03 19:19-0400\n" +"Last-Translator: Klemens Haeckel \n" +"Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -45,8 +46,11 @@ msgstr "Abortando operación..." #: src/Progress.py:127 src/Progress.py:131 +# example: %1=downloading, %2=firefox +# 080503 changed the word order, to make grammer sound better +# maybe just skip the word "package" / paquete ?? msgid "Now %1 %2 package" -msgstr "Ahora paquete %1 %2" +msgstr "Ahora %1 paquete %2" #: src/Progress.py:141 msgid "installed" From uludag-commits at pardus.org.tr Sun May 4 23:21:04 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Sun, 4 May 2008 23:21:04 +0300 (EEST) Subject: [Uludag-commits] r17887 - in trunk/python-modules/pardus-python: . pardus po Message-ID: <20080504202104.E76631384122@liste.pardus.org.tr> Author: fatih Date: Sun May 4 23:21:04 2008 New Revision: 17887 Added: trunk/python-modules/pardus-python/pardus/localedata.py trunk/python-modules/pardus-python/po/ trunk/python-modules/pardus-python/po/pardus-python.pot Modified: trunk/python-modules/pardus-python/setup.py Log: add localedata module. mudur, zorg and yali can use it. Modified: trunk/python-modules/pardus-python/setup.py ================================================================= --- trunk/python-modules/pardus-python/setup.py (original) +++ trunk/python-modules/pardus-python/setup.py Sun May 4 23:21:04 2008 @@ -17,6 +17,8 @@ pardus/*.c pardus/xorg/*.py pardus/xorg/*.c + po/*.po + po/*.pot tools/*.py MODULES README @@ -52,9 +54,24 @@ self.install_platlib = '$base/lib/pardus' self.install_purelib = '$base/lib/pardus' install.finalize_options(self) - + def run(self): install.run(self) + self.installi18n() + + def installi18n(self): + for name in os.listdir('po'): + if not name.endswith('.po'): + continue + lang = name[:-3] + print "Installing '%s' translations..." % lang + os.popen("msgfmt po/%s.po -o po/%s.mo" % (lang, lang)) + if not self.root: + self.root = "/" + destpath = os.path.join(self.root, "usr/share/locale/%s/LC_MESSAGES" % lang) + if not os.path.exists(destpath): + os.makedirs(destpath) + shutil.copy("po/%s.mo" % lang, os.path.join(destpath, "pardus-python.mo")) setup(name="pardus", version=pardus.versionString(), From uludag-commits at pardus.org.tr Mon May 5 00:15:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 00:15:51 +0300 (EEST) Subject: [Uludag-commits] r17888 - trunk/PolicyKit-kde/src Message-ID: <20080504211551.A431E138409C@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 00:15:51 2008 New Revision: 17888 Modified: trunk/PolicyKit-kde/src/service.cpp trunk/PolicyKit-kde/src/service.h Log: * Remove unnecessary QVariant header * Define 30 seconds timeout in header Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 00:15:51 2008 @@ -15,7 +15,6 @@ #include //kde and qt headers -#include #include #include #include @@ -49,8 +48,8 @@ if (KCmdLineArgs::parsedArgs()->isSet("-exit")) { //exit, if no-exit option is not set - Debug::printWarning("no-exit option is not set, setting timer to exit in 30 seconds..."); - QTimer::singleShot(30000, this, SLOT(quitSlot(void))); + Debug::printWarning(QString("no-exit option is not set, setting timer to exit in %1 seconds...").arg(POLICYKITKDE_TIMEOUT / 1000)); + QTimer::singleShot(POLICYKITKDE_TIMEOUT, this, SLOT(quitSlot(void))); } else Debug::printDebug("no-exit option is set, not quiting"); Modified: trunk/PolicyKit-kde/src/service.h ================================================================= --- trunk/PolicyKit-kde/src/service.h (original) +++ trunk/PolicyKit-kde/src/service.h Mon May 5 00:15:51 2008 @@ -13,6 +13,7 @@ #define SERVICE_H #define POLICYKITKDE_MAX_TRY 3 +#define POLICYKITKDE_TIMEOUT 30000 #include From uludag-commits at pardus.org.tr Mon May 5 02:41:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 02:41:20 +0300 (EEST) Subject: [Uludag-commits] r17889 - trunk/PolicyKit-kde/src Message-ID: <20080504234120.C6BC913840DF@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 02:41:20 2008 New Revision: 17889 Modified: trunk/PolicyKit-kde/src/service.cpp trunk/PolicyKit-kde/src/service.h Log: use exit timer as class member to stop it when needed Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 02:41:20 2008 @@ -49,7 +49,10 @@ { //exit, if no-exit option is not set Debug::printWarning(QString("no-exit option is not set, setting timer to exit in %1 seconds...").arg(POLICYKITKDE_TIMEOUT / 1000)); - QTimer::singleShot(POLICYKITKDE_TIMEOUT, this, SLOT(quitSlot(void))); + + exitTimer = new QTimer(); + exitTimer->connect(exitTimer, SIGNAL(timeout()), this, SLOT(quitSlot(void))); + exitTimer->start(POLICYKITKDE_TIMEOUT, true); } else Debug::printDebug("no-exit option is set, not quiting"); @@ -108,9 +111,13 @@ void PolicyService::quitSlot() { Debug::printWarning("Timeout limit reached and no-exit option is not set, quiting..."); - KApplication::kApplication()->quit(); + + if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + delete exitTimer; //TODO: Do last jobs + + KApplication::kApplication()->quit(); } PolicyService::~PolicyService() @@ -455,6 +462,10 @@ void PolicyService::obtainAuthorization(const QString& actionId, const uint wid, const uint pid, const QDBusMessage& messageToReply) { + //stop exitTimer during authentication, and restart when it is finished + if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + exitTimer->stop(); + PolKitAction *action = polkit_action_new(); if (action == NULL) { @@ -550,7 +561,7 @@ throw msg; } - // This workaround used for to aviod ourself from a race condition, + // This workaround used for to avoid ourself from a race condition, // polkit_grant_done must return before the following privilege check QApplication::eventLoop()->exec(); @@ -573,6 +584,9 @@ reply << QDBusData::fromBool(m_gainedPrivilege); m_sessionBus.send(reply); + + if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + exitTimer->start(POLICYKITKDE_TIMEOUT, true); } #include "service.moc" Modified: trunk/PolicyKit-kde/src/service.h ================================================================= --- trunk/PolicyKit-kde/src/service.h (original) +++ trunk/PolicyKit-kde/src/service.h Mon May 5 02:41:20 2008 @@ -24,6 +24,7 @@ #include #include #include +#include #include "qdbusconnection.h" #include "qdbusobject.h" @@ -66,6 +67,7 @@ bool m_inputBogus; static PolicyService* m_self; QString m_uniqueSessionName; + QTimer *exitTimer; QMap m_contextwatches; QMap m_grantwatches; From uludag-commits at pardus.org.tr Mon May 5 02:45:18 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 02:45:18 +0300 (EEST) Subject: [Uludag-commits] r17890 - trunk/PolicyKit-kde/src Message-ID: <20080504234518.3606513840DF@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 02:45:17 2008 New Revision: 17890 Modified: trunk/PolicyKit-kde/src/service.cpp Log: delete object in destructor Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 02:45:17 2008 @@ -112,9 +112,6 @@ { Debug::printWarning("Timeout limit reached and no-exit option is not set, quiting..."); - if (KCmdLineArgs::parsedArgs()->isSet("-exit")) - delete exitTimer; - //TODO: Do last jobs KApplication::kApplication()->quit(); @@ -124,6 +121,9 @@ { Debug::printDebug(QString("Unregistering object: %1").arg(POLICYKITKDE_OBJECTNAME)); m_sessionBus.unregisterObject(POLICYKITKDE_OBJECTNAME); + + if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + delete exitTimer; } bool PolicyService::handleMethodCall(const QDBusMessage& message) From uludag-commits at pardus.org.tr Mon May 5 10:53:59 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 10:53:59 +0300 (EEST) Subject: [Uludag-commits] r17891 - trunk/PolicyKit-kde/src Message-ID: <20080505075400.0F1CC1384142@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 10:53:59 2008 New Revision: 17891 Modified: trunk/PolicyKit-kde/src/service.cpp trunk/PolicyKit-kde/src/service.h Log: Fix cancel problem Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 10:53:59 2008 @@ -64,9 +64,10 @@ m_error = NULL; m_grant = NULL; m_dialog = NULL; - bool m_authInProgress = false; - bool m_gainedPrivilege = false; - bool m_inputBogus = false; + m_authInProgress = false; + m_gainedPrivilege = false; + m_inputBogus = false; + m_cancelled = false; m_uniqueSessionName = m_sessionBus.uniqueName(); Debug::printDebug("Registering object: /"); @@ -180,6 +181,7 @@ Debug::printWarning(QString("Session bus name owner changed: service name='%1', old owner='%2', new owner='%3'").arg(msg[0].toString()).arg(msg[1].toString()).arg(msg[2].toString())); //TODO: exit if not busy + //polkit_grant_cancel_auth (grant); } } @@ -416,6 +418,8 @@ if (result == QDialog::Rejected) { Debug::printDebug("polkit_grant_prompt: Dialog cancelled"); + m_cancelled = true; + polkit_grant_cancel_auth (m_grant); return NULL; } @@ -438,7 +442,7 @@ void PolicyService::polkit_grant_error_message(PolKitGrant *grant, const char *error, void *data) { - Debug::printDebug(QString("polkit_grant_error_message: %1").arg(error)); + Debug::printError(QString("polkit_grant_error_message: %1").arg(error)); } void PolicyService::polkit_grant_text_info(PolKitGrant *grant, const char *info, void *data) @@ -464,7 +468,10 @@ { //stop exitTimer during authentication, and restart when it is finished if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + { + Debug::printDebug("Authentication is in progress, stopping timer"); exitTimer->stop(); + } PolKitAction *action = polkit_action_new(); if (action == NULL) @@ -553,6 +560,7 @@ // explicitly set to false before every try m_gainedPrivilege = false; m_inputBogus = false; + m_cancelled = false; if (!polkit_grant_initiate_auth (m_grant, action, caller)) { @@ -565,7 +573,7 @@ // polkit_grant_done must return before the following privilege check QApplication::eventLoop()->exec(); - if (!m_gainedPrivilege && !m_inputBogus) + if (!m_gainedPrivilege && !m_inputBogus && !m_cancelled) { Debug::printDebug("obtain_authorization: Authentication failure, trying again..."); polkit_grant_unref (m_grant); @@ -586,7 +594,10 @@ m_sessionBus.send(reply); if (KCmdLineArgs::parsedArgs()->isSet("-exit")) + { + Debug::printDebug("Authentication finished, starting timer again"); exitTimer->start(POLICYKITKDE_TIMEOUT, true); + } } #include "service.moc" Modified: trunk/PolicyKit-kde/src/service.h ================================================================= --- trunk/PolicyKit-kde/src/service.h (original) +++ trunk/PolicyKit-kde/src/service.h Mon May 5 10:53:59 2008 @@ -65,6 +65,7 @@ bool m_authInProgress; bool m_gainedPrivilege; bool m_inputBogus; + bool m_cancelled; static PolicyService* m_self; QString m_uniqueSessionName; QTimer *exitTimer; From uludag-commits at pardus.org.tr Mon May 5 11:08:33 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:08:33 +0300 (EEST) Subject: [Uludag-commits] r17892 - in trunk/PolicyKit-kde: . src Message-ID: <20080505080833.6A0CD1384142@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 11:08:33 2008 New Revision: 17892 Modified: trunk/PolicyKit-kde/TODO trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/service.cpp Log: Fix session checkbox disabled problem Modified: trunk/PolicyKit-kde/TODO ================================================================= --- trunk/PolicyKit-kde/TODO (original) +++ trunk/PolicyKit-kde/TODO Mon May 5 11:08:33 2008 @@ -1,6 +1,4 @@ IMPORTANT: -* Handle cancelling -* Fix disabling of keep session label * Fix admin user selection support (another eventloop solution may be required) * Fix override_type function Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 11:08:33 2008 @@ -179,7 +179,10 @@ } if (res == POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION || res == POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION) + { cbRemember->hide(); + cbSession->setEnabled(true); + } m_type = res; Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 11:08:33 2008 @@ -585,7 +585,7 @@ if (m_grant) polkit_grant_unref (m_grant); - Debug::printDebug(QString("obtain_authorization returning %1").arg(m_gainedPrivilege)); + Debug::printDebug(QString("obtain_authorization: privilege: %1 input_bogus: %2, cancelled: %3").arg(m_gainedPrivilege).arg(m_inputBogus).arg(m_cancelled)); //send dbus reply QDBusMessage reply = QDBusMessage::methodReply(messageToReply); From uludag-commits at pardus.org.tr Mon May 5 11:27:21 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:27:21 +0300 (EEST) Subject: [Uludag-commits] r17893 - trunk/tasma/display-manager/src Message-ID: <20080505082721.9209A1384179@liste.pardus.org.tr> Author: pinar Date: Mon May 5 11:27:21 2008 New Revision: 17893 Modified: trunk/tasma/display-manager/src/dm_mainview.ui Log: extended/cloned option Modified: trunk/tasma/display-manager/src/dm_mainview.ui ================================================================= Suppressed! Too long (more than 250 lines) diff output suppressed... From uludag-commits at pardus.org.tr Mon May 5 11:40:01 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:40:01 +0300 (EEST) Subject: [Uludag-commits] r17894 - in trunk/python-modules/pardus-python: po tools Message-ID: <20080505084001.E06A913840E3@liste.pardus.org.tr> Author: fatih Date: Mon May 5 11:40:01 2008 New Revision: 17894 Added: trunk/python-modules/pardus-python/po/ca.po trunk/python-modules/pardus-python/po/de.po trunk/python-modules/pardus-python/po/es.po trunk/python-modules/pardus-python/po/fr.po trunk/python-modules/pardus-python/po/it.po trunk/python-modules/pardus-python/po/nl.po trunk/python-modules/pardus-python/po/pl.po trunk/python-modules/pardus-python/po/pt_BR.po (contents, props changed) trunk/python-modules/pardus-python/po/tr.po trunk/python-modules/pardus-python/tools/pygettext.py - copied unchanged from r17892, trunk/pisi/tools/pygettext.py trunk/python-modules/pardus-python/tools/update-po.sh - copied, changed from r17892, trunk/pisi/tools/update-po.sh Modified: trunk/python-modules/pardus-python/po/pardus-python.pot Log: add translations Modified: trunk/python-modules/pardus-python/po/pardus-python.pot ================================================================= --- trunk/python-modules/pardus-python/po/pardus-python.pot (original) +++ trunk/python-modules/pardus-python/po/pardus-python.pot Mon May 5 11:40:01 2008 @@ -1,20 +1,19 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR ORGANIZATION # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-04 22:51+0300\n" +"POT-Creation-Date: 2008-05-05 11:36+EEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: ENCODING\n" +"Generated-By: pygettext.py 1.5\n" + #: pardus/localedata.py:46 msgid "Turkish" @@ -163,3 +162,4 @@ #: pardus/localedata.py:254 msgid "Vietnamese" msgstr "" + Copied: trunk/python-modules/pardus-python/tools/update-po.sh (from r17892, trunk/pisi/tools/update-po.sh) ================================================================= --- trunk/pisi/tools/update-po.sh (original) +++ trunk/python-modules/pardus-python/tools/update-po.sh Mon May 5 11:40:01 2008 @@ -1,8 +1,6 @@ -find pisi -iname '*.py' | grep -v pisi/cli/commands.py >exclude -python tools/pygettext.py -D -X exclude -o po/pisi.pot pisi pisi-cli scripts /usr/lib/python2.4/optparse.py +python tools/pygettext.py -o po/pardus-python.pot pardus for lang in po/*.po do - msgmerge -U $lang po/pisi.pot + msgmerge -U $lang po/pardus-python.pot done -rm exclude From uludag-commits at pardus.org.tr Mon May 5 11:41:20 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:41:20 +0300 (EEST) Subject: [Uludag-commits] r17895 - trunk/python-modules/pardus-python/po Message-ID: <20080505084121.0D11413840E6@liste.pardus.org.tr> Author: fatih Date: Mon May 5 11:41:20 2008 New Revision: 17895 Modified: trunk/python-modules/pardus-python/po/pt_BR.po (props changed) Log: remove svn:executable From uludag-commits at pardus.org.tr Mon May 5 11:45:54 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:45:54 +0300 (EEST) Subject: [Uludag-commits] r17896 - trunk/python-modules/pardus-python Message-ID: <20080505084554.45F39138417A@liste.pardus.org.tr> Author: fatih Date: Mon May 5 11:45:54 2008 New Revision: 17896 Modified: trunk/python-modules/pardus-python/setup.py (contents, props changed) Log: set executable Modified: trunk/python-modules/pardus-python/setup.py ================================================================= --- trunk/python-modules/pardus-python/setup.py (original) +++ trunk/python-modules/pardus-python/setup.py Mon May 5 11:45:54 2008 @@ -20,6 +20,7 @@ po/*.po po/*.pot tools/*.py + tools/*.sh MODULES README """ From uludag-commits at pardus.org.tr Mon May 5 11:54:06 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 11:54:06 +0300 (EEST) Subject: [Uludag-commits] r17897 - trunk/python-modules/pardus-python/pardus Message-ID: <20080505085407.0AC9613840F3@liste.pardus.org.tr> Author: fatih Date: Mon May 5 11:54:06 2008 New Revision: 17897 Modified: trunk/python-modules/pardus-python/pardus/__init__.py Log: bump Modified: trunk/python-modules/pardus-python/pardus/__init__.py ================================================================= --- trunk/python-modules/pardus-python/pardus/__init__.py (original) +++ trunk/python-modules/pardus-python/pardus/__init__.py Mon May 5 11:54:06 2008 @@ -10,7 +10,7 @@ # Please read the COPYING file. # -__version__ = "0.2" +__version__ = "0.3" __all__ = ["csapi", "deviceutils", @@ -18,6 +18,7 @@ "fileutils", "grubutils", "iniutils", + "localedata", "netutils", "netfilterutils", "shellutils", From uludag-commits at pardus.org.tr Mon May 5 12:12:32 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 12:12:32 +0300 (EEST) Subject: [Uludag-commits] r17898 - trunk/PolicyKit-kde/src Message-ID: <20080505091232.E1D7713840C8@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 12:12:32 2008 New Revision: 17898 Modified: trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/service.cpp Log: override grant type function implemented Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 12:12:32 2008 @@ -104,12 +104,12 @@ QString msg; switch(m_type) { - //TODO: Authentication as one of the users below... + //TODO: Add user selection support case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH: case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION: case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS: msg = i18n("An application is attempting to perform an action that requires privileges." - " Authentication as the super user is required to perform this action."); + " Authentication as the super user is required to perform this action."); break; default: msg = i18n("An application is attempting to perform an action that requires privileges." Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 12:12:32 2008 @@ -17,6 +17,7 @@ //kde and qt headers #include #include +#include #include #include #include @@ -390,7 +391,7 @@ if (dialogResult == QDialog::Rejected) { - Debug::printDebug("polkit_grant_select_admin_user: Dialog rejected"); + Debug::printDebug("polkit_grant_select_admin_user: Dialog cancelled"); return NULL; } else @@ -403,8 +404,7 @@ char *PolicyService::polkit_grant_prompt(const QString &prompt, bool echo) { - //TODO: check prompt - // + //TODO: check prompt like polkit-gnome m_dialog->setPrompt(prompt); @@ -452,8 +452,58 @@ PolKitResult PolicyService::polkit_grant_override_grant_type(PolKitGrant *grant, PolKitResult result, void *data) { - Debug::printDebug("In polkit_grant_override_grant_type"); - return result; + Debug::printDebug("In polkit_grant_override_grant_type..."); + + PolKitResult overridden = result; + bool keepSession = m_self->m_dialog->cbSession->isChecked(); + bool keepAlways = m_self->m_dialog->cbRemember->isChecked(); + + Debug::printDebug(QString("polkit_grant_override_grant_type: keep session: %1, keep always: %2").arg(keepSession).arg(keepAlways)); + + switch(result) + { + // result can not be overridden if keepsession or keepalways do not exist + case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_ONE_SHOT: + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_ONE_SHOT: + case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH: + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH: + overridden = result; + + case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION: + //if keepsession is available but user does not select it, override result with adminauth + if (!keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH; + else + overridden = result; + break; + case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS: + //if keepalways and keepsession options are available but user does not select them, override result with adminauth + if (!keepAlways && !keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH; + else if (keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION; + else + overridden = POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_ALWAYS; + break; + + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION: + if (!keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_SELF_AUTH; + break; + case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS: + if (!keepAlways && !keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_SELF_AUTH; + else if (keepSession) + overridden = POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_SESSION; + else + overridden = POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS; + break; + default: + Debug::printWarning("polkit_grant_override_grant_type: Unexpected PolKitResult type"); + } + + Debug::printDebug(QString("polkit_grant_override_grant_type: default type = %1, overridden type = %2").arg(polkit_result_to_string_representation(result)).arg(polkit_result_to_string_representation(overridden))); + return overridden; } void PolicyService::polkit_grant_done(PolKitGrant *grant, polkit_bool_t gained_privilege, polkit_bool_t invalid_data, void *data) From uludag-commits at pardus.org.tr Mon May 5 12:13:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 12:13:38 +0300 (EEST) Subject: [Uludag-commits] r17899 - trunk/PolicyKit-kde Message-ID: <20080505091338.49899138416C@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 12:13:37 2008 New Revision: 17899 Modified: trunk/PolicyKit-kde/TODO Log: update TODO Modified: trunk/PolicyKit-kde/TODO ================================================================= --- trunk/PolicyKit-kde/TODO (original) +++ trunk/PolicyKit-kde/TODO Mon May 5 12:13:37 2008 @@ -1,6 +1,5 @@ IMPORTANT: * Fix admin user selection support (another eventloop solution may be required) -* Fix override_type function LESS IMPORTANT: * Inform user that authentication is not granted From uludag-commits at pardus.org.tr Mon May 5 12:21:17 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 12:21:17 +0300 (EEST) Subject: [Uludag-commits] r17900 - trunk/PolicyKit-kde/src Message-ID: <20080505092117.60BED138416C@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 12:21:17 2008 New Revision: 17900 Modified: trunk/PolicyKit-kde/src/authdialog.cpp Log: Change 'remember session' to a meaningful message Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 12:21:17 2008 @@ -182,6 +182,7 @@ { cbRemember->hide(); cbSession->setEnabled(true); + cbSession->setText(i18n("Remember authorization for this session")); } m_type = res; From uludag-commits at pardus.org.tr Mon May 5 12:30:51 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 12:30:51 +0300 (EEST) Subject: [Uludag-commits] r17901 - trunk/comar/mudur Message-ID: <20080505093051.27F83138411B@liste.pardus.org.tr> Author: bahadir.kandemir Date: Mon May 5 12:30:50 2008 New Revision: 17901 Modified: trunk/comar/mudur/setup.py Log: alpha8 Modified: trunk/comar/mudur/setup.py ================================================================= --- trunk/comar/mudur/setup.py (original) +++ trunk/comar/mudur/setup.py Mon May 5 12:30:50 2008 @@ -15,7 +15,7 @@ import shutil import parser -version = "2.0_alpha7" +version = "2.0_alpha8" distfiles = """ setup.py From uludag-commits at pardus.org.tr Mon May 5 14:15:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:15:00 +0300 (EEST) Subject: [Uludag-commits] r17902 - in tags/RELEASE/pardus-python-0.3: . pardus Message-ID: <20080505111500.68BD7138413E@liste.pardus.org.tr> Author: fatih Date: Mon May 5 14:14:59 2008 New Revision: 17902 Added: tags/RELEASE/pardus-python-0.3/ - copied from r17895, trunk/python-modules/pardus-python/ tags/RELEASE/pardus-python-0.3/pardus/__init__.py - copied unchanged from r17897, trunk/python-modules/pardus-python/pardus/__init__.py tags/RELEASE/pardus-python-0.3/setup.py - copied unchanged from r17896, trunk/python-modules/pardus-python/setup.py Log: tag From uludag-commits at pardus.org.tr Mon May 5 14:16:36 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:16:36 +0300 (EEST) Subject: [Uludag-commits] r17903 - trunk/PolicyKit-kde Message-ID: <20080505111636.9DE88138413E@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 14:16:35 2008 New Revision: 17903 Modified: trunk/PolicyKit-kde/TODO Log: one more todo Modified: trunk/PolicyKit-kde/TODO ================================================================= --- trunk/PolicyKit-kde/TODO (original) +++ trunk/PolicyKit-kde/TODO Mon May 5 14:16:35 2008 @@ -2,6 +2,7 @@ * Fix admin user selection support (another eventloop solution may be required) LESS IMPORTANT: +* Do not send same DBus exceptions to all errors * Inform user that authentication is not granted * Use polkit_grant_cancel_auth in handler of DBus signal NameOwnerChanged * Show details about the application request for authorization From uludag-commits at pardus.org.tr Mon May 5 14:29:58 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:29:58 +0300 (EEST) Subject: [Uludag-commits] r17904 - trunk/baselayout/etc/skel Message-ID: <20080505112958.28AD813840E4@liste.pardus.org.tr> Author: onur Date: Mon May 5 14:29:57 2008 New Revision: 17904 Modified: trunk/baselayout/etc/skel/.bashrc Log: Ok this is final fix, profiles were not being loaded correctly on nonlogin shells. Ubuntu etc. are doing it this way, so I gave up and did the same solution :( Modified: trunk/baselayout/etc/skel/.bashrc ================================================================= --- trunk/baselayout/etc/skel/.bashrc (original) +++ trunk/baselayout/etc/skel/.bashrc Mon May 5 14:29:57 2008 @@ -50,3 +50,11 @@ export GTK2_RC_FILES=$HOME/.gtkrc-2.0 +for sh in /etc/profile.d/*.sh ; do + if [ -r "$sh" ] ; then + . "$sh" + fi +done +unset sh + + From uludag-commits at pardus.org.tr Mon May 5 14:36:53 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:36:53 +0300 (EEST) Subject: [Uludag-commits] r17905 - trunk/baselayout/etc Message-ID: <20080505113653.7FDE2138412D@liste.pardus.org.tr> Author: onur Date: Mon May 5 14:36:53 2008 New Revision: 17905 Modified: trunk/baselayout/etc/profile Log: tab -> space Modified: trunk/baselayout/etc/profile ================================================================= --- trunk/baselayout/etc/profile (original) +++ trunk/baselayout/etc/profile Mon May 5 14:36:53 2008 @@ -7,7 +7,7 @@ # Load environment settings from profile.env, which is created by # env-update from the files in /etc/env.d if [ -e /etc/profile.env ] ; then - . /etc/profile.env + . /etc/profile.env fi # 077 would be more secure, but 022 is generally quite realistic @@ -22,9 +22,9 @@ # This way the evaluation can be short-circuited and calling whoami is # avoided. if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" + PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" else - PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" + PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" fi export PATH unset ROOTPATH @@ -34,31 +34,31 @@ export EDITOR if [ -n "${BASH_VERSION}" ] ; then - # including color. We leave out color here because not all - # terminals support it. - if [ -f /etc/bash/bashrc ] ; then - # Bash login shells run only /etc/profile - # Bash non-login shells run only /etc/bash/bashrc - # Since we want to run /etc/bash/bashrc regardless, we source it - # from here. It is unfortunate that there is no way to do - # this *after* the user's .bash_profile runs (without putting - # it in the user's dot-files), but it shouldn't make any - # difference. - . /etc/bash/bashrc - else - PS1='\u@\h \w \$ ' - fi + # including color. We leave out color here because not all + # terminals support it. + if [ -f /etc/bash/bashrc ] ; then + # Bash login shells run only /etc/profile + # Bash non-login shells run only /etc/bash/bashrc + # Since we want to run /etc/bash/bashrc regardless, we source it + # from here. It is unfortunate that there is no way to do + # this *after* the user's .bash_profile runs (without putting + # it in the user's dot-files), but it shouldn't make any + # difference. + . /etc/bash/bashrc + else + PS1='\u@\h \w \$ ' + fi else - # Setup a bland default prompt. Since this prompt should be useable - # on color and non-color terminals, as well as shells that don't - # understand sequences such as \h, don't put anything special in it. - PS1="`whoami`@`uname -n | cut -f1 -d.` \$ " + # Setup a bland default prompt. Since this prompt should be useable + # on color and non-color terminals, as well as shells that don't + # understand sequences such as \h, don't put anything special in it. + PS1="`whoami`@`uname -n | cut -f1 -d.` \$ " fi - for sh in /etc/profile.d/*.sh ; do if [ -r "$sh" ] ; then . "$sh" fi done unset sh + From uludag-commits at pardus.org.tr Mon May 5 14:38:00 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 14:38:00 +0300 (EEST) Subject: [Uludag-commits] r17906 - trunk/baselayout/etc/skel Message-ID: <20080505113800.33A43138412D@liste.pardus.org.tr> Author: onur Date: Mon May 5 14:37:59 2008 New Revision: 17906 Modified: trunk/baselayout/etc/skel/.bashrc Log: tab -> space Modified: trunk/baselayout/etc/skel/.bashrc ================================================================= --- trunk/baselayout/etc/skel/.bashrc (original) +++ trunk/baselayout/etc/skel/.bashrc Mon May 5 14:37:59 2008 @@ -7,8 +7,8 @@ # past this point for scp and rcp, and it's important to refrain from # outputting anything in those cases. if [[ $- != *i* ]]; then - # Shell is non-interactive. Be done now - return + # Shell is non-interactive. Be done now + return fi # Shell is interactive. It is okay to produce output at this point, @@ -17,9 +17,9 @@ # colors for ls, etc. Prefer ~/.dir_colors #64489 if [[ -f ~/.dir_colors ]]; then - eval `dircolors -b ~/.dir_colors` + eval `dircolors -b ~/.dir_colors` else - eval `dircolors -b /etc/DIR_COLORS` + eval `dircolors -b /etc/DIR_COLORS` fi alias d="ls --color" @@ -40,12 +40,12 @@ # Change the window title of X terminals case $TERM in - xterm*|rxvt|Eterm|eterm) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' - ;; - screen) - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"' - ;; + xterm*|rxvt|Eterm|eterm) + PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\007"' + ;; + screen) + PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/$HOME/~}\033\\"' + ;; esac export GTK2_RC_FILES=$HOME/.gtkrc-2.0 From uludag-commits at pardus.org.tr Mon May 5 16:29:47 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 16:29:47 +0300 (EEST) Subject: [Uludag-commits] r17907 - trunk/tasma/package-manager/src Message-ID: <20080505132948.144FF1384142@liste.pardus.org.tr> Author: faik Date: Mon May 5 16:29:47 2008 New Revision: 17907 Modified: trunk/tasma/package-manager/src/MainWidget.py trunk/tasma/package-manager/src/PackageCache.py trunk/tasma/package-manager/src/PisiIface.py Log: try to get rid of packagecache... pisi has its own cache Modified: trunk/tasma/package-manager/src/MainWidget.py ================================================================= --- trunk/tasma/package-manager/src/MainWidget.py (original) +++ trunk/tasma/package-manager/src/MainWidget.py Mon May 5 16:29:47 2008 @@ -58,7 +58,6 @@ self.command = None self.state = install_state self.basket = Basket.Basket() - self.packageCache = PackageCache.PackageCache() self.command = Commander.Commander(self) self.settings = Settings.Settings(Globals.config()) @@ -175,7 +174,6 @@ self.basketAction.setEnabled(False) self.operateAction.setEnabled(False) self.searchLine.clear() - self.packageCache.clearCache() self.parent.showNewAction.setChecked(False) self.parent.showInstalledAction.setChecked(False) self.parent.showUpgradeAction.setEnabled(True) @@ -262,7 +260,6 @@ self.parent.showInstalledAction.setChecked(False) ## - self.packageCache.clearCache() upgradables = PisiIface.get_upgradable_packages() self.createComponentList(upgradables, True) self.operateAction.setText(i18n("Upgrade Package(s)")) @@ -298,7 +295,7 @@ Globals.setWaitCursor() try: # fetch packages including metadata from cache - packagesWithMeta = [self.packageCache.get_package(package) for package in self.componentDict[item].packages] + packagesWithMeta = [PisiIface.get_package(package, self.state == install_state) for package in self.componentDict[item].packages] if self.state == remove_state: self.specialList.createList(packagesWithMeta, selected = self.basket.packages, disabled = unremovable_packages) else: @@ -503,13 +500,6 @@ self.componentsList.clear() self.componentDict.clear() - # populate package cache for accessing package metadata quickly - if self.packageCache.isEmpty() and packages: - if self.state == remove_state: - self.packageCache.populateCache(packages, inInstalled = True) - else: - self.packageCache.populateCache(packages) - # eliminate components that are not visible to users. This is achieved by a tag in component.xmls componentNames = [cname for cname in PisiIface.get_components() if PisiIface.is_component_visible(cname)] @@ -577,7 +567,7 @@ item = KListViewItem(self.componentsList) item.setText(0,i18n("Search Results")) item.setPixmap(0, KGlobal.iconLoader().loadIcon("find",KIcon.Desktop,KIcon.SizeMedium)) - packagesWithMeta = [self.packageCache.get_package(package) for package in packages] + packagesWithMeta = [PisiIface.get_package(package, self.state == install_state) for package in packages] if self.state == remove_state: self.specialList.createList(packagesWithMeta, selected = self.basket.packages, disabled = unremovable_packages) else: @@ -711,7 +701,7 @@ def searchPackage(self): query = unicode(self.searchLine.text()) if query: - result = self.packageCache.searchInPackages(query.split()) + result = PisiIface.search_package(query.split(), self.state == install_state) self.createSearchResults(result) else: self.timer.stop() Modified: trunk/tasma/package-manager/src/PackageCache.py ================================================================= --- trunk/tasma/package-manager/src/PackageCache.py (original) +++ trunk/tasma/package-manager/src/PackageCache.py Mon May 5 16:29:47 2008 @@ -11,42 +11,16 @@ # Please read the COPYING file import PisiIface -from kdecore import i18n -import Icons - -class Package: - def __init__(self, name, summary, description, version, icon_path, size, homepage, repo): - self.name = name - self.summary = summary - self.description = description - self.version = version - self.icon_path = icon_path - self.size = self._sizer(size) - self.homepage = homepage - self.repo = repo - - def _sizer(self, size): - if size: - tpl = PisiIface.humanize(size) - return "%.0f %s" % (tpl[0], tpl[1]) - else: - return i18n("N\A") - - def __str__(self): - return self.name - - def lower(self): - return self.name.lower() class PackageCache: def __init__(self): - self.packages = {} + pass def clearCache(self): - self.packages.clear() + pass def isEmpty(self): - return not self.packages + pass def populateCache(self, packages, inInstalled = False): for pkg_name in packages: Modified: trunk/tasma/package-manager/src/PisiIface.py ================================================================= --- trunk/tasma/package-manager/src/PisiIface.py (original) +++ trunk/tasma/package-manager/src/PisiIface.py Mon May 5 16:29:47 2008 @@ -80,4 +80,15 @@ def get_conflicts(packages): return pisi.api.get_conflicts(packages) +def get_package(package, installed=False): + if installed: + return get_installed_package(package) + else: + return get_repo_package(package) + +def search_package(terms, installed=False): + if installed: + return pisi.api.search_installed(terms) + else: + return pisi.api.serach_package(terms) From uludag-commits at pardus.org.tr Mon May 5 16:45:14 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 16:45:14 +0300 (EEST) Subject: [Uludag-commits] r17908 - trunk/PolicyKit-kde/src Message-ID: <20080505134514.ED507138412D@liste.pardus.org.tr> Author: caglar Date: Mon May 5 16:45:14 2008 New Revision: 17908 Modified: trunk/PolicyKit-kde/src/authdialog.cpp trunk/PolicyKit-kde/src/authdialog.h Log: steal keyboard from GTK apps also Modified: trunk/PolicyKit-kde/src/authdialog.cpp ================================================================= --- trunk/PolicyKit-kde/src/authdialog.cpp (original) +++ trunk/PolicyKit-kde/src/authdialog.cpp Mon May 5 16:45:14 2008 @@ -44,7 +44,7 @@ */ AuthDialog::AuthDialog(QString &header) : AuthDialogUI( NULL, NULL, true, Qt::WType_Popup), - m_currentY( 0 ) + m_currentY( 0 ), grabKeyboard( false ) { KIconLoader* iconloader = KGlobal::iconLoader(); lblPixmap->setPixmap(iconloader->loadIcon("lock", KIcon::Desktop)); @@ -72,6 +72,25 @@ { } +void AuthDialog::paintEvent(QPaintEvent* ev) +{ + // Grab keyboard when widget is mapped to screen + // It might be a little weird to do it here, but it works! + if(!grabKeyboard) + { + lePassword->grabKeyboard(); + grabKeyboard = true; + } + QDialog::paintEvent( ev ); +} + +void AuthDialog::hideEvent(QHideEvent* ev) +{ + lePassword->releaseKeyboard(); + grabKeyboard = false; + QDialog::hideEvent( ev ); +} + void AuthDialog::setHeader(const QString &header) { lblHeader->setText("

" + header + "

"); Modified: trunk/PolicyKit-kde/src/authdialog.h ================================================================= --- trunk/PolicyKit-kde/src/authdialog.h (original) +++ trunk/PolicyKit-kde/src/authdialog.h Mon May 5 16:45:14 2008 @@ -35,6 +35,10 @@ void setHeader(const QString &); void setPrompt(const QString &); +protected: + virtual void hideEvent( QHideEvent* ); + virtual void paintEvent( QPaintEvent* ); + private slots: void slotPaintEffect(); void slotGrab(); @@ -50,6 +54,8 @@ QImage m_grabbed; QPixmap m_root; QTime m_passed; + + bool grabKeyboard; }; #endif // AUTHDIALOG_H From uludag-commits at pardus.org.tr Mon May 5 17:31:38 2008 From: uludag-commits at pardus.org.tr (uludag-commits at pardus.org.tr) Date: Mon, 5 May 2008 17:31:38 +0300 (EEST) Subject: [Uludag-commits] r17909 - trunk/PolicyKit-kde/src Message-ID: <20080505143138.944E71384105@liste.pardus.org.tr> Author: gokcen.eraslan Date: Mon May 5 17:31:38 2008 New Revision: 17909 Modified: trunk/PolicyKit-kde/src/service.cpp Log: Fix selfauth problem Modified: trunk/PolicyKit-kde/src/service.cpp ================================================================= --- trunk/PolicyKit-kde/src/service.cpp (original) +++ trunk/PolicyKit-kde/src/service.cpp Mon May 5 17:31:38 2008 @@ -468,7 +468,7 @@ case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH: case POLKIT_RESULT_ONLY_VIA_SELF_AUTH: overridden = result; - + break; case POLKIT_RESULT_ONLY_VIA_ADMIN_AUTH_KEEP_SESSION: //if keepsession is available but user does not select it, overrid