Merge pull request #156 from ciromattia/dev

4.6.5
Fixed OS X GUI anomalies
2026-04-16 14:08:45 +00:00 · 2015-09-17 15:44:42 +02:00 · 2015-09-17 10:35:54 +02:00 · 2015-09-16 19:13:32 +02:00 · 2015-09-16 19:00:45 +02:00 · 2015-09-16 11:52:17 +02:00
40 changed files with 6755 additions and 3899 deletions
--- a/KCC.qrc
+++ b/KCC.qrc
@@ -1,27 +0,0 @@
-<RCC>
-  <qresource prefix="Icon">
-    <file>icons/comic2ebook.png</file>
-  </qresource>
-  <qresource prefix="Devices">
-    <file>icons/Kobo.png</file>
-    <file>icons/Other.png</file>
-    <file>icons/Kindle.png</file>
-  </qresource>
-  <qresource prefix="Formats">
-    <file>icons/CBZ.png</file>
-    <file>icons/EPUB.png</file>
-    <file>icons/MOBI.png</file>
-  </qresource>
-  <qresource prefix="Status">
-    <file>icons/error.png</file>
-    <file>icons/info.png</file>
-    <file>icons/warning.png</file>
-  </qresource>
-  <qresource prefix="Other">
-    <file>icons/list_background.png</file>
-    <file>icons/clear.png</file>
-    <file>icons/convert.png</file>
-    <file>icons/document_new.png</file>
-    <file>icons/folder_new.png</file>
-  </qresource>
-</RCC>
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # KCC

 **Kindle Comic Converter** is a Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ.
-It was initially developed for Kindle but since version 2.2 it outputs valid EPUB 2.0 so _**despite its name, KCC is
+It was initially developed for Kindle but since version 4.6 it outputs valid EPUB 3.0 so _**despite its name, KCC is
 actually a comic/manga to EPUB converter that every e-reader owner can happily use**_.
 It can also optionally optimize images by applying a number of transformations.

