diff --git a/gui/KCC-OSX.ui b/gui/KCC-OSX.ui
index 3ad0af7..797e17b 100644
--- a/gui/KCC-OSX.ui
+++ b/gui/KCC-OSX.ui
@@ -7,24 +7,24 @@
0
0
420
- 397
+ 390
420
- 397
+ 390
420
- 397
+ 390
- 9
+ 11
@@ -38,159 +38,17 @@
-
-
- true
-
-
-
- 4
- 253
- 421
- 61
-
-
-
-
- Lucida Grande
- 9
-
-
-
- -
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::NoFocus
-
-
- <html><head/><body><p style='white-space:pre'>Disable image optimizations.<br/><span style=" font-weight:600;">Input images must be already resized.</span></p></body></html>
-
-
- No optimisation
-
-
-
- -
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::NoFocus
-
-
- <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>
-
-
- Stretch/Upscale
-
-
- true
-
-
-
- -
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::NoFocus
-
-
- <html><head/><body><p style='white-space:pre'>Enable special parsing mode for WebToons.</p></body></html>
-
-
- Webtoon mode
-
-
-
- -
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::NoFocus
-
-
- <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>
-
-
- PNG output
-
-
-
- -
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::NoFocus
-
-
- <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>
-
-
- W/B margins
-
-
- true
-
-
-
- -
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::NoFocus
-
-
- <html><head/><body><p style='white-space:pre'>Disable page splitting and rotation.</p></body></html>
-
-
- No split/rotate
-
-
-
-
-
8
- 206
+ 204
151
26
- Lucida Grande
11
@@ -200,25 +58,18 @@
<html><head/><body><p style='white-space:pre'>Target device.</p></body></html>
-
-
- 15
- 15
-
-
- 263
- 206
- 152
+ 264
+ 204
+ 150
26
- Lucida Grande
11
@@ -228,25 +79,18 @@
<html><head/><body><p style='white-space:pre'>Output format.</p></body></html>
-
-
- 15
- 15
-
-
- 160
+ 159
200
- 101
+ 104
41
- Lucida Grande
11
75
true
@@ -269,15 +113,14 @@
- 5
+ 4
160
- 156
+ 158
41
- Lucida Grande
11
@@ -306,7 +149,6 @@
- Lucida Grande
11
@@ -327,15 +169,14 @@
- 160
+ 159
160
- 101
+ 104
41
- Lucida Grande
11
@@ -350,102 +191,166 @@
:/Other/icons/clear.png:/Other/icons/clear.png
-
+
- 5
- 233
- 421
- 41
+ 10
+ 237
+ 401
+ 70
- Lucida Grande
- 12
+ 11
-
-
-
- 9
- 10
- 130
- 18
-
+
+
+ 0
-
-
- Lucida Grande
- 12
-
+
+ 0
-
- Qt::NoFocus
+
+ 0
-
- <html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html>
+
+ 0
-
- Manga mode
+
+ 31
-
-
-
-
- 282
- 10
- 135
- 18
-
+
+ 5
-
-
- Lucida Grande
- 12
-
-
-
- Qt::NoFocus
-
-
- <html><head/><body><p style='white-space:pre'>Quality of Panel View/zoom. Highly impact size of output file.<br/><span style=" font-weight:600;">This option control only quality of magnification!</span></p></body></html>
-
-
- High/Ultra quality
-
-
- true
-
-
-
-
-
- 145
- 10
- 130
- 18
-
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::NoFocus
-
-
- <html><head/><body><p style='white-space:pre'>Disable splitting of two-page spreads.<br/>They will be rotated instead.</p></body></html>
-
-
- Horizontal mode
-
-
- RotateBox
- MangaBox
- QualityBox
+ -
+
+
+ Qt::NoFocus
+
+
+ <html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html>
+
+
+ Manga mode
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Unchecked - Split<br/></span>Double page spreads will be cut into two separate pages.</p><p><span style=" font-weight:600; text-decoration: underline;">Indeterminate - Rotate and split<br/></span>Double page spreads will be displayed twice. First rotated and then split. </p><p><span style=" font-weight:600; text-decoration: underline;">Checked - Rotate<br/></span>Double page spreads will be rotated.</p></body></html>
+
+
+ Spread splitter
+
+
+ true
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+ <html><head/><body><p style='white-space:pre'>High quality Panel View.<br/>Require source files with bigger resolution than target device.<br/><span style=" font-weight:600;">Highly impact size of output file!</span></p></body></html>
+
+
+ HQ zoom
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+ <html><head/><body><p style='white-space:pre'>Disable automatic gamma correction.</p></body></html>
+
+
+ Custom gamma
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+ <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>
+
+
+ PNG output
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+ <html><head/><body><p style='white-space:pre'>Disable conversion to grayscale.</p></body></html>
+
+
+ Color mode
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+ <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>
+
+
+ Stretch/Upscale
+
+
+ true
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+ <html><head/><body><p style='white-space:pre'>Enable special parsing mode for Korean Webtoons.</p></body></html>
+
+
+ Webtoon mode
+
+
+
+ -
+
+
+ Qt::NoFocus
+
+
+ <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>
+
+
+ W/B margins
+
+
+ true
+
+
+
+
@@ -458,7 +363,6 @@
- Lucida Grande
11
@@ -474,6 +378,12 @@
QAbstractItemView::NoSelection
+
+
+ 15
+ 15
+
+
QAbstractItemView::ScrollPerPixel
@@ -481,120 +391,63 @@
QAbstractItemView::ScrollPerPixel
-
-
-
- 5
- 10
- 156
- 41
-
-
-
-
- Lucida Grande
- 12
- 50
- false
-
-
-
- Qt::NoFocus
-
-
- Basic
-
-
-
-
-
- 260
- 10
- 156
- 41
-
-
-
-
- Lucida Grande
- 12
- 50
- false
-
-
-
- Qt::NoFocus
-
-
- Advanced
-
-
-
+
true
- 5
- 303
+ 10
+ 305
401
- 41
+ 35
- Lucida Grande
- 9
+ 11
-
-
-
- 20
- 0
- 100
- 40
-
+
+
+ 15
-
-
- Lucida Grande
- 12
- 50
- false
-
+
+ 0
-
- Gamma: Auto
+
+ 0
-
-
-
-
- 110
- 10
- 290
- 22
-
+
+ 0
-
-
- Lucida Grande
-
+
+ 0
-
- Qt::ClickFocus
-
-
- 500
-
-
- 5
-
-
- Qt::Horizontal
-
-
+ -
+
+
+ Gamma: Auto
+
+
+
+ -
+
+
+ Qt::ClickFocus
+
+
+ 500
+
+
+ 5
+
+
+ Qt::Horizontal
+
+
+
+
@@ -602,13 +455,12 @@
10
10
401
- 29
+ 31
- Lucida Grande
- 10
+ 11
75
true
@@ -623,187 +475,120 @@
-
+
- 5
- 335
- 421
- 41
+ 10
+ 337
+ 401
+ 25
- Lucida Grande
- 9
+ 11
-
-
-
- 9
- 11
- 130
- 18
-
+
+
+ 5
-
-
- Lucida Grande
- 12
-
+
+ 0
-
- Qt::NoFocus
+
+ 0
-
- <html><head/><body><p style='white-space:pre'>Don't convert images to grayscale.</p></body></html>
+
+ 0
-
- Color mode
+
+ 0
-
-
-
-
- 95
- 0
- 315
- 40
-
-
-
-
- Lucida Grande
-
-
-
- -
-
-
-
- Lucida Grande
- 12
- 50
- false
-
-
-
- <html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html>
-
-
- Custom width:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 45
- 16777215
-
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::ClickFocus
-
-
- false
-
-
- <html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html>
-
-
- 0000
-
-
- 4
-
-
-
- -
-
-
-
- Lucida Grande
- 12
- 50
- false
-
-
-
- <html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html>
-
-
- Custom height:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 45
- 16777215
-
-
-
-
- Lucida Grande
- 12
-
-
-
- Qt::ClickFocus
-
-
- false
-
-
- <html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html>
-
-
- 0000
-
-
- 4
-
-
-
-
-
+ -
+
+
+ <html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html>
+
+
+ Custom width:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::ClickFocus
+
+
+ false
+
+
+ <html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html>
+
+
+ 0000
+
+
+ 4
+
+
+
+ -
+
+
+ <html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html>
+
+
+ Custom height:
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Qt::ClickFocus
+
+
+ false
+
+
+ <html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html>
+
+
+ 0000
+
+
+ 4
+
+
+
+
- 160
+ 4
10
- 101
+ 210
41
- Lucida Grande
- 12
+ 11
@@ -817,27 +602,49 @@
:/Other/icons/editor.png:/Other/icons/editor.png
- BasicModeButton
- AdvModeButton
- JobList
- OptionsAdvanced
+
+
+
+ 207
+ 10
+ 210
+ 41
+
+
+
+
+ 11
+
+
+
+ Qt::NoFocus
+
+
+ Wiki
+
+
+
+ :/Other/icons/wiki.png:/Other/icons/wiki.png
+
+
DeviceBox
FormatBox
ConvertButton
DirectoryButton
FileButton
ClearButton
- OptionsBasic
- OptionsAdvancedGamma
- OptionsExpert
+ Options
+ JobList
+ OptionsGamma
+ OptionsCustom
EditorButton
+ WikiButton
ProgressBar
- Aharoni
- 8
+ 11
@@ -856,7 +663,7 @@
- 9
+ 11
diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py
index 9e3b070..ec94274 100644
--- a/kcc/KCC_ui_osx.py
+++ b/kcc/KCC_ui_osx.py
@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
-# Form implementation generated from reading ui file '/Users/pawelj/Documents/KCC/gui/KCC-OSX.ui'
+# Form implementation generated from reading ui file 'KCC-OSX.ui'
#
-# Created: Sun Feb 8 12:37:33 2015
-# by: PyQt5 UI code generator 5.4
+# Created by: PyQt5 UI code generator 5.5.1
#
# WARNING! All changes made in this file will be lost!
@@ -12,11 +11,11 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_KCC(object):
def setupUi(self, KCC):
KCC.setObjectName("KCC")
- KCC.resize(420, 397)
- KCC.setMinimumSize(QtCore.QSize(420, 397))
- KCC.setMaximumSize(QtCore.QSize(420, 397))
+ KCC.resize(420, 390)
+ KCC.setMinimumSize(QtCore.QSize(420, 390))
+ KCC.setMaximumSize(QtCore.QSize(420, 390))
font = QtGui.QFont()
- font.setPointSize(9)
+ font.setPointSize(11)
KCC.setFont(font)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
@@ -24,88 +23,23 @@ class Ui_KCC(object):
KCC.setLocale(QtCore.QLocale(QtCore.QLocale.C, QtCore.QLocale.AnyCountry))
self.Form = QtWidgets.QWidget(KCC)
self.Form.setObjectName("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("Lucida Grande")
- font.setPointSize(9)
- self.OptionsAdvanced.setFont(font)
- self.OptionsAdvanced.setObjectName("OptionsAdvanced")
- self.gridLayout = QtWidgets.QGridLayout(self.OptionsAdvanced)
- self.gridLayout.setObjectName("gridLayout")
- self.ProcessingBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.ProcessingBox.setFont(font)
- self.ProcessingBox.setFocusPolicy(QtCore.Qt.NoFocus)
- self.ProcessingBox.setObjectName("ProcessingBox")
- self.gridLayout.addWidget(self.ProcessingBox, 1, 0, 1, 1)
- self.UpscaleBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.UpscaleBox.setFont(font)
- self.UpscaleBox.setFocusPolicy(QtCore.Qt.NoFocus)
- self.UpscaleBox.setTristate(True)
- self.UpscaleBox.setObjectName("UpscaleBox")
- self.gridLayout.addWidget(self.UpscaleBox, 1, 1, 1, 1)
- self.WebtoonBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.WebtoonBox.setFont(font)
- self.WebtoonBox.setFocusPolicy(QtCore.Qt.NoFocus)
- self.WebtoonBox.setObjectName("WebtoonBox")
- self.gridLayout.addWidget(self.WebtoonBox, 3, 1, 1, 1)
- self.NoDitheringBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.NoDitheringBox.setFont(font)
- self.NoDitheringBox.setFocusPolicy(QtCore.Qt.NoFocus)
- self.NoDitheringBox.setObjectName("NoDitheringBox")
- self.gridLayout.addWidget(self.NoDitheringBox, 3, 2, 1, 1)
- self.BorderBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.BorderBox.setFont(font)
- self.BorderBox.setFocusPolicy(QtCore.Qt.NoFocus)
- self.BorderBox.setTristate(True)
- self.BorderBox.setObjectName("BorderBox")
- self.gridLayout.addWidget(self.BorderBox, 3, 0, 1, 1)
- self.NoRotateBox = QtWidgets.QCheckBox(self.OptionsAdvanced)
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.NoRotateBox.setFont(font)
- self.NoRotateBox.setFocusPolicy(QtCore.Qt.NoFocus)
- self.NoRotateBox.setObjectName("NoRotateBox")
- self.gridLayout.addWidget(self.NoRotateBox, 1, 2, 1, 1)
self.DeviceBox = QtWidgets.QComboBox(self.Form)
- self.DeviceBox.setGeometry(QtCore.QRect(8, 206, 151, 26))
+ self.DeviceBox.setGeometry(QtCore.QRect(8, 204, 151, 26))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
font.setPointSize(11)
self.DeviceBox.setFont(font)
self.DeviceBox.setFocusPolicy(QtCore.Qt.NoFocus)
self.DeviceBox.setObjectName("DeviceBox")
- self.DeviceBox.setIconSize(QtCore.QSize(15, 15))
self.FormatBox = QtWidgets.QComboBox(self.Form)
- self.FormatBox.setGeometry(QtCore.QRect(263, 206, 152, 26))
+ self.FormatBox.setGeometry(QtCore.QRect(264, 204, 150, 26))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
font.setPointSize(11)
self.FormatBox.setFont(font)
self.FormatBox.setFocusPolicy(QtCore.Qt.NoFocus)
self.FormatBox.setObjectName("FormatBox")
- self.FormatBox.setIconSize(QtCore.QSize(15, 15))
self.ConvertButton = QtWidgets.QPushButton(self.Form)
- self.ConvertButton.setGeometry(QtCore.QRect(160, 200, 101, 41))
+ self.ConvertButton.setGeometry(QtCore.QRect(159, 200, 104, 41))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
font.setPointSize(11)
font.setBold(True)
font.setWeight(75)
@@ -116,9 +50,8 @@ class Ui_KCC(object):
self.ConvertButton.setIcon(icon1)
self.ConvertButton.setObjectName("ConvertButton")
self.DirectoryButton = QtWidgets.QPushButton(self.Form)
- self.DirectoryButton.setGeometry(QtCore.QRect(5, 160, 156, 41))
+ self.DirectoryButton.setGeometry(QtCore.QRect(4, 160, 158, 41))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
font.setPointSize(11)
self.DirectoryButton.setFont(font)
self.DirectoryButton.setFocusPolicy(QtCore.Qt.NoFocus)
@@ -129,7 +62,6 @@ class Ui_KCC(object):
self.FileButton = QtWidgets.QPushButton(self.Form)
self.FileButton.setGeometry(QtCore.QRect(260, 160, 157, 41))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
font.setPointSize(11)
self.FileButton.setFont(font)
self.FileButton.setFocusPolicy(QtCore.Qt.NoFocus)
@@ -138,9 +70,8 @@ class Ui_KCC(object):
self.FileButton.setIcon(icon3)
self.FileButton.setObjectName("FileButton")
self.ClearButton = QtWidgets.QPushButton(self.Form)
- self.ClearButton.setGeometry(QtCore.QRect(160, 160, 101, 41))
+ self.ClearButton.setGeometry(QtCore.QRect(159, 160, 104, 41))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
font.setPointSize(11)
self.ClearButton.setFont(font)
self.ClearButton.setFocusPolicy(QtCore.Qt.NoFocus)
@@ -148,103 +79,94 @@ class Ui_KCC(object):
icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.ClearButton.setIcon(icon4)
self.ClearButton.setObjectName("ClearButton")
- self.OptionsBasic = QtWidgets.QFrame(self.Form)
- self.OptionsBasic.setGeometry(QtCore.QRect(5, 233, 421, 41))
+ self.Options = QtWidgets.QFrame(self.Form)
+ self.Options.setGeometry(QtCore.QRect(10, 237, 401, 70))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.OptionsBasic.setFont(font)
- self.OptionsBasic.setObjectName("OptionsBasic")
- self.MangaBox = QtWidgets.QCheckBox(self.OptionsBasic)
- self.MangaBox.setGeometry(QtCore.QRect(9, 10, 130, 18))
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.MangaBox.setFont(font)
+ font.setPointSize(11)
+ self.Options.setFont(font)
+ self.Options.setObjectName("Options")
+ self.gridLayout = QtWidgets.QGridLayout(self.Options)
+ self.gridLayout.setContentsMargins(0, 0, 0, 0)
+ self.gridLayout.setHorizontalSpacing(31)
+ self.gridLayout.setVerticalSpacing(5)
+ self.gridLayout.setObjectName("gridLayout")
+ self.MangaBox = QtWidgets.QCheckBox(self.Options)
self.MangaBox.setFocusPolicy(QtCore.Qt.NoFocus)
self.MangaBox.setObjectName("MangaBox")
- self.QualityBox = QtWidgets.QCheckBox(self.OptionsBasic)
- self.QualityBox.setGeometry(QtCore.QRect(282, 10, 135, 18))
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.QualityBox.setFont(font)
- self.QualityBox.setFocusPolicy(QtCore.Qt.NoFocus)
- self.QualityBox.setTristate(True)
- self.QualityBox.setObjectName("QualityBox")
- self.RotateBox = QtWidgets.QCheckBox(self.OptionsBasic)
- self.RotateBox.setGeometry(QtCore.QRect(145, 10, 130, 18))
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.RotateBox.setFont(font)
+ self.gridLayout.addWidget(self.MangaBox, 2, 0, 1, 1)
+ self.RotateBox = QtWidgets.QCheckBox(self.Options)
self.RotateBox.setFocusPolicy(QtCore.Qt.NoFocus)
+ self.RotateBox.setTristate(True)
self.RotateBox.setObjectName("RotateBox")
+ self.gridLayout.addWidget(self.RotateBox, 2, 1, 1, 1)
+ self.QualityBox = QtWidgets.QCheckBox(self.Options)
+ self.QualityBox.setFocusPolicy(QtCore.Qt.NoFocus)
+ self.QualityBox.setObjectName("QualityBox")
+ self.gridLayout.addWidget(self.QualityBox, 2, 2, 1, 1)
+ self.GammaBox = QtWidgets.QCheckBox(self.Options)
+ self.GammaBox.setFocusPolicy(QtCore.Qt.NoFocus)
+ self.GammaBox.setObjectName("GammaBox")
+ self.gridLayout.addWidget(self.GammaBox, 4, 2, 1, 1)
+ self.NoDitheringBox = QtWidgets.QCheckBox(self.Options)
+ self.NoDitheringBox.setFocusPolicy(QtCore.Qt.NoFocus)
+ self.NoDitheringBox.setObjectName("NoDitheringBox")
+ self.gridLayout.addWidget(self.NoDitheringBox, 5, 1, 1, 1)
+ self.ColorBox = QtWidgets.QCheckBox(self.Options)
+ self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus)
+ self.ColorBox.setObjectName("ColorBox")
+ self.gridLayout.addWidget(self.ColorBox, 5, 2, 1, 1)
+ self.UpscaleBox = QtWidgets.QCheckBox(self.Options)
+ self.UpscaleBox.setFocusPolicy(QtCore.Qt.NoFocus)
+ self.UpscaleBox.setTristate(True)
+ self.UpscaleBox.setObjectName("UpscaleBox")
+ self.gridLayout.addWidget(self.UpscaleBox, 4, 1, 1, 1)
+ self.WebtoonBox = QtWidgets.QCheckBox(self.Options)
+ self.WebtoonBox.setFocusPolicy(QtCore.Qt.NoFocus)
+ self.WebtoonBox.setObjectName("WebtoonBox")
+ self.gridLayout.addWidget(self.WebtoonBox, 4, 0, 1, 1)
+ self.BorderBox = QtWidgets.QCheckBox(self.Options)
+ self.BorderBox.setFocusPolicy(QtCore.Qt.NoFocus)
+ self.BorderBox.setTristate(True)
+ self.BorderBox.setObjectName("BorderBox")
+ self.gridLayout.addWidget(self.BorderBox, 5, 0, 1, 1)
self.JobList = QtWidgets.QListWidget(self.Form)
self.JobList.setGeometry(QtCore.QRect(10, 50, 401, 101))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
font.setPointSize(11)
self.JobList.setFont(font)
self.JobList.setFocusPolicy(QtCore.Qt.NoFocus)
self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}")
self.JobList.setProperty("showDropIndicator", False)
self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
+ self.JobList.setIconSize(QtCore.QSize(15, 15))
self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
self.JobList.setObjectName("JobList")
- self.BasicModeButton = QtWidgets.QPushButton(self.Form)
- self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 156, 41))
+ self.OptionsGamma = QtWidgets.QFrame(self.Form)
+ self.OptionsGamma.setEnabled(True)
+ self.OptionsGamma.setGeometry(QtCore.QRect(10, 305, 401, 35))
font = QtGui.QFont()
- 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("BasicModeButton")
- self.AdvModeButton = QtWidgets.QPushButton(self.Form)
- self.AdvModeButton.setGeometry(QtCore.QRect(260, 10, 156, 41))
- font = QtGui.QFont()
- 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("AdvModeButton")
- self.OptionsAdvancedGamma = QtWidgets.QFrame(self.Form)
- self.OptionsAdvancedGamma.setEnabled(True)
- self.OptionsAdvancedGamma.setGeometry(QtCore.QRect(5, 303, 401, 41))
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(9)
- self.OptionsAdvancedGamma.setFont(font)
- self.OptionsAdvancedGamma.setObjectName("OptionsAdvancedGamma")
- self.GammaLabel = QtWidgets.QLabel(self.OptionsAdvancedGamma)
- self.GammaLabel.setGeometry(QtCore.QRect(20, 0, 100, 40))
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- font.setBold(False)
- font.setWeight(50)
- self.GammaLabel.setFont(font)
+ font.setPointSize(11)
+ self.OptionsGamma.setFont(font)
+ self.OptionsGamma.setObjectName("OptionsGamma")
+ self.horizontalLayout = QtWidgets.QHBoxLayout(self.OptionsGamma)
+ self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
+ self.horizontalLayout.setSpacing(15)
+ self.horizontalLayout.setObjectName("horizontalLayout")
+ self.GammaLabel = QtWidgets.QLabel(self.OptionsGamma)
self.GammaLabel.setObjectName("GammaLabel")
- self.GammaSlider = QtWidgets.QSlider(self.OptionsAdvancedGamma)
- self.GammaSlider.setGeometry(QtCore.QRect(110, 10, 290, 22))
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- self.GammaSlider.setFont(font)
+ self.horizontalLayout.addWidget(self.GammaLabel)
+ self.GammaSlider = QtWidgets.QSlider(self.OptionsGamma)
self.GammaSlider.setFocusPolicy(QtCore.Qt.ClickFocus)
self.GammaSlider.setMaximum(500)
self.GammaSlider.setSingleStep(5)
self.GammaSlider.setOrientation(QtCore.Qt.Horizontal)
self.GammaSlider.setObjectName("GammaSlider")
+ self.horizontalLayout.addWidget(self.GammaSlider)
self.ProgressBar = QtWidgets.QProgressBar(self.Form)
- self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 29))
+ self.ProgressBar.setGeometry(QtCore.QRect(10, 10, 401, 31))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(10)
+ font.setPointSize(11)
font.setBold(True)
font.setWeight(75)
self.ProgressBar.setFont(font)
@@ -252,95 +174,81 @@ class Ui_KCC(object):
self.ProgressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
self.ProgressBar.setFormat("")
self.ProgressBar.setObjectName("ProgressBar")
- self.OptionsExpert = QtWidgets.QFrame(self.Form)
- self.OptionsExpert.setGeometry(QtCore.QRect(5, 335, 421, 41))
+ self.OptionsCustom = QtWidgets.QFrame(self.Form)
+ self.OptionsCustom.setGeometry(QtCore.QRect(10, 337, 401, 25))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(9)
- self.OptionsExpert.setFont(font)
- self.OptionsExpert.setObjectName("OptionsExpert")
- self.ColorBox = QtWidgets.QCheckBox(self.OptionsExpert)
- self.ColorBox.setGeometry(QtCore.QRect(9, 11, 130, 18))
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- self.ColorBox.setFont(font)
- self.ColorBox.setFocusPolicy(QtCore.Qt.NoFocus)
- self.ColorBox.setObjectName("ColorBox")
- self.OptionsExpertInternal = QtWidgets.QFrame(self.OptionsExpert)
- self.OptionsExpertInternal.setGeometry(QtCore.QRect(95, 0, 315, 40))
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- self.OptionsExpertInternal.setFont(font)
- self.OptionsExpertInternal.setObjectName("OptionsExpertInternal")
- self.gridLayout_2 = QtWidgets.QGridLayout(self.OptionsExpertInternal)
- self.gridLayout_2.setObjectName("gridLayout_2")
- self.wLabel = QtWidgets.QLabel(self.OptionsExpertInternal)
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- font.setBold(False)
- font.setWeight(50)
- self.wLabel.setFont(font)
+ font.setPointSize(11)
+ self.OptionsCustom.setFont(font)
+ self.OptionsCustom.setObjectName("OptionsCustom")
+ self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.OptionsCustom)
+ self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
+ self.horizontalLayout_2.setSpacing(5)
+ self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+ self.wLabel = QtWidgets.QLabel(self.OptionsCustom)
self.wLabel.setObjectName("wLabel")
- self.gridLayout_2.addWidget(self.wLabel, 0, 0, 1, 1)
- self.customWidth = QtWidgets.QLineEdit(self.OptionsExpertInternal)
+ self.horizontalLayout_2.addWidget(self.wLabel)
+ self.customWidth = QtWidgets.QLineEdit(self.OptionsCustom)
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("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("customWidth")
- self.gridLayout_2.addWidget(self.customWidth, 0, 1, 1, 1)
- self.hLabel = QtWidgets.QLabel(self.OptionsExpertInternal)
- font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
- font.setBold(False)
- font.setWeight(50)
- self.hLabel.setFont(font)
+ self.horizontalLayout_2.addWidget(self.customWidth)
+ self.hLabel = QtWidgets.QLabel(self.OptionsCustom)
self.hLabel.setObjectName("hLabel")
- self.gridLayout_2.addWidget(self.hLabel, 0, 2, 1, 1)
- self.customHeight = QtWidgets.QLineEdit(self.OptionsExpertInternal)
- sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
+ self.horizontalLayout_2.addWidget(self.hLabel)
+ self.customHeight = QtWidgets.QLineEdit(self.OptionsCustom)
+ 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(45, 16777215))
- font = QtGui.QFont()
- 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("customHeight")
- self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1)
+ self.horizontalLayout_2.addWidget(self.customHeight)
self.EditorButton = QtWidgets.QPushButton(self.Form)
- self.EditorButton.setGeometry(QtCore.QRect(160, 10, 101, 41))
+ self.EditorButton.setGeometry(QtCore.QRect(4, 10, 210, 41))
font = QtGui.QFont()
- font.setFamily("Lucida Grande")
- font.setPointSize(12)
+ font.setPointSize(11)
self.EditorButton.setFont(font)
self.EditorButton.setFocusPolicy(QtCore.Qt.NoFocus)
icon5 = QtGui.QIcon()
icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
self.EditorButton.setIcon(icon5)
self.EditorButton.setObjectName("EditorButton")
+ self.WikiButton = QtWidgets.QPushButton(self.Form)
+ self.WikiButton.setGeometry(QtCore.QRect(207, 10, 210, 41))
+ font = QtGui.QFont()
+ font.setPointSize(11)
+ self.WikiButton.setFont(font)
+ self.WikiButton.setFocusPolicy(QtCore.Qt.NoFocus)
+ icon6 = QtGui.QIcon()
+ icon6.addPixmap(QtGui.QPixmap(":/Other/icons/wiki.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+ self.WikiButton.setIcon(icon6)
+ self.WikiButton.setObjectName("WikiButton")
+ self.DeviceBox.raise_()
+ self.FormatBox.raise_()
+ self.ConvertButton.raise_()
+ self.DirectoryButton.raise_()
+ self.FileButton.raise_()
+ self.ClearButton.raise_()
+ self.Options.raise_()
+ self.JobList.raise_()
+ self.OptionsGamma.raise_()
+ self.OptionsCustom.raise_()
+ self.EditorButton.raise_()
+ self.WikiButton.raise_()
+ self.ProgressBar.raise_()
KCC.setCentralWidget(self.Form)
self.statusBar = QtWidgets.QStatusBar(KCC)
font = QtGui.QFont()
- font.setFamily("Aharoni")
- font.setPointSize(8)
+ font.setPointSize(11)
self.statusBar.setFont(font)
self.statusBar.setSizeGripEnabled(False)
self.statusBar.setObjectName("statusBar")
@@ -349,7 +257,7 @@ class Ui_KCC(object):
self.ActionBasic.setCheckable(True)
self.ActionBasic.setChecked(False)
font = QtGui.QFont()
- font.setPointSize(9)
+ font.setPointSize(11)
self.ActionBasic.setFont(font)
self.ActionBasic.setObjectName("ActionBasic")
self.ActionAdvanced = QtWidgets.QAction(KCC)
@@ -365,18 +273,6 @@ class Ui_KCC(object):
def retranslateUi(self, KCC):
_translate = QtCore.QCoreApplication.translate
KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter"))
- self.ProcessingBox.setToolTip(_translate("KCC", "Disable image optimizations.
Input images must be already resized.
"))
- self.ProcessingBox.setText(_translate("KCC", "No optimisation"))
- self.UpscaleBox.setToolTip(_translate("KCC", "Unchecked - Nothing
Images smaller than device resolution will not be resized.
Indeterminate - Stretching
Images smaller than device resolution will be resized. Aspect ratio will be not preserved.
Checked - Upscaling
Images smaller than device resolution will be resized. Aspect ratio will be preserved.
"))
- self.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale"))
- self.WebtoonBox.setToolTip(_translate("KCC", "Enable special parsing mode for WebToons.
"))
- self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
- self.NoDitheringBox.setToolTip(_translate("KCC", "Create PNG files instead JPEG.
Quality increase is not noticeable on most of devices.
Output files might be smaller.
MOBI conversion will be much slower.
"))
- self.NoDitheringBox.setText(_translate("KCC", "PNG output"))
- self.BorderBox.setToolTip(_translate("KCC", "Unchecked - Autodetection
Color of margins fill will be detected automatically.
Indeterminate - White
Margins will be filled with white color.
Checked - Black
Margins will be filled with black color.
"))
- self.BorderBox.setText(_translate("KCC", "W/B margins"))
- self.NoRotateBox.setToolTip(_translate("KCC", "