Version bump + README update

Python3 + Qt5

.gitignore

@@ -2,11 +2,11 @@
 *.cbz
 *.cbr
 .idea
+.DS_Store
+Thumbs.db
 build
 dist
 Output
+test
+solaio
 kindlegen*
-UnRAR*
-7za*
-.DS_Store
-Thumbs.db

KCC-Linux.ui

@@ -7,19 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </size>
   </property>
   <property name="font">
@@ -27,9 +27,6 @@
     <pointsize>9</pointsize>
    </font>
   </property>
-  <property name="focusPolicy">
-   <enum>Qt::NoFocus</enum>
-  </property>
   <property name="windowTitle">
    <string>Kindle Comic Converter</string>
   </property>
@@ -74,7 +71,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>Disable image optimizations.</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable image optimizations.&lt;br/&gt;Input images must be already resized.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>No optimisation</string>
@@ -113,7 +110,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>Webtoon mode</string>
@@ -131,7 +128,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Create PNG files instead JPEG.&lt;br/&gt;Quality increase is not noticeable on most of devices.&lt;br/&gt;Output files &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; be smaller.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;MOBI conversion will be much slower.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Create PNG files instead JPEG.&lt;br/&gt;Quality increase is not noticeable on most of devices.&lt;br/&gt;Output files &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; be smaller.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;MOBI conversion will be much slower.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>PNG output</string>
@@ -170,7 +167,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disable splitting and rotation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable splitting and rotation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>No split/rotate</string>
@@ -198,7 +195,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-     <string>Target device.</string>
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
    </widget>
    <widget class="QComboBox" name="FormatBox">
@@ -220,7 +217,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-     <string>Output format.</string>
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Output format.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
    </widget>
    <widget class="QPushButton" name="ConvertButton">
@@ -243,6 +240,9 @@
     <property name="focusPolicy">
      <enum>Qt::NoFocus</enum>
     </property>
+    <property name="toolTip">
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Shift+Click to select the output directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    </property>
     <property name="text">
      <string>Convert</string>
     </property>
@@ -362,7 +362,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>Enable right-to-left reading.</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable right-to-left reading.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Manga mode</string>
@@ -386,13 +386,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Poor quality when zoom is enabled.&lt;br/&gt;- Lowest file size.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Not zoomed images &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;might&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt; be blurry.&lt;br/&gt;&lt;/span&gt;- High quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximum possible quality.&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;br/&gt;- Very high file size.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;- Maximum quality when zoom is not enabled.&lt;br /&gt;- Poor quality when zoom is enabled.&lt;br /&gt;- Lowest file size.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-style:italic;&quot;&gt;Not zoomed image &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-weight:600; font-style:italic;&quot;&gt;might &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-style:italic;&quot;&gt;be a little blurry.&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;- Medium/High quality when zoom is not enabled.&lt;br /&gt;- Maximum quality when zoom is enabled.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-style:italic;&quot;&gt;Maximum possible quality.&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2';&quot;&gt;- Maximum quality when zoom is not enabled.&lt;br /&gt;- Maximum quality when zoom is enabled.&lt;br /&gt;- Very high file size.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>High/Ultra quality</string>
@@ -419,7 +413,7 @@ p, li { white-space: pre-wrap; }
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disable page spliting.&lt;br/&gt;They will be rotated instead.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable splitting of two-page spreads.&lt;br/&gt;They will be rotated instead.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Horizontal mode</string>
@@ -546,9 +540,6 @@ p, li { white-space: pre-wrap; }
        <family>DejaVu Sans</family>
       </font>
      </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When converting color images setting this option to 1.0 &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; improve readability.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
      <property name="text">
       <string>Gamma: Auto</string>
      </property>
@@ -570,9 +561,6 @@ p, li { white-space: pre-wrap; }
      <property name="focusPolicy">
       <enum>Qt::ClickFocus</enum>
      </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When converting color images setting this option to 1.0 &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; improve readability.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
      <property name="maximum">
       <number>500</number>
      </property>
@@ -644,7 +632,7 @@ p, li { white-space: pre-wrap; }
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>Do not convert images to grayscale.</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Don't convert images to grayscale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Color mode</string>
@@ -673,7 +661,7 @@ p, li { white-space: pre-wrap; }
          </font>
         </property>
         <property name="toolTip">
-         <string>Resolution of target device.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Custom width: </string>
@@ -706,10 +694,10 @@ p, li { white-space: pre-wrap; }
          <bool>false</bool>
         </property>
         <property name="toolTip">
-         <string>Resolution of target device.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="inputMask">
-         <string>0000; </string>
+         <string>0000</string>
         </property>
         <property name="maxLength">
          <number>4</number>
@@ -724,7 +712,7 @@ p, li { white-space: pre-wrap; }
          </font>
         </property>
         <property name="toolTip">
-         <string>Resolution of target device.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Custom height: </string>
@@ -757,10 +745,10 @@ p, li { white-space: pre-wrap; }
          <bool>false</bool>
         </property>
         <property name="toolTip">
-         <string>Resolution of target device.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="inputMask">
-         <string>0000; </string>
+         <string>0000</string>
         </property>
         <property name="maxLength">
          <number>4</number>
@@ -785,6 +773,17 @@ p, li { white-space: pre-wrap; }
    <zorder>OptionsExpert</zorder>
    <zorder>ProgressBar</zorder>
   </widget>
+  <widget class="QStatusBar" name="statusBar">
+   <property name="font">
+    <font>
+     <family>DejaVu Sans</family>
+     <pointsize>8</pointsize>
+    </font>
+   </property>
+   <property name="sizeGripEnabled">
+    <bool>false</bool>
+   </property>
+  </widget>
   <action name="ActionBasic">
    <property name="checkable">
     <bool>true</bool>

KCC-OSX.ui

@@ -7,19 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </size>
   </property>
   <property name="font">
@@ -27,9 +27,6 @@
     <pointsize>9</pointsize>
    </font>
   </property>
-  <property name="focusPolicy">
-   <enum>Qt::NoFocus</enum>
-  </property>
   <property name="windowTitle">
    <string>Kindle Comic Converter</string>
   </property>
@@ -72,7 +69,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Disable image optimizations.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable image optimizations.&lt;br/&gt;Input images must be already resized.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>No optimisation</string>
@@ -91,7 +88,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Nothing&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Images smaller than device resolution will not be resized.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - Stretching&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Images smaller than device resolution will be resized. Aspect ratio will be not preserved.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Upscaling&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Images smaller than device resolution will be resized. Aspect ratio will be preserved.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Nothing&lt;br/&gt;&lt;/span&gt;Images smaller than device resolution will not be resized.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - Stretching&lt;br/&gt;&lt;/span&gt;Images smaller than device resolution will be resized. Aspect ratio will be not preserved.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Upscaling&lt;br/&gt;&lt;/span&gt;Images smaller than device resolution will be resized. Aspect ratio will be preserved.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>Stretch/Upscale</string>
@@ -113,7 +110,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Enable auto-splitting of webtoons like &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt; or &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>Webtoon mode</string>
@@ -132,7 +129,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Create PNG files instead JPEG.&lt;br/&gt;Quality increase is not noticeable on most of devices.&lt;br/&gt;Output files &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;might&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt; be smaller.&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;MOBI conversion will be much slower.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Create PNG files instead JPEG.&lt;br/&gt;Quality increase is not noticeable on most of devices.&lt;br/&gt;Output files &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; be smaller.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;MOBI conversion will be much slower.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>PNG output</string>
@@ -151,7 +148,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Autodetection&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Color of margins fill will be detected automatically.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - White&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Margins will be filled with white color.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Black&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Margins will be filled with black color.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Autodetection&lt;br/&gt;&lt;/span&gt;Color of margins fill will be detected automatically.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - White&lt;br/&gt;&lt;/span&gt;Margins will be filled with white color.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Black&lt;br/&gt;&lt;/span&gt;Margins will be filled with black color.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>W/B margins</string>
@@ -173,7 +170,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Disable splitting and rotation.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable splitting and rotation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>No split/rotate</string>
@@ -201,7 +198,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Target device.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
    </widget>
    <widget class="QComboBox" name="FormatBox">
@@ -223,7 +220,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Output format.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p  style='white-space:pre'&gt;Output format.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
    </widget>
    <widget class="QPushButton" name="ConvertButton">
@@ -246,6 +243,9 @@
     <property name="focusPolicy">
      <enum>Qt::NoFocus</enum>
     </property>
+    <property name="toolTip">
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Shift+Click to select the output directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    </property>
     <property name="text">
      <string>Convert</string>
     </property>
@@ -366,7 +366,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Enable right-to-left reading.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable right-to-left reading.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Manga mode</string>
@@ -391,7 +391,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot;font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot;font-size:12pt; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;/span&gt;&lt;span style=&quot;font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot;font-size:12pt;&quot;&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Poor quality when zoom is enabled.&lt;br/&gt;- Lowest file size.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot;font-size:12pt; font-style:italic;&quot;&gt;Not zoomed image &lt;/span&gt;&lt;span style=&quot;font-size:12pt; font-weight:600; font-style:italic;&quot;&gt;might &lt;/span&gt;&lt;span style=&quot;font-size:12pt; font-style:italic;&quot;&gt;be a little blurry.&lt;/span&gt;&lt;span style=&quot;font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot;font-size:12pt;&quot;&gt;- Medium/High quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;span style=&quot;font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot;font-size:12pt; font-style:italic;&quot;&gt;Maximum possible quality.&lt;/span&gt;&lt;span style=&quot;font-size:12pt; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot;font-size:12pt;&quot;&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;br/&gt;- Very high file size.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Poor quality when zoom is enabled.&lt;br/&gt;- Lowest file size.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Not zoomed image &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;might&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt; be a little blurry.&lt;br/&gt;&lt;/span&gt;- High quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximum possible quality.&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;br/&gt;- Very high file size.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>High/Ultra quality</string>
@@ -419,7 +419,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Disable page spliting.&lt;br/&gt;They will be rotated instead.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable splitting of two-page spreads.&lt;br/&gt;They will be rotated instead.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Horizontal mode</string>
@@ -546,9 +546,6 @@
        <bold>false</bold>
       </font>
      </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;When converting color images setting this option to 1.0 &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;might&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt; improve readability.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
      <property name="text">
       <string>Gamma: Auto</string>
      </property>
@@ -570,9 +567,6 @@
      <property name="focusPolicy">
       <enum>Qt::ClickFocus</enum>
      </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;When converting color images setting this option to 1.0 &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;might&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt; improve readability.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
      <property name="maximum">
       <number>500</number>
      </property>
@@ -590,7 +584,7 @@
       <x>10</x>
       <y>10</y>
       <width>401</width>
-      <height>35</height>
+      <height>29</height>
      </rect>
     </property>
     <property name="font">
@@ -601,9 +595,6 @@
       <bold>true</bold>
      </font>
     </property>
-    <property name="autoFillBackground">
-     <bool>true</bool>
-    </property>
     <property name="value">
      <number>0</number>
     </property>
@@ -648,7 +639,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Do not convert images to grayscale.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Don't convert images to grayscale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Color mode</string>
@@ -680,7 +671,7 @@
          </font>
         </property>
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Resolution of target device.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Custom width: </string>
@@ -714,10 +705,10 @@
          <bool>false</bool>
         </property>
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Resolution of target device.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="inputMask">
-         <string>0000; </string>
+         <string>0000</string>
         </property>
         <property name="maxLength">
          <number>4</number>
@@ -735,7 +726,7 @@
          </font>
         </property>
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Resolution of target device.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Custom height: </string>
@@ -769,10 +760,10 @@
          <bool>false</bool>
         </property>
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Resolution of target device.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="inputMask">
-         <string>0000; </string>
+         <string>0000</string>
         </property>
         <property name="maxLength">
          <number>4</number>
@@ -797,6 +788,17 @@
    <zorder>OptionsAdvancedGamma</zorder>
    <zorder>OptionsExpert</zorder>
   </widget>
+  <widget class="QStatusBar" name="statusBar">
+   <property name="font">
+    <font>
+     <family>Aharoni</family>
+     <pointsize>8</pointsize>
+    </font>
+   </property>
+   <property name="sizeGripEnabled">
+    <bool>false</bool>
+   </property>
+  </widget>
   <action name="ActionBasic">
    <property name="checkable">
     <bool>true</bool>

KCC.qrc

@@ -3,6 +3,7 @@
     <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>

KCC.ui

@@ -7,19 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
     <width>420</width>
-    <height>380</height>
+    <height>397</height>
    </size>
   </property>
   <property name="font">
@@ -27,9 +27,6 @@
     <pointsize>9</pointsize>
    </font>
   </property>
-  <property name="focusPolicy">
-   <enum>Qt::NoFocus</enum>
-  </property>
   <property name="windowTitle">
    <string>Kindle Comic Converter</string>
   </property>
@@ -68,7 +65,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>Disable image optimizations.</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable image optimizations.&lt;br/&gt;Input images must be already resized.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>No optimisation</string>
@@ -97,7 +94,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable auto-splitting of webtoons like &lt;span style=&quot; font-style:italic;&quot;&gt;Tower of God&lt;/span&gt; or &lt;span style=&quot; font-style:italic;&quot;&gt;Noblesse&lt;/span&gt;.&lt;br/&gt;Pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>Webtoon mode</string>
@@ -110,7 +107,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Create PNG files instead JPEG.&lt;br/&gt;Quality increase is not noticeable on most of devices.&lt;br/&gt;Output files &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; be smaller.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;MOBI conversion will be much slower.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Create PNG files instead JPEG.&lt;br/&gt;Quality increase is not noticeable on most of devices.&lt;br/&gt;Output files &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; be smaller.&lt;br/&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;MOBI conversion will be much slower.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>PNG output</string>
@@ -139,7 +136,7 @@
         <enum>Qt::NoFocus</enum>
        </property>
        <property name="toolTip">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disable splitting and rotation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable splitting and rotation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>No split/rotate</string>
@@ -166,7 +163,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-     <string>Target device.</string>
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
    </widget>
    <widget class="QComboBox" name="FormatBox">
@@ -187,7 +184,7 @@
      <enum>Qt::NoFocus</enum>
     </property>
     <property name="toolTip">
-     <string>Output format.</string>
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Output format.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
    </widget>
    <widget class="QPushButton" name="ConvertButton">
@@ -209,6 +206,9 @@
     <property name="focusPolicy">
      <enum>Qt::NoFocus</enum>
     </property>
+    <property name="toolTip">
+     <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p  style='white-space:pre'&gt;Shift+Click to select the output directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    </property>
     <property name="text">
      <string>Convert</string>
     </property>
@@ -319,7 +319,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>Enable right-to-left reading.</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Enable right-to-left reading.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Manga mode</string>
@@ -338,13 +338,7 @@
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Poor quality when zoom is enabled.&lt;br/&gt;- Lowest file size.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Not zoomed images &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;might &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;be blurry.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;- High quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximum possible quality.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br/&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br/&gt;- Maximum quality when zoom is enabled.&lt;br/&gt;- Very high file size.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Use it when Panel View support is not needed.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br /&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br /&gt;- Poor quality when zoom is enabled.&lt;br /&gt;- Lowest file size.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Not zoomed image &lt;/span&gt;&lt;span style=&quot; font-weight:600; font-style:italic;&quot;&gt;might &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;be &lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;a little blurry.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br /&gt;&lt;/span&gt;- Medium/High quality when zoom is not enabled.&lt;br /&gt;- Maximum quality when zoom is enabled.&lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br /&gt;&lt;/span&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Maximum possible quality.&lt;/span&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;&lt;br /&gt;&lt;/span&gt;- Maximum quality when zoom is not enabled.&lt;br /&gt;- Maximum quality when zoom is enabled.&lt;br /&gt;- Very high file size.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>High/Ultra quality</string>
@@ -366,7 +360,7 @@ p, li { white-space: pre-wrap; }
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Disable page spliting.&lt;br/&gt;They will be rotated instead.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Disable splitting of two-page spreads.&lt;br/&gt;They will be rotated instead.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Horizontal mode</string>
@@ -472,9 +466,6 @@ p, li { white-space: pre-wrap; }
        <height>40</height>
       </rect>
      </property>
-     <property name="toolTip">
-      <string>When converting color images setting this option to 1.0 MIGHT improve readability.</string>
-     </property>
      <property name="text">
       <string>Gamma: Auto</string>
      </property>
@@ -491,9 +482,6 @@ p, li { white-space: pre-wrap; }
      <property name="focusPolicy">
       <enum>Qt::ClickFocus</enum>
      </property>
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When converting color images setting this option to 1.0 &lt;span style=&quot; font-weight:600;&quot;&gt;might&lt;/span&gt; improve readability.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
      <property name="maximum">
       <number>500</number>
      </property>
@@ -558,7 +546,7 @@ p, li { white-space: pre-wrap; }
       <enum>Qt::NoFocus</enum>
      </property>
      <property name="toolTip">
-      <string>Do not convert images to grayscale.</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Don't convert images to grayscale.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Color mode</string>
@@ -577,7 +565,7 @@ p, li { white-space: pre-wrap; }
       <item row="0" column="0">
        <widget class="QLabel" name="wLabel">
         <property name="toolTip">
-         <string>Resolution of target device.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Custom width: </string>
@@ -605,10 +593,10 @@ p, li { white-space: pre-wrap; }
          <bool>false</bool>
         </property>
         <property name="toolTip">
-         <string>Resolution of target device.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="inputMask">
-         <string>0000; </string>
+         <string>0000</string>
         </property>
         <property name="maxLength">
          <number>4</number>
@@ -618,7 +606,7 @@ p, li { white-space: pre-wrap; }
       <item row="0" column="2">
        <widget class="QLabel" name="hLabel">
         <property name="toolTip">
-         <string>Resolution of target device.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="text">
          <string>Custom height: </string>
@@ -646,10 +634,10 @@ p, li { white-space: pre-wrap; }
          <bool>false</bool>
         </property>
         <property name="toolTip">
-         <string>Resolution of target device.</string>
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p style='white-space:pre'&gt;Resolution of target device.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="inputMask">
-         <string>0000; </string>
+         <string>0000</string>
         </property>
         <property name="maxLength">
          <number>4</number>
@@ -674,6 +662,17 @@ p, li { white-space: pre-wrap; }
    <zorder>OptionsExpert</zorder>
    <zorder>ProgressBar</zorder>
   </widget>
+  <widget class="QStatusBar" name="statusBar">
+   <property name="font">
+    <font>
+     <family>MS Shell Dlg 2</family>
+     <pointsize>8</pointsize>
+    </font>
+   </property>
+   <property name="sizeGripEnabled">
+    <bool>false</bool>
+   </property>
+  </widget>
   <action name="ActionBasic">
    <property name="checkable">
     <bool>true</bool>

LICENSE.txt

@@ -1,7 +1,7 @@
 ISC LICENSE
 
-Copyright (c) 2013 Ciro Mattia Gonano <ciromattia@gmail.com>
+Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-Copyright (c) 2013 Paweł Jastrzębski <pawelj@vulturis.eu>
+Copyright (c) 2013-2014 Paweł Jastrzębski <pawelj@vulturis.eu>
 
 Permission to use, copy, modify, and/or distribute this software for
 any purpose with or without fee is hereby granted, provided that the

README.md

@@ -1,6 +1,6 @@
 # KCC
 
-**KindleComicConverter** is a Python app to convert comic files or folders to ePub or Panel View MOBI.
+**Kindle Comic Converter** is a Python app to convert comic files or folders to ePub, Panel View MOBI or E-Ink optimized CBZ.
 It was initally developed for Kindle but since v2.2 it outputs valid ePub 2.0 so _**despite its name, KCC is
 actually a comic to EPUB converter that every e-reader owner can happily use**_.
 It can also optionally optimize images by applying a number of transformations.