@@ -29,6 +29,26 @@ You can find the latest released binary at the following links:
 - **Linux:** [http://kcc.iosphe.re/Linux/](http://kcc.iosphe.re/Linux/)
 - **OS X (10.8+):** [http://kcc.iosphe.re/OSX/](http://kcc.iosphe.re/OSX/)

+## DEPENDENCIES
+Following software is required to run Linux version of **KCC** and/or bare sources:
+- Python 3.3+
+- [PyQt](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.2.1+
+- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.8.2+
+- [psutil](https://pypi.python.org/pypi/psutil) 3.0.0+
+- [python-slugify](http://pypi.python.org/pypi/python-slugify) 1.1.3+
+- [scandir](https://pypi.python.org/pypi/scandir) 1.1.0+
+
+On Debian based distributions these two commands should install all needed dependencies:
+```
+sudo apt-get install python3 python3-dev python3-pip python3-pyqt5 libpng-dev libjpeg-dev p7zip-full unrar
+sudo pip3 install pillow python-slugify psutil scandir
+```
+
+### Optional dependencies
+- [KindleGen](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211) v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation)*
+- [UnRAR](http://www.rarlab.com/download.htm) *(For CBR/RAR support)*
+- [7za](http://www.7-zip.org/download.html) *(For 7z/CB7 support)*
+
 ## INPUT FORMATS
 **KCC** can understand and convert, at the moment, the following input types:
 - Folders containing: PNG, JPG or GIF files
@@ -37,28 +57,6 @@ You can find the latest released binary at the following links:
 - CB7, 7Z *(With `7za` executable)*
 - PDF *(Only extracting JPG images)*

-## OPTIONAL REQUIREMENTS
- [KindleGen](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211) v2.9+ in a directory reachable by your _PATH_ or in _KCC_ directory *(For MOBI generation)*
- [UnRAR](http://www.rarlab.com/download.htm) *(For CBR/RAR support)*
- [7za](http://www.7-zip.org/download.html) *(For 7z/CB7 support)*
-
-### For running from source:
- Python 3.3+
- [PyQt](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.2.0+
- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.7.0+
- [psutil](https://pypi.python.org/pypi/psutil) 2.0+
- [python-slugify](http://pypi.python.org/pypi/python-slugify) 0.1.0+
-
-On Debian based distributions these two commands should install all dependencies:
-```
-sudo apt-get install python3 python3-dev python3-pip python3-pyqt5 libpng-dev libjpeg-dev p7zip-full unrar
-sudo pip3 install pillow python-slugify psutil
-```
-
-### For freezing code:
- Windows - [py2exe](https://pypi.python.org/pypi/py2exe) 0.9.2.2+
- OS X - [py2app](https://bitbucket.org/ronaldoussoren/py2app) 0.9.0+
-
 ## USAGE

 Should be pretty self-explanatory. All options have detailed informations in tooltips.
@@ -77,8 +75,7 @@ Options:
  MAIN:
    -p PROFILE, --profile=PROFILE
                        Device profile (Available options: K1, K2, K345, KDX,
-                        KPW, KV, KFHD, KFHDX, KFHDX8, KFA, KoMT, KoG, KoA,
-                        KoAHD, KoAH2O) [Default=KV]
+                        KPW, KV, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O) [Default=KV]
    -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)
@@ -147,17 +144,63 @@ The app relies and includes the following scripts:
 - 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 Voyage](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi)
-* [Kindle Paperwhite](http://kcc.iosphe.re/Samples/Ubunchu!-KPW.mobi)
+* [Kindle Paperwhite 3 / Voyage](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi)
+* [Kindle Paperwhite 1 / 2](http://kcc.iosphe.re/Samples/Ubunchu!-KPW.mobi)
 * [Kindle](http://kcc.iosphe.re/Samples/Ubunchu!-K345.mobi)
 * [Kindle DX/DXG](http://kcc.iosphe.re/Samples/Ubunchu!-KDX.cbz)
-* [Kobo Mini/Touch](http://kcc.iosphe.re/Samples/Ubunchu!-KoMT.cbz)
-* [Kobo Glow](http://kcc.iosphe.re/Samples/Ubunchu!-KoG.cbz)
-* [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu!-KoA.cbz)
-* [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu!-KoAHD.cbz)
-* [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu!-KoAH2O.cbz)
+* [Kobo Mini/Touch](http://kcc.iosphe.re/Samples/Ubunchu-KoMT.kepub.epub)
+* [Kobo Glo](http://kcc.iosphe.re/Samples/Ubunchu-KoG.kepub.epub)
+* [Kobo Glo HD](http://kcc.iosphe.re/Samples/Ubunchu-KoGHD.kepub.epub)
+* [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu-KoA.kepub.epub)
+* [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu-KoAHD.kepub.epub)
+* [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu-KoAH2O.kepub.epub)

 ## CHANGELOG
+####4.6.5:
+* Fixed multiple Windows and OS X issues
+* Allowed Linux release to use older PyQT5 version
+
+####4.6.4:
+* Fixed multiple Windows specific problems
+* Improved error handling
+* Improved color detection algorithm
+* New, slimmer OS X release
+
+####4.6.3:
+* Implemented remote bug reporting
+* Minor bug fixes and GUI tweaks
+
+####4.6.2:
+* Fixed critical MOBI header bug
+* Fixed metadata encoding error
+
+####4.6.1:
+* Fixed KEPUB TOC generator
+* Added warning about too small input files
+* ComicRack Summary metadata field is now parsed
+* Small tweaks of KEPUB output
+
+####4.6:
+* KEPUB is now default output for all Kobo profiles
+* EPUB output now produce fully valid EPUB 3.0.1
+* Added profile for Kindle Paperwhite 3
+* Dropped official support of all Kindle Fire models and Kindle for Android
+* Other minor tweaks
+
+####4.5.1:
+* Added Kobo Glo HD profile
+* Fixed RAR/CBR parsing anomalies
+* Minor bug fixes and tweaks
+
+####4.5:
+* Added simple ComicRack metadata editor
+* Re-enabled Manga Cover Database support
+* ComicRack bookmarks are now parsed
+* Fixed glitches in Kindle Voyage profile
+* Fixed problems with directory locks on Windows
+* Fixed sorting anomalies
+* Improved conversion speed
+
 ####4.4.1:
 * Fixed problems with OSX GUI
 * Added one missing DLL to Windows installer
@@ -394,6 +437,14 @@ The app relies and includes the following scripts:
 ####1.0
 * Initial version

+## PRIVACY
+**KCC** is initiating internet connections in three cases:
+* During startup - Version check
+* When MCD metadata are used - Cover download
+* When error occurs - Automatic reporting
+
+Error report include **KCC** version, OS version and content of error message. 
+
 ## KNOWN ISSUES
 Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).

--- a/gui/KCC-Linux.ui
+++ b/gui/KCC-Linux.ui
@@ -451,9 +451,6 @@
    <property name="styleSheet">
     <string notr="true">QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}</string>
    </property>
-    <property name="verticalScrollBarPolicy">
-     <enum>Qt::ScrollBarAlwaysOn</enum>
-    </property>
    <property name="showDropIndicator" stdset="0">
     <bool>false</bool>
    </property>
@@ -466,19 +463,13 @@
      <height>18</height>
     </size>
    </property>
-    <property name="verticalScrollMode">
-     <enum>QAbstractItemView::ScrollPerPixel</enum>
-    </property>
-    <property name="horizontalScrollMode">
-     <enum>QAbstractItemView::ScrollPerPixel</enum>
-    </property>
   </widget>
   <widget class="QPushButton" name="BasicModeButton">
    <property name="geometry">
     <rect>
      <x>10</x>
      <y>10</y>
-      <width>195</width>
+      <width>141</width>
      <height>32</height>
     </rect>
    </property>
@@ -498,9 +489,9 @@
   <widget class="QPushButton" name="AdvModeButton">
    <property name="geometry">
     <rect>
-      <x>217</x>
+      <x>260</x>
      <y>10</y>
-      <width>195</width>
+      <width>151</width>
      <height>32</height>
     </rect>
    </property>
@@ -767,6 +758,32 @@
     </layout>
    </widget>
   </widget>
+   <widget class="QPushButton" name="EditorButton">
+    <property name="geometry">
+     <rect>
+      <x>160</x>
+      <y>10</y>
+      <width>91</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>DejaVu Sans</family>
+      <pointsize>9</pointsize>
+     </font>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
+    <property name="text">
+     <string>Editor</string>
+    </property>
+    <property name="icon">
+     <iconset resource="KCC.qrc">
+      <normaloff>:/Other/icons/editor.png</normaloff>:/Other/icons/editor.png</iconset>
+    </property>
+   </widget>
   <zorder>OptionsAdvanced</zorder>
   <zorder>DeviceBox</zorder>
   <zorder>FormatBox</zorder>
@@ -780,6 +797,7 @@
   <zorder>AdvModeButton</zorder>
   <zorder>OptionsAdvancedGamma</zorder>
   <zorder>OptionsExpert</zorder>
+   <zorder>EditorButton</zorder>
   <zorder>ProgressBar</zorder>
  </widget>
  <widget class="QStatusBar" name="statusBar">
--- a/gui/KCC-OSX.ui
+++ b/gui/KCC-OSX.ui
@@ -456,9 +456,6 @@
    <property name="styleSheet">
     <string notr="true">QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}</string>
    </property>
-    <property name="verticalScrollBarPolicy">
-     <enum>Qt::ScrollBarAlwaysOn</enum>
-    </property>
    <property name="showDropIndicator" stdset="0">
     <bool>false</bool>
    </property>
@@ -477,7 +474,7 @@
     <rect>
      <x>5</x>
      <y>10</y>
-      <width>210</width>
+      <width>156</width>
      <height>41</height>
     </rect>
    </property>
@@ -499,9 +496,9 @@
   <widget class="QPushButton" name="AdvModeButton">
    <property name="geometry">
     <rect>
-      <x>207</x>
+      <x>260</x>
      <y>10</y>
-      <width>210</width>
+      <width>156</width>
      <height>41</height>
     </rect>
    </property>
@@ -782,9 +779,34 @@
     </layout>
    </widget>
   </widget>
+   <widget class="QPushButton" name="EditorButton">
+    <property name="geometry">
+     <rect>
+      <x>160</x>
+      <y>10</y>
+      <width>101</width>
+      <height>41</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <family>Lucida Grande</family>
+      <pointsize>12</pointsize>
+     </font>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
+    <property name="text">
+     <string>Editor</string>
+    </property>
+    <property name="icon">
+     <iconset resource="KCC.qrc">
+      <normaloff>:/Other/icons/editor.png</normaloff>:/Other/icons/editor.png</iconset>
+    </property>
+   </widget>
   <zorder>BasicModeButton</zorder>
   <zorder>AdvModeButton</zorder>
-   <zorder>ProgressBar</zorder>
   <zorder>JobList</zorder>
   <zorder>OptionsAdvanced</zorder>
   <zorder>DeviceBox</zorder>
@@ -796,6 +818,8 @@
   <zorder>OptionsBasic</zorder>
   <zorder>OptionsAdvancedGamma</zorder>
   <zorder>OptionsExpert</zorder>
+   <zorder>EditorButton</zorder>
+   <zorder>ProgressBar</zorder>
  </widget>
  <widget class="QStatusBar" name="statusBar">
   <property name="font">
--- a/gui/KCC.qrc
+++ b/gui/KCC.qrc
@@ -0,0 +1,28 @@
+<RCC>
+  <qresource prefix="Icon">
+    <file>../icons/comic2ebook.png</file>
+  </qresource>
+  <qresource prefix="Devices">
+    <file>../icons/Kobo.png</file>
+    <file>../icons/Other.png</file>
+    <file>../icons/Kindle.png</file>
+  </qresource>
+  <qresource prefix="Formats">
+    <file>../icons/CBZ.png</file>
+    <file>../icons/EPUB.png</file>
+    <file>../icons/MOBI.png</file>
+  </qresource>
+  <qresource prefix="Status">
+    <file>../icons/error.png</file>
+    <file>../icons/info.png</file>
+    <file>../icons/warning.png</file>
+  </qresource>
+  <qresource prefix="Other">
+    <file>../icons/editor.png</file>
+    <file>../icons/list_background.png</file>
+    <file>../icons/clear.png</file>
+    <file>../icons/convert.png</file>
+    <file>../icons/document_new.png</file>
+    <file>../icons/folder_new.png</file>
+  </qresource>
+</RCC>
--- a/gui/KCC.ui
+++ b/gui/KCC.ui
@@ -391,9 +391,6 @@
    <property name="styleSheet">
     <string notr="true">QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}</string>
    </property>
-    <property name="verticalScrollBarPolicy">
-     <enum>Qt::ScrollBarAlwaysOn</enum>
-    </property>
    <property name="showDropIndicator" stdset="0">
     <bool>false</bool>
    </property>
@@ -412,7 +409,7 @@
     <rect>
      <x>10</x>
      <y>10</y>
-      <width>195</width>
+      <width>141</width>
      <height>32</height>
     </rect>
    </property>
@@ -431,9 +428,9 @@
   <widget class="QPushButton" name="AdvModeButton">
    <property name="geometry">
     <rect>
-      <x>217</x>
+      <x>261</x>
      <y>10</y>
-      <width>195</width>
+      <width>151</width>
      <height>32</height>
     </rect>
    </property>
@@ -656,6 +653,31 @@
     </layout>
    </widget>
   </widget>
+   <widget class="QPushButton" name="EditorButton">
+    <property name="geometry">
+     <rect>
+      <x>160</x>
+      <y>10</y>
+      <width>91</width>
+      <height>32</height>
+     </rect>
+    </property>
+    <property name="font">
+     <font>
+      <pointsize>9</pointsize>
+     </font>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
+    <property name="text">
+     <string>Editor</string>
+    </property>
+    <property name="icon">
+     <iconset resource="KCC.qrc">
+      <normaloff>:/Other/icons/editor.png</normaloff>:/Other/icons/editor.png</iconset>
+    </property>
+   </widget>
   <zorder>OptionsAdvanced</zorder>
   <zorder>DeviceBox</zorder>
   <zorder>FormatBox</zorder>
@@ -669,6 +691,7 @@
   <zorder>AdvModeButton</zorder>
   <zorder>OptionsAdvancedGamma</zorder>
   <zorder>OptionsExpert</zorder>
+   <zorder>EditorButton</zorder>
   <zorder>ProgressBar</zorder>
  </widget>
  <widget class="QStatusBar" name="statusBar">
--- a/gui/MetaEditor-Linux.ui
+++ b/gui/MetaEditor-Linux.ui
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MetaEditorDialog</class>
+ <widget class="QDialog" name="MetaEditorDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>320</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>320</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>400</width>
+    <height>320</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Metadata editor</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="KCC.qrc">
+    <normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
+  </property>
+  <widget class="QWidget" name="horizontalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>280</y>
+     <width>381</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QLabel" name="StatusLabel">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">color: rgb(255, 0, 0);</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="OKButton">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Save</string>
+      </property>
+      <property name="icon">
+       <iconset resource="KCC.qrc">
+        <normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="CancelButton">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Cancel</string>
+      </property>
+      <property name="icon">
+       <iconset resource="KCC.qrc">
+        <normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QFrame" name="EditorFrame">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>381</width>
+     <height>271</height>
+    </rect>
+   </property>
+   <widget class="QWidget" name="formLayoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>381</width>
+      <height>266</height>
+     </rect>
+    </property>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Series:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="SeriesLine"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Volume:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="VolumeLine"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Number:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="NumberLine"/>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Writer:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="WriterLine"/>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Penciller:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLineEdit" name="PencillerLine"/>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Inker:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLineEdit" name="InkerLine"/>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Colorist:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QLineEdit" name="ColoristLine"/>
+     </item>
+     <item row="8" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;MUid:&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="QLineEdit" name="MUidLine"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <zorder>horizontalLayoutWidget</zorder>
+  <zorder>EditorFrame</zorder>
+  <zorder>StatusLabel</zorder>
+ </widget>
+ <resources>
+  <include location="KCC.qrc"/>
+ </resources>
+ <connections/>
+</ui>
--- a/gui/MetaEditor-OSX.ui
+++ b/gui/MetaEditor-OSX.ui
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MetaEditorDialog</class>
+ <widget class="QDialog" name="MetaEditorDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>295</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>295</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>400</width>
+    <height>295</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Metadata editor</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="KCC.qrc">
+    <normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
+  </property>
+  <widget class="QWidget" name="horizontalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>260</y>
+     <width>381</width>
+     <height>32</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QLabel" name="StatusLabel">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>10</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">color: rgb(255, 0, 0);</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="OKButton">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Save</string>
+      </property>
+      <property name="icon">
+       <iconset resource="KCC.qrc">
+        <normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="CancelButton">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Cancel</string>
+      </property>
+      <property name="icon">
+       <iconset resource="KCC.qrc">
+        <normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QFrame" name="EditorFrame">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>381</width>
+     <height>251</height>
+    </rect>
+   </property>
+   <widget class="QWidget" name="formLayoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>381</width>
+      <height>250</height>
+     </rect>
+    </property>
+    <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Series:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="SeriesLine"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Volume:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="VolumeLine"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Number:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="NumberLine"/>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Writer:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="WriterLine"/>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Penciller:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLineEdit" name="PencillerLine"/>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Inker:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLineEdit" name="InkerLine"/>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Colorist:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QLineEdit" name="ColoristLine"/>
+     </item>
+     <item row="8" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;MUid:&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="QLineEdit" name="MUidLine"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+ </widget>
+ <resources>
+  <include location="KCC.qrc"/>
+ </resources>
+ <connections/>
+</ui>
--- a/gui/MetaEditor.ui
+++ b/gui/MetaEditor.ui
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MetaEditorDialog</class>
+ <widget class="QDialog" name="MetaEditorDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>260</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>400</width>
+    <height>260</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>400</width>
+    <height>260</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Metadata editor</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="KCC.qrc">
+    <normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
+  </property>
+  <widget class="QWidget" name="horizontalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>220</y>
+     <width>381</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QLabel" name="StatusLabel">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="styleSheet">
+       <string notr="true">color: rgb(255, 0, 0);</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="OKButton">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Save</string>
+      </property>
+      <property name="icon">
+       <iconset resource="KCC.qrc">
+        <normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="CancelButton">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Cancel</string>
+      </property>
+      <property name="icon">
+       <iconset resource="KCC.qrc">
+        <normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QFrame" name="EditorFrame">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>381</width>
+     <height>211</height>
+    </rect>
+   </property>
+   <widget class="QWidget" name="formLayoutWidget">
+    <property name="geometry">
+     <rect>
+      <x>0</x>
+      <y>0</y>
+      <width>381</width>
+      <height>211</height>
+     </rect>
+    </property>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Series:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="SeriesLine"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Volume:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="VolumeLine"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Number:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLineEdit" name="NumberLine"/>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Writer:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLineEdit" name="WriterLine"/>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Penciller:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLineEdit" name="PencillerLine"/>
+     </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Inker:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLineEdit" name="InkerLine"/>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Colorist:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QLineEdit" name="ColoristLine"/>
+     </item>
+     <item row="8" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;MUid:&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="QLineEdit" name="MUidLine"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+ </widget>
+ <resources>
+  <include location="KCC.qrc"/>
+ </resources>
+ <connections/>
+</ui>
--- a/icons/WizardOSX.png
+++ b/icons/WizardOSX.png
--- a/icons/editor.png
+++ b/icons/editor.png
--- a/kcc-c2e.py
+++ b/kcc-c2e.py
@@ -18,11 +18,6 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-__version__ = '4.4.1'
-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import sys
 if sys.version_info[0] != 3:
    print('ERROR: This is Python 3 script!')
@@ -32,10 +27,11 @@ from kcc.shared import dependencyCheck
 dependencyCheck(2)

 from multiprocessing import freeze_support
+from kcc import __version__
 from kcc.comic2ebook import main

 if __name__ == "__main__":
    freeze_support()
-    print(('comic2ebook v%(__version__)s. Written by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals()))
+    print('comic2ebook v' + __version__ + ' - Written by Ciro Mattia Gonano and Pawel Jastrzebski.')
    main(sys.argv[1:])
-    sys.exit(0)
+    sys.exit(0)
--- a/kcc-c2p.py
+++ b/kcc-c2p.py
@@ -18,11 +18,6 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-__version__ = '4.4.1'
-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import sys
 if sys.version_info[0] != 3:
    print('ERROR: This is Python 3 script!')
@@ -32,10 +27,11 @@ from kcc.shared import dependencyCheck
 dependencyCheck(1)

 from multiprocessing import freeze_support
+from kcc import __version__
 from kcc.comic2panel import main

 if __name__ == "__main__":
    freeze_support()
-    print(('comic2panel v%(__version__)s. Written by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals()))
+    print('comic2panel v' + __version__ + ' - Written by Ciro Mattia Gonano and Pawel Jastrzebski.')
    main(sys.argv[1:])
-    sys.exit(0)
+    sys.exit(0)
--- a/kcc.iss
+++ b/kcc.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Kindle Comic Converter"
-#define MyAppVersion "4.4.1"
+#define MyAppVersion "4.6.5"
 #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
 #define MyAppURL "http://kcc.iosphe.re/"
 #define MyAppExeName "KCC.exe"
@@ -85,3 +85,49 @@ Root: HKCR; SubKey: ".cb7"; ValueType: string; ValueData: "KCCCB7"; Flags: unins
 Root: HKCR; SubKey: "KCCCB7"; ValueType: string; ValueData: "KCC 7z Archive"; Flags: uninsdeletekey; Tasks: CB7association
 Root: HKCR; SubKey: "KCCCB7\Shell\Open\Command"; ValueType: string; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Flags: uninsdeletekey; Tasks: CB7association
 Root: HKCR; Subkey: "KCCCB7\DefaultIcon"; ValueType: string; ValueData: "{app}\{#MyAppExeName},0"; Flags: uninsdeletevalue; Tasks: CB7association
+
+[Code]
+function GetUninstallString(): String;
+var
+  sUnInstPath: String;
+  sUnInstallString: String;
+begin
+  sUnInstPath := ExpandConstant('Software\Microsoft\Windows\CurrentVersion\Uninstall\{#emit SetupSetting("AppId")}_is1');
+  sUnInstallString := '';
+  if not RegQueryStringValue(HKLM, sUnInstPath, 'UninstallString', sUnInstallString) then
+    RegQueryStringValue(HKCU, sUnInstPath, 'UninstallString', sUnInstallString);
+  Result := sUnInstallString;
+end;
+
+function IsUpgrade(): Boolean;
+begin
+  Result := (GetUninstallString() <> '');
+end;
+
+function UnInstallOldVersion(): Integer;
+var
+  sUnInstallString: String;
+  iResultCode: Integer;
+begin
+  Result := 0;
+  sUnInstallString := GetUninstallString();
+  if sUnInstallString <> '' then begin
+    sUnInstallString := RemoveQuotes(sUnInstallString);
+    if Exec(sUnInstallString, '/SILENT /NORESTART /SUPPRESSMSGBOXES','', SW_HIDE, ewWaitUntilTerminated, iResultCode) then
+      Result := 3
+    else
+      Result := 2;
+  end else
+    Result := 1;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if (CurStep=ssInstall) then
+  begin
+    if (IsUpgrade()) then
+    begin
+      UnInstallOldVersion();
+    end;
+  end;
+end;
--- a/kcc.py
+++ b/kcc.py
@@ -18,11 +18,6 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-__version__ = '4.4.1'
-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import sys
 if sys.version_info[0] != 3:
    print('ERROR: This is Python 3 script!')
@@ -35,6 +30,7 @@ if sys.platform.startswith('darwin'):
        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/:' + os.environ['PATH']
    else:
        os.environ['PATH'] = './../Resources:/usr/local/bin:/usr/bin:/bin'
+        os.system('defaults write com.kindlecomicconverter.KindleComicConverter ApplePersistenceIgnoreState YES')
 elif sys.platform.startswith('win'):
    if getattr(sys, 'frozen', False):
        os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
--- a/kcc/KCC_MetaEditor_ui.py
+++ b/kcc/KCC_MetaEditor_ui.py
@@ -0,0 +1,147 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'MetaEditor.ui'
+#
+# Created: Sun Feb  8 11:52:00 2015
+#      by: PyQt5 UI code generator 5.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_MetaEditorDialog(object):
+    def setupUi(self, MetaEditorDialog):
+        MetaEditorDialog.setObjectName("MetaEditorDialog")
+        MetaEditorDialog.resize(400, 260)
+        MetaEditorDialog.setMinimumSize(QtCore.QSize(400, 260))
+        MetaEditorDialog.setMaximumSize(QtCore.QSize(400, 260))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        MetaEditorDialog.setWindowIcon(icon)
+        self.horizontalLayoutWidget = QtWidgets.QWidget(MetaEditorDialog)
+        self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 220, 381, 31))
+        self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget)
+        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.StatusLabel = QtWidgets.QLabel(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.StatusLabel.sizePolicy().hasHeightForWidth())
+        self.StatusLabel.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.StatusLabel.setFont(font)
+        self.StatusLabel.setStyleSheet("color: rgb(255, 0, 0);")
+        self.StatusLabel.setObjectName("StatusLabel")
+        self.horizontalLayout.addWidget(self.StatusLabel)
+        self.OKButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.OKButton.sizePolicy().hasHeightForWidth())
+        self.OKButton.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.OKButton.setFont(font)
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.OKButton.setIcon(icon1)
+        self.OKButton.setObjectName("OKButton")
+        self.horizontalLayout.addWidget(self.OKButton)
+        self.CancelButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.CancelButton.sizePolicy().hasHeightForWidth())
+        self.CancelButton.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.CancelButton.setFont(font)
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.CancelButton.setIcon(icon2)
+        self.CancelButton.setObjectName("CancelButton")
+        self.horizontalLayout.addWidget(self.CancelButton)
+        self.EditorFrame = QtWidgets.QFrame(MetaEditorDialog)
+        self.EditorFrame.setGeometry(QtCore.QRect(10, 10, 381, 211))
+        self.EditorFrame.setObjectName("EditorFrame")
+        self.formLayoutWidget = QtWidgets.QWidget(self.EditorFrame)
+        self.formLayoutWidget.setGeometry(QtCore.QRect(0, 0, 381, 211))
+        self.formLayoutWidget.setObjectName("formLayoutWidget")
+        self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget)
+        self.formLayout.setContentsMargins(0, 0, 0, 0)
+        self.formLayout.setObjectName("formLayout")
+        self.label = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label.setObjectName("label")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label)
+        self.SeriesLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.SeriesLine.setObjectName("SeriesLine")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.SeriesLine)
+        self.label_2 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_2.setObjectName("label_2")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2)
+        self.VolumeLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.VolumeLine.setObjectName("VolumeLine")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.VolumeLine)
+        self.label_3 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_3.setObjectName("label_3")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3)
+        self.NumberLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.NumberLine.setObjectName("NumberLine")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.NumberLine)
+        self.label_4 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_4.setObjectName("label_4")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4)
+        self.WriterLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.WriterLine.setObjectName("WriterLine")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.WriterLine)
+        self.label_5 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_5.setObjectName("label_5")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5)
+        self.PencillerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.PencillerLine.setObjectName("PencillerLine")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.PencillerLine)
+        self.label_6 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_6.setObjectName("label_6")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
+        self.InkerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.InkerLine.setObjectName("InkerLine")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.InkerLine)
+        self.label_7 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_7.setObjectName("label_7")
+        self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7)
+        self.ColoristLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.ColoristLine.setObjectName("ColoristLine")
+        self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.ColoristLine)
+        self.label_8 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_8.setTextFormat(QtCore.Qt.RichText)
+        self.label_8.setOpenExternalLinks(True)
+        self.label_8.setObjectName("label_8")
+        self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8)
+        self.MUidLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.MUidLine.setObjectName("MUidLine")
+        self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.MUidLine)
+
+        self.retranslateUi(MetaEditorDialog)
+        QtCore.QMetaObject.connectSlotsByName(MetaEditorDialog)
+
+    def retranslateUi(self, MetaEditorDialog):
+        _translate = QtCore.QCoreApplication.translate
+        MetaEditorDialog.setWindowTitle(_translate("MetaEditorDialog", "Metadata editor"))
+        self.OKButton.setText(_translate("MetaEditorDialog", "Save"))
+        self.CancelButton.setText(_translate("MetaEditorDialog", "Cancel"))
+        self.label.setText(_translate("MetaEditorDialog", "Series:"))
+        self.label_2.setText(_translate("MetaEditorDialog", "Volume:"))
+        self.label_3.setText(_translate("MetaEditorDialog", "Number:"))
+        self.label_4.setText(_translate("MetaEditorDialog", "Writer:"))
+        self.label_5.setText(_translate("MetaEditorDialog", "Penciller:"))
+        self.label_6.setText(_translate("MetaEditorDialog", "Inker:"))
+        self.label_7.setText(_translate("MetaEditorDialog", "Colorist:"))
+        self.label_8.setText(_translate("MetaEditorDialog", "<html><head/><body><p><a href=\"https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support\"><span style=\" text-decoration: underline; color:#0000ff;\">MUid:</span></a></p></body></html>"))
+
+from . import KCC_rc
--- a/kcc/KCC_MetaEditor_ui_linux.py
+++ b/kcc/KCC_MetaEditor_ui_linux.py
@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'gui/MetaEditor.ui'
+#
+# Created: Sun Feb  8 03:24:23 2015
+#      by: PyQt5 UI code generator 5.2.1
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_MetaEditorDialog(object):
+    def setupUi(self, MetaEditorDialog):
+        MetaEditorDialog.setObjectName("MetaEditorDialog")
+        MetaEditorDialog.resize(400, 320)
+        MetaEditorDialog.setMinimumSize(QtCore.QSize(400, 320))
+        MetaEditorDialog.setMaximumSize(QtCore.QSize(400, 320))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        MetaEditorDialog.setWindowIcon(icon)
+        self.horizontalLayoutWidget = QtWidgets.QWidget(MetaEditorDialog)
+        self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 280, 381, 31))
+        self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget)
+        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.StatusLabel = QtWidgets.QLabel(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.StatusLabel.sizePolicy().hasHeightForWidth())
+        self.StatusLabel.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setPointSize(10)
+        font.setBold(True)
+        font.setWeight(75)
+        self.StatusLabel.setFont(font)
+        self.StatusLabel.setStyleSheet("color: rgb(255, 0, 0);")
+        self.StatusLabel.setObjectName("StatusLabel")
+        self.horizontalLayout.addWidget(self.StatusLabel)
+        self.OKButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.OKButton.sizePolicy().hasHeightForWidth())
+        self.OKButton.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.OKButton.setFont(font)
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.OKButton.setIcon(icon1)
+        self.OKButton.setObjectName("OKButton")
+        self.horizontalLayout.addWidget(self.OKButton)
+        self.CancelButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.CancelButton.sizePolicy().hasHeightForWidth())
+        self.CancelButton.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.CancelButton.setFont(font)
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.CancelButton.setIcon(icon2)
+        self.CancelButton.setObjectName("CancelButton")
+        self.horizontalLayout.addWidget(self.CancelButton)
+        self.EditorFrame = QtWidgets.QFrame(MetaEditorDialog)
+        self.EditorFrame.setGeometry(QtCore.QRect(10, 10, 381, 271))
+        self.EditorFrame.setObjectName("EditorFrame")
+        self.formLayoutWidget = QtWidgets.QWidget(self.EditorFrame)
+        self.formLayoutWidget.setGeometry(QtCore.QRect(0, 0, 381, 266))
+        self.formLayoutWidget.setObjectName("formLayoutWidget")
+        self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget)
+        self.formLayout.setContentsMargins(0, 0, 0, 0)
+        self.formLayout.setObjectName("formLayout")
+        self.label = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label.setObjectName("label")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label)
+        self.SeriesLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.SeriesLine.setObjectName("SeriesLine")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.SeriesLine)
+        self.label_2 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_2.setObjectName("label_2")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2)
+        self.VolumeLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.VolumeLine.setObjectName("VolumeLine")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.VolumeLine)
+        self.label_3 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_3.setObjectName("label_3")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3)
+        self.NumberLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.NumberLine.setObjectName("NumberLine")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.NumberLine)
+        self.label_4 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_4.setObjectName("label_4")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4)
+        self.WriterLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.WriterLine.setObjectName("WriterLine")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.WriterLine)
+        self.label_5 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_5.setObjectName("label_5")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5)
+        self.PencillerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.PencillerLine.setObjectName("PencillerLine")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.PencillerLine)
+        self.label_6 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_6.setObjectName("label_6")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
+        self.InkerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.InkerLine.setObjectName("InkerLine")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.InkerLine)
+        self.label_7 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_7.setObjectName("label_7")
+        self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7)
+        self.ColoristLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.ColoristLine.setObjectName("ColoristLine")
+        self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.ColoristLine)
+        self.label_8 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_8.setTextFormat(QtCore.Qt.RichText)
+        self.label_8.setOpenExternalLinks(True)
+        self.label_8.setObjectName("label_8")
+        self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8)
+        self.MUidLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.MUidLine.setObjectName("MUidLine")
+        self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.MUidLine)
+
+        self.retranslateUi(MetaEditorDialog)
+        QtCore.QMetaObject.connectSlotsByName(MetaEditorDialog)
+
+    def retranslateUi(self, MetaEditorDialog):
+        _translate = QtCore.QCoreApplication.translate
+        MetaEditorDialog.setWindowTitle(_translate("MetaEditorDialog", "Metadata editor"))
+        self.OKButton.setText(_translate("MetaEditorDialog", "Save"))
+        self.CancelButton.setText(_translate("MetaEditorDialog", "Cancel"))
+        self.label.setText(_translate("MetaEditorDialog", "Series:"))
+        self.label_2.setText(_translate("MetaEditorDialog", "Volume:"))
+        self.label_3.setText(_translate("MetaEditorDialog", "Number:"))
+        self.label_4.setText(_translate("MetaEditorDialog", "Writer:"))
+        self.label_5.setText(_translate("MetaEditorDialog", "Penciller:"))
+        self.label_6.setText(_translate("MetaEditorDialog", "Inker:"))
+        self.label_7.setText(_translate("MetaEditorDialog", "Colorist:"))
+        self.label_8.setText(_translate("MetaEditorDialog", "<html><head/><body><p><a href=\"https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support\"><span style=\" text-decoration: underline; color:#0000ff;\">MUid:</span></a></p></body></html>"))
+
+from . import KCC_rc
--- a/kcc/KCC_MetaEditor_ui_osx.py
+++ b/kcc/KCC_MetaEditor_ui_osx.py
@@ -0,0 +1,149 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file '/Users/pawelj/Documents/KCC/gui/MetaEditor.ui'
+#
+# Created: Sun Feb  8 12:47:09 2015
+#      by: PyQt5 UI code generator 5.4
+#
+# WARNING! All changes made in this file will be lost!
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+class Ui_MetaEditorDialog(object):
+    def setupUi(self, MetaEditorDialog):
+        MetaEditorDialog.setObjectName("MetaEditorDialog")
+        MetaEditorDialog.resize(400, 295)
+        MetaEditorDialog.setMinimumSize(QtCore.QSize(400, 295))
+        MetaEditorDialog.setMaximumSize(QtCore.QSize(400, 295))
+        icon = QtGui.QIcon()
+        icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        MetaEditorDialog.setWindowIcon(icon)
+        self.horizontalLayoutWidget = QtWidgets.QWidget(MetaEditorDialog)
+        self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 260, 381, 32))
+        self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
+        self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget)
+        self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.StatusLabel = QtWidgets.QLabel(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.StatusLabel.sizePolicy().hasHeightForWidth())
+        self.StatusLabel.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setPointSize(10)
+        font.setBold(True)
+        font.setWeight(75)
+        self.StatusLabel.setFont(font)
+        self.StatusLabel.setStyleSheet("color: rgb(255, 0, 0);")
+        self.StatusLabel.setObjectName("StatusLabel")
+        self.horizontalLayout.addWidget(self.StatusLabel)
+        self.OKButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.OKButton.sizePolicy().hasHeightForWidth())
+        self.OKButton.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.OKButton.setFont(font)
+        icon1 = QtGui.QIcon()
+        icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.OKButton.setIcon(icon1)
+        self.OKButton.setObjectName("OKButton")
+        self.horizontalLayout.addWidget(self.OKButton)
+        self.CancelButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.CancelButton.sizePolicy().hasHeightForWidth())
+        self.CancelButton.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setBold(True)
+        font.setWeight(75)
+        self.CancelButton.setFont(font)
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.CancelButton.setIcon(icon2)
+        self.CancelButton.setObjectName("CancelButton")
+        self.horizontalLayout.addWidget(self.CancelButton)
+        self.EditorFrame = QtWidgets.QFrame(MetaEditorDialog)
+        self.EditorFrame.setGeometry(QtCore.QRect(10, 10, 381, 251))
+        self.EditorFrame.setObjectName("EditorFrame")
+        self.formLayoutWidget = QtWidgets.QWidget(self.EditorFrame)
+        self.formLayoutWidget.setGeometry(QtCore.QRect(0, 0, 381, 250))
+        self.formLayoutWidget.setObjectName("formLayoutWidget")
+        self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget)
+        self.formLayout.setContentsMargins(0, 0, 0, 0)
+        self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow)
+        self.formLayout.setObjectName("formLayout")
+        self.label = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label.setObjectName("label")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label)
+        self.SeriesLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.SeriesLine.setObjectName("SeriesLine")
+        self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.SeriesLine)
+        self.label_2 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_2.setObjectName("label_2")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2)
+        self.VolumeLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.VolumeLine.setObjectName("VolumeLine")
+        self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.VolumeLine)
+        self.label_3 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_3.setObjectName("label_3")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3)
+        self.NumberLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.NumberLine.setObjectName("NumberLine")
+        self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.NumberLine)
+        self.label_4 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_4.setObjectName("label_4")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4)
+        self.WriterLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.WriterLine.setObjectName("WriterLine")
+        self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.WriterLine)
+        self.label_5 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_5.setObjectName("label_5")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5)
+        self.PencillerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.PencillerLine.setObjectName("PencillerLine")
+        self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.PencillerLine)
+        self.label_6 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_6.setObjectName("label_6")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
+        self.InkerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.InkerLine.setObjectName("InkerLine")
+        self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.InkerLine)
+        self.label_7 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_7.setObjectName("label_7")
+        self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7)
+        self.ColoristLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.ColoristLine.setObjectName("ColoristLine")
+        self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.ColoristLine)
+        self.label_8 = QtWidgets.QLabel(self.formLayoutWidget)
+        self.label_8.setTextFormat(QtCore.Qt.RichText)
+        self.label_8.setOpenExternalLinks(True)
+        self.label_8.setObjectName("label_8")
+        self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8)
+        self.MUidLine = QtWidgets.QLineEdit(self.formLayoutWidget)
+        self.MUidLine.setObjectName("MUidLine")
+        self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.MUidLine)
+
+        self.retranslateUi(MetaEditorDialog)
+        QtCore.QMetaObject.connectSlotsByName(MetaEditorDialog)
+
+    def retranslateUi(self, MetaEditorDialog):
+        _translate = QtCore.QCoreApplication.translate
+        MetaEditorDialog.setWindowTitle(_translate("MetaEditorDialog", "Metadata editor"))
+        self.OKButton.setText(_translate("MetaEditorDialog", "Save"))
+        self.CancelButton.setText(_translate("MetaEditorDialog", "Cancel"))
+        self.label.setText(_translate("MetaEditorDialog", "Series:"))
+        self.label_2.setText(_translate("MetaEditorDialog", "Volume:"))
+        self.label_3.setText(_translate("MetaEditorDialog", "Number:"))
+        self.label_4.setText(_translate("MetaEditorDialog", "Writer:"))
+        self.label_5.setText(_translate("MetaEditorDialog", "Penciller:"))
+        self.label_6.setText(_translate("MetaEditorDialog", "Inker:"))
+        self.label_7.setText(_translate("MetaEditorDialog", "Colorist:"))
+        self.label_8.setText(_translate("MetaEditorDialog", "<html><head/><body><p><a href=\"https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support\"><span style=\" text-decoration: underline; color:#0000ff;\">MUid:</span></a></p></body></html>"))
+
+from . import KCC_rc
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -17,36 +17,41 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-__version__ = '4.4.1'
-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import os
 import sys
 from urllib.parse import unquote
