Merge pull request #108 from ciromattia/4.x

4.2.1

KCC-Linux.ui

@@ -71,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>
@@ -110,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&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;This mode was created for 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>
@@ -128,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>
@@ -167,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>
@@ -195,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">
@@ -217,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">
@@ -240,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>
@@ -359,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>
@@ -383,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;/span&gt;&lt;br/&gt;Maximal quality of images but very poor magnification quality.&lt;br/&gt;Use it only when zoom is not needed or output files needs to be small.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;/span&gt;&lt;br/&gt;In most cases high quality of images and magnification.&lt;br/&gt;Overall quality highly depends on the resolution of source files.&lt;br/&gt;On Kindle models older than Paperwhite non-zoomed images might be a little blurred.&lt;br/&gt;&lt;br/&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;/span&gt;&lt;br/&gt;Highest possible quality. Output files will be big.&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>
@@ -416,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 splitting of two-page spreads.&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>
@@ -635,7 +632,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;Don't convert images to grayscale.&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>
@@ -664,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>
@@ -697,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>
@@ -715,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>
@@ -748,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>

KCC-OSX.ui

@@ -69,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>
@@ -88,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>
@@ -110,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&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;This mode was created for pages with a low width, high height and vertical panel flow.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
         <string>Webtoon mode</string>
@@ -129,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>
@@ -148,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>
@@ -170,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>
@@ -198,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">
@@ -220,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">
@@ -243,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>
@@ -363,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>
@@ -388,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;/span&gt;&lt;br/&gt;Maximal quality of images but very poor magnification quality.&lt;br/&gt;Use it only when zoom is not needed or output files needs to be small.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;/span&gt;&lt;br/&gt;In most cases high quality of images and magnification.&lt;br/&gt;Overall quality highly depends on the resolution of source files.&lt;br/&gt;On Kindle models older than Paperwhite non-zoomed images might be a little blurred.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;/span&gt;&lt;br/&gt;Highest possible quality. Output files will be big.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>High/Ultra quality</string>
@@ -416,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 splitting of two-page spreads.&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>
@@ -581,7 +584,7 @@
       <x>10</x>
       <y>10</y>
       <width>401</width>
-      <height>35</height>
+      <height>29</height>
      </rect>
     </property>
     <property name="font">
@@ -592,9 +595,6 @@
       <bold>true</bold>
      </font>
     </property>
-    <property name="autoFillBackground">
-     <bool>true</bool>
-    </property>
     <property name="value">
      <number>0</number>
     </property>
@@ -639,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;Don't 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>
@@ -671,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>
@@ -705,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>
@@ -726,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>
@@ -760,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>

KCC.ui

@@ -65,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>
@@ -94,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=&quot;white-space:pre&quot;&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;This mode is created for 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>
@@ -107,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>
@@ -136,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>
@@ -163,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">
@@ -184,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">
@@ -206,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>
@@ -316,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>
@@ -335,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 style=&quot;white-space:pre&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Unchecked - Normal quality mode&lt;br/&gt;&lt;/span&gt;Maximal quality of images but very poor magnification quality.&lt;br/&gt;Use it only when zoom is not needed or output files needs to be small.&lt;/p&gt;&lt;p style=&quot;white-space:pre&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Indeterminate - High quality mode&lt;br/&gt;&lt;/span&gt;In most cases high quality of images and magnification.&lt;br/&gt;Overall quality highly depends on the resolution of source files.&lt;br/&gt;On Kindle models older than Paperwhite non-zoomed images might be a little blurred.&lt;/p&gt;&lt;p style=&quot;white-space:pre&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Checked - Ultra quality mode&lt;br/&gt;&lt;/span&gt;Highest possible quality. Output files will be big.&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>
@@ -363,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 splitting of two-page spreads.&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>
@@ -549,7 +546,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;Don't convert images to grayscale.&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>
@@ -568,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>
@@ -596,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>
@@ -609,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>
@@ -637,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>

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@iosphe.re>
 
 Permission to use, copy, modify, and/or distribute this software for
 any purpose with or without fee is hereby granted, provided that the

README.md

@@ -17,14 +17,18 @@ 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)!  
 
 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:
-  * 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)
+ - [![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)
+- 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)
+ - Bitcoin: 1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b
 
 ## BINARY RELEASES
 You can find the latest released binary at the following links:
