Updated README and version bump

10 files changed, 36 insertions, 25 deletions

diff --git a/README.md b/README.md
index 57dbb5f..5cae032 100644
--- a/README.md
+++ b/README.md
@@ -67,12 +67,10 @@ Usage: comic2ebook.py [options] comic_file|comic_folder
 Options:
   MAIN:
     -p PROFILE, --profile=PROFILE
-                        Device profile (Choose one among K1, K2, K3, K4NT, K4T, KDX, KDXG, KHD, KF, KFHD, KFHD8, KFA) [Default=KHD]
+                        Device profile (Choose one among K1, K2, K345, KDX, KDXG, KHD, KF, KFHD, KFHD8, KFA) [Default=KHD]
     -q QUALITY, --quality=QUALITY
                         Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0]
     -m, --manga-style   Manga style (Right-to-left reading and splitting)
-
-  EXPERIMENTAL:
     -w, --webtoon       Webtoon processing mode
 
   OUTPUT SETTINGS:
@@ -84,7 +82,8 @@ Options:
     --batchsplit        Split output into multiple files
 
   PROCESSING:
-    --blackborders      Use black borders instead of white ones
+    --blackborders      Disable autodetection and force black borders
+    --whiteborders      Disable autodetection and force white borders
     --forcecolor        Don't convert images to grayscale
     --forcepng          Create PNG files instead JPEG (For non-Kindle devices)
     --gamma=GAMMA       Apply gamma correction to linearize the image [Default=Auto]