-from urllib.request import urlopen, urlretrieve
+from urllib.request import urlopen, urlretrieve, Request
 from socket import gethostbyname_ex, gethostname
-from traceback import format_tb
-from time import sleep
+from time import sleep, time
+from datetime import datetime
 from shutil import move
 from http.server import BaseHTTPRequestHandler, HTTPServer
 from socketserver import ThreadingMixIn
 from subprocess import STDOUT, PIPE
 from PyQt5 import QtGui, QtCore, QtWidgets, QtNetwork
-from xml.dom.minidom import parse
+from xml.dom.minidom import parse, Document
 from psutil import Popen, Process
 from copy import copy
 from distutils.version import StrictVersion
-from .shared import md5Checksum, HTMLStripper
+from xml.sax.saxutils import escape
+from platform import platform
+from .shared import md5Checksum, HTMLStripper, sanitizeTrace
+from . import __version__
 from . import comic2ebook
 from . import KCC_rc_web
+from . import metadata
 if sys.platform.startswith('darwin'):
    from . import KCC_ui_osx as KCC_ui
 elif sys.platform.startswith('linux'):
    from . import KCC_ui_linux as KCC_ui
 else:
    from . import KCC_ui
+if sys.platform.startswith('darwin'):
+    from . import KCC_MetaEditor_ui_osx as KCC_MetaEditor_ui
+elif sys.platform.startswith('linux'):
+    from . import KCC_MetaEditor_ui_linux as KCC_MetaEditor_ui
+else:
+    from . import KCC_MetaEditor_ui


 class QApplicationMessaging(QtWidgets.QApplication):
@@ -61,7 +66,6 @@ class QApplicationMessaging(QtWidgets.QApplication):
        socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly)
        if not socket.waitForConnected(self._timeout):
            self._server = QtNetwork.QLocalServer(self)
-            # noinspection PyUnresolvedReferences
            self._server.newConnection.connect(self.handleMessage)
            self._server.listen(self._key)
        else:
@@ -134,7 +138,7 @@ class Icons:


 class WebServerHandler(BaseHTTPRequestHandler):
-    # noinspection PyAttributeOutsideInit, PyArgumentList
+    # noinspection PyAttributeOutsideInit
    def do_GET(self):
        if self.path == '/':
            self.path = '/index.html'
@@ -241,22 +245,22 @@ class VersionThread(QtCore.QThread):

    def run(self):
        try:
-            XML = urlopen('http://kcc.iosphe.re/Version.php')
-            XML = parse(XML)
+            XML = parse(urlopen(Request('https://kcc.iosphe.re/Version/',
+                                        headers={'User-Agent': 'KindleComicConverter/' + __version__})))
        except Exception:
            return
-        latestVersion = XML.childNodes[0].getElementsByTagName('latest')[0].childNodes[0].toxml()
+        latestVersion = XML.childNodes[0].getElementsByTagName('LatestVersion')[0].childNodes[0].toxml()
        if StrictVersion(latestVersion) > StrictVersion(__version__):
            if sys.platform.startswith('win'):
                self.newVersion = latestVersion
-                self.md5 = XML.childNodes[0].getElementsByTagName('WindowsMD5')[0].childNodes[0].toxml()
+                self.md5 = XML.childNodes[0].getElementsByTagName('MD5')[0].childNodes[0].toxml()
                MW.showDialog.emit('<b>New version released!</b> <a href="https://github.com/ciromattia/kcc/releases/">'
                                   'See changelog.</a><br/><br/>Installed version: ' + __version__ +
                                   '<br/>Current version: ' + latestVersion +
                                   '<br/><br/>Would you like to start automatic update?', 'question')
                self.getNewVersion()
            else:
-                MW.addMessage.emit('<a href="http://kcc.iosphe.re/">'
+                MW.addMessage.emit('<a href="https://kcc.iosphe.re/">'
                                   '<b>New version is available!</b></a> '
                                   '(<a href="https://github.com/ciromattia/kcc/releases/">'
                                   'Changelog</a>)', 'warning', False)
@@ -271,8 +275,8 @@ class VersionThread(QtCore.QThread):
            try:
                MW.modeConvert.emit(-1)
                MW.progressBarTick.emit('Downloading update')
-                path = urlretrieve('http://kcc.iosphe.re/Windows/KindleComicConverter_win_'
-                                   + self.newVersion + '.exe', reporthook=self.getNewVersionTick)
+                path = urlretrieve('https://kcc.iosphe.re/Windows/KindleComicConverter_win_' +
+                                   self.newVersion + '.exe', reporthook=self.getNewVersionTick)
                if self.md5 != md5Checksum(path[0]):
                    raise Exception
                move(path[0], path[0] + '.exe')
@@ -319,7 +323,6 @@ class ProgressThread(QtCore.QThread):


 class WorkerThread(QtCore.QThread):
-    # noinspection PyArgumentList
    def __init__(self):
        QtCore.QThread.__init__(self)
        self.conversionAlive = False
@@ -344,12 +347,6 @@ class WorkerThread(QtCore.QThread):
        MW.addTrayMessage.emit('Conversion interrupted.', 'Critical')
        MW.modeConvert.emit(1)

-    def sanitizeTrace(self, traceback):
-        return ''.join(format_tb(traceback))\
-            .replace('C:\\Users\\AcidWeb\\Documents\\Projekty\\KCC\\', '')\
-            .replace('C:\\Python34\\', '')\
-            .replace('C:\\Python34_64\\', '')
-
    def run(self):
        MW.modeConvert.emit(0)

@@ -371,9 +368,6 @@ class WorkerThread(QtCore.QThread):
        elif GUI.QualityBox.checkState() == 2:
            options.quality = 2
        options.format = str(GUI.FormatBox.currentText())
-        if GUI.currentMode == 1:
-            if 'KFH' in profile:
-                options.upscale = True

        # Advanced mode settings
        if GUI.currentMode > 1:
@@ -436,16 +430,20 @@ class WorkerThread(QtCore.QThread):
                    GUI.progress.content = ''
                    self.errors = True
                    MW.addMessage.emit(str(warn), 'warning', False)
-                    MW.addMessage.emit('Failed to create output file!', 'error', False)
-                    MW.addTrayMessage.emit('Failed to create output file!', 'Critical')
+                    MW.addMessage.emit('Error during conversion! Please consult '
+                                       '<a href="https://github.com/ciromattia/kcc/wiki/Error-messages">wiki</a> '
+                                       'for more details.', 'error', False)
+                    MW.addTrayMessage.emit('Error during conversion!', 'Critical')
            except Exception as err:
                GUI.progress.content = ''
                self.errors = True
                _, _, traceback = sys.exc_info()
                MW.showDialog.emit("Error during conversion %s:\n\n%s\n\nTraceback:\n%s"
-                                   % (jobargv[-1], str(err), self.sanitizeTrace(traceback)), 'error')
-                MW.addMessage.emit('Failed to create EPUB!', 'error', False)
-                MW.addTrayMessage.emit('Failed to create EPUB!', 'Critical')
+                                   % (jobargv[-1], str(err), sanitizeTrace(traceback)), 'error')
+                MW.addMessage.emit('Error during conversion! Please consult '
+                                   '<a href="https://github.com/ciromattia/kcc/wiki/Error-messages">wiki</a> '
+                                   'for more details.', 'error', False)
+                MW.addTrayMessage.emit('Error during conversion!', 'Critical')
            if not self.conversionAlive:
                for item in outputPath:
                    if os.path.exists(item):
@@ -460,7 +458,7 @@ class WorkerThread(QtCore.QThread):
                    MW.addMessage.emit('Creating EPUB files... <b>Done!</b>', 'info', True)
                if str(GUI.FormatBox.currentText()) == 'MOBI':
                    MW.progressBarTick.emit('Creating MOBI files')
-                    MW.progressBarTick.emit(str(len(outputPath)*2+1))
+                    MW.progressBarTick.emit(str(len(outputPath) * 2 + 1))
                    MW.progressBarTick.emit('tick')
                    MW.addMessage.emit('Creating MOBI files', 'info', False)
                    GUI.progress.content = 'Creating MOBI files'
@@ -499,7 +497,7 @@ class WorkerThread(QtCore.QThread):
                                GUI.progress.content = ''
                                mobiPath = item.replace('.epub', '.mobi')
                                os.remove(mobiPath + '_toclean')
-                                if GUI.targetDirectory and GUI.targetDirectory != os.path.split(mobiPath)[0]:
+                                if GUI.targetDirectory and GUI.targetDirectory != os.path.dirname(mobiPath):
                                    try:
                                        move(mobiPath, GUI.targetDirectory)
                                        mobiPath = os.path.join(GUI.targetDirectory, os.path.basename(mobiPath))
@@ -519,7 +517,7 @@ class WorkerThread(QtCore.QThread):
                            MW.addTrayMessage.emit('Failed to process MOBI file!', 'Critical')
                    else:
                        GUI.progress.content = ''
-                        epubSize = (os.path.getsize(self.kindlegenErrorCode[2]))//1024//1024
+                        epubSize = (os.path.getsize(self.kindlegenErrorCode[2])) // 1024 // 1024
                        for item in outputPath:
                            if os.path.exists(item):
                                os.remove(item)
@@ -535,7 +533,7 @@ class WorkerThread(QtCore.QThread):
                                               False)
                else:
                    for item in outputPath:
-                        if GUI.targetDirectory and GUI.targetDirectory != os.path.split(item)[0]:
+                        if GUI.targetDirectory and GUI.targetDirectory != os.path.dirname(item):
                            try:
                                move(item, GUI.targetDirectory)
                                item = os.path.join(GUI.targetDirectory, os.path.basename(item))
@@ -546,16 +544,17 @@ class WorkerThread(QtCore.QThread):
        GUI.progress.stop()
        MW.hideProgressBar.emit()
        GUI.needClean = True
-        MW.addMessage.emit('<b>All jobs completed.</b>', 'info', False)
-        MW.addTrayMessage.emit('All jobs completed.', 'Information')
+        if not self.errors:
+            MW.addMessage.emit('<b>All jobs completed.</b>', 'info', False)
+            MW.addTrayMessage.emit('All jobs completed.', 'Information')
        MW.modeConvert.emit(1)


 class SystemTrayIcon(QtWidgets.QSystemTrayIcon):
    def __init__(self):
+        super().__init__()
        if self.isSystemTrayAvailable():
            QtWidgets.QSystemTrayIcon.__init__(self, GUI.icons.programIcon, MW)
-            # noinspection PyUnresolvedReferences
            self.activated.connect(self.catchClicks)

    def catchClicks(self):
@@ -608,6 +607,36 @@ class KCCGUI(KCC_ui.Ui_KCC):
                GUI.JobList.addItem(fname)
                GUI.JobList.scrollToBottom()

