From cbd4d76b6e82f48b58ff19a65ef2a40920a2aaa0 Mon Sep 17 00:00:00 2001 From: Kilian Valkhof Date: Mon, 29 Mar 2010 13:09:24 +0200 Subject: [PATCH] fix file dialog error with wrong type, update version --- debian/changelog | 11 +++++++---- setup.py | 2 +- src/trimage/trimage.py | 10 +++++++--- website/index.html | 3 ++- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 81d75e3..2df7d56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ -trimage (1.0.0b2-0ubuntu1) jaunty; urgency=low +trimage (1.0.0b3-0ubuntu1) jaunty; urgency=low - * correct parsing of unicode characters in filenames - * changelog + * better image filetype determination + * use unicode strings everywhere + * fix bug where Trimage would crash if a directory didn't end in a slash + * avoid a segfault when parsing empty directories + * ../../debian/changelog - -- Kilian Valkhof Sun, 28 Mar 2010 16:09:45 +0200 + -- Kilian Valkhof Mon, 29 Mar 2010 13:08:18 +0200 diff --git a/setup.py b/setup.py index f286b8b..4ffd086 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name = "trimage", - version = "1.0.0b2", + version = "1.0.0b3", description = "Trimage image compressor - A cross-platform tool for optimizing PNG and JPG files", author = "Kilian Valkhof, Paul Chaplin", author_email = "help@trimage.org", diff --git a/src/trimage/trimage.py b/src/trimage/trimage.py index d404343..3033740 100755 --- a/src/trimage/trimage.py +++ b/src/trimage/trimage.py @@ -14,7 +14,7 @@ from imghdr import what as determinetype from ui import Ui_trimage -VERSION = "1.0.0b2" +VERSION = "1.0.0b3" class StartQT4(QMainWindow): @@ -131,7 +131,11 @@ class StartQT4(QMainWindow): # this is a fix for file dialog differentiating between cases "Image files (*.png *.jpg *.jpeg *.PNG *.JPG *.JPEG)") - self.delegator(images) + imagelist = [] + for i, image in enumerate(images): + imagelist.append(unicode(image)) + + self.delegator(imagelist) def recompress_files(self): """Send each file in the current file list to compress_file again.""" @@ -356,7 +360,7 @@ class Worker(QThread): if len(self.images)==0: import time time.sleep(0.1) - + #make sure the app quits after all images are done quit() diff --git a/website/index.html b/website/index.html index 1e39603..b439856 100644 --- a/website/index.html +++ b/website/index.html @@ -69,7 +69,7 @@
-

Trimage image compressor – 1.0.0b2 (beta)

+

Trimage image compressor – 1.0.0b3 (beta)

A cross-platform tool for losslessly optimizing PNG and JPG files.

Trimage is a cross-platform GUI and command-line interface to optimize image files via optipng, @@ -123,6 +123,7 @@

  • Neil Wallace
  • Jeroen Goudsmit
    • +
  • Kálmán Tarnay