From 60ae6da83a38b514fb2f43fe4dfb9ab4e0efdc7f Mon Sep 17 00:00:00 2001
From: Kilian Valkhof <kilian@kilianvalkhof.com>
Date: Wed, 3 Feb 2010 15:37:00 +0100
Subject: [PATCH] add license, clean up todo

---
 MIT-LICENSE | 23 +++++++++++++++++++++++
 todo        | 25 -------------------------
 trimage.py  |  4 +++-
 3 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 MIT-LICENSE

diff --git a/MIT-LICENSE b/MIT-LICENSE
new file mode 100644
index 0000000..0cc58d2
--- /dev/null
+++ b/MIT-LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2010 Kilian Valkhof, Paul Chaplin
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/todo b/todo
index b0918ee..cb877fa 100644
--- a/todo
+++ b/todo
@@ -1,32 +1,8 @@
-- make an index of available command line tools
-	All:
-	- imagemagick? *
-	png:
-	- optipng * (better version of pngcrush)
-	- pngnq *  (lossy, better version of pngquant)
-	- pngout http://www.jonof.id.au/kenutils
-	- pngcrush *
-	- pngquant * (lossy)
-	- advancecomp/advpng *
-	jpg:
-	- jpegoptim *
-	- libjpeg/jpegtran *
-	gif:
-	- optipng * no
-	- gifsicle * (maybe)
-* = available in ubuntu
-
-trimage: simple gui for:
-optipng for png and gif, jpegoptim for jpeg. both are available in ubuntu as dependencies (our primary platform)
-^ no gif. optipng optimized gif by converting to png
-
-
 ==========================================
 todo app wise
 - implement threading
 - errors need to go to standarderror
 - add file icon to table view
-- hide jpegoptim from commandline
 
 todo else
 - figure out dependencies for a .deb/how to make a .deb
@@ -42,7 +18,6 @@ optipng 0.6.2.1
 jpgegoptim 1.2.2
 advancecomp 1.15
 ===========================================
-1.5:
 later versions:
 pnypng api? http://www.gracepointafterfive.com/punypng/api
 imagemagick/graphicmagick?
diff --git a/trimage.py b/trimage.py
index 550c38d..4161bff 100644
--- a/trimage.py
+++ b/trimage.py
@@ -3,10 +3,12 @@ from os import system
 from os import listdir
 from os import path
 from subprocess import *
+from optparse import OptionParser
+
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from hurry.filesize import *
-from optparse import OptionParser
+
 from ui import Ui_trimage