From c6cb2dc3219f5e2158eb5be98986501019442679 Mon Sep 17 00:00:00 2001
From: Kilian Valkhof <kilian@kilianvalkhof.com>
Date: Fri, 2 Apr 2010 21:10:44 +0800
Subject: [PATCH 1/4] update changelog

---
 debian/changelog | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2df7d56..8d0ed63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-trimage (1.0.0b3-0ubuntu1) jaunty; urgency=low
+trimage (1.1.0b-0ubuntu1) jaunty; urgency=low
 
-  * 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
+  * use multiprocessing for images
+  * more robust file handling
+  * re-adding images now results in recompressing them
+  * compressing message now shows filename
+  * wider array of status messages in the table
 
  -- Kilian Valkhof <kilian@kdesktop>  Mon, 29 Mar 2010 13:08:18 +0200
+

From d03c0dfbd8cab608a84e8434bbc507388e1d0987 Mon Sep 17 00:00:00 2001
From: Paul Chaplin <paul@paulchaplin.com>
Date: Sat, 3 Apr 2010 00:47:07 +0800
Subject: [PATCH 2/4] Added Unicode BOM to file to declare encoding; Python
 assumes ASCII and chokes unless told.

---
 trimage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trimage b/trimage
index 6906ad3..574f5e9 100644
--- a/trimage
+++ b/trimage
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
 #
 #Copyright (c) 2010 Kilian Valkhof, Paul Chaplin, Tarnay Kálmán
 #

From f7988ab5bd29d467679e3307e150733eae1e5207 Mon Sep 17 00:00:00 2001
From: Kilian Valkhof <kilian@kilianvalkhof.com>
Date: Wed, 21 Apr 2010 23:49:14 +0800
Subject: [PATCH 3/4] get directory ready for settings

---
 src/trimage/trimage.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/trimage/trimage.py b/src/trimage/trimage.py
index 8ba1452..7ac6c6d 100644
--- a/src/trimage/trimage.py
+++ b/src/trimage/trimage.py
@@ -126,9 +126,11 @@ class StartQT4(QMainWindow):
     def file_dialog(self):
         """Open a file dialog and send the selected images to compress_file."""
         fd = QFileDialog(self)
+        directory = ""
+
         images = fd.getOpenFileNames(self,
             "Select one or more image files to compress",
-            "", # directory
+            directory,
             # this is a fix for file dialog differentiating between cases
             "Image files (*.png *.jpg *.jpeg *.PNG *.JPG *.JPEG)")
 

From 54680e1bc6adbf4046c498dc242499739a90cabe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A1lm=C3=A1n=20Tarnay?= <kalmi@kalmi-desktop.(none)>
Date: Mon, 26 Apr 2010 17:36:30 +0200
Subject: [PATCH 4/4] chmod +x trimage src/trimage/trimage.py

---
 src/trimage/trimage.py | 0
 trimage                | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 src/trimage/trimage.py
 mode change 100644 => 100755 trimage

diff --git a/src/trimage/trimage.py b/src/trimage/trimage.py
old mode 100644
new mode 100755
diff --git a/trimage b/trimage
old mode 100644
new mode 100755