+    def selectFileMetaEditor(self):
+        if self.UnRAR:
+            if self.sevenza:
+                fname = QtWidgets.QFileDialog.getOpenFileName(MW, 'Select file', self.lastPath,
+                                                              'Comic (*.cbz *.cbr *.cb7)')
+            else:
+                fname = QtWidgets.QFileDialog.getOpenFileName(MW, 'Select file', self.lastPath,
+                                                              'Comic (*.cbz *.cbr)')
+        else:
+            if self.sevenza:
+                fname = QtWidgets.QFileDialog.getOpenFileName(MW, 'Select file', self.lastPath,
+                                                              'Comic (*.cbz *.cb7)')
+            else:
+                fname = QtWidgets.QFileDialog.getOpenFileName(MW, 'Select file', self.lastPath,
+                                                              'Comic (*.cbz)')
+        if fname[0] != '':
+            if sys.platform.startswith('win'):
+                fname = fname[0].replace('/', '\\')
+            else:
+                fname = fname[0]
+            self.lastPath = os.path.abspath(os.path.join(fname, os.pardir))
+            try:
+                self.editor.loadData(fname)
+            except Exception as err:
+                _, _, traceback = sys.exc_info()
+                self.showDialog("Failed to parse metadata!\n\n%s\n\nTraceback:\n%s"
+                                % (str(err), sanitizeTrace(traceback)), 'error')
+            else:
+                self.editor.ui.exec_()
+
    def clearJobs(self):
        GUI.JobList.clear()

@@ -622,6 +651,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
            MW.setMinimumSize(QtCore.QSize(420, 287))
            MW.resize(420, 287)
        GUI.BasicModeButton.setEnabled(True)
+        GUI.EditorButton.setEnabled(True)
        GUI.AdvModeButton.setEnabled(True)
        GUI.BasicModeButton.setStyleSheet('font-weight:Bold;')
        GUI.AdvModeButton.setStyleSheet('font-weight:Normal;')
@@ -651,6 +681,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        MW.setMinimumSize(QtCore.QSize(420, 365))
        MW.resize(420, 365)
        GUI.BasicModeButton.setEnabled(True)
+        GUI.EditorButton.setEnabled(True)
        GUI.AdvModeButton.setEnabled(True)
        GUI.BasicModeButton.setStyleSheet('font-weight:Normal;')
        GUI.AdvModeButton.setStyleSheet('font-weight:Bold;')
@@ -680,6 +711,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        MW.setMinimumSize(QtCore.QSize(420, 397))
        MW.resize(420, 397)
        GUI.BasicModeButton.setEnabled(False)
+        GUI.EditorButton.setEnabled(True)
        GUI.AdvModeButton.setEnabled(False)
        GUI.BasicModeButton.setStyleSheet('font-weight:Normal;')
        GUI.AdvModeButton.setStyleSheet('font-weight:Normal;')
@@ -710,6 +742,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
            status = True
        if self.currentMode != 3:
            GUI.BasicModeButton.setEnabled(status)
+            GUI.EditorButton.setEnabled(status)
            GUI.AdvModeButton.setEnabled(status)
        if self.currentMode != 1:
            GUI.FormatBox.setEnabled(status)
@@ -809,7 +842,7 @@ class KCCGUI(KCC_ui.Ui_KCC):

    def changeGamma(self, value):
        value = float(value)
-        value = '%.2f' % (value/100)
+        value = '%.2f' % (value / 100)
        if float(value) <= 0.09:
            GUI.GammaLabel.setText('Gamma: Auto')
        else:
@@ -877,7 +910,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        else:
            item = QtWidgets.QListWidgetItem('    ' + self.stripTags(message))
        if replace:
-            GUI.JobList.takeItem(GUI.JobList.count()-1)
+            GUI.JobList.takeItem(GUI.JobList.count() - 1)
        # Due to lack of HTML support in QListWidgetItem we overlay text field with QLabel
        # We still fill original text field with transparent content to trigger creation of horizontal scrollbar
        item.setForeground(QtGui.QColor('transparent'))
@@ -894,6 +927,31 @@ class KCCGUI(KCC_ui.Ui_KCC):
    def showDialog(self, message, kind):
        if kind == 'error':
            QtWidgets.QMessageBox.critical(MW, 'KCC - Error', message, QtWidgets.QMessageBox.Ok)
+            try:
+                doc = Document()
+                root = doc.createElement('KCCErrorReport')
+                doc.appendChild(root)
+                main = doc.createElement('Timestamp')
+                root.appendChild(main)
+                text = doc.createTextNode(datetime.fromtimestamp(time()).strftime('%Y-%m-%d %H:%M:%S'))
+                main.appendChild(text)
+                main = doc.createElement('OS')
+                root.appendChild(main)
+                text = doc.createTextNode(platform())
+                main.appendChild(text)
+                main = doc.createElement('Version')
+                root.appendChild(main)
+                text = doc.createTextNode(__version__)
+                main.appendChild(text)
+                main = doc.createElement('Error')
+                root.appendChild(main)
+                text = doc.createTextNode(message)
+                main.appendChild(text)
+                urlopen(Request(url='https://kcc.iosphe.re/ErrorHandle/', data=doc.toxml(encoding='utf-8'),
+                                headers={'Content-Type': 'application/xml',
+                                         'User-Agent': 'KindleComicConverter/' + __version__}))
+            except:
+                pass
        elif kind == 'question':
            GUI.versionCheck.setAnswer(QtWidgets.QMessageBox.question(MW, 'KCC - Question', message,
                                                                          QtWidgets.QMessageBox.Yes,
@@ -905,6 +963,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        elif command.isdigit():
            GUI.ProgressBar.setMaximum(int(command) - 1)
            GUI.BasicModeButton.hide()
+            GUI.EditorButton.hide()
            GUI.AdvModeButton.hide()
            GUI.ProgressBar.reset()
            GUI.ProgressBar.show()
@@ -960,6 +1019,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
    def hideProgressBar(self):
        GUI.ProgressBar.hide()
        GUI.BasicModeButton.show()
+        GUI.EditorButton.show()
        GUI.AdvModeButton.show()

    def saveSettings(self, event):
@@ -990,7 +1050,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
                                           'ColorBox': GUI.ColorBox.checkState(),
                                           'customWidth': GUI.customWidth.text(),
                                           'customHeight': GUI.customHeight.text(),
-                                           'GammaSlider': float(self.GammaValue)*100})
+                                           'GammaSlider': float(self.GammaValue) * 100})
        self.settings.sync()
        self.tray.hide()

@@ -1067,6 +1127,8 @@ class KCCGUI(KCC_ui.Ui_KCC):
                                '<b>KindleGen</b></a>! MOBI conversion will be unavailable!', 'error')
                if sys.platform.startswith('win'):
                    self.addMessage('Download it and place EXE in KCC directory.', 'error')
+                elif sys.platform.startswith('darwin'):
+                    self.addMessage('Install it using <a href="http://brew.sh/">Brew</a>.', 'error')
                else:
                    self.addMessage('Download it and place executable in /usr/local/bin directory.', 'error')

@@ -1077,6 +1139,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        MW = KCCWindow
        GUI = self
        self.setupUi(MW)
+        self.editor = KCCGUI_MetaEditor()
        self.icons = Icons()
        self.webContent = KCC_rc_web.WebContent()
        self.settings = QtCore.QSettings('KindleComicConverter', 'KindleComicConverter')
@@ -1122,63 +1185,53 @@ class KCCGUI(KCC_ui.Ui_KCC):
            self.p.ionice(1)

        self.profiles = {
-            "Kindle Voyage": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                              'DefaultUpscale': False, 'Label': 'KV'},
-            "Kindle Paperwhite": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                                  'DefaultUpscale': False, 'Label': 'KPW'},
+            "K. PW 3/Voyage": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                               'DefaultUpscale': False, 'Label': 'KV'},
+            "Kindle PW 1/2": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
+                              'DefaultUpscale': False, 'Label': 'KPW'},
            "Kindle": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
                       'DefaultUpscale': False, 'Label': 'K345'},
            "Kindle DX/DXG": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 2,
                              'DefaultUpscale': False, 'Label': 'KDX'},
-            "K. Fire HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                           'DefaultUpscale': True, 'Label': 'KFHD'},
-            "K. Fire HDX": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                            'DefaultUpscale': True, 'Label': 'KFHDX'},
-            "K. Fire HDX 8.9": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 0,
-                                'DefaultUpscale': True, 'Label': 'KFHDX8'},
-            "Kobo Mini/Touch": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
+            "Kobo Mini/Touch": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 1,
                                'DefaultUpscale': False, 'Label': 'KoMT'},
-            "Kobo Glow": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
-                          'DefaultUpscale': False, 'Label': 'KoG'},
-            "Kobo Aura": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
+            "Kobo Glo": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 1,
+                         'DefaultUpscale': False, 'Label': 'KoG'},
+            "Kobo Glo HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 1,
+                            'DefaultUpscale': False, 'Label': 'KoGHD'},
+            "Kobo Aura": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 1,
                          'DefaultUpscale': False, 'Label': 'KoA'},
-            "Kobo Aura HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
+            "Kobo Aura HD": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 1,
                             'DefaultUpscale': False, 'Label': 'KoAHD'},
-            "Kobo Aura H2O": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 2,
+            "Kobo Aura H2O": {'Quality': True, 'ForceExpert': False, 'DefaultFormat': 1,
                              'DefaultUpscale': False, 'Label': 'KoAH2O'},
            "Other": {'Quality': False, 'ForceExpert': True, 'DefaultFormat': 1,
                      'DefaultUpscale': False, 'Label': 'OTHER'},
-            "Kindle for Android": {'Quality': False, 'ForceExpert': True, 'DefaultFormat': 0,
-                                   'DefaultUpscale': False, 'Label': 'KFA'},
            "Kindle 1": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0,
                         'DefaultUpscale': False, 'Label': 'K1'},
            "Kindle 2": {'Quality': False, 'ForceExpert': False, 'DefaultFormat': 0,
                         'DefaultUpscale': False, 'Label': 'K2'}
        }
        profilesGUI = [
-            "Kindle Voyage",
-            "Kindle Paperwhite",
+            "K. PW 3/Voyage",
+            "Kindle PW 1/2",
            "Kindle",
            "Separator",
-            "K. Fire HD",
-            "K. Fire HDX",
-            "K. Fire HDX 8.9",
-            "Separator",
            "Kobo Mini/Touch",
-            "Kobo Glow",
+            "Kobo Glo",
+            "Kobo Glo HD",
            "Kobo Aura",
            "Kobo Aura HD",
            "Kobo Aura H2O",
            "Separator",
            "Other",
            "Separator",
-            "Kindle for Android",
            "Kindle 1",
            "Kindle 2",
            "Kindle DX/DXG",
        ]

-        statusBarLabel = QtWidgets.QLabel('<b><a href="http://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.'
+        statusBarLabel = QtWidgets.QLabel('<b><a href="https://kcc.iosphe.re/">HOMEPAGE</a> - <a href="https://github.'
                                          'com/ciromattia/kcc/blob/master/README.md#issues--new-features--donations">DO'
                                          'NATE</a> - <a href="https://github.com/ciromattia/kcc/wiki">WIKI</a> - <a hr'
                                          'ef="http://www.mobileread.com/forums/showthread.php?t=207461">FORUM</a></b>')
@@ -1220,6 +1273,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
        GUI.DirectoryButton.clicked.connect(self.selectDir)
        GUI.ClearButton.clicked.connect(self.clearJobs)
        GUI.FileButton.clicked.connect(self.selectFile)
+        GUI.EditorButton.clicked.connect(self.selectFileMetaEditor)
        GUI.ConvertButton.clicked.connect(self.convertStart)
        GUI.GammaSlider.valueChanged.connect(self.changeGamma)
        GUI.NoRotateBox.stateChanged.connect(self.toggleNoSplitRotate)
@@ -1245,7 +1299,7 @@ class KCCGUI(KCC_ui.Ui_KCC):
            if profile == "Other":
                GUI.DeviceBox.addItem(self.icons.deviceOther, profile)
            elif profile == "Separator":
-                GUI.DeviceBox.insertSeparator(GUI.DeviceBox.count()+1)
+                GUI.DeviceBox.insertSeparator(GUI.DeviceBox.count() + 1)
            elif 'Ko' in profile:
                GUI.DeviceBox.addItem(self.icons.deviceKobo, profile)
            else:
@@ -1279,6 +1333,66 @@ class KCCGUI(KCC_ui.Ui_KCC):
        self.versionCheck.start()
        self.contentServer.start()
        self.tray.show()
+
+        # Linux hack as PyQt 5.5 not hit mainstream distributions yet
+        if sys.platform.startswith('linux') and StrictVersion(QtCore.qVersion()) > StrictVersion('5.4.9'):
+            self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+            self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
+
        MW.setWindowTitle("Kindle Comic Converter " + __version__)
        MW.show()
        MW.raise_()
+
+
+class KCCGUI_MetaEditor(KCC_MetaEditor_ui.Ui_MetaEditorDialog):
+    def loadData(self, file):
+        self.parser = metadata.MetadataParser(file)
+        if self.parser.compressor == 'rar':
+            self.EditorFrame.setEnabled(False)
+            self.OKButton.setEnabled(False)
+            self.StatusLabel.setText('CBR metadata are read-only.')
+        else:
+            self.EditorFrame.setEnabled(True)
+            self.OKButton.setEnabled(True)
+            self.StatusLabel.setText('Separate authors with a comma.')
+        for field in (self.SeriesLine, self.VolumeLine, self.NumberLine, self.MUidLine):
+            field.setText(self.parser.data[field.objectName()[:-4]])
+        for field in (self.WriterLine, self.PencillerLine, self.InkerLine, self.ColoristLine):
+            field.setText(', '.join(self.parser.data[field.objectName()[:-4] + 's']))
+        if self.SeriesLine.text() == '':
+            self.SeriesLine.setText(file.split('\\')[-1].split('.')[0])
+
+    def saveData(self):
+        for field in (self.VolumeLine, self.NumberLine, self.MUidLine):
+            if field.text().isnumeric() or self.cleanData(field.text()) == '':
+                self.parser.data[field.objectName()[:-4]] = self.cleanData(field.text())
+            else:
+                self.StatusLabel.setText(field.objectName()[:-4] + ' field must be a number.')
+                break
+        else:
+            self.parser.data['Series'] = self.cleanData(self.SeriesLine.text())
+            for field in (self.WriterLine, self.PencillerLine, self.InkerLine, self.ColoristLine):
+                values = self.cleanData(field.text()).split(',')
+                tmpData = []
+                for value in values:
+                    if self.cleanData(value) != '':
+                        tmpData.append(self.cleanData(value))
+                self.parser.data[field.objectName()[:-4] + 's'] = tmpData
+            try:
+                self.parser.saveXML()
+            except Exception as err:
+                _, _, traceback = sys.exc_info()
+                GUI.showDialog("Failed to save metadata!\n\n%s\n\nTraceback:\n%s"
+                               % (str(err), sanitizeTrace(traceback)), 'error')
+            self.ui.close()
+
+    def cleanData(self, s):
+        return escape(s.strip())
+
+    def __init__(self):
+        self.ui = QtWidgets.QDialog()
+        self.parser = None
+        self.setupUi(self.ui)
+        self.ui.setWindowFlags(self.ui.windowFlags() & ~QtCore.Qt.WindowContextHelpButtonHint)
+        self.OKButton.clicked.connect(self.saveData)
+        self.CancelButton.clicked.connect(self.ui.close)
--- a/kcc/KCC_rc.py
+++ b/kcc/KCC_rc.py
--- a/kcc/KCC_ui.py
+++ b/kcc/KCC_ui.py
@@ -2,7 +2,7 @@

 # Form implementation generated from reading ui file 'KCC.ui'
 #
-# Created: Sun Jan  4 09:58:25 2015
+# Created: Sun Feb  8 09:50:43 2015
 #      by: PyQt5 UI code generator 5.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -139,21 +139,20 @@ class Ui_KCC(object):
        self.JobList.setGeometry(QtCore.QRect(10, 50, 401, 101))
        self.JobList.setFocusPolicy(QtCore.Qt.NoFocus)
        self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}")
-        self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
        self.JobList.setProperty("showDropIndicator", False)
        self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
        self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
        self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
        self.JobList.setObjectName("JobList")
        self.BasicModeButton = QtWidgets.QPushButton(self.Form)
-        self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 195, 32))
+        self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 141, 32))
        font = QtGui.QFont()
        font.setPointSize(9)
        self.BasicModeButton.setFont(font)
        self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
        self.BasicModeButton.setObjectName("BasicModeButton")
        self.AdvModeButton = QtWidgets.QPushButton(self.Form)
-        self.AdvModeButton.setGeometry(QtCore.QRect(217, 10, 195, 32))
+        self.AdvModeButton.setGeometry(QtCore.QRect(261, 10, 151, 32))
        font = QtGui.QFont()
        font.setPointSize(9)
        self.AdvModeButton.setFont(font)
@@ -232,6 +231,16 @@ class Ui_KCC(object):
        self.customHeight.setMaxLength(4)
        self.customHeight.setObjectName("customHeight")
        self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
+        self.EditorButton = QtWidgets.QPushButton(self.Form)
+        self.EditorButton.setGeometry(QtCore.QRect(160, 10, 91, 32))
+        font = QtGui.QFont()
+        font.setPointSize(9)
+        self.EditorButton.setFont(font)
+        self.EditorButton.setFocusPolicy(QtCore.Qt.NoFocus)
+        icon5 = QtGui.QIcon()
+        icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.EditorButton.setIcon(icon5)
+        self.EditorButton.setObjectName("EditorButton")
        KCC.setCentralWidget(self.Form)
        self.statusBar = QtWidgets.QStatusBar(KCC)
        font = QtGui.QFont()
@@ -301,6 +310,7 @@ class Ui_KCC(object):
        self.hLabel.setText(_translate("KCC", "Custom height: "))
        self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
        self.customHeight.setInputMask(_translate("KCC", "0000"))
+        self.EditorButton.setText(_translate("KCC", "Editor"))
        self.ActionBasic.setText(_translate("KCC", "Basic"))
        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))

