diff options
| -rw-r--r-- | KCC-Linux.ui | 24 | ||||
| -rw-r--r-- | KCC-OSX.ui | 18 | ||||
| -rw-r--r-- | KCC.ui | 14 | ||||
| -rw-r--r-- | kcc/KCC_gui.py | 2 | ||||
| -rw-r--r-- | kcc/KCC_ui.py | 20 | ||||
| -rw-r--r-- | kcc/KCC_ui_linux.py | 30 | ||||
| -rw-r--r-- | kcc/KCC_ui_osx.py | 24 |
7 files changed, 78 insertions, 54 deletions
diff --git a/KCC-Linux.ui b/KCC-Linux.ui index 7c41928..edf8fa4 100644 --- a/KCC-Linux.ui +++ b/KCC-Linux.ui @@ -71,7 +71,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable image optimizations.<br/>Input images must be already resized.</p></body></html></string> + <string><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></string> </property> <property name="text"> <string>No optimisation</string> @@ -110,7 +110,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><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></string> + <string><html><head/><body><p style='white-space:pre'>Enable special parsing mode for WebToons.</p></body></html></string> </property> <property name="text"> <string>Webtoon mode</string> @@ -167,7 +167,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable splitting and rotation.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Disable page splitting and rotation.</p></body></html></string> </property> <property name="text"> <string>No split/rotate</string> @@ -241,7 +241,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory.</p></body></html></string> </property> <property name="text"> <string>Convert</string> @@ -269,6 +269,9 @@ <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=" font-weight:600;">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html></string> + </property> <property name="text"> <string>Add directory</string> </property> @@ -295,6 +298,9 @@ <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html></string> + </property> <property name="text"> <string>Add file</string> </property> @@ -386,7 +392,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><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></string> + <string><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></string> </property> <property name="text"> <string>High/Ultra quality</string> @@ -664,7 +670,7 @@ </font> </property> <property name="toolTip"> - <string><html><head/><body><p>Resolution of target device.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> </property> <property name="text"> <string>Custom width: </string> @@ -697,7 +703,7 @@ <bool>false</bool> </property> <property name="toolTip"> - <string><html><head/><body><p>Resolution of target device.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> </property> <property name="inputMask"> <string>0000</string> @@ -715,7 +721,7 @@ </font> </property> <property name="toolTip"> - <string><html><head/><body><p>Resolution of target device.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> </property> <property name="text"> <string>Custom height: </string> @@ -748,7 +754,7 @@ <bool>false</bool> </property> <property name="toolTip"> - <string><html><head/><body><p>Resolution of target device.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string> </property> <property name="inputMask"> <string>0000</string> diff --git a/KCC-OSX.ui b/KCC-OSX.ui index e73c93d..77a9079 100644 --- a/KCC-OSX.ui +++ b/KCC-OSX.ui @@ -69,7 +69,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable image optimizations.<br/>Input images must be already resized.</p></body></html></string> + <string><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></string> </property> <property name="text"> <string>No optimisation</string> @@ -110,7 +110,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><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></string> + <string><html><head/><body><p style='white-space:pre'>Enable special parsing mode for WebToons.</p></body></html></string> </property> <property name="text"> <string>Webtoon mode</string> @@ -170,7 +170,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable splitting and rotation.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Disable page splitting and rotation.</p></body></html></string> </property> <property name="text"> <string>No split/rotate</string> @@ -220,7 +220,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Output format.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Output format.</p></body></html></string> </property> </widget> <widget class="QPushButton" name="ConvertButton"> @@ -244,7 +244,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Shift+Click to select the output directory.</p></body></html></string> </property> <property name="text"> <string>Convert</string> @@ -272,6 +272,9 @@ <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=" font-weight:600;">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html></string> + </property> <property name="text"> <string>Add directory</string> </property> @@ -298,6 +301,9 @@ <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html></string> + </property> <property name="text"> <string>Add file</string> </property> @@ -391,7 +397,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><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></string> + <string><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></string> </property> <property name="text"> <string>High/Ultra quality</string> diff --git a/KCC.ui b/KCC.ui index 883a351..9e83cf7 100644 --- a/KCC.ui +++ b/KCC.ui @@ -65,7 +65,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable image optimizations.<br/>Input images must be already resized.</p></body></html></string> + <string><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></string> </property> <property name="text"> <string>No optimisation</string> @@ -94,7 +94,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><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></string> + <string><html><head/><body><p style='white-space:pre'>Enable special parsing mode for WebToons.</p></body></html></string> </property> <property name="text"> <string>Webtoon mode</string> @@ -136,7 +136,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><html><head/><body><p style='white-space:pre'>Disable splitting and rotation.</p></body></html></string> + <string><html><head/><body><p style='white-space:pre'>Disable page splitting and rotation.</p></body></html></string> </property> <property name="text"> <string>No split/rotate</string> @@ -234,6 +234,9 @@ <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=" font-weight:600;">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html></string> + </property> <property name="text"> <string>Add directory</string> </property> @@ -259,6 +262,9 @@ <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> + <property name="toolTip"> + <string><html><head/><body><p style='white-space:pre'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html></string> + </property> <property name="text"> <string>Add file</string> </property> @@ -338,7 +344,7 @@ <enum>Qt::NoFocus</enum> </property> <property name="toolTip"> - <string><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></string> + <string><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></string> </property> <property name="text"> <string>High/Ultra quality</string> diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py index 42eb9b9..74dc7f6 100644 --- a/kcc/KCC_gui.py +++ b/kcc/KCC_gui.py @@ -1070,7 +1070,7 @@ class KCCGUI(KCC_ui.Ui_KCC): elif sys.platform.startswith('linux'): self.listFontSize = 8 self.statusBarFontSize = 8 - self.statusBarStyle = 'QLabel{padding-top:5px;padding-bottom:3px;}' + self.statusBarStyle = 'QLabel{padding-top:3px;padding-bottom:3px;}' self.statusBar.setStyleSheet('QStatusBar::item{border:0px;border-top:2px solid #C2C7CB;}') else: self.listFontSize = 9 diff --git a/kcc/KCC_ui.py b/kcc/KCC_ui.py index dd36744..4de51be 100644 --- a/kcc/KCC_ui.py +++ b/kcc/KCC_ui.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'KCC.ui' # -# Created: Sun May 18 09:08:27 2014 -# by: PyQt5 UI code generator 5.2.1 +# Created: Sun Jan 4 09:58:25 2015 +# by: PyQt5 UI code generator 5.4 # # WARNING! All changes made in this file will be lost! @@ -138,12 +138,12 @@ class Ui_KCC(object): self.JobList = QtWidgets.QListWidget(self.Form) self.JobList.setGeometry(QtCore.QRect(10, 50, 401, 101)) self.JobList.setFocusPolicy(QtCore.Qt.NoFocus) - self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}") + self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.JobList.setProperty("showDropIndicator", False) self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) + self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) + self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.JobList.setObjectName("JobList") self.BasicModeButton = QtWidgets.QPushButton(self.Form) self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 195, 32)) @@ -261,28 +261,30 @@ class Ui_KCC(object): def retranslateUi(self, KCC): _translate = QtCore.QCoreApplication.translate KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter")) - 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.ProcessingBox.setToolTip(_translate("KCC", "<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>")) self.ProcessingBox.setText(_translate("KCC", "No optimisation")) 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.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale")) - 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.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable special parsing mode for WebToons.</p></body></html>")) self.WebtoonBox.setText(_translate("KCC", "Webtoon mode")) 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.NoDitheringBox.setText(_translate("KCC", "PNG output")) 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.BorderBox.setText(_translate("KCC", "W/B margins")) - self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting and rotation.</p></body></html>")) + self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable page splitting and rotation.</p></body></html>")) self.NoRotateBox.setText(_translate("KCC", "No split/rotate")) self.DeviceBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>")) self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>")) self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>")) self.ConvertButton.setText(_translate("KCC", "Convert")) + self.DirectoryButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=\" font-weight:600;\">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html>")) self.DirectoryButton.setText(_translate("KCC", "Add directory")) + self.FileButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>")) self.FileButton.setText(_translate("KCC", "Add file")) self.ClearButton.setText(_translate("KCC", "Clear list")) self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>")) self.MangaBox.setText(_translate("KCC", "Manga mode")) - 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>")) + self.QualityBox.setToolTip(_translate("KCC", "<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>")) self.QualityBox.setText(_translate("KCC", "High/Ultra quality")) 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.RotateBox.setText(_translate("KCC", "Horizontal mode")) diff --git a/kcc/KCC_ui_linux.py b/kcc/KCC_ui_linux.py index d077804..eabddc6 100644 --- a/kcc/KCC_ui_linux.py +++ b/kcc/KCC_ui_linux.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'KCC-Linux.ui' # -# Created: Sun May 18 09:08:37 2014 -# by: PyQt5 UI code generator 5.2.1 +# Created: Sun Jan 4 10:06:14 2015 +# by: PyQt5 UI code generator 5.4 # # WARNING! All changes made in this file will be lost! @@ -178,13 +178,13 @@ class Ui_KCC(object): font.setItalic(False) self.JobList.setFont(font) self.JobList.setFocusPolicy(QtCore.Qt.NoFocus) - self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}") + self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.JobList.setProperty("showDropIndicator", False) self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) self.JobList.setIconSize(QtCore.QSize(18, 18)) + self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) + self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.JobList.setObjectName("JobList") self.BasicModeButton = QtWidgets.QPushButton(self.Form) self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 195, 32)) @@ -330,28 +330,30 @@ class Ui_KCC(object): def retranslateUi(self, KCC): _translate = QtCore.QCoreApplication.translate KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter")) - 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.ProcessingBox.setToolTip(_translate("KCC", "<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>")) self.ProcessingBox.setText(_translate("KCC", "No optimisation")) 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.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale")) - 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.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable special parsing mode for WebToons.</p></body></html>")) self.WebtoonBox.setText(_translate("KCC", "Webtoon mode")) 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.NoDitheringBox.setText(_translate("KCC", "PNG output")) 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.BorderBox.setText(_translate("KCC", "W/B margins")) - self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting and rotation.</p></body></html>")) + self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable page splitting and rotation.</p></body></html>")) self.NoRotateBox.setText(_translate("KCC", "No split/rotate")) self.DeviceBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>")) self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>")) - self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>")) + self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>")) self.ConvertButton.setText(_translate("KCC", "Convert")) + self.DirectoryButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=\" font-weight:600;\">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html>")) self.DirectoryButton.setText(_translate("KCC", "Add directory")) + self.FileButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>")) self.FileButton.setText(_translate("KCC", "Add file")) self.ClearButton.setText(_translate("KCC", "Clear list")) self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>")) self.MangaBox.setText(_translate("KCC", "Manga mode")) - 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>")) + self.QualityBox.setToolTip(_translate("KCC", "<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>")) self.QualityBox.setText(_translate("KCC", "High/Ultra quality")) 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.RotateBox.setText(_translate("KCC", "Horizontal mode")) @@ -360,13 +362,13 @@ class Ui_KCC(object): self.GammaLabel.setText(_translate("KCC", "Gamma: Auto")) self.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Don\'t convert images to grayscale.</p></body></html>")) self.ColorBox.setText(_translate("KCC", "Color mode")) - self.wLabel.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>")) + self.wLabel.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>")) self.wLabel.setText(_translate("KCC", "Custom width: ")) - self.customWidth.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>")) + self.customWidth.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>")) self.customWidth.setInputMask(_translate("KCC", "0000")) - self.hLabel.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>")) + self.hLabel.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>")) self.hLabel.setText(_translate("KCC", "Custom height: ")) - self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p>Resolution of target device.</p></body></html>")) + self.customHeight.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Resolution of target device.</p></body></html>")) self.customHeight.setInputMask(_translate("KCC", "0000")) self.ActionBasic.setText(_translate("KCC", "Basic")) self.ActionAdvanced.setText(_translate("KCC", "Advanced")) diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py index fb12b70..775ecc8 100644 --- a/kcc/KCC_ui_osx.py +++ b/kcc/KCC_ui_osx.py @@ -2,8 +2,8 @@ # Form implementation generated from reading ui file 'KCC-OSX.ui' # -# Created: Sun May 18 09:08:44 2014 -# by: PyQt5 UI code generator 5.2.1 +# Created: Sun Jan 4 10:26:09 2015 +# by: PyQt5 UI code generator 5.4 # # WARNING! All changes made in this file will be lost! @@ -185,12 +185,12 @@ class Ui_KCC(object): font.setPointSize(11) self.JobList.setFont(font) self.JobList.setFocusPolicy(QtCore.Qt.NoFocus) - self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.JobList.setStyleSheet("QListWidget#JobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;}QScrollBar:vertical{border:1px solid #999;background:#FFF;width:5px;margin:0}QScrollBar::handle:vertical{background:DarkGray;min-height:0}QScrollBar::add-line:vertical{height:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:vertical{height:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}QScrollBar:horizontal{border:1px solid #999;background:#FFF;height:5px;margin:0}QScrollBar::handle:horizontal{background:DarkGray;min-width:0}QScrollBar::add-line:horizontal{width:0;background:DarkGray;subcontrol-position:bottom;subcontrol-origin:margin}QScrollBar::sub-line:horizontal{width:0;background:DarkGray;subcontrol-position:top;subcontrol-origin:margin}") + self.JobList.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn) self.JobList.setProperty("showDropIndicator", False) self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) + self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) + self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.JobList.setObjectName("JobList") self.BasicModeButton = QtWidgets.QPushButton(self.Form) self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 210, 41)) @@ -353,28 +353,30 @@ class Ui_KCC(object): def retranslateUi(self, KCC): _translate = QtCore.QCoreApplication.translate KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter")) - 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.ProcessingBox.setToolTip(_translate("KCC", "<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>")) self.ProcessingBox.setText(_translate("KCC", "No optimisation")) 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.UpscaleBox.setText(_translate("KCC", "Stretch/Upscale")) - 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.WebtoonBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable special parsing mode for WebToons.</p></body></html>")) self.WebtoonBox.setText(_translate("KCC", "Webtoon mode")) 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.NoDitheringBox.setText(_translate("KCC", "PNG output")) 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.BorderBox.setText(_translate("KCC", "W/B margins")) - self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable splitting and rotation.</p></body></html>")) + self.NoRotateBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable page splitting and rotation.</p></body></html>")) self.NoRotateBox.setText(_translate("KCC", "No split/rotate")) self.DeviceBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>")) - self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>")) - self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>")) + self.FormatBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>")) + self.ConvertButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>")) self.ConvertButton.setText(_translate("KCC", "Convert")) + self.DirectoryButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Add directory containing JPG, PNG or GIF files to queue.<br/><span style=\" font-weight:600;\">CBR, CBZ and CB7 files inside will not be processed!</span></p></body></html>")) self.DirectoryButton.setText(_translate("KCC", "Add directory")) + self.FileButton.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>")) self.FileButton.setText(_translate("KCC", "Add file")) self.ClearButton.setText(_translate("KCC", "Clear list")) self.MangaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>")) self.MangaBox.setText(_translate("KCC", "Manga mode")) - 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.QualityBox.setToolTip(_translate("KCC", "<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>")) self.QualityBox.setText(_translate("KCC", "High/Ultra quality")) 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.RotateBox.setText(_translate("KCC", "Horizontal mode")) |