-- **Windows:** [http://kcc.vulturis.eu/Windows/](http://kcc.vulturis.eu/Windows/)
+- **Windows (Vista or newer):** [http://kcc.iosphe.re/Windows/](http://kcc.iosphe.re/Windows/)
-- **Linux:** [http://kcc.vulturis.eu/Linux/](http://kcc.vulturis.eu/Linux/)
+- **Linux:** [http://kcc.iosphe.re/Linux/](http://kcc.iosphe.re/Linux/)
-- **OS X 10.8+:** [http://kcc.vulturis.eu/OSX/](http://kcc.vulturis.eu/OSX/)
+- **OS X (10.8+):** [http://kcc.iosphe.re/OSX/](http://kcc.iosphe.re/OSX/)
 
 ## INPUT FORMATS
 **KCC** can understand and convert, at the moment, the following input types:
@@ -39,12 +43,22 @@ You can find the latest released binary at the following links:
 - [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](http://www.riverbankcomputing.co.uk/software/pyqt/download) - Please refer to official documentation for installing into your system.
+- [PyQt5](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.2.0+
-- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.3.0+ - For comic optimizations. Please refer to official documentation for installing into your system.
+- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.5.0+
-- [Psutil](https://code.google.com/p/psutil/) - Please refer to official documentation for installing into your system.
+- [psutil](https://pypi.python.org/pypi/psutil) 2.0+
-- **To build OS X release you need a modified QT:** [patch](https://github.com/ciromattia/kcc/blob/master/other/QT-4.8.5-QListWidget.patch)
+- [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 - [py2exe](https://pypi.python.org/pypi/py2exe) 0.9.2+
+- OS X - [py2app](https://bitbucket.org/ronaldoussoren/py2app) 0.8.0+
 
 ## USAGE
 
@@ -53,10 +67,10 @@ After completed conversion you should find ready file alongside the original inp
 
 Please check [our wiki](https://github.com/ciromattia/kcc/wiki/) for more details.
 
-### Standalone `comic2ebook.py` usage:
+### Standalone `kcc-c2e.py` usage:
 
 ```
-Usage: comic2ebook.py [options] comic_file|comic_folder
+Usage: kcc-c2e [options] comic_file|comic_folder
 
 Options:
   MAIN:
@@ -95,14 +109,13 @@ Options:
                         Replace screen height provided by device profile
 
   OTHER:
-    -v, --verbose       Verbose output
     -h, --help          Show this help message and exit
 ```
 
-### Standalone `comic2panel.py` usage:
+### Standalone `kcc-c2p.py` usage:
 
 ```
-Usage: comic2panel.py [options] comic_folder
+Usage: kcc-c2p [options] comic_folder
 
 Options:
   MANDATORY:
@@ -117,29 +130,29 @@ Options:
 ```
 
 ## CREDITS
-**KCC** is made by [Ciro Mattia Gonano](http://github.com/ciromattia) and [Paweł Jastrzębski](http://github.com/AcidWeb)
+**KCC** is made by [Ciro Mattia Gonano](http://github.com/ciromattia) and [Paweł Jastrzębski](http://github.com/AcidWeb).
 
-This script born as a cross-platform alternative to `KindleComicParser` by **Dc5e** (published [here](http://www.mobileread.com/forums/showthread.php?t=192783))
+This script born as a cross-platform alternative to `KindleComicParser` by **Dc5e** (published [here](http://www.mobileread.com/forums/showthread.php?t=192783)).
 
 The app relies and includes the following scripts/binaries:
 
- - `KindleUnpack` script by Charles **M. Hannum, P. Durrant, K. Hendricks, S. Siebert, fandrieu, DiapDealer, nickredding**. Released with GPLv3 License.
+ - `DualMetaFix` script by **K. Hendricks**. Released with GPL-3 License.
  - `rarfile.py` script &copy; 2005-2011 **Marko Kreen** <markokr@gmail.com>. Released with ISC License.
- - `image.py` class from **Alex Yatskov**'s [Mangle](http://foosoft.net/mangle/) with subsequent [proDOOMman](https://github.com/proDOOMman/Mangle)'s and [Birua](https://github.com/Birua/Mangle)'s patches.
+ - `image.py` class from **Alex Yatskov**'s [Mangle](https://github.com/FooSoft/mangle/) with subsequent [proDOOMman](https://github.com/proDOOMman/Mangle)'s and [Birua](https://github.com/Birua/Mangle)'s patches.
  - Icon is by **Nikolay Verin** ([http://ncrow.deviantart.com/](http://ncrow.deviantart.com/)) and released under [CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/) License.
 
 ## SAMPLE FILES CREATED BY KCC
-* [Kindle Paperwhite](http://kcc.vulturis.eu/Samples/Ubunchu!-KPW.mobi)
+* [Kindle Paperwhite](http://kcc.iosphe.re/Samples/Ubunchu!-KPW.mobi)
-* [Kindle](http://kcc.vulturis.eu/Samples/Ubunchu!-K345.mobi)
+* [Kindle](http://kcc.iosphe.re/Samples/Ubunchu!-K345.mobi)
-* [Kindle DX/DXG](http://kcc.vulturis.eu/Samples/Ubunchu!-KDX.mobi)
+* [Kindle DX/DXG](http://kcc.iosphe.re/Samples/Ubunchu!-KDX.mobi)
-* [Kindle Fire HD](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHD.mobi)
+* [Kindle Fire HD](http://kcc.iosphe.re/Samples/Ubunchu!-KFHD.mobi)
-* [Kindle Fire HD 8.9"](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHD8.mobi)
+* [Kindle Fire HD 8.9"](http://kcc.iosphe.re/Samples/Ubunchu!-KFHD8.mobi)
-* [Kindle Fire HDX](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHDX.mobi)
+* [Kindle Fire HDX](http://kcc.iosphe.re/Samples/Ubunchu!-KFHDX.mobi)
-* [Kindle Fire HDX 8.9"](http://kcc.vulturis.eu/Samples/Ubunchu!-KFHDX8.mobi)
+* [Kindle Fire HDX 8.9"](http://kcc.iosphe.re/Samples/Ubunchu!-KFHDX8.mobi)
-* [Kobo Mini/Touch](http://kcc.vulturis.eu/Samples/Ubunchu!-KoMT.cbz)
+* [Kobo Mini/Touch](http://kcc.iosphe.re/Samples/Ubunchu!-KoMT.cbz)
-* [Kobo Glow](http://kcc.vulturis.eu/Samples/Ubunchu!-KoG.cbz)
+* [Kobo Glow](http://kcc.iosphe.re/Samples/Ubunchu!-KoG.cbz)
-* [Kobo Aura](http://kcc.vulturis.eu/Samples/Ubunchu!-KoA.cbz)
+* [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu!-KoA.cbz)
-* [Kobo Aura HD](http://kcc.vulturis.eu/Samples/Ubunchu!-KoAHD.cbz)
+* [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu!-KoAHD.cbz)
 
 ## CHANGELOG
 ####1.0
@@ -309,7 +322,55 @@ The app relies and includes the following scripts/binaries:
 ####3.7.1:
 * Hotfixed Kobo profiles
 
-## COPYRIGHT
+####3.7.2:
+* Fixed problems with HQ mode
 
-Copyright (c) 2012-2013 Ciro Mattia Gonano and Paweł Jastrzębski.  
+####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
+
+####4.0.2:
+* Fixed some Windows and OSX specific bugs
+* Fixed problem with marigns when using HQ mode
+
+####4.1:
+* Thanks to code contributed by Kevin Hendricks speed of MOBI creation was greatly increased
+* Improved performance on Windows
+* Improved MOBI splitting and changed maximal size of output file
+* Fixed _No optimization_ mode
+* Multiple small tweaks nad minor bug fixes
+
+####4.2:
+* Added [Manga Cover Database](http://manga.joentjuh.nl/) support
+* Officially dropped Windows XP support
+* Fixed _Other_ profile
+* Fixed problems with page order on stock KOBO CBZ reader
+* Many other small bug fixes and tweaks
+
+####4.2.1:
+* Improved margin color detection 
+* Fixed random crashes of MOBI processing step
+* Fixed resizing problems in high quality mode
+* Fixed some MCD support bugs
+* Default output format for Kindle DX is now CBZ
+
+## 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,72 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
+# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
+# Copyright (c) 2013-2014 Pawel Jastrzebski <pawelj@iosphe.re>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+__version__ = '4.2.1'
+__license__ = 'ISC'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
+__docformat__ = 'restructuredtext en'
+
+import sys
+if sys.version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
+
+# Dependency check
+missing = []
+try:
+    # noinspection PyUnresolvedReferences
+    import psutil
+    if tuple(map(int, ('2.0.0'.split(".")))) > tuple(map(int, psutil.version_info)):
+        missing.append('psutil 2.0.0+')
+except ImportError:
+    missing.append('psutil 2.0.0+')
+try:
+    # noinspection PyUnresolvedReferences
+    import PIL
+    if tuple(map(int, ('2.5.0'.split(".")))) > tuple(map(int, (PIL.PILLOW_VERSION.split(".")))):
+        missing.append('Pillow 2.5.0+')
+except ImportError:
+    missing.append('Pillow 2.5.0+')
+try:
+    # noinspection PyUnresolvedReferences
+    import slugify
+except ImportError:
+    missing.append('python-slugify')
+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
+
+if __name__ == "__main__":
+    freeze_support()
+    print(('comic2ebook v%(__version__)s. Written by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals()))
+    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@iosphe.re>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+__version__ = '4.2.1'
+__license__ = 'ISC'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
+__docformat__ = 'restructuredtext en'
+
+import sys
+if sys.version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
+
+# Dependency check
+missing = []
+try:
+    # noinspection PyUnresolvedReferences
+    import PIL
+    if tuple(map(int, ('2.5.0'.split(".")))) > tuple(map(int, (PIL.PILLOW_VERSION.split(".")))):
+        missing.append('Pillow 2.5.0+')
+except ImportError:
+    missing.append('Pillow 2.5.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
+
+if __name__ == "__main__":
+    freeze_support()
+    print(('comic2ebook v%(__version__)s. Written by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals()))
+    main(sys.argv[1:])
+    sys.exit(0)

kcc.iss

@@ -1,7 +1,7 @@
 #define MyAppName "Kindle Comic Converter"
-#define MyAppVersion "3.7.1"
+#define MyAppVersion "4.2.1"
 #define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
-#define MyAppURL "http://kcc.vulturis.eu/"
+#define MyAppURL "http://kcc.iosphe.re/"
 #define MyAppExeName "KCC.exe"
 
 [Setup]
@@ -12,7 +12,7 @@ AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
-AppCopyright=Copyright (C) 2012-2013 Ciro Mattia Gonano and Paweł Jastrzębski
+AppCopyright=Copyright (C) 2012-2014 Ciro Mattia Gonano and Paweł Jastrzębski
 DefaultDirName={pf}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
@@ -30,6 +30,7 @@ UninstallDisplayIcon={app}\{#MyAppExeName}
 ChangesAssociations=True
 InfoAfterFile=other\InstallWarning.rtf
 SignTool=SignTool /d $q{#MyAppName}$q /du $q{#MyAppURL}$q $f
+MinVersion=0,6.0
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -42,56 +43,16 @@ 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: "dist_64\imageformats\*"; DestDir: "{app}\imageformats\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\_ctypes.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "dist_64\platforms\*"; DestDir: "{app}\platforms\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\_hashlib.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "dist_64\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "build\exe.win-amd64-2.7\_multiprocessing.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "dist_64\*.dll"; 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-2.7\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion; 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
-Source: "build\exe.win-amd64-2.7\_psutil_mswindows.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
 Source: "other\vcredist_x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: Is64BitInstallMode
 ; x86 files
-Source: "build\exe.win32-2.7\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion solidbreak; Check: not Is64BitInstallMode
+Source: "dist\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: "dist\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: "dist\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "build\exe.win32-2.7\_multiprocessing.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "dist\*.dll"; 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-2.7\_ssl.pyd"; DestDir: "{app}"; Flags: ignoreversion; 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
-Source: "build\exe.win32-2.7\_psutil_mswindows.pyd"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "other\vcredist_x86.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall; Check: not Is64BitInstallMode
 ; Common files
 Source: "LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion solidbreak
@@ -105,9 +66,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++ 2008 Redistributable Package..."; Check: Is64BitInstallMode
+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++ 2008 Redistributable Package..."; Check: not 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 python2
+#!/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@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,27 +18,60 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-__version__ = '3.7.1'
+__version__ = '4.2.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@iosphe.re>'
 __docformat__ = 'restructuredtext en'
 
 import sys
-import os
+if sys.version_info[0] != 3:
+    print('ERROR: This is Python 3 script!')
+    exit(1)
+
+# Dependency check
+missing = []
 try:
     # noinspection PyUnresolvedReferences
-    from PyQt4 import QtCore, QtGui, QtNetwork
+    from PyQt5 import QtCore, QtNetwork, QtWidgets
+    if tuple(map(int, ('5.2.0'.split(".")))) > tuple(map(int, (QtCore.qVersion().split(".")))):
+        missing.append('PyQt5 5.2.0+')
 except ImportError:
-    print "ERROR: PyQT4 is not installed!"
+    missing.append('PyQt5 5.2.0+')
-    if sys.platform.startswith('linux'):
+try:
-        import Tkinter
+    # noinspection PyUnresolvedReferences
-        import tkMessageBox
+    import psutil
-        importRoot = Tkinter.Tk()
+    if tuple(map(int, ('2.0.0'.split(".")))) > tuple(map(int, psutil.version_info)):
+        missing.append('psutil 2.0.0+')
+except ImportError:
+    missing.append('psutil 2.0.0+')
+try:
+    # noinspection PyUnresolvedReferences
+    import PIL
+    if tuple(map(int, ('2.5.0'.split(".")))) > tuple(map(int, (PIL.PILLOW_VERSION.split(".")))):
+        missing.append('Pillow 2.5.0+')
+except ImportError:
+    missing.append('Pillow 2.5.0+')
+try:
+    # noinspection PyUnresolvedReferences
+    import slugify
+except ImportError:
+    missing.append('python-slugify')
+if len(missing) > 0:
+    try:
+        # noinspection PyUnresolvedReferences
+        import tkinter
+        # noinspection PyUnresolvedReferences
+        import tkinter.messagebox
+        importRoot = tkinter.Tk()
         importRoot.withdraw()
-        tkMessageBox.showerror("KCC - Error", "PyQT4 is not installed!")
+        tkinter.messagebox.showerror('KCC - Error', 'ERROR: ' + ', '.join(missing) + ' is not installed!')
+    except ImportError:
+        print('ERROR: ' + ', '.join(missing) + ' is not installed!')
     exit(1)
-from kcc import KCC_gui
+
+import os
 from multiprocessing import freeze_support
+from kcc import KCC_gui
 
 # OS specific PATH variable workarounds
 if sys.platform.startswith('darwin'):
@@ -49,37 +82,62 @@ if sys.platform.startswith('darwin'):
 elif sys.platform.startswith('win'):
     if getattr(sys, 'frozen', False):
         os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
+
+        # Implementing dummy stdout and stderr for frozen Windows release
+        class fakestd(object):
+            def write(self, string):
+                pass
+
+            def flush(self):
+                pass
+        sys.stdout = fakestd()
+        sys.stderr = fakestd()
     else:
         os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/;' + os.environ['PATH']
         os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 
 # 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)
         if not self.isRunning():
+            # noinspection PyUnresolvedReferences
             self._server.newConnection.connect(self.handleMessage)
             self._server.listen(self._key)
 
+    def shutdown(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():
@@ -87,28 +145,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()
+
-KCCAplication = QApplicationMessaging(sys.argv)
+# Adding signals to QMainWindow
-if KCCAplication.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:
-        KCCAplication.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)
-KCCWindow = QtGui.QMainWindow()
-KCCUI = KCC_gui.KCCGUI(KCCAplication, KCCWindow)
-if len(sys.argv) > 1:
-    KCCUI.handleMessage(sys.argv[1].decode(sys.getfilesystemencoding()))
-sys.exit(KCCAplication.exec_())

kcc/KCC_ui.py

@@ -2,30 +2,16 @@
 
 # Form implementation generated from reading ui file 'KCC.ui'
 #
-# Created: Fri Dec 13 19:22:05 2013
+# Created: Sun May 18 09:08:27 2014
-#      by: PyQt4 UI code generator 4.10.3
+#      by: PyQt5 UI code generator 5.2.1
 #
 # 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, 397)
         KCC.setMinimumSize(QtCore.QSize(420, 397))
         KCC.setMaximumSize(QtCore.QSize(420, 397))
@@ -33,62 +19,62 @@ class Ui_KCC(object):
         font.setPointSize(9)
         KCC.setFont(font)
         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)
@@ -97,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)
@@ -198,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())
@@ -228,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())
@@ -243,27 +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.statusBar = QtGui.QStatusBar(KCC)
+        self.statusBar = QtWidgets.QStatusBar(KCC)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("MS Shell Dlg 2"))
+        font.setFamily("MS Shell Dlg 2")
         font.setPointSize(8)
         self.statusBar.setFont(font)
         self.statusBar.setSizeGripEnabled(False)
-        self.statusBar.setObjectName(_fromUtf8("statusBar"))
+        self.statusBar.setObjectName("statusBar")
         KCC.setStatusBar(self.statusBar)
-        self.ActionBasic = QtGui.QAction(KCC)
+        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)
@@ -272,51 +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/>This mode is created for 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 style=\"white-space:pre\"><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Normal quality mode<br/></span>Maximal quality of images but very poor magnification quality.<br/>Use it only when zoom is not needed or output files needs to be small.</p><p style=\"white-space:pre\"><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode<br/></span>In most cases high quality of images and magnification.<br/>Overall quality highly depends on the resolution of source files.<br/>On Kindle models older than Paperwhite non-zoomed images might be a little blurred.</p><p style=\"white-space:pre\"><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode<br/></span>Highest possible quality. Output files will be big.</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 splitting of two-page spreads.<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.setText(_translate("KCC", "Gamma: Auto", None))
+        self.wLabel.setText(_translate("KCC", "Custom width: "))
-        self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p>Don\'t convert images to grayscale.</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.ColorBox.setText(_translate("KCC", "Color mode", None))
+        self.customWidth.setInputMask(_translate("KCC", "0000"))
-        self.wLabel.setToolTip(_translate("KCC", "Resolution of target device.", None))
+        self.hLabel.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.hLabel.setText(_translate("KCC", "Custom height: "))
-        self.customWidth.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.customWidth.setInputMask(_translate("KCC", "0000; ", None))
+        self.customHeight.setInputMask(_translate("KCC", "0000"))
-        self.hLabel.setToolTip(_translate("KCC", "Resolution of target device.", None))
+        self.ActionBasic.setText(_translate("KCC", "Basic"))
-        self.hLabel.setText(_translate("KCC", "Custom height: ", None))
+        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
-        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,30 +2,16 @@
 
 # Form implementation generated from reading ui file 'KCC-Linux.ui'
 #
-# Created: Fri Dec 13 19:22:17 2013
+# Created: Sun May 18 09:08:37 2014
-#      by: PyQt4 UI code generator 4.10.3
+#      by: PyQt5 UI code generator 5.2.1
 #
 # 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, 397)
         KCC.setMinimumSize(QtCore.QSize(420, 397))
         KCC.setMaximumSize(QtCore.QSize(420, 397))
@@ -33,306 +19,306 @@ class Ui_KCC(object):
         font.setPointSize(9)
         KCC.setFont(font)
         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.statusBar = QtGui.QStatusBar(KCC)
+        self.statusBar = QtWidgets.QStatusBar(KCC)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("DejaVu Sans"))
+        font.setFamily("DejaVu Sans")
         font.setPointSize(8)
         self.statusBar.setFont(font)
         self.statusBar.setSizeGripEnabled(False)
-        self.statusBar.setObjectName(_fromUtf8("statusBar"))
+        self.statusBar.setObjectName("statusBar")
         KCC.setStatusBar(self.statusBar)
-        self.ActionBasic = QtGui.QAction(KCC)
+        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)
@@ -341,51 +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>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God</span> or <span style=\" font-style:italic;\">Noblesse</span>.<br/>This mode was created for 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</span><br/>Maximal quality of images but very poor magnification quality.<br/>Use it only when zoom is not needed or output files needs to be small.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode</span><br/>In most cases high quality of images and magnification.<br/>Overall quality highly depends on the resolution of source files.<br/>On Kindle models older than Paperwhite non-zoomed images might be a little blurred.<br/><br/><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode</span><br/>Highest possible quality. Output files will be big.</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 splitting of two-page spreads.<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.setText(_translate("KCC", "Gamma: Auto", None))
+        self.wLabel.setText(_translate("KCC", "Custom width: "))
-        self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p>Don\'t convert images to grayscale.</p></body></html>", None))
+        self.customWidth.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>"))
-        self.ColorBox.setText(_translate("KCC", "Color mode", None))
+        self.customWidth.setInputMask(_translate("KCC", "0000"))
-        self.wLabel.setToolTip(_translate("KCC", "Resolution of target device.", None))
+        self.hLabel.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>"))
-        self.wLabel.setText(_translate("KCC", "Custom width: ", None))
+        self.hLabel.setText(_translate("KCC", "Custom height: "))
-        self.customWidth.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.customWidth.setInputMask(_translate("KCC", "0000; ", None))
+        self.customHeight.setInputMask(_translate("KCC", "0000"))
-        self.hLabel.setToolTip(_translate("KCC", "Resolution of target device.", None))
+        self.ActionBasic.setText(_translate("KCC", "Basic"))
-        self.hLabel.setText(_translate("KCC", "Custom height: ", None))
+        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
-        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,30 +2,16 @@
 
 # Form implementation generated from reading ui file 'KCC-OSX.ui'
 #
-# Created: Fri Dec 13 19:22:27 2013
+# Created: Sun May 18 09:08:44 2014
-#      by: PyQt4 UI code generator 4.10.3
+#      by: PyQt5 UI code generator 5.2.1
 #
 # 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, 397)
         KCC.setMinimumSize(QtCore.QSize(420, 397))
         KCC.setMaximumSize(QtCore.QSize(420, 397))
@@ -33,330 +19,329 @@ class Ui_KCC(object):
         font.setPointSize(9)
         KCC.setFont(font)
         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.statusBar = QtGui.QStatusBar(KCC)
+        self.statusBar = QtWidgets.QStatusBar(KCC)
         font = QtGui.QFont()
-        font.setFamily(_fromUtf8("Aharoni"))
+        font.setFamily("Aharoni")
         font.setPointSize(8)
         self.statusBar.setFont(font)
         self.statusBar.setSizeGripEnabled(False)
-        self.statusBar.setObjectName(_fromUtf8("statusBar"))
+        self.statusBar.setObjectName("statusBar")
         KCC.setStatusBar(self.statusBar)
-        self.ActionBasic = QtGui.QAction(KCC)
+        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)
@@ -365,45 +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>Enable auto-splitting of webtoons like <span style=\" font-style:italic;\">Tower of God </span>or <span style=\" font-style:italic;\">Noblesse</span>.<br/>This mode was created for pages with a low width, high height and vertical panel flow.</p><p><br/></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 splitting of two-page spreads.<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</span><br/>Maximal quality of images but very poor magnification quality.<br/>Use it only when zoom is not needed or output files needs to be small.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - High quality mode</span><br/>In most cases high quality of images and magnification.<br/>Overall quality highly depends on the resolution of source files.<br/>On Kindle models older than Paperwhite non-zoomed images might be a little blurred.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - Ultra quality mode</span><br/>Highest possible quality. Output files will be big.</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.setText(_translate("KCC", "Gamma: Auto", None))
+        self.BasicModeButton.setText(_translate("KCC", "Basic"))
-        self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Don\'t convert images to grayscale.</span></p></body></html>", None))
+        self.AdvModeButton.setText(_translate("KCC", "Advanced"))
-        self.ColorBox.setText(_translate("KCC", "Color mode", None))
+        self.GammaLabel.setText(_translate("KCC", "Gamma: Auto"))
-        self.wLabel.setToolTip(_translate("KCC", "<html><head/><body><p><span style=\" font-size:12pt;\">Resolution of target device.</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.wLabel.setText(_translate("KCC", "Custom width: ", None))
+        self.ColorBox.setText(_translate("KCC", "Color mode"))
-        self.customWidth.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.customWidth.setInputMask(_translate("KCC", "0000; ", None))
+        self.wLabel.setText(_translate("KCC", "Custom width: "))
-        self.hLabel.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.hLabel.setText(_translate("KCC", "Custom height: ", None))
+        self.customWidth.setInputMask(_translate("KCC", "0000"))
-        self.customHeight.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.customHeight.setInputMask(_translate("KCC", "0000; ", None))
+        self.hLabel.setText(_translate("KCC", "Custom height: "))
-        self.ActionBasic.setText(_translate("KCC", "Basic", None))
+        self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
-        self.ActionAdvanced.setText(_translate("KCC", "Advanced", None))
+        self.customHeight.setInputMask(_translate("KCC", "0000"))
+        self.ActionBasic.setText(_translate("KCC", "Basic"))
+        self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
 
-import KCC_rc
+from . import KCC_rc

kcc/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '3.7.1'
+__version__ = '4.2.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@iosphe.re>'
 __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@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -15,35 +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@iosphe.re>'
 __docformat__ = 'restructuredtext en'
 
+import sys
 import os
-import zipfile
+from zipfile import is_zipfile, ZipFile
-import rarfile
-import locale
-from sys import platform
 from subprocess import STDOUT, PIPE
-try:
+from psutil import Popen
-    # noinspection PyUnresolvedReferences
+from shutil import move, copy
-    from psutil import Popen
+from . import rarfile
-except ImportError:
-    print "ERROR: Psutil is not installed!"
-    if platform.startswith('linux'):
-        import Tkinter
-        import tkMessageBox
-        importRoot = Tkinter.Tk()
-        importRoot.withdraw()
-        tkMessageBox.showerror("KCC - Error", "Psutil is not installed!")
-    exit(1)
-from shutil import move
 
 
 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'
@@ -56,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'):
@@ -64,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'):
@@ -79,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':
@@ -109,6 +102,10 @@ class CBxArchive:
             adir.remove('ComicInfo.xml')
         if len(adir) == 1 and os.path.isdir(os.path.join(targetdir, adir[0])):
             for f in os.listdir(os.path.join(targetdir, adir[0])):
+                # If directory names contain UTF-8 chars shutil.move can't clean up the mess alone
+                if os.path.isdir(os.path.join(targetdir, f)):
+                    os.replace(os.path.join(targetdir, adir[0], f), os.path.join(targetdir, adir[0], f + '-A'))
+                    f += '-A'
                 move(os.path.join(targetdir, adir[0], f), targetdir)
             os.rmdir(os.path.join(targetdir, adir[0]))
         return targetdir

kcc/comic2panel.py

@@ -1,8 +1,7 @@
-#!/usr/bin/env python2
 # -*- 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@iosphe.re>
 #
 # Permission to use, copy, modify, and/or distribute this software for
 # any purpose with or without fee is hereby granted, provided that the
@@ -18,74 +17,31 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 #
-__version__ = '3.7.1'
+
+__version__ = '4.2.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@iosphe.re>'
 __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.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
-        print "ERROR: Pillow 2.3.0 or newer is required!"
-        if sys.platform.startswith('linux'):
-            import Tkinter
-            import tkMessageBox
-            importRoot = Tkinter.Tk()
-            importRoot.withdraw()
-            tkMessageBox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
-        exit(1)
-except ImportError:
-    print "ERROR: Pillow is not installed!"
-    if sys.platform.startswith('linux'):
-        import Tkinter
-        import tkMessageBox
-        importRoot = Tkinter.Tk()
-        importRoot.withdraw()
-        tkMessageBox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
-    exit(1)
-try:
-    from PyQt4 import QtCore
 except ImportError:
     QtCore = None
 
 
-def getImageFileName(imgfile):
+def mergeDirectoryTick(output):
-    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 mergeDirectory_tick(output):
     if output:
         mergeWorkerOutput.append(output)
         mergeWorkerPool.terminate()
     if GUI:
-        GUI.emit(QtCore.SIGNAL("progressBarTick"))
+        GUI.progressBarTick.emit('tick')
         if not GUI.conversionAlive:
             mergeWorkerPool.terminate()
 
@@ -96,36 +52,40 @@ def mergeDirectory(work):
         images = []
         imagesClear = []
         sizes = []
+        h = 0
         for root, dirs, files in walkLevel(directory, 0):
             for name in files:
                 if getImageFileName(name) is not None:
-                    images.append([Image.open(os.path.join(root, name)), os.path.join(root, name)])
+                    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:
-            for i in images:
-                sizes.append(i[0].size[0])
             mw = max(set(sizes), key=sizes.count)
             for i in images:
-                if i[0].size[0] == mw:
+                if i[1] == mw:
-                    i[0] = i[0].convert('RGB')
+                    h += i[2]
-                    imagesClear.append(i)
+                    imagesClear.append(i[0])
-            h = sum(i[0].size[1] for i in imagesClear)
+            # 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:
-                result.paste(i[0], (0, y))
+                img = Image.open(i)
-                y += i[0].size[1]
+                img = img.convert('RGB')
-            for i in imagesClear:
+                result.paste(img, (0, y))
-                os.remove(i[1])
+                y += img.size[1]
-            savePath = os.path.split(imagesClear[0][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 StandardError:
+    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])
@@ -135,25 +95,25 @@ 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
 
 
-def splitImage_tick(output):
+def splitImageTick(output):
     if output:
         splitWorkerOutput.append(output)
         splitWorkerPool.terminate()
     if GUI:
-        GUI.emit(QtCore.SIGNAL("progressBarTick"))
+        GUI.progressBarTick.emit('tick')
         if not GUI.conversionAlive:
             splitWorkerPool.terminate()
 
@@ -164,10 +124,9 @@ def splitImage(work):
         path = work[0]
         name = work[1]
         opt = work[2]
-        # Harcoded opttions
+        # Hardcoded options
         threshold = 1.0
         delta = 15
-        print ".",
         fileExpanded = os.path.splitext(name)
         filePath = os.path.join(path, name)
         image = Image.open(filePath)
@@ -244,18 +203,13 @@ 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. '
-           'Written 2013 by Ciro Mattia Gonano and Pawel Jastrzebski.' % globals())
-
-
 def main(argv=None, qtGUI=None):
     global options, GUI, splitWorkerPool, splitWorkerOutput, mergeWorkerPool, mergeWorkerOutput
-    parser = OptionParser(usage="Usage: %prog [options] comic_folder", add_help_option=False)
+    parser = OptionParser(usage="Usage: kcc-c2p [options] comic_folder", add_help_option=False)
     mainOptions = OptionGroup(parser, "MANDATORY")
     otherOptions = OptionGroup(parser, "OTHER")
     mainOptions.add_option("-y", "--height", type="int", dest="height", default=0,
@@ -281,15 +235,15 @@ 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 = []
@@ -300,10 +254,10 @@ def main(argv=None, qtGUI=None):
                         directoryNumer += 1
                         mergeWork.append([os.path.join(root, directory)])
                 if GUI:
-                    GUI.emit(QtCore.SIGNAL("progressBarTick"), 'status', 'Combining images')
+                    GUI.progressBarTick.emit('Combining images')
-                    GUI.emit(QtCore.SIGNAL("progressBarTick"), directoryNumer)
+                    GUI.progressBarTick.emit(str(directoryNumer))
                 for i in mergeWork:
-                    mergeWorkerPool.apply_async(func=mergeDirectory, args=(i, ), callback=mergeDirectory_tick)
+                    mergeWorkerPool.apply_async(func=mergeDirectory, args=(i, ), callback=mergeDirectoryTick)
                 mergeWorkerPool.close()
                 mergeWorkerPool.join()
                 if GUI and not GUI.conversionAlive:
@@ -312,6 +266,7 @@ def main(argv=None, qtGUI=None):
                 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:
@@ -320,12 +275,12 @@ def main(argv=None, qtGUI=None):
                     else:
                         os.remove(os.path.join(root, name))
             if GUI:
-                GUI.emit(QtCore.SIGNAL("progressBarTick"), 'status', 'Splitting images')
+                GUI.progressBarTick.emit('Splitting images')
-                GUI.emit(QtCore.SIGNAL("progressBarTick"), pagenumber)
+                GUI.progressBarTick.emit(str(pagenumber))
-                GUI.emit(QtCore.SIGNAL("progressBarTick"))
+                GUI.progressBarTick.emit('tick')
             if len(work) > 0:
                 for i in work:
-                    splitWorkerPool.apply_async(func=splitImage, args=(i, ), callback=splitImage_tick)
+                    splitWorkerPool.apply_async(func=splitImage, args=(i, ), callback=splitImageTick)
                 splitWorkerPool.close()
                 splitWorkerPool.join()
                 if GUI and not GUI.conversionAlive:
@@ -343,11 +298,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/dualmetafix.py

@@ -0,0 +1,184 @@
+# -*- coding: utf-8 -*-
+#
+# Based on initial version of DualMetaFix. Copyright (C) 2013 Kevin Hendricks
+# Changes for KCC Copyright (C) 2014 Pawel Jastrzebski <pawelj@iosphe.re>
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import struct
+import mmap
+import shutil
+
+
+class DualMetaFixException(Exception):
+    pass
+
+# palm database offset constants
+number_of_pdb_records = 76
+first_pdb_record = 78
+
+# important rec0 offsets
+mobi_header_base = 16
+mobi_header_length = 20
+mobi_version = 36
+title_offset = 84
+
+
+def getint(data, ofs, sz='L'):
+    i, = struct.unpack_from('>'+sz, data, ofs)
+    return i
+
+
+def writeint(data, ofs, n, slen='L'):
+    if slen == 'L':
+        return data[:ofs]+struct.pack('>L', n)+data[ofs+4:]
+    else:
+        return data[:ofs]+struct.pack('>H', n)+data[ofs+2:]
+
+
+def getsecaddr(datain, secno):
+    nsec = getint(datain, number_of_pdb_records, 'H')
+    if (secno < 0) | (secno >= nsec):
+        emsg = 'requested section number %d out of range (nsec=%d)' % (secno, nsec)
+        raise DualMetaFixException(emsg)
+    secstart = getint(datain, first_pdb_record+secno*8)
+    if secno == nsec-1:
+        secend = len(datain)
+    else:
+        secend = getint(datain, first_pdb_record+(secno+1)*8)
+    return secstart, secend
+
+
+def readsection(datain, secno):
+    secstart, secend = getsecaddr(datain, secno)
+    return datain[secstart:secend]
+
+
+# overwrite section - must be exact same length as original
+def replacesection(datain, secno, secdata):
+    secstart, secend = getsecaddr(datain, secno)
+    seclen = secend - secstart
+    if len(secdata) != seclen:
+        raise DualMetaFixException('section length change in replacesection')
+    datain[secstart:secstart+seclen] = secdata
+
+
+def get_exth_params(rec0):
+    ebase = mobi_header_base + getint(rec0, mobi_header_length)
+    if rec0[ebase:ebase+4] != b'EXTH':
+        raise DualMetaFixException('EXTH tag not found where expected')
+    elen = getint(rec0, ebase+4)
+    enum = getint(rec0, ebase+8)
+    rlen = len(rec0)
+    return ebase, elen, enum, rlen
+
+
+def add_exth(rec0, exth_num, exth_bytes):
+    ebase, elen, enum, rlen = get_exth_params(rec0)
+    newrecsize = 8+len(exth_bytes)
+    newrec0 = rec0[0:ebase+4]+struct.pack('>L', elen+newrecsize)+struct.pack('>L', enum+1)+struct.pack('>L', exth_num)\
+        + struct.pack('>L', newrecsize)+exth_bytes+rec0[ebase+12:]
+    newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)+newrecsize)
+    # keep constant record length by removing newrecsize null bytes from end
+    sectail = newrec0[-newrecsize:]
+    if sectail != b'\0'*newrecsize:
+        raise DualMetaFixException('add_exth: trimmed non-null bytes at end of section')
+    newrec0 = newrec0[0:rlen]
+    return newrec0
+
+
+def read_exth(rec0, exth_num):
+    exth_values = []
+    ebase, elen, enum, rlen = get_exth_params(rec0)
+    ebase += 12
+    while enum > 0:
+        exth_id = getint(rec0, ebase)
+        if exth_id == exth_num:
+            # We might have multiple exths, so build a list.
+            exth_values.append(rec0[ebase+8:ebase+getint(rec0, ebase+4)])
+        enum -= 1
+        ebase = ebase+getint(rec0, ebase+4)
+    return exth_values
+
+
+def del_exth(rec0, exth_num):
+    ebase, elen, enum, rlen = get_exth_params(rec0)
+    ebase_idx = ebase+12
+    enum_idx = 0
+    while enum_idx < enum:
+        exth_id = getint(rec0, ebase_idx)
+        exth_size = getint(rec0, ebase_idx+4)
+        if exth_id == exth_num:
+            newrec0 = rec0
+            newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)-exth_size)
+            newrec0 = newrec0[:ebase_idx]+newrec0[ebase_idx+exth_size:]
+            newrec0 = newrec0[0:ebase+4]+struct.pack('>L', elen-exth_size)+struct.pack('>L', enum-1)+newrec0[ebase+12:]
+            newrec0 += b'\0'*exth_size
+            if rlen != len(newrec0):
+                raise DualMetaFixException('del_exth: incorrect section size change')
+            return newrec0
+        enum_idx += 1
+        ebase_idx = ebase_idx+exth_size
+    return rec0
+
+
+class DualMobiMetaFix:
+    def __init__(self, infile, outfile, asin):
+        shutil.copyfile(infile, outfile)
+        f = open(outfile, "r+b")
+        self.datain = mmap.mmap(f.fileno(), 0)
+        self.datain_rec0 = readsection(self.datain, 0)
+
+        # in the first mobi header
+        # add 501 to "EBOK", add 113 as asin, add 504 as asin
+        rec0 = self.datain_rec0
+        rec0 = del_exth(rec0, 501)
+        rec0 = del_exth(rec0, 113)
+        rec0 = del_exth(rec0, 504)
+        rec0 = add_exth(rec0, 501, b'EBOK')
+        rec0 = add_exth(rec0, 113, asin)
+        rec0 = add_exth(rec0, 504, asin)
+        replacesection(self.datain, 0, rec0)
+
+        ver = getint(self.datain_rec0, mobi_version)
+        self.combo = (ver != 8)
+        if not self.combo:
+            return
+
+        exth121 = read_exth(self.datain_rec0, 121)
+        if len(exth121) == 0:
+            self.combo = False
+            return
+        else:
+            # only pay attention to first exth121
+            # (there should only be one)
+            datain_kf8, = struct.unpack_from('>L', exth121[0], 0)
+            if datain_kf8 == 0xffffffff:
+                self.combo = False
+                return
+        self.datain_kfrec0 = readsection(self.datain, datain_kf8)
+
+        # in the second header
+        # add 501 to "EBOK", add 113 as asin, add 504 as asin
+        rec0 = self.datain_kfrec0
+        rec0 = del_exth(rec0, 501)
+        rec0 = del_exth(rec0, 113)
+        rec0 = del_exth(rec0, 504)
+        rec0 = add_exth(rec0, 501, b'EBOK')
+        rec0 = add_exth(rec0, 113, asin)
+        rec0 = add_exth(rec0, 504, asin)
+        replacesection(self.datain, datain_kf8, rec0)
+
+        self.datain.flush()
+        self.datain.close()

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@iosphe.re>
 #
 # 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
@@ -16,33 +16,18 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+__version__ = '4.2.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@iosphe.re>'
 __docformat__ = 'restructuredtext en'
 
 import os
-from sys import platform
+from io import BytesIO
-try:
+from urllib.request import Request, urlopen
-    # noinspection PyUnresolvedReferences
+from urllib.parse import quote
-    from PIL import Image, ImageOps, ImageStat, ImageChops
+from functools import reduce
-    if tuple(map(int, ('2.3.0'.split(".")))) > tuple(map(int, (Image.PILLOW_VERSION.split(".")))):
+from PIL import Image, ImageOps, ImageStat, ImageChops
-        print "ERROR: Pillow 2.3.0 or newer is required!"
+from .shared import md5Checksum
-        if platform.startswith('linux'):
-            import Tkinter
-            import tkMessageBox
-            importRoot = Tkinter.Tk()
-            importRoot.withdraw()
-            tkMessageBox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
-        exit(1)
-except ImportError:
-    print "ERROR: Pillow is not installed!"
-    if platform.startswith('linux'):
-        import Tkinter
-        import tkMessageBox
-        importRoot = Tkinter.Tk()
-        importRoot.withdraw()
-        tkMessageBox.showerror("KCC - Error", "Pillow 2.3.0 or newer is required!")
-    exit(1)
 
 
 class ProfileData:
@@ -126,52 +111,57 @@ class ComicPage:
         self.filename = os.path.basename(self.origFileName)
         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.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 color and not forcepng:
-                self.image = self.image.convert('L')
-            if self.rotated:
-                suffix += "_kccrot"
-            if wipe:
-                os.remove(os.path.join(targetdir, self.filename))
-            else:
-                suffix += "_kcchq"
-            if self.noPV:
-                suffix += "_kccnpv"
-            else:
-                if self.noHPV:
-                    suffix += "_kccnh"
-                if self.noVPV:
-                    suffix += "_kccnv"
-                if self.border:
-                    suffix += "_kccxl" + str(self.border[0]) + "_kccyu" + str(self.border[1]) + "_kccxr" +\
-                              str(self.border[2]) + "_kccyd" + str(self.border[3])
             if not self.purge:
-                if forcepng:
+                flags = []
-                    self.image.save(os.path.join(targetdir, os.path.splitext(self.filename)[0] + suffix + ".png"),
+                filename = os.path.join(targetdir, os.path.splitext(self.filename)[0]) + '-KCC'
-                                    "PNG", optimize=1)
+                if not color and not forcepng:
+                    self.image = self.image.convert('L')
+                if self.rotated:
+                    flags.append('Rotated')
+                if self.hq:
+                    flags.append('HighQuality')
+                    filename += '-HQ'
+                if self.noPV:
+                    flags.append('NoPanelView')
                 else:
-                    self.image.save(os.path.join(targetdir, os.path.splitext(self.filename)[0] + suffix + ".jpg"),
+                    if self.noHPV:
-                                    "JPEG", optimize=1)
+                        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:
+                return None
         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.isImageColor(self.image):
+            if self.gamma != 1.0 and self.color:
                 gamma = 1.0
         if gamma == 1.0:
             self.image = ImageOps.autocontrast(self.image)
@@ -179,7 +169,7 @@ class ComicPage:
             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))
@@ -196,7 +186,7 @@ class ComicPage:
             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:
+        if (isHQ and sourceImage.purge) or self.noPV:
             self.border = [0, 0, 0, 0]
             self.noPV = True
             return
@@ -233,7 +223,20 @@ class ComicPage:
         # Set target size
         if qualityMode == 0:
             size = (self.size[0], self.size[1])
+        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:
+            # Forcing upscale to make sure that margins will be not too big
+            if not stretch:
+                upscale = True
+            size = (self.panelviewsize[0], self.panelviewsize[1])
+        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])
         # If stretching is on - Resize without other considerations
         if stretch:
@@ -245,11 +248,11 @@ class ComicPage:
             return self.image
         # If image is smaller than target resolution and upscale is off - Just expand it by adding margins
         if self.image.size[0] <= size[0] and self.image.size[1] <= size[1] and not upscale:
-            borderw = (size[0] - self.image.size[0]) / 2
+            borderw = int((size[0] - self.image.size[0]) / 2)
-            borderh = (size[1] - self.image.size[1]) / 2
+            borderh = int((size[1] - self.image.size[1]) / 2)
-            # PV is disabled when source image is smaller than device screen and upscale is off - So we drop HQ image
+            # PV is disabled when source image is smaller than device screen and upscale is off
-            if qualityMode == 2 and self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
+            if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
-                self.purge = True
+                self.noPV = True
             self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=fill)
             # Border can't be float so sometimes image might be 1px too small/large
             if self.image.size[0] != size[0] or self.image.size[1] != size[1]:
@@ -259,10 +262,10 @@ class ComicPage:
         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:
@@ -283,15 +286,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)
@@ -301,7 +304,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
@@ -327,7 +329,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
@@ -336,7 +338,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
@@ -364,27 +366,28 @@ class ComicPage:
             self.image = self.image.crop((0, 0, widthImg, heightImg - diff))
         return self.image
 
-    def cropWhiteSpace(self, threshold):
+    def cropWhiteSpace(self):
         if ImageChops.invert(self.image).getbbox() is not None:
             widthImg, heightImg = self.image.size
             delta = 10
             diff = delta
+            fixedThreshold = 0.1
             # top
-            while ImageStat.Stat(self.image.crop((0, 0, widthImg, diff))).var[0] < threshold and diff < heightImg:
+            while ImageStat.Stat(self.image.crop((0, 0, widthImg, diff))).var[0] < fixedThreshold and diff < heightImg:
                 diff += delta
             diff -= delta
             self.image = self.image.crop((0, diff, widthImg, heightImg))
             widthImg, heightImg = self.image.size
             diff = delta
             # left
-            while ImageStat.Stat(self.image.crop((0, 0, diff, heightImg))).var[0] < threshold and diff < widthImg:
+            while ImageStat.Stat(self.image.crop((0, 0, diff, heightImg))).var[0] < fixedThreshold and diff < widthImg:
                 diff += delta
             diff -= delta
             self.image = self.image.crop((diff, 0, widthImg, heightImg))
             widthImg, heightImg = self.image.size
             diff = delta
             # down
-            while ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0] < threshold\
+            while ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0] < fixedThreshold\
                     and diff < heightImg:
                 diff += delta
             diff -= delta
@@ -392,7 +395,7 @@ class ComicPage:
             widthImg, heightImg = self.image.size
             diff = delta
             # right
-            while ImageStat.Stat(self.image.crop((widthImg - diff, 0, widthImg, heightImg))).var[0] < threshold\
+            while ImageStat.Stat(self.image.crop((widthImg - diff, 0, widthImg, heightImg))).var[0] < fixedThreshold\
                     and diff < widthImg:
                 diff += delta
             diff -= delta
@@ -401,49 +404,47 @@ class ComicPage:
 
     def getImageHistogram(self, image):
         histogram = image.histogram()
-        RBGW = []
+        if histogram[0] == 0:
-        pixelCount = 0
-        for i in range(256):
-            pixelCount += histogram[i] + histogram[256 + i] + histogram[512 + i]
-            RBGW.append(histogram[i] + histogram[256 + i] + histogram[512 + i])
-        white = 0
-        black = 0
-        for i in range(251, 256):
-            white += RBGW[i]
-        for i in range(5):
-            black += RBGW[i]
-        if black > pixelCount*0.8 and white == 0:
-            return 1
-        elif white > pixelCount*0.8 and black == 0:
             return -1
+        elif histogram[255] == 0:
+            return 1
         else:
-            return False
+            return 0
 
-    def getImageFill(self, webtoon):
+    def getImageFill(self):
-        fill = 0
+        bw = self.image.convert('L').point(lambda x: 0 if x < 128 else 255, '1')
-        if not webtoon and not self.rotated:
+        imageBoxA = bw.getbbox()
-            # Search for horizontal solid lines
+        imageBoxB = ImageChops.invert(bw).getbbox()
-            startY = 0
+        if imageBoxA is None or imageBoxB is None:
-            while startY < self.image.size[1]:
+            surfaceB, surfaceW = 0, 0
-                checkSolid = self.getImageHistogram(self.image.crop((0, startY, self.image.size[0], startY+1)))
-                if checkSolid:
-                    fill += checkSolid
-                startY += 1
         else:
-            # Search for vertical solid lines
+            surfaceB = (imageBoxA[2] - imageBoxA[0]) * (imageBoxA[3] - imageBoxA[1])
-            startX = 0
+            surfaceW = (imageBoxB[2] - imageBoxB[0]) * (imageBoxB[3] - imageBoxB[1])
-            while startX < self.image.size[0]:
+        if surfaceW < surfaceB:
-                checkSolid = self.getImageHistogram(self.image.crop((startX, 0, startX+1, self.image.size[1])))
+            self.fill = 'white'
-                if checkSolid:
+        elif surfaceW > surfaceB:
-                    fill += checkSolid
-                startX += 1
-        if fill > 0:
             self.fill = 'black'
         else:
-            self.fill = 'white'
+            fill = 0
+            startY = 0
+            while startY < bw.size[1]:
+                if startY + 5 > bw.size[1]:
+                    startY = bw.size[1] - 5
+                fill += self.getImageHistogram(bw.crop((0, startY, bw.size[0], startY+5)))
+                startY += 5
+            startX = 0
+            while startX < bw.size[0]:
+                if startX + 5 > bw.size[0]:
+                    startX = bw.size[0] - 5
+                fill += self.getImageHistogram(bw.crop((startX, 0, startX+5, bw.size[1])))
+                startX += 5
+            if fill > 0:
+                self.fill = 'black'
+            else:
+                self.fill = 'white'
 
-    def isImageColor(self, image):
+    def isImageColor(self):
-        v = ImageStat.Stat(image).var
+        v = ImageStat.Stat(self.image).var
         isMonochromatic = reduce(lambda x, y: x and y < 0.005, v, True)
         if isMonochromatic:
             # Monochromatic
@@ -466,3 +467,59 @@ class ComicPage:
             else:
                 # Detection failed
                 return False
+
+
+class Cover:
+    def __init__(self, source, target, opt, tomeNumber):
+        self.options = opt
+        self.source = source
+        self.target = target
+        if tomeNumber == 0:
+            self.tomeNumber = 1
+        else:
+            self.tomeNumber = tomeNumber
+        if self.tomeNumber in self.options.remoteCovers:
+            try:
+                source = urlopen(Request(quote(self.options.remoteCovers[self.tomeNumber]).replace('%3A', ':', 1),
+                                         headers={'User-Agent': 'KindleComicConverter/' + __version__})).read()
+                self.image = Image.open(BytesIO(source))
+                self.processExternal()
+            except Exception:
+                self.image = Image.open(source)
+                self.processInternal()
+        else:
+            self.image = Image.open(source)
+            self.processInternal()
+
+    def processInternal(self):
+        self.image = self.image.convert('RGB')
+        self.image = self.trim()
+        self.save()
+
+    def processExternal(self):
+        self.image = self.image.convert('RGB')
+        self.image.thumbnail(self.options.profileData[1], Image.ANTIALIAS)
+        self.save(True)
+
+    def trim(self):
+        bg = Image.new(self.image.mode, self.image.size, self.image.getpixel((0, 0)))
+        diff = ImageChops.difference(self.image, bg)
+        diff = ImageChops.add(diff, diff, 2.0, -100)
+        bbox = diff.getbbox()
+        if bbox:
+            return self.image.crop(bbox)
+        else:
+            return self.image
+
+    def save(self, external=False):
+        if external:
+            source = self.options.remoteCovers[self.tomeNumber].split('/')[-1]
+        else:
+            source = self.source
+        try:
+            if os.path.splitext(source)[1].lower() == '.png':
+                self.image.save(self.target, "PNG", optimize=1)
+            else:
+                self.image.save(self.target, "JPEG", optimize=1)
+        except IOError:
+            raise RuntimeError('Failed to save cover')

kcc/kindlesplit.py

@@ -1,380 +0,0 @@
-# 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
-# Changes for KCC Copyright (C) 2013 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import struct
-# from uuid import uuid4
-
-# important  pdb header offsets
-unique_id_seed = 68
-number_of_pdb_records = 76
-
-# important palmdoc header offsets
-book_length = 4
-book_record_count = 8
-first_pdb_record = 78
-
-# important rec0 offsets
-length_of_book = 4
-mobi_header_base = 16
-mobi_header_length = 20
-mobi_type = 24
-mobi_version = 36
-first_non_text = 80
-title_offset = 84
-first_image_record = 108
-first_content_index = 192
-last_content_index = 194
-kf8_last_content_index = 192  # for KF8 mobi headers
-fcis_index = 200
-flis_index = 208
-srcs_index = 224
-srcs_count = 228
-primary_index = 244
-datp_index = 256
-huffoff = 112
-hufftbloff = 120
-
-
-def getint(datain, ofs, sz='L'):
-    i, = struct.unpack_from('>'+sz, datain, ofs)
-    return i
-
-
-def writeint(datain, ofs, n, length='L'):
-    if length == 'L':
-        return datain[:ofs]+struct.pack('>L', n)+datain[ofs+4:]
-    else:
-        return datain[:ofs]+struct.pack('>H', n)+datain[ofs+2:]
-
-
-def getsecaddr(datain, secno):
-    nsec = getint(datain, number_of_pdb_records, 'H')
-    assert secno >= 0 & secno < nsec, 'secno %d out of range (nsec=%d)' % (secno, nsec)
-    secstart = getint(datain, first_pdb_record+secno*8)
-    if secno == nsec-1:
-        secend = len(datain)
-    else:
-        secend = getint(datain, first_pdb_record+(secno+1)*8)
-    return secstart, secend
-
-
-def readsection(datain, secno):
-    secstart, secend = getsecaddr(datain, secno)
-    return datain[secstart:secend]
-
-
-def writesection(datain, secno, secdata):  # overwrite, accounting for different length
-    dataout = deletesectionrange(datain, secno, secno)
-    return insertsection(dataout, secno, secdata)
-
-
-def nullsection(datain, secno):  # make it zero-length without deleting it
-    datalst = []
-    nsec = getint(datain, number_of_pdb_records, 'H')
-    secstart, secend = getsecaddr(datain, secno)
-    zerosecstart, zerosecend = getsecaddr(datain, 0)
-    dif = secend-secstart
-    datalst.append(datain[:first_pdb_record])
-    for i in range(0, secno+1):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    for i in range(secno+1, nsec):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs -= dif
-        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(datain[zerosecstart: secstart])
-    datalst.append(datain[secend:])
-    dataout = "".join(datalst)
-    return dataout
-
-
-def deletesectionrange(datain, firstsec, lastsec):  # delete a range of sections
-    datalst = []
-    firstsecstart, firstsecend = getsecaddr(datain, firstsec)
-    lastsecstart, lastsecend = getsecaddr(datain, lastsec)
-    zerosecstart, zerosecend = getsecaddr(datain, 0)
-    dif = lastsecend - firstsecstart + 8*(lastsec-firstsec+1)
-    nsec = getint(datain, number_of_pdb_records, 'H')
-    datalst.append(datain[:unique_id_seed])
-    datalst.append(struct.pack('>L', 2*(nsec-(lastsec-firstsec+1))+1))
-    datalst.append(datain[unique_id_seed+4:number_of_pdb_records])
-    datalst.append(struct.pack('>H', nsec-(lastsec-firstsec+1)))
-    newstart = zerosecstart - 8*(lastsec-firstsec+1)
-    for i in range(0, firstsec):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs -= 8 * (lastsec - firstsec + 1)
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    for i in range(lastsec+1, nsec):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs -= dif
-        flgval = 2*(i-(lastsec-firstsec+1))
-        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(datain[zerosecstart:firstsecstart])
-    datalst.append(datain[lastsecend:])
-    dataout = "".join(datalst)
-    return dataout
-
-
-def insertsection(datain, secno, secdata):  # insert a new section
-    datalst = []
-    nsec = getint(datain, number_of_pdb_records, 'H')
-    secstart, secend = getsecaddr(datain, secno)
-    zerosecstart, zerosecend = getsecaddr(datain, 0)
-    dif = len(secdata)
-    datalst.append(datain[:unique_id_seed])
-    datalst.append(struct.pack('>L', 2*(nsec+1)+1))
-    datalst.append(datain[unique_id_seed+4:number_of_pdb_records])
-    datalst.append(struct.pack('>H', nsec+1))
-    newstart = zerosecstart + 8
-    for i in range(0, secno):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs += 8
-        datalst.append(struct.pack('>L', ofs) + struct.pack('>L', flgval))
-    datalst.append(struct.pack('>L', secstart + 8) + struct.pack('>L', (2*secno)))
-    for i in range(secno, nsec):
-        ofs, flgval = struct.unpack_from('>2L', datain, first_pdb_record+i*8)
-        ofs = ofs + dif + 8
-        flgval = 2*(i+1)
-        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(datain[zerosecstart:secstart])
-    datalst.append(secdata)
-    datalst.append(datain[secstart:])
-    dataout = "".join(datalst)
-    return dataout
-
-
-def insertsectionrange(sectionsource, firstsec, lastsec, sectiontarget, targetsec):  # insert a range of sections
-    dataout = sectiontarget
-    for idx in range(lastsec, firstsec-1, -1):
-        dataout = insertsection(dataout, targetsec, readsection(sectionsource, idx))
-    return dataout
-
-
-def get_exth_params(rec0):
-    ebase = mobi_header_base + getint(rec0, mobi_header_length)
-    elen = getint(rec0, ebase+4)
-    enum = getint(rec0, ebase+8)
-    return ebase, elen, enum
-
-
-def add_exth(rec0, exth_num, exth_bytes):
-    ebase, elen, enum = get_exth_params(rec0)
-    newrecsize = 8+len(exth_bytes)
-    newrec0 = rec0[0:ebase+4]+struct.pack('>L', elen+newrecsize)+struct.pack('>L', enum+1) +\
-        struct.pack('>L', exth_num) + struct.pack('>L', newrecsize)+exth_bytes+rec0[ebase+12:]
-    newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)+newrecsize)
-    return newrec0
-
-
-def read_exth(rec0, exth_num):
-    exth_values = []
-    ebase, elen, enum = get_exth_params(rec0)
-    ebase += 12
-    while enum > 0:
-        exth_id = getint(rec0, ebase)
-        if exth_id == exth_num:
-            # We might have multiple exths, so build a list.
-            exth_values.append(rec0[ebase+8:ebase+getint(rec0, ebase+4)])
-        enum -= 1
-        ebase = ebase+getint(rec0, ebase+4)
-    return exth_values
-
-
-def write_exth(rec0, exth_num, exth_bytes):
-    ebase, elen, enum = get_exth_params(rec0)
-    ebase_idx = ebase+12
-    enum_idx = enum
-    while enum_idx > 0:
-        exth_id = getint(rec0, ebase_idx)
-        if exth_id == exth_num:
-            dif = len(exth_bytes)+8-getint(rec0, ebase_idx+4)
-            newrec0 = rec0
-            if dif != 0:
-                newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)+dif)
-            return newrec0[:ebase+4]+struct.pack('>L', elen+len(exth_bytes)+8-getint(rec0, ebase_idx+4)) +\
-                struct.pack('>L', enum)+rec0[ebase+12:ebase_idx+4] +\
-                struct.pack('>L', len(exth_bytes)+8)+exth_bytes +\
-                rec0[ebase_idx+getint(rec0, ebase_idx+4):]
-        enum_idx -= 1
-        ebase_idx = ebase_idx+getint(rec0, ebase_idx+4)
-    return rec0
-
-
-def del_exth(rec0, exth_num):
-    ebase, elen, enum = get_exth_params(rec0)
-    ebase_idx = ebase+12
-    enum_idx = 0
-    while enum_idx < enum:
-        exth_id = getint(rec0, ebase_idx)
-        exth_size = getint(rec0, ebase_idx+4)
-        if exth_id == exth_num:
-            newrec0 = rec0
-            newrec0 = writeint(newrec0, title_offset, getint(newrec0, title_offset)-exth_size)
-            newrec0 = newrec0[:ebase_idx]+newrec0[ebase_idx+exth_size:]
-            newrec0 = newrec0[0:ebase+4]+struct.pack('>L', elen-exth_size)+struct.pack('>L', enum-1)+newrec0[ebase+12:]
-            return newrec0
-        enum_idx += 1
-        ebase_idx = ebase_idx+exth_size
-    return rec0
-
-
-class mobi_split:
-    def __init__(self, infile, newKindle):
-        try:
-            datain = open(infile, 'rb').read()
-            datain_rec0 = readsection(datain, 0)
-            ver = getint(datain_rec0, mobi_version)
-            # fake_asin = str(uuid4())
-            self.combo = (ver != 8)
-            if not self.combo:
-                return
-            exth121 = read_exth(datain_rec0, 121)
-            if len(exth121) == 0:
-                self.combo = False
-                return
-            else:
-                # only pay attention to first exth121
-                # (there should only be one)
-                datain_kf8, = struct.unpack_from('>L', exth121[0], 0)
-                if datain_kf8 == 0xffffffff:
-                    self.combo = False
-                    return
-            datain_kfrec0 = readsection(datain, datain_kf8)
-            firstimage = getint(datain_rec0, first_image_record)
-            lastimage = getint(datain_rec0, last_content_index, 'H')
-
-            if not newKindle:
-                # create the standalone mobi7
-                num_sec = getint(datain, number_of_pdb_records, 'H')
-                # remove BOUNDARY up to but not including ELF record
-                self.result_file = deletesectionrange(datain, datain_kf8-1, num_sec-2)
-                # check if there are SRCS records and delete them
-                srcs = getint(datain_rec0, srcs_index)
-                num_srcs = getint(datain_rec0, srcs_count)
-                if srcs != 0xffffffff and num_srcs > 0:
-                    self.result_file = deletesectionrange(self.result_file, srcs, srcs+num_srcs-1)
-                    datain_rec0 = writeint(datain_rec0, srcs_index, 0xffffffff)
-                    datain_rec0 = writeint(datain_rec0, srcs_count, 0)
-                # reset the EXTH 121 KF8 Boundary meta data to 0xffffffff
-                datain_rec0 = write_exth(datain_rec0, 121, struct.pack('>L', 0xffffffff))
-                # datain_rec0 = del_exth(datain_rec0,121)
-                # 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, '')
-                # 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...
-                # if len(read_exth(datain_rec0, 113)) == 0:
-                #     datain_rec0 = add_exth(datain_rec0, 113, fake_asin)
-                # if len(read_exth(datain_rec0, 504)) == 0:
-                #     datain_rec0 = add_exth(datain_rec0, 504, fake_asin)
-                if len(read_exth(datain_rec0, 501)) == 0:
-                    datain_rec0 = add_exth(datain_rec0, 501, b'EBOK')
-
-                # need to reset flags stored in 0x80-0x83
-                # old mobi with exth: 0x50, mobi7 part with exth: 0x1850, mobi8 part with exth: 0x1050
-                # Bit Flags
-                # 0x1000 = Bit 12 indicates if embedded fonts are used or not
-                # 0x0800 = means this Header points to *shared* images/resource/fonts ??
-                # 0x0080 = unknown new flag, why is this now being set by Kindlegen 2.8?
-                # 0x0040 = exth exists
-                # 0x0010 = Not sure but this is always set so far
-                fval, = struct.unpack_from('>L', datain_rec0, 0x80)
-                # need to remove flag 0x0800 for KindlePreviewer 2.8 and unset Bit 12 for embedded fonts
-                fval &= 0x07FF
-                datain_rec0 = datain_rec0[:0x80] + struct.pack('>L', fval) + datain_rec0[0x84:]
-                self.result_file = writesection(self.result_file, 0, datain_rec0)
-                if lastimage == 0xffff:
-                    # find the lowest of the next sections and copy up to that.
-                    ofs_list = [(kf8_last_content_index, 'L'), (fcis_index, 'L'), (flis_index, 'L'), (datp_index, 'L'),
-                                (hufftbloff, 'L')]
-                    for ofs, sz in ofs_list:
-                        n = getint(datain_kfrec0, ofs, sz)
-                        if 0 < n < lastimage:
-                            lastimage = n-1
-
-                # Try to null out FONT and RES, but leave the (empty) PDB record so image refs remain valid
-                for i in range(firstimage, lastimage):
-                    imgsec = readsection(self.result_file, i)
-                    if imgsec[0:4] in ['RESC', 'FONT']:
-                        self.result_file = nullsection(self.result_file, i)
-                # mobi7 finished
-            else:
-                # create standalone mobi8
-                self.result_file = deletesectionrange(datain, 0, datain_kf8-1)
-                target = getint(datain_kfrec0, first_image_record)
-                self.result_file = insertsectionrange(datain, firstimage, lastimage, self.result_file, target)
-                datain_kfrec0 = readsection(self.result_file, 0)
-
-                # Only keep the correct EXTH 116 StartOffset, KG 2.5 carries over the one from the mobi7 part,
-                # which then points at garbage in the mobi8 part, and confuses FW 3.4
-                kf8starts = read_exth(datain_kfrec0, 116)
-                # If we have multiple StartOffset, keep only the last one
-                kf8start_count = len(kf8starts)
-                while kf8start_count > 1:
-                    kf8start_count -= 1
-                    datain_kfrec0 = del_exth(datain_kfrec0, 116)
-
-                # update the EXTH 125 KF8 Count of Images/Fonts/Resources
-                datain_kfrec0 = write_exth(datain_kfrec0, 125, struct.pack('>L', lastimage-firstimage+1))
-
-                # Same dance for the KF8, we want an ASIN & cdeType :)
-                # if len(read_exth(datain_kfrec0, 113)) == 0:
-                #     datain_kfrec0 = add_exth(datain_kfrec0, 113, fake_asin)
-                # if len(read_exth(datain_kfrec0, 504)) == 0:
-                #     datain_kfrec0 = add_exth(datain_kfrec0, 504, fake_asin)
-                if len(read_exth(datain_kfrec0, 501)) == 0:
-                    datain_kfrec0 = add_exth(datain_kfrec0, 501, b'EBOK')
-
-                # need to reset flags stored in 0x80-0x83
-                # old mobi with exth: 0x50, mobi7 part with exth: 0x1850, mobi8 part with exth: 0x1050
-                # standalone mobi8 with exth: 0x0050
-                # Bit Flags
-                # 0x1000 = Bit 12 indicates if embedded fonts are used or not
-                # 0x0800 = means this Header points to *shared* images/resource/fonts ??
-                # 0x0080 = unknown new flag, why is this now being set by Kindlegen 2.8?
-                # 0x0040 = exth exists
-                # 0x0010 = Not sure but this is always set so far
-                fval, = struct.unpack_from('>L', datain_kfrec0, 0x80)
-                fval &= 0x1FFF
-                fval |= 0x0800
-                datain_kfrec0 = datain_kfrec0[:0x80] + struct.pack('>L', fval) + datain_kfrec0[0x84:]
-
-                # properly update other index pointers that have been shifted by the insertion of images
-                ofs_list = [(kf8_last_content_index, 'L'), (fcis_index, 'L'), (flis_index, 'L'), (datp_index, 'L'),
-                            (hufftbloff, 'L')]
-                for ofs, sz in ofs_list:
-                    n = getint(datain_kfrec0, ofs, sz)
-                    if n != 0xffffffff:
-                        datain_kfrec0 = writeint(datain_kfrec0, ofs, n+lastimage-firstimage+1, sz)
-                self.result_file = writesection(self.result_file, 0, datain_kfrec0)
-                # mobi8 finished
-        except Exception:
-                raise
-
-    def getResult(self):
-        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@iosphe.re>
 #
 # Based upon the code snippet by Ned Batchelder
 # (http://nedbatchelder.com/blog/200712/extracting_jpgs_from_pdfs.html)
@@ -20,7 +20,7 @@
 #
 
 __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@iosphe.re>'
 __docformat__ = 'restructuredtext en'
 
 import os
@@ -39,38 +39,34 @@ class PdfJpgExtract:
         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
             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@iosphe.re>
+#
+# Permission to use, copy, modify, and/or distribute this software for
+# any purpose with or without fee is hereby granted, provided that the
+# above copyright notice and this permission notice appear in all
+# copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+# OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+
+__license__ = 'ISC'
+__copyright__ = '2012-2014, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
+__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,17 +1,20 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 """
-cx_Freeze build script for KCC.
+cx_Freeze/py2app build script for KCC.
 
 Usage (Mac OS X):
     python setup.py py2app
 
 Usage (Windows):
-    python setup.py build
+    python setup.py py2exe
 """
-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.7.1"
+VERSION = "4.2.1"
 MAIN = "kcc.py"
 
 if platform == "darwin":
@@ -23,25 +26,23 @@ 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',
-                qt_plugins=[],
+                          'PyQt5.QtPrintSupport'],
-                excludes=['PyQt4.QtDeclarative', 'PyQt4.QtDesigner', 'PyQt4.QtHelp', 'PyQt4.QtMultimedia',
+                resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'],
-                          'PyQt4.QtOpenGL', 'PyQt4.QtScript', 'PyQt4.QtScriptTools', 'PyQt4.QtSql', 'PyQt4.QtSvg',
-                          'PyQt4.QtXmlPatterns', 'PyQt4.QtXml', 'PyQt4.QtWebKit', 'PyQt4.QtTest', 'Tkinter'],
-                resources=['LICENSE.txt', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'],
                 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',
@@ -54,25 +55,63 @@ if platform == "darwin":
         )
     )
 elif platform == "win32":
-    from cx_Freeze import setup, Executable
+    # noinspection PyUnresolvedReferences
-    base = "Win32GUI"
+    import py2exe
+    import platform as arch
+    from distutils.core import setup
+    if arch.architecture()[0] == '64bit':
+        suffix = '_64'
+    else:
+        suffix = ''
+    additional_files = [('imageformats', ['C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qgif.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qico.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qjpeg.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qmng.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qsvg.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qtga.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qtiff.dll',
+                                          'C:\Python34' + suffix +
+                                          '\Lib\site-packages\PyQt5\plugins\imageformats\qwbmp.dll']),
+                        ('platforms', ['C:\Python34' + suffix +
+                                       '\Lib\site-packages\PyQt5\plugins\platforms\qminimal.dll',
+                                       'C:\Python34' + suffix +
+                                       '\Lib\site-packages\PyQt5\plugins\platforms\qoffscreen.dll',
+                                       'C:\Python34' + suffix +
+                                       '\Lib\site-packages\PyQt5\plugins\platforms\qwindows.dll']),
+                        ('', ['LICENSE.txt',
+                              'other\\7za.exe',
+                              'other\\UnRAR.exe',
+                              'other\\Additional-LICENSE.txt',
+                              'other\\7za.exe',
+                              'C:\Python34' + suffix + '\Lib\site-packages\PyQt5\libEGL.dll'])]
     extra_options = dict(
-        options={"build_exe": {"include_files": ['LICENSE.txt',
+        options={'py2exe': {"bundle_files": 2,
-                                                 ['other/UnRAR.exe', 'UnRAR.exe'],
+                            "dll_excludes": ["tcl85.dll", "tk85.dll"],
-                                                 ['other/7za.exe', '7za.exe'],
+                            "dist_dir": "dist" + suffix,
-                                                 ['other/Additional-LICENSE.txt', 'Additional-LICENSE.txt']
+                            "compressed": True,
-                                                 ], "compressed": True,
+                            "includes": ["sip"],
-                               "excludes": ['Tkinter']}},
+                            "excludes": ["tkinter"],
-        executables=[Executable(MAIN,
+                            "optimize": 2}},
-                                base=base,
+        windows=[{"script": "kcc.py",
-                                targetName="KCC.exe",
+                  "dest_base": "KCC",
-                                icon="icons/comic2ebook.ico",
+                  "version": VERSION,
-                                copyDependentFiles=True,
+                  "copyright": "Ciro Mattia Gonano, Pawel Jastrzebski © 2014",
-                                appendScriptToExe=True,
+                  "legal_copyright": "ISC License (ISCL)",
-                                appendScriptToLibrary=False,
+                  "product_version": VERSION,
-                                compress=True)])
+                  "product_name": "Kindle Comic Converter",
+                  "file_description": "Kindle Comic Converter",
+                  "icon_resources": [(1, "icons\comic2ebook.ico")]}],
+        zipfile=None,
+        data_files=additional_files)
 else:
-    print 'Please use setup.sh to build Linux package.'
+    print('Please use setup.sh to build Linux package.')
     exit()
 
 #noinspection PyUnboundLocalVariable
@@ -80,16 +119,18 @@ setup(
     name=NAME,
     version=VERSION,
     author="Ciro Mattia Gonano, Pawel Jastrzebski",
-    author_email="ciromattia@gmail.com, pawelj@vulturis.eu",
+    author_email="ciromattia@gmail.com, pawelj@iosphe.re",
-    description="A tool to convert comics (CBR/CBZ/PDFs/image folders) to MOBI.",
+    description="Kindle Comic Converter",
     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
+    from os import chmod, makedirs
-    chmod('dist/' + NAME + '.app/Contents/Resources/unrar', 0777)
+    from shutil import copyfile
-    chmod('dist/' + NAME + '.app/Contents/Resources/7za', 0777)
+    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

@@ -1,12 +1,25 @@
 #!/bin/bash
 # Linux Python package build script
 
-VERSION="3.7.1"
+VERSION="4.2.1"
 
 cp kcc.py __main__.py
 zip kcc.zip __main__.py kcc/*.py
-echo "#!/usr/bin/env python2" > kcc-bin
+echo "#!/usr/bin/env python3" > kcc-bin
 cat kcc.zip >> kcc-bin
 chmod +x kcc-bin
-tar --xform s:^.*/:: --xform s/kcc-bin/kcc/ --xform s/comic2ebook/kcc/ -czf KindleComicConverter_linux_$VERSION.tar.gz kcc-bin LICENSE.txt icons/comic2ebook.png
+
-rm __main__.py kcc.zip 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