--- a/kcc/KCC_ui_linux.py
+++ b/kcc/KCC_ui_linux.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-

-# Form implementation generated from reading ui file 'KCC-Linux.ui'
+# Form implementation generated from reading ui file 'gui/KCC-Linux.ui'
 #
-# Created: Sun Jan  4 10:06:14 2015
-#      by: PyQt5 UI code generator 5.4
+# Created: Sun Feb  8 03:10:09 2015
+#      by: PyQt5 UI code generator 5.2.1
 #
 # WARNING! All changes made in this file will be lost!

@@ -179,15 +179,12 @@ class Ui_KCC(object):
        self.JobList.setFont(font)
        self.JobList.setFocusPolicy(QtCore.Qt.NoFocus)
        self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}")
-        self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
        self.JobList.setProperty("showDropIndicator", False)
        self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
        self.JobList.setIconSize(QtCore.QSize(18, 18))
-        self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
        self.JobList.setObjectName("JobList")
        self.BasicModeButton = QtWidgets.QPushButton(self.Form)
-        self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 195, 32))
+        self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 141, 32))
        font = QtGui.QFont()
        font.setFamily("DejaVu Sans")
        font.setPointSize(9)
@@ -195,7 +192,7 @@ class Ui_KCC(object):
        self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
        self.BasicModeButton.setObjectName("BasicModeButton")
        self.AdvModeButton = QtWidgets.QPushButton(self.Form)
-        self.AdvModeButton.setGeometry(QtCore.QRect(217, 10, 195, 32))
+        self.AdvModeButton.setGeometry(QtCore.QRect(260, 10, 151, 32))
        font = QtGui.QFont()
        font.setFamily("DejaVu Sans")
        font.setPointSize(9)
@@ -302,6 +299,17 @@ class Ui_KCC(object):
        self.customHeight.setMaxLength(4)
        self.customHeight.setObjectName("customHeight")
        self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
+        self.EditorButton = QtWidgets.QPushButton(self.Form)
+        self.EditorButton.setGeometry(QtCore.QRect(160, 10, 91, 32))
+        font = QtGui.QFont()
+        font.setFamily("DejaVu Sans")
+        font.setPointSize(9)
+        self.EditorButton.setFont(font)
+        self.EditorButton.setFocusPolicy(QtCore.Qt.NoFocus)
+        icon5 = QtGui.QIcon()
+        icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.EditorButton.setIcon(icon5)
+        self.EditorButton.setObjectName("EditorButton")
        KCC.setCentralWidget(self.Form)
        self.statusBar = QtWidgets.QStatusBar(KCC)
        font = QtGui.QFont()
@@ -370,6 +378,7 @@ class Ui_KCC(object):
        self.hLabel.setText(_translate("KCC", "Custom height: "))
        self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
        self.customHeight.setInputMask(_translate("KCC", "0000"))
+        self.EditorButton.setText(_translate("KCC", "Editor"))
        self.ActionBasic.setText(_translate("KCC", "Basic"))
        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))

--- a/kcc/KCC_ui_osx.py
+++ b/kcc/KCC_ui_osx.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-

-# Form implementation generated from reading ui file 'KCC-OSX.ui'
+# Form implementation generated from reading ui file '/Users/pawelj/Documents/KCC/gui/KCC-OSX.ui'
 #
-# Created: Sun Jan  4 10:26:09 2015
+# Created: Sun Feb  8 12:37:33 2015
 #      by: PyQt5 UI code generator 5.4
 #
 # WARNING! All changes made in this file will be lost!
@@ -186,14 +186,13 @@ class Ui_KCC(object):
        self.JobList.setFont(font)
        self.JobList.setFocusPolicy(QtCore.Qt.NoFocus)
        self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}")
-        self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
        self.JobList.setProperty("showDropIndicator", False)
        self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
        self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
        self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
        self.JobList.setObjectName("JobList")
        self.BasicModeButton = QtWidgets.QPushButton(self.Form)
-        self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 210, 41))
+        self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 156, 41))
        font = QtGui.QFont()
        font.setFamily("Lucida Grande")
        font.setPointSize(12)
@@ -203,7 +202,7 @@ class Ui_KCC(object):
        self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
        self.BasicModeButton.setObjectName("BasicModeButton")
        self.AdvModeButton = QtWidgets.QPushButton(self.Form)
-        self.AdvModeButton.setGeometry(QtCore.QRect(207, 10, 210, 41))
+        self.AdvModeButton.setGeometry(QtCore.QRect(260, 10, 156, 41))
        font = QtGui.QFont()
        font.setFamily("Lucida Grande")
        font.setPointSize(12)
@@ -324,6 +323,17 @@ class Ui_KCC(object):
        self.customHeight.setMaxLength(4)
        self.customHeight.setObjectName("customHeight")
        self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
+        self.EditorButton = QtWidgets.QPushButton(self.Form)
+        self.EditorButton.setGeometry(QtCore.QRect(160, 10, 101, 41))
+        font = QtGui.QFont()
+        font.setFamily("Lucida Grande")
+        font.setPointSize(12)
+        self.EditorButton.setFont(font)
+        self.EditorButton.setFocusPolicy(QtCore.Qt.NoFocus)
+        icon5 = QtGui.QIcon()
+        icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.EditorButton.setIcon(icon5)
+        self.EditorButton.setObjectName("EditorButton")
        KCC.setCentralWidget(self.Form)
        self.statusBar = QtWidgets.QStatusBar(KCC)
        font = QtGui.QFont()
@@ -393,6 +403,7 @@ class Ui_KCC(object):
        self.hLabel.setText(_translate("KCC", "Custom height: "))
        self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
        self.customHeight.setInputMask(_translate("KCC", "0000"))
+        self.EditorButton.setText(_translate("KCC", "Editor"))
        self.ActionBasic.setText(_translate("KCC", "Basic"))
        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))

--- a/kcc/init.py
+++ b/kcc/init.py
@@ -1,4 +1,4 @@
-__version__ = '4.4.1'
+__version__ = '4.6.5'
 __license__ = 'ISC'
 __copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
+__docformat__ = 'restructuredtext en'
--- a/kcc/cbxarchive.py
+++ b/kcc/cbxarchive.py
@@ -16,18 +16,18 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #

-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import sys
 import os
 from zipfile import is_zipfile, ZipFile
 from subprocess import STDOUT, PIPE
 from psutil import Popen
 from shutil import move, copy
+try:
+    from scandir import walk
+except ImportError:
+    walk = os.walk
 from . import rarfile
-from .shared import check7ZFile as is_7zfile
+from .shared import check7ZFile as is_7zfile, saferReplace


 class CBxArchive:
@@ -49,7 +49,7 @@ class CBxArchive:
        cbzFile = ZipFile(self.origFileName)
        filelist = []
        for f in cbzFile.namelist():
-            if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('thumbs.db'):
+            if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('humbs.db'):
                pass    # skip MacOS special files
            elif f.endswith('/'):
                try:
@@ -62,26 +62,19 @@ class CBxArchive:

    def extractCBR(self, targetdir):
        cbrFile = rarfile.RarFile(self.origFileName)
-        filelist = []
-        for f in cbrFile.namelist():
-            if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('thumbs.db'):
-                pass  # skip MacOS special files
-            elif f.endswith('/'):
-                try:
-                    os.makedirs(os.path.join(targetdir, f))
-                except Exception:
-                    pass  # the dir exists so we are going to extract the images only.
-            else:
-                filelist.append(f)
-        cbrFile.extractall(targetdir, filelist)
+        cbrFile.extractall(targetdir)
+        for root, dirnames, filenames in walk(targetdir):
+            for filename in filenames:
+                if filename.startswith('__MACOSX') or filename.endswith('.DS_Store') or filename.endswith('humbs.db'):
+                    os.remove(os.path.join(root, filename))

    def extractCB7(self, targetdir):
        # Workaround for some wide UTF-8 + Popen abnormalities
        if sys.platform.startswith('darwin'):
            copy(self.origFileName, os.path.join(os.path.dirname(self.origFileName), 'TMP_KCC_TMP'))
            self.origFileName = os.path.join(os.path.dirname(self.origFileName), 'TMP_KCC_TMP')
-        output = Popen('7za x "' + self.origFileName + '" -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -o"'
-                       + targetdir + '"', stdout=PIPE, stderr=STDOUT, shell=True)
+        output = Popen('7za x "' + self.origFileName + '" -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -xr!Thumbs.db -o"' +
+                       targetdir + '"', stdout=PIPE, stderr=STDOUT, shell=True)
        extracted = False
        for line in output.stdout:
            if b"Everything is Ok" in line:
@@ -105,7 +98,7 @@ class CBxArchive:
            for f in os.listdir(os.path.join(targetdir, adir[0])):
                # If directory names contain UTF-8 chars shutil.move can't clean up the mess alone
                if os.path.isdir(os.path.join(targetdir, f)):
-                    os.replace(os.path.join(targetdir, adir[0], f), os.path.join(targetdir, adir[0], f + '-A'))
+                    saferReplace(os.path.join(targetdir, adir[0], f), os.path.join(targetdir, adir[0], f + '-A'))
                    f += '-A'
                move(os.path.join(targetdir, adir[0], f), targetdir)
            os.rmdir(os.path.join(targetdir, adir[0]))
--- a/kcc/comic2ebook.py
+++ b/kcc/comic2ebook.py
--- a/kcc/comic2panel.py
+++ b/kcc/comic2panel.py
@@ -18,22 +18,21 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #

-__version__ = '4.4.1'
-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import os
 import sys
 from shutil import rmtree, copytree, move
 from optparse import OptionParser, OptionGroup
 from multiprocessing import Pool
 from PIL import Image, ImageStat, ImageOps
-from .shared import getImageFileName, walkLevel
+from .shared import getImageFileName, walkLevel, walkSort
 try:
    from PyQt5 import QtCore
 except ImportError:
    QtCore = None
+try:
+    from scandir import walk
+except ImportError:
+    walk = os.walk


 def mergeDirectoryTick(output):
@@ -89,19 +88,19 @@ def sanitizePanelSize(panel, opt):
    newPanels = []
    if panel[2] > 6 * opt.height:
        diff = int(panel[2] / 8)
-        newPanels.append([panel[0], panel[1] - diff*7, diff])
-        newPanels.append([panel[1] - diff*7, panel[1] - diff*6, diff])
-        newPanels.append([panel[1] - diff*6, panel[1] - diff*5, diff])
-        newPanels.append([panel[1] - diff*5, panel[1] - diff*4, diff])
-        newPanels.append([panel[1] - diff*4, panel[1] - diff*3, diff])
-        newPanels.append([panel[1] - diff*3, panel[1] - diff*2, diff])
-        newPanels.append([panel[1] - diff*2, panel[1] - diff, diff])
+        newPanels.append([panel[0], panel[1] - diff * 7, diff])
+        newPanels.append([panel[1] - diff * 7, panel[1] - diff * 6, diff])
+        newPanels.append([panel[1] - diff * 6, panel[1] - diff * 5, diff])
+        newPanels.append([panel[1] - diff * 5, panel[1] - diff * 4, diff])
+        newPanels.append([panel[1] - diff * 4, panel[1] - diff * 3, diff])
+        newPanels.append([panel[1] - diff * 3, panel[1] - diff * 2, diff])
+        newPanels.append([panel[1] - diff * 2, panel[1] - diff, diff])
        newPanels.append([panel[1] - diff, panel[1], diff])
    elif panel[2] > 3 * opt.height:
        diff = int(panel[2] / 4)
-        newPanels.append([panel[0], panel[1] - diff*3, diff])
-        newPanels.append([panel[1] - diff*3, panel[1] - diff*2, diff])
-        newPanels.append([panel[1] - diff*2, panel[1] - diff, diff])
+        newPanels.append([panel[0], panel[1] - diff * 3, diff])
+        newPanels.append([panel[1] - diff * 3, panel[1] - diff * 2, diff])
+        newPanels.append([panel[1] - diff * 2, panel[1] - diff, diff])
        newPanels.append([panel[1] - diff, panel[1], diff])
    elif panel[2] > 1.5 * opt.height:
        newPanels.append([panel[0], panel[1] - int(panel[2] / 2), int(panel[2] / 2)])
@@ -251,7 +250,8 @@ def main(argv=None, qtGUI=None):
                mergeWorkerOutput = []
                mergeWorkerPool = Pool()
                mergeWork.append([options.targetDir])
-                for root, dirs, files in os.walk(options.targetDir, False):
+                for root, dirs, files in walk(options.targetDir, False):
+                    dirs, files = walkSort(dirs, files)
                    for directory in dirs:
                        directoryNumer += 1
                        mergeWork.append([os.path.join(root, directory)])
@@ -269,7 +269,7 @@ def main(argv=None, qtGUI=None):
                    rmtree(options.targetDir, True)
                    raise RuntimeError("One of workers crashed. Cause: " + mergeWorkerOutput[0])
            print("\nSplitting images...")
-            for root, dirs, files in os.walk(options.targetDir, False):
+            for root, dirs, files in walk(options.targetDir, False):
                for name in files:
                    if getImageFileName(name) is not None:
                        pagenumber += 1
@@ -300,4 +300,4 @@ def main(argv=None, qtGUI=None):
        else:
            raise UserWarning("Provided path is not a directory.")
    else:
-        raise UserWarning("Target height is not set.")
+        raise UserWarning("Target height is not set.")
--- a/kcc/dualmetafix.py
+++ b/kcc/dualmetafix.py
@@ -36,15 +36,15 @@ title_offset = 84


 def getint(data, ofs, sz='L'):
-    i, = struct.unpack_from('>'+sz, data, ofs)
+    i, = struct.unpack_from('>' + sz, data, ofs)
    return i


 def writeint(data, ofs, n, slen='L'):
    if slen == 'L':
-        return data[:ofs]+struct.pack('>L', n)+data[ofs+4:]
+        return data[:ofs] + struct.pack('>L', n) + data[ofs + 4:]
    else:
-        return data[:ofs]+struct.pack('>H', n)+data[ofs+2:]
+        return data[:ofs] + struct.pack('>H', n) + data[ofs + 2:]


 def getsecaddr(datain, secno):
@@ -52,11 +52,11 @@ def getsecaddr(datain, secno):
    if (secno < 0) | (secno >= nsec):
        emsg = 'requested section number %d out of range (nsec=%d)' % (secno, nsec)
        raise DualMetaFixException(emsg)
-    secstart = getint(datain, first_pdb_record+secno*8)
-    if secno == nsec-1:
+    secstart = getint(datain, first_pdb_record + secno * 8)
+    if secno == nsec - 1:
        secend = len(datain)
    else:
-        secend = getint(datain, first_pdb_record+(secno+1)*8)
+        secend = getint(datain, first_pdb_record + (secno + 1) * 8)
    return secstart, secend


@@ -71,28 +71,28 @@ def replacesection(datain, secno, secdata):
    seclen = secend - secstart
    if len(secdata) != seclen:
        raise DualMetaFixException('section length change in replacesection')
-    datain[secstart:secstart+seclen] = secdata
+    datain[secstart:secstart + seclen] = secdata


 def get_exth_params(rec0):
    ebase = mobi_header_base + getint(rec0, mobi_header_length)
-    if rec0[ebase:ebase+4] != b'EXTH':
+    if rec0[ebase:ebase + 4] != b'EXTH':
        raise DualMetaFixException('EXTH tag not found where expected')
-    elen = getint(rec0, ebase+4)
-    enum = getint(rec0, ebase+8)
+    elen = getint(rec0, ebase + 4)
+    enum = getint(rec0, ebase + 8)
    rlen = len(rec0)
    return ebase, elen, enum, rlen


 def add_exth(rec0, exth_num, exth_bytes):
    ebase, elen, enum, rlen = get_exth_params(rec0)
-    newrecsize = 8+len(exth_bytes)
-    newrec0 = rec0[0:ebase+4]+struct.pack('>L', elen+newrecsize)+struct.pack('>L', enum+1)+struct.pack('>L', exth_num)\
-        + struct.pack('>L', newrecsize)+exth_bytes+rec0[ebase+12:]
-    newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)+newrecsize)
+    newrecsize = 8 + len(exth_bytes)
+    newrec0 = rec0[0:ebase + 4] + struct.pack('>L', elen + newrecsize) + struct.pack('>L', enum + 1) + \
+        struct.pack('>L', exth_num) + struct.pack('>L', newrecsize) + exth_bytes + rec0[ebase + 12:]
+    newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset) + newrecsize)
    # keep constant record length by removing newrecsize null bytes from end
    sectail = newrec0[-newrecsize:]
-    if sectail != b'\0'*newrecsize:
+    if sectail != b'\0' * newrecsize:
        raise DualMetaFixException('add_exth: trimmed non-null bytes at end of section')
    newrec0 = newrec0[0:rlen]
    return newrec0
@@ -106,30 +106,31 @@ def read_exth(rec0, exth_num):
        exth_id = getint(rec0, ebase)
        if exth_id == exth_num:
            # We might have multiple exths, so build a list.
-            exth_values.append(rec0[ebase+8:ebase+getint(rec0, ebase+4)])
+            exth_values.append(rec0[ebase + 8:ebase + getint(rec0, ebase + 4)])
        enum -= 1
-        ebase = ebase+getint(rec0, ebase+4)
+        ebase = ebase + getint(rec0, ebase + 4)
    return exth_values


 def del_exth(rec0, exth_num):
    ebase, elen, enum, rlen = get_exth_params(rec0)
-    ebase_idx = ebase+12
+    ebase_idx = ebase + 12
    enum_idx = 0
    while enum_idx < enum:
        exth_id = getint(rec0, ebase_idx)
-        exth_size = getint(rec0, ebase_idx+4)
+        exth_size = getint(rec0, ebase_idx + 4)
        if exth_id == exth_num:
            newrec0 = rec0