@@ -8,60 +8,61 @@ It can also optionally optimize images by applying a number of transformations.
 ### A word of warning
 **KCC** _is not_ [Amazon's Kindle Comic Creator](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1001103761) nor is in any way endorsed by Amazon.  
 Amazon's tool is for comic publishers and involves a lot of manual effort, while **KCC** is for comic readers.
-If you want to read some comments over *Amazon's KC2* you can take a look at [this](http://www.mobileread.com/forums/showthread.php?t=207461&page=7#96) and [that](http://www.mobileread.com/forums/showthread.php?t=211047) threads on Mobileread.
+_KC2_ in no way is a replacement for **KCC** so you can be quite confident we'll going to carry on developing our little monster ;-)
-_KC2_ in no way is a replacement for **KCC** so you can be quite confident we'll going to carry on developing our little monster ;)
+
+### Issues / new features / donations
+If you have general questions about usage, feedback etc. please [post it here](http://www.mobileread.com/forums/showthread.php?t=207461).
+If you have some **technical** problems using KCC please [file an issue here](https://github.com/ciromattia/kcc/issues/new).
+If you can fix an open issue, fork & make a pull request.  
+If you want more chances an issue is fixes or your wanted feature added, consider [placing a bounty](https://www.bountysource.com/trackers/65571-ciromattia-kcc)!  
 
-### Donations
 If you find **KCC** valuable you can consider donating to the authors:
-
+  * Ciro Mattia Gonano: [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D8WNYNPBGDAS2) [![Flattr this](http://api.flattr.com/button/flattr-badge-large.png)](http://flattr.com/thing/2260449/ciromattiakcc-on-GitHub)
-* Ciro Mattia Gonano [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D8WNYNPBGDAS2)
+  * Paweł Jastrzębski: [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YTTJ4LK2JDHPS) [![1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b](http://s30.postimg.org/6z3kwvdlp/BC_Rnd.png)](bitcoin:1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b?label=KCC) [1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b](bitcoin:1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b?label=KCC)
-* Paweł Jastrzębski [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YTTJ4LK2JDHPS)
 
 ## BINARY RELEASES
 You can find the latest released binary at the following links:
-- **Win64:** [http://kcc.vulturis.eu/Win64/](http://kcc.vulturis.eu/Win64/)
+- **Windows:** [http://kcc.vulturis.eu/Windows/](http://kcc.vulturis.eu/Windows/)
-- **Win32:** [http://kcc.vulturis.eu/Win32/](http://kcc.vulturis.eu/Win32/)
+- **Linux:** [http://kcc.vulturis.eu/Linux/](http://kcc.vulturis.eu/Linux/)
-- **OS X:** [http://kcc.vulturis.eu/OSX/](http://kcc.vulturis.eu/OSX/)
+- **OS X (10.8+):** [http://kcc.vulturis.eu/OSX/](http://kcc.vulturis.eu/OSX/)
-- **Linux:** Just download sourcecode and launch: `python kcc.py`
 
 ## INPUT FORMATS
-**KCC** can understand and convert, at the moment, the following file types:
+**KCC** can understand and convert, at the moment, the following input types:
-- PNG, JPG, GIF, TIFF, BMP
+- Folders containing: PNG, JPG, GIF, TIFF or BMP files
-- Folders
 - CBZ, ZIP
 - CBR, RAR *(With `unrar` executable)*
 - CB7, 7Z *(With `7za` executable)*
 - PDF *(Extracting only contained 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)*
+- [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 compiling/running from source:
+### For running from source:
-- Python 2.7 - Included in MacOS and Linux, follow the [official documentation](http://www.python.org/getit/windows/) to install on Windows.
+- Python 3.3
-- PyQt4 - Please refer to official documentation for installing into your system.
+- [PyQt5](http://www.riverbankcomputing.co.uk/software/pyqt/download5)
-- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.2.1+ - For comic optimizations. Please refer to official documentation for installing into your system.
+- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.3.0+
-- **To build OS X release a modified QT is required:** [Patch](https://github.com/ciromattia/kcc/blob/master/other/QT-4.8.5-QListWidget.patch)
+- [psutil](https://pypi.python.org/pypi/psutil)
+- [python-slugify](http://pypi.python.org/pypi/python-slugify)
+
+On Debian based distributions these two commands should install all dependencies:
+```
+sudo apt-get install python3 python3-dev python3-pip python3-pyqt5 libtiff-dev libpng-dev libjpeg-dev p7zip-full unrar
+sudo pip3 install pillow python-slugify psutil
+```
+
+### For freezing code:
+- Windows - [cx_Freeze](https://bitbucket.org/anthony_tuininga/cx_freeze) version 4.3.2 with [this](https://bitbucket.org/anthony_tuininga/cx_freeze/pull-request/29/conversions-to-support-untranslated-wide) patchset.
+- OS X - [py2app](https://bitbucket.org/ronaldoussoren/py2app) HEAD version.
 
 ## USAGE
 
-### Important tips:
-* Use high quality source files. **This little detail have a major impact on the final result.**
-* Read tooltip of _High/Ultra quality_ option. There are many important informations there.
-* When converting images smaller than device resolution remember to enable upscaling.
-* Panel View (auto zooming every part of page) can be disabled directly on Kindle. There is no KCC option to do that.
-* If you're converting color images and the end result is not satisfactory, experiment with gamma correction option (check 1.0 setting first).
-* Check our [wiki](https://github.com/ciromattia/kcc/wiki/Other-devices) for a list of tested Non-Kindle E-Readers.
-* The first image found will be set as the comic's cover.
-* All files/directories will be added to EPUB in alphabetical order.
-* Output MOBI file should be uploaded via USB. Other methods might corrupt it.
-
-### GUI 
-
 Should be pretty self-explanatory. All options have detailed informations in tooltips.
 After completed conversion you should find ready file alongside the original input file (same directory).
 
+Please check [our wiki](https://github.com/ciromattia/kcc/wiki/) for more details.
+
 ### Standalone `comic2ebook.py` usage:
 
 ```
@@ -70,7 +71,7 @@ Usage: comic2ebook.py [options] comic_file|comic_folder
 Options:
   MAIN:
     -p PROFILE, --profile=PROFILE
-                        Device profile (Choose one among K1, K2, K345, KDX, KHD, KF, KFHD, KFHD8, KFHDX, KFHDX8, KFA) [Default=KHD]
+                        Device profile (Choose one among K1, K2, K345, KDX, KHD, KF, KFHD, KFHD8, KFHDX, KFHDX8, KFA, KoMT, KoG, KoA, KoAHD) [Default=KHD]
     -q QUALITY, --quality=QUALITY
                         Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0]
     -m, --manga-style   Manga style (Right-to-left reading and splitting)
@@ -104,7 +105,6 @@ Options:
                         Replace screen height provided by device profile
 
   OTHER:
-    -v, --verbose       Verbose output
     -h, --help          Show this help message and exit
 ```
 
@@ -118,6 +118,7 @@ Options:
     -y HEIGHT, --height=HEIGHT
                         Height of the target device screen
     -i, --in-place      Overwrite source directory
+    -m, --merge         Combine every directory into a single image before splitting
 
   OTHER:
     -d, --debug         Create debug file for every splitted image
@@ -140,37 +141,40 @@ The app relies and includes the following scripts/binaries:
 * [Kindle Paperwhite](http://kcc.vulturis.eu/Samples/Ubunchu!-KPW.mobi)
 * [Kindle](http://kcc.vulturis.eu/Samples/Ubunchu!-K345.mobi)
 * [Kindle DX/DXG](http://kcc.vulturis.eu/Samples/Ubunchu!-KDX.mobi)
-* [Kindle Fire](http://kcc.vulturis.eu/Samples/Ubunchu!-KF.mobi)
 * [Kindle Fire HD](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHD.mobi)
 * [Kindle Fire HD 8.9"](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHD8.mobi)
 * [Kindle Fire HDX](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHDX.mobi)
 * [Kindle Fire HDX 8.9"](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHDX8.mobi)
+* [Kobo Mini/Touch](http://kcc.vulturis.eu/Samples/Ubunchu!-KoMT.cbz)
+* [Kobo Glow](http://kcc.vulturis.eu/Samples/Ubunchu!-KoG.cbz)
+* [Kobo Aura](http://kcc.vulturis.eu/Samples/Ubunchu!-KoA.cbz)
+* [Kobo Aura HD](http://kcc.vulturis.eu/Samples/Ubunchu!-KoAHD.cbz)
 
 ## CHANGELOG
-####1.00
+####1.0
 * Initial version
 
-####1.10
+####1.1
 * Added support for CBZ/CBR files in comic2ebook.py
 
-####1.11
+####1.1.1
-* Added support for CBZ/CBR files in KindleComicConverter
+* Added support for CBZ/CBR files in Kindle Comic Converter
 
-####1.20
+####1.2
 * Comic optimizations! Split pages not target-oriented (landscape with portrait target or portrait with landscape target), add palette and other image optimizations from Mangle. WARNING: PIL is required for all image mangling!
 
-####1.30
+####1.3
 * Fixed an issue in OPF generation for device resolution  
 * Reworked options system (call with -h option to get the inline help)
 
-####1.40
+####1.4
 * Added some options for controlling image optimization  
 * Further optimization (ImageOps, page numbering cut, autocontrast)
 
-####1.41
+####1.4.1
 * Fixed a serious bug on resizing when img ratio was bigger than device one
 
-####1.50
+####1.5
 * Added subfolder support for multiple chapters.
 
 ####2.0
@@ -179,7 +183,7 @@ The app relies and includes the following scripts/binaries:
 ####2.1
 * Added basic error reporting
 
-#### 2.2:
+####2.2:
 * Added (valid!) ePub 2.0 output  
 * Rename .zip files to .cbz to avoid overwriting
 
@@ -284,7 +288,60 @@ The app relies and includes the following scripts/binaries:
 * Improved multiprocessing speed
 * GUI tweaks and minor bug fixes
 
-## COPYRIGHT
+####3.6:
+* Increased quality of Panel View zoom
+* Creation of multipart MOBI output is now faster on machines with 4GB+ RAM
+* Automatic gamma correction now distinguishes color and grayscale images
+* Added ComicRack metadata parser
+* Implemented new method to detect border color in non-webtoon comics
+* Upscaling is now enabled by default for Kindle Fire HD/HDX
+* Windows nad Linux releases now have tray icon
+* Fixed Kindle Fire HDX 7" output
+* Increased target resolution for Kindle DX/DXG CBZ output
 
-Copyright (c) 2012-2013 Ciro Mattia Gonano and Paweł Jastrzębski.  
+####3.6.1:
+* Fixed PNG output
+
+####3.6.2:
+* Fixed previous PNG output fix
+* Fixed Panel View anomalies
+
+####3.7:
+* Added profiles for KOBO devices
+* Improved Panel View support
+* Improved WebToon splitter
+* Improved margin color autodetection
+* Tweaked EPUB output
+* Fixed stretching option
+* GUI tweaks and minor bugfixes
+
+####3.7.1:
+* Hotfixed Kobo profiles
+
+####3.7.2:
+* Fixed problems with HQ mode
+
+####4.0:
+* KCC now use Python 3.3 and Qt 5.2
+* Full UTF-8 awareness
+* CBZ output now support Manga mode
+* Improved Panel View support and margin color detection
+* Added drag&drop support
+* Output directory can be now selected
+* Windows release now have auto-updater
+* Names of chapters on Kindle should be now more user friendly
+* Fixed OSX file association support
+* Many extensive internal changes and tweaks
+
+####4.0.1:
+* Fixed file lock problems that plagued some Windows users
+* Fixed content server failing to start on Windows
+* Improved performance of WebToon splitter
+* Tweaked margin color detection
+
+## KNOWN ISSUES
+Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).
+
+## COPYRIGHT
+Copyright (c) 2012-2014 Ciro Mattia Gonano and Paweł Jastrzębski.
 **KCC** is released under ISC LICENSE; see LICENSE.txt for further details.

kcc-c2e.py

@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+#
+# 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.
+
+__version__ = '4.0.1'
+__license__ = 'ISC'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__docformat__ = 'restructuredtext en'
+
+import sys
+if sys.version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
+
+# Dependiences check
+missing = []
+try:
+    # noinspection PyUnresolvedReferences
+    from psutil import TOTAL_PHYMEM, Popen
+except ImportError:
+    missing.append('psutil')
+try:
+    # noinspection PyUnresolvedReferences
+    from slugify import slugify
+except ImportError:
+    missing.append('python-slugify')
+try:
+    # noinspection PyUnresolvedReferences
+    from PIL import Image, ImageOps, ImageStat, ImageChops
+    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
+        missing.append('Pillow 2.3.0+')
+except ImportError:
+    missing.append('Pillow 2.3.0+')
+if len(missing) > 0:
+    try:
+        # noinspection PyUnresolvedReferences
+        import tkinter
+        # noinspection PyUnresolvedReferences
+        import tkinter.messagebox
+        importRoot = tkinter.Tk()
+        importRoot.withdraw()
+        tkinter.messagebox.showerror('KCC - Error', 'ERROR: ' + ', '.join(missing) + ' is not installed!')
+    except ImportError:
+        print('ERROR: ' + ', '.join(missing) + ' is not installed!')
+    exit(1)
+
+from multiprocessing import freeze_support
+from kcc.comic2ebook import main, Copyright
+
+if __name__ == "__main__":
+    freeze_support()
+    Copyright()
+    main(sys.argv[1:])
+    sys.exit(0)

kcc-c2p.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+#
+# 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 sys
+if sys.version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
+
+__version__ = '4.0.1'
+__license__ = 'ISC'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__docformat__ = 'restructuredtext en'
+
+# Dependiences check
+missing = []
+try:
+    # noinspection PyUnresolvedReferences
+    from PIL import Image, ImageOps, ImageStat, ImageChops
+    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
+        missing.append('Pillow 2.3.0+')
+except ImportError:
+    missing.append('Pillow 2.3.0+')
+if len(missing) > 0:
+    try:
+        # noinspection PyUnresolvedReferences
+        import tkinter
+        # noinspection PyUnresolvedReferences
+        import tkinter.messagebox
+        importRoot = tkinter.Tk()
+        importRoot.withdraw()
+        tkinter.messagebox.showerror('KCC - Error', 'ERROR: ' + ', '.join(missing) + ' is not installed!')
+    except ImportError:
+        print('ERROR: ' + ', '.join(missing) + ' is not installed!')
+    exit(1)
+
+from multiprocessing import freeze_support
+from kcc.comic2panel import main, Copyright
+
+if __name__ == "__main__":
+    freeze_support()
+    Copyright()
+    main(sys.argv[1:])
+    sys.exit(0)

kcc.iss

@@ -1,5 +1,5 @@
 #define MyAppName "Kindle Comic Converter"
-#define MyAppVersion "3.5"
+#define MyAppVersion "4.0.1"
 #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
 #define MyAppURL "http://kcc.vulturis.eu/"
 #define MyAppExeName "KCC.exe"
@@ -12,6 +12,7 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
+AppCopyright=Copyright (C) 2012-2014 Ciro Mattia Gonano and Paweł Jastrzębski
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
@@ -28,6 +29,7 @@ UninstallDisplayName={#MyAppName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
 ChangesAssociations=True
 InfoAfterFile=other\InstallWarning.rtf
+SignTool=SignTool /d $q{#MyAppName}$q /du $q{#MyAppURL}$q $f
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -40,53 +42,19 @@ Name: "CB7association"; Description: "CB7"; GroupDescription: "File associations
 
 [Files]
 ; x64 files
-Source: "build\exe.win-amd64-2.7\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "build\exe.win-amd64-3.3\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "build\exe.win-amd64-3.3\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "build\exe.win-amd64-3.3\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\_multiprocessing.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "build\exe.win-amd64-3.3\*.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\_socket.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "build\exe.win-amd64-3.3\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "other\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\bz2.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\LIBEAY32.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\library.zip"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\PIL._imaging.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\PIL._imagingft.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\pyexpat.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\PyQt4.QtCore.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\PyQt4.QtGui.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\PyQt4.QtNetwork.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\python27.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\select.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\sip.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\SSLEAY32.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\unicodedata.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
 ; x86 files
-Source: "build\exe.win32-2.7\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion solidbreak; Check: not Is64BitInstallMode
+Source: "build\exe.win32-3.3\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "build\exe.win32-3.3\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "build\exe.win32-3.3\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\_multiprocessing.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "build\exe.win32-3.3\*.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\_socket.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "build\exe.win32-3.3\*.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "other\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\bz2.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\LIBEAY32.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\library.zip"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\PIL._imaging.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\PIL._imagingft.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\pyexpat.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\PyQt4.QtCore.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\PyQt4.QtGui.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\PyQt4.QtNetwork.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\python27.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\select.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\sip.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\SSLEAY32.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\unicodedata.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
 ; Common files
 Source: "LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion solidbreak
 Source: "other\Additional-LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
@@ -99,7 +67,9 @@ Name: "{group}\Readme"; Filename: "https://github.com/ciromattia/kcc#kcc"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
+Filename: "{tmp}\vcredist_x64.exe"; Parameters: "/passive /Q:a /c:""msiexec /qb /i vcredist.msi"" "; StatusMsg: "Installing Microsoft Visual C++ 2010 Redistributable Package..."; Check: Is64BitInstallMode
+Filename: "{tmp}\vcredist_x86.exe"; Parameters: "/passive /Q:a /c:""msiexec /qb /i vcredist.msi"" "; StatusMsg: "Installing Microsoft Visual C++ 2010 Redistributable Package..."; Check: not Is64BitInstallMode
 
 [Messages]
 WelcomeLabel1=Welcome to the KCC Setup Wizard

kcc.py

@@ -1,8 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2012-2013 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,48 +18,84 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '3.5'
+__version__ = '4.0.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
 
 import sys
-import os
+if sys.version_info[0] != 3:
-try:
+    print('ERROR: This is Python 3 script!')
-    #noinspection PyUnresolvedReferences
-    from PyQt4 import QtCore, QtGui, QtNetwork
-except ImportError:
-    print "ERROR: PyQT4 is not installed!"
     exit(1)
-from kcc import KCC_gui
+
+# Dependiences check
+missing = []
+try:
+    # noinspection PyUnresolvedReferences
+    from PyQt5 import QtCore, QtGui, QtNetwork, QtWidgets
+except ImportError:
+    missing.append('PyQt5')
+try:
+    # noinspection PyUnresolvedReferences
+    from psutil import TOTAL_PHYMEM, Popen
+except ImportError:
+    missing.append('psutil')
+try:
+    # noinspection PyUnresolvedReferences
+    from slugify import slugify
+except ImportError:
+    missing.append('python-slugify')
+try:
+    # noinspection PyUnresolvedReferences
+    from PIL import Image, ImageOps, ImageStat, ImageChops
+    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
+        missing.append('Pillow 2.3.0+')
+except ImportError:
+    missing.append('Pillow 2.3.0+')
+if len(missing) > 0:
+    try:
+        # noinspection PyUnresolvedReferences
+        import tkinter
+        # noinspection PyUnresolvedReferences
+        import tkinter.messagebox
+        importRoot = tkinter.Tk()
+        importRoot.withdraw()
+        tkinter.messagebox.showerror('KCC - Error', 'ERROR: ' + ', '.join(missing) + ' is not installed!')
+    except ImportError:
+        print('ERROR: ' + ', '.join(missing) + ' is not installed!')
+    exit(1)
+
+import os
 from multiprocessing import freeze_support
+from kcc import KCC_gui
+
+# OS specific PATH variable workarounds
 if sys.platform.startswith('darwin'):
-    # Workaround Finder-launched app PATH evaluation
+    if 'RESOURCEPATH' in os.environ:
-    os.environ['PATH'] = '/usr/local/bin:' + os.environ['PATH']
+        os.environ['PATH'] = os.environ['RESOURCEPATH'] + ':' + os.environ['PATH']
-    from kcc import KCC_ui_osx as KCC_ui
+    else:
-elif sys.platform.startswith('linux'):
+        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/:' + os.environ['PATH']
-    from kcc import KCC_ui_linux as KCC_ui
+elif sys.platform.startswith('win'):
-else:
-    # Workaround for Windows file association mechanism
     if getattr(sys, 'frozen', False):
         os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
     else:
+        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/;' + os.environ['PATH']
         os.chdir(os.path.dirname(os.path.abspath(__file__)))
-    from kcc import KCC_ui
 
 
 # Implementing detection of already running KCC instance and forwarding argv to it
-class QApplicationMessaging(QtGui.QApplication):
+class QApplicationMessaging(QtWidgets.QApplication):
+    messageFromOtherInstance = QtCore.pyqtSignal(bytes)
+
     def __init__(self, argv):
-        QtGui.QApplication.__init__(self, argv)
+        QtWidgets.QApplication.__init__(self, argv)
         self._memory = QtCore.QSharedMemory(self)
         self._memory.setKey('KCC')
         if self._memory.attach():
             self._running = True
         else:
             self._running = False
-            if not self._memory.create(1):
+            self._memory.create(1)
-                raise RuntimeError(self._memory.errorString().toLocal8Bit().data())
         self._key = 'KCC'
         self._timeout = 1000
         self._server = QtNetwork.QLocalServer(self)
@@ -67,13 +103,26 @@ class QApplicationMessaging(QtGui.QApplication):
             self._server.newConnection.connect(self.handleMessage)
             self._server.listen(self._key)
 
+    def __del__(self):
+        if self._memory.isAttached():
+            self._memory.detach()
+            self._server.close()
+
+    def event(self, e):
+        if e.type() == QtCore.QEvent.FileOpen:
+            # noinspection PyArgumentList
+            self.messageFromOtherInstance.emit(bytes(e.file(), 'UTF-8'))
+            return True
+        else:
+            return QtWidgets.QApplication.event(self, e)
+
     def isRunning(self):
         return self._running
 
     def handleMessage(self):
         socket = self._server.nextPendingConnection()
         if socket.waitForReadyRead(self._timeout):
-            self.emit(QtCore.SIGNAL('messageFromOtherInstance'), socket.readAll().data().decode('utf8'))
+            self.messageFromOtherInstance.emit(socket.readAll().data())
 
     def sendMessage(self, message):
         if self.isRunning():
@@ -81,33 +130,39 @@ class QApplicationMessaging(QtGui.QApplication):
             socket.connectToServer(self._key, QtCore.QIODevice.WriteOnly)
             if not socket.waitForConnected(self._timeout):
                 return False
-            socket.write(message.encode('utf8'))
+            # noinspection PyArgumentList
+            socket.write(bytes(message, 'UTF-8'))
             if not socket.waitForBytesWritten(self._timeout):
                 return False
             socket.disconnectFromServer()
             return True
         return False
 
-freeze_support()
+
-APP = QApplicationMessaging(sys.argv)
+# Adding signals to QMainWindow
-if APP.isRunning():
+class QMainWindowKCC(QtWidgets.QMainWindow):
+    progressBarTick = QtCore.pyqtSignal(str)
+    modeConvert = QtCore.pyqtSignal(int)
+    addMessage = QtCore.pyqtSignal(str, str, bool)
+    addTrayMessage = QtCore.pyqtSignal(str, str)
+    showDialog = QtCore.pyqtSignal(str, str)
+    hideProgressBar = QtCore.pyqtSignal()
+    forceShutdown = QtCore.pyqtSignal()
+    dialogAnswer = QtCore.pyqtSignal(int)
+
+
+if __name__ == "__main__":
+    freeze_support()
+    KCCAplication = QApplicationMessaging(sys.argv)
+    if KCCAplication.isRunning():
+        if len(sys.argv) > 1:
+            KCCAplication.sendMessage(sys.argv[1])
+            sys.exit(0)
+        else:
+            KCCAplication.sendMessage('ARISE')
+            sys.exit(0)
+    KCCWindow = QMainWindowKCC()
+    KCCUI = KCC_gui.KCCGUI(KCCAplication, KCCWindow)
     if len(sys.argv) > 1:
-        APP.sendMessage(sys.argv[1].decode(sys.getfilesystemencoding()))
+        KCCUI.handleMessage(sys.argv[1])
-        sys.exit(0)
+    sys.exit(KCCAplication.exec_())
-    else:
-        messageBox = QtGui.QMessageBox()
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(':/Icon/icons/comic2ebook.png'), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        messageBox.setWindowIcon(icon)
-        QtGui.QMessageBox.critical(messageBox, 'KCC - Error', 'KCC is already running!', QtGui.QMessageBox.Ok)
-        sys.exit(1)
-KCC = QtGui.QMainWindow()
-UI = KCC_ui.Ui_KCC()
-UI.setupUi(KCC)
-GUI = KCC_gui.Ui_KCC(UI, KCC, APP)
-KCC.setWindowTitle("Kindle Comic Converter " + __version__)
-KCC.show()
-KCC.raise_()
-if len(sys.argv) > 1:
-    GUI.handleMessage(sys.argv[1].decode(sys.getfilesystemencoding()))
-sys.exit(APP.exec_())

kcc/KCC_ui.py

@@ -2,94 +2,79 @@
 
 # Form implementation generated from reading ui file 'KCC.ui'
 #
-# Created: Sat Oct 12 11:28:00 2013
+# Created: Sat Jan 25 17:36:53 2014
-#      by: PyQt4 UI code generator 4.10.3
+#      by: PyQt5 UI code generator 5.2
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt4 import QtCore, QtGui
+from PyQt5 import QtCore, QtGui, QtWidgets
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
 
 class Ui_KCC(object):
     def setupUi(self, KCC):
-        KCC.setObjectName(_fromUtf8("KCC"))
+        KCC.setObjectName("KCC")
-        KCC.resize(420, 380)
+        KCC.resize(420, 397)
-        KCC.setMinimumSize(QtCore.QSize(420, 380))
+        KCC.setMinimumSize(QtCore.QSize(420, 397))
-        KCC.setMaximumSize(QtCore.QSize(420, 380))
+        KCC.setMaximumSize(QtCore.QSize(420, 397))
         font = QtGui.QFont()
         font.setPointSize(9)
         KCC.setFont(font)
-        KCC.setFocusPolicy(QtCore.Qt.NoFocus)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/Icon/icons/comic2ebook.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         KCC.setWindowIcon(icon)
         KCC.setLocale(QtCore.QLocale(QtCore.QLocale.C, QtCore.QLocale.AnyCountry))
-        self.Form = QtGui.QWidget(KCC)
+        self.Form = QtWidgets.QWidget(KCC)
-        self.Form.setObjectName(_fromUtf8("Form"))
+        self.Form.setObjectName("Form")
-        self.OptionsAdvanced = QtGui.QFrame(self.Form)
+        self.OptionsAdvanced = QtWidgets.QFrame(self.Form)
         self.OptionsAdvanced.setEnabled(True)
         self.OptionsAdvanced.setGeometry(QtCore.QRect(10, 254, 421, 61))
         font = QtGui.QFont()
         font.setPointSize(9)
         self.OptionsAdvanced.setFont(font)
-        self.OptionsAdvanced.setObjectName(_fromUtf8("OptionsAdvanced"))
+        self.OptionsAdvanced.setObjectName("OptionsAdvanced")
-        self.gridLayout = QtGui.QGridLayout(self.OptionsAdvanced)
+        self.gridLayout = QtWidgets.QGridLayout(self.OptionsAdvanced)
         self.gridLayout.setContentsMargins(9, -1, -1, -1)
-        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.gridLayout.setObjectName("gridLayout")
-        self.ProcessingBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.ProcessingBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         self.ProcessingBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.ProcessingBox.setObjectName(_fromUtf8("ProcessingBox"))
+        self.ProcessingBox.setObjectName("ProcessingBox")
         self.gridLayout.addWidget(self.ProcessingBox, 1, 0, 1, 1)
-        self.UpscaleBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.UpscaleBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         self.UpscaleBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.UpscaleBox.setTristate(True)
-        self.UpscaleBox.setObjectName(_fromUtf8("UpscaleBox"))
+        self.UpscaleBox.setObjectName("UpscaleBox")
         self.gridLayout.addWidget(self.UpscaleBox, 1, 1, 1, 1)
-        self.WebtoonBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.WebtoonBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         self.WebtoonBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.WebtoonBox.setObjectName(_fromUtf8("WebtoonBox"))
+        self.WebtoonBox.setObjectName("WebtoonBox")
         self.gridLayout.addWidget(self.WebtoonBox, 3, 1, 1, 1)
-        self.NoDitheringBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.NoDitheringBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         self.NoDitheringBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.NoDitheringBox.setObjectName(_fromUtf8("NoDitheringBox"))
+        self.NoDitheringBox.setObjectName("NoDitheringBox")
         self.gridLayout.addWidget(self.NoDitheringBox, 3, 2, 1, 1)
-        self.BorderBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.BorderBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         self.BorderBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.BorderBox.setTristate(True)
-        self.BorderBox.setObjectName(_fromUtf8("BorderBox"))
+        self.BorderBox.setObjectName("BorderBox")
         self.gridLayout.addWidget(self.BorderBox, 3, 0, 1, 1)
-        self.NoRotateBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.NoRotateBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         self.NoRotateBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.NoRotateBox.setObjectName(_fromUtf8("NoRotateBox"))
+        self.NoRotateBox.setObjectName("NoRotateBox")
         self.gridLayout.addWidget(self.NoRotateBox, 1, 2, 1, 1)
-        self.DeviceBox = QtGui.QComboBox(self.Form)
+        self.DeviceBox = QtWidgets.QComboBox(self.Form)
         self.DeviceBox.setGeometry(QtCore.QRect(10, 200, 141, 31))
         font = QtGui.QFont()
         font.setPointSize(8)
         self.DeviceBox.setFont(font)
         self.DeviceBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.DeviceBox.setObjectName(_fromUtf8("DeviceBox"))
+        self.DeviceBox.setObjectName("DeviceBox")
-        self.FormatBox = QtGui.QComboBox(self.Form)
+        self.FormatBox = QtWidgets.QComboBox(self.Form)
         self.FormatBox.setGeometry(QtCore.QRect(260, 200, 151, 31))
         font = QtGui.QFont()
         font.setPointSize(8)
         self.FormatBox.setFont(font)
         self.FormatBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.FormatBox.setObjectName(_fromUtf8("FormatBox"))
+        self.FormatBox.setObjectName("FormatBox")
-        self.ConvertButton = QtGui.QPushButton(self.Form)
+        self.ConvertButton = QtWidgets.QPushButton(self.Form)
         self.ConvertButton.setGeometry(QtCore.QRect(160, 200, 91, 32))
         font = QtGui.QFont()
         font.setPointSize(9)
@@ -98,99 +83,99 @@ class Ui_KCC(object):
         self.ConvertButton.setFont(font)
         self.ConvertButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/convert.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.ConvertButton.setIcon(icon1)
-        self.ConvertButton.setObjectName(_fromUtf8("ConvertButton"))
+        self.ConvertButton.setObjectName("ConvertButton")
-        self.DirectoryButton = QtGui.QPushButton(self.Form)
+        self.DirectoryButton = QtWidgets.QPushButton(self.Form)
         self.DirectoryButton.setGeometry(QtCore.QRect(10, 160, 141, 32))
         font = QtGui.QFont()
         font.setPointSize(8)
         self.DirectoryButton.setFont(font)
         self.DirectoryButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/folder_new.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon2.addPixmap(QtGui.QPixmap(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.DirectoryButton.setIcon(icon2)
-        self.DirectoryButton.setObjectName(_fromUtf8("DirectoryButton"))
+        self.DirectoryButton.setObjectName("DirectoryButton")
-        self.FileButton = QtGui.QPushButton(self.Form)
+        self.FileButton = QtWidgets.QPushButton(self.Form)
         self.FileButton.setGeometry(QtCore.QRect(260, 160, 151, 32))
         font = QtGui.QFont()
         font.setPointSize(8)
         self.FileButton.setFont(font)
         self.FileButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/document_new.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon3.addPixmap(QtGui.QPixmap(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.FileButton.setIcon(icon3)
-        self.FileButton.setObjectName(_fromUtf8("FileButton"))
+        self.FileButton.setObjectName("FileButton")
-        self.ClearButton = QtGui.QPushButton(self.Form)
+        self.ClearButton = QtWidgets.QPushButton(self.Form)
         self.ClearButton.setGeometry(QtCore.QRect(160, 160, 91, 32))
         font = QtGui.QFont()
         font.setPointSize(8)
         self.ClearButton.setFont(font)
         self.ClearButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/clear.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.ClearButton.setIcon(icon4)
-        self.ClearButton.setObjectName(_fromUtf8("ClearButton"))
+        self.ClearButton.setObjectName("ClearButton")
-        self.OptionsBasic = QtGui.QFrame(self.Form)
+        self.OptionsBasic = QtWidgets.QFrame(self.Form)
         self.OptionsBasic.setGeometry(QtCore.QRect(10, 230, 421, 41))
         font = QtGui.QFont()
         font.setPointSize(9)
         self.OptionsBasic.setFont(font)
-        self.OptionsBasic.setObjectName(_fromUtf8("OptionsBasic"))
+        self.OptionsBasic.setObjectName("OptionsBasic")
-        self.MangaBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.MangaBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.MangaBox.setGeometry(QtCore.QRect(9, 10, 130, 18))
         self.MangaBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.MangaBox.setObjectName(_fromUtf8("MangaBox"))
+        self.MangaBox.setObjectName("MangaBox")
-        self.QualityBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.QualityBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.QualityBox.setGeometry(QtCore.QRect(282, 10, 130, 18))
         self.QualityBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.QualityBox.setTristate(True)
-        self.QualityBox.setObjectName(_fromUtf8("QualityBox"))
+        self.QualityBox.setObjectName("QualityBox")
-        self.RotateBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.RotateBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.RotateBox.setGeometry(QtCore.QRect(145, 10, 130, 18))
         self.RotateBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.RotateBox.setObjectName(_fromUtf8("RotateBox"))
+        self.RotateBox.setObjectName("RotateBox")
-        self.JobList = QtGui.QListWidget(self.Form)
+        self.JobList = QtWidgets.QListWidget(self.Form)
         self.JobList.setGeometry(QtCore.QRect(10, 50, 401, 101))
         self.JobList.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.JobList.setStyleSheet(_fromUtf8("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.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.setProperty("showDropIndicator", False)
-        self.JobList.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
+        self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
-        self.JobList.setVerticalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
+        self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.JobList.setHorizontalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
+        self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.JobList.setObjectName(_fromUtf8("JobList"))
+        self.JobList.setObjectName("JobList")
-        self.BasicModeButton = QtGui.QPushButton(self.Form)
+        self.BasicModeButton = QtWidgets.QPushButton(self.Form)
         self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 195, 32))
         font = QtGui.QFont()
         font.setPointSize(9)
         self.BasicModeButton.setFont(font)
         self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.BasicModeButton.setObjectName(_fromUtf8("BasicModeButton"))
+        self.BasicModeButton.setObjectName("BasicModeButton")
-        self.AdvModeButton = QtGui.QPushButton(self.Form)
+        self.AdvModeButton = QtWidgets.QPushButton(self.Form)
         self.AdvModeButton.setGeometry(QtCore.QRect(217, 10, 195, 32))
         font = QtGui.QFont()
         font.setPointSize(9)
         self.AdvModeButton.setFont(font)
         self.AdvModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.AdvModeButton.setObjectName(_fromUtf8("AdvModeButton"))
+        self.AdvModeButton.setObjectName("AdvModeButton")
-        self.OptionsAdvancedGamma = QtGui.QFrame(self.Form)
+        self.OptionsAdvancedGamma = QtWidgets.QFrame(self.Form)
         self.OptionsAdvancedGamma.setEnabled(True)
         self.OptionsAdvancedGamma.setGeometry(QtCore.QRect(10, 305, 401, 41))
         font = QtGui.QFont()
         font.setPointSize(9)
         self.OptionsAdvancedGamma.setFont(font)
-        self.OptionsAdvancedGamma.setObjectName(_fromUtf8("OptionsAdvancedGamma"))
+        self.OptionsAdvancedGamma.setObjectName("OptionsAdvancedGamma")
-        self.GammaLabel = QtGui.QLabel(self.OptionsAdvancedGamma)
+        self.GammaLabel = QtWidgets.QLabel(self.OptionsAdvancedGamma)
         self.GammaLabel.setGeometry(QtCore.QRect(15, 0, 100, 40))
-        self.GammaLabel.setObjectName(_fromUtf8("GammaLabel"))
+        self.GammaLabel.setObjectName("GammaLabel")
-        self.GammaSlider = QtGui.QSlider(self.OptionsAdvancedGamma)
+        self.GammaSlider = QtWidgets.QSlider(self.OptionsAdvancedGamma)
         self.GammaSlider.setGeometry(QtCore.QRect(110, 10, 270, 22))
         self.GammaSlider.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.GammaSlider.setMaximum(500)
         self.GammaSlider.setSingleStep(5)
         self.GammaSlider.setOrientation(QtCore.Qt.Horizontal)
-        self.GammaSlider.setObjectName(_fromUtf8("GammaSlider"))
+        self.GammaSlider.setObjectName("GammaSlider")
-        self.ProgressBar = QtGui.QProgressBar(self.Form)
+        self.ProgressBar = QtWidgets.QProgressBar(self.Form)
         self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 31))
         font = QtGui.QFont()
         font.setPointSize(10)
@@ -199,28 +184,28 @@ class Ui_KCC(object):
         self.ProgressBar.setFont(font)
         self.ProgressBar.setProperty("value", 0)
         self.ProgressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
-        self.ProgressBar.setFormat(_fromUtf8(""))
+        self.ProgressBar.setFormat("")
-        self.ProgressBar.setObjectName(_fromUtf8("ProgressBar"))
+        self.ProgressBar.setObjectName("ProgressBar")
-        self.OptionsExpert = QtGui.QFrame(self.Form)
+        self.OptionsExpert = QtWidgets.QFrame(self.Form)
         self.OptionsExpert.setGeometry(QtCore.QRect(10, 337, 421, 41))
         font = QtGui.QFont()
         font.setPointSize(9)
         self.OptionsExpert.setFont(font)
-        self.OptionsExpert.setObjectName(_fromUtf8("OptionsExpert"))
+        self.OptionsExpert.setObjectName("OptionsExpert")
-        self.ColorBox = QtGui.QCheckBox(self.OptionsExpert)
+        self.ColorBox = QtWidgets.QCheckBox(self.OptionsExpert)
         self.ColorBox.setGeometry(QtCore.QRect(9, 11, 130, 18))
         self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.ColorBox.setObjectName(_fromUtf8("ColorBox"))
+        self.ColorBox.setObjectName("ColorBox")
-        self.OptionsExpertInternal = QtGui.QFrame(self.OptionsExpert)
+        self.OptionsExpertInternal = QtWidgets.QFrame(self.OptionsExpert)
         self.OptionsExpertInternal.setGeometry(QtCore.QRect(100, 0, 295, 40))
-        self.OptionsExpertInternal.setObjectName(_fromUtf8("OptionsExpertInternal"))
+        self.OptionsExpertInternal.setObjectName("OptionsExpertInternal")
-        self.gridLayout_2 = QtGui.QGridLayout(self.OptionsExpertInternal)
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.OptionsExpertInternal)
-        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.wLabel = QtGui.QLabel(self.OptionsExpertInternal)
+        self.wLabel = QtWidgets.QLabel(self.OptionsExpertInternal)
-        self.wLabel.setObjectName(_fromUtf8("wLabel"))
+        self.wLabel.setObjectName("wLabel")
         self.gridLayout_2.addWidget(self.wLabel, 0, 0, 1, 1)
-        self.customWidth = QtGui.QLineEdit(self.OptionsExpertInternal)
+        self.customWidth = QtWidgets.QLineEdit(self.OptionsExpertInternal)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.customWidth.sizePolicy().hasHeightForWidth())
@@ -229,13 +214,13 @@ class Ui_KCC(object):
         self.customWidth.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.customWidth.setAcceptDrops(False)
         self.customWidth.setMaxLength(4)
-        self.customWidth.setObjectName(_fromUtf8("customWidth"))
+        self.customWidth.setObjectName("customWidth")
         self.gridLayout_2.addWidget(self.customWidth, 0, 1, 1, 1)
-        self.hLabel = QtGui.QLabel(self.OptionsExpertInternal)
+        self.hLabel = QtWidgets.QLabel(self.OptionsExpertInternal)
-        self.hLabel.setObjectName(_fromUtf8("hLabel"))
+        self.hLabel.setObjectName("hLabel")
         self.gridLayout_2.addWidget(self.hLabel, 0, 2, 1, 1)
-        self.customHeight = QtGui.QLineEdit(self.OptionsExpertInternal)
+        self.customHeight = QtWidgets.QLineEdit(self.OptionsExpertInternal)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.customHeight.sizePolicy().hasHeightForWidth())
@@ -244,19 +229,27 @@ class Ui_KCC(object):
         self.customHeight.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.customHeight.setAcceptDrops(False)
         self.customHeight.setMaxLength(4)
-        self.customHeight.setObjectName(_fromUtf8("customHeight"))
+        self.customHeight.setObjectName("customHeight")
         self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
         KCC.setCentralWidget(self.Form)
-        self.ActionBasic = QtGui.QAction(KCC)
+        self.statusBar = QtWidgets.QStatusBar(KCC)
+        font = QtGui.QFont()
+        font.setFamily("MS Shell Dlg 2")
+        font.setPointSize(8)
+        self.statusBar.setFont(font)
+        self.statusBar.setSizeGripEnabled(False)
+        self.statusBar.setObjectName("statusBar")
+        KCC.setStatusBar(self.statusBar)
+        self.ActionBasic = QtWidgets.QAction(KCC)
         self.ActionBasic.setCheckable(True)
         self.ActionBasic.setChecked(False)
         font = QtGui.QFont()
         font.setPointSize(9)
         self.ActionBasic.setFont(font)
-        self.ActionBasic.setObjectName(_fromUtf8("ActionBasic"))
+        self.ActionBasic.setObjectName("ActionBasic")
-        self.ActionAdvanced = QtGui.QAction(KCC)
+        self.ActionAdvanced = QtWidgets.QAction(KCC)
         self.ActionAdvanced.setCheckable(True)
-        self.ActionAdvanced.setObjectName(_fromUtf8("ActionAdvanced"))
+        self.ActionAdvanced.setObjectName("ActionAdvanced")
 
         self.retranslateUi(KCC)
         QtCore.QMetaObject.connectSlotsByName(KCC)
@@ -265,53 +258,47 @@ class Ui_KCC(object):
         KCC.setTabOrder(self.ConvertButton, self.ClearButton)
 
     def retranslateUi(self, KCC):
-        KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter", None))
+        _translate = QtCore.QCoreApplication.translate
-        self.ProcessingBox.setToolTip(_translate("KCC", "Disable image optimizations.", None))
+        KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter"))
-        self.ProcessingBox.setText(_translate("KCC", "No optimisation", None))
+        self.ProcessingBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable image optimizations.<br/>Input images must be already resized.</p></body></html>"))
-        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>", None))
+        self.ProcessingBox.setText(_translate("KCC", "No optimisation"))
-        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale", None))
+        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>"))
-        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html>", None))
+        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale"))
-        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode", None))
+        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html>"))
-        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>", None))
+        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
-        self.NoDitheringBox.setText(_translate("KCC", "PNG output", None))
+        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>"))
-        self.BorderBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>", None))
+        self.NoDitheringBox.setText(_translate("KCC", "PNG output"))
-        self.BorderBox.setText(_translate("KCC", "W/B margins", None))
+        self.BorderBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>"))
-        self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p>Disable splitting and rotation.</p></body></html>", None))
+        self.BorderBox.setText(_translate("KCC", "W/B margins"))
-        self.NoRotateBox.setText(_translate("KCC", "No split/rotate", None))
+        self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting and rotation.</p></body></html>"))
-        self.DeviceBox.setToolTip(_translate("KCC", "Target device.", None))
+        self.NoRotateBox.setText(_translate("KCC", "No split/rotate"))
-        self.FormatBox.setToolTip(_translate("KCC", "Output format.", None))
+        self.DeviceBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>"))
-        self.ConvertButton.setText(_translate("KCC", "Convert", None))
+        self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>"))
-        self.DirectoryButton.setText(_translate("KCC", "Add directory", None))
+        self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p  style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>"))
-        self.FileButton.setText(_translate("KCC", "Add file", None))
+        self.ConvertButton.setText(_translate("KCC", "Convert"))
-        self.ClearButton.setText(_translate("KCC", "Clear list", None))
+        self.DirectoryButton.setText(_translate("KCC", "Add directory"))
-        self.MangaBox.setToolTip(_translate("KCC", "Enable right-to-left reading.", None))
+        self.FileButton.setText(_translate("KCC", "Add file"))
-        self.MangaBox.setText(_translate("KCC", "Manga mode", None))
+        self.ClearButton.setText(_translate("KCC", "Clear list"))
-        self.QualityBox.setToolTip(_translate("KCC", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+        self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>"))
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+        self.MangaBox.setText(_translate("KCC", "Manga mode"))
-"p, li { white-space: pre-wrap; }\n"
+        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span><span style=\" font-style:italic;\">Use it when Panel View support is not needed.</span><span style=\" font-weight:600; text-decoration: underline;\"><br/></span>- Maximum quality when zoom is not enabled.<br/>- Poor quality when zoom is enabled.<br/>- Lowest file size.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span><span style=\" font-style:italic;\">Not zoomed images </span><span style=\" font-weight:600; font-style:italic;\">might </span><span style=\" font-style:italic;\">be blurry.</span><span style=\" font-weight:600; text-decoration: underline;\"><br/></span>- High quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span><span style=\" font-style:italic;\">Maximum possible quality.</span><span style=\" font-weight:600; text-decoration: underline;\"><br/></span>- Maximum quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.<br/>- Very high file size.</p></body></html>"))
-"</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
+        self.QualityBox.setText(_translate("KCC", "High/Ultra quality"))
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br /></span><span style=\" font-style:italic;\">Use it when Panel View support is not needed.</span><span style=\" font-weight:600; text-decoration: underline;\"><br /></span>- Maximum quality when zoom is not enabled.<br />- Poor quality when zoom is enabled.<br />- Lowest file size.</p>\n"
+        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>"))
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br /></span><span style=\" font-style:italic;\">Not zoomed image </span><span style=\" font-weight:600; font-style:italic;\">might </span><span style=\" font-style:italic;\">be </span><span style=\" font-style:italic;\">a little blurry.</span><span style=\" font-weight:600; text-decoration: underline;\"><br /></span>- Medium/High quality when zoom is not enabled.<br />- Maximum quality when zoom is enabled.</p>\n"
+        self.RotateBox.setText(_translate("KCC", "Horizontal mode"))
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br /></span><span style=\" font-style:italic;\">Maximum possible quality.</span><span style=\" font-weight:600; text-decoration: underline;\"><br /></span>- Maximum quality when zoom is not enabled.<br />- Maximum quality when zoom is enabled.<br />- Very high file size.</p></body></html>", None))
+        self.BasicModeButton.setText(_translate("KCC", "Basic"))
-        self.QualityBox.setText(_translate("KCC", "High/Ultra quality", None))
+        self.AdvModeButton.setText(_translate("KCC", "Advanced"))
-        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p>Disable page spliting.<br/>They will be rotated instead.</p></body></html>", None))
+        self.GammaLabel.setText(_translate("KCC", "Gamma: Auto"))
-        self.RotateBox.setText(_translate("KCC", "Horizontal mode", None))
+        self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Don\'t convert images to grayscale.</p></body></html>"))
-        self.BasicModeButton.setText(_translate("KCC", "Basic", None))
+        self.ColorBox.setText(_translate("KCC", "Color mode"))
-        self.AdvModeButton.setText(_translate("KCC", "Advanced", None))
+        self.wLabel.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
-        self.GammaLabel.setToolTip(_translate("KCC", "When converting color images setting this option to 1.0 MIGHT improve readability.", None))
+        self.wLabel.setText(_translate("KCC", "Custom width: "))
-        self.GammaLabel.setText(_translate("KCC", "Gamma: Auto", None))
+        self.customWidth.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
-        self.GammaSlider.setToolTip(_translate("KCC", "<html><head/><body><p>When converting color images setting this option to 1.0 <span style=\" font-weight:600;\">might</span> improve readability.</p></body></html>", None))
+        self.customWidth.setInputMask(_translate("KCC", "0000"))
-        self.ColorBox.setToolTip(_translate("KCC", "Do not convert images to grayscale.", None))
+        self.hLabel.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
-        self.ColorBox.setText(_translate("KCC", "Color mode", None))
+        self.hLabel.setText(_translate("KCC", "Custom height: "))
-        self.wLabel.setToolTip(_translate("KCC", "Resolution of target device.", None))
+        self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
-        self.wLabel.setText(_translate("KCC", "Custom width: ", None))
+        self.customHeight.setInputMask(_translate("KCC", "0000"))
-        self.customWidth.setToolTip(_translate("KCC", "Resolution of target device.", None))
+        self.ActionBasic.setText(_translate("KCC", "Basic"))
-        self.customWidth.setInputMask(_translate("KCC", "0000; ", None))
+        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
-        self.hLabel.setToolTip(_translate("KCC", "Resolution of target device.", None))
-        self.hLabel.setText(_translate("KCC", "Custom height: ", None))
-        self.customHeight.setToolTip(_translate("KCC", "Resolution of target device.", None))
-        self.customHeight.setInputMask(_translate("KCC", "0000; ", None))
-        self.ActionBasic.setText(_translate("KCC", "Basic", None))
-        self.ActionAdvanced.setText(_translate("KCC", "Advanced", None))
 
-import KCC_rc
+from . import KCC_rc

kcc/KCC_ui_linux.py

@@ -2,330 +2,323 @@
 
 # Form implementation generated from reading ui file 'KCC-Linux.ui'
 #
-# Created: Sat Oct 12 11:28:11 2013
+# Created: Sat Jan 25 17:37:02 2014
-#      by: PyQt4 UI code generator 4.10.3
+#      by: PyQt5 UI code generator 5.2
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt4 import QtCore, QtGui
+from PyQt5 import QtCore, QtGui, QtWidgets
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
 
 class Ui_KCC(object):
     def setupUi(self, KCC):
-        KCC.setObjectName(_fromUtf8("KCC"))
+        KCC.setObjectName("KCC")
-        KCC.resize(420, 380)
+        KCC.resize(420, 397)
-        KCC.setMinimumSize(QtCore.QSize(420, 380))
+        KCC.setMinimumSize(QtCore.QSize(420, 397))
-        KCC.setMaximumSize(QtCore.QSize(420, 380))
+        KCC.setMaximumSize(QtCore.QSize(420, 397))
         font = QtGui.QFont()
         font.setPointSize(9)
         KCC.setFont(font)
-        KCC.setFocusPolicy(QtCore.Qt.NoFocus)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/Icon/icons/comic2ebook.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         KCC.setWindowIcon(icon)
         KCC.setLocale(QtCore.QLocale(QtCore.QLocale.C, QtCore.QLocale.AnyCountry))
-        self.Form = QtGui.QWidget(KCC)
+        self.Form = QtWidgets.QWidget(KCC)
-        self.Form.setObjectName(_fromUtf8("Form"))
+        self.Form.setObjectName("Form")
-        self.OptionsAdvanced = QtGui.QFrame(self.Form)
+        self.OptionsAdvanced = QtWidgets.QFrame(self.Form)
         self.OptionsAdvanced.setEnabled(True)
         self.OptionsAdvanced.setGeometry(QtCore.QRect(1, 254, 421, 61))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(9)
         self.OptionsAdvanced.setFont(font)
-        self.OptionsAdvanced.setObjectName(_fromUtf8("OptionsAdvanced"))
+        self.OptionsAdvanced.setObjectName("OptionsAdvanced")
-        self.gridLayout = QtGui.QGridLayout(self.OptionsAdvanced)
+        self.gridLayout = QtWidgets.QGridLayout(self.OptionsAdvanced)
         self.gridLayout.setContentsMargins(9, -1, -1, -1)
-        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.gridLayout.setObjectName("gridLayout")
-        self.ProcessingBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.ProcessingBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.ProcessingBox.setFont(font)
         self.ProcessingBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.ProcessingBox.setObjectName(_fromUtf8("ProcessingBox"))
+        self.ProcessingBox.setObjectName("ProcessingBox")
         self.gridLayout.addWidget(self.ProcessingBox, 1, 0, 1, 1)
-        self.UpscaleBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.UpscaleBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.UpscaleBox.setFont(font)
         self.UpscaleBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.UpscaleBox.setTristate(True)
-        self.UpscaleBox.setObjectName(_fromUtf8("UpscaleBox"))
+        self.UpscaleBox.setObjectName("UpscaleBox")
         self.gridLayout.addWidget(self.UpscaleBox, 1, 1, 1, 1)
-        self.WebtoonBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.WebtoonBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.WebtoonBox.setFont(font)
         self.WebtoonBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.WebtoonBox.setObjectName(_fromUtf8("WebtoonBox"))
+        self.WebtoonBox.setObjectName("WebtoonBox")
         self.gridLayout.addWidget(self.WebtoonBox, 3, 1, 1, 1)
-        self.NoDitheringBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.NoDitheringBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.NoDitheringBox.setFont(font)
         self.NoDitheringBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.NoDitheringBox.setObjectName(_fromUtf8("NoDitheringBox"))
+        self.NoDitheringBox.setObjectName("NoDitheringBox")
         self.gridLayout.addWidget(self.NoDitheringBox, 3, 2, 1, 1)
-        self.BorderBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.BorderBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.BorderBox.setFont(font)
         self.BorderBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.BorderBox.setTristate(True)
-        self.BorderBox.setObjectName(_fromUtf8("BorderBox"))
+        self.BorderBox.setObjectName("BorderBox")
         self.gridLayout.addWidget(self.BorderBox, 3, 0, 1, 1)
-        self.NoRotateBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.NoRotateBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.NoRotateBox.setFont(font)
         self.NoRotateBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.NoRotateBox.setObjectName(_fromUtf8("NoRotateBox"))
+        self.NoRotateBox.setObjectName("NoRotateBox")
         self.gridLayout.addWidget(self.NoRotateBox, 1, 2, 1, 1)
-        self.DeviceBox = QtGui.QComboBox(self.Form)
+        self.DeviceBox = QtWidgets.QComboBox(self.Form)
         self.DeviceBox.setGeometry(QtCore.QRect(10, 200, 141, 31))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(8)
         self.DeviceBox.setFont(font)
         self.DeviceBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.DeviceBox.setObjectName(_fromUtf8("DeviceBox"))
+        self.DeviceBox.setObjectName("DeviceBox")
-        self.FormatBox = QtGui.QComboBox(self.Form)
+        self.FormatBox = QtWidgets.QComboBox(self.Form)
         self.FormatBox.setGeometry(QtCore.QRect(260, 200, 151, 31))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(8)
         self.FormatBox.setFont(font)
         self.FormatBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.FormatBox.setObjectName(_fromUtf8("FormatBox"))
+        self.FormatBox.setObjectName("FormatBox")
-        self.ConvertButton = QtGui.QPushButton(self.Form)
+        self.ConvertButton = QtWidgets.QPushButton(self.Form)
         self.ConvertButton.setGeometry(QtCore.QRect(160, 200, 91, 32))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(9)
         font.setBold(True)
         font.setWeight(75)
         self.ConvertButton.setFont(font)
         self.ConvertButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/convert.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.ConvertButton.setIcon(icon1)
-        self.ConvertButton.setObjectName(_fromUtf8("ConvertButton"))
+        self.ConvertButton.setObjectName("ConvertButton")
-        self.DirectoryButton = QtGui.QPushButton(self.Form)
+        self.DirectoryButton = QtWidgets.QPushButton(self.Form)
         self.DirectoryButton.setGeometry(QtCore.QRect(10, 160, 141, 32))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(8)
         self.DirectoryButton.setFont(font)
         self.DirectoryButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/folder_new.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon2.addPixmap(QtGui.QPixmap(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.DirectoryButton.setIcon(icon2)
-        self.DirectoryButton.setObjectName(_fromUtf8("DirectoryButton"))
+        self.DirectoryButton.setObjectName("DirectoryButton")
-        self.FileButton = QtGui.QPushButton(self.Form)
+        self.FileButton = QtWidgets.QPushButton(self.Form)
         self.FileButton.setGeometry(QtCore.QRect(260, 160, 151, 32))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(8)
         self.FileButton.setFont(font)
         self.FileButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/document_new.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon3.addPixmap(QtGui.QPixmap(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.FileButton.setIcon(icon3)
-        self.FileButton.setObjectName(_fromUtf8("FileButton"))
+        self.FileButton.setObjectName("FileButton")
-        self.ClearButton = QtGui.QPushButton(self.Form)
+        self.ClearButton = QtWidgets.QPushButton(self.Form)
         self.ClearButton.setGeometry(QtCore.QRect(160, 160, 91, 32))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(8)
         self.ClearButton.setFont(font)
         self.ClearButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/clear.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.ClearButton.setIcon(icon4)
-        self.ClearButton.setObjectName(_fromUtf8("ClearButton"))
+        self.ClearButton.setObjectName("ClearButton")
-        self.OptionsBasic = QtGui.QFrame(self.Form)
+        self.OptionsBasic = QtWidgets.QFrame(self.Form)
         self.OptionsBasic.setGeometry(QtCore.QRect(1, 230, 421, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(9)
         self.OptionsBasic.setFont(font)
-        self.OptionsBasic.setObjectName(_fromUtf8("OptionsBasic"))
+        self.OptionsBasic.setObjectName("OptionsBasic")
-        self.MangaBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.MangaBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.MangaBox.setGeometry(QtCore.QRect(9, 10, 130, 18))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.MangaBox.setFont(font)
         self.MangaBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.MangaBox.setObjectName(_fromUtf8("MangaBox"))
+        self.MangaBox.setObjectName("MangaBox")
-        self.QualityBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.QualityBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.QualityBox.setGeometry(QtCore.QRect(282, 10, 135, 18))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.QualityBox.setFont(font)
         self.QualityBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.QualityBox.setTristate(True)
-        self.QualityBox.setObjectName(_fromUtf8("QualityBox"))
+        self.QualityBox.setObjectName("QualityBox")
-        self.RotateBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.RotateBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.RotateBox.setGeometry(QtCore.QRect(145, 10, 130, 18))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.RotateBox.setFont(font)
         self.RotateBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.RotateBox.setObjectName(_fromUtf8("RotateBox"))
+        self.RotateBox.setObjectName("RotateBox")
-        self.JobList = QtGui.QListWidget(self.Form)
+        self.JobList = QtWidgets.QListWidget(self.Form)
         self.JobList.setGeometry(QtCore.QRect(10, 50, 401, 101))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(8)
         font.setItalic(False)
         self.JobList.setFont(font)
         self.JobList.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.JobList.setStyleSheet(_fromUtf8("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.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.setProperty("showDropIndicator", False)
-        self.JobList.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
+        self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
         self.JobList.setIconSize(QtCore.QSize(18, 18))
-        self.JobList.setVerticalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
+        self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.JobList.setHorizontalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
+        self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.JobList.setObjectName(_fromUtf8("JobList"))
+        self.JobList.setObjectName("JobList")
-        self.BasicModeButton = QtGui.QPushButton(self.Form)
+        self.BasicModeButton = QtWidgets.QPushButton(self.Form)
         self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 195, 32))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(9)
         self.BasicModeButton.setFont(font)
         self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.BasicModeButton.setObjectName(_fromUtf8("BasicModeButton"))
+        self.BasicModeButton.setObjectName("BasicModeButton")
-        self.AdvModeButton = QtGui.QPushButton(self.Form)
+        self.AdvModeButton = QtWidgets.QPushButton(self.Form)
         self.AdvModeButton.setGeometry(QtCore.QRect(217, 10, 195, 32))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(9)
         self.AdvModeButton.setFont(font)
         self.AdvModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.AdvModeButton.setObjectName(_fromUtf8("AdvModeButton"))
+        self.AdvModeButton.setObjectName("AdvModeButton")
-        self.OptionsAdvancedGamma = QtGui.QFrame(self.Form)
+        self.OptionsAdvancedGamma = QtWidgets.QFrame(self.Form)
         self.OptionsAdvancedGamma.setEnabled(True)
         self.OptionsAdvancedGamma.setGeometry(QtCore.QRect(10, 305, 401, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(9)
         self.OptionsAdvancedGamma.setFont(font)
-        self.OptionsAdvancedGamma.setObjectName(_fromUtf8("OptionsAdvancedGamma"))
+        self.OptionsAdvancedGamma.setObjectName("OptionsAdvancedGamma")
-        self.GammaLabel = QtGui.QLabel(self.OptionsAdvancedGamma)
+        self.GammaLabel = QtWidgets.QLabel(self.OptionsAdvancedGamma)
         self.GammaLabel.setGeometry(QtCore.QRect(15, 0, 100, 40))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.GammaLabel.setFont(font)
-        self.GammaLabel.setObjectName(_fromUtf8("GammaLabel"))
+        self.GammaLabel.setObjectName("GammaLabel")
-        self.GammaSlider = QtGui.QSlider(self.OptionsAdvancedGamma)
+        self.GammaSlider = QtWidgets.QSlider(self.OptionsAdvancedGamma)
         self.GammaSlider.setGeometry(QtCore.QRect(110, 10, 275, 22))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.GammaSlider.setFont(font)
         self.GammaSlider.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.GammaSlider.setMaximum(500)
         self.GammaSlider.setSingleStep(5)
         self.GammaSlider.setOrientation(QtCore.Qt.Horizontal)
-        self.GammaSlider.setObjectName(_fromUtf8("GammaSlider"))
+        self.GammaSlider.setObjectName("GammaSlider")
-        self.ProgressBar = QtGui.QProgressBar(self.Form)
+        self.ProgressBar = QtWidgets.QProgressBar(self.Form)
         self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 31))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(10)
         font.setBold(True)
         font.setWeight(75)
         self.ProgressBar.setFont(font)
         self.ProgressBar.setProperty("value", 0)
         self.ProgressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
-        self.ProgressBar.setFormat(_fromUtf8(""))
+        self.ProgressBar.setFormat("")
-        self.ProgressBar.setObjectName(_fromUtf8("ProgressBar"))
+        self.ProgressBar.setObjectName("ProgressBar")
-        self.OptionsExpert = QtGui.QFrame(self.Form)
+        self.OptionsExpert = QtWidgets.QFrame(self.Form)
         self.OptionsExpert.setGeometry(QtCore.QRect(1, 337, 421, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(9)
         self.OptionsExpert.setFont(font)
-        self.OptionsExpert.setObjectName(_fromUtf8("OptionsExpert"))
+        self.OptionsExpert.setObjectName("OptionsExpert")
-        self.ColorBox = QtGui.QCheckBox(self.OptionsExpert)
+        self.ColorBox = QtWidgets.QCheckBox(self.OptionsExpert)
         self.ColorBox.setGeometry(QtCore.QRect(9, 11, 130, 18))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.ColorBox.setFont(font)
         self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.ColorBox.setObjectName(_fromUtf8("ColorBox"))
+        self.ColorBox.setObjectName("ColorBox")
-        self.OptionsExpertInternal = QtGui.QFrame(self.OptionsExpert)
+        self.OptionsExpertInternal = QtWidgets.QFrame(self.OptionsExpert)
         self.OptionsExpertInternal.setGeometry(QtCore.QRect(105, 0, 295, 40))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.OptionsExpertInternal.setFont(font)
-        self.OptionsExpertInternal.setObjectName(_fromUtf8("OptionsExpertInternal"))
+        self.OptionsExpertInternal.setObjectName("OptionsExpertInternal")
-        self.gridLayout_2 = QtGui.QGridLayout(self.OptionsExpertInternal)
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.OptionsExpertInternal)
-        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.wLabel = QtGui.QLabel(self.OptionsExpertInternal)
+        self.wLabel = QtWidgets.QLabel(self.OptionsExpertInternal)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.wLabel.setFont(font)
-        self.wLabel.setObjectName(_fromUtf8("wLabel"))
+        self.wLabel.setObjectName("wLabel")
         self.gridLayout_2.addWidget(self.wLabel, 0, 0, 1, 1)
-        self.customWidth = QtGui.QLineEdit(self.OptionsExpertInternal)
+        self.customWidth = QtWidgets.QLineEdit(self.OptionsExpertInternal)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.customWidth.sizePolicy().hasHeightForWidth())
         self.customWidth.setSizePolicy(sizePolicy)
         self.customWidth.setMaximumSize(QtCore.QSize(40, 16777215))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.customWidth.setFont(font)
         self.customWidth.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.customWidth.setAcceptDrops(False)
         self.customWidth.setMaxLength(4)
-        self.customWidth.setObjectName(_fromUtf8("customWidth"))
+        self.customWidth.setObjectName("customWidth")
         self.gridLayout_2.addWidget(self.customWidth, 0, 1, 1, 1)
-        self.hLabel = QtGui.QLabel(self.OptionsExpertInternal)
+        self.hLabel = QtWidgets.QLabel(self.OptionsExpertInternal)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.hLabel.setFont(font)
-        self.hLabel.setObjectName(_fromUtf8("hLabel"))
+        self.hLabel.setObjectName("hLabel")
         self.gridLayout_2.addWidget(self.hLabel, 0, 2, 1, 1)
-        self.customHeight = QtGui.QLineEdit(self.OptionsExpertInternal)
+        self.customHeight = QtWidgets.QLineEdit(self.OptionsExpertInternal)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.customHeight.sizePolicy().hasHeightForWidth())
         self.customHeight.setSizePolicy(sizePolicy)
         self.customHeight.setMaximumSize(QtCore.QSize(40, 16777215))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         self.customHeight.setFont(font)
         self.customHeight.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.customHeight.setAcceptDrops(False)
         self.customHeight.setMaxLength(4)
-        self.customHeight.setObjectName(_fromUtf8("customHeight"))
+        self.customHeight.setObjectName("customHeight")
         self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
         KCC.setCentralWidget(self.Form)
-        self.ActionBasic = QtGui.QAction(KCC)
+        self.statusBar = QtWidgets.QStatusBar(KCC)
+        font = QtGui.QFont()
+        font.setFamily("DejaVu Sans")
+        font.setPointSize(8)
+        self.statusBar.setFont(font)
+        self.statusBar.setSizeGripEnabled(False)
+        self.statusBar.setObjectName("statusBar")
+        KCC.setStatusBar(self.statusBar)
+        self.ActionBasic = QtWidgets.QAction(KCC)
         self.ActionBasic.setCheckable(True)
         self.ActionBasic.setChecked(False)
         font = QtGui.QFont()
         self.ActionBasic.setFont(font)
-        self.ActionBasic.setObjectName(_fromUtf8("ActionBasic"))
+        self.ActionBasic.setObjectName("ActionBasic")
-        self.ActionAdvanced = QtGui.QAction(KCC)
+        self.ActionAdvanced = QtWidgets.QAction(KCC)
         self.ActionAdvanced.setCheckable(True)
-        self.ActionAdvanced.setObjectName(_fromUtf8("ActionAdvanced"))
+        self.ActionAdvanced.setObjectName("ActionAdvanced")
 
         self.retranslateUi(KCC)
         QtCore.QMetaObject.connectSlotsByName(KCC)
@@ -334,53 +327,47 @@ class Ui_KCC(object):
         KCC.setTabOrder(self.ConvertButton, self.ClearButton)
 
     def retranslateUi(self, KCC):
-        KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter", None))
+        _translate = QtCore.QCoreApplication.translate
-        self.ProcessingBox.setToolTip(_translate("KCC", "Disable image optimizations.", None))
+        KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter"))
-        self.ProcessingBox.setText(_translate("KCC", "No optimisation", None))
+        self.ProcessingBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable image optimizations.<br/>Input images must be already resized.</p></body></html>"))
-        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>", None))
+        self.ProcessingBox.setText(_translate("KCC", "No optimisation"))
-        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale", None))
+        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>"))
-        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html>", None))
+        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale"))
-        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode", None))
+        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html>"))
-        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>", None))
+        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
-        self.NoDitheringBox.setText(_translate("KCC", "PNG output", None))
+        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>"))
-        self.BorderBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>", None))
+        self.NoDitheringBox.setText(_translate("KCC", "PNG output"))
-        self.BorderBox.setText(_translate("KCC", "W/B margins", None))
+        self.BorderBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>"))
-        self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p>Disable splitting and rotation.</p></body></html>", None))
+        self.BorderBox.setText(_translate("KCC", "W/B margins"))
-        self.NoRotateBox.setText(_translate("KCC", "No split/rotate", None))
+        self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting and rotation.</p></body></html>"))
-        self.DeviceBox.setToolTip(_translate("KCC", "Target device.", None))
+        self.NoRotateBox.setText(_translate("KCC", "No split/rotate"))
-        self.FormatBox.setToolTip(_translate("KCC", "Output format.", None))
+        self.DeviceBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>"))
-        self.ConvertButton.setText(_translate("KCC", "Convert", None))
+        self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>"))
-        self.DirectoryButton.setText(_translate("KCC", "Add directory", None))
+        self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>"))
-        self.FileButton.setText(_translate("KCC", "Add file", None))
+        self.ConvertButton.setText(_translate("KCC", "Convert"))
-        self.ClearButton.setText(_translate("KCC", "Clear list", None))
+        self.DirectoryButton.setText(_translate("KCC", "Add directory"))
-        self.MangaBox.setToolTip(_translate("KCC", "Enable right-to-left reading.", None))
+        self.FileButton.setText(_translate("KCC", "Add file"))
-        self.MangaBox.setText(_translate("KCC", "Manga mode", None))
+        self.ClearButton.setText(_translate("KCC", "Clear list"))
-        self.QualityBox.setToolTip(_translate("KCC", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+        self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>"))
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+        self.MangaBox.setText(_translate("KCC", "Manga mode"))
-"p, li { white-space: pre-wrap; }\n"
+        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span><span style=\" font-style:italic;\">Use it when Panel View support is not needed.<br/></span>- Maximum quality when zoom is not enabled.<br/>- Poor quality when zoom is enabled.<br/>- Lowest file size.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span><span style=\" font-style:italic;\">Not zoomed images </span><span style=\" font-weight:600; font-style:italic;\">might</span><span style=\" font-style:italic;\"> be blurry.<br/></span>- High quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span><span style=\" font-style:italic;\">Maximum possible quality.<br/></span>- Maximum quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.<br/>- Very high file size.</p></body></html>"))
-"</style></head><body style=\" font-family:\'Sans\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
+        self.QualityBox.setText(_translate("KCC", "High/Ultra quality"))
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br /></span><span style=\" font-family:\'MS Shell Dlg 2\'; font-style:italic;\">Use it when Panel View support is not needed.</span><span style=\" font-family:\'MS Shell Dlg 2\'; font-weight:600; text-decoration: underline;\"><br /></span><span style=\" font-family:\'MS Shell Dlg 2\';\">- Maximum quality when zoom is not enabled.<br />- Poor quality when zoom is enabled.<br />- Lowest file size.</span></p>\n"
+        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>"))
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br /></span><span style=\" font-family:\'MS Shell Dlg 2\'; font-style:italic;\">Not zoomed image </span><span style=\" font-family:\'MS Shell Dlg 2\'; font-weight:600; font-style:italic;\">might </span><span style=\" font-family:\'MS Shell Dlg 2\'; font-style:italic;\">be a little blurry.</span><span style=\" font-family:\'MS Shell Dlg 2\'; font-weight:600; text-decoration: underline;\"><br /></span><span style=\" font-family:\'MS Shell Dlg 2\';\">- Medium/High quality when zoom is not enabled.<br />- Maximum quality when zoom is enabled.</span></p>\n"
+        self.RotateBox.setText(_translate("KCC", "Horizontal mode"))
-"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'MS Shell Dlg 2\'; font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br /></span><span style=\" font-family:\'MS Shell Dlg 2\'; font-style:italic;\">Maximum possible quality.</span><span style=\" font-family:\'MS Shell Dlg 2\'; font-weight:600; text-decoration: underline;\"><br /></span><span style=\" font-family:\'MS Shell Dlg 2\';\">- Maximum quality when zoom is not enabled.<br />- Maximum quality when zoom is enabled.<br />- Very high file size.</span></p></body></html>", None))
+        self.BasicModeButton.setText(_translate("KCC", "Basic"))
-        self.QualityBox.setText(_translate("KCC", "High/Ultra quality", None))
+        self.AdvModeButton.setText(_translate("KCC", "Advanced"))
-        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p>Disable page spliting.<br/>They will be rotated instead.</p></body></html>", None))
+        self.GammaLabel.setText(_translate("KCC", "Gamma: Auto"))
-        self.RotateBox.setText(_translate("KCC", "Horizontal mode", None))
+        self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Don\'t convert images to grayscale.</p></body></html>"))
-        self.BasicModeButton.setText(_translate("KCC", "Basic", None))
+        self.ColorBox.setText(_translate("KCC", "Color mode"))
-        self.AdvModeButton.setText(_translate("KCC", "Advanced", None))
+        self.wLabel.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>"))
-        self.GammaLabel.setToolTip(_translate("KCC", "<html><head/><body><p>When converting color images setting this option to 1.0 <span style=\" font-weight:600;\">might</span> improve readability.</p></body></html>", None))
+        self.wLabel.setText(_translate("KCC", "Custom width: "))
-        self.GammaLabel.setText(_translate("KCC", "Gamma: Auto", None))
+        self.customWidth.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>"))
-        self.GammaSlider.setToolTip(_translate("KCC", "<html><head/><body><p>When converting color images setting this option to 1.0 <span style=\" font-weight:600;\">might</span> improve readability.</p></body></html>", None))
+        self.customWidth.setInputMask(_translate("KCC", "0000"))
-        self.ColorBox.setToolTip(_translate("KCC", "Do not convert images to grayscale.", None))
+        self.hLabel.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>"))
-        self.ColorBox.setText(_translate("KCC", "Color mode", None))
+        self.hLabel.setText(_translate("KCC", "Custom height: "))
-        self.wLabel.setToolTip(_translate("KCC", "Resolution of target device.", None))
+        self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>"))
-        self.wLabel.setText(_translate("KCC", "Custom width: ", None))
+        self.customHeight.setInputMask(_translate("KCC", "0000"))
-        self.customWidth.setToolTip(_translate("KCC", "Resolution of target device.", None))
+        self.ActionBasic.setText(_translate("KCC", "Basic"))
-        self.customWidth.setInputMask(_translate("KCC", "0000; ", None))
+        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
-        self.hLabel.setToolTip(_translate("KCC", "Resolution of target device.", None))
-        self.hLabel.setText(_translate("KCC", "Custom height: ", None))
-        self.customHeight.setToolTip(_translate("KCC", "Resolution of target device.", None))
-        self.customHeight.setInputMask(_translate("KCC", "0000; ", None))
-        self.ActionBasic.setText(_translate("KCC", "Basic", None))
-        self.ActionAdvanced.setText(_translate("KCC", "Advanced", None))
 
-import KCC_rc
+from . import KCC_rc

kcc/KCC_ui_osx.py

@@ -2,354 +2,346 @@
 
 # Form implementation generated from reading ui file 'KCC-OSX.ui'
 #
-# Created: Sat Oct 12 11:28:19 2013
+# Created: Sat Jan 25 17:37:10 2014
-#      by: PyQt4 UI code generator 4.10.3
+#      by: PyQt5 UI code generator 5.2
 #
 # WARNING! All changes made in this file will be lost!
 
-from PyQt4 import QtCore, QtGui
+from PyQt5 import QtCore, QtGui, QtWidgets
-
-try:
-    _fromUtf8 = QtCore.QString.fromUtf8
-except AttributeError:
-    def _fromUtf8(s):
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
 
 class Ui_KCC(object):
     def setupUi(self, KCC):
-        KCC.setObjectName(_fromUtf8("KCC"))
+        KCC.setObjectName("KCC")
-        KCC.resize(420, 380)
+        KCC.resize(420, 397)
-        KCC.setMinimumSize(QtCore.QSize(420, 380))
+        KCC.setMinimumSize(QtCore.QSize(420, 397))
-        KCC.setMaximumSize(QtCore.QSize(420, 380))
+        KCC.setMaximumSize(QtCore.QSize(420, 397))
         font = QtGui.QFont()
         font.setPointSize(9)
         KCC.setFont(font)
-        KCC.setFocusPolicy(QtCore.Qt.NoFocus)
         icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/Icon/icons/comic2ebook.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         KCC.setWindowIcon(icon)
         KCC.setLocale(QtCore.QLocale(QtCore.QLocale.C, QtCore.QLocale.AnyCountry))
-        self.Form = QtGui.QWidget(KCC)
+        self.Form = QtWidgets.QWidget(KCC)
-        self.Form.setObjectName(_fromUtf8("Form"))
+        self.Form.setObjectName("Form")
-        self.OptionsAdvanced = QtGui.QFrame(self.Form)
+        self.OptionsAdvanced = QtWidgets.QFrame(self.Form)
         self.OptionsAdvanced.setEnabled(True)
         self.OptionsAdvanced.setGeometry(QtCore.QRect(4, 253, 421, 61))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(9)
         self.OptionsAdvanced.setFont(font)
-        self.OptionsAdvanced.setObjectName(_fromUtf8("OptionsAdvanced"))
+        self.OptionsAdvanced.setObjectName("OptionsAdvanced")
-        self.gridLayout = QtGui.QGridLayout(self.OptionsAdvanced)
+        self.gridLayout = QtWidgets.QGridLayout(self.OptionsAdvanced)
-        self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+        self.gridLayout.setObjectName("gridLayout")
-        self.ProcessingBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.ProcessingBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.ProcessingBox.setFont(font)
         self.ProcessingBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.ProcessingBox.setObjectName(_fromUtf8("ProcessingBox"))
+        self.ProcessingBox.setObjectName("ProcessingBox")
         self.gridLayout.addWidget(self.ProcessingBox, 1, 0, 1, 1)
-        self.UpscaleBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.UpscaleBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.UpscaleBox.setFont(font)
         self.UpscaleBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.UpscaleBox.setTristate(True)
-        self.UpscaleBox.setObjectName(_fromUtf8("UpscaleBox"))
+        self.UpscaleBox.setObjectName("UpscaleBox")
         self.gridLayout.addWidget(self.UpscaleBox, 1, 1, 1, 1)
-        self.WebtoonBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.WebtoonBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.WebtoonBox.setFont(font)
         self.WebtoonBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.WebtoonBox.setObjectName(_fromUtf8("WebtoonBox"))
+        self.WebtoonBox.setObjectName("WebtoonBox")
         self.gridLayout.addWidget(self.WebtoonBox, 3, 1, 1, 1)
-        self.NoDitheringBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.NoDitheringBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.NoDitheringBox.setFont(font)
         self.NoDitheringBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.NoDitheringBox.setObjectName(_fromUtf8("NoDitheringBox"))
+        self.NoDitheringBox.setObjectName("NoDitheringBox")
         self.gridLayout.addWidget(self.NoDitheringBox, 3, 2, 1, 1)
-        self.BorderBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.BorderBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.BorderBox.setFont(font)
         self.BorderBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.BorderBox.setTristate(True)
-        self.BorderBox.setObjectName(_fromUtf8("BorderBox"))
+        self.BorderBox.setObjectName("BorderBox")
         self.gridLayout.addWidget(self.BorderBox, 3, 0, 1, 1)
-        self.NoRotateBox = QtGui.QCheckBox(self.OptionsAdvanced)
+        self.NoRotateBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.NoRotateBox.setFont(font)
         self.NoRotateBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.NoRotateBox.setObjectName(_fromUtf8("NoRotateBox"))
+        self.NoRotateBox.setObjectName("NoRotateBox")
         self.gridLayout.addWidget(self.NoRotateBox, 1, 2, 1, 1)
-        self.DeviceBox = QtGui.QComboBox(self.Form)
+        self.DeviceBox = QtWidgets.QComboBox(self.Form)
         self.DeviceBox.setGeometry(QtCore.QRect(8, 201, 151, 34))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(11)
         self.DeviceBox.setFont(font)
         self.DeviceBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.DeviceBox.setObjectName(_fromUtf8("DeviceBox"))
+        self.DeviceBox.setObjectName("DeviceBox")
-        self.FormatBox = QtGui.QComboBox(self.Form)
+        self.FormatBox = QtWidgets.QComboBox(self.Form)
         self.FormatBox.setGeometry(QtCore.QRect(262, 201, 152, 34))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(11)
         self.FormatBox.setFont(font)
         self.FormatBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.FormatBox.setObjectName(_fromUtf8("FormatBox"))
+        self.FormatBox.setObjectName("FormatBox")
-        self.ConvertButton = QtGui.QPushButton(self.Form)
+        self.ConvertButton = QtWidgets.QPushButton(self.Form)
         self.ConvertButton.setGeometry(QtCore.QRect(160, 200, 101, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(11)
         font.setBold(True)
         font.setWeight(75)
         self.ConvertButton.setFont(font)
         self.ConvertButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/convert.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.ConvertButton.setIcon(icon1)
-        self.ConvertButton.setObjectName(_fromUtf8("ConvertButton"))
+        self.ConvertButton.setObjectName("ConvertButton")
-        self.DirectoryButton = QtGui.QPushButton(self.Form)
+        self.DirectoryButton = QtWidgets.QPushButton(self.Form)
         self.DirectoryButton.setGeometry(QtCore.QRect(5, 160, 156, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(11)
         self.DirectoryButton.setFont(font)
         self.DirectoryButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/folder_new.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon2.addPixmap(QtGui.QPixmap(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.DirectoryButton.setIcon(icon2)
-        self.DirectoryButton.setObjectName(_fromUtf8("DirectoryButton"))
+        self.DirectoryButton.setObjectName("DirectoryButton")
-        self.FileButton = QtGui.QPushButton(self.Form)
+        self.FileButton = QtWidgets.QPushButton(self.Form)
         self.FileButton.setGeometry(QtCore.QRect(260, 160, 157, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(11)
         self.FileButton.setFont(font)
         self.FileButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon3 = QtGui.QIcon()
-        icon3.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/document_new.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon3.addPixmap(QtGui.QPixmap(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.FileButton.setIcon(icon3)
-        self.FileButton.setObjectName(_fromUtf8("FileButton"))
+        self.FileButton.setObjectName("FileButton")
-        self.ClearButton = QtGui.QPushButton(self.Form)
+        self.ClearButton = QtWidgets.QPushButton(self.Form)
         self.ClearButton.setGeometry(QtCore.QRect(160, 160, 101, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(11)
         self.ClearButton.setFont(font)
         self.ClearButton.setFocusPolicy(QtCore.Qt.NoFocus)
         icon4 = QtGui.QIcon()
-        icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/Other/icons/clear.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.ClearButton.setIcon(icon4)
-        self.ClearButton.setObjectName(_fromUtf8("ClearButton"))
+        self.ClearButton.setObjectName("ClearButton")
-        self.OptionsBasic = QtGui.QFrame(self.Form)
+        self.OptionsBasic = QtWidgets.QFrame(self.Form)
         self.OptionsBasic.setGeometry(QtCore.QRect(5, 233, 421, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.OptionsBasic.setFont(font)
-        self.OptionsBasic.setObjectName(_fromUtf8("OptionsBasic"))
+        self.OptionsBasic.setObjectName("OptionsBasic")
-        self.MangaBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.MangaBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.MangaBox.setGeometry(QtCore.QRect(9, 10, 130, 18))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.MangaBox.setFont(font)
         self.MangaBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.MangaBox.setObjectName(_fromUtf8("MangaBox"))
+        self.MangaBox.setObjectName("MangaBox")
-        self.QualityBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.QualityBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.QualityBox.setGeometry(QtCore.QRect(282, 10, 135, 18))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.QualityBox.setFont(font)
         self.QualityBox.setFocusPolicy(QtCore.Qt.NoFocus)
         self.QualityBox.setTristate(True)
-        self.QualityBox.setObjectName(_fromUtf8("QualityBox"))
+        self.QualityBox.setObjectName("QualityBox")
-        self.RotateBox = QtGui.QCheckBox(self.OptionsBasic)
+        self.RotateBox = QtWidgets.QCheckBox(self.OptionsBasic)
         self.RotateBox.setGeometry(QtCore.QRect(145, 10, 130, 18))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.RotateBox.setFont(font)
         self.RotateBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.RotateBox.setObjectName(_fromUtf8("RotateBox"))
+        self.RotateBox.setObjectName("RotateBox")
-        self.JobList = QtGui.QListWidget(self.Form)
+        self.JobList = QtWidgets.QListWidget(self.Form)
         self.JobList.setGeometry(QtCore.QRect(10, 50, 401, 101))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(11)
         self.JobList.setFont(font)
         self.JobList.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.JobList.setStyleSheet(_fromUtf8("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.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.setProperty("showDropIndicator", False)
-        self.JobList.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
+        self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
-        self.JobList.setVerticalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
+        self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.JobList.setHorizontalScrollMode(QtGui.QAbstractItemView.ScrollPerPixel)
+        self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
-        self.JobList.setObjectName(_fromUtf8("JobList"))
+        self.JobList.setObjectName("JobList")
-        self.BasicModeButton = QtGui.QPushButton(self.Form)
+        self.BasicModeButton = QtWidgets.QPushButton(self.Form)
         self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 210, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         font.setBold(False)
         font.setWeight(50)
         self.BasicModeButton.setFont(font)
         self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.BasicModeButton.setObjectName(_fromUtf8("BasicModeButton"))
+        self.BasicModeButton.setObjectName("BasicModeButton")
-        self.AdvModeButton = QtGui.QPushButton(self.Form)
+        self.AdvModeButton = QtWidgets.QPushButton(self.Form)
         self.AdvModeButton.setGeometry(QtCore.QRect(207, 10, 210, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         font.setBold(False)
         font.setWeight(50)
         self.AdvModeButton.setFont(font)
         self.AdvModeButton.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.AdvModeButton.setObjectName(_fromUtf8("AdvModeButton"))
+        self.AdvModeButton.setObjectName("AdvModeButton")
-        self.OptionsAdvancedGamma = QtGui.QFrame(self.Form)
+        self.OptionsAdvancedGamma = QtWidgets.QFrame(self.Form)
         self.OptionsAdvancedGamma.setEnabled(True)
         self.OptionsAdvancedGamma.setGeometry(QtCore.QRect(5, 303, 401, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(9)
         self.OptionsAdvancedGamma.setFont(font)
-        self.OptionsAdvancedGamma.setObjectName(_fromUtf8("OptionsAdvancedGamma"))
+        self.OptionsAdvancedGamma.setObjectName("OptionsAdvancedGamma")
-        self.GammaLabel = QtGui.QLabel(self.OptionsAdvancedGamma)
+        self.GammaLabel = QtWidgets.QLabel(self.OptionsAdvancedGamma)
         self.GammaLabel.setGeometry(QtCore.QRect(20, 0, 100, 40))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         font.setBold(False)
         font.setWeight(50)
         self.GammaLabel.setFont(font)
-        self.GammaLabel.setObjectName(_fromUtf8("GammaLabel"))
+        self.GammaLabel.setObjectName("GammaLabel")
-        self.GammaSlider = QtGui.QSlider(self.OptionsAdvancedGamma)
+        self.GammaSlider = QtWidgets.QSlider(self.OptionsAdvancedGamma)
         self.GammaSlider.setGeometry(QtCore.QRect(110, 10, 290, 22))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         self.GammaSlider.setFont(font)
         self.GammaSlider.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.GammaSlider.setMaximum(500)
         self.GammaSlider.setSingleStep(5)
         self.GammaSlider.setOrientation(QtCore.Qt.Horizontal)
-        self.GammaSlider.setObjectName(_fromUtf8("GammaSlider"))
+        self.GammaSlider.setObjectName("GammaSlider")
-        self.ProgressBar = QtGui.QProgressBar(self.Form)
+        self.ProgressBar = QtWidgets.QProgressBar(self.Form)
-        self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 35))
+        self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 29))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(10)
         font.setBold(True)
         font.setWeight(75)
         self.ProgressBar.setFont(font)
-        self.ProgressBar.setAutoFillBackground(True)
         self.ProgressBar.setProperty("value", 0)
         self.ProgressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
-        self.ProgressBar.setFormat(_fromUtf8(""))
+        self.ProgressBar.setFormat("")
-        self.ProgressBar.setObjectName(_fromUtf8("ProgressBar"))
+        self.ProgressBar.setObjectName("ProgressBar")
-        self.OptionsExpert = QtGui.QFrame(self.Form)
+        self.OptionsExpert = QtWidgets.QFrame(self.Form)
         self.OptionsExpert.setGeometry(QtCore.QRect(5, 335, 421, 41))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(9)
         self.OptionsExpert.setFont(font)
-        self.OptionsExpert.setObjectName(_fromUtf8("OptionsExpert"))
+        self.OptionsExpert.setObjectName("OptionsExpert")
-        self.ColorBox = QtGui.QCheckBox(self.OptionsExpert)
+        self.ColorBox = QtWidgets.QCheckBox(self.OptionsExpert)
         self.ColorBox.setGeometry(QtCore.QRect(9, 11, 130, 18))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.ColorBox.setFont(font)
         self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus)
-        self.ColorBox.setObjectName(_fromUtf8("ColorBox"))
+        self.ColorBox.setObjectName("ColorBox")
-        self.OptionsExpertInternal = QtGui.QFrame(self.OptionsExpert)
+        self.OptionsExpertInternal = QtWidgets.QFrame(self.OptionsExpert)
         self.OptionsExpertInternal.setGeometry(QtCore.QRect(95, 0, 315, 40))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         self.OptionsExpertInternal.setFont(font)
-        self.OptionsExpertInternal.setObjectName(_fromUtf8("OptionsExpertInternal"))
+        self.OptionsExpertInternal.setObjectName("OptionsExpertInternal")
-        self.gridLayout_2 = QtGui.QGridLayout(self.OptionsExpertInternal)
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.OptionsExpertInternal)
-        self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
+        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.wLabel = QtGui.QLabel(self.OptionsExpertInternal)
+        self.wLabel = QtWidgets.QLabel(self.OptionsExpertInternal)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         font.setBold(False)
         font.setWeight(50)
         self.wLabel.setFont(font)
-        self.wLabel.setObjectName(_fromUtf8("wLabel"))
+        self.wLabel.setObjectName("wLabel")
         self.gridLayout_2.addWidget(self.wLabel, 0, 0, 1, 1)
-        self.customWidth = QtGui.QLineEdit(self.OptionsExpertInternal)
+        self.customWidth = QtWidgets.QLineEdit(self.OptionsExpertInternal)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.customWidth.sizePolicy().hasHeightForWidth())
         self.customWidth.setSizePolicy(sizePolicy)
         self.customWidth.setMaximumSize(QtCore.QSize(45, 16777215))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.customWidth.setFont(font)
         self.customWidth.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.customWidth.setAcceptDrops(False)
         self.customWidth.setMaxLength(4)
-        self.customWidth.setObjectName(_fromUtf8("customWidth"))
+        self.customWidth.setObjectName("customWidth")
         self.gridLayout_2.addWidget(self.customWidth, 0, 1, 1, 1)
-        self.hLabel = QtGui.QLabel(self.OptionsExpertInternal)
+        self.hLabel = QtWidgets.QLabel(self.OptionsExpertInternal)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         font.setBold(False)
         font.setWeight(50)
         self.hLabel.setFont(font)
-        self.hLabel.setObjectName(_fromUtf8("hLabel"))
+        self.hLabel.setObjectName("hLabel")
         self.gridLayout_2.addWidget(self.hLabel, 0, 2, 1, 1)
-        self.customHeight = QtGui.QLineEdit(self.OptionsExpertInternal)
+        self.customHeight = QtWidgets.QLineEdit(self.OptionsExpertInternal)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.customHeight.sizePolicy().hasHeightForWidth())
         self.customHeight.setSizePolicy(sizePolicy)
         self.customHeight.setMaximumSize(QtCore.QSize(45, 16777215))
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Lucida Grande"))
+        font.setFamily("Lucida Grande")
         font.setPointSize(12)
         self.customHeight.setFont(font)
         self.customHeight.setFocusPolicy(QtCore.Qt.ClickFocus)
         self.customHeight.setAcceptDrops(False)
         self.customHeight.setMaxLength(4)
-        self.customHeight.setObjectName(_fromUtf8("customHeight"))
+        self.customHeight.setObjectName("customHeight")
         self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
         KCC.setCentralWidget(self.Form)
-        self.ActionBasic = QtGui.QAction(KCC)
+        self.statusBar = QtWidgets.QStatusBar(KCC)
+        font = QtGui.QFont()
+        font.setFamily("Aharoni")
+        font.setPointSize(8)
+        self.statusBar.setFont(font)
+        self.statusBar.setSizeGripEnabled(False)
+        self.statusBar.setObjectName("statusBar")
+        KCC.setStatusBar(self.statusBar)
+        self.ActionBasic = QtWidgets.QAction(KCC)
         self.ActionBasic.setCheckable(True)
         self.ActionBasic.setChecked(False)
         font = QtGui.QFont()
         font.setPointSize(9)
         self.ActionBasic.setFont(font)
-        self.ActionBasic.setObjectName(_fromUtf8("ActionBasic"))
+        self.ActionBasic.setObjectName("ActionBasic")
-        self.ActionAdvanced = QtGui.QAction(KCC)
+        self.ActionAdvanced = QtWidgets.QAction(KCC)
         self.ActionAdvanced.setCheckable(True)
-        self.ActionAdvanced.setObjectName(_fromUtf8("ActionAdvanced"))
+        self.ActionAdvanced.setObjectName("ActionAdvanced")
 
         self.retranslateUi(KCC)
         QtCore.QMetaObject.connectSlotsByName(KCC)
@@ -358,47 +350,47 @@ class Ui_KCC(object):
         KCC.setTabOrder(self.ConvertButton, self.ClearButton)
 
     def retranslateUi(self, KCC):
-        KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter", None))
+        _translate = QtCore.QCoreApplication.translate
-        self.ProcessingBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Disable image optimizations.</span></p></body></html>", None))
+        KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter"))
-        self.ProcessingBox.setText(_translate("KCC", "No optimisation", None))
+        self.ProcessingBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable image optimizations.<br/>Input images must be already resized.</p></body></html>"))
-        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt; font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span><span style=\" font-size:12pt;\">Images smaller than device resolution will not be resized.</span></p><p><span style=\" font-size:12pt; font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span><span style=\" font-size:12pt;\">Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</span></p><p><span style=\" font-size:12pt; font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span><span style=\" font-size:12pt;\">Images smaller than device resolution will be resized. Aspect ratio will be preserved.</span></p></body></html>", None))
+        self.ProcessingBox.setText(_translate("KCC", "No optimisation"))
-        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale", None))
+        self.UpscaleBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Nothing<br/></span>Images smaller than device resolution will not be resized.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - Stretching<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be not preserved.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Upscaling<br/></span>Images smaller than device resolution will be resized. Aspect ratio will be preserved.</p></body></html>"))
-        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Enable auto-splitting of webtoons like </span><span style=\" font-size:12pt; font-style:italic;\">Tower of God</span><span style=\" font-size:12pt;\"> or </span><span style=\" font-size:12pt; font-style:italic;\">Noblesse</span><span style=\" font-size:12pt;\">.<br/>Pages with a low width, high height and vertical panel flow.</span></p></body></html>", None))
+        self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale"))
-        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode", None))
+        self.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>Pages with a low width, high height and vertical panel flow.</p></body></html>"))
-        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files </span><span style=\" font-size:12pt; font-weight:600;\">might</span><span style=\" font-size:12pt;\"> be smaller.<br/></span><span style=\" font-size:12pt; font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>", None))
+        self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
-        self.NoDitheringBox.setText(_translate("KCC", "PNG output", None))
+        self.NoDitheringBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Create PNG files instead JPEG.<br/>Quality increase is not noticeable on most of devices.<br/>Output files <span style=\" font-weight:600;\">might</span> be smaller.<br/><span style=\" font-weight:600;\">MOBI conversion will be much slower.</span></p></body></html>"))
-        self.BorderBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt; font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span><span style=\" font-size:12pt;\">Color of margins fill will be detected automatically.</span></p><p><span style=\" font-size:12pt; font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span><span style=\" font-size:12pt;\">Margins will be filled with white color.</span></p><p><span style=\" font-size:12pt; font-weight:600; text-decoration: underline;\">Checked - Black<br/></span><span style=\" font-size:12pt;\">Margins will be filled with black color.</span></p></body></html>", None))
+        self.NoDitheringBox.setText(_translate("KCC", "PNG output"))
-        self.BorderBox.setText(_translate("KCC", "W/B margins", None))
+        self.BorderBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>Color of margins fill will be detected automatically.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - White<br/></span>Margins will be filled with white color.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Black<br/></span>Margins will be filled with black color.</p></body></html>"))
-        self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Disable splitting and rotation.</span></p></body></html>", None))
+        self.BorderBox.setText(_translate("KCC", "W/B margins"))
-        self.NoRotateBox.setText(_translate("KCC", "No split/rotate", None))
+        self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting and rotation.</p></body></html>"))
-        self.DeviceBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Target device.</span></p></body></html>", None))
+        self.NoRotateBox.setText(_translate("KCC", "No split/rotate"))
-        self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Output format.</span></p></body></html>", None))
+        self.DeviceBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>"))
-        self.ConvertButton.setText(_translate("KCC", "Convert", None))
+        self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p  style=\'white-space:pre\'>Output format.</p></body></html>"))
-        self.DirectoryButton.setText(_translate("KCC", "Add directory", None))
+        self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>"))
-        self.FileButton.setText(_translate("KCC", "Add file", None))
+        self.ConvertButton.setText(_translate("KCC", "Convert"))
-        self.ClearButton.setText(_translate("KCC", "Clear list", None))
+        self.DirectoryButton.setText(_translate("KCC", "Add directory"))
-        self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Enable right-to-left reading.</span></p></body></html>", None))
+        self.FileButton.setText(_translate("KCC", "Add file"))
-        self.MangaBox.setText(_translate("KCC", "Manga mode", None))
+        self.ClearButton.setText(_translate("KCC", "Clear list"))
-        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\"font-size:12pt; font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span><span style=\"font-size:12pt; font-style:italic;\">Use it when Panel View support is not needed.</span><span style=\"font-size:12pt; font-weight:600; text-decoration: underline;\"><br/></span><span style=\"font-size:12pt;\">- Maximum quality when zoom is not enabled.<br/>- Poor quality when zoom is enabled.<br/>- Lowest file size.</span></p><p><span style=\"font-size:12pt; font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span><span style=\"font-size:12pt; font-style:italic;\">Not zoomed image </span><span style=\"font-size:12pt; font-weight:600; font-style:italic;\">might </span><span style=\"font-size:12pt; font-style:italic;\">be a little blurry.</span><span style=\"font-size:12pt; font-weight:600; text-decoration: underline;\"><br/></span><span style=\"font-size:12pt;\">- Medium/High quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.</span></p><p><span style=\"font-size:12pt; font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span><span style=\"font-size:12pt; font-style:italic;\">Maximum possible quality.</span><span style=\"font-size:12pt; font-weight:600; text-decoration: underline;\"><br/></span><span style=\"font-size:12pt;\">- Maximum quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.<br/>- Very high file size.</span></p></body></html>", None))
+        self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>"))
-        self.QualityBox.setText(_translate("KCC", "High/Ultra quality", None))
+        self.MangaBox.setText(_translate("KCC", "Manga mode"))
-        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Disable page spliting.<br/>They will be rotated instead.</span></p></body></html>", None))
+        self.QualityBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span><span style=\" font-style:italic;\">Use it when Panel View support is not needed.<br/></span>- Maximum quality when zoom is not enabled.<br/>- Poor quality when zoom is enabled.<br/>- Lowest file size.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span><span style=\" font-style:italic;\">Not zoomed image </span><span style=\" font-weight:600; font-style:italic;\">might</span><span style=\" font-style:italic;\"> be a little blurry.<br/></span>- High quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span><span style=\" font-style:italic;\">Maximum possible quality.<br/></span>- Maximum quality when zoom is not enabled.<br/>- Maximum quality when zoom is enabled.<br/>- Very high file size.</p></body></html>"))
-        self.RotateBox.setText(_translate("KCC", "Horizontal mode", None))
+        self.QualityBox.setText(_translate("KCC", "High/Ultra quality"))
-        self.BasicModeButton.setText(_translate("KCC", "Basic", None))
+        self.RotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>"))
-        self.AdvModeButton.setText(_translate("KCC", "Advanced", None))
+        self.RotateBox.setText(_translate("KCC", "Horizontal mode"))
-        self.GammaLabel.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">When converting color images setting this option to 1.0 </span><span style=\" font-size:12pt; font-weight:600;\">might</span><span style=\" font-size:12pt;\"> improve readability.</span></p></body></html>", None))
+        self.BasicModeButton.setText(_translate("KCC", "Basic"))
-        self.GammaLabel.setText(_translate("KCC", "Gamma: Auto", None))
+        self.AdvModeButton.setText(_translate("KCC", "Advanced"))
-        self.GammaSlider.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">When converting color images setting this option to 1.0 </span><span style=\" font-size:12pt; font-weight:600;\">might</span><span style=\" font-size:12pt;\"> improve readability.</span></p></body></html>", None))
+        self.GammaLabel.setText(_translate("KCC", "Gamma: Auto"))
-        self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Do not convert images to grayscale.</span></p></body></html>", None))
+        self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Don\'t convert images to grayscale.</p></body></html>"))
-        self.ColorBox.setText(_translate("KCC", "Color mode", None))
+        self.ColorBox.setText(_translate("KCC", "Color mode"))
-        self.wLabel.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Resolution of target device.</span></p></body></html>", None))
+        self.wLabel.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
-        self.wLabel.setText(_translate("KCC", "Custom width: ", None))
+        self.wLabel.setText(_translate("KCC", "Custom width: "))
-        self.customWidth.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Resolution of target device.</span></p></body></html>", None))
+        self.customWidth.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
-        self.customWidth.setInputMask(_translate("KCC", "0000; ", None))
+        self.customWidth.setInputMask(_translate("KCC", "0000"))
-        self.hLabel.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Resolution of target device.</span></p></body></html>", None))
+        self.hLabel.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
-        self.hLabel.setText(_translate("KCC", "Custom height: ", None))
+        self.hLabel.setText(_translate("KCC", "Custom height: "))
-        self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Resolution of target device.</span></p></body></html>", None))
+        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; ", None))
+        self.customHeight.setInputMask(_translate("KCC", "0000"))
-        self.ActionBasic.setText(_translate("KCC", "Basic", None))
+        self.ActionBasic.setText(_translate("KCC", "Basic"))
-        self.ActionAdvanced.setText(_translate("KCC", "Advanced", None))
+        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
 
-import KCC_rc
+from . import KCC_rc

kcc/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.5'
+__version__ = '4.0.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'

kcc/cbxarchive.py

@@ -1,5 +1,5 @@
-# Copyright (c) 2012-2013 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -15,21 +15,24 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
+
 __license__ = 'ISC'
-__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
 
+import sys
 import os
-import zipfile
+from zipfile import is_zipfile, ZipFile
-import rarfile
+from subprocess import STDOUT, PIPE
-import locale
+from psutil import Popen
-from subprocess import Popen, STDOUT, PIPE
+from shutil import move, copy
+from . import rarfile
 
 
 class CBxArchive:
     def __init__(self, origFileName):
         self.origFileName = origFileName
-        if zipfile.is_zipfile(origFileName):
+        if is_zipfile(origFileName):
             self.compressor = 'zip'
         elif rarfile.is_rarfile(origFileName):
             self.compressor = 'rar'
@@ -42,7 +45,7 @@ class CBxArchive:
         return self.compressor is not None
 
     def extractCBZ(self, targetdir):
-        cbzFile = zipfile.ZipFile(self.origFileName)
+        cbzFile = ZipFile(self.origFileName)
         filelist = []
         for f in cbzFile.namelist():
             if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('thumbs.db'):
@@ -50,14 +53,14 @@ class CBxArchive:
             elif f.endswith('/'):
                 try:
                     os.makedirs(os.path.join(targetdir, f))
-                except StandardError:
+                except Exception:
                     pass  # the dir exists so we are going to extract the images only.
             else:
                 filelist.append(f)
         cbzFile.extractall(targetdir, filelist)
 
     def extractCBR(self, targetdir):
-        cbrFile = rarfile.RarFile(self.origFileName.encode(locale.getpreferredencoding()))
+        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'):
@@ -65,25 +68,29 @@ class CBxArchive:
             elif f.endswith('/'):
                 try:
                     os.makedirs(os.path.join(targetdir, f))
-                except StandardError:
+                except Exception:
                     pass  # the dir exists so we are going to extract the images only.
             else:
-                filelist.append(f.encode(locale.getpreferredencoding()))
+                filelist.append(f)
         cbrFile.extractall(targetdir, filelist)
 
     def extractCB7(self, targetdir):
-        output = Popen('7za x "' + self.origFileName.encode(locale.getpreferredencoding()) +
+        # Workaround for some wide UTF-8 + Popen abnormalities
-                       '" -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -o"' + targetdir + '"',
+        if sys.platform.startswith('darwin'):
-                       stdout=PIPE, stderr=STDOUT, shell=True)
+            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)
         extracted = False
         for line in output.stdout:
-            if "Everything is Ok" in line:
+            if b"Everything is Ok" in line:
                 extracted = True
+        if sys.platform.startswith('darwin'):
+            os.remove(self.origFileName)
         if not extracted:
             raise OSError
 
     def extract(self, targetdir):
-        print "\n" + targetdir + "\n"
         if self.compressor == 'rar':
             self.extractCBR(targetdir)
         elif self.compressor == 'zip':
@@ -91,9 +98,14 @@ class CBxArchive:
         elif self.compressor == '7z':
             self.extractCB7(targetdir)
         adir = os.listdir(targetdir)
+        if 'ComicInfo.xml' in adir:
+            adir.remove('ComicInfo.xml')
         if len(adir) == 1 and os.path.isdir(os.path.join(targetdir, adir[0])):
-            import shutil
             for f in os.listdir(os.path.join(targetdir, adir[0])):
-                shutil.move(os.path.join(targetdir, adir[0], f), targetdir)
+                # 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.rename(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]))
         return targetdir

kcc/comic2ebook.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2012-2013 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,42 +17,53 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-__version__ = '3.5'
+
+__version__ = '4.0.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
 
 import os
 import sys
-import tempfile
+from re import split, sub
-import re
+from stat import S_IWRITE, S_IREAD, S_IEXEC
-import stat
+from zipfile import ZipFile, ZIP_STORED, ZIP_DEFLATED
-import string
+from tempfile import mkdtemp
-from shutil import move, copyfile, copytree, rmtree, make_archive
+from shutil import move, copyfile, copytree, rmtree
 from optparse import OptionParser, OptionGroup
-from multiprocessing import Pool, freeze_support
+from multiprocessing import Pool
+from xml.dom.minidom import parse
+from uuid import uuid4
+from slugify import slugify as slugifyExt
+from PIL import Image
 try:
-    from PyQt4 import QtCore
+    from PyQt5 import QtCore
 except ImportError:
     QtCore = None
-import comic2panel
+from .shared import md5Checksum, getImageFileName, walkLevel
-import image
+from . import comic2panel
-import cbxarchive
+from . import image
-import pdfjpgextract
+from . import cbxarchive
+from . import pdfjpgextract
 
 
-def buildHTML(path, imgfile):
+def buildHTML(path, imgfile, imgfilepath):
+    imgfilepath = md5Checksum(imgfilepath)
     filename = getImageFileName(imgfile)
     if filename is not None:
-        if "_kccrot" in str(filename):
+        if "Rotated" in theGreatIndex[imgfilepath]:
             rotatedPage = True
         else:
             rotatedPage = False
-        if "_kccnh" in str(filename):
+        if "NoPanelView" in theGreatIndex[imgfilepath]:
+            noPV = True
+        else:
+            noPV = False
+        if "NoHorizontalPanelView" in theGreatIndex[imgfilepath]:
             noHorizontalPV = True
         else:
             noHorizontalPV = False
-        if "_kccnv" in str(filename):
+        if "NoVerticalPanelView" in theGreatIndex[imgfilepath]:
             noVerticalPV = True
         else:
             noVerticalPV = False
@@ -71,7 +81,7 @@ def buildHTML(path, imgfile):
         if not os.path.exists(htmlpath):
             os.makedirs(htmlpath)
         htmlfile = os.path.join(htmlpath, filename[0] + '.html')
-        f = open(htmlfile, "w")
+        f = open(htmlfile, "w", encoding='UTF-8')
         f.writelines(["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" ",
                       "\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">\n",
                       "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n",
@@ -86,7 +96,7 @@ def buildHTML(path, imgfile):
                       "<div><img src=\"", "../" * backref, "Images/", postfix, imgfile, "\" alt=\"",
                       imgfile, "\" class=\"singlePage\"/></div>\n"
                       ])
-        if options.panelview:
+        if options.panelview and not noPV:
             if not noHorizontalPV and not noVerticalPV:
                 if rotatedPage:
                     if options.righttoleft:
@@ -102,9 +112,9 @@ def buildHTML(path, imgfile):
             elif noHorizontalPV and not noVerticalPV:
                 if rotatedPage:
                     if options.righttoleft:
-                        order = [2, 1]
-                    else:
                         order = [1, 2]
+                    else:
+                        order = [2, 1]
                 else:
                     order = [1, 2]
                 boxes = ["BoxT", "BoxB"]
@@ -125,36 +135,21 @@ def buildHTML(path, imgfile):
                               "'{\"targetId\":\"" + boxes[i] + "-Panel-Parent\", \"ordinal\":" + str(order[i]),
                               "}'></a></div>\n"])
             if options.quality == 2:
-                imgfilepv = string.split(imgfile, ".")
+                imgfilepv = str.split(imgfile, ".")
-                imgfilepv[0] = imgfilepv[0].split("_kccx")[0].replace("_kccnh", "").replace("_kccnv", "")
+                imgfilepv[0] += "-hq"
-                imgfilepv[0] += "_kcchq"
+                imgfilepv = ".".join(imgfilepv)
-                imgfilepv = string.join(imgfilepv, ".")
             else:
                 imgfilepv = imgfile
-            if "_kccx" in filename[0]:
+            xl, yu, xr, yd = checkMargins(imgfilepath)
-                xy = string.split(filename[0], "_kccx")[1]
+            boxStyles = {"BoxTL": "left:" + xl + ";top:" + yu + ";",
-                x = string.split(xy, "_kccy")[0].lstrip("0")
+                         "BoxTR": "right:" + xr + ";top:" + yu + ";",
-                y = string.split(xy, "_kccy")[1].lstrip("0")
+                         "BoxBL": "left:" + xl + ";bottom:" + yd + ";",
-                if x != "":
+                         "BoxBR": "right:" + xr + ";bottom:" + yd + ";",
-                    x = "-" + str(float(x)/100) + "%"
+                         "BoxT": "left:-25%;top:" + yu + ";",
-                else:
+                         "BoxB": "left:-25%;bottom:" + yd + ";",
-                    x = "0%"
+                         "BoxL": "left:" + xl + ";top:-25%;",
-                if y != "":
+                         "BoxR": "right:" + xr + ";top:-25%;",
-                    y = "-" + str(float(y)/100) + "%"
+                         "BoxC": "left:-25%;top:-25%;"
-                else:
-                    y = "0%"
-            else:
-                x = "0%"
-                y = "0%"
-            boxStyles = {"BoxTL": "left:" + x + ";top:" + y + ";",
-                         "BoxTR": "right:" + x + ";top:" + y + ";",
-                         "BoxBL": "left:" + x + ";bottom:" + y + ";",
-                         "BoxBR": "right:" + x + ";bottom:" + y + ";",
-                         "BoxT": "left:-25%;top:" + y + ";",
-                         "BoxB": "left:-25%;bottom:" + y + ";",
-                         "BoxL": "left:" + x + ";top:-25%;",
-                         "BoxR": "right:" + x + ";top:-25%;",
-                         "BoxC": "right:-25%;top:-25%;"
                          }
             for box in boxes:
                 f.writelines(["<div id=\"" + box + "-Panel-Parent\" class=\"target-mag-parent\"><div id=\"",
@@ -167,12 +162,38 @@ def buildHTML(path, imgfile):
         return path, imgfile
 
 
-def buildNCX(dstdir, title, chapters):
+def checkMargins(path):
-    from uuid import uuid4
+    for flag in theGreatIndex[path]:
+        if "Margins-" in flag:
+            flag = flag.split('-')
+            xl = flag[1]
+            yu = flag[2]
+            xr = flag[3]
+            yd = flag[4]
+            if xl != "0":
+                xl = "-" + str(float(xl)/100) + "%"
+            else:
+                xl = "0%"
+            if xr != "0":
+                xr = "-" + str(float(xr)/100) + "%"
+            else:
+                xr = "0%"
+            if yu != "0":
+                yu = "-" + str(float(yu)/100) + "%"
+            else:
+                yu = "0%"
+            if yd != "0":
+                yd = "-" + str(float(yd)/100) + "%"
+            else:
+                yd = "0%"
+            return xl, yu, xr, yd
+    return '0%', '0%', '0%', '0%'
+
+
+def buildNCX(dstdir, title, chapters, chapterNames):
     options.uuid = str(uuid4())
-    options.uuid = options.uuid.encode('utf-8')
     ncxfile = os.path.join(dstdir, 'OEBPS', 'toc.ncx')
-    f = open(ncxfile, "w")
+    f = open(ncxfile, "w", encoding='UTF-8')
     f.writelines(["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
                   "<!DOCTYPE ncx PUBLIC \"-//NISO//DTD ncx 2005-1//EN\" ",
                   "\"http://www.daisy.org/z3986/2005/ncx-2005-1.dtd\">\n",
@@ -184,16 +205,16 @@ def buildNCX(dstdir, title, chapters):
                   "<meta name=\"dtb:maxPageNumber\" content=\"0\"/>\n",
                   "<meta name=\"generated\" content=\"true\"/>\n",
                   "</head>\n",
-                  "<docTitle><text>", title.encode('utf-8'), "</text></docTitle>\n",
+                  "<docTitle><text>", title, "</text></docTitle>\n",
                   "<navMap>"
                   ])
     for chapter in chapters:
         folder = chapter[0].replace(os.path.join(dstdir, 'OEBPS'), '').lstrip('/').lstrip('\\\\')
         if os.path.basename(folder) != "Text":
-            title = os.path.basename(folder)
+            title = chapterNames[os.path.basename(folder)]
         filename = getImageFileName(os.path.join(folder, chapter[1]))
         f.write("<navPoint id=\"" + folder.replace('/', '_').replace('\\', '_') + "\"><navLabel><text>"
-                + title.encode('utf-8') + "</text></navLabel><content src=\"" + filename[0].replace("\\", "/")
+                + title + "</text></navLabel><content src=\"" + filename[0].replace("\\", "/")
                 + ".html\"/></navPoint>\n")
     f.write("</navMap>\n</ncx>")
     f.close()
@@ -208,17 +229,18 @@ def buildOPF(dstdir, title, filelist, cover=None):
         writingmode = "horizontal-rl"
     else:
         writingmode = "horizontal-lr"
-    f = open(opffile, "w")
+    f = open(opffile, "w", encoding='UTF-8')
     f.writelines(["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
                   "<package version=\"2.0\" unique-identifier=\"BookID\" ",
                   "xmlns=\"http://www.idpf.org/2007/opf\">\n",
                   "<metadata xmlns:opf=\"http://www.idpf.org/2007/opf\" ",
                   "xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n",
-                  "<dc:title>", title.encode('utf-8'), "</dc:title>\n",
+                  "<dc:title>", title, "</dc:title>\n",
                   "<dc:language>en-US</dc:language>\n",
-                  "<dc:identifier id=\"BookID\" opf:scheme=\"UUID\">", options.uuid, "</dc:identifier>\n",
+                  "<dc:identifier id=\"BookID\" opf:scheme=\"UUID\">", options.uuid, "</dc:identifier>\n"])
-                  "<dc:Creator>KCC</dc:Creator>\n",
+    for author in options.authors:
-                  "<meta name=\"generator\" content=\"KindleComicConverter-" + __version__ + "\"/>\n",
+        f.writelines(["<dc:creator>", author, "</dc:creator>\n"])
+    f.writelines(["<meta name=\"generator\" content=\"KindleComicConverter-" + __version__ + "\"/>\n",
                   "<meta name=\"RegionMagnification\" content=\"true\"/>\n",
                   "<meta name=\"region-mag\" content=\"true\"/>\n",
                   "<meta name=\"cover\" content=\"cover\"/>\n",
@@ -248,14 +270,14 @@ def buildOPF(dstdir, title, filelist, cover=None):
         filename = getImageFileName(path[1])
         uniqueid = os.path.join(folder, filename[0]).replace('/', '_').replace('\\', '_')
         reflist.append(uniqueid)
-        f.write("<item id=\"page_" + uniqueid + "\" href=\""
+        f.write("<item id=\"page_" + str(uniqueid) + "\" href=\""
                 + folder.replace('Images', 'Text') + "/" + filename[0]
                 + ".html\" media-type=\"application/xhtml+xml\"/>\n")
         if '.png' == filename[1]:
             mt = 'image/png'
         else:
             mt = 'image/jpeg'
-        f.write("<item id=\"img_" + uniqueid + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\""
+        f.write("<item id=\"img_" + str(uniqueid) + "\" href=\"" + folder + "/" + path[1] + "\" media-type=\""
                 + mt + "\"/>\n")
     f.write("<item id=\"css\" href=\"Text/style.css\" media-type=\"text/css\"/>\n")
     f.write("</manifest>\n<spine toc=\"ncx\">\n")
@@ -264,10 +286,7 @@ def buildOPF(dstdir, title, filelist, cover=None):
     f.write("</spine>\n<guide>\n</guide>\n</package>\n")
     f.close()
     os.mkdir(os.path.join(dstdir, 'META-INF'))
-    f = open(os.path.join(dstdir, 'mimetype'), 'w')
+    f = open(os.path.join(dstdir, 'META-INF', 'container.xml'), 'w', encoding='UTF-8')
-    f.write('application/epub+zip')
-    f.close()
-    f = open(os.path.join(dstdir, 'META-INF', 'container.xml'), 'w')
     f.writelines(["<?xml version=\"1.0\"?>\n",
                   "<container version=\"1.0\" xmlns=\"urn:oasis:names:tc:opendocument:xmlns:container\">\n",
                   "<rootfiles>\n",
@@ -278,40 +297,35 @@ def buildOPF(dstdir, title, filelist, cover=None):
     return
 
 
-def getImageFileName(imgfile):
+def applyImgOptimization(img, opt, hqImage=None):
-    filename = os.path.splitext(imgfile)
+    if not img.fill:
-    if filename[0].startswith('.') or\
+        img.getImageFill(opt.webtoon)
-            (filename[1].lower() != '.png' and
-             filename[1].lower() != '.jpg' and
-             filename[1].lower() != '.gif' and
-             filename[1].lower() != '.tif' and
-             filename[1].lower() != '.tiff' and
-             filename[1].lower() != '.bmp' and
-             filename[1].lower() != '.jpeg'):
-        return None
-    return filename
-
-
-def applyImgOptimization(img, opt, overrideQuality=5):
-    img.getImageFill(opt.webtoon)
     if not opt.webtoon:
         img.cropWhiteSpace(10.0)
     if opt.cutpagenumbers and not opt.webtoon:
         img.cutPageNumber()
     img.optimizeImage(opt.gamma)
-    if overrideQuality != 5:
+    if hqImage:
-        img.resizeImage(opt.upscale, opt.stretch, opt.bordersColor, overrideQuality)
+        img.resizeImage(opt.upscale, opt.stretch, opt.bordersColor, 0)
+        img.calculateBorder(hqImage, True)
     else:
         img.resizeImage(opt.upscale, opt.stretch, opt.bordersColor, opt.quality)
+        if opt.panelview:
+            if opt.quality == 0:
+                img.calculateBorder(img)
+            elif opt.quality == 1:
+                img.calculateBorder(img, True)
     if opt.forcepng and not opt.forcecolor:
         img.quantizeImage()
 
 
 def dirImgProcess(path):
-    global workerPool, workerOutput
+    global workerPool, workerOutput, theGreatIndex, theGreatWipe
     workerPool = Pool()
     workerOutput = []
     work = []
+    theGreatIndex = {}
+    theGreatWipe = []
     pagenumber = 0
     for (dirpath, dirnames, filenames) in os.walk(path):
         for afile in filenames:
@@ -319,7 +333,7 @@ def dirImgProcess(path):
                 pagenumber += 1
                 work.append([afile, dirpath, options])
     if GUI:
-        GUI.emit(QtCore.SIGNAL("progressBarTick"), pagenumber)
+        GUI.progressBarTick.emit(str(pagenumber))
     if len(work) > 0:
         for i in work:
             workerPool.apply_async(func=fileImgProcess, args=(i, ), callback=fileImgProcess_tick)
@@ -331,17 +345,27 @@ def dirImgProcess(path):
         if len(workerOutput) > 0:
             rmtree(os.path.join(path, '..', '..'), True)
             raise RuntimeError("One of workers crashed. Cause: " + workerOutput[0])
+        for file in theGreatWipe:
+            if os.path.isfile(file):
+                os.remove(file)
     else:
         rmtree(os.path.join(path, '..', '..'), True)
         raise UserWarning("Source directory is empty.")
 
 
 def fileImgProcess_tick(output):
-    if output:
+    if isinstance(output, str):
         workerOutput.append(output)
         workerPool.terminate()
+    else:
+        for page in output:
+            if page is not None:
+                if isinstance(page, str):
+                    theGreatWipe.append(page)
+                else:
+                    theGreatIndex[page[0]] = page[1]
     if GUI:
-        GUI.emit(QtCore.SIGNAL("progressBarTick"))
+        GUI.progressBarTick.emit('tick')
         if not GUI.conversionAlive:
             workerPool.terminate()
 
@@ -351,56 +375,61 @@ def fileImgProcess(work):
         afile = work[0]
         dirpath = work[1]
         opt = work[2]
-        if opt.verbose:
+        output = []
-            print "Optimizing " + afile + " for " + opt.profile
-        else:
-            print ".",
         img = image.ComicPage(os.path.join(dirpath, afile), opt.profileData)
         if opt.quality == 2:
             wipe = False
         else:
             wipe = True
         if opt.nosplitrotate:
-            split = None
+            splitter = None
         else:
-            split = img.splitPage(dirpath, opt.righttoleft, opt.rotate)
+            splitter = img.splitPage(dirpath, opt.righttoleft, opt.rotate)
-        if split is not None:
+        if splitter is not None:
-            if opt.verbose:
+            img0 = image.ComicPage(splitter[0], opt.profileData)
-                print "Splitted " + afile
-            img0 = image.ComicPage(split[0], opt.profileData)
             applyImgOptimization(img0, opt)
-            img0.saveToDir(dirpath, opt.forcepng, opt.forcecolor, wipe)
+            output.append(img0.saveToDir(dirpath, opt.forcepng, opt.forcecolor))
-            img1 = image.ComicPage(split[1], opt.profileData)
+            img1 = image.ComicPage(splitter[1], opt.profileData)
             applyImgOptimization(img1, opt)
-            img1.saveToDir(dirpath, opt.forcepng, opt.forcecolor, wipe)
+            output.append(img1.saveToDir(dirpath, opt.forcepng, opt.forcecolor))
+            if wipe:
+                output.append(img0.origFileName)
+                output.append(img1.origFileName)
             if opt.quality == 2:
-                img3 = image.ComicPage(split[0], opt.profileData)
+                img0b = image.ComicPage(splitter[0], opt.profileData, img0.fill)
-                applyImgOptimization(img3, opt, 0)
+                applyImgOptimization(img0b, opt, img0)
-                img3.saveToDir(dirpath, opt.forcepng, opt.forcecolor, True)
+                output.append(img0b.saveToDir(dirpath, opt.forcepng, opt.forcecolor))
-                img4 = image.ComicPage(split[1], opt.profileData)
+                img1b = image.ComicPage(splitter[1], opt.profileData, img1.fill)
-                applyImgOptimization(img4, opt, 0)
+                applyImgOptimization(img1b, opt, img1)
-                img4.saveToDir(dirpath, opt.forcepng, opt.forcecolor, True)
+                output.append(img1b.saveToDir(dirpath, opt.forcepng, opt.forcecolor))
+                output.append(img0.origFileName)
+                output.append(img1.origFileName)
+            output.append(img.origFileName)
         else:
             applyImgOptimization(img, opt)
-            img.saveToDir(dirpath, opt.forcepng, opt.forcecolor, wipe)
+            output.append(img.saveToDir(dirpath, opt.forcepng, opt.forcecolor))
+            if wipe:
+                output.append(img.origFileName)
             if opt.quality == 2:
-                img2 = image.ComicPage(os.path.join(dirpath, afile), opt.profileData)
+                img2 = image.ComicPage(os.path.join(dirpath, afile), opt.profileData, img.fill)
                 if img.rotated:
                     img2.image = img2.image.rotate(90)
                     img2.rotated = True
-                applyImgOptimization(img2, opt, 0)
+                applyImgOptimization(img2, opt, img)
-                img2.saveToDir(dirpath, opt.forcepng, opt.forcecolor, True)
+                output.append(img2.saveToDir(dirpath, opt.forcepng, opt.forcecolor))
-    except StandardError:
+                output.append(img.origFileName)
+        return output
+    except Exception:
         return str(sys.exc_info()[1])
 
 
-def genEpubStruct(path):
+def genEpubStruct(path, chapterNames):
     filelist = []
     chapterlist = []
     cover = None
     _, deviceres, _, _, panelviewsize = options.profileData
     os.mkdir(os.path.join(path, 'OEBPS', 'Text'))
-    f = open(os.path.join(path, 'OEBPS', 'Text', 'style.css'), 'w')
+    f = open(os.path.join(path, 'OEBPS', 'Text', 'style.css'), 'w', encoding='UTF-8')
     # DON'T COMPRESS CSS. KINDLE WILL FAIL TO PARSE IT.
     # Generic Panel View support + Margins fix for Non-Kindle devices.
     f.writelines(["@page {\n",
@@ -514,8 +543,8 @@ def genEpubStruct(path):
         chapter = False
         for afile in filenames:
             filename = getImageFileName(afile)
-            if filename is not None and not "_kcchq" in filename[0]:
+            if filename is not None and not '-kcc-hq' in filename[0]:
-                filelist.append(buildHTML(dirpath, afile))
+                filelist.append(buildHTML(dirpath, afile, os.path.join(dirpath, afile)))
                 if not chapter:
                     chapterlist.append((dirpath.replace('Images', 'Text'), filelist[-1][1]))
                     chapter = True
@@ -523,10 +552,10 @@ def genEpubStruct(path):
                     cover = os.path.join(os.path.join(path, 'OEBPS', 'Images'),
                                          'cover' + getImageFileName(filelist[-1][1])[1])
                     copyfile(os.path.join(filelist[-1][0], filelist[-1][1]), cover)
-    buildNCX(path, options.title, chapterlist)
+    buildNCX(path, options.title, chapterlist, chapterNames)
     # Ensure we're sorting files alphabetically
     convert = lambda text: int(text) if text.isdigit() else text
-    alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)]
+    alphanum_key = lambda key: [convert(c) for c in split('([0-9]+)', key)]
     filelist.sort(key=lambda name: (alphanum_key(name[0].lower()), alphanum_key(name[1].lower())))
     buildOPF(path, options.title, filelist, cover)
 
@@ -535,7 +564,7 @@ def getWorkFolder(afile):
     if len(afile) > 240:
         raise UserWarning("Path is too long.")
     if os.path.isdir(afile):
-        workdir = tempfile.mkdtemp('', 'KCC-TMP-')
+        workdir = mkdtemp('', 'KCC-TMP-')
         try:
             os.rmdir(workdir)   # needed for copytree() fails if dst already exists
             fullPath = os.path.join(workdir, 'OEBPS', 'Images')
@@ -554,15 +583,14 @@ def getWorkFolder(afile):
             rmtree(path, True)
             raise UserWarning("Failed to extract images.")
     else:
-        workdir = tempfile.mkdtemp('', 'KCC-TMP-')
+        workdir = mkdtemp('', 'KCC-TMP-')
         cbx = cbxarchive.CBxArchive(afile)
         if cbx.isCbxFile():
             try:
                 path = cbx.extract(workdir)
             except OSError:
                 rmtree(workdir, True)
-                print 'UnRAR/7za not found or file failed to extract!'
+                raise UserWarning("Failed to extract file.")
-                sys.exit(21)
         else:
             rmtree(workdir, True)
             raise TypeError
@@ -573,22 +601,65 @@ def getWorkFolder(afile):
     return path
 
 
+def checkComicInfo(path, originalPath):
+    xmlPath = os.path.join(path, 'ComicInfo.xml')
+    options.authors = ['KCC']
+    titleSuffix = ''
+    if options.title == 'defaulttitle':
+        defaultTitle = True
+        if os.path.isdir(originalPath):
+            options.title = os.path.basename(originalPath)
+        else:
+            options.title = os.path.splitext(os.path.basename(originalPath))[0]
+    else:
+        defaultTitle = False
+    if os.path.exists(xmlPath):
+        try:
+            xml = parse(xmlPath)
+        except Exception:
+            os.remove(xmlPath)
+            return
+        options.authors = []
+        if defaultTitle:
+            if len(xml.getElementsByTagName('Series')) != 0:
+                options.title = xml.getElementsByTagName('Series')[0].firstChild.nodeValue
+            if len(xml.getElementsByTagName('Volume')) != 0:
+                titleSuffix += ' V' + xml.getElementsByTagName('Volume')[0].firstChild.nodeValue
+            if len(xml.getElementsByTagName('Number')) != 0:
+                titleSuffix += ' #' + xml.getElementsByTagName('Number')[0].firstChild.nodeValue
+            options.title += titleSuffix
+        if len(xml.getElementsByTagName('Writer')) != 0:
+            authorsTemp = str.split(xml.getElementsByTagName('Writer')[0].firstChild.nodeValue, ', ')
+            for author in authorsTemp:
+                options.authors.append(author)
+        if len(xml.getElementsByTagName('Penciller')) != 0:
+            authorsTemp = str.split(xml.getElementsByTagName('Penciller')[0].firstChild.nodeValue, ', ')
+            for author in authorsTemp:
+                options.authors.append(author)
+        if len(xml.getElementsByTagName('Inker')) != 0:
+            authorsTemp = str.split(xml.getElementsByTagName('Inker')[0].firstChild.nodeValue, ', ')
+            for author in authorsTemp:
+                options.authors.append(author)
+        if len(xml.getElementsByTagName('Colorist')) != 0:
+            authorsTemp = str.split(xml.getElementsByTagName('Colorist')[0].firstChild.nodeValue, ', ')
+            for author in authorsTemp:
+                options.authors.append(author)
+        if len(options.authors) > 0:
+            options.authors = list(set(options.authors))
+            options.authors.sort()
+        else:
+            options.authors = ['KCC']
+        os.remove(xmlPath)
+
+
 def slugify(value):
-    # Normalizes string, converts to lowercase, removes non-alpha characters and converts spaces to hyphens.
+    value = slugifyExt(value)
-    import unicodedata
+    value = sub(r'0*([0-9]{4,})', r'\1', sub(r'([0-9]+)', r'0000\1', value))
-    if isinstance(value, str):
-        #noinspection PyArgumentList
-        value = unicodedata.normalize('NFKD', unicode(value, 'latin1')).encode('ascii', 'ignore')
-    elif isinstance(value, unicode):
-        value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
-    value = re.sub('[^\w\s\.-]', '', value).strip().lower()
-    value = re.sub('[-\.\s]+', '-', value)
-    value = re.sub(r'([0-9]+)', r'00000\1', value)
-    value = re.sub(r'0*([0-9]{6,})', r'\1', value)
     return value
 
 
 def sanitizeTree(filetree):
+    chapterNames = {}
     for root, dirs, files in os.walk(filetree, False):
         for name in files:
             if name.startswith('.') or name.lower() == 'thumbs.db':
@@ -599,26 +670,32 @@ def sanitizeTree(filetree):
                 while os.path.exists(os.path.join(root, slugified + splitname[1])) and splitname[0].upper()\
                         != slugified.upper():
                     slugified += "A"
-                os.rename(os.path.join(root, name), os.path.join(root, slugified + splitname[1]))
+                newKey = os.path.join(root, slugified + splitname[1])
+                key = os.path.join(root, name)
+                if key != newKey:
+                    os.rename(key, newKey)
         for name in dirs:
             if name.startswith('.'):
                 os.remove(os.path.join(root, name))
             else:
+                tmpName = name
                 slugified = slugify(name)
                 while os.path.exists(os.path.join(root, slugified)) and name.upper() != slugified.upper():
                     slugified += "A"
-                os.rename(os.path.join(root, name), os.path.join(root, slugified))
+                chapterNames[slugified] = tmpName
+                newKey = os.path.join(root, slugified)
+                key = os.path.join(root, name)
+                if key != newKey:
+                    os.rename(key, newKey)
+    return chapterNames
 
 
 def sanitizeTreeBeforeConversion(filetree):
     for root, dirs, files in os.walk(filetree, False):
         for name in files:
-            os.chmod(os.path.join(root, name), stat.S_IWRITE | stat.S_IREAD)
+            os.chmod(os.path.join(root, name), S_IWRITE | S_IREAD)
-            # Detect corrupted files - Phase 1
-            if os.path.getsize(os.path.join(root, name)) == 0:
-                os.remove(os.path.join(root, name))
         for name in dirs:
-            os.chmod(os.path.join(root, name), stat.S_IWRITE | stat.S_IREAD | stat.S_IEXEC)
+            os.chmod(os.path.join(root, name), S_IWRITE | S_IREAD | S_IEXEC)
 
 
 def getDirectorySize(start_path='.'):
@@ -631,23 +708,12 @@ def getDirectorySize(start_path='.'):
 
 
 def createNewTome():
-    tomePathRoot = tempfile.mkdtemp('', 'KCC-TMP-')
+    tomePathRoot = mkdtemp('', 'KCC-TMP-')
     tomePath = os.path.join(tomePathRoot, 'OEBPS', 'Images')
     os.makedirs(tomePath)
     return tomePath, tomePathRoot
 
 
-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):
-        yield root, dirs, files
-        num_sep_this = root.count(os.path.sep)
-        if num_sep + level <= num_sep_this:
-            del dirs[:]
-
-
 def splitDirectory(path, mode):
     output = []
     currentSize = 0
@@ -721,13 +787,13 @@ def preSplitDirectory(path):
             mode = 0
         else:
             if filesNumber > 0:
-                print '\nWARNING: Automatic output splitting failed.'
+                print('\nWARNING: Automatic output splitting failed.')
                 if GUI:
-                    GUI.emit(QtCore.SIGNAL("addMessage"), 'Automatic output splitting failed. <a href='
+                    GUI.addMessage.emit('Automatic output splitting failed. <a href='
-                                                          '"https://github.com/ciromattia/kcc/wiki'
+                                        '"https://github.com/ciromattia/kcc/wiki'
-                                                          '/Automatic-output-splitting">'
+                                        '/Automatic-output-splitting">'
-                                                          'More details.</a>', 'warning')
+                                        'More details.</a>', 'warning', False)
-                    GUI.emit(QtCore.SIGNAL("addMessage"), '')
+                    GUI.addMessage.emit('', '', False)
                 return [path]
             detectedSubSubdirectories = False
             detectedFilesInSubdirectories = False
@@ -736,13 +802,13 @@ def preSplitDirectory(path):
                     if len(dirs) != 0:
                         detectedSubSubdirectories = True
                     elif len(dirs) == 0 and detectedSubSubdirectories:
-                        print '\nWARNING: Automatic output splitting failed.'
+                        print('\nWARNING: Automatic output splitting failed.')
                         if GUI:
-                            GUI.emit(QtCore.SIGNAL("addMessage"), 'Automatic output splitting failed. <a href='
+                            GUI.addMessage.emit('Automatic output splitting failed. <a href='
-                                                                  '"https://github.com/ciromattia/kcc/wiki'
+                                                '"https://github.com/ciromattia/kcc/wiki'
-                                                                  '/Automatic-output-splitting">'
+                                                '/Automatic-output-splitting">'
-                                                                  'More details.</a>', 'warning')
+                                                'More details.</a>', 'warning', False)
-                            GUI.emit(QtCore.SIGNAL("addMessage"), '')
+                            GUI.addMessage.emit('', '', False)
                         return [path]
                     if len(files) != 0:
                         detectedFilesInSubdirectories = True
@@ -753,18 +819,18 @@ def preSplitDirectory(path):
                 # One level of subdirectories
                 mode = 1
             if detectedFilesInSubdirectories and detectedSubSubdirectories:
-                print '\nWARNING: Automatic output splitting failed.'
+                print('\nWARNING: Automatic output splitting failed.')
                 if GUI:
-                    GUI.emit(QtCore.SIGNAL("addMessage"), 'Automatic output splitting failed. <a href='
+                    GUI.addMessage.emit('Automatic output splitting failed. <a href='
-                                                          '"https://github.com/ciromattia/kcc/wiki'
+                                        '"https://github.com/ciromattia/kcc/wiki'
-                                                          '/Automatic-output-splitting">'
+                                        '/Automatic-output-splitting">'
-                                                          'More details.</a>', 'warning')
+                                        'More details.</a>', 'warning', False)
-                    GUI.emit(QtCore.SIGNAL("addMessage"), '')
+                    GUI.addMessage.emit('', '', False)
                 return [path]
         # Split directories
-        split = splitDirectory(os.path.join(path, 'OEBPS', 'Images'), mode)
+        splitter = splitDirectory(os.path.join(path, 'OEBPS', 'Images'), mode)
         path = [path]
-        for tome in split:
+        for tome in splitter:
             path.append(tome)
         return path
     else:
@@ -772,13 +838,46 @@ def preSplitDirectory(path):
         return [path]
 
 
+def detectCorruption(tmpPath, orgPath):
+    for root, dirs, files in os.walk(tmpPath, False):
+        for name in files:
+            if getImageFileName(name) is not None:
+                path = os.path.join(root, name)
+                pathOrg = os.path.join(orgPath, name)
+                if os.path.getsize(path) == 0:
+                    rmtree(os.path.join(tmpPath, '..', '..'), True)
+                    raise RuntimeError('Image file %s is corrupted.' % pathOrg)
+                try:
+                    img = Image.open(path)
+                    img.verify()
+                    img = Image.open(path)
+                    img.load()
+                except Exception:
+                    rmtree(os.path.join(tmpPath, '..', '..'), True)
+                    raise RuntimeError('Image file %s is corrupted.' % pathOrg)
+
+
+def makeZIP(zipFilename, baseDir, isEPUB=False):
+    zipFilename = os.path.abspath(zipFilename) + '.zip'
+    zipOutput = ZipFile(zipFilename, 'w', ZIP_DEFLATED)
+    if isEPUB:
+        zipOutput.writestr('mimetype', 'application/epub+zip', ZIP_STORED)
+    for dirpath, dirnames, filenames in os.walk(baseDir):
+        for name in filenames:
+            path = os.path.normpath(os.path.join(dirpath, name))
+            aPath = os.path.normpath(os.path.join(dirpath.replace(baseDir, ''), name))
+            if os.path.isfile(path):
+                zipOutput.write(path, aPath)
+    zipOutput.close()
+    return zipFilename
+
+
 def Copyright():
-    print ('comic2ebook v%(__version__)s. '
+    print(('comic2ebook v%(__version__)s. Written by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals()))
-           'Written 2013 by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals())
 
 
 def Usage():
-    print "Generates EPUB/CBZ comic ebook from a bunch of images."
+    print("Generates EPUB/CBZ comic ebook from a bunch of images.")
     parser.print_help()
 
 
@@ -792,7 +891,7 @@ def main(argv=None, qtGUI=None):
     otherOptions = OptionGroup(parser, "OTHER")
     mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KHD",
                            help="Device profile (Choose one among K1, K2, K345, KDX, KHD, KF, KFHD, KFHD8, KFHDX,"
-                                " KFHDX8, KFA) [Default=KHD]")
+                                " KFHDX8, KFA, KoMT, KoG, KoA, KoAHD) [Default=KHD]")
     mainOptions.add_option("-q", "--quality", type="int", dest="quality", default="0",
                            help="Quality of Panel View. 0 - Normal 1 - High 2 - Ultra [Default=0]")
     mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
@@ -833,8 +932,6 @@ def main(argv=None, qtGUI=None):
                                     help="Replace screen width provided by device profile")
     customProfileOptions.add_option("--customheight", type="int", dest="customheight", default=0,
                                     help="Replace screen height provided by device profile")
-    otherOptions.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False,
-                            help="Verbose output")
     otherOptions.add_option("-h", "--help", action="help",
                             help="Show this help message and exit")
     parser.add_option_group(mainOptions)
@@ -846,28 +943,29 @@ def main(argv=None, qtGUI=None):
     checkOptions()
     if qtGUI:
         GUI = qtGUI
-        GUI.emit(QtCore.SIGNAL("progressBarTick"), 1)
+        GUI.progressBarTick.emit('1')
     else:
         GUI = None
     if len(args) != 1:
         parser.print_help()
         return
     path = getWorkFolder(args[0])
+    print("\nChecking images...")
+    detectCorruption(os.path.join(path, "OEBPS", "Images"), args[0])
+    checkComicInfo(os.path.join(path, "OEBPS", "Images"), args[0])
     if options.webtoon:
-        if GUI:
-            GUI.emit(QtCore.SIGNAL("progressBarTick"), 'status', 'Splitting images')
         if options.customheight > 0:
-            comic2panel.main(['-y ' + str(options.customheight), '-i', path], qtGUI)
+            comic2panel.main(['-y ' + str(options.customheight), '-i', '-m', path], qtGUI)
         else:
-            comic2panel.main(['-y ' + str(image.ProfileData.Profiles[options.profile][1][1]), '-i', path], qtGUI)
+            comic2panel.main(['-y ' + str(image.ProfileData.Profiles[options.profile][1][1]), '-i', '-m', path], qtGUI)
     if options.imgproc:
-        print "\nProcessing images..."
+        print("\nProcessing images...")
         if GUI:
-            GUI.emit(QtCore.SIGNAL("progressBarTick"), 'status', 'Processing images')
+            GUI.progressBarTick.emit('Processing images')
-        dirImgProcess(path + "/OEBPS/Images/")
+        dirImgProcess(os.path.join(path, "OEBPS", "Images"))
     if GUI:
-        GUI.emit(QtCore.SIGNAL("progressBarTick"), 1)
+        GUI.progressBarTick.emit('1')
-    sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
+    chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
     if options.batchsplit:
         tomes = preSplitDirectory(path)
     else:
@@ -876,41 +974,37 @@ def main(argv=None, qtGUI=None):
     tomeNumber = 0
     if GUI:
         if options.cbzoutput:
-            GUI.emit(QtCore.SIGNAL("progressBarTick"), 'status', 'Compressing CBZ files')
+            GUI.progressBarTick.emit('Compressing CBZ files')
         else:
-            GUI.emit(QtCore.SIGNAL("progressBarTick"), 'status', 'Compressing EPUB files')
+            GUI.progressBarTick.emit('Compressing EPUB files')
-        GUI.emit(QtCore.SIGNAL("progressBarTick"), len(tomes))
+        GUI.progressBarTick.emit(str(len(tomes) + 1))
+        GUI.progressBarTick.emit('tick')
+    options.baseTitle = options.title
     for tome in tomes:
-        if GUI:
-            GUI.emit(QtCore.SIGNAL("progressBarTick"))
-        if os.path.isdir(args[0]):
-            barePath = os.path.basename(args[0])
-        else:
-            barePath = os.path.splitext(os.path.basename(args[0]))[0]
         if len(tomes) > 1:
             tomeNumber += 1
-            options.title = barePath + ' ' + str(tomeNumber)
+            options.title = options.baseTitle + ' [' + str(tomeNumber) + '/' + str(len(tomes)) + ']'
-        elif options.title == 'defaulttitle':
-            options.title = barePath
         if options.cbzoutput:
             # if CBZ output wanted, compress all images and return filepath
-            print "\nCreating CBZ file..."
+            print("\nCreating CBZ file...")
             if len(tomes) > 1:
                 filepath.append(getOutputFilename(args[0], options.output, '.cbz', ' ' + str(tomeNumber)))
             else:
                 filepath.append(getOutputFilename(args[0], options.output, '.cbz', ''))
-            make_archive(tome + '_comic', 'zip', tome + '/OEBPS/Images')
+            makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"))
         else:
-            print "\nCreating EPUB structure..."
+            print("\nCreating EPUB structure...")
-            genEpubStruct(tome)
+            genEpubStruct(tome, chapterNames)
             # actually zip the ePub
             if len(tomes) > 1:
                 filepath.append(getOutputFilename(args[0], options.output, '.epub', ' ' + str(tomeNumber)))
             else:
                 filepath.append(getOutputFilename(args[0], options.output, '.epub', ''))
-            make_archive(tome + '_comic', 'zip', tome)
+            makeZIP(tome + '_comic', tome, True)
         move(tome + '_comic.zip', filepath[-1])
         rmtree(tome, True)
+        if GUI:
+            GUI.progressBarTick.emit('tick')
     return filepath
 
 
@@ -921,9 +1015,10 @@ def getOutputFilename(srcpath, wantedname, ext, tomeNumber):
         if wantedname.endswith(ext):
             filename = os.path.abspath(wantedname)
         elif os.path.isdir(srcpath):
-            filename = os.path.abspath(options.output) + "/" + os.path.basename(srcpath) + ext
+            filename = os.path.join(os.path.abspath(options.output), os.path.basename(srcpath) + ext)
         else:
-            filename = os.path.abspath(options.output) + "/" + os.path.basename(os.path.splitext(srcpath)[0]) + ext
+            filename = os.path.join(os.path.abspath(options.output),
+                                    os.path.basename(os.path.splitext(srcpath)[0]) + ext)
     elif os.path.isdir(srcpath):
         filename = srcpath + tomeNumber + ext
     else:
@@ -964,10 +1059,18 @@ def checkOptions():
     if options.profile == 'OTHER':
         options.panelview = False
         options.quality = 0
+    if 'Ko' in options.profile:
+        options.panelview = False
+        # Kobo models can't use ultra quality mode
+        if options.quality == 2:
+            options.quality = 1
     # Kindle for Android profile require target resolution.
     if options.profile == 'KFA' and (options.customwidth == 0 or options.customheight == 0):
-        print "ERROR: Kindle for Android profile require --customwidth and --customheight options!"
+        print("ERROR: Kindle for Android profile require --customwidth and --customheight options!")
         sys.exit(1)
+    # CBZ files on Kindle DX/DXG support higher resolution
+    if options.profile == 'KDX' and options.cbzoutput:
+        options.customheight = 1200
     # Override profile data
     if options.customwidth != 0 or options.customheight != 0:
         X = image.ProfileData.Profiles[options.profile][1][0]
@@ -980,11 +1083,4 @@ def checkOptions():
                       (int(X*1.5), int(Y*1.5)))
         image.ProfileData.Profiles["Custom"] = newProfile
         options.profile = "Custom"
-    options.profileData = image.ProfileData.Profiles[options.profile]
+    options.profileData = image.ProfileData.Profiles[options.profile]
-
-
-if __name__ == "__main__":
-    freeze_support()
-    Copyright()
-    main(sys.argv[1:])
-    sys.exit(0)

kcc/comic2panel.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2012-2013 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,49 +17,75 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-__version__ = '3.5'
+
+__version__ = '4.0.1'
 __license__ = 'ISC'
-__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
 
 import os
 import sys
 from shutil import rmtree, copytree, move
 from optparse import OptionParser, OptionGroup
-from multiprocessing import Pool, freeze_support
+from multiprocessing import Pool
+from PIL import Image, ImageStat
+from .shared import getImageFileName, walkLevel
 try:
-    #noinspection PyUnresolvedReferences
+    from PyQt5 import QtCore
-    from PIL import Image, ImageStat
-    if tuple(map(int, ('2.2.1'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
-        print "ERROR: Pillow 2.2.1 or newer is required!"
-        exit(1)
-except ImportError:
-    print "ERROR: Pillow is not installed!"
-    exit(1)
-try:
-    from PyQt4 import QtCore
 except ImportError:
     QtCore = None
 
 
-def getImageFileName(imgfile):
+def mergeDirectory_tick(output):
-    filename = os.path.splitext(imgfile)
+    if output:
-    if filename[0].startswith('.') or\
+        mergeWorkerOutput.append(output)
-            (filename[1].lower() != '.png' and
+        mergeWorkerPool.terminate()
-             filename[1].lower() != '.jpg' and
+    if GUI:
-             filename[1].lower() != '.gif' and
+        GUI.progressBarTick.emit('tick')
-             filename[1].lower() != '.tif' and
+        if not GUI.conversionAlive:
-             filename[1].lower() != '.tiff' and
+            mergeWorkerPool.terminate()
-             filename[1].lower() != '.bmp' and
+
-             filename[1].lower() != '.jpeg'):
+
-        return None
+def mergeDirectory(work):
-    return filename
+    try:
+        directory = work[0]
+        images = []
+        imagesClear = []
+        sizes = []
+        h = 0
+        for root, dirs, files in walkLevel(directory, 0):
+            for name in files:
+                if getImageFileName(name) is not None:
+                    i = Image.open(os.path.join(root, name))
+                    images.append([os.path.join(root, name), i.size[0], i.size[1]])
+                    sizes.append(i.size[0])
+        if len(images) > 0:
+            mw = max(set(sizes), key=sizes.count)
+            for i in images:
+                if i[1] == mw:
+                    h += i[2]
+                    imagesClear.append(i[0])
+            # Silently drop directories that contain too many images
+            if h > 262144:
+                return None
+            result = Image.new('RGB', (mw, h))
+            y = 0
+            for i in imagesClear:
+                img = Image.open(i)
+                img = img.convert('RGB')
+                result.paste(img, (0, y))
+                y += img.size[1]
+                os.remove(i)
+            savePath = os.path.split(imagesClear[0])
+            result.save(os.path.join(savePath[0], os.path.splitext(savePath[1])[0] + '.png'), 'PNG')
+    except Exception:
+        return str(sys.exc_info()[1])
 
 
 def sanitizePanelSize(panel, opt):
     newPanels = []
     if panel[2] > 8 * opt.height:
-        diff = (panel[2] / 8)
+        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])
@@ -70,14 +95,14 @@ def sanitizePanelSize(panel, opt):
         newPanels.append([panel[1] - diff*2, panel[1] - diff, diff])
         newPanels.append([panel[1] - diff, panel[1], diff])
     elif panel[2] > 4 * opt.height:
-        diff = (panel[2] / 4)
+        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[1] - diff, panel[1], diff])
     elif panel[2] > 2 * opt.height:
-        newPanels.append([panel[0], panel[1] - (panel[2] / 2), (panel[2] / 2)])
+        newPanels.append([panel[0], panel[1] - int(panel[2] / 2), int(panel[2] / 2)])
-        newPanels.append([panel[1] - (panel[2] / 2), panel[1], (panel[2] / 2)])
+        newPanels.append([panel[1] - int(panel[2] / 2), panel[1], int(panel[2] / 2)])
     else:
         newPanels = [panel]
     return newPanels
@@ -88,7 +113,7 @@ def splitImage_tick(output):
         splitWorkerOutput.append(output)
         splitWorkerPool.terminate()
     if GUI:
-        GUI.emit(QtCore.SIGNAL("progressBarTick"))
+        GUI.progressBarTick.emit('tick')
         if not GUI.conversionAlive:
             splitWorkerPool.terminate()
 
@@ -102,24 +127,8 @@ def splitImage(work):
         # Harcoded opttions
         threshold = 1.0
         delta = 15
-        print ".",
         fileExpanded = os.path.splitext(name)
         filePath = os.path.join(path, name)
-        # Detect corrupted files
-        try:
-            Image.open(filePath)
-        except IOError:
-            raise RuntimeError('Cannot read image file %s' % filePath)
-        try:
-            image = Image.open(filePath)
-            image.verify()
-        except:
-            raise RuntimeError('Image file %s is corrupted' % filePath)
-        try:
-            image = Image.open(filePath)
-            image.load()
-        except:
-            raise RuntimeError('Image file %s is corrupted' % filePath)
         image = Image.open(filePath)
         image = image.convert('RGB')
         widthImg, heightImg = image.size
@@ -194,17 +203,16 @@ def splitImage(work):
                                               str(pageNumber) + '.png'), 'PNG')
                     pageNumber += 1
             os.remove(filePath)
-    except StandardError:
+    except Exception:
         return str(sys.exc_info()[1])
 
 
 def Copyright():
-    print ('comic2panel v%(__version__)s. '
+    print(('comic2panel v%(__version__)s. Written by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals()))
-           'Written 2013 by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals())
 
 
 def main(argv=None, qtGUI=None):
-    global options, GUI, splitWorkerPool, splitWorkerOutput
+    global options, GUI, splitWorkerPool, splitWorkerOutput, mergeWorkerPool, mergeWorkerOutput
     parser = OptionParser(usage="Usage: %prog [options] comic_folder", add_help_option=False)
     mainOptions = OptionGroup(parser, "MANDATORY")
     otherOptions = OptionGroup(parser, "OTHER")
@@ -212,6 +220,8 @@ def main(argv=None, qtGUI=None):
                            help="Height of the target device screen")
     mainOptions.add_option("-i", "--in-place", action="store_true", dest="inPlace", default=False,
                            help="Overwrite source directory")
+    mainOptions.add_option("-m", "--merge", action="store_true", dest="merge", default=False,
+                           help="Combine every directory into a single image before splitting")
     otherOptions.add_option("-d", "--debug", action="store_true", dest="debug", default=False,
                             help="Create debug file for every splitted image")
     otherOptions.add_option("-h", "--help", action="help",
@@ -229,14 +239,38 @@ def main(argv=None, qtGUI=None):
     if options.height > 0:
         options.sourceDir = args[0]
         options.targetDir = args[0] + "-Splitted"
-        print "\nSplitting images..."
         if os.path.isdir(options.sourceDir):
             rmtree(options.targetDir, True)
             copytree(options.sourceDir, options.targetDir)
             work = []
-            pagenumber = 0
+            pagenumber = 1
             splitWorkerOutput = []
             splitWorkerPool = Pool()
+            if options.merge:
+                print("\nMerging images...")
+                directoryNumer = 1
+                mergeWork = []
+                mergeWorkerOutput = []
+                mergeWorkerPool = Pool()
+                mergeWork.append([options.targetDir])
+                for root, dirs, files in os.walk(options.targetDir, False):
+                    for directory in dirs:
+                        directoryNumer += 1
+                        mergeWork.append([os.path.join(root, directory)])
+                if GUI:
+                    GUI.progressBarTick.emit('Combining images')
+                    GUI.progressBarTick.emit(str(directoryNumer))
+                for i in mergeWork:
+                    mergeWorkerPool.apply_async(func=mergeDirectory, args=(i, ), callback=mergeDirectory_tick)
+                mergeWorkerPool.close()
+                mergeWorkerPool.join()
+                if GUI and not GUI.conversionAlive:
+                    rmtree(options.targetDir, True)
+                    raise UserWarning("Conversion interrupted.")
+                if len(mergeWorkerOutput) > 0:
+                    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 name in files:
                     if getImageFileName(name) is not None:
@@ -245,7 +279,9 @@ def main(argv=None, qtGUI=None):
                     else:
                         os.remove(os.path.join(root, name))
             if GUI:
-                GUI.emit(QtCore.SIGNAL("progressBarTick"), pagenumber)
+                GUI.progressBarTick.emit('Splitting images')
+                GUI.progressBarTick.emit(str(pagenumber))
+                GUI.progressBarTick.emit('tick')
             if len(work) > 0:
                 for i in work:
                     splitWorkerPool.apply_async(func=splitImage, args=(i, ), callback=splitImage_tick)
@@ -266,11 +302,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.")
-
-
-if __name__ == "__main__":
-    freeze_support()
-    Copyright()
-    main(sys.argv[1:])
-    sys.exit(0)

kcc/image.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2010  Alex Yatskov
 # Copyright (C) 2011  Stanislav (proDOOMman) Kosolapov <prodoomman@gmail.com>
-# Copyright (C) 2012-2013  Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (C) 2013 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,19 +17,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 __license__ = 'ISC'
-__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
 
 import os
-try:
+from functools import reduce
-    # noinspection PyUnresolvedReferences
+from PIL import Image, ImageOps, ImageStat, ImageChops
-    from PIL import Image, ImageOps, ImageStat, ImageChops
+from .shared import md5Checksum
-    if tuple(map(int, ('2.2.1'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
-        print "ERROR: Pillow 2.2.1 or newer is required!"
-        exit(1)
-except ImportError:
-    print "ERROR: Pillow is not installed!"
-    exit(1)
 
 
 class ProfileData:
@@ -94,113 +88,84 @@ class ProfileData:
         'KFHD8': ("K. Fire HD 8.9\"", (1200, 1920), PalleteNull, 1.0, (1800, 2880)),
         'KFHDX': ("K. Fire HDX 7\"", (1200, 1920), PalleteNull, 1.0, (1800, 2880)),
         'KFHDX8': ("K. Fire HDX 8.9\"", (1600, 2560), PalleteNull, 1.0, (2400, 3840)),
+        'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8, (900, 1200)),
+        'KoG': ("Kobo Glow", (768, 1024), Palette16, 1.8, (1152, 1536)),
+        'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.8, (1137, 1536)),
+        'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.8, (1620, 2160)),
         'KFA': ("Kindle for Android", (0, 0), PalleteNull, 1.0, (0, 0)),
         'OTHER': ("Other", (0, 0), Palette16, 1.8, (0, 0)),
     }
 
-    ProfileLabels = {
-        "Kindle 1": 'K1',
-        "Kindle 2": 'K2',
-        "Kindle": 'K345',
-        "Kindle Paperwhite": 'KHD',
-        "Kindle DX/DXG": 'KDX',
-        "Kindle Fire": 'KF',
-        "K. Fire HD 7\"": 'KFHD',
-        "K. Fire HD 8.9\"": 'KFHD8',
-        "K. Fire HDX 7\"": 'KFHDX',
-        "K. Fire HDX 8.9\"": 'KFHDX8',
-        "Kindle for Android": 'KFA',
-        "Other": 'OTHER'
-    }
-
-    ProfileLabelsGUI = [
-        "Kindle Paperwhite",
-        "Kindle",
-        "Separator",
-        "K. Fire HD 7\"",
-        "K. Fire HD 8.9\"",
-        "K. Fire HDX 7\"",
-        "K. Fire HDX 8.9\"",
-        "Separator",
-        "Kindle for Android",
-        "Other",
-        "Separator",
-        "Kindle 1",
-        "Kindle 2",
-        "Kindle DX/DXG",
-        "Kindle Fire"
-    ]
-
 
 class ComicPage:
-    def __init__(self, source, device):
+    def __init__(self, source, device, fill=None):
         try:
             self.profile_label, self.size, self.palette, self.gamma, self.panelviewsize = device
         except KeyError:
             raise RuntimeError('Unexpected output device %s' % device)
-        # Detect corrupted files - Phase 2
+        self.origFileName = source
-        try:
+        self.filename = os.path.basename(self.origFileName)
-            self.origFileName = source
-            self.filename = os.path.basename(self.origFileName)
-            self.image = Image.open(source)
-        except IOError:
-            raise RuntimeError('Cannot read image file %s' % source)
-        # Detect corrupted files - Phase 3
-        try:
-            self.image = Image.open(source)
-            self.image.verify()
-        except:
-            raise RuntimeError('Image file %s is corrupted' % source)
-        # Detect corrupted files - Phase 4
-        try:
-            self.image = Image.open(source)
-            self.image.load()
-        except:
-            raise RuntimeError('Image file %s is corrupted' % source)
         self.image = Image.open(source)
         self.image = self.image.convert('RGB')
+        self.color = self.isImageColor()
         self.rotated = None
         self.border = None
         self.noHPV = None
         self.noVPV = None
-        self.fill = None
+        self.noPV = None
+        self.purge = False
+        self.hq = False
+        if fill:
+            self.fill = fill
+        else:
+            self.fill = None
 
-    def saveToDir(self, targetdir, forcepng, color, wipe):
+    def saveToDir(self, targetdir, forcepng, color):
         try:
-            suffix = ""
+            if not self.purge:
-            if not color and not forcepng:
+                flags = []
-                self.image = self.image.convert('L')
+                filename = os.path.join(targetdir, os.path.splitext(self.filename)[0]) + '-KCC'
-            if self.rotated:
+                if not color and not forcepng:
-                suffix += "_kccrot"
+                    self.image = self.image.convert('L')
-            if wipe:
+                if self.rotated:
-                os.remove(os.path.join(targetdir, self.filename))
+                    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 forcepng:
+                    filename += ".png"
+                    self.image.save(filename,  "PNG", optimize=1)
+                else:
+                    filename += ".jpg"
+                    self.image.save(filename, "JPEG", optimize=1)
+                return [md5Checksum(filename), flags]
             else:
-                suffix += "_kcchq"
+                return None
-            if self.noHPV:
-                suffix += "_kccnh"
-            if self.noVPV:
-                suffix += "_kccnv"
-            if self.border:
-                suffix += "_kccx" + str(self.border[0]) + "_kccy" + str(self.border[1])
-            if forcepng:
-                self.image.save(os.path.join(targetdir, os.path.splitext(self.filename)[0] + suffix + ".png"), "PNG",
-                                optimize=1)
-            else:
-                self.image.save(os.path.join(targetdir, os.path.splitext(self.filename)[0] + suffix + ".jpg"), "JPEG",
-                                optimize=1)
         except IOError as e:
             raise RuntimeError('Cannot write image in directory %s: %s' % (targetdir, e))
 
     def optimizeImage(self, gamma):
         if gamma < 0.1:
             gamma = self.gamma
+            if self.gamma != 1.0 and self.color:
+                gamma = 1.0
         if gamma == 1.0:
             self.image = ImageOps.autocontrast(self.image)
         else:
             self.image = ImageOps.autocontrast(Image.eval(self.image, lambda a: 255 * (a / 255.) ** gamma))
 
     def quantizeImage(self):
-        colors = len(self.palette) / 3
+        colors = len(self.palette) // 3
         if colors < 256:
             self.palette += self.palette[:3] * (256 - colors)
         palImg = Image.new('P', (1, 1))
@@ -210,84 +175,95 @@ 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
+            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()
+        else:
+            border = sourceImage.image.getbbox()
+        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.noHPV = True
+            if int((border[3] - border[1]) * multiplier) < self.size[1]:
+                self.noVPV = True
+        else:
+            self.border = [0, 0, 0, 0]
+            self.noHPV = True
+            self.noVPV = True
+
     def resizeImage(self, upscale=False, stretch=False, bordersColor=None, qualityMode=0):
-        # High-quality downscaling filter
-        method = Image.ANTIALIAS
         if bordersColor:
             fill = bordersColor
         else:
             fill = self.fill
+        # Set target size
         if qualityMode == 0:
             size = (self.size[0], self.size[1])
-            generateBorder = True
+        elif qualityMode == 1 and not stretch and not 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:
             size = (self.panelviewsize[0], self.panelviewsize[1])
-            generateBorder = True
+        elif qualityMode == 2 and not stretch and not upscale and self.image.size[0] <=\
+                self.size[0] and self.image.size[1] <= self.size[1]:
+            self.purge = True
+            return self.image
         else:
+            self.hq = True
             size = (self.panelviewsize[0], self.panelviewsize[1])
-            generateBorder = False
-        # If image is smaller than screen and upscale is off - Just expand it
-        if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
-            if not upscale:
-                borderw = (self.size[0] - self.image.size[0]) / 2
-                borderh = (self.size[1] - self.image.size[1]) / 2
-                self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=fill)
-                if generateBorder:
-                    if (self.image.size[0]-(2*borderw))*1.5 < self.size[0]:
-                        self.noHPV = True
-                    if (self.image.size[1]-(2*borderh))*1.5 < self.size[1]:
-                        self.noVPV = True
-                    self.border = [int(round(float(borderw)/float(self.image.size[0])*100, 2)*100*1.5),
-                                   int(round(float(borderh)/float(self.image.size[1])*100, 2)*100*1.5)]
-                return self.image
-            else:
-                # Cubic spline interpolation in a 4x4 environment
-                method = Image.BICUBIC
         # If stretching is on - Resize without other considerations
         if stretch:
+            if self.image.size[0] <= size[0] and self.image.size[1] <= size[1]:
+                method = Image.BICUBIC
+            else:
+                method = Image.ANTIALIAS
             self.image = self.image.resize(size, method)
-            if generateBorder:
+            return self.image
-                if fill == 'white':
+        # If image is smaller than target resolution and upscale is off - Just expand it by adding margins
-                    border = ImageOps.invert(self.image).getbbox()
+        if self.image.size[0] <= size[0] and self.image.size[1] <= size[1] and not upscale:
-                else:
+            borderw = int((size[0] - self.image.size[0]) / 2)
-                    border = self.image.getbbox()
+            borderh = int((size[1] - self.image.size[1]) / 2)
-                if border is not None:
+            # PV is disabled when source image is smaller than device screen and upscale is off
-                    if (border[2]-border[0])*1.5 < self.size[0]:
+            if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
-                        self.noHPV = True
+                self.noPV = True
-                    if (border[3]-border[1])*1.5 < self.size[1]:
+            self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=fill)
-                        self.noVPV = True
+            # Border can't be float so sometimes image might be 1px too small/large
-                    self.border = [int(round(float(border[0])/float(self.image.size[0])*100, 2)*100*1.5),
+            if self.image.size[0] != size[0] or self.image.size[1] != size[1]:
-                                   int(round(float(border[1])/float(self.image.size[1])*100, 2)*100*1.5)]
+                self.image = ImageOps.fit(self.image, size, method=Image.BICUBIC, centering=(0.5, 0.5))
-                else:
-                    self.border = [0, 0]
-                    self.noHPV = True
-                    self.noVPV = True
             return self.image
         # Otherwise - Upscale/Downscale
-        ratioDev = float(self.size[0]) / float(self.size[1])
+        ratioDev = float(size[0]) / float(size[1])
         if (float(self.image.size[0]) / float(self.image.size[1])) < ratioDev:
             diff = int(self.image.size[1] * ratioDev) - self.image.size[0]
-            self.image = ImageOps.expand(self.image, border=(diff / 2, 0), fill=fill)
+            self.image = ImageOps.expand(self.image, border=(int(diff / 2), 0), fill=fill)
         elif (float(self.image.size[0]) / float(self.image.size[1])) > ratioDev:
             diff = int(self.image.size[0] / ratioDev) - self.image.size[1]
-            self.image = ImageOps.expand(self.image, border=(0, diff / 2), fill=fill)
+            self.image = ImageOps.expand(self.image, border=(0, int(diff / 2)), fill=fill)
+        if self.image.size[0] <= size[0] and self.image.size[1] <= size[1]:
+            method = Image.BICUBIC
+        else:
+            method = Image.ANTIALIAS
         self.image = ImageOps.fit(self.image, size, method=method, centering=(0.5, 0.5))
-        if generateBorder:
-            if fill == 'white':
-                border = ImageOps.invert(self.image).getbbox()
-            else:
-                border = self.image.getbbox()
-            if border is not None:
-                if (border[2]-border[0])*1.5 < self.size[0]:
-                    self.noHPV = True
-                if (border[3]-border[1])*1.5 < self.size[1]:
-                    self.noVPV = True
-                self.border = [int(round(float(border[0])/float(self.image.size[0])*100, 2)*100*1.5),
-                               int(round(float(border[1])/float(self.image.size[1])*100, 2)*100*1.5)]
-            else:
-                self.border = [0, 0]
-                self.noHPV = True
-                self.noVPV = True
         return self.image
 
     def splitPage(self, targetdir, righttoleft=False, rotate=False):
@@ -303,15 +279,15 @@ class ComicPage:
                 self.rotated = False
                 if width > height:
                     # Source is landscape, so split by the width
-                    leftbox = (0, 0, width / 2, height)
+                    leftbox = (0, 0, int(width / 2), height)
-                    rightbox = (width / 2, 0, width, height)
+                    rightbox = (int(width / 2), 0, width, height)
                 else:
                     # Source is portrait and target is landscape, so split by the height
-                    leftbox = (0, 0, width, height / 2)
+                    leftbox = (0, 0, width, int(height / 2))
-                    rightbox = (0, height / 2, width, height)
+                    rightbox = (0, int(height / 2), width, height)
                 filename = os.path.splitext(self.filename)
-                fileone = targetdir + '/' + filename[0] + '_kcca' + filename[1]
+                fileone = targetdir + '/' + filename[0] + '-A' + filename[1]
-                filetwo = targetdir + '/' + filename[0] + '_kccb' + filename[1]
+                filetwo = targetdir + '/' + filename[0] + '-B' + filename[1]
                 try:
                     if righttoleft:
                         pageone = self.image.crop(rightbox)
@@ -321,7 +297,6 @@ class ComicPage:
                         pagetwo = self.image.crop(rightbox)
                     pageone.save(fileone)
                     pagetwo.save(filetwo)
-                    os.remove(self.origFileName)
                 except IOError as e:
                     raise RuntimeError('Cannot write image in directory %s: %s' % (targetdir, e))
                 return fileone, filetwo
@@ -347,7 +322,7 @@ class ComicPage:
             oldStat = ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0]
             diff += delta
             while ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0] - oldStat > 0\
-                    and diff < heightImg / 4:
+                    and diff < heightImg // 4:
                 oldStat = ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0]
                 diff += delta
             diff -= delta
@@ -356,7 +331,7 @@ class ComicPage:
             oldStat = ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg,
                                                       heightImg - pageNumberCut2))).var[0]
             while ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg - pageNumberCut2))).var[0]\
-                    < fixedThreshold + oldStat and diff < heightImg / 4:
+                    < fixedThreshold + oldStat and diff < heightImg // 4:
                 diff += delta
             diff -= delta
             pageNumberCut3 = diff
@@ -428,37 +403,65 @@ class ComicPage:
             RBGW.append(histogram[i] + histogram[256 + i] + histogram[512 + i])
         white = 0
         black = 0
-        for i in range(245, 256):
+        for i in range(251, 256):
             white += RBGW[i]
-        for i in range(11):
+        for i in range(5):
             black += RBGW[i]
-        if black > white and black > pixelCount*0.5:
+        if black > pixelCount*0.8 and white == 0:
-            return True
+            return 1
+        elif white > pixelCount*0.8 and black == 0:
+            return -1
         else:
             return False
 
-    def getImageFill(self, isWebToon):
+    def getImageFill(self, webtoon):
         fill = 0
-        if isWebToon or self.rotated:
+        if not webtoon and not self.rotated:
-            fill += self.getImageHistogram(self.image.crop((0, 0, self.image.size[0], 5)))
+            # Search for horizontal solid lines
-            fill += self.getImageHistogram(self.image.crop((0, self.image.size[1]-5, self.image.size[0],
+            startY = 0
-                                                            self.image.size[1])))
+            while startY < self.image.size[1]:
+                if startY + 5 > self.image.size[1]:
+                    startY = self.image.size[1] - 5
+                checkSolid = self.getImageHistogram(self.image.crop((0, startY, self.image.size[0], startY+5)))
+                if checkSolid:
+                    fill += checkSolid
+                startY += 5
         else:
-            fill += self.getImageHistogram(self.image.crop((0, 0, 5, self.image.size[1])))
+            # Search for vertical solid lines
-            fill += self.getImageHistogram(self.image.crop((self.image.size[0]-5, 0, self.image.size[0],
+            startX = 0
-                                                            self.image.size[1])))
+            while startX < self.image.size[0]:
-        if fill == 2:
+                if startX + 5 > self.image.size[0]:
+                    startX = self.image.size[0] - 5
+                checkSolid = self.getImageHistogram(self.image.crop((startX, 0, startX+5, self.image.size[1])))
+                if checkSolid:
+                    fill += checkSolid
+                startX += 5
+        if fill > 0:
             self.fill = 'black'
-        elif fill == 0:
-            self.fill = 'white'
         else:
-            fill = 0
+            self.fill = 'white'
-            fill += self.getImageHistogram(self.image.crop((0, 0, 5, 5)))
+
-            fill += self.getImageHistogram(self.image.crop((self.image.size[0]-5, 0, self.image.size[0], 5)))
+    def isImageColor(self):
-            fill += self.getImageHistogram(self.image.crop((0, self.image.size[1]-5, 5, self.image.size[1])))
+        v = ImageStat.Stat(self.image).var
-            fill += self.getImageHistogram(self.image.crop((self.image.size[0]-5, self.image.size[1]-5,
+        isMonochromatic = reduce(lambda x, y: x and y < 0.005, v, True)
-                                                            self.image.size[0], self.image.size[1])))
+        if isMonochromatic:
-            if fill > 1:
+            # Monochromatic
-                self.fill = 'black'
+            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
+                return False
             else:
-                self.fill = 'white'
+                # Detection failed
+                return False

kcc/kindlesplit.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
+#
 # Based on initial version of KindleUnpack. Copyright (C) 2009 Charles M. Hannum <root@ihack.net>
 # Improvements Copyright (C) 2009-2012 P. Durrant, K. Hendricks, S. Siebert, fandrieu, DiapDealer, nickredding
-# Copyright (C) 2013 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Changes for KCC Copyright (C) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,10 +17,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/>.
 
-__license__ = 'ISC'
-__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
-__docformat__ = 'restructuredtext en'
-
 import struct
 # from uuid import uuid4
 
@@ -102,10 +100,10 @@ def nullsection(datain, secno):  # make it zero-length without deleting it
         datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
     lpad = zerosecstart - (first_pdb_record + 8*nsec)
     if lpad > 0:
-        datalst.append('\0' * lpad)
+        datalst.append(b'\0' * lpad)
     datalst.append(datain[zerosecstart: secstart])
     datalst.append(datain[secend:])
-    dataout = "".join(datalst)
+    dataout = b"".join(datalst)
     return dataout
 
 
@@ -132,10 +130,10 @@ def deletesectionrange(datain, firstsec, lastsec):  # delete a range of sections
         datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
     lpad = newstart - (first_pdb_record + 8*(nsec - (lastsec - firstsec + 1)))
     if lpad > 0:
-        datalst.append('\0' * lpad)
+        datalst.append(b'\0' * lpad)
     datalst.append(datain[zerosecstart:firstsecstart])
     datalst.append(datain[lastsecend:])
-    dataout = "".join(datalst)
+    dataout = b"".join(datalst)
     return dataout
 
 
@@ -162,11 +160,11 @@ def insertsection(datain, secno, secdata):  # insert a new section
         datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
     lpad = newstart - (first_pdb_record + 8*(nsec + 1))
     if lpad > 0:
-        datalst.append('\0' * lpad)
+        datalst.append(b'\0' * lpad)
     datalst.append(datain[zerosecstart:secstart])
     datalst.append(secdata)
     datalst.append(datain[secstart:])
-    dataout = "".join(datalst)
+    dataout = b"".join(datalst)
     return dataout
 
 
@@ -288,7 +286,7 @@ class mobi_split:
                 # datain_rec0 = del_exth(datain_rec0,534)
                 # don't remove the EXTH 125 KF8 Count of Resources, seems to be present in mobi6 files as well
                 # set the EXTH 129 KF8 Masthead / Cover Image string to the null string
-                datain_rec0 = write_exth(datain_rec0, 129, '')
+                datain_rec0 = write_exth(datain_rec0, 129, b'')
                 # don't remove the EXTH 131 KF8 Unidentified Count, seems to be present in mobi6 files as well
 
                 # Make sure we have an ASIN & cdeType set...
@@ -381,4 +379,4 @@ class mobi_split:
                 raise
 
     def getResult(self):
-        return self.result_file
+        return self.result_file

kcc/pdfjpgextract.py

@@ -1,5 +1,5 @@
-# Copyright (c) 2012-2013 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
-# Copyright (c) 2013 Pawel Jastrzebski <pawelj@vulturis.eu>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
 #
 # Based upon the code snippet by Ned Batchelder
 # (http://nedbatchelder.com/blog/200712/extracting_jpgs_from_pdfs.html)
@@ -20,55 +20,53 @@
 #
 
 __license__ = 'ISC'
-__copyright__ = '2012-2013, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
 __docformat__ = 'restructuredtext en'
 
 import os
+from random import choice
+from string import ascii_uppercase, digits
 
 
 class PdfJpgExtract:
     def __init__(self, origFileName):
         self.origFileName = origFileName
         self.filename = os.path.splitext(origFileName)
-        self.path = self.filename[0] + "-KCC-TMP"
+        # noinspection PyUnusedLocal
+        self.path = self.filename[0] + "-KCC-TMP-" + ''.join(choice(ascii_uppercase + digits) for x in range(3))
 
     def getPath(self):
         return self.path
 
     def extract(self):
-        pdf = file(self.origFileName, "rb").read()
+        pdf = open(self.origFileName, "rb").read()
-
+        startmark = b"\xff\xd8"
-        startmark = "\xff\xd8"
         startfix = 0
-        endmark = "\xff\xd9"
+        endmark = b"\xff\xd9"
         endfix = 2
         i = 0
-
         njpg = 0
         os.makedirs(self.path)
         while True:
-            istream = pdf.find("stream", i)
+            istream = pdf.find(b"stream", i)
             if istream < 0:
                 break
             istart = pdf.find(startmark, istream, istream + 20)
             if istart < 0:
                 i = istream + 20
                 continue
-            iend = pdf.find("endstream", istart)
+            iend = pdf.find(b"endstream", istart)
             if iend < 0:
                 raise Exception("Didn't find end of stream!")
             iend = pdf.find(endmark, iend - 20)
             if iend < 0:
                 raise Exception("Didn't find end of JPG!")
-
             istart += startfix
             iend += endfix
-            print "JPG %d from %d to %d" % (njpg, istart, iend)
             jpg = pdf[istart:iend]
-            jpgfile = file(self.path + "/jpg%d.jpg" % njpg, "wb")
+            jpgfile = open(self.path + "/jpg%d.jpg" % njpg, "wb")
             jpgfile.write(jpg)
             jpgfile.close()
-
             njpg += 1
             i = iend
         return self.path, njpg

kcc/rarfile.py

@@ -108,6 +108,8 @@ if sys.hexversion < 0x3000000:
     # py2.6 has broken bytes()
     def bytes(s, enc):
         return str(s)
+else:
+    unicode = str
 
 # see if compat bytearray() is needed
 try:
@@ -188,10 +190,6 @@ NEED_COMMENTS = 1
 #: whether to convert comments to unicode strings
 UNICODE_COMMENTS = 0
 
-#: When RAR is corrupt, stopping on bad header is better
-#: On unknown/misparsed RAR headers reporting is better
-REPORT_BAD_HEADER = 0
-
 #: Convert RAR time tuple into datetime() object
 USE_DATETIME = 0
 
@@ -340,9 +338,11 @@ class RarSignalExit(RarExecError):
     """Unrar exited with signal"""
 
 
-def is_rarfile(fn):
+def is_rarfile(xfile):
     '''Check quickly whether file is rar archive.'''
-    buf = open(fn, "rb").read(len(RAR_ID))
+    fd = XFile(xfile)
+    buf = fd.read(len(RAR_ID))
+    fd.close()
     return buf == RAR_ID
 
 
@@ -453,11 +453,12 @@ class RarFile(object):
     '''Parse RAR structure, provide access to files in archive.
     '''
 
-    #: Archive comment.  Byte string or None.  Use UNICODE_COMMENTS
+    #: Archive comment.  Byte string or None.  Use :data:`UNICODE_COMMENTS`
     #: to get automatic decoding to unicode.
     comment = None
 
-    def __init__(self, rarfile, mode="r", charset=None, info_callback=None, crc_check = True):
+    def __init__(self, rarfile, mode="r", charset=None, info_callback=None,
+                 crc_check = True, errors = "stop"):
         """Open and parse a RAR archive.
         
         Parameters:
@@ -472,6 +473,9 @@ class RarFile(object):
                 debug callback, gets to see all archive entries.
             crc_check
                 set to False to disable CRC checks
+            errors
+                Either "stop" to quietly stop parsing on errors,
+                or "strict" to raise errors.  Default is "stop".
         """
         self.rarfile = rarfile
         self.comment = None
@@ -485,6 +489,13 @@ class RarFile(object):
         self._crc_check = crc_check
         self._vol_list = []
 
+        if errors == "stop":
+            self._strict = False
+        elif errors == "strict":
+            self._strict = True
+        else:
+            raise ValueError("Invalid value for 'errors' parameter.")
+
         self._main = None
 
         if mode != "r":
@@ -548,8 +559,9 @@ class RarFile(object):
         '''Returns file-like object (:class:`RarExtFile`),
         from where the data can be read.
         
-        The object implements io.RawIOBase interface, so it can
+        The object implements :class:`io.RawIOBase` interface, so it can
-        be further wrapped with io.BufferedReader and io.TextIOWrapper.
+        be further wrapped with :class:`io.BufferedReader`
+        and :class:`io.TextIOWrapper`.
 
         On older Python where io module is not available, it implements
         only .read(), .seek(), .tell() and .close() methods.
@@ -588,16 +600,19 @@ class RarFile(object):
             psw = None
 
         # is temp write usable?
-        if not USE_EXTRACT_HACK or not self._main:
+        use_hack = 1
+        if not self._main:
             use_hack = 0
         elif self._main.flags & (RAR_MAIN_SOLID | RAR_MAIN_PASSWORD):
             use_hack = 0
         elif inf.flags & (RAR_FILE_SPLIT_BEFORE | RAR_FILE_SPLIT_AFTER):
             use_hack = 0
+        elif is_filelike(self.rarfile):
+            pass
         elif inf.file_size > HACK_SIZE_LIMIT:
             use_hack = 0
-        else:
+        elif not USE_EXTRACT_HACK:
-            use_hack = 1
+            use_hack = 0
 
         # now extract
         if inf.compress_type == RAR_M0 and (inf.flags & RAR_FILE_PASSWORD) == 0:
@@ -610,7 +625,7 @@ class RarFile(object):
     def read(self, fname, psw = None):
         """Return uncompressed data for archive entry.
         
-        For longer files using .open() may be better idea.
+        For longer files using :meth:`RarFile.open` may be better idea.
 
         Parameters:
 
@@ -641,7 +656,7 @@ class RarFile(object):
         Parameters:
 
             member
-                filename or RarInfo instance
+                filename or :class:`RarInfo` instance
             path
                 optional destination path
             pwd
@@ -661,7 +676,7 @@ class RarFile(object):
             path
                 optional destination path
             members
-                optional filename or RarInfo instance list to extract
+                optional filename or :class:`RarInfo` instance list to extract
             pwd
                 optional password to use
         """
@@ -687,10 +702,23 @@ class RarFile(object):
         output = p.communicate()[0]
         check_returncode(p, output)
 
+    def strerror(self):
+        """Return error string if parsing failed,
+        or None if no problems.
+        """
+        return self._parse_error
+
     ##
     ## private methods
     ##
 
+    def _set_error(self, msg, *args):
+        if args:
+            msg = msg % args
+        self._parse_error = msg
+        if self._strict:
+            raise BadRarFile(msg)
+
     # store entry
     def _process_entry(self, item):
         if item.type == RAR_BLOCK_FILE:
@@ -738,7 +766,7 @@ class RarFile(object):
                 self._fd = None
 
     def _parse_real(self):
-        fd = open(self.rarfile, "rb")
+        fd = XFile(self.rarfile)
         self._fd = fd
         id = fd.read(len(RAR_ID))
         if id != RAR_ID:
@@ -757,9 +785,13 @@ class RarFile(object):
             if not h:
                 if more_vols:
                     volume += 1
-                    volfile = self._next_volname(volfile)
                     fd.close()
-                    fd = open(volfile, "rb")
+                    try:
+                        volfile = self._next_volname(volfile)
+                        fd = XFile(volfile)
+                    except IOError:
+                        self._set_error("Cannot open next volume: %s", volfile)
+                        break
                     self._fd = fd
                     more_vols = 0
                     endarc = 0
@@ -824,8 +856,7 @@ class RarFile(object):
             # now read actual header
             return self._parse_block_header(fd)
         except struct.error:
-            if REPORT_BAD_HEADER:
+            self._set_error('Broken header in RAR file')
-                raise BadRarFile('Broken header in RAR file')
             return None
 
     # common header
@@ -852,8 +883,7 @@ class RarFile(object):
 
         # unexpected EOF?
         if len(h.header_data) != h.header_size:
-            if REPORT_BAD_HEADER:
+            self._set_error('Unexpected EOF when reading header')
-                raise BadRarFile('Unexpected EOF when reading header')
             return None
 
         # block has data assiciated with it?
@@ -896,18 +926,9 @@ class RarFile(object):
         if h.header_crc == calc_crc:
             return h
 
-        # need to panic?
+        # header parsing failed.
-        if REPORT_BAD_HEADER:
+        self._set_error('Header CRC error (%02x): exp=%x got=%x (xlen = %d)',
-            xlen = len(crcdat)
+                h.type, h.header_crc, calc_crc, len(crcdat))
-            crcdat = h.header_data[2:]
-            msg = 'Header CRC error (%02x): exp=%x got=%x (xlen = %d)' % ( h.type, h.header_crc, calc_crc, xlen )
-            xlen = len(crcdat)
-            while xlen >= S_BLK_HDR.size - 2:
-                crc = crc32(crcdat[:xlen]) & 0xFFFF
-                if crc == h.header_crc:
-                    msg += ' / crc match, xlen = %d' % xlen
-                xlen -= 1
-            raise BadRarFile(msg)
 
         # instead panicing, send eof
         return None
@@ -1053,6 +1074,8 @@ class RarFile(object):
 
     # given current vol name, construct next one
     def _next_volname(self, volfile):
+        if is_filelike(volfile):
+            raise IOError("Working on single FD")
         if self._main.flags & RAR_MAIN_NEWNUMBERING:
             return self._next_newvol(volfile)
         return self._next_oldvol(volfile)
@@ -1093,7 +1116,7 @@ class RarFile(object):
         BSIZE = 32*1024
 
         size = inf.compress_size + inf.header_size
-        rf = open(inf.volume_file, "rb", 0)
+        rf = XFile(inf.volume_file, 0)
         rf.seek(inf.header_offset)
 
         tmpfd, tmpname = mkstemp(suffix='.rar')
@@ -1125,7 +1148,7 @@ class RarFile(object):
     def _read_comment_v3(self, inf, psw=None):
 
         # read data
-        rf = open(inf.volume_file, "rb")
+        rf = XFile(inf.volume_file)
         rf.seek(inf.file_offset)
         data = rf.read(inf.compress_size)
         rf.close()
@@ -1146,6 +1169,8 @@ class RarFile(object):
 
     # extract using unrar
     def _open_unrar(self, rarfile, inf, psw = None, tmpfile = None):
+        if is_filelike(rarfile):
+            raise ValueError("Cannot use unrar directly on memory buffer")
         cmd = [UNRAR_TOOL] + list(OPEN_ARGS)
         if psw is not None:
             cmd.append("-p" + psw)
@@ -1553,7 +1578,7 @@ class DirectReader(RarExtFile):
         RarExtFile._open(self)
 
         self.volfile = self.inf.volume_file
-        self.fd = open(self.volfile, "rb", 0)
+        self.fd = XFile(self.volfile, 0)
         self.fd.seek(self.inf.header_offset, 0)
         self.cur = self.rf._parse_header(self.fd)
         self.cur_avail = self.cur.add_size
@@ -1705,10 +1730,47 @@ class HeaderDecrypt:
 
         return res
 
+# handle (filename|filelike) object
+class XFile(object):
+    __slots__ = ('_fd', '_need_close')
+    def __init__(self, xfile, bufsize = 1024):
+        if is_filelike(xfile):
+            self._need_close = False
+            self._fd = xfile
+            self._fd.seek(0)
+        else:
+            self._need_close = True
+            self._fd = open(xfile, 'rb', bufsize)
+    def read(self, n=None):
+        return self._fd.read(n)
+    def tell(self):
+        return self._fd.tell()
+    def seek(self, ofs, whence=0):
+        return self._fd.seek(ofs, whence)
+    def readinto(self, dst):
+        return self._fd.readinto(dst)
+    def close(self):
+        if self._need_close:
+            self._fd.close()
+    def __enter__(self):
+        return self
+    def __exit__(self, typ, val, tb):
+        self.close()
+
 ##
 ## Utility functions
 ##
 
+def is_filelike(obj):
+    if isinstance(obj, str) or isinstance(obj, unicode):
+        return False
+    res = True
+    for a in ('read', 'tell', 'seek'):
+        res = res and hasattr(obj, a)
+    if not res:
+        raise ValueError("Invalid object passed as file")
+    return True
+
 def rar3_s2k(psw, salt):
     """String-to-key hash for RAR3."""
 
@@ -1874,4 +1936,3 @@ def check_returncode(p, out):
         msg = "%s [%d]" % (exc.__doc__, p.returncode)
 
     raise exc(msg)
-

kcc/shared.py

@@ -0,0 +1,60 @@
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@vulturis.eu>
+#
+# 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.
+#
+
+__license__ = 'ISC'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@vulturis.eu>'
+__docformat__ = 'restructuredtext en'
+
+import os
+from hashlib import md5
+
+
+def getImageFileName(imgfile):
+    filename = os.path.splitext(imgfile)
+    if filename[0].startswith('.') or\
+            (filename[1].lower() != '.png' and
+             filename[1].lower() != '.jpg' and
+             filename[1].lower() != '.gif' and
+             filename[1].lower() != '.tif' and
+             filename[1].lower() != '.tiff' and
+             filename[1].lower() != '.bmp' and
+             filename[1].lower() != '.jpeg'):
+        return None
+    return filename
+
+
+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):
+        yield root, dirs, files
+        num_sep_this = root.count(os.path.sep)
+        if num_sep + level <= num_sep_this:
+            del dirs[:]
+
+
+def md5Checksum(filePath):
+    with open(filePath, 'rb') as fh:
+        m = md5()
+        while True:
+            data = fh.read(8192)
+            if not data:
+                break
+            m.update(data)
+        return m.hexdigest()

other/QT-4.8.5-QListWidget.patch

@@ -1,35 +0,0 @@
---- qt-4.8.5/src/gui/kernel/qwidget_mac.mm	2013-06-07 07:16:59.000000000 +0200
-+++ qt-4.8.5-fix/src/gui/kernel/qwidget_mac.mm	2013-10-11 23:00:15.000000000 +0200
-@@ -4715,15 +4715,13 @@ void QWidgetPrivate::scroll_sys(int dx, 
-     }
- 
-     // Scroll the whole widget if qscrollRect is not valid:
--    QRect validScrollRect = qscrollRect.isValid() ? qscrollRect : q->rect();
--    validScrollRect &= clipRect();
-+    QRect validScrollRect = qscrollRect.isValid() ? qscrollRect : QRect(0, 0, q->width(), q->height());
- 
-     // If q is overlapped by other widgets, we cannot just blit pixels since
-     // this will move overlapping widgets as well. In case we just update:
-     const bool overlapped = isOverlapped(validScrollRect.translated(data.crect.topLeft()));
-     const bool accelerateScroll = accelEnv && isOpaque && !overlapped;
-     const bool isAlien = (q->internalWinId() == 0);
--    const QPoint scrollDelta(dx, dy);
- 
-     // If qscrollRect is valid, we are _not_ supposed to scroll q's children (as documented).
-     // But we do scroll children (and the whole of q) if qscrollRect is invalid. This case is
-@@ -4745,7 +4743,6 @@ void QWidgetPrivate::scroll_sys(int dx, 
-         }else {
-             update_sys(qscrollRect);
-         }
--        return;
-     }
- 
- #ifdef QT_MAC_USE_COCOA
-@@ -4762,6 +4759,7 @@ void QWidgetPrivate::scroll_sys(int dx, 
-     // moved when the parent is scrolled. All directly or indirectly moved
-     // children will receive a move event before the function call returns.
-     QWidgetList movedChildren;
-+    const QPoint scrollDelta(dx, dy);
-     if (scrollChildren) {
-         QObjectList children = q->children();
- 

other/qt.conf

@@ -0,0 +1,3 @@
+; Qt Configuration file
+[Paths]
+Plugins = PlugIns

setup.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """
 cx_Freeze build script for KCC.
 
@@ -7,10 +8,13 @@ Usage (Mac OS X):
 Usage (Windows):
     python setup.py build
 """
-from sys import platform
+from sys import platform, version_info
+if version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
 
 NAME = "KindleComicConverter"
-VERSION = "3.5"
+VERSION = "4.0.1"
 MAIN = "kcc.py"
 
 if platform == "darwin":
@@ -22,61 +26,65 @@ if platform == "darwin":
             py2app=dict(
                 argv_emulation=True,
                 iconfile='icons/comic2ebook.icns',
-                includes=['PIL', 'sip', 'PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtNetwork'],
+                includes=['PIL', 'sip', 'PyQt5', 'PyQt5.QtCore', 'PyQt5.QtGui', 'PyQt5.QtNetwork', 'PyQt5.QtWidgets',
-                excludes=['PyQt4.QtDeclarative', 'PyQt4.QtDesigner', 'PyQt4.QtHelp', 'PyQt4.QtMultimedia',
+                          'PyQt5.QtPrintSupport'],
-                          'PyQt4.QtOpenGL', 'PyQt4.QtScript', 'PyQt4.QtScriptTools', 'PyQt4.QtSql', 'PyQt4.QtSvg',
+                resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'],
-                          'PyQt4.QtXmlPatterns', 'PyQt4.QtXml', 'PyQt4.QtWebKit', 'PyQt4.QtTest'],
-                resources=['LICENSE.txt', 'other/Additional-LICENSE.txt'],
                 plist=dict(
                     CFBundleName=NAME,
                     CFBundleShortVersionString=VERSION,
                     CFBundleGetInfoString=NAME + " " + VERSION +
-                    ", written 2012-2013 by Ciro Mattia Gonano and Pawel Jastrzebski",
+                    ", written 2012-2014 by Ciro Mattia Gonano and Pawel Jastrzebski",
                     CFBundleExecutable=NAME,
                     CFBundleIdentifier='com.github.ciromattia.kcc',
                     CFBundleSignature='dplt',
                     CFBundleDocumentTypes=[
                         dict(
                             CFBundleTypeExtensions=['cbz', 'cbr', 'cb7', 'zip', 'rar', '7z', 'pdf'],
+                            CFBundleTypeName='Comics',
                             CFBundleTypeIconFile='comic2ebook.icns',
-                            CFBundleTypeRole='Viewer',
+                            CFBundleTypeRole='Editor',
                         )
                     ],
+                    LSMinimumSystemVersion='10.8.0',
+                    LSEnvironment=dict(
+                        PATH='/usr/local/bin:/usr/bin:/bin'
+                    ),
                     NSHumanReadableCopyright='ISC License (ISCL)'
                 )
             )
         )
     )
 elif platform == "win32":
+    import platform as arch
     from cx_Freeze import setup, Executable
+    if arch.architecture()[0] == '64bit':
+        library = 'libEGL64.dll'
+    else:
+        library = 'libEGL32.dll'
     base = "Win32GUI"
     extra_options = dict(
-        options={"build_exe": {"include_files": ['LICENSE.txt',
+        options={"build_exe": {"optimize": 2,
+                               "include_files": ['LICENSE.txt',
                                                  ['other/UnRAR.exe', 'UnRAR.exe'],
                                                  ['other/7za.exe', '7za.exe'],
-                                                 ['other/Additional-LICENSE.txt', 'Additional-LICENSE.txt']
+                                                 ['other/Additional-LICENSE.txt', 'Additional-LICENSE.txt'],
-                                                 ], "compressed": True}},
+                                                 ['other/' + library, 'libEGL.dll']
+                                                 ],
+                               "copy_dependent_files": True,
+                               "create_shared_zip": False,
+                               "append_script_to_exe": True,
+                               "replace_paths": '*=',
+                               "excludes": ['tkinter']}},
         executables=[Executable(MAIN,
                                 base=base,
                                 targetName="KCC.exe",
                                 icon="icons/comic2ebook.ico",
-                                copyDependentFiles=True,
+                                compress=False)])
-                                appendScriptToExe=True,
-                                appendScriptToLibrary=False,
-                                compress=True)])
 else:
-    from cx_Freeze import setup, Executable
+    print('Please use setup.sh to build Linux package.')
-    extra_options = dict(
+    exit()
-        options={"build_exe": {"include_files": ['LICENSE.txt',
-                                                 ['other/Additional-LICENSE.txt', 'Additional-LICENSE.txt']
-                                                 ], "compressed": True}},
-        executables=[Executable(MAIN,
-                                icon="icons/comic2ebook.png",
-                                copyDependentFiles=True,
-                                appendScriptToExe=True,
-                                appendScriptToLibrary=False,
-                                compress=True)])
 
+#noinspection PyUnboundLocalVariable
 setup(
     name=NAME,
     version=VERSION,
@@ -86,6 +94,13 @@ setup(
     license="ISC License (ISCL)",
     keywords="kindle comic mobipocket mobi cbz cbr manga",
     url="http://github.com/ciromattia/kcc",
-    packages=['kcc'], requires=['Pillow'],
     **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)

setup.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Linux Python package build script
+
+VERSION="4.0.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