@@ -136,15 +135,13 @@ The app relies and includes the following scripts/binaries:
  - Icon is by **Nikolay Verin** ([http://ncrow.deviantart.com/](http://ncrow.deviantart.com/)) and released under [CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/) License
 
 ## SAMPLE FILES CREATED BY KCC
-* [Kindle Keyboard](http://kcc.vulturis.eu/Samples/Ubunchu!-K3.mobi)
-* [Kindle DX](http://kcc.vulturis.eu/Samples/Ubunchu!-KDX.mobi)
-* [Kindle DXG](http://kcc.vulturis.eu/Samples/Ubunchu!-KDXG.mobi)
-* [Kindle Non-Touch](http://kcc.vulturis.eu/Samples/Ubunchu!-K4NT.mobi)
-* [Kindle Touch](http://kcc.vulturis.eu/Samples/Ubunchu!-K4T.mobi)
 * [Kindle Paperwhite](http://kcc.vulturis.eu/Samples/Ubunchu!-KPW.mobi)
+* [Kindle](http://kcc.vulturis.eu/Samples/Ubunchu!-K345.mobi)
 * [Kindle Fire](http://kcc.vulturis.eu/Samples/Ubunchu!-KF.mobi)
 * [Kindle Fire HD](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHD.mobi)
 * [Kindle Fire HD 8.9"](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHD8.mobi)
+* [Kindle DX](http://kcc.vulturis.eu/Samples/Ubunchu!-KDX.mobi)
+* [Kindle DXG](http://kcc.vulturis.eu/Samples/Ubunchu!-KDXG.mobi)
 
 ## CHANGELOG
 ####1.00
@@ -255,6 +252,15 @@ The app relies and includes the following scripts/binaries:
 ####3.2.1:
 * Hotfixed crash occurring on OS with Russian locale
 
+####3.3:
+* Margins are now automatically omitted in Panel View mode
+* Layout of panels in Panel View mode is now automatically adjusted to content
+* Support for Virtual Panel View was removed
+* Margin color fill is now autodetected
+* Profiles for Kindle Keyboard, Touch and Non-Touch are now merged
+* Windows release is now bundled with UnRAR
+* Small GUI tweaks
+
 ## KNOWN ISSUES
 * Removing SRCS headers sometimes fail in 32bit enviroments. Due to memory limitations.
 
diff --git a/kcc.py b/kcc.py
index 5f4a4f9..bf341ce 100644
--- a/kcc.py
+++ b/kcc.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2012 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2012-2013 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2013 Pawel Jastrzebski <[email protected]>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -17,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '3.2.1'
+__version__ = '3.3'
 __license__ = 'ISC'
 __copyright__ = '2012-2013, Ciro Mattia Gonano <[email protected]>, Pawel Jastrzebski <[email protected]>'
 __docformat__ = 'restructuredtext en'
diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py
index fda5a2e..6945e80 100644
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2013 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2012-2013 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2013 Pawel Jastrzebski <[email protected]>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -17,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '3.2.1'
+__version__ = '3.3'
 __license__ = 'ISC'
 __copyright__ = '2012-2013, Ciro Mattia Gonano <[email protected]>, Pawel Jastrzebski <[email protected]>'
 __docformat__ = 'restructuredtext en'
diff --git a/kcc/__init__.py b/kcc/__init__.py
index f9bbb7e..9e6b234 100644
--- a/kcc/__init__.py
+++ b/kcc/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '3.2.1'
+__version__ = '3.3'
 __license__ = 'ISC'
 __copyright__ = '2012-2013, Ciro Mattia Gonano <[email protected]>, Pawel Jastrzebski <[email protected]>'
 __docformat__ = 'restructuredtext en'
\ No newline at end of file
diff --git a/kcc/cbxarchive.py b/kcc/cbxarchive.py
index d4b8a86..a2138f5 100644
--- a/kcc/cbxarchive.py
+++ b/kcc/cbxarchive.py
@@ -1,4 +1,5 @@
-# Copyright (c) 2012 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2012-2013 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2013 Pawel Jastrzebski <[email protected]>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py
index a895320..e4df1ec 100755
--- a/kcc/comic2ebook.py
+++ b/kcc/comic2ebook.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2012 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2012-2013 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2013 Pawel Jastrzebski <[email protected]>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -17,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-__version__ = '3.2.1'
+__version__ = '3.3'
 __license__ = 'ISC'
 __copyright__ = '2012-2013, Ciro Mattia Gonano <[email protected]>, Pawel Jastrzebski <[email protected]>'
 __docformat__ = 'restructuredtext en'
@@ -789,7 +790,6 @@ def main(argv=None, qtGUI=None):
     global parser, options, epub_path, GUI
     parser = OptionParser(usage="Usage: %prog [options] comic_file|comic_folder", add_help_option=False)
     mainOptions = OptionGroup(parser, "MAIN")
-    experimentalOptions = OptionGroup(parser, "EXPERIMENTAL")
     processingOptions = OptionGroup(parser, "PROCESSING")
     outputOptions = OptionGroup(parser, "OUTPUT SETTINGS")
     customProfileOptions = OptionGroup(parser, "CUSTOM PROFILE")
@@ -801,6 +801,8 @@ def main(argv=None, qtGUI=None):
                            help="Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0]")
     mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
                            help="Manga style (Right-to-left reading and splitting)")
+    mainOptions.add_option("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
+                           help="Webtoon processing mode"),
     outputOptions.add_option("-o", "--output", action="store", dest="output", default=None,
                              help="Output generated file to specified directory or file")
     outputOptions.add_option("-t", "--title", action="store", dest="title", default="defaulttitle",
@@ -809,8 +811,6 @@ def main(argv=None, qtGUI=None):
                              help="Outputs a CBZ archive and does not generate EPUB")
     outputOptions.add_option("--batchsplit", action="store_true", dest="batchsplit", default=False,
                              help="Split output into multiple files"),
-    experimentalOptions.add_option("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
-                                   help="Webtoon processing mode"),
     processingOptions.add_option("--blackborders", action="store_true", dest="black_borders", default=False,
                                  help="Disable autodetection and force black borders")
     processingOptions.add_option("--whiteborders", action="store_true", dest="white_borders", default=False,
@@ -842,7 +842,6 @@ def main(argv=None, qtGUI=None):
     otherOptions.add_option("-h", "--help", action="help",
                             help="Show this help message and exit")
     parser.add_option_group(mainOptions)
-    parser.add_option_group(experimentalOptions)
     parser.add_option_group(outputOptions)
     parser.add_option_group(processingOptions)
     parser.add_option_group(customProfileOptions)
diff --git a/kcc/comic2panel.py b/kcc/comic2panel.py
index f9a52b1..8b2e877 100644
--- a/kcc/comic2panel.py
+++ b/kcc/comic2panel.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2012 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2012-2013 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2013 Pawel Jastrzebski <[email protected]>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -17,7 +18,7 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-__version__ = '3.2.1'
+__version__ = '3.3'
 __license__ = 'ISC'
 __copyright__ = '2012-2013, Ciro Mattia Gonano <[email protected]>, Pawel Jastrzebski <[email protected]>'
 __docformat__ = 'restructuredtext en'
diff --git a/kcc/image.py b/kcc/image.py
index dfa40b5..eae916f 100755
--- a/kcc/image.py
+++ b/kcc/image.py
@@ -1,6 +1,7 @@
 # Copyright (C) 2010  Alex Yatskov
 # Copyright (C) 2011  Stanislav (proDOOMman) Kosolapov <[email protected]>
 # Copyright (C) 2012-2013  Ciro Mattia Gonano <[email protected]>
+# Copyright (C) 2013 Pawel Jastrzebski <[email protected]>
 #
 # 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
diff --git a/kcc/pdfjpgextract.py b/kcc/pdfjpgextract.py
index dd5f067..d9dad09 100644
--- a/kcc/pdfjpgextract.py
+++ b/kcc/pdfjpgextract.py
@@ -1,4 +1,5 @@
-# Copyright (c) 2012 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2012-2013 Ciro Mattia Gonano <[email protected]>
+# Copyright (c) 2013 Pawel Jastrzebski <[email protected]>
 #
 # Based upon the code snippet by Ned Batchelder
 # (http://nedbatchelder.com/blog/200712/extracting_jpgs_from_pdfs.html)
diff --git a/setup.py b/setup.py
index ebe2bf3..9d95d63 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ Usage (Windows):
 from sys import platform
 
 NAME = "KindleComicConverter"
-VERSION = "3.2.1"
+VERSION = "3.3"
 MAIN = "kcc.py"
 
 if platform == "darwin":