-            newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)-exth_size)
-            newrec0 = newrec0[:ebase_idx]+newrec0[ebase_idx+exth_size:]
-            newrec0 = newrec0[0:ebase+4]+struct.pack('>L', elen-exth_size)+struct.pack('>L', enum-1)+newrec0[ebase+12:]
-            newrec0 += b'\0'*exth_size
+            newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset) - exth_size)
+            newrec0 = newrec0[:ebase_idx] + newrec0[ebase_idx + exth_size:]
+            newrec0 = newrec0[0:ebase + 4] + struct.pack('>L', elen - exth_size) + \
+                struct.pack('>L', enum - 1) + newrec0[ebase + 12:]
+            newrec0 += b'\0' * exth_size
            if rlen != len(newrec0):
                raise DualMetaFixException('del_exth: incorrect section size change')
            return newrec0
        enum_idx += 1
-        ebase_idx = ebase_idx+exth_size
+        ebase_idx = ebase_idx + exth_size
    return rec0


@@ -181,4 +182,4 @@ class DualMobiMetaFix:
        replacesection(self.datain, datain_kf8, rec0)

        self.datain.flush()
-        self.datain.close()
+        self.datain.close()
--- a/kcc/image.py
+++ b/kcc/image.py
@@ -16,11 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.

-__version__ = '4.4.1'
-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import os
 from io import BytesIO
 from urllib.request import Request, urlopen
@@ -28,6 +23,7 @@ from urllib.parse import quote
 from functools import reduce
 from PIL import Image, ImageOps, ImageStat, ImageChops
 from .shared import md5Checksum
+from . import __version__


 class ProfileData:
@@ -86,14 +82,11 @@ class ProfileData:
        'K2': ("Kindle 2", (600, 670), Palette15, 1.8, (900, 1005)),
        'K345': ("Kindle", (600, 800), Palette16, 1.8, (900, 1200)),
        'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8, (1236, 1500)),
-        'KPW': ("Kindle Paperwhite", (758, 1024), Palette16, 1.8, (1137, 1536)),
-        'KV': ("Kindle Voyage", (1072, 1448), Palette16, 1.8, (1608, 2172)),
-        'KFHD': ("K. Fire HD", (800, 1280), PalleteNull, 1.0, (1200, 1920)),
-        'KFHDX': ("K. Fire HDX", (1200, 1920), PalleteNull, 1.0, (1800, 2880)),
-        'KFHDX8': ("K. Fire HDX 8.9", (1600, 2560), PalleteNull, 1.0, (2400, 3840)),
-        'KFA': ("Kindle for Android", (0, 0), PalleteNull, 1.0, (0, 0)),
+        'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8, (1137, 1536)),
+        'KV': ("Kindle Paperwhite 3/Voyage", (1072, 1448), Palette16, 1.8, (1608, 2172)),
        'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8, (900, 1200)),
-        'KoG': ("Kobo Glow", (768, 1024), Palette16, 1.8, (1152, 1536)),
+        'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.8, (1152, 1536)),
+        'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.8, (1608, 2172)),
        'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.8, (1137, 1536)),
        'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.8, (1620, 2160)),
        'KoAH2O': ("Kobo Aura H2O", (1080, 1430), Palette16, 1.8, (1620, 2145)),
@@ -102,7 +95,7 @@ class ProfileData:


 class ComicPage:
-    def __init__(self, source, options, fill=None):
+    def __init__(self, source, options, original=None):
        try:
            self.profile_label, self.size, self.palette, self.gamma, self.panelviewsize = options.profileData
        except KeyError:
@@ -111,58 +104,67 @@ class ComicPage:
        self.filename = os.path.basename(self.origFileName)
        self.image = Image.open(source)
        self.image = self.image.convert('RGB')
-        self.rotated = None
-        self.border = None
-        self.noHPV = None
-        self.noVPV = None
-        self.noPV = None
-        self.purge = False
-        self.hq = False
        self.opt = options
-        if fill:
-            self.fill = fill
+        if original:
+            self.second = True
+            self.rotated = original.rotated
+            self.border = original.border
+            self.noHPV = original.noHPV
+            self.noVPV = original.noVPV
+            self.noPV = original.noPV
+            self.noHQ = original.noHQ
+            self.fill = original.fill
+            self.color = original.color
+            if self.rotated:
+                self.image = self.image.rotate(90, Image.BICUBIC, True)
+            self.opt.quality = 0
        else:
+            self.second = False
+            self.rotated = None
+            self.border = None
+            self.noHPV = None
+            self.noVPV = None
+            self.noPV = None
            self.fill = None
-        if options.webtoon:
-            self.color = True
-        else:
-            self.color = self.isImageColor()
+            self.noHQ = False
+            if options.webtoon:
+                self.color = True
+            else:
+                self.color = self.isImageColor()

    def saveToDir(self, targetdir):
        try:
-            if not self.purge:
-                flags = []
-                filename = os.path.join(targetdir, os.path.splitext(self.filename)[0]) + '-KCC'
-                if not self.opt.forcecolor and not self.opt.forcepng:
-                    self.image = self.image.convert('L')
-                if self.rotated:
-                    flags.append('Rotated')
-                if self.hq:
-                    flags.append('HighQuality')
-                    filename += '-HQ'
-                if self.noPV:
-                    flags.append('NoPanelView')
-                else:
-                    if self.noHPV:
-                        flags.append('NoHorizontalPanelView')
-                    if self.noVPV:
-                        flags.append('NoVerticalPanelView')
-                    if self.border:
-                        flags.append('Margins-' + str(self.border[0]) + '-' + str(self.border[1]) + '-'
-                                     + str(self.border[2]) + '-' + str(self.border[3]))
-                if self.opt.forcepng:
-                    filename += '.png'
-                    self.image.save(filename, 'PNG', optimize=1)
-                else:
-                    filename += '.jpg'
-                    self.image.save(filename, 'JPEG', optimize=1, quality=80)
-                return [md5Checksum(filename), flags]
+            flags = []
+            filename = os.path.join(targetdir, os.path.splitext(self.filename)[0]) + '-KCC'
+            if not self.opt.forcecolor and not self.opt.forcepng:
+                self.image = self.image.convert('L')
+            if self.rotated:
+                flags.append('Rotated')
+            if self.noPV:
+                flags.append('NoPanelView')
            else:
-                return None
+                if self.noHPV:
+                    flags.append('NoHorizontalPanelView')
+                if self.noVPV:
+                    flags.append('NoVerticalPanelView')
+                if self.border:
+                    flags.append('Margins-' + str(self.border[0]) + '-' + str(self.border[1]) + '-' +
+                                 str(self.border[2]) + '-' + str(self.border[3]))
+            if self.fill != 'white':
+                flags.append('BlackFill')
+            if self.opt.quality == 2:
+                filename += '-HQ'
+            if self.opt.forcepng:
+                filename += '.png'
+                self.image.save(filename, 'PNG', optimize=1)
+            else:
+                filename += '.jpg'
+                self.image.save(filename, 'JPEG', optimize=1, quality=80)
+            return [md5Checksum(filename), flags]
        except IOError as e:
            raise RuntimeError('Cannot write image in directory %s: %s' % (targetdir, e))

-    def optimizeImage(self):
+    def autocontrastImage(self):
        gamma = self.opt.gamma
        if gamma < 0.1:
            gamma = self.gamma
@@ -184,80 +186,65 @@ class ComicPage:
        # Quantize is deprecated but new function call it internally anyway...
        self.image = self.image.quantize(palette=palImg)

-    def calculateBorderPercent(self, x, img, isWidth):
-        if isWidth:
-            return int(round(float(x)/float(img.image.size[0]), 4) * 10000 * 1.5)
-        else:
-            return int(round(float(x)/float(img.image.size[1]), 4) * 10000 * 1.5)
-
-    def calculateBorder(self, sourceImage, isHQ=False):
-        if (isHQ and sourceImage.purge) or self.noPV:
-            self.border = [0, 0, 0, 0]
-            self.noPV = True
+    def calculateBorder(self):
+        if self.noPV:
+            self.border = [0.0, 0.0, 0.0, 0.0]
            return
        if self.fill == 'white':
-            # Only already saved files can have P mode. So we can break color quantization.
-            if sourceImage.image.mode == 'P':
-                sourceImage.image = sourceImage.image.convert('RGB')
-            border = ImageChops.invert(sourceImage.image).getbbox()
+            border = ImageChops.invert(self.image).getbbox()
        else:
-            border = sourceImage.image.getbbox()
+            border = self.image.getbbox()
+        if self.opt.quality == 2:
+            multiplier = 1.0
+        else:
+            multiplier = 1.5
        if border is not None:
-            if isHQ:
-                multiplier = 1.0
-            else:
-                multiplier = 1.5
-            self.border = [self.calculateBorderPercent(border[0], sourceImage, True),
-                           self.calculateBorderPercent(border[1], sourceImage, False),
-                           self.calculateBorderPercent((sourceImage.image.size[0] - border[2]), sourceImage, True),
-                           self.calculateBorderPercent((sourceImage.image.size[1] - border[3]), sourceImage, False)]
-            if int((border[2] - border[0]) * multiplier) < self.size[0]:
+            self.border = [round(float(border[0]) / float(self.image.size[0]) * 150, 3),
+                           round(float(border[1]) / float(self.image.size[1]) * 150, 3),
+                           round(float(self.image.size[0] - border[2]) / float(self.image.size[0]) * 150, 3),
+                           round(float(self.image.size[1] - border[3]) / float(self.image.size[1]) * 150, 3)]
+            if int((border[2] - border[0]) * multiplier) < self.size[0] + 10:
                self.noHPV = True
-            if int((border[3] - border[1]) * multiplier) < self.size[1]:
+            if int((border[3] - border[1]) * multiplier) < self.size[1] + 10:
                self.noVPV = True
        else:
-            self.border = [0, 0, 0, 0]
+            self.border = [0.0, 0.0, 0.0, 0.0]
            self.noHPV = True
            self.noVPV = True

-    def resizeImage(self, qualityMode=None):
-        upscale = self.opt.upscale
-        stretch = self.opt.stretch
-        bordersColor = self.opt.bordersColor
-        if qualityMode is None:
-            qualityMode = self.opt.quality
-        if bordersColor:
-            fill = bordersColor
+    def resizeImage(self):
+        if self.opt.bordersColor:
+            fill = self.opt.bordersColor
        else:
            fill = self.fill
        # Set target size
-        if qualityMode == 0:
+        if self.opt.quality == 0:
            size = (self.size[0], self.size[1])
-        elif qualityMode == 1 and not stretch and not upscale and self.image.size[0] <=\
+        elif self.opt.quality == 1 and not self.opt.stretch and not self.opt.upscale and self.image.size[0] <=\
                self.size[0] and self.image.size[1] <= self.size[1]:
            size = (self.size[0], self.size[1])
-        elif qualityMode == 1:
+        elif self.opt.quality == 1:
            # Forcing upscale to make sure that margins will be not too big
-            if not stretch:
-                upscale = True
+            if not self.opt.stretch:
+                self.opt.upscale = True
            size = (self.panelviewsize[0], self.panelviewsize[1])
-        elif qualityMode == 2 and not stretch and not upscale and self.image.size[0] <=\
+        elif self.opt.quality == 2 and not self.opt.stretch and not self.opt.upscale and self.image.size[0] <=\
                self.size[0] and self.image.size[1] <= self.size[1]:
-            self.purge = True
-            return self.image
+            # HQ version will not be needed
+            self.noHQ = True
+            return
        else:
-            self.hq = True
            size = (self.panelviewsize[0], self.panelviewsize[1])
        # If stretching is on - Resize without other considerations
-        if stretch:
+        if self.opt.stretch:
            if self.image.size[0] <= size[0] and self.image.size[1] <= size[1]:
                method = Image.BICUBIC
            else:
                method = Image.LANCZOS
            self.image = self.image.resize(size, method)
-            return self.image
+            return
        # If image is smaller than target resolution and upscale is off - Just expand it by adding margins
-        if self.image.size[0] <= size[0] and self.image.size[1] <= size[1] and not upscale:
+        if self.image.size[0] <= size[0] and self.image.size[1] <= size[1] and not self.opt.upscale:
            borderw = int((size[0] - self.image.size[0]) / 2)
            borderh = int((size[1] - self.image.size[1]) / 2)
            # PV is disabled when source image is smaller than device screen and upscale is off
@@ -267,7 +254,7 @@ class ComicPage:
            # Border can't be float so sometimes image might be 1px too small/large
            if self.image.size[0] != size[0] or self.image.size[1] != size[1]:
                self.image = ImageOps.fit(self.image, size, method=Image.BICUBIC, centering=(0.5, 0.5))
-            return self.image
+            return
        # Otherwise - Upscale/Downscale
        ratioDev = float(size[0]) / float(size[1])
        if (float(self.image.size[0]) / float(self.image.size[1])) < ratioDev:
@@ -281,7 +268,7 @@ class ComicPage:
        else:
            method = Image.LANCZOS
        self.image = ImageOps.fit(self.image, size, method=method, centering=(0.5, 0.5))
-        return self.image
+        return

    def splitPage(self, targetdir):
        width, height = self.image.size
@@ -374,7 +361,6 @@ class ComicPage:
            else:
                diff = pageNumberCut1
            self.image = self.image.crop((0, 0, widthImg, heightImg - diff))
-        return self.image

    def cropWhiteSpace(self):
        if ImageChops.invert(self.image).getbbox() is not None:
@@ -410,7 +396,6 @@ class ComicPage:
                diff += delta
            diff -= delta
            self.image = self.image.crop((0, 0, widthImg - diff, heightImg))
-        return self.image

    def getImageHistogram(self, image):
        histogram = image.histogram()
@@ -443,13 +428,13 @@ class ComicPage:
            while startY < bw.size[1]:
                if startY + 5 > bw.size[1]:
                    startY = bw.size[1] - 5
-                fill += self.getImageHistogram(bw.crop((0, startY, bw.size[0], startY+5)))
+                fill += self.getImageHistogram(bw.crop((0, startY, bw.size[0], startY + 5)))
                startY += 5
            startX = 0
            while startX < bw.size[0]:
                if startX + 5 > bw.size[0]:
                    startX = bw.size[0] - 5
-                fill += self.getImageHistogram(bw.crop((startX, 0, startX+5, bw.size[1])))
+                fill += self.getImageHistogram(bw.crop((startX, 0, startX + 5, bw.size[1])))
                startX += 5
            if fill > 0:
                self.fill = 'black'
@@ -457,29 +442,25 @@ class ComicPage:
                self.fill = 'white'

    def isImageColor(self):
-        v = ImageStat.Stat(self.image).var
-        isMonochromatic = reduce(lambda x, y: x and y < 0.005, v, True)
-        if isMonochromatic:
-            # Monochromatic
-            return False
-        else:
-            if len(v) == 3:
-                maxmin = abs(max(v) - min(v))
-                if maxmin > 1000:
-                    # Color
-                    return True
-                elif maxmin > 100:
-                    # Probably color
-                    return True
-                else:
-                    # Grayscale
-                    return False
-            elif len(v) == 1:
-                # Black and white
+        img = self.image.copy()
+        bands = img.getbands()
+        if bands == ('R', 'G', 'B') or bands == ('R', 'G', 'B', 'A'):
+            thumb = img.resize((40, 40))
+            SSE, bias = 0, [0, 0, 0]
+            bias = ImageStat.Stat(thumb).mean[:3]
+            bias = [b - sum(bias) / 3 for b in bias]
+            for pixel in thumb.getdata():
+                mu = sum(pixel) / 3
+                SSE += sum((pixel[i] - mu - bias[i]) * (pixel[i] - mu - bias[i]) for i in [0, 1, 2])
+            MSE = float(SSE) / (40 * 40)
+            if MSE <= 22:
                return False
            else:
-                # Detection failed
-                return False
+                return True
+        elif len(bands) == 1:
+            return False
+        else:
+            return False


 class Cover:
@@ -512,7 +493,7 @@ class Cover:
    def processExternal(self):
        self.image = self.image.convert('RGB')
        self.image.thumbnail(self.options.profileData[1], Image.LANCZOS)
-        self.save(True)
+        self.save()

    def trim(self):
        bg = Image.new(self.image.mode, self.image.size, self.image.getpixel((0, 0)))
@@ -524,15 +505,8 @@ class Cover:
        else:
            return self.image

-    def save(self, external=False):
-        if external:
-            source = self.options.remoteCovers[self.tomeNumber].split('/')[-1]
-        else:
-            source = self.source
+    def save(self):
        try:
-            if os.path.splitext(source)[1].lower() == '.png':
-                self.image.save(self.target, "PNG", optimize=1)
-            else:
-                self.image.save(self.target, "JPEG", optimize=1, quality=80)
+            self.image.save(self.target, "JPEG", optimize=1, quality=80)
        except IOError:
