diff --git a/KCC-Linux.ui b/KCC-Linux.ui
index 8034019..6d8eaba 100644
--- a/KCC-Linux.ui
+++ b/KCC-Linux.ui
@@ -416,7 +416,7 @@ p, li { white-space: pre-wrap; }
Qt::NoFocus
- <html><head/><body><p>Disable page spliting.<br/>They will be rotated instead.</p></body></html>
+ <html><head/><body><p>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>
Horizontal mode
@@ -543,9 +543,6 @@ p, li { white-space: pre-wrap; }
DejaVu Sans
-
- <html><head/><body><p>When converting color images setting this option to 1.0 <span style=" font-weight:600;">might</span> improve readability.</p></body></html>
-
Gamma: Auto
@@ -567,9 +564,6 @@ p, li { white-space: pre-wrap; }
Qt::ClickFocus
-
- <html><head/><body><p>When converting color images setting this option to 1.0 <span style=" font-weight:600;">might</span> improve readability.</p></body></html>
-
500
@@ -641,7 +635,7 @@ p, li { white-space: pre-wrap; }
Qt::NoFocus
- Do not convert images to grayscale.
+ <html><head/><body><p>Don't convert images to grayscale.</p></body></html>
Color mode
diff --git a/KCC-OSX.ui b/KCC-OSX.ui
index 1c7c5ae..4896197 100644
--- a/KCC-OSX.ui
+++ b/KCC-OSX.ui
@@ -416,7 +416,7 @@
Qt::NoFocus
- <html><head/><body><p><span style=" font-size:12pt;">Disable page spliting.<br/>They will be rotated instead.</span></p></body></html>
+ <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>
Horizontal mode
@@ -543,9 +543,6 @@
false
-
- <html><head/><body><p><span style=" font-size:12pt;">When converting color images setting this option to 1.0 </span><span style=" font-size:12pt; font-weight:600;">might</span><span style=" font-size:12pt;"> improve readability.</span></p></body></html>
-
Gamma: Auto
@@ -567,9 +564,6 @@
Qt::ClickFocus
-
- <html><head/><body><p><span style=" font-size:12pt;">When converting color images setting this option to 1.0 </span><span style=" font-size:12pt; font-weight:600;">might</span><span style=" font-size:12pt;"> improve readability.</span></p></body></html>
-
500
@@ -645,7 +639,7 @@
Qt::NoFocus
- <html><head/><body><p><span style=" font-size:12pt;">Do not convert images to grayscale.</span></p></body></html>
+ <html><head/><body><p><span style=" font-size:12pt;">Don't convert images to grayscale.</span></p></body></html>
Color mode
diff --git a/KCC.ui b/KCC.ui
index edb433a..6725915 100644
--- a/KCC.ui
+++ b/KCC.ui
@@ -363,7 +363,7 @@ p, li { white-space: pre-wrap; }
Qt::NoFocus
- <html><head/><body><p>Disable page spliting.<br/>They will be rotated instead.</p></body></html>
+ <html><head/><body><p>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>
Horizontal mode
@@ -469,9 +469,6 @@ p, li { white-space: pre-wrap; }
40
-
- When converting color images setting this option to 1.0 MIGHT improve readability.
-
Gamma: Auto
@@ -488,9 +485,6 @@ p, li { white-space: pre-wrap; }
Qt::ClickFocus
-
- <html><head/><body><p>When converting color images setting this option to 1.0 <span style=" font-weight:600;">might</span> improve readability.</p></body></html>
-
500
@@ -555,7 +549,7 @@ p, li { white-space: pre-wrap; }
Qt::NoFocus
- Do not convert images to grayscale.
+ <html><head/><body><p>Don't convert images to grayscale.</p></body></html>
Color mode
diff --git a/README.md b/README.md
index 2534614..fcf64e5 100644
--- a/README.md
+++ b/README.md
@@ -10,22 +10,21 @@ It can also optionally optimize images by applying a number of transformations.
Amazon's tool is for comic publishers and involves a lot of manual effort, while **KCC** is for comic readers.
_KC2_ in no way is a replacement for **KCC** so you can be quite confident we'll going to carry on developing our little monster ;-)
-### Donations
-If you find **KCC** valuable you can consider donating to the authors:
+### Issues / new features / donations
+If you have some problems using KCC please [file an issue here](https://github.com/ciromattia/kcc/issues/new).
+If you can fix an open issue, fork & make a pull request.
+If you want more chances an issue is fixes or your wanted feature added, consider [placing a bounty](https://www.bountysource.com/trackers/65571-ciromattia-kcc)!
-* Ciro Mattia Gonano
- * PayPal: [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D8WNYNPBGDAS2)
- * Flattr: [](http://flattr.com/thing/2260449/ciromattiakcc-on-GitHub)
-* Paweł Jastrzębski
- * PayPal: [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YTTJ4LK2JDHPS)
- * BitCoin: [1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b](bitcoin:1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b?label=KCC)
+If you find **KCC** valuable you can consider donating to the authors:
+ * Ciro Mattia Gonano: [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D8WNYNPBGDAS2) [](http://flattr.com/thing/2260449/ciromattiakcc-on-GitHub)
+ * Paweł Jastrzębski: [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YTTJ4LK2JDHPS) [](bitcoin:1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b?label=KCC) [1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b](bitcoin:1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b?label=KCC)
## BINARY RELEASES
You can find the latest released binary at the following links:
- **Windows:** [http://kcc.vulturis.eu/Windows/](http://kcc.vulturis.eu/Windows/)
- **Linux:** [http://kcc.vulturis.eu/Linux/](http://kcc.vulturis.eu/Linux/)
- **OS X (10.8 or later):** [http://kcc.vulturis.eu/OSX/](http://kcc.vulturis.eu/OSX/)
-- **OS X (10.7 or earlier):** [http://kcc.vulturis.eu/Old/OSX/KindleComicConverter_3.6-rc1_osx10.7.zip](http://kcc.vulturis.eu/Old/OSX/KindleComicConverter_3.6-rc1_osx10.7.zip)
+- **OS X (10.7 or earlier):** Soon™
## INPUT FORMATS
**KCC** can understand and convert, at the moment, the following file types:
@@ -55,10 +54,10 @@ You can find the latest released binary at the following links:
* Read tooltip of _High/Ultra quality_ option. There are many important informations there.
* When converting images smaller than device resolution remember to enable upscaling.
* Panel View (auto zooming every part of page) can be disabled directly on Kindle. There is no KCC option to do that.
-* If you're converting color images and the end result is not satisfactory, experiment with gamma correction option (check 1.0 setting first).
* Check our [wiki](https://github.com/ciromattia/kcc/wiki/Other-devices) for a list of tested Non-Kindle E-Readers.
* The first image found will be set as the comic's cover.
* All files/directories will be added to EPUB in alphabetical order.
+* Using high/ultra quality output option with Kindle Fire HD/HDX in most cases is just waste of space.
* ComicRack metadata will be parsed only if they are saved in *ComicInfo.xml* file.
### Calibre:
@@ -295,6 +294,22 @@ The app relies and includes the following scripts/binaries:
* GUI tweaks and minor bug fixes
####3.6:
+* Increased quality of Panel View zoom
+* Creation of multipart MOBI output is now faster on machines with 4GB+ RAM
+* Automatic gamma correction now distinguishes color and grayscale images
+* Added ComicRack metadata parser
+* Implemented new method to detect border color in non-webtoon comics
+* Upscaling is now enabled by default for Kindle Fire HD/HDX
+* Windows nad Linux releases now have tray icon
+* Fixed Kindle Fire HDX 7" output
+* Increased target resolution for Kindle DX/DXG CBZ output
+
+####3.6.1:
+* Fixed PNG output
+
+####3.6.2:
+* Fixed previous PNG output fix
+* Fixed Panel View anomalies
## COPYRIGHT
diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py
index 0142767..5d0dda4 100644
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -291,7 +291,7 @@ class KindleUnpackThread(QtCore.QRunnable):
try:
# MOBI file produced by KindleGen is hybrid. KF8 + M7 + Source header
# KindleSplit is removing redundant data as we need only KF8 part for new Kindle models
- if profile in ['K345', 'KHD', 'KF', 'KFHD', 'KFHD8', 'KFHDX8', 'KFA']:
+ if profile in ['K345', 'KHD', 'KF', 'KFHD', 'KFHD8', 'KFHDX', 'KFHDX8', 'KFA']:
newKindle = True
else:
newKindle = False
@@ -356,6 +356,9 @@ class WorkerThread(QtCore.QThread):
argv.append("--quality=1")
elif GUI.QualityBox.checkState() == 2:
argv.append("--quality=2")
+ if GUI.currentMode == 1:
+ if profile in ['KFHD', 'KFHD8', 'KFHDX', 'KFHDX8']:
+ argv.append("--upscale")
if GUI.currentMode > 1:
if GUI.ProcessingBox.isChecked():
argv.append("--noprocessing")
@@ -374,6 +377,7 @@ class WorkerThread(QtCore.QThread):
if GUI.WebtoonBox.isChecked():
argv.append("--webtoon")
if float(GUI.GammaValue) > 0.09:
+ # noinspection PyTypeChecker
argv.append("--gamma=" + GUI.GammaValue)
if str(GUI.FormatBox.currentText()) == 'CBZ':
argv.append("--cbz-output")
@@ -540,11 +544,11 @@ class WorkerThread(QtCore.QThread):
class SystemTrayIcon(QtGui.QSystemTrayIcon):
def __init__(self, parent=None):
if not sys.platform.startswith('darwin') and self.isSystemTrayAvailable():
- QtGui.QSystemTrayIcon.__init__(self, parent)
- self.setIcon(GUI.icons.programIcon)
+ QtGui.QSystemTrayIcon.__init__(self, GUI.icons.programIcon, MW)
self.activated.connect(self.catchClicks)
def catchClicks(self):
+ MW.showNormal()
MW.raise_()
MW.activateWindow()
@@ -793,9 +797,12 @@ class KCCGUI(KCC_ui.Ui_KCC):
GUI.QualityBox.setChecked(False)
GUI.QualityBox.setEnabled(False)
self.QualityBoxDisabled = True
+ if value in [4, 5, 6, 7]:
+ if GUI.UpscaleBox.isEnabled():
+ GUI.UpscaleBox.setChecked(True)
else:
if not GUI.WebtoonBox.isChecked() and not GUI.ProcessingBox.isChecked() \
- and str(GUI.FormatBox.currentText()) != 'CBZ':
+ and str(GUI.FormatBox.currentText()) != 'CBZ' and value not in [9, 11, 12, 13]:
GUI.QualityBox.setEnabled(True)
self.QualityBoxDisabled = False
@@ -880,8 +887,6 @@ class KCCGUI(KCC_ui.Ui_KCC):
event.ignore()
if not GUI.ConvertButton.isEnabled():
event.ignore()
- if not sys.platform.startswith('darwin'):
- self.tray.hide()
self.contentServer.stop()
self.settings.setValue('settingsVersion', __version__)
self.settings.setValue('lastPath', self.lastPath)
@@ -978,9 +983,9 @@ class KCCGUI(KCC_ui.Ui_KCC):
self.tray.show()
statusBarLabel = QtGui.QLabel('HOMEPAGE - DONATE - README - WIKI')
+ 'ciromattia/kcc/blob/master/README.md#issues--new-features--donations">DONATE'
+ ' - README<'
+ '/a> - WIKI')
statusBarLabel.setAlignment(QtCore.Qt.AlignCenter)
statusBarLabel.setStyleSheet(self.statusBarStyle)
statusBarLabel.setOpenExternalLinks(True)
diff --git a/kcc/KCC_ui.py b/kcc/KCC_ui.py
index 65c71a6..b530932 100644
--- a/kcc/KCC_ui.py
+++ b/kcc/KCC_ui.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'KCC.ui'
#
-# Created: Tue Nov 12 14:31:48 2013
+# Created: Fri Dec 13 19:22:05 2013
# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
@@ -301,14 +301,12 @@ class Ui_KCC(object):
"Indeterminate - High quality mode
Not zoomed image might be a little blurry.
- Medium/High quality when zoom is not enabled.
- Maximum quality when zoom is enabled.
\n"
"Checked - Ultra quality mode
Maximum possible quality.
- Maximum quality when zoom is not enabled.
- Maximum quality when zoom is enabled.
- Very high file size.