-            raise RuntimeError('Failed to save cover')
+            raise RuntimeError('Failed to process downloaded cover.')
--- a/kcc/metadata.py
+++ b/kcc/metadata.py
@@ -0,0 +1,172 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+import os
+from xml.dom.minidom import parse, Document
+from re import compile
+from zipfile import is_zipfile, ZipFile, ZIP_DEFLATED
+from subprocess import STDOUT, PIPE
+from psutil import Popen
+from tempfile import mkdtemp
+from shutil import rmtree
+from .shared import removeFromZIP, check7ZFile as is_7zfile
+from . import rarfile
+
+
+class MetadataParser:
+    def __init__(self, source):
+        self.source = source
+        self.data = {'Series': '',
+                     'Volume': '',
+                     'Number': '',
+                     'Writers': [],
+                     'Pencillers': [],
+                     'Inkers': [],
+                     'Colorists': [],
+                     'Summary': '',
+                     'MUid': '',
+                     'Bookmarks': []}
+        self.rawdata = None
+        self.compressor = None
+        if self.source.endswith('.xml'):
+            self.rawdata = parse(self.source)
+            self.parseXML()
+        else:
+            if is_zipfile(self.source):
+                self.compressor = 'zip'
+                with ZipFile(self.source) as zip_file:
+                    for member in zip_file.namelist():
+                        if member != 'ComicInfo.xml':
+                            continue
+                        with zip_file.open(member) as xml_file:
+                            self.rawdata = parse(xml_file)
+            elif rarfile.is_rarfile(self.source):
+                self.compressor = 'rar'
+                with rarfile.RarFile(self.source) as rar_file:
+                    for member in rar_file.namelist():
+                        if member != 'ComicInfo.xml':
+                            continue
+                        with rar_file.open(member) as xml_file:
+                            self.rawdata = parse(xml_file)
+            elif is_7zfile(self.source):
+                self.compressor = '7z'
+                workdir = mkdtemp('', 'KCC-')
+                tmpXML = os.path.join(workdir, 'ComicInfo.xml')
+                output = Popen('7za e "' + self.source + '" ComicInfo.xml -o"' + workdir + '"',
+                               stdout=PIPE, stderr=STDOUT, shell=True)
+                extracted = False
+                for line in output.stdout:
+                    if b"Everything is Ok" in line or b"No files to process" in line:
+                        extracted = True
+                if not extracted:
+                    rmtree(workdir)
+                    raise OSError('Failed to extract 7ZIP file.')
+                if os.path.isfile(tmpXML):
+                    self.rawdata = parse(tmpXML)
+                rmtree(workdir)
+            else:
+                raise OSError('Failed to detect archive format.')
+            if self.rawdata:
+                self.parseXML()
+
+    def parseXML(self):
+        if len(self.rawdata.getElementsByTagName('Series')) != 0:
+            self.data['Series'] = self.rawdata.getElementsByTagName('Series')[0].firstChild.nodeValue
+        if len(self.rawdata.getElementsByTagName('Volume')) != 0:
+            self.data['Volume'] = self.rawdata.getElementsByTagName('Volume')[0].firstChild.nodeValue
+        if len(self.rawdata.getElementsByTagName('Number')) != 0:
+            self.data['Number'] = self.rawdata.getElementsByTagName('Number')[0].firstChild.nodeValue
+        if len(self.rawdata.getElementsByTagName('Summary')) != 0:
+            self.data['Summary'] = self.rawdata.getElementsByTagName('Summary')[0].firstChild.nodeValue
+        for field in ['Writer', 'Penciller', 'Inker', 'Colorist']:
+            if len(self.rawdata.getElementsByTagName(field)) != 0:
+                for person in self.rawdata.getElementsByTagName(field)[0].firstChild.nodeValue.split(', '):
+                    self.data[field + 's'].append(person)
+            self.data[field + 's'] = list(set(self.data[field + 's']))
+            self.data[field + 's'].sort()
+        if len(self.rawdata.getElementsByTagName('ScanInformation')) != 0:
+            coverId = compile('(MCD\\()(\\d+)(\\))')\
+                .search(self.rawdata.getElementsByTagName('ScanInformation')[0].firstChild.nodeValue)
+            if coverId:
+                self.data['MUid'] = coverId.group(2)
+        if len(self.rawdata.getElementsByTagName('Page')) != 0:
+            for page in self.rawdata.getElementsByTagName('Page'):
+                if 'Bookmark' in page.attributes and 'Image' in page.attributes:
+                    self.data['Bookmarks'].append((int(page.attributes['Image'].value),
+                                                   page.attributes['Bookmark'].value))
+
+    def saveXML(self):
+        if self.rawdata:
+            root = self.rawdata.getElementsByTagName('ComicInfo')[0]
+            for row in (['Series', self.data['Series']], ['Volume', self.data['Volume']],
+                        ['Number', self.data['Number']], ['Writer', ', '.join(self.data['Writers'])],
+                        ['Penciller', ', '.join(self.data['Pencillers'])], ['Inker', ', '.join(self.data['Inkers'])],
+                        ['Colorist', ', '.join(self.data['Colorists'])], ['Summary', self.data['Summary']],
+                        ['ScanInformation', 'MCD(' + self.data['MUid'] + ')' if self.data['MUid'] else '']):
+                if self.rawdata.getElementsByTagName(row[0]):
+                    node = self.rawdata.getElementsByTagName(row[0])[0]
+                    if row[1]:
+                        node.firstChild.replaceWholeText(row[1])
+                    else:
+                        root.removeChild(node)
+                elif row[1]:
+                    main = self.rawdata.createElement(row[0])
+                    root.appendChild(main)
+                    text = self.rawdata.createTextNode(row[1])
+                    main.appendChild(text)
+        else:
+            doc = Document()
+            root = doc.createElement('ComicInfo')
+            root.setAttribute('xmlns:xsd', 'http://www.w3.org/2001/XMLSchema')
+            root.setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance')
+            doc.appendChild(root)
+            for row in (['Series', self.data['Series']], ['Volume', self.data['Volume']],
+                        ['Number', self.data['Number']], ['Writer', ', '.join(self.data['Writers'])],
+                        ['Penciller', ', '.join(self.data['Pencillers'])], ['Inker', ', '.join(self.data['Inkers'])],
+                        ['Colorist', ', '.join(self.data['Colorists'])], ['Summary', self.data['Summary']],
+                        ['ScanInformation', 'MCD(' + self.data['MUid'] + ')' if self.data['MUid'] else '']):
+                if row[1]:
+                    main = doc.createElement(row[0])
+                    root.appendChild(main)
+                    text = doc.createTextNode(row[1])
+                    main.appendChild(text)
+            self.rawdata = doc
+        if self.source.endswith('.xml'):
+            with open(self.source, 'w', encoding='utf-8') as f:
+                self.rawdata.writexml(f, encoding='utf-8')
+        else:
+            workdir = mkdtemp('', 'KCC-')
+            tmpXML = os.path.join(workdir, 'ComicInfo.xml')
+            with open(tmpXML, 'w', encoding='utf-8') as f:
+                self.rawdata.writexml(f, encoding='utf-8')
+            if is_zipfile(self.source):
+                removeFromZIP(self.source, 'ComicInfo.xml')
+                with ZipFile(self.source, mode='a', compression=ZIP_DEFLATED) as zip_file:
+                    zip_file.write(tmpXML, arcname=tmpXML.split(os.sep)[-1])
+            elif rarfile.is_rarfile(self.source):
+                raise NotImplementedError
+            elif is_7zfile(self.source):
+                output = Popen('7za a "' + self.source + '" "' + tmpXML + '"', stdout=PIPE, stderr=STDOUT, shell=True)
+                extracted = False
+                for line in output.stdout:
+                    if b"Everything is Ok" in line:
+                        extracted = True
+                if not extracted:
+                    rmtree(workdir)
+                    raise OSError('Failed to modify 7ZIP file.')
+            rmtree(workdir)
--- a/kcc/pdfjpgextract.py
+++ b/kcc/pdfjpgextract.py
@@ -19,10 +19,6 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #

-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import os
 from random import choice
 from string import ascii_uppercase, digits
@@ -33,7 +29,7 @@ class PdfJpgExtract:
        self.origFileName = origFileName
        self.filename = os.path.splitext(origFileName)
        # noinspection PyUnusedLocal
-        self.path = self.filename[0] + "-KCC-TMP-" + ''.join(choice(ascii_uppercase + digits) for x in range(3))
+        self.path = self.filename[0] + "-KCC-" + ''.join(choice(ascii_uppercase + digits) for x in range(3))

    def getPath(self):
        return self.path
--- a/kcc/rarfile.py
+++ b/kcc/rarfile.py
@@ -360,9 +360,8 @@ class RarCannotExec(RarExecError):

 def is_rarfile(xfile):
    '''Check quickly whether file is rar archive.'''
-    fd = XFile(xfile)
-    buf = fd.read(len(RAR_ID))
-    fd.close()
+    with open(xfile, 'rb') as fh:
+        buf = fh.read(len(RAR_ID))
    if buf == RAR_ID or buf == RAR5_ID:
        return True
    else:
--- a/kcc/shared.py
+++ b/kcc/shared.py
@@ -16,14 +16,21 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #

-__license__ = 'ISC'
-__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
-__docformat__ = 'restructuredtext en'
-
 import os
+from sys import version_info
 from hashlib import md5
 from html.parser import HTMLParser
 from distutils.version import StrictVersion
+from time import sleep
+from shutil import rmtree, move, copy
+from tempfile import mkdtemp
+from zipfile import ZipFile, ZIP_DEFLATED
+from re import split
+from traceback import format_tb
+try:
+    from scandir import walk
+except ImportError:
+    walk = os.walk


 class HTMLStripper(HTMLParser):
@@ -40,6 +47,9 @@ class HTMLStripper(HTMLParser):
    def get_data(self):
        return ''.join(self.fed)

+    def error(self, message):
+        pass
+

 def getImageFileName(imgfile):
    name, ext = os.path.splitext(imgfile)
@@ -49,11 +59,20 @@ def getImageFileName(imgfile):
    return [name, ext]


+def walkSort(dirnames, filenames):
+    convert = lambda text: int(text) if text.isdigit() else text
+    alphanum_key = lambda key: [convert(c) for c in split('([0-9]+)', key)]
+    dirnames.sort(key=lambda name: alphanum_key(name.lower()))
+    filenames.sort(key=lambda name: alphanum_key(name.lower()))
+    return dirnames, filenames
+
+
 def walkLevel(some_dir, level=1):
    some_dir = some_dir.rstrip(os.path.sep)
    assert os.path.isdir(some_dir)
    num_sep = some_dir.count(os.path.sep)
-    for root, dirs, files in os.walk(some_dir):
+    for root, dirs, files in walk(some_dir):
+        dirs, files = walkSort(dirs, files)
        yield root, dirs, files
        num_sep_this = root.count(os.path.sep)
        if num_sep + level <= num_sep_this:
@@ -77,42 +96,74 @@ def check7ZFile(filePath):
    return header == b"7z\xbc\xaf'\x1c"


-# noinspection PyUnresolvedReferences
+def saferReplace(old, new):
+    for x in range(5):
+        try:
+            os.replace(old, new)
+        except PermissionError:
+            sleep(5)
+        else:
+            break
+    else:
+        raise PermissionError
+
+
+def removeFromZIP(zipfname, *filenames):
+    tempdir = mkdtemp('', 'KCC-')
+    try:
+        tempname = os.path.join(tempdir, 'KCC.zip')
+        with ZipFile(zipfname, 'r') as zipread:
+            with ZipFile(tempname, 'w', compression=ZIP_DEFLATED) as zipwrite:
+                for item in zipread.infolist():
+                    if item.filename not in filenames:
+                        zipwrite.writestr(item, zipread.read(item.filename))
+        copy(tempname, zipfname)
+    finally:
+        rmtree(tempdir, True)
+
+
+def sanitizeTrace(traceback):
+    return ''.join(format_tb(traceback))\
+        .replace('C:\\Users\\pawel\\Documents\\Projekty\\KCC\\', '')\
+        .replace('C:\\Python34\\', '')\
+        .replace('C:\\Python34_64\\', '')
+
+
 def dependencyCheck(level):
    missing = []
    if level > 2:
        try:
            from PyQt5.QtCore import qVersion as qtVersion
-            if StrictVersion('5.2.0') > StrictVersion(qtVersion()):
-                missing.append('PyQt 5.2.0+')
+            if StrictVersion('5.2.1') > StrictVersion(qtVersion()):
+                missing.append('PyQt 5.2.1+')
        except ImportError:
-            missing.append('PyQt 5.2.0+')
+            missing.append('PyQt 5.2.1+')
    if level > 1:
        try:
            from psutil import __version__ as psutilVersion
-            if StrictVersion('2.0.0') > StrictVersion(psutilVersion):
-                missing.append('psutil 2.0.0+')
+            if StrictVersion('3.0.0') > StrictVersion(psutilVersion):
+                missing.append('psutil 3.0.0+')
        except ImportError:
-            missing.append('psutil 2.0.0+')
+            missing.append('psutil 3.0.0+')
        try:
            from slugify import __version__ as slugifyVersion
-            if StrictVersion('0.1.0') > StrictVersion(slugifyVersion):
-                missing.append('python-slugify 0.1.0+')
+            if StrictVersion('1.1.3') > StrictVersion(slugifyVersion):
+                missing.append('python-slugify 1.1.3+')
        except ImportError:
-            missing.append('python-slugify 0.1.0+')
+            missing.append('python-slugify 1.1.3+')
    try:
        from PIL import PILLOW_VERSION as pillowVersion
-        if StrictVersion('2.7.0') > StrictVersion(pillowVersion):
-            missing.append('Pillow 2.7.0+')
+        if StrictVersion('2.8.2') > StrictVersion(pillowVersion):
+            missing.append('Pillow 2.8.2+')
    except ImportError:
-        missing.append('Pillow 2.7.0+')
-    if len(missing) > 0:
+        missing.append('Pillow 2.8.2+')
+    if version_info[1] < 5:
        try:
-            import tkinter
-            import tkinter.messagebox
-            importRoot = tkinter.Tk()
-            importRoot.withdraw()
-            tkinter.messagebox.showerror('KCC - Error', 'ERROR: ' + ', '.join(missing) + ' is not installed!')
+            from scandir import __version__ as scandirVersion
+            if StrictVersion('1.1') > StrictVersion(scandirVersion):
+                missing.append('scandir 1.1+')
        except ImportError:
-            print('ERROR: ' + ', '.join(missing) + ' is not installed!')
-        exit(1)
+            missing.append('scandir 1.1+')
+    if len(missing) > 0:
+        print('ERROR: ' + ', '.join(missing) + ' is not installed!')
+        exit(1)
--- a/other/7za
+++ b/other/7za
--- a/other/7za.exe
+++ b/other/7za.exe
--- a/other/UnRAR.exe
+++ b/other/UnRAR.exe
--- a/other/unrar
+++ b/other/unrar
--- a/setup.json
+++ b/setup.json
@@ -0,0 +1,10 @@
+{
+  "title": "Kindle Comic Converter",
+  "icon": "icons/comic2ebook.icns",
+  "background": "icons/WizardOSX.png",
+  "icon-size": 160,
+  "contents": [
+    { "x": 180, "y": 300, "type": "file", "path": "dist/Kindle Comic Converter.app" },
+    { "x": 520, "y": 300, "type": "link", "path": "/Applications" }
+  ]
+}
--- a/setup.py
+++ b/setup.py
@@ -1,24 +1,31 @@
 #!/usr/bin/env python3
 """
-py2exe/py2app build script for KCC.
+pip/py2exe/py2app build script for KCC.

 Usage (Windows):
-    python setup.py py2exe
+    py -3.4 setup.py py2exe
+
+Usage (Linux):
+    python3 setup.py make_pyz or python3 setup.py install

 Usage (Mac OS X):
-    python setup.py py2app
+    python3 setup.py py2app
 """
-from sys import platform, version_info
-if version_info[0] != 3:
-    print('ERROR: This is Python 3 script!')
-    exit(1)

-NAME = "KindleComicConverter"
-VERSION = "4.4.1"
-MAIN = "kcc.py"
+from sys import platform, version_info, argv
+from kcc import __version__

-if platform == "darwin":
+
+NAME = 'KindleComicConverter'
+VERSION = __version__
+MAIN = 'kcc.py'
+extra_options = {}
+
+
+if platform == 'darwin':
    from setuptools import setup
+    from os import chmod, makedirs, system
+    from shutil import copyfile
    extra_options = dict(
        setup_requires=['py2app'],
        app=[MAIN],
@@ -29,10 +36,10 @@ if platform == "darwin":
                includes=['sip', 'PyQt5.QtPrintSupport'],
                resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'],
                plist=dict(
-                    CFBundleName=NAME,
+                    CFBundleName='Kindle Comic Converter',
                    CFBundleShortVersionString=VERSION,
-                    CFBundleGetInfoString=NAME + " " + VERSION +
-                    ", written 2012-2015 by Ciro Mattia Gonano and Pawel Jastrzebski",
+                    CFBundleGetInfoString=NAME + ' ' + VERSION +
+                    ', written 2012-2015 by Ciro Mattia Gonano and Pawel Jastrzebski',
                    CFBundleExecutable=NAME,
                    CFBundleDocumentTypes=[
                        dict(
@@ -42,6 +49,7 @@ if platform == "darwin":
                            CFBundleTypeRole='Editor',
                        )
                    ],
+                    CFBundleIdentifier='com.kindlecomicconverter.KindleComicConverter',
                    LSMinimumSystemVersion='10.8.0',
                    LSEnvironment=dict(
                        PATH='./../Resources:/usr/local/bin:/usr/bin:/bin'
@@ -51,12 +59,11 @@ if platform == "darwin":
            )
        )
    )
-elif platform == "win32":
-    # noinspection PyUnresolvedReferences
+elif platform == 'win32':
    import py2exe
-    import platform as arch
+    from platform import architecture
    from distutils.core import setup
-    if arch.architecture()[0] == '64bit':
+    if architecture()[0] == '64bit':
        suffix = '_64'
    else:
        suffix = ''
@@ -69,45 +76,89 @@ elif platform == "win32":
                              'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libGLESv2.dll',
                              'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libEGL.dll'])]
    extra_options = dict(
-        options={'py2exe': {"bundle_files": 1,
-                            "dll_excludes": ["tcl85.dll", "tk85.dll"],
-                            "dist_dir": "dist" + suffix,
-                            "compressed": True,
-                            "includes": ["sip"],
-                            "excludes": ["tkinter"],
-                            "optimize": 2}},
-        windows=[{"script": MAIN,
-                  "dest_base": "KCC",
-                  "version": VERSION,
-                  "copyright": "Ciro Mattia Gonano, Pawel Jastrzebski © 2012-2015",
-                  "legal_copyright": "ISC License (ISCL)",
-                  "product_version": VERSION,
-                  "product_name": "Kindle Comic Converter",
-                  "file_description": "Kindle Comic Converter",
-                  "icon_resources": [(1, "icons\comic2ebook.ico")]}],
+        options={'py2exe': {'bundle_files': 1,
+                            'dist_dir': 'dist' + suffix,
+                            'compressed': True,
+                            'includes': ['sip'],
+                            'excludes': ['tkinter'],
+                            'optimize': 2}},
+        windows=[{'script': MAIN,
+                  'dest_base': 'KCC',
+                  'version': VERSION,
+                  'copyright': 'Ciro Mattia Gonano, Pawel Jastrzebski © 2012-2015',
+                  'legal_copyright': 'ISC License (ISCL)',
+                  'product_version': VERSION,
+                  'product_name': 'Kindle Comic Converter',
+                  'file_description': 'Kindle Comic Converter',
+                  'icon_resources': [(1, 'icons\comic2ebook.ico')]}],
        zipfile=None,
        data_files=additional_files)
 else:
-    print('Please use setup.sh to build Linux package.')
-    exit()
+    if len(argv) > 1 and argv[1] == 'make_pyz':
+        from os import system
+        script = '''
+        cp kcc.py __main__.py
+        zip kcc.zip __main__.py kcc/*.py
+        echo "#!/usr/bin/env python3" > kcc-bin
+        cat kcc.zip >> kcc-bin
+        chmod +x kcc-bin
+
+        cp kcc-c2e.py __main__.py
+        zip kcc-c2e.zip __main__.py kcc/*.py
+        echo "#!/usr/bin/env python3" > kcc-c2e-bin
+        cat kcc-c2e.zip >> kcc-c2e-bin
+        chmod +x kcc-c2e-bin
+
+        cp kcc-c2p.py __main__.py
+        zip kcc-c2p.zip __main__.py kcc/*.py
+        echo "#!/usr/bin/env python3" > kcc-c2p-bin
+        cat kcc-c2p.zip >> kcc-c2p-bin
+        chmod +x kcc-c2p-bin
+
+        tar --xform s:^.*/:: --xform s/LICENSE.txt/LICENSE/ --xform s/kcc-bin/kcc/ --xform s/kcc-c2p-bin/kcc-c2p/ \
+        --xform s/kcc-c2e-bin/kcc-c2e/ --xform s/comic2ebook/kcc/ -czf KindleComicConverter_linux_'''\
+        + VERSION + '''.tar.gz kcc-bin kcc-c2e-bin kcc-c2p-bin LICENSE.txt README.md icons/comic2ebook.png
+        rm __main__.py kcc.zip kcc-c2e.zip kcc-c2p.zip kcc-bin kcc-c2e-bin kcc-c2p-bin
+        '''
+        system("bash -c '%s'" % script)
+        exit(0)
+    else:
+        from setuptools import setup
+        from os import makedirs
+        from shutil import copyfile
+        makedirs('build/_scripts/', exist_ok=True)
+        copyfile('kcc.py', 'build/_scripts/kcc')
+        copyfile('kcc-c2e.py', 'build/_scripts/kcc-c2e')
+        copyfile('kcc-c2p.py', 'build/_scripts/kcc-c2p')
+        extra_options = dict(
+            scripts=['build/_scripts/kcc', 'build/_scripts/kcc-c2e', 'build/_scripts/kcc-c2p'],
+            packages=['kcc'],
+            install_requires=[
+                'Pillow>=2.8.2',
+                'psutil>=3.0.0',
+                'python-slugify>=1.1.3',
+            ],
+            zip_safe=False,
+        )
+        if version_info[1] < 5:
+            extra_options['install_requires'].append('scandir>=1.1.0')
+

-# noinspection PyUnboundLocalVariable
 setup(
    name=NAME,
    version=VERSION,
-    author="Ciro Mattia Gonano, Pawel Jastrzebski",
-    author_email="ciromattia@gmail.com, pawelj@iosphe.re",
-    description="Kindle Comic Converter",
-    license="ISC License (ISCL)",
-    keywords="kindle comic mobipocket mobi cbz cbr manga",
-    url="http://github.com/ciromattia/kcc",
+    author='Ciro Mattia Gonano, Pawel Jastrzebski',
+    author_email='ciromattia@gmail.com, pawelj@iosphe.re',
+    description='Comic and manga converter for E-Book readers.',
+    license='ISC License (ISCL)',
+    keywords='kindle comic mobipocket mobi cbz cbr manga',
+    url='http://github.com/ciromattia/kcc',
    **extra_options
 )

-if platform == "darwin":
-    from os import chmod, makedirs
-    from shutil import copyfile
-    makedirs('dist/' + NAME + '.app/Contents/PlugIns/platforms')
-    copyfile('other/libqcocoa.dylib', 'dist/' + NAME + '.app/Contents/PlugIns/platforms/libqcocoa.dylib')
-    chmod('dist/' + NAME + '.app/Contents/Resources/unrar', 0o777)
-    chmod('dist/' + NAME + '.app/Contents/Resources/7za', 0o777)
+if platform == 'darwin':
+    makedirs('dist/Kindle Comic Converter.app/Contents/PlugIns/platforms', exist_ok=True)
+    copyfile('other/libqcocoa.dylib', 'dist/Kindle Comic Converter.app/Contents/PlugIns/platforms/libqcocoa.dylib')
+    chmod('dist/Kindle Comic Converter.app/Contents/Resources/unrar', 0o777)
+    chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 0o777)
+    system('appdmg setup.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
--- a/setup.sh
+++ b/setup.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-# Linux Python package build script
-
-VERSION="4.4.1"
-
-cp kcc.py __main__.py
-zip kcc.zip __main__.py kcc/*.py
-echo "#!/usr/bin/env python3" > kcc-bin
-cat kcc.zip >> kcc-bin
-chmod +x kcc-bin
-
-cp kcc-c2e.py __main__.py
-zip kcc-c2e.zip __main__.py kcc/*.py
-echo "#!/usr/bin/env python3" > kcc-c2e-bin
-cat kcc-c2e.zip >> kcc-c2e-bin
-chmod +x kcc-c2e-bin
-
-cp kcc-c2p.py __main__.py
-zip kcc-c2p.zip __main__.py kcc/*.py
-echo "#!/usr/bin/env python3" > kcc-c2p-bin
-cat kcc-c2p.zip >> kcc-c2p-bin
-chmod +x kcc-c2p-bin
-
-tar --xform s:^.*/:: --xform s/kcc-bin/kcc/ --xform s/kcc-c2p-bin/kcc-c2p/ --xform s/kcc-c2e-bin/kcc-c2e/ --xform s/comic2ebook/kcc/ -czf KindleComicConverter_linux_$VERSION.tar.gz kcc-bin kcc-c2e-bin kcc-c2p-bin LICENSE.txt icons/comic2ebook.png
-rm __main__.py kcc.zip kcc-c2e.zip kcc-c2p.zip kcc-bin kcc-c2e-bin kcc-c2p-bin
Author	SHA1	Message	Date
Paweł Jastrzębski	1fa6d315b1	Merge pull request #156 from ciromattia/dev 4.6.5	2015-09-17 15:44:42 +02:00
Paweł Jastrzębski	112917754a	Fixed OS X GUI anomalies	2015-09-17 10:35:54 +02:00
Paweł Jastrzębski	65774c6f12	Updated README + version bump	2015-09-16 19:13:32 +02:00
Paweł Jastrzębski	7b3ce8827f	Updated OS X build environment	2015-09-16 19:00:45 +02:00
Paweł Jastrzębski	b12825045b	Fixed stupid typo	2015-09-16 11:52:17 +02:00
Paweł Jastrzębski	ac9f3a5d87	KindleGen detection tweak	2015-09-16 10:22:53 +02:00
Paweł Jastrzębski	00969a3739	Allow older PyQT	2015-09-16 08:47:59 +02:00
Paweł Jastrzębski	21f738b44a	Yet another Windows file lock fix	2015-09-15 21:24:49 +02:00
Paweł Jastrzębski	f2238b16a6	os.access acts unpredictably on Windows	2015-09-15 17:44:55 +02:00
Paweł Jastrzębski	14f677ec68	Python 3.5+ include scandir	2015-09-15 15:44:52 +02:00
Paweł Jastrzębski	7b3bf4618f	Yet another Windows file lock fixes	2015-09-12 09:48:17 +02:00
Paweł Jastrzębski	eab63a0f74	Merge pull request #153 from ciromattia/dev 4.6.4	2015-09-11 09:38:56 +02:00
Paweł Jastrzębski	2128104db7	Updated README + version bump	2015-09-11 09:38:28 +02:00
Paweł Jastrzębski	c6179b0064	Tweaked CBZ detection	2015-09-06 18:26:15 +02:00
Paweł Jastrzębski	1d4319be2e	CLI: Additional source path cleanup (close #152 )	2015-09-06 14:49:56 +02:00
Paweł Jastrzębski	f5a738e2d4	Updated OSX release to QT 5.5	2015-09-06 11:23:45 +02:00
Paweł Jastrzębski	477d834a91	Updated OSX installer	2015-09-05 09:14:26 +02:00
Paweł Jastrzębski	c8698f6d99	Improved error handling	2015-09-04 18:40:02 +02:00
Paweł Jastrzębski	0988601842	Implemented new method to detect color images	2015-09-04 16:06:18 +02:00
Paweł Jastrzębski	57e9637c81	Code cleanup	2015-09-03 17:13:46 +02:00
Paweł Jastrzębski	a7440e06a9	Additional temp cleanup	2015-09-01 18:53:09 +02:00
Paweł Jastrzębski	a9ed1e7610	Improved error reporting	2015-09-01 18:15:33 +02:00
Paweł Jastrzębski	b1bc140ad3	Reversed OS X version to Qt 4.9.2	2015-08-29 09:43:52 +02:00
Paweł Jastrzębski	9014ed53d4	Merge pull request #151 from ciromattia/dev 4.6.3	2015-08-28 19:53:59 +02:00
Paweł Jastrzębski	cad05904f3	Updated README + version bump	2015-08-28 19:53:16 +02:00
Paweł Jastrzębski	10386d8af3	Added detailed platform info to error report	2015-08-28 19:50:43 +02:00
Paweł Jastrzębski	c991feb9ce	GUI tweaks	2015-08-28 19:33:40 +02:00
Paweł Jastrzębski	d26eb7cdcd	Set proper User-Agent	2015-08-24 17:18:39 +02:00
Paweł Jastrzębski	351084b703	Implemented error reporting	2015-08-24 17:11:35 +02:00
Paweł Jastrzębski	e861e7f6e8	Updated page endpoints	2015-08-24 17:07:49 +02:00
Paweł Jastrzębski	370c9d4df7	Tweaked setup.py	2015-08-09 10:08:24 +02:00
Paweł Jastrzębski	8e5704683c	Fixed detection of file corruption	2015-08-04 09:54:39 +02:00
Paweł Jastrzębski	c65e1c8dea	Merge pull request #150 from ciromattia/dev 4.6.2	2015-07-14 18:01:51 +02:00
Paweł Jastrzębski	677622c103	Updated README + version bump	2015-07-14 18:01:02 +02:00
Paweł Jastrzębski	af0ebb85a0	Escape HTML in metadata (close #148 )	2015-07-14 17:58:59 +02:00
Paweł Jastrzębski	8af029ac92	Fixed MOBI header (close #149 )	2015-07-14 17:40:33 +02:00
Paweł Jastrzębski	a268e12a90	Merge pull request #147 from ciromattia/dev 4.6.1	2015-07-05 12:16:27 +02:00
Paweł Jastrzębski	d621335e6c	Updated README + version bump	2015-07-05 12:15:35 +02:00
Paweł Jastrzębski	ec1d9c2d93	Added ComicRack Summary field parsing (close #146 )	2015-07-05 07:49:48 +02:00
Paweł Jastrzębski	85b9dbbf83	Detect too small input images	2015-07-05 06:57:56 +02:00
Paweł Jastrzębski	feeced44bf	Tweaked KEPUB renamer (close #144 )	2015-06-28 19:20:38 +02:00
Paweł Jastrzębski	cbea18398b	Fixed Kobo TOC (close #145 )	2015-06-28 18:31:47 +02:00
Paweł Jastrzębski	4c9857f14d	Merge pull request #143 from ciromattia/dev 4.6	2015-06-21 08:44:37 +02:00
Paweł Jastrzębski	6b58ef4557	Updated README + version bump	2015-06-21 08:29:22 +02:00
Paweł Jastrzębski	24d697c965	Dropped Kindle Fire support	2015-06-21 08:04:28 +02:00
Paweł Jastrzębski	8b07d4eb69	Added Kindle Paperwhite 3 profile	2015-06-18 16:21:48 +02:00
Paweł Jastrzębski	e6c5ac915f	Changed Kobo default output to KEPUB (close #141 )	2015-06-17 22:35:24 +02:00
Paweł Jastrzębski	b22e4757a3	EPUB 3.0 output	2015-06-17 20:22:04 +02:00
Paweł Jastrzębski	91b06016bb	Dependency update	2015-06-15 22:19:08 +02:00
Paweł Jastrzębski	5631391245	Error handling tweak	2015-05-31 09:36:20 +02:00
Paweł Jastrzębski	c33887b7b7	Fixed yet another tray icon anomaly	2015-05-20 20:21:12 +02:00
Paweł Jastrzębski	8d82f58f09	Merge pull request #137 from ciromattia/dev 4.5.1	2015-05-09 09:29:42 +02:00
Paweł Jastrzębski	36985f5169	Detect broken Pillow (close #135 )	2015-05-07 22:37:48 +02:00
Paweł Jastrzębski	9d190c1585	Updated README + version bump	2015-05-07 18:06:16 +02:00
Paweł Jastrzębski	3834850317	Tweaked metadata editor	2015-05-07 17:49:03 +02:00
Paweł Jastrzębski	84fc23b979	Fixed CBR parsing anomalies (close #133 )	2015-04-27 18:50:14 +02:00
Paweł Jastrzębski	77748afdbd	Fixed supid typo	2015-04-26 18:47:40 +02:00
Paweł Jastrzębski	431e2ffaf2	Binary blob cleanup	2015-04-26 15:59:43 +02:00
Paweł Jastrzębski	16df4cd083	Added Kobo Glow HD profile	2015-04-22 20:38:17 +02:00
Paweł Jastrzębski	1aa34347c1	Added page-progression-direction tag to EPUB spine	2015-03-17 11:02:28 +01:00
Paweł Jastrzębski	561af90b06	Updated README and Setup	2015-03-09 20:08:48 +01:00
Paweł Jastrzębski	00d239e1d8	Merge pull request #131 from ciromattia/dev 4.5	2015-03-08 18:08:15 +01:00
Paweł Jastrzębski	26bd2d3ed0	Version bump	2015-03-08 18:07:47 +01:00
Paweł Jastrzębski	e7aa49b70c	Fixed bookmark drift caused by image splits	2015-03-08 18:06:27 +01:00
Paweł Jastrzębski	da41edc2f1	GUI tweak	2015-02-26 18:27:10 +01:00
fsteffek	ecbf60fb28	Add ComicInfo bookmarks -> EPUB chapter support Bookmarks from ComicRack's ComicInfo.xml are now converted to EPUB chapters. `Bookmark` is an attribute to the `Page` element in ComicInfo.xml. * Works with flat directory structure (no sub-folders support)	2015-02-21 18:40:59 +01:00
Paweł Jastrzębski	57b571b6c2	Fixed CLI version	2015-02-21 18:30:54 +01:00
Paweł Jastrzębski	44bdc0245b	Fool proofing file sorting	2015-02-21 18:25:55 +01:00
fsteffek	1ec07fe4ec	Fix random order of chapter list (close #129 ) Directories and files returned by walk() are not always sorted. Currently we sort the filelist after creating the it. When walk()-ing topdown (we do) the directory list can be modified in-place. By sorting the directories and files before creating the filelist, we guarantee a sorted chapter list.	2015-02-21 17:59:46 +01:00
Paweł Jastrzębski	5f8f7e0919	Merge pull request #128 from fsteffek/dev Fixed first file detection	2015-02-20 10:01:34 +01:00
fsteffek	f404b9090d	Set first image in folder as cover The walk() function does not necessarily return filenames in alphabetical order. This leads to a random cover image. Sorting filenames before setting the cover images fixes this issue.	2015-02-19 22:33:25 +01:00
Paweł Jastrzębski	68521f7c63	Updated installer	2015-02-17 18:08:23 +01:00
Paweł Jastrzębski	f5dd813c4c	General refactoring and tweaks	2015-02-14 09:47:14 +01:00
Paweł Jastrzębski	7924c492b3	Updated OSX and Linux GUI	2015-02-08 12:52:42 +01:00
Paweł Jastrzębski	2fc21c33e2	Added metadata editor	2015-02-08 11:53:55 +01:00
Paweł Jastrzębski	cb76504acb	Updated installer	2015-02-01 08:57:24 +01:00
Paweł Jastrzębski	db6b0eddfe	Completely replaced Virtual Panel View with Panel View	2015-01-31 11:10:01 +01:00
Paweł Jastrzębski	7d529a2acc	Added Metadata editor class	2015-01-24 18:36:15 +01:00
Paweł Jastrzębski	ad3ff35aaa	Yet another workaround for file lock problems (#125 )	2015-01-24 10:07:27 +01:00
Paweł Jastrzębski	c62eeeb712	Re-enabled MCD support	2015-01-21 19:15:38 +01:00
Paweł Jastrzębski	5a36a13105	Replaced os.walk	2015-01-21 18:19:54 +01:00
Paweł Jastrzębski	12684d6562	Code cleanup	2015-01-20 21:45:22 +01:00
Paweł Jastrzębski	c5f68ae12a	Merge pull request #124 from ciromattia/dev 4.4.1	2015-01-11 16:20:43 +01:00