mirror of
https://github.com/ciromattia/kcc
synced 2026-04-15 13:38:46 +00:00
Compare commits
93 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
2c875673bd | ||
|
|
1a0be83d63 | ||
|
|
36a7dc49ec | ||
|
|
40d1ae63da | ||
|
|
3d3621c6ec | ||
|
|
d77f04a84e | ||
|
|
ec51d6fc51 | ||
|
|
b7861d9d9e | ||
|
|
0b4503af21 | ||
|
|
437ffb9b10 | ||
|
|
066d1401bd | ||
|
|
9babe68d2a | ||
|
|
67de77538c | ||
|
|
c3e950f2ec | ||
|
|
ac2934aba2 | ||
|
|
a5064a0c0a | ||
|
|
2d712e796d | ||
|
|
cc3da40fd7 | ||
|
|
a53c272bd0 | ||
|
|
6526b139fd | ||
|
|
283d6101cd | ||
|
|
02dab3c6ee | ||
|
|
1895aa127d | ||
|
|
c01ff83fce | ||
|
|
4b670f3754 | ||
|
|
23b1560fa2 | ||
|
|
62350608dc | ||
|
|
8048b91fa8 | ||
|
|
2e9b3389e4 | ||
|
|
40e1ab4cf3 | ||
|
|
d2c12c89e6 | ||
|
|
4647fd1f1d | ||
|
|
010ad3c88c | ||
|
|
4b0a94a8a0 | ||
|
|
807a2d1dff | ||
|
|
e1470cca15 | ||
|
|
02b9081e37 | ||
|
|
495db88a9e | ||
|
|
2bea546a9d | ||
|
|
ee042ef98d | ||
|
|
aea7c0fafb | ||
|
|
45c1afcad4 | ||
|
|
b8e314f6ca | ||
|
|
d76eea9f43 | ||
|
|
2e55f22355 | ||
|
|
30b8770e34 | ||
|
|
9ad161489f | ||
|
|
bdb459cfab | ||
|
|
2e85556543 | ||
|
|
93ebbbd0af | ||
|
|
dd5c907bad | ||
|
|
64fb4a9eca | ||
|
|
284c577894 | ||
|
|
c68c9892e4 | ||
|
|
aa00ea3aa2 | ||
|
|
88f005824c | ||
|
|
2a2bfae112 | ||
|
|
583eec787f | ||
|
|
9ce691aecb | ||
|
|
d1a07d7ffa | ||
|
|
b545f7ad48 | ||
|
|
9e01797d28 | ||
|
|
c68c5f25bf | ||
|
|
a04bf5262f | ||
|
|
b09b2527d9 | ||
|
|
94b372f47d | ||
|
|
b978adcc7c | ||
|
|
9dee4432ad | ||
|
|
15055c6c0c | ||
|
|
3f948a10b0 | ||
|
|
1c942d81db | ||
|
|
b36a5a0a93 | ||
|
|
2ca07430a0 | ||
|
|
3132aa8a21 | ||
|
|
e4dccfe603 | ||
|
|
4c56141b80 | ||
|
|
73c2e4b136 | ||
|
|
c28e9a6ef0 | ||
|
|
558bf07f7f | ||
|
|
eaa458a9c7 | ||
|
|
91b6869638 | ||
|
|
25331f5d81 | ||
|
|
9b25182393 | ||
|
|
189c03529a | ||
|
|
c9cf635229 | ||
|
|
f78dc3cd8f | ||
|
|
4079314b61 | ||
|
|
04cf732d50 | ||
|
|
9015614b1a | ||
|
|
e817c8b258 | ||
|
|
cb9059c231 | ||
|
|
75d8be0951 | ||
|
|
161abdab18 |
7
.gitignore
vendored
7
.gitignore
vendored
@@ -4,12 +4,13 @@
|
|||||||
.idea
|
.idea
|
||||||
.DS_Store
|
.DS_Store
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
build
|
|
||||||
dist
|
dist
|
||||||
Output
|
Output
|
||||||
test
|
test
|
||||||
solaio
|
solaio
|
||||||
kindlegen*
|
kindlegen*
|
||||||
*.spec
|
*.spec
|
||||||
setup.bat
|
kindlecomicconverter/sentry.py
|
||||||
setup.sh
|
build/
|
||||||
|
.python-version
|
||||||
|
KindleComicConverter.egg-info/
|
||||||
|
|||||||
46
.travis.yml
Normal file
46
.travis.yml
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- os: linux
|
||||||
|
language: python
|
||||||
|
python: 3.6
|
||||||
|
dist: trusty
|
||||||
|
sudo: required
|
||||||
|
- os: osx
|
||||||
|
language: generic
|
||||||
|
osx_image: xcode6.4
|
||||||
|
|
||||||
|
before_install:
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then sudo apt-get -y install ruby ruby-dev ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install --upgrade pip setuptools wheel ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then openssl aes-256-cbc -K $encrypted_a95564d8ff0d_key -iv $encrypted_a95564d8ff0d_iv -in other/linux/sentry.py.enc -out kindlecomicconverter/sentry.py -d ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew update ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew install python3 ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then brew upgrade node ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install --upgrade pip setuptools wheel ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then openssl aes-256-cbc -K $encrypted_a95564d8ff0d_key -iv $encrypted_a95564d8ff0d_iv -in other/osx/sentry.py.enc -out kindlecomicconverter/sentry.py -d ; fi
|
||||||
|
|
||||||
|
install:
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install -r requirements.txt ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install certifi https://github.com/pyinstaller/pyinstaller/archive/develop.zip ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then gem install fpm ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install -r requirements.txt ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install certifi https://github.com/pyinstaller/pyinstaller/archive/develop.zip ; fi
|
||||||
|
- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then npm install -g appdmg ; fi
|
||||||
|
|
||||||
|
script: python3 setup.py build_binary
|
||||||
|
|
||||||
|
before_deploy:
|
||||||
|
- shopt -s extglob
|
||||||
|
- rm -r dist/!(*.deb|*.dmg)
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
provider: s3
|
||||||
|
skip_cleanup: true
|
||||||
|
access_key_id: AKIAIQNL5R4FI4C4NJYQ
|
||||||
|
secret_access_key:
|
||||||
|
secure: X66hYplxB4QSueljwvDfamNH/MQmHjo3mCofBcaTHAr7n2fp+yd2NzD2yy9h8NbsL0LWwx9wtJa/jpkIE02ZDfi9NrMLvKKFazzdpiyTMN5Yh85lHHyD1XIOCZRd4igaZ+O8975tJAEaEOPS+PE9XGZcRBh+y/eSJ+fMEgohaJ1MtDFbQR7X1cEw3iqbjrV2rlghZNCk/9mZEfObzAEjQiSDpv5G0IuIPRvYg/BgZt8chHVAe03B6oqcBa7uCBCTlfHIiNh1MWtP0B3NNBq3dcu9QHOFri1YqoZKuaPVCf6TFQL/NW5dFihegev2t9IwFyaBxytiT8fBkgQhP0VX8cuCwBAfnQGIogAu0eLSPp+E6dB/7Cpt2GDCk39+As8WKqt9hCRHmrvYhPA1Mq9QyEgKy/TKKKfDby3qVTIqYOQYpuQ1B7sIU651L5A+hBvZ1dqWIUz25h0zqjjeSFrcfNnf1e4tkk0QJvvnKqz0xsVaJxA2p07VJMRn8SlZQIJ2GEbMDeB5jxYtf5JzXywChP9adlPNjLna9G8ScnGSU1f7ZhsBQUEgY5jBlnX1lveyl3DUe6NP+qOTyljLWYwjx3AF4Zg10LYSecRS6hnqAUrGRmibDCIYclUzlJkVyjKGJ9uEyrUiCp0P0IsAzE1XhPVAWEyGUcWWGJG+jgmohSk=
|
||||||
|
bucket: kcc-deploy
|
||||||
|
region: eu-central-1
|
||||||
|
local_dir: dist
|
||||||
|
on:
|
||||||
|
repo: AcidWeb/kcc
|
||||||
343
CHANGELOG.md
Normal file
343
CHANGELOG.md
Normal file
@@ -0,0 +1,343 @@
|
|||||||
|
# CHANGELOG
|
||||||
|
#### 5.4.1:
|
||||||
|
* Minor bug fixes and tweaks
|
||||||
|
* Implemented new binary build pipeline
|
||||||
|
|
||||||
|
#### 5.4:
|
||||||
|
* Reimplemented high quality Panel View option
|
||||||
|
* Improved webtoon splitter
|
||||||
|
* Fixed page splitter
|
||||||
|
|
||||||
|
#### 5.3.1:
|
||||||
|
* Small increase of output quality
|
||||||
|
* Improved error reporting
|
||||||
|
* Internal changes and tweaks
|
||||||
|
|
||||||
|
#### 5.3:
|
||||||
|
* Vastly improved output compatibility for non-Kindle devices
|
||||||
|
* Enabled old pinch zoom for Kindle devices
|
||||||
|
* Re-enabled Panel View support for Kindle Keyboard
|
||||||
|
* Partially re-enabled OS X file association mechanism
|
||||||
|
* Fixed multiple smaller issues
|
||||||
|
|
||||||
|
#### 5.2.1:
|
||||||
|
* Improved directory parsing
|
||||||
|
* Tweaked margin detection algorithm
|
||||||
|
* Improved error reporting
|
||||||
|
|
||||||
|
#### 5.2:
|
||||||
|
* Added new Panel View options
|
||||||
|
* Implemented new margin detection algorithm
|
||||||
|
* Removed HQ Panel View mode
|
||||||
|
* Fixed multiple smaller issues
|
||||||
|
|
||||||
|
#### 5.1.3:
|
||||||
|
* Added Kobo Aura ONE profile
|
||||||
|
* Fixed few small bugs
|
||||||
|
|
||||||
|
#### 5.1.2:
|
||||||
|
* Fixed error reporting
|
||||||
|
|
||||||
|
#### 5.1.1:
|
||||||
|
* Fixed multiple GUI bugs
|
||||||
|
|
||||||
|
#### 5.1:
|
||||||
|
* GUI now can be resized and high DPI support was somewhat improved
|
||||||
|
* Added profile for Kindle Oasis
|
||||||
|
* Implemented new error reporting mechanism
|
||||||
|
* CLI version now support additional cropping options
|
||||||
|
* Fixed permission issues on Windows
|
||||||
|
* Fixed multiple smaller issues
|
||||||
|
|
||||||
|
#### 5.0.1:
|
||||||
|
* Fixed Panel View placement issues
|
||||||
|
* Decreased application startup time
|
||||||
|
* Fixed multiple smaller issues
|
||||||
|
|
||||||
|
#### 5.0:
|
||||||
|
* Major overhaul of internal mechanisms and GUI
|
||||||
|
* Added cover upload feature
|
||||||
|
* Tweaked Webtoon parsing mode
|
||||||
|
* Fixed multiple smaller issues
|
||||||
|
* Migrated build enviroment to PyInstaller
|
||||||
|
|
||||||
|
#### 4.6.5:
|
||||||
|
* Fixed multiple Windows and OS X issues
|
||||||
|
* Allowed Linux release to use older PyQT5 version
|
||||||
|
|
||||||
|
#### 4.6.4:
|
||||||
|
* Fixed multiple Windows specific problems
|
||||||
|
* Improved error handling
|
||||||
|
* Improved color detection algorithm
|
||||||
|
* New, slimmer OS X release
|
||||||
|
|
||||||
|
#### 4.6.3:
|
||||||
|
* Implemented remote bug reporting
|
||||||
|
* Minor bug fixes and GUI tweaks
|
||||||
|
|
||||||
|
#### 4.6.2:
|
||||||
|
* Fixed critical MOBI header bug
|
||||||
|
* Fixed metadata encoding error
|
||||||
|
|
||||||
|
#### 4.6.1:
|
||||||
|
* Fixed KEPUB TOC generator
|
||||||
|
* Added warning about too small input files
|
||||||
|
* ComicRack Summary metadata field is now parsed
|
||||||
|
* Small tweaks of KEPUB output
|
||||||
|
|
||||||
|
#### 4.6:
|
||||||
|
* KEPUB is now default output for all Kobo profiles
|
||||||
|
* EPUB output now produce fully valid EPUB 3.0.1
|
||||||
|
* Added profile for Kindle Paperwhite 3
|
||||||
|
* Dropped official support of all Kindle Fire models and Kindle for Android
|
||||||
|
* Other minor tweaks
|
||||||
|
|
||||||
|
#### 4.5.1:
|
||||||
|
* Added Kobo Glo HD profile
|
||||||
|
* Fixed RAR/CBR parsing anomalies
|
||||||
|
* Minor bug fixes and tweaks
|
||||||
|
|
||||||
|
#### 4.5:
|
||||||
|
* Added simple ComicRack metadata editor
|
||||||
|
* Re-enabled Manga Cover Database support
|
||||||
|
* ComicRack bookmarks are now parsed
|
||||||
|
* Fixed glitches in Kindle Voyage profile
|
||||||
|
* Fixed problems with directory locks on Windows
|
||||||
|
* Fixed sorting anomalies
|
||||||
|
* Improved conversion speed
|
||||||
|
|
||||||
|
#### 4.4.1:
|
||||||
|
* Fixed problems with OSX GUI
|
||||||
|
* Added one missing DLL to Windows installer
|
||||||
|
|
||||||
|
#### 4.4:
|
||||||
|
* Improved speed and quality of conversion
|
||||||
|
* Added RAR5 support
|
||||||
|
* Dropped BMP and TIFF support
|
||||||
|
* Fixed some WebToon mode bugs
|
||||||
|
* Fixed CBR parsing on OSX
|
||||||
|
|
||||||
|
#### 4.3.1:
|
||||||
|
* Fixed Kindle Voyage profile
|
||||||
|
* Fixed some bugs in OS X release
|
||||||
|
* CLI version now support multiple input files at once
|
||||||
|
* Disabled MCB support
|
||||||
|
* Other minor tweaks
|
||||||
|
|
||||||
|
#### 4.3:
|
||||||
|
* Added profiles for Kindle Voyage and Kobo Aura H2O
|
||||||
|
* Added missing features to CLI version
|
||||||
|
* Other minor bug fixes
|
||||||
|
|
||||||
|
#### 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
|
||||||
|
|
||||||
|
#### 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.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.0.2:
|
||||||
|
* Fixed some Windows and OSX specific bugs
|
||||||
|
* Fixed problem with marigns when using HQ mode
|
||||||
|
|
||||||
|
#### 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:
|
||||||
|
* 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
|
||||||
|
|
||||||
|
#### 3.7.2:
|
||||||
|
* Fixed problems with HQ mode
|
||||||
|
|
||||||
|
#### 3.7.1:
|
||||||
|
* Hotfixed Kobo profiles
|
||||||
|
|
||||||
|
#### 3.7:
|
||||||
|
* Added profiles for KOBO devices
|
||||||
|
* Improved Panel View support
|
||||||
|
* Improved WebToon splitter
|
||||||
|
* Improved margin color autodetection
|
||||||
|
* Tweaked EPUB output
|
||||||
|
* Fixed stretching option
|
||||||
|
* GUI tweaks and minor bugfixes
|
||||||
|
|
||||||
|
#### 3.6.2:
|
||||||
|
* Fixed previous PNG output fix
|
||||||
|
* Fixed Panel View anomalies
|
||||||
|
|
||||||
|
#### 3.6.1:
|
||||||
|
* Fixed PNG output
|
||||||
|
|
||||||
|
#### 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.5:
|
||||||
|
* Added simple content server - Converted files can be now delivered wireless
|
||||||
|
* Added proper Windows installer
|
||||||
|
* Improved multiprocessing speed
|
||||||
|
* GUI tweaks and minor bug fixes
|
||||||
|
|
||||||
|
#### 3.4:
|
||||||
|
* Improved PNG output
|
||||||
|
* Increased quality of upscaling
|
||||||
|
* Added support of file association - KCC can now open CBZ, CBR, CB7, ZIP, RAR, 7Z and PDF files directly
|
||||||
|
* Paths that contain UTF-8 characters are now supported
|
||||||
|
* Migrated to new version of Pillow library
|
||||||
|
* Merged DX and DXG profiles
|
||||||
|
* Many other minor bug fixes and GUI tweaks
|
||||||
|
|
||||||
|
#### 3.3:
|
||||||
|
* Margins are now automatically omitted in Panel View mode
|
||||||
|
* Margin color fill is now autodetected
|
||||||
|
* Created MOBI files are not longer marked as _Personal_ on newer Kindle models
|
||||||
|
* Layout of panels in Panel View mode is now automatically adjusted to content
|
||||||
|
* Fixed Kindle 2/DX/DXG profiles - no more blank pages
|
||||||
|
* All Kindle Fire profiles now support hiqh quality Panel View
|
||||||
|
* Added support of 7z/CB7 files
|
||||||
|
* Added Kindle Fire HDX profile
|
||||||
|
* Support for Virtual Panel View was removed
|
||||||
|
* Profiles for Kindle Keyboard, Touch and Non-Touch are now merged
|
||||||
|
* Windows release is now bundled with UnRAR and 7za
|
||||||
|
* Small GUI tweaks
|
||||||
|
|
||||||
|
#### 3.2:
|
||||||
|
* Too big EPUB files are now splitted before conversion to MOBI
|
||||||
|
* Added experimental parser of manga webtoons
|
||||||
|
* Improved error handling
|
||||||
|
|
||||||
|
#### 3.2.1:
|
||||||
|
* Hotfixed crash occurring on OS with Russian locale
|
||||||
|
|
||||||
|
#### 3.1:
|
||||||
|
* Added profile: Kindle for Android
|
||||||
|
* Add file/directory dialogs now support multiselect
|
||||||
|
* Many small fixes and tweaks
|
||||||
|
|
||||||
|
#### 3.0:
|
||||||
|
* New QT GUI
|
||||||
|
* Merge with AWKCC
|
||||||
|
* Added ultra quality mode
|
||||||
|
* Added support for custom width/height
|
||||||
|
* Added option to disable color conversion
|
||||||
|
|
||||||
|
#### 2.10:
|
||||||
|
* Multiprocessing support
|
||||||
|
* Kindle Fire support (color EPUB/MOBI)
|
||||||
|
* Panel View support for horizontal content
|
||||||
|
* Fixed panel order for horizontal pages when --rotate is enabled
|
||||||
|
* Disabled cropping and page number cutting for blank pages
|
||||||
|
* Fixed some slugify issues with specific file naming conventions (#50, #51)
|
||||||
|
|
||||||
|
#### 2.9
|
||||||
|
* Added support for generating a plain CBZ (skipping all the EPUB/MOBI generation) (#45)
|
||||||
|
* Prevent output file overwriting the source one: if a duplicate name is detected, append _kcc to the name
|
||||||
|
* Rarfile library updated to 2.6
|
||||||
|
* Added GIF, TIFF and BMP to supported formats (#42)
|
||||||
|
* Filenames slugifications (#28, #31, #9, #8)
|
||||||
|
|
||||||
|
#### 2.8
|
||||||
|
* Updated rarfile library
|
||||||
|
* Panel View support + HQ support (#36) - new option: --nopanelviewhq
|
||||||
|
* Split profiles for K4NT and K4T
|
||||||
|
* Rewrite of Landscape Mode support (huge readability improvement for KPW)
|
||||||
|
* Upscale use now BILINEAR method
|
||||||
|
* Added generic CSS file
|
||||||
|
* Optimized archive extraction for zip/rar files (#40)
|
||||||
|
|
||||||
|
#### 2.7
|
||||||
|
* Lots of GUI improvements (#27, #13)
|
||||||
|
* Added gamma support within --gamma option (defaults to profile-specified gamma) (#26, #27)
|
||||||
|
* Added --nodithering option to prevent dithering optimizations (#27)
|
||||||
|
* EPUB margins support (#30)
|
||||||
|
* Fixed no file added if file has no spaces on Windows (#25)
|
||||||
|
* Gracefully exit if unrar missing (#15)
|
||||||
|
* Do not call kindlegen if source EPUB is bigger than 320MB (#17)
|
||||||
|
* Get filetype from magic number (#14)
|
||||||
|
* PDF conversion works again
|
||||||
|
|
||||||
|
#### 2.6
|
||||||
|
* Added --rotate option to rotate landscape images instead of splitting them (#16, #24)
|
||||||
|
* Added --output option to customize EPUB output dir/file (#22)
|
||||||
|
* Add rendition:layout and rendition:orientation EPUB meta tags (supported by new kindlegen 2.8)
|
||||||
|
* Fixed natural sorting for files (#18)
|
||||||
|
|
||||||
|
#### 2.5
|
||||||
|
* Added --black-borders option to set added borders black when page's ratio is not the device's one (#11).
|
||||||
|
* Fixes EPUB containing zipped itself (#10)
|
||||||
|
|
||||||
|
#### 2.4
|
||||||
|
* Use temporary directory as workdir (fixes converting from external volumes and zipfiles renaming)
|
||||||
|
* Fixed "add folders" from GUI.
|
||||||
|
|
||||||
|
#### 2.3
|
||||||
|
* Fixed win32 EPUB generation, folder handling, filenames with spaces and subfolders
|
||||||
|
|
||||||
|
#### 2.2:
|
||||||
|
* Added (valid!) EPUB 2.0 output
|
||||||
|
* Rename .zip files to .cbz to avoid overwriting
|
||||||
|
|
||||||
|
#### 2.1
|
||||||
|
* Added basic error reporting
|
||||||
|
|
||||||
|
#### 2.0
|
||||||
|
* GUI! AppleScript is gone and Tk is used to provide cross-platform GUI support.
|
||||||
|
|
||||||
|
#### 1.5
|
||||||
|
* Added subfolder support for multiple chapters.
|
||||||
|
|
||||||
|
#### 1.4.1
|
||||||
|
* Fixed a serious bug on resizing when img ratio was bigger than device one
|
||||||
|
|
||||||
|
#### 1.4
|
||||||
|
* Added some options for controlling image optimization
|
||||||
|
* Further optimization (ImageOps, page numbering cut, autocontrast)
|
||||||
|
|
||||||
|
#### 1.3
|
||||||
|
* Fixed an issue in OPF generation for device resolution
|
||||||
|
* Reworked options system (call with -h option to get the inline help)
|
||||||
|
|
||||||
|
#### 1.2
|
||||||
|
* Comic optimizations! Split pages not target-oriented (landscape with portrait target or portrait with landscape target), add palette and other image optimizations from Mangle. WARNING: PIL is required for all image mangling!
|
||||||
|
|
||||||
|
#### 1.1.1
|
||||||
|
* Added support for CBZ/CBR files in Kindle Comic Converter
|
||||||
|
|
||||||
|
#### 1.1
|
||||||
|
* Added support for CBZ/CBR files in comic2ebook.py
|
||||||
|
|
||||||
|
#### 1.0
|
||||||
|
* Initial version
|
||||||
26
Dockerfile
26
Dockerfile
@@ -1,26 +0,0 @@
|
|||||||
# Recipe used to build DEB package
|
|
||||||
|
|
||||||
FROM acidweb/kcc-base
|
|
||||||
MAINTAINER Paweł Jastrzębski <pawelj@iosphe.re>
|
|
||||||
|
|
||||||
ENV KCCVER 5.0.1
|
|
||||||
ADD . /app
|
|
||||||
|
|
||||||
RUN pip3 install pillow python-slugify psutil scandir pyinstaller
|
|
||||||
RUN gem install fpm
|
|
||||||
RUN useradd -ms /bin/bash kcc && chown -R kcc:kcc /app
|
|
||||||
|
|
||||||
USER kcc
|
|
||||||
WORKDIR /app
|
|
||||||
RUN pyinstaller -F -s --noupx kcc.py
|
|
||||||
RUN mkdir -p dist/usr/bin dist/usr/share/applications dist/usr/share/doc/kindlecomicconverter dist/usr/share/kindlecomicconverter dist/usr/share/lintian/overrides
|
|
||||||
RUN mv dist/kcc dist/usr/bin
|
|
||||||
RUN cp icons/comic2ebook.png dist/usr/share/kindlecomicconverter
|
|
||||||
RUN cp LICENSE.txt dist/usr/share/doc/kindlecomicconverter/copyright
|
|
||||||
RUN cp other/linux/kindlecomicconverter.desktop dist/usr/share/applications
|
|
||||||
RUN cp other/linux/kindlecomicconverter dist/usr/share/lintian/overrides
|
|
||||||
|
|
||||||
WORKDIR /app/dist
|
|
||||||
RUN fpm -f -s dir -t deb -n kindlecomicconverter -v $KCCVER -m "Paweł Jastrzębski <pawelj@iosphe.re>" --license "ISC" --description "Comic and Manga converter for e-book readers.\nThis app allows you to transform your PNG, JPG, GIF, CBZ, CBR and CB7 files\ninto EPUB or MOBI format e-books." --url "https://kcc.iosphe.re/" --deb-priority "optional" --vendor "" --category "graphics" -d "unrar | unrar-free" -d "p7zip-full" usr
|
|
||||||
|
|
||||||
CMD mkdir -p /out/dist && cp kindlecomicconverter_${KCCVER}_amd64.deb /out/dist
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
ISC LICENSE
|
ISC LICENSE
|
||||||
|
|
||||||
Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
Copyright (c) 2013-2015 Paweł Jastrzębski <pawelj@iosphe.re>
|
Copyright (c) 2013-2017 Paweł Jastrzębski <pawelj@iosphe.re>
|
||||||
|
|
||||||
Permission to use, copy, modify, and/or distribute this software for
|
Permission to use, copy, modify, and/or distribute this software for
|
||||||
any purpose with or without fee is hereby granted, provided that the
|
any purpose with or without fee is hereby granted, provided that the
|
||||||
|
|||||||
1
MANIFEST.in
Normal file
1
MANIFEST.in
Normal file
@@ -0,0 +1 @@
|
|||||||
|
exclude kindlecomicconverter/sentry.py
|
||||||
380
README.md
380
README.md
@@ -1,4 +1,6 @@
|
|||||||
# KCC
|
# KCC
|
||||||
|
|
||||||
|
[](https://github.com/ciromattia/kcc/releases) [](https://pypi.python.org/pypi/KindleComicConverter) [](https://aur.archlinux.org/packages/kcc/)
|
||||||
|
|
||||||
**Kindle Comic Converter** is a Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ.
|
**Kindle Comic Converter** is a Python app to convert comic/manga files or folders to EPUB, Panel View MOBI or E-Ink optimized CBZ.
|
||||||
It was initially developed for Kindle but since version 4.6 it outputs valid EPUB 3.0 so _**despite its name, KCC is
|
It was initially developed for Kindle but since version 4.6 it outputs valid EPUB 3.0 so _**despite its name, KCC is
|
||||||
@@ -6,7 +8,7 @@ actually a comic/manga to EPUB converter that every e-reader owner can happily u
|
|||||||
It can also optionally optimize images by applying a number of transformations.
|
It can also optionally optimize images by applying a number of transformations.
|
||||||
|
|
||||||
### A word of warning
|
### A word of warning
|
||||||
**KCC** _is not_ [Amazon's Kindle Comic Creator](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1001103761) nor is in any way endorsed by Amazon.
|
**KCC** _is not_ [Amazon's Kindle Comic Creator](http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1001103761) nor is in any way endorsed by Amazon.
|
||||||
Amazon's tool is for comic publishers and involves a lot of manual effort, while **KCC** is for comic/manga readers.
|
Amazon's tool is for comic publishers and involves a lot of manual effort, while **KCC** is for comic/manga 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 ;-)
|
_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 ;-)
|
||||||
|
|
||||||
@@ -17,31 +19,37 @@ If you can fix an open issue, fork & make a pull request.
|
|||||||
|
|
||||||
If you find **KCC** valuable you can consider donating to the authors:
|
If you find **KCC** valuable you can consider donating to the authors:
|
||||||
- Ciro Mattia Gonano:
|
- Ciro Mattia Gonano:
|
||||||
- [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D8WNYNPBGDAS2)
|
- [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=D8WNYNPBGDAS2)
|
||||||
- [](http://flattr.com/thing/2260449/ciromattiakcc-on-GitHub)
|
- [](http://flattr.com/thing/2260449/ciromattiakcc-on-GitHub)
|
||||||
- Paweł Jastrzębski:
|
- Paweł Jastrzębski:
|
||||||
- [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YTTJ4LK2JDHPS)
|
- [](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YTTJ4LK2JDHPS)
|
||||||
- Bitcoin: 1W15wwqsfd7wbaZ6wvSJf1LW1bz6q5L8b
|
- [](https://jastrzeb.ski/donate/)
|
||||||
|
|
||||||
## BINARY RELEASES
|
## BINARY RELEASES
|
||||||
You can find the latest released binary at the following links:
|
You can find the latest released binary at the following links:
|
||||||
- **Windows (64-bit only):** [http://kcc.iosphe.re/Windows/](http://kcc.iosphe.re/Windows/)
|
- **Windows (64-bit only):** [http://kcc.iosphe.re/Windows/](http://kcc.iosphe.re/Windows/)
|
||||||
- **Linux (Glibc 2.19+):** [http://kcc.iosphe.re/Linux/](http://kcc.iosphe.re/Linux/)
|
- **Linux (Glibc 2.19+):** [http://kcc.iosphe.re/Linux/](http://kcc.iosphe.re/Linux/)
|
||||||
- **OS X (10.9+):** [http://kcc.iosphe.re/OSX/](http://kcc.iosphe.re/OSX/)
|
- **OS X (10.10+):** [http://kcc.iosphe.re/OSX/](http://kcc.iosphe.re/OSX/)
|
||||||
|
|
||||||
|
## PYPI
|
||||||
|
**KCC** is also available on PyPI.
|
||||||
|
```
|
||||||
|
pip install KindleComicConverter
|
||||||
|
```
|
||||||
|
|
||||||
## DEPENDENCIES
|
## DEPENDENCIES
|
||||||
Following software is required to run Linux version of **KCC** and/or bare sources:
|
Following software is required to run Linux version of **KCC** and/or bare sources:
|
||||||
- Python 3.3+
|
- Python 3.3+
|
||||||
- [PyQt](http://www.riverbankcomputing.co.uk/software/pyqt/download5) 5.2.1+ _(5.5+ is recommended)_
|
- [PyQt5](https://pypi.python.org/pypi/PyQt5) 5.6.0+
|
||||||
- [Pillow](http://pypi.python.org/pypi/Pillow/) 3.0.0+
|
- [Pillow](https://pypi.python.org/pypi/Pillow/) 4.0.0+
|
||||||
- [psutil](https://pypi.python.org/pypi/psutil) 3.2.1+
|
- [psutil](https://pypi.python.org/pypi/psutil) 5.0.0+
|
||||||
- [python-slugify](http://pypi.python.org/pypi/python-slugify) 1.1.4+
|
- [python-slugify](https://pypi.python.org/pypi/python-slugify) 1.2.1+
|
||||||
- [scandir](https://pypi.python.org/pypi/scandir) 1.1.0+ _(needed only when using Python 3.3 or 3.4)_
|
- [raven](https://pypi.python.org/pypi/raven) 6.0.0+
|
||||||
|
|
||||||
On Debian based distributions these two commands should install all needed dependencies:
|
On Debian based distributions these two commands should install all needed dependencies:
|
||||||
```
|
```
|
||||||
sudo apt-get install python3 python3-dev python3-pip python3-pyqt5 libpng-dev libjpeg-dev p7zip-full unrar
|
sudo apt-get install python3 python3-dev python3-pip libpng-dev libjpeg-dev p7zip-full unrar
|
||||||
sudo pip3 install --upgrade pillow python-slugify psutil scandir
|
sudo pip3 install --upgrade pillow python-slugify psutil pyqt5 raven
|
||||||
```
|
```
|
||||||
|
|
||||||
### Optional dependencies
|
### Optional dependencies
|
||||||
@@ -59,12 +67,12 @@ sudo pip3 install --upgrade pillow python-slugify psutil scandir
|
|||||||
|
|
||||||
## USAGE
|
## USAGE
|
||||||
|
|
||||||
Should be pretty self-explanatory. All options have detailed informations in tooltips.
|
Should be pretty self-explanatory. All options have detailed information in tooltips.
|
||||||
After completed conversion you should find ready file alongside the original input file (same directory).
|
After completed conversion, you should find ready file alongside the original input file (same directory).
|
||||||
|
|
||||||
Please check [our wiki](https://github.com/ciromattia/kcc/wiki/) for more details.
|
Please check [our wiki](https://github.com/ciromattia/kcc/wiki/) for more details.
|
||||||
|
|
||||||
CLI version of **KCC** is intended for power users. It is not idiot-proof like GUI :-)
|
CLI version of **KCC** is intended for power users. It allows using options that might not be compatible and decrease the quality of output.
|
||||||
|
|
||||||
### Standalone `kcc-c2e.py` usage:
|
### Standalone `kcc-c2e.py` usage:
|
||||||
|
|
||||||
@@ -74,9 +82,12 @@ Usage: kcc-c2e [options] comic_file|comic_folder
|
|||||||
Options:
|
Options:
|
||||||
MAIN:
|
MAIN:
|
||||||
-p PROFILE, --profile=PROFILE
|
-p PROFILE, --profile=PROFILE
|
||||||
Device profile (Available options: K1, K2, K345, KDX,
|
Device profile (Available options: K1, K2, K34, K578,
|
||||||
KPW, KV, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O) [Default=KV]
|
KDX, KPW, KV, KoMT, KoG, KoGHD, KoA, KoAHD, KoAH2O,
|
||||||
|
KoAO) [Default=KV]
|
||||||
-m, --manga-style Manga style (right-to-left reading and splitting)
|
-m, --manga-style Manga style (right-to-left reading and splitting)
|
||||||
|
-q, --hq Try to increase the quality of magnification
|
||||||
|
-2, --two-panel Display two not four panels in Panel View mode
|
||||||
-w, --webtoon Webtoon processing mode
|
-w, --webtoon Webtoon processing mode
|
||||||
|
|
||||||
OUTPUT SETTINGS:
|
OUTPUT SETTINGS:
|
||||||
@@ -85,23 +96,31 @@ Options:
|
|||||||
-t TITLE, --title=TITLE
|
-t TITLE, --title=TITLE
|
||||||
Comic title [Default=filename or directory name]
|
Comic title [Default=filename or directory name]
|
||||||
-f FORMAT, --format=FORMAT
|
-f FORMAT, --format=FORMAT
|
||||||
Output format (Available options: Auto, MOBI, EPUB, CBZ)
|
Output format (Available options: Auto, MOBI, EPUB,
|
||||||
[Default=Auto]
|
CBZ) [Default=Auto]
|
||||||
-b, --batchsplit Split output into multiple files
|
-b BATCHSPLIT, --batchsplit=BATCHSPLIT
|
||||||
|
Split output into multiple files. 0: Don't split 1:
|
||||||
|
Automatic mode 2: Consider every subdirectory as
|
||||||
|
separate volume [Default=0]
|
||||||
|
|
||||||
PROCESSING:
|
PROCESSING:
|
||||||
-u, --upscale Resize images smaller than device's resolution
|
-u, --upscale Resize images smaller than device's resolution
|
||||||
-s, --stretch Stretch images to device's resolution
|
-s, --stretch Stretch images to device's resolution
|
||||||
-r SPLITTER, --splitter=SPLITTER
|
-r SPLITTER, --splitter=SPLITTER
|
||||||
Double page parsing mode. 0: Split 1: Rotate 2: Both [Default=0]
|
Double page parsing mode. 0: Split 1: Rotate 2: Both
|
||||||
|
[Default=0]
|
||||||
-g GAMMA, --gamma=GAMMA
|
-g GAMMA, --gamma=GAMMA
|
||||||
Apply gamma correction to linearize the image [Default=Auto]
|
Apply gamma correction to linearize the image
|
||||||
--hq Enable high quality Panel View
|
[Default=Auto]
|
||||||
|
-c CROPPING, --cropping=CROPPING
|
||||||
|
Set cropping mode. 0: Disabled 1: Margins 2: Margins +
|
||||||
|
page numbers [Default=2]
|
||||||
|
--cp=CROPPINGP, --croppingpower=CROPPINGP
|
||||||
|
Set cropping power [Default=1.0]
|
||||||
--blackborders Disable autodetection and force black borders
|
--blackborders Disable autodetection and force black borders
|
||||||
--whiteborders Disable autodetection and force white borders
|
--whiteborders Disable autodetection and force white borders
|
||||||
--forcecolor Don't convert images to grayscale
|
--forcecolor Don't convert images to grayscale
|
||||||
--forcepng Create PNG files instead JPEG
|
--forcepng Create PNG files instead JPEG
|
||||||
--nocutpagenumbers Don't try to cut page numbers from images
|
|
||||||
|
|
||||||
CUSTOM PROFILE:
|
CUSTOM PROFILE:
|
||||||
--customwidth=CUSTOMWIDTH
|
--customwidth=CUSTOMWIDTH
|
||||||
@@ -126,7 +145,7 @@ Options:
|
|||||||
-m, --merge Combine every directory into a single image before splitting
|
-m, --merge Combine every directory into a single image before splitting
|
||||||
|
|
||||||
OTHER:
|
OTHER:
|
||||||
-d, --debug Create debug file for every splitted image
|
-d, --debug Create debug file for every split image
|
||||||
-h, --help Show this help message and exit
|
-h, --help Show this help message and exit
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -143,310 +162,13 @@ The app relies and includes the following scripts:
|
|||||||
- 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.
|
- 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
|
## SAMPLE FILES CREATED BY KCC
|
||||||
* [Kindle Paperwhite 3 / Voyage](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi)
|
* [Kindle Paperwhite 3 / Voyage / Oasis](http://kcc.iosphe.re/Samples/Ubunchu!-KV.mobi)
|
||||||
* [Kindle Paperwhite 1 / 2](http://kcc.iosphe.re/Samples/Ubunchu!-KPW.mobi)
|
* [Kindle Paperwhite 1 / 2](http://kcc.iosphe.re/Samples/Ubunchu!-KPW.mobi)
|
||||||
* [Kindle](http://kcc.iosphe.re/Samples/Ubunchu!-K345.mobi)
|
* [Kindle](http://kcc.iosphe.re/Samples/Ubunchu!-K45.mobi)
|
||||||
* [Kindle DX/DXG](http://kcc.iosphe.re/Samples/Ubunchu!-KDX.cbz)
|
|
||||||
* [Kobo Mini/Touch](http://kcc.iosphe.re/Samples/Ubunchu-KoMT.kepub.epub)
|
|
||||||
* [Kobo Glo](http://kcc.iosphe.re/Samples/Ubunchu-KoG.kepub.epub)
|
|
||||||
* [Kobo Glo HD](http://kcc.iosphe.re/Samples/Ubunchu-KoGHD.kepub.epub)
|
|
||||||
* [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu-KoA.kepub.epub)
|
* [Kobo Aura](http://kcc.iosphe.re/Samples/Ubunchu-KoA.kepub.epub)
|
||||||
* [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu-KoAHD.kepub.epub)
|
* [Kobo Aura HD](http://kcc.iosphe.re/Samples/Ubunchu-KoAHD.kepub.epub)
|
||||||
* [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu-KoAH2O.kepub.epub)
|
* [Kobo Aura H2O](http://kcc.iosphe.re/Samples/Ubunchu-KoAH2O.kepub.epub)
|
||||||
|
* [Kobo Aura ONE](http://kcc.iosphe.re/Samples/Ubunchu-KoAO.kepub.epub)
|
||||||
## CHANGELOG
|
|
||||||
####5.0.1:
|
|
||||||
* Fixed Panel View placement issues
|
|
||||||
* Decreased application startup time
|
|
||||||
* Fixed multiple smaller issues
|
|
||||||
|
|
||||||
####5.0:
|
|
||||||
* Major overhaul of internal mechanisms and GUI
|
|
||||||
* Added cover upload feature
|
|
||||||
* Tweaked Webtoon parsing mode
|
|
||||||
* Fixed multiple smaller issues
|
|
||||||
* Migrated build enviroment to PyInstaller
|
|
||||||
|
|
||||||
####4.6.5:
|
|
||||||
* Fixed multiple Windows and OS X issues
|
|
||||||
* Allowed Linux release to use older PyQT5 version
|
|
||||||
|
|
||||||
####4.6.4:
|
|
||||||
* Fixed multiple Windows specific problems
|
|
||||||
* Improved error handling
|
|
||||||
* Improved color detection algorithm
|
|
||||||
* New, slimmer OS X release
|
|
||||||
|
|
||||||
####4.6.3:
|
|
||||||
* Implemented remote bug reporting
|
|
||||||
* Minor bug fixes and GUI tweaks
|
|
||||||
|
|
||||||
####4.6.2:
|
|
||||||
* Fixed critical MOBI header bug
|
|
||||||
* Fixed metadata encoding error
|
|
||||||
|
|
||||||
####4.6.1:
|
|
||||||
* Fixed KEPUB TOC generator
|
|
||||||
* Added warning about too small input files
|
|
||||||
* ComicRack Summary metadata field is now parsed
|
|
||||||
* Small tweaks of KEPUB output
|
|
||||||
|
|
||||||
####4.6:
|
|
||||||
* KEPUB is now default output for all Kobo profiles
|
|
||||||
* EPUB output now produce fully valid EPUB 3.0.1
|
|
||||||
* Added profile for Kindle Paperwhite 3
|
|
||||||
* Dropped official support of all Kindle Fire models and Kindle for Android
|
|
||||||
* Other minor tweaks
|
|
||||||
|
|
||||||
####4.5.1:
|
|
||||||
* Added Kobo Glo HD profile
|
|
||||||
* Fixed RAR/CBR parsing anomalies
|
|
||||||
* Minor bug fixes and tweaks
|
|
||||||
|
|
||||||
####4.5:
|
|
||||||
* Added simple ComicRack metadata editor
|
|
||||||
* Re-enabled Manga Cover Database support
|
|
||||||
* ComicRack bookmarks are now parsed
|
|
||||||
* Fixed glitches in Kindle Voyage profile
|
|
||||||
* Fixed problems with directory locks on Windows
|
|
||||||
* Fixed sorting anomalies
|
|
||||||
* Improved conversion speed
|
|
||||||
|
|
||||||
####4.4.1:
|
|
||||||
* Fixed problems with OSX GUI
|
|
||||||
* Added one missing DLL to Windows installer
|
|
||||||
|
|
||||||
####4.4:
|
|
||||||
* Improved speed and quality of conversion
|
|
||||||
* Added RAR5 support
|
|
||||||
* Dropped BMP and TIFF support
|
|
||||||
* Fixed some WebToon mode bugs
|
|
||||||
* Fixed CBR parsing on OSX
|
|
||||||
|
|
||||||
####4.3.1:
|
|
||||||
* Fixed Kindle Voyage profile
|
|
||||||
* Fixed some bugs in OS X release
|
|
||||||
* CLI version now support multiple input files at once
|
|
||||||
* Disabled MCB support
|
|
||||||
* Other minor tweaks
|
|
||||||
|
|
||||||
####4.3:
|
|
||||||
* Added profiles for Kindle Voyage and Kobo Aura H2O
|
|
||||||
* Added missing features to CLI version
|
|
||||||
* Other minor bug fixes
|
|
||||||
|
|
||||||
####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
|
|
||||||
|
|
||||||
####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.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.0.2:
|
|
||||||
* Fixed some Windows and OSX specific bugs
|
|
||||||
* Fixed problem with marigns when using HQ mode
|
|
||||||
|
|
||||||
####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:
|
|
||||||
* 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
|
|
||||||
|
|
||||||
####3.7.2:
|
|
||||||
* Fixed problems with HQ mode
|
|
||||||
|
|
||||||
####3.7.1:
|
|
||||||
* Hotfixed Kobo profiles
|
|
||||||
|
|
||||||
####3.7:
|
|
||||||
* Added profiles for KOBO devices
|
|
||||||
* Improved Panel View support
|
|
||||||
* Improved WebToon splitter
|
|
||||||
* Improved margin color autodetection
|
|
||||||
* Tweaked EPUB output
|
|
||||||
* Fixed stretching option
|
|
||||||
* GUI tweaks and minor bugfixes
|
|
||||||
|
|
||||||
####3.6.2:
|
|
||||||
* Fixed previous PNG output fix
|
|
||||||
* Fixed Panel View anomalies
|
|
||||||
|
|
||||||
####3.6.1:
|
|
||||||
* Fixed PNG output
|
|
||||||
|
|
||||||
####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.5:
|
|
||||||
* Added simple content server - Converted files can be now delivered wireless
|
|
||||||
* Added proper Windows installer
|
|
||||||
* Improved multiprocessing speed
|
|
||||||
* GUI tweaks and minor bug fixes
|
|
||||||
|
|
||||||
####3.4:
|
|
||||||
* Improved PNG output
|
|
||||||
* Increased quality of upscaling
|
|
||||||
* Added support of file association - KCC can now open CBZ, CBR, CB7, ZIP, RAR, 7Z and PDF files directly
|
|
||||||
* Paths that contain UTF-8 characters are now supported
|
|
||||||
* Migrated to new version of Pillow library
|
|
||||||
* Merged DX and DXG profiles
|
|
||||||
* Many other minor bug fixes and GUI tweaks
|
|
||||||
|
|
||||||
####3.3:
|
|
||||||
* Margins are now automatically omitted in Panel View mode
|
|
||||||
* Margin color fill is now autodetected
|
|
||||||
* Created MOBI files are not longer marked as _Personal_ on newer Kindle models
|
|
||||||
* Layout of panels in Panel View mode is now automatically adjusted to content
|
|
||||||
* Fixed Kindle 2/DX/DXG profiles - no more blank pages
|
|
||||||
* All Kindle Fire profiles now support hiqh quality Panel View
|
|
||||||
* Added support of 7z/CB7 files
|
|
||||||
* Added Kindle Fire HDX profile
|
|
||||||
* Support for Virtual Panel View was removed
|
|
||||||
* Profiles for Kindle Keyboard, Touch and Non-Touch are now merged
|
|
||||||
* Windows release is now bundled with UnRAR and 7za
|
|
||||||
* Small GUI tweaks
|
|
||||||
|
|
||||||
####3.2:
|
|
||||||
* Too big EPUB files are now splitted before conversion to MOBI
|
|
||||||
* Added experimental parser of manga webtoons
|
|
||||||
* Improved error handling
|
|
||||||
|
|
||||||
####3.2.1:
|
|
||||||
* Hotfixed crash occurring on OS with Russian locale
|
|
||||||
|
|
||||||
####3.1:
|
|
||||||
* Added profile: Kindle for Android
|
|
||||||
* Add file/directory dialogs now support multiselect
|
|
||||||
* Many small fixes and tweaks
|
|
||||||
|
|
||||||
####3.0:
|
|
||||||
* New QT GUI
|
|
||||||
* Merge with AWKCC
|
|
||||||
* Added ultra quality mode
|
|
||||||
* Added support for custom width/height
|
|
||||||
* Added option to disable color conversion
|
|
||||||
|
|
||||||
####2.10:
|
|
||||||
* Multiprocessing support
|
|
||||||
* Kindle Fire support (color EPUB/MOBI)
|
|
||||||
* Panel View support for horizontal content
|
|
||||||
* Fixed panel order for horizontal pages when --rotate is enabled
|
|
||||||
* Disabled cropping and page number cutting for blank pages
|
|
||||||
* Fixed some slugify issues with specific file naming conventions (#50, #51)
|
|
||||||
|
|
||||||
####2.9
|
|
||||||
* Added support for generating a plain CBZ (skipping all the EPUB/MOBI generation) (#45)
|
|
||||||
* Prevent output file overwriting the source one: if a duplicate name is detected, append _kcc to the name
|
|
||||||
* Rarfile library updated to 2.6
|
|
||||||
* Added GIF, TIFF and BMP to supported formats (#42)
|
|
||||||
* Filenames slugifications (#28, #31, #9, #8)
|
|
||||||
|
|
||||||
####2.8
|
|
||||||
* Updated rarfile library
|
|
||||||
* Panel View support + HQ support (#36) - new option: --nopanelviewhq
|
|
||||||
* Split profiles for K4NT and K4T
|
|
||||||
* Rewrite of Landscape Mode support (huge readability improvement for KPW)
|
|
||||||
* Upscale use now BILINEAR method
|
|
||||||
* Added generic CSS file
|
|
||||||
* Optimized archive extraction for zip/rar files (#40)
|
|
||||||
|
|
||||||
####2.7
|
|
||||||
* Lots of GUI improvements (#27, #13)
|
|
||||||
* Added gamma support within --gamma option (defaults to profile-specified gamma) (#26, #27)
|
|
||||||
* Added --nodithering option to prevent dithering optimizations (#27)
|
|
||||||
* EPUB margins support (#30)
|
|
||||||
* Fixed no file added if file has no spaces on Windows (#25)
|
|
||||||
* Gracefully exit if unrar missing (#15)
|
|
||||||
* Do not call kindlegen if source EPUB is bigger than 320MB (#17)
|
|
||||||
* Get filetype from magic number (#14)
|
|
||||||
* PDF conversion works again
|
|
||||||
|
|
||||||
####2.6
|
|
||||||
* Added --rotate option to rotate landscape images instead of splitting them (#16, #24)
|
|
||||||
* Added --output option to customize EPUB output dir/file (#22)
|
|
||||||
* Add rendition:layout and rendition:orientation EPUB meta tags (supported by new kindlegen 2.8)
|
|
||||||
* Fixed natural sorting for files (#18)
|
|
||||||
|
|
||||||
####2.5
|
|
||||||
* Added --black-borders option to set added borders black when page's ratio is not the device's one (#11).
|
|
||||||
* Fixes EPUB containing zipped itself (#10)
|
|
||||||
|
|
||||||
####2.4
|
|
||||||
* Use temporary directory as workdir (fixes converting from external volumes and zipfiles renaming)
|
|
||||||
* Fixed "add folders" from GUI.
|
|
||||||
|
|
||||||
####2.3
|
|
||||||
* Fixed win32 EPUB generation, folder handling, filenames with spaces and subfolders
|
|
||||||
|
|
||||||
####2.2:
|
|
||||||
* Added (valid!) EPUB 2.0 output
|
|
||||||
* Rename .zip files to .cbz to avoid overwriting
|
|
||||||
|
|
||||||
####2.1
|
|
||||||
* Added basic error reporting
|
|
||||||
|
|
||||||
####2.0
|
|
||||||
* GUI! AppleScript is gone and Tk is used to provide cross-platform GUI support.
|
|
||||||
|
|
||||||
####1.5
|
|
||||||
* Added subfolder support for multiple chapters.
|
|
||||||
|
|
||||||
####1.4.1
|
|
||||||
* Fixed a serious bug on resizing when img ratio was bigger than device one
|
|
||||||
|
|
||||||
####1.4
|
|
||||||
* Added some options for controlling image optimization
|
|
||||||
* Further optimization (ImageOps, page numbering cut, autocontrast)
|
|
||||||
|
|
||||||
####1.3
|
|
||||||
* Fixed an issue in OPF generation for device resolution
|
|
||||||
* Reworked options system (call with -h option to get the inline help)
|
|
||||||
|
|
||||||
####1.2
|
|
||||||
* Comic optimizations! Split pages not target-oriented (landscape with portrait target or portrait with landscape target), add palette and other image optimizations from Mangle. WARNING: PIL is required for all image mangling!
|
|
||||||
|
|
||||||
####1.1.1
|
|
||||||
* Added support for CBZ/CBR files in Kindle Comic Converter
|
|
||||||
|
|
||||||
####1.1
|
|
||||||
* Added support for CBZ/CBR files in comic2ebook.py
|
|
||||||
|
|
||||||
####1.0
|
|
||||||
* Initial version
|
|
||||||
|
|
||||||
## PRIVACY
|
## PRIVACY
|
||||||
**KCC** is initiating internet connections in three cases:
|
**KCC** is initiating internet connections in three cases:
|
||||||
@@ -454,11 +176,9 @@ The app relies and includes the following scripts:
|
|||||||
* When MCD metadata are used - Cover download
|
* When MCD metadata are used - Cover download
|
||||||
* When error occurs - Automatic reporting
|
* When error occurs - Automatic reporting
|
||||||
|
|
||||||
Error report include **KCC** version, OS version and content of error message.
|
|
||||||
|
|
||||||
## KNOWN ISSUES
|
## KNOWN ISSUES
|
||||||
Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).
|
Please check [wiki page](https://github.com/ciromattia/kcc/wiki/Known-issues).
|
||||||
|
|
||||||
## COPYRIGHT
|
## COPYRIGHT
|
||||||
Copyright (c) 2012-2015 Ciro Mattia Gonano and Paweł Jastrzębski.
|
Copyright (c) 2012-2017 Ciro Mattia Gonano and Paweł Jastrzębski.
|
||||||
**KCC** is released under ISC LICENSE; see LICENSE.txt for further details.
|
**KCC** is released under ISC LICENSE; see LICENSE.txt for further details.
|
||||||
|
|||||||
27
appveyor.yml
Normal file
27
appveyor.yml
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
environment:
|
||||||
|
PYTHON: "C:\\Python36-x64"
|
||||||
|
|
||||||
|
install:
|
||||||
|
- set PATH="%PYTHON%\\Scripts";"C:\\Program Files (x86)\\Inno Setup 5";%PATH%
|
||||||
|
- "%PYTHON%\\python.exe -m pip install --upgrade pip setuptools wheel"
|
||||||
|
- "%PYTHON%\\python.exe -m pip install -r requirements.txt"
|
||||||
|
- "%PYTHON%\\python.exe -m pip install certifi https://github.com/pyinstaller/pyinstaller/archive/develop.zip"
|
||||||
|
- nuget install secure-file -ExcludeVersion
|
||||||
|
- nuget install verpatch -ExcludeVersion
|
||||||
|
- secure-file\tools\secure-file -decrypt other\windows\Cert.pfx.enc -secret %ENCRYPTION%
|
||||||
|
- secure-file\tools\secure-file -decrypt other\windows\sentry.py.enc -out kindlecomicconverter\sentry.py -secret %ENCRYPTION%
|
||||||
|
|
||||||
|
build_script:
|
||||||
|
- "%PYTHON%\\python.exe setup.py build_binary"
|
||||||
|
|
||||||
|
after_build:
|
||||||
|
- ps: Get-ChildItem .\dist\KindleComicConverter_win_* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
provider: S3
|
||||||
|
access_key_id:
|
||||||
|
secure: pWfyU8wtAHt354mBILwM41TemOjb+My9n3CRMnrpLzI=
|
||||||
|
secret_access_key:
|
||||||
|
secure: G0Xpxe355LMqV3s8v+TsdJYdmhFoKKA+mxK37Tlu8yNwKXKJgcnY7pcFKSdX5xS5
|
||||||
|
bucket: kcc-deploy
|
||||||
|
region: eu-central-1
|
||||||
676
gui/KCC-Linux.ui
676
gui/KCC-Linux.ui
@@ -1,676 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>KCC</class>
|
|
||||||
<widget class="QMainWindow" name="KCC">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>420</width>
|
|
||||||
<height>390</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>420</width>
|
|
||||||
<height>390</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>420</width>
|
|
||||||
<height>390</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>9</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Kindle Comic Converter</string>
|
|
||||||
</property>
|
|
||||||
<property name="windowIcon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="locale">
|
|
||||||
<locale language="C" country="AnyCountry"/>
|
|
||||||
</property>
|
|
||||||
<widget class="QWidget" name="Form">
|
|
||||||
<widget class="QComboBox" name="DeviceBox">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>200</y>
|
|
||||||
<width>141</width>
|
|
||||||
<height>31</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>8</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Target device.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QComboBox" name="FormatBox">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>260</x>
|
|
||||||
<y>200</y>
|
|
||||||
<width>151</width>
|
|
||||||
<height>31</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>8</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Output format.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="ConvertButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>160</x>
|
|
||||||
<y>200</y>
|
|
||||||
<width>91</width>
|
|
||||||
<height>32</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>9</pointsize>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<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>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Convert</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="DirectoryButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>160</y>
|
|
||||||
<width>141</width>
|
|
||||||
<height>32</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>8</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<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>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/folder_new.png</normaloff>:/Other/icons/folder_new.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="FileButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>260</x>
|
|
||||||
<y>160</y>
|
|
||||||
<width>151</width>
|
|
||||||
<height>32</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>8</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<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>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/document_new.png</normaloff>:/Other/icons/document_new.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="ClearButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>160</x>
|
|
||||||
<y>160</y>
|
|
||||||
<width>91</width>
|
|
||||||
<height>32</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>8</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Clear list</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QFrame" name="Options">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>237</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>70</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>9</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0">
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="horizontalSpacing">
|
|
||||||
<number>25</number>
|
|
||||||
</property>
|
|
||||||
<property name="verticalSpacing">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QCheckBox" name="MangaBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Manga mode</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QCheckBox" name="RotateBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Spread splitter</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="2">
|
|
||||||
<widget class="QCheckBox" name="QualityBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>HQ zoom</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="2">
|
|
||||||
<widget class="QCheckBox" name="GammaBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Disable automatic gamma correction.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Custom gamma</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="1">
|
|
||||||
<widget class="QCheckBox" name="NoDitheringBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>PNG output</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="2">
|
|
||||||
<widget class="QCheckBox" name="ColorBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Disable conversion to grayscale.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Color mode</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QCheckBox" name="UpscaleBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Stretch/Upscale</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QCheckBox" name="WebtoonBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Enable special parsing mode for Korean Webtoons.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Webtoon mode</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QCheckBox" name="BorderBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>W/B margins</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QListWidget" name="JobList">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>50</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>101</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">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}</string>
|
|
||||||
</property>
|
|
||||||
<property name="showDropIndicator" stdset="0">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="selectionMode">
|
|
||||||
<enum>QAbstractItemView::NoSelection</enum>
|
|
||||||
</property>
|
|
||||||
<property name="iconSize">
|
|
||||||
<size>
|
|
||||||
<width>18</width>
|
|
||||||
<height>18</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QFrame" name="OptionsGamma">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>305</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>35</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>9</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>15</number>
|
|
||||||
</property>
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="GammaLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Gamma: Auto</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QSlider" name="GammaSlider">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::ClickFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>500</number>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QProgressBar" name="ProgressBar">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>31</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>10</pointsize>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="value">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignJustify|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
<property name="format">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QFrame" name="OptionsCustom">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>336</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>25</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>9</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>10</number>
|
|
||||||
</property>
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="wLabel">
|
|
||||||
<property name="toolTip">
|
|
||||||
<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>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="customWidth">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::ClickFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="acceptDrops">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="inputMask">
|
|
||||||
<string>0000</string>
|
|
||||||
</property>
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="hLabel">
|
|
||||||
<property name="toolTip">
|
|
||||||
<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>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="customHeight">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::ClickFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="acceptDrops">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="inputMask">
|
|
||||||
<string>0000</string>
|
|
||||||
</property>
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="EditorButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>200</width>
|
|
||||||
<height>32</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>9</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Editor</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/editor.png</normaloff>:/Other/icons/editor.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="WikiButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>211</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>200</width>
|
|
||||||
<height>32</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>9</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Wiki</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/wiki.png</normaloff>:/Other/icons/wiki.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<zorder>DeviceBox</zorder>
|
|
||||||
<zorder>FormatBox</zorder>
|
|
||||||
<zorder>ConvertButton</zorder>
|
|
||||||
<zorder>DirectoryButton</zorder>
|
|
||||||
<zorder>FileButton</zorder>
|
|
||||||
<zorder>ClearButton</zorder>
|
|
||||||
<zorder>Options</zorder>
|
|
||||||
<zorder>JobList</zorder>
|
|
||||||
<zorder>OptionsGamma</zorder>
|
|
||||||
<zorder>OptionsCustom</zorder>
|
|
||||||
<zorder>EditorButton</zorder>
|
|
||||||
<zorder>WikiButton</zorder>
|
|
||||||
<zorder>ProgressBar</zorder>
|
|
||||||
</widget>
|
|
||||||
<widget class="QStatusBar" name="statusBar">
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>8</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="sizeGripEnabled">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<action name="ActionBasic">
|
|
||||||
<property name="checkable">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Basic</string>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font/>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
<action name="ActionAdvanced">
|
|
||||||
<property name="checkable">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Advanced</string>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
</widget>
|
|
||||||
<tabstops>
|
|
||||||
<tabstop>DirectoryButton</tabstop>
|
|
||||||
<tabstop>FileButton</tabstop>
|
|
||||||
<tabstop>ConvertButton</tabstop>
|
|
||||||
<tabstop>ClearButton</tabstop>
|
|
||||||
</tabstops>
|
|
||||||
<resources>
|
|
||||||
<include location="KCC.qrc"/>
|
|
||||||
</resources>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
689
gui/KCC-OSX.ui
689
gui/KCC-OSX.ui
@@ -1,689 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>KCC</class>
|
|
||||||
<widget class="QMainWindow" name="KCC">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>420</width>
|
|
||||||
<height>390</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>420</width>
|
|
||||||
<height>390</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>420</width>
|
|
||||||
<height>390</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Kindle Comic Converter</string>
|
|
||||||
</property>
|
|
||||||
<property name="windowIcon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="locale">
|
|
||||||
<locale language="C" country="AnyCountry"/>
|
|
||||||
</property>
|
|
||||||
<widget class="QWidget" name="Form">
|
|
||||||
<widget class="QComboBox" name="DeviceBox">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>8</x>
|
|
||||||
<y>204</y>
|
|
||||||
<width>151</width>
|
|
||||||
<height>26</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Target device.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QComboBox" name="FormatBox">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>264</x>
|
|
||||||
<y>204</y>
|
|
||||||
<width>150</width>
|
|
||||||
<height>26</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Output format.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="ConvertButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>159</x>
|
|
||||||
<y>200</y>
|
|
||||||
<width>104</width>
|
|
||||||
<height>41</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<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>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Convert</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="DirectoryButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>4</x>
|
|
||||||
<y>160</y>
|
|
||||||
<width>158</width>
|
|
||||||
<height>41</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<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>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/folder_new.png</normaloff>:/Other/icons/folder_new.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="FileButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>260</x>
|
|
||||||
<y>160</y>
|
|
||||||
<width>157</width>
|
|
||||||
<height>41</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<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>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/document_new.png</normaloff>:/Other/icons/document_new.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="ClearButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>159</x>
|
|
||||||
<y>160</y>
|
|
||||||
<width>104</width>
|
|
||||||
<height>41</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Clear list</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QFrame" name="Options">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>237</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>70</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,0">
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="horizontalSpacing">
|
|
||||||
<number>31</number>
|
|
||||||
</property>
|
|
||||||
<property name="verticalSpacing">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QCheckBox" name="MangaBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Enable right-to-left reading.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Manga mode</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QCheckBox" name="RotateBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Spread splitter</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="2">
|
|
||||||
<widget class="QCheckBox" name="QualityBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>HQ zoom</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="2">
|
|
||||||
<widget class="QCheckBox" name="GammaBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Disable automatic gamma correction.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Custom gamma</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="1">
|
|
||||||
<widget class="QCheckBox" name="NoDitheringBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>PNG output</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="2">
|
|
||||||
<widget class="QCheckBox" name="ColorBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Disable conversion to grayscale.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Color mode</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QCheckBox" name="UpscaleBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Stretch/Upscale</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QCheckBox" name="WebtoonBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Enable special parsing mode for Korean Webtoons.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Webtoon mode</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QCheckBox" name="BorderBox">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><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></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>W/B margins</string>
|
|
||||||
</property>
|
|
||||||
<property name="tristate">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QListWidget" name="JobList">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>50</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>101</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">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}</string>
|
|
||||||
</property>
|
|
||||||
<property name="showDropIndicator" stdset="0">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="selectionMode">
|
|
||||||
<enum>QAbstractItemView::NoSelection</enum>
|
|
||||||
</property>
|
|
||||||
<property name="iconSize">
|
|
||||||
<size>
|
|
||||||
<width>15</width>
|
|
||||||
<height>15</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="verticalScrollMode">
|
|
||||||
<enum>QAbstractItemView::ScrollPerPixel</enum>
|
|
||||||
</property>
|
|
||||||
<property name="horizontalScrollMode">
|
|
||||||
<enum>QAbstractItemView::ScrollPerPixel</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QFrame" name="OptionsGamma">
|
|
||||||
<property name="enabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>305</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>35</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>15</number>
|
|
||||||
</property>
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="GammaLabel">
|
|
||||||
<property name="text">
|
|
||||||
<string>Gamma: Auto</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QSlider" name="GammaSlider">
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::ClickFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="maximum">
|
|
||||||
<number>500</number>
|
|
||||||
</property>
|
|
||||||
<property name="singleStep">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Horizontal</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QProgressBar" name="ProgressBar">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>31</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="value">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="alignment">
|
|
||||||
<set>Qt::AlignJustify|Qt::AlignVCenter</set>
|
|
||||||
</property>
|
|
||||||
<property name="format">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QFrame" name="OptionsCustom">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>337</y>
|
|
||||||
<width>401</width>
|
|
||||||
<height>25</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>5</number>
|
|
||||||
</property>
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="wLabel">
|
|
||||||
<property name="toolTip">
|
|
||||||
<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>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="customWidth">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::ClickFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="acceptDrops">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="inputMask">
|
|
||||||
<string>0000</string>
|
|
||||||
</property>
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="hLabel">
|
|
||||||
<property name="toolTip">
|
|
||||||
<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>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="customHeight">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::ClickFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="acceptDrops">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p style='white-space:pre'>Resolution of target device.</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="inputMask">
|
|
||||||
<string>0000</string>
|
|
||||||
</property>
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>4</number>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="EditorButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>4</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>210</width>
|
|
||||||
<height>41</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Editor</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/editor.png</normaloff>:/Other/icons/editor.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<widget class="QPushButton" name="WikiButton">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>207</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>210</width>
|
|
||||||
<height>41</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="focusPolicy">
|
|
||||||
<enum>Qt::NoFocus</enum>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Wiki</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/wiki.png</normaloff>:/Other/icons/wiki.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<zorder>DeviceBox</zorder>
|
|
||||||
<zorder>FormatBox</zorder>
|
|
||||||
<zorder>ConvertButton</zorder>
|
|
||||||
<zorder>DirectoryButton</zorder>
|
|
||||||
<zorder>FileButton</zorder>
|
|
||||||
<zorder>ClearButton</zorder>
|
|
||||||
<zorder>Options</zorder>
|
|
||||||
<zorder>JobList</zorder>
|
|
||||||
<zorder>OptionsGamma</zorder>
|
|
||||||
<zorder>OptionsCustom</zorder>
|
|
||||||
<zorder>EditorButton</zorder>
|
|
||||||
<zorder>WikiButton</zorder>
|
|
||||||
<zorder>ProgressBar</zorder>
|
|
||||||
</widget>
|
|
||||||
<widget class="QStatusBar" name="statusBar">
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="sizeGripEnabled">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
<action name="ActionBasic">
|
|
||||||
<property name="checkable">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="checked">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Basic</string>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>11</pointsize>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
<action name="ActionAdvanced">
|
|
||||||
<property name="checkable">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Advanced</string>
|
|
||||||
</property>
|
|
||||||
</action>
|
|
||||||
</widget>
|
|
||||||
<tabstops>
|
|
||||||
<tabstop>DirectoryButton</tabstop>
|
|
||||||
<tabstop>FileButton</tabstop>
|
|
||||||
<tabstop>ConvertButton</tabstop>
|
|
||||||
<tabstop>ClearButton</tabstop>
|
|
||||||
</tabstops>
|
|
||||||
<resources>
|
|
||||||
<include location="KCC.qrc"/>
|
|
||||||
</resources>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
1108
gui/KCC.ui
1108
gui/KCC.ui
File diff suppressed because it is too large
Load Diff
@@ -1,225 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>MetaEditorDialog</class>
|
|
||||||
<widget class="QDialog" name="MetaEditorDialog">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>400</width>
|
|
||||||
<height>290</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>400</width>
|
|
||||||
<height>290</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>400</width>
|
|
||||||
<height>290</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Metadata editor</string>
|
|
||||||
</property>
|
|
||||||
<property name="windowIcon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
|
|
||||||
</property>
|
|
||||||
<widget class="QWidget" name="horizontalLayoutWidget">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>250</y>
|
|
||||||
<width>381</width>
|
|
||||||
<height>31</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="StatusLabel">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>9</pointsize>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">color: rgb(255, 0, 0);</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="OKButton">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Save</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="CancelButton">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Cancel</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QFrame" name="EditorFrame">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>381</width>
|
|
||||||
<height>241</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<widget class="QWidget" name="formLayoutWidget">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>381</width>
|
|
||||||
<height>266</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<layout class="QFormLayout" name="formLayout">
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Series:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QLineEdit" name="SeriesLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="label_2">
|
|
||||||
<property name="text">
|
|
||||||
<string>Volume:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QLineEdit" name="VolumeLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QLabel" name="label_3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Number:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<widget class="QLineEdit" name="NumberLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QLabel" name="label_4">
|
|
||||||
<property name="text">
|
|
||||||
<string>Writer:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QLineEdit" name="WriterLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QLabel" name="label_5">
|
|
||||||
<property name="text">
|
|
||||||
<string>Penciller:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="1">
|
|
||||||
<widget class="QLineEdit" name="PencillerLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="0">
|
|
||||||
<widget class="QLabel" name="label_6">
|
|
||||||
<property name="text">
|
|
||||||
<string>Inker:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="1">
|
|
||||||
<widget class="QLineEdit" name="InkerLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="0">
|
|
||||||
<widget class="QLabel" name="label_7">
|
|
||||||
<property name="text">
|
|
||||||
<string>Colorist:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="1">
|
|
||||||
<widget class="QLineEdit" name="ColoristLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="0">
|
|
||||||
<widget class="QLabel" name="label_8">
|
|
||||||
<property name="text">
|
|
||||||
<string><html><head/><body><p><a href="https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support"><span style=" text-decoration: underline; color:#0000ff;">MUid:</span></a></p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="textFormat">
|
|
||||||
<enum>Qt::RichText</enum>
|
|
||||||
</property>
|
|
||||||
<property name="openExternalLinks">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="1">
|
|
||||||
<widget class="QLineEdit" name="MUidLine"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<zorder>formLayoutWidget</zorder>
|
|
||||||
<zorder>horizontalLayoutWidget</zorder>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
|
||||||
<resources>
|
|
||||||
<include location="KCC.qrc"/>
|
|
||||||
</resources>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
@@ -1,226 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<ui version="4.0">
|
|
||||||
<class>MetaEditorDialog</class>
|
|
||||||
<widget class="QDialog" name="MetaEditorDialog">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>400</width>
|
|
||||||
<height>295</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>400</width>
|
|
||||||
<height>295</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>400</width>
|
|
||||||
<height>295</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
|
||||||
<string>Metadata editor</string>
|
|
||||||
</property>
|
|
||||||
<property name="windowIcon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
|
|
||||||
</property>
|
|
||||||
<widget class="QWidget" name="horizontalLayoutWidget">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>260</y>
|
|
||||||
<width>381</width>
|
|
||||||
<height>32</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QLabel" name="StatusLabel">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<pointsize>10</pointsize>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="styleSheet">
|
|
||||||
<string notr="true">color: rgb(255, 0, 0);</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="OKButton">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Save</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="CancelButton">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="font">
|
|
||||||
<font>
|
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>Cancel</string>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset resource="KCC.qrc">
|
|
||||||
<normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QFrame" name="EditorFrame">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>10</x>
|
|
||||||
<y>10</y>
|
|
||||||
<width>381</width>
|
|
||||||
<height>251</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<widget class="QWidget" name="formLayoutWidget">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>0</x>
|
|
||||||
<y>0</y>
|
|
||||||
<width>381</width>
|
|
||||||
<height>250</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<layout class="QFormLayout" name="formLayout">
|
|
||||||
<property name="fieldGrowthPolicy">
|
|
||||||
<enum>QFormLayout::ExpandingFieldsGrow</enum>
|
|
||||||
</property>
|
|
||||||
<item row="1" column="0">
|
|
||||||
<widget class="QLabel" name="label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Series:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QLineEdit" name="SeriesLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="0">
|
|
||||||
<widget class="QLabel" name="label_2">
|
|
||||||
<property name="text">
|
|
||||||
<string>Volume:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QLineEdit" name="VolumeLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QLabel" name="label_3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Number:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<widget class="QLineEdit" name="NumberLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QLabel" name="label_4">
|
|
||||||
<property name="text">
|
|
||||||
<string>Writer:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QLineEdit" name="WriterLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QLabel" name="label_5">
|
|
||||||
<property name="text">
|
|
||||||
<string>Penciller:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="1">
|
|
||||||
<widget class="QLineEdit" name="PencillerLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="0">
|
|
||||||
<widget class="QLabel" name="label_6">
|
|
||||||
<property name="text">
|
|
||||||
<string>Inker:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="1">
|
|
||||||
<widget class="QLineEdit" name="InkerLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="0">
|
|
||||||
<widget class="QLabel" name="label_7">
|
|
||||||
<property name="text">
|
|
||||||
<string>Colorist:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="1">
|
|
||||||
<widget class="QLineEdit" name="ColoristLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="0">
|
|
||||||
<widget class="QLabel" name="label_8">
|
|
||||||
<property name="text">
|
|
||||||
<string><html><head/><body><p><a href="https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support"><span style=" text-decoration: underline; color:#0000ff;">MUid:</span></a></p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="textFormat">
|
|
||||||
<enum>Qt::RichText</enum>
|
|
||||||
</property>
|
|
||||||
<property name="openExternalLinks">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="1">
|
|
||||||
<widget class="QLineEdit" name="MUidLine"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
|
||||||
<resources>
|
|
||||||
<include location="KCC.qrc"/>
|
|
||||||
</resources>
|
|
||||||
<connections/>
|
|
||||||
</ui>
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<ui version="4.0">
|
<ui version="4.0">
|
||||||
<class>MetaEditorDialog</class>
|
<class>editorDialog</class>
|
||||||
<widget class="QDialog" name="MetaEditorDialog">
|
<widget class="QDialog" name="editorDialog">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
@@ -16,12 +16,6 @@
|
|||||||
<height>260</height>
|
<height>260</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>400</width>
|
|
||||||
<height>260</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>Metadata editor</string>
|
<string>Metadata editor</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -29,191 +23,177 @@
|
|||||||
<iconset resource="KCC.qrc">
|
<iconset resource="KCC.qrc">
|
||||||
<normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
|
<normaloff>:/Icon/icons/comic2ebook.png</normaloff>:/Icon/icons/comic2ebook.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="horizontalLayoutWidget">
|
<layout class="QVBoxLayout" name="verticalLayout">
|
||||||
<property name="geometry">
|
<property name="bottomMargin">
|
||||||
<rect>
|
<number>5</number>
|
||||||
<x>10</x>
|
|
||||||
<y>220</y>
|
|
||||||
<width>381</width>
|
|
||||||
<height>31</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
<item>
|
||||||
<item>
|
<widget class="QWidget" name="editorWidget" native="true">
|
||||||
<widget class="QLabel" name="StatusLabel">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<property name="sizePolicy">
|
<property name="leftMargin">
|
||||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
|
<number>0</number>
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="font">
|
<property name="topMargin">
|
||||||
<font>
|
<number>0</number>
|
||||||
<weight>75</weight>
|
|
||||||
<bold>true</bold>
|
|
||||||
</font>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="styleSheet">
|
<property name="rightMargin">
|
||||||
<string notr="true">color: rgb(255, 0, 0);</string>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
<property name="bottomMargin">
|
||||||
</item>
|
<number>0</number>
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="OKButton">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="font">
|
<item row="0" column="0">
|
||||||
<font>
|
<widget class="QLabel" name="label_1">
|
||||||
<weight>75</weight>
|
<property name="text">
|
||||||
<bold>true</bold>
|
<string>Series:</string>
|
||||||
</font>
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLineEdit" name="seriesLine"/>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="0">
|
||||||
|
<widget class="QLabel" name="label_2">
|
||||||
|
<property name="text">
|
||||||
|
<string>Volume:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QLineEdit" name="volumeLine"/>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="label_3">
|
||||||
|
<property name="text">
|
||||||
|
<string>Number:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QLineEdit" name="numberLine"/>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="label_4">
|
||||||
|
<property name="text">
|
||||||
|
<string>Writer:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QLineEdit" name="writerLine"/>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="0">
|
||||||
|
<widget class="QLabel" name="label_5">
|
||||||
|
<property name="text">
|
||||||
|
<string>Penciller:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QLineEdit" name="pencillerLine"/>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="0">
|
||||||
|
<widget class="QLabel" name="label_6">
|
||||||
|
<property name="text">
|
||||||
|
<string>Inker:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="1">
|
||||||
|
<widget class="QLineEdit" name="inkerLine"/>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="0">
|
||||||
|
<widget class="QLabel" name="label_7">
|
||||||
|
<property name="text">
|
||||||
|
<string>Colorist:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="6" column="1">
|
||||||
|
<widget class="QLineEdit" name="coloristLine"/>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="0">
|
||||||
|
<widget class="QLabel" name="label_8">
|
||||||
|
<property name="text">
|
||||||
|
<string><html><head/><body><p><a href="https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support"><span style=" text-decoration: underline; color:#0000ff;">MUid:</span></a></p></body></html></string>
|
||||||
|
</property>
|
||||||
|
<property name="openExternalLinks">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="7" column="1">
|
||||||
|
<widget class="QLineEdit" name="muidLine"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QWidget" name="optionWidget" native="true">
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="topMargin">
|
||||||
<string>Save</string>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="rightMargin">
|
||||||
<iconset resource="KCC.qrc">
|
<number>0</number>
|
||||||
<normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
|
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
<property name="bottomMargin">
|
||||||
</item>
|
<number>0</number>
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="CancelButton">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="font">
|
<item>
|
||||||
<font>
|
<widget class="QLabel" name="statusLabel">
|
||||||
<weight>75</weight>
|
<property name="sizePolicy">
|
||||||
<bold>true</bold>
|
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
|
||||||
</font>
|
<horstretch>0</horstretch>
|
||||||
</property>
|
<verstretch>0</verstretch>
|
||||||
<property name="text">
|
</sizepolicy>
|
||||||
<string>Cancel</string>
|
</property>
|
||||||
</property>
|
<property name="text">
|
||||||
<property name="icon">
|
<string/>
|
||||||
<iconset resource="KCC.qrc">
|
</property>
|
||||||
<normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
|
</widget>
|
||||||
</property>
|
</item>
|
||||||
</widget>
|
<item>
|
||||||
</item>
|
<widget class="QPushButton" name="okButton">
|
||||||
</layout>
|
<property name="minimumSize">
|
||||||
</widget>
|
<size>
|
||||||
<widget class="QFrame" name="EditorFrame">
|
<width>0</width>
|
||||||
<property name="geometry">
|
<height>30</height>
|
||||||
<rect>
|
</size>
|
||||||
<x>10</x>
|
</property>
|
||||||
<y>10</y>
|
<property name="text">
|
||||||
<width>381</width>
|
<string>Save</string>
|
||||||
<height>211</height>
|
</property>
|
||||||
</rect>
|
<property name="icon">
|
||||||
</property>
|
<iconset resource="KCC.qrc">
|
||||||
<widget class="QWidget" name="formLayoutWidget">
|
<normaloff>:/Other/icons/convert.png</normaloff>:/Other/icons/convert.png</iconset>
|
||||||
<property name="geometry">
|
</property>
|
||||||
<rect>
|
</widget>
|
||||||
<x>0</x>
|
</item>
|
||||||
<y>0</y>
|
<item>
|
||||||
<width>381</width>
|
<widget class="QPushButton" name="cancelButton">
|
||||||
<height>211</height>
|
<property name="minimumSize">
|
||||||
</rect>
|
<size>
|
||||||
</property>
|
<width>0</width>
|
||||||
<layout class="QFormLayout" name="formLayout">
|
<height>30</height>
|
||||||
<item row="1" column="0">
|
</size>
|
||||||
<widget class="QLabel" name="label">
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Series:</string>
|
<string>Cancel</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
<property name="icon">
|
||||||
</item>
|
<iconset resource="KCC.qrc">
|
||||||
<item row="1" column="1">
|
<normaloff>:/Other/icons/clear.png</normaloff>:/Other/icons/clear.png</iconset>
|
||||||
<widget class="QLineEdit" name="SeriesLine"/>
|
</property>
|
||||||
</item>
|
</widget>
|
||||||
<item row="2" column="0">
|
</item>
|
||||||
<widget class="QLabel" name="label_2">
|
</layout>
|
||||||
<property name="text">
|
</widget>
|
||||||
<string>Volume:</string>
|
</item>
|
||||||
</property>
|
</layout>
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="2" column="1">
|
|
||||||
<widget class="QLineEdit" name="VolumeLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QLabel" name="label_3">
|
|
||||||
<property name="text">
|
|
||||||
<string>Number:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<widget class="QLineEdit" name="NumberLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QLabel" name="label_4">
|
|
||||||
<property name="text">
|
|
||||||
<string>Writer:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QLineEdit" name="WriterLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QLabel" name="label_5">
|
|
||||||
<property name="text">
|
|
||||||
<string>Penciller:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="1">
|
|
||||||
<widget class="QLineEdit" name="PencillerLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="0">
|
|
||||||
<widget class="QLabel" name="label_6">
|
|
||||||
<property name="text">
|
|
||||||
<string>Inker:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="1">
|
|
||||||
<widget class="QLineEdit" name="InkerLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="0">
|
|
||||||
<widget class="QLabel" name="label_7">
|
|
||||||
<property name="text">
|
|
||||||
<string>Colorist:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="7" column="1">
|
|
||||||
<widget class="QLineEdit" name="ColoristLine"/>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="0">
|
|
||||||
<widget class="QLabel" name="label_8">
|
|
||||||
<property name="text">
|
|
||||||
<string><html><head/><body><p><a href="https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support"><span style=" text-decoration: underline; color:#0000ff;">MUid:</span></a></p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="textFormat">
|
|
||||||
<enum>Qt::RichText</enum>
|
|
||||||
</property>
|
|
||||||
<property name="openExternalLinks">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="8" column="1">
|
|
||||||
<widget class="QLineEdit" name="MUidLine"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
</widget>
|
||||||
<resources>
|
<resources>
|
||||||
<include location="KCC.qrc"/>
|
<include location="KCC.qrc"/>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 9.1 KiB After Width: | Height: | Size: 23 KiB |
Binary file not shown.
11
kcc-c2e.py
11
kcc-c2e.py
@@ -2,7 +2,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -23,14 +23,9 @@ if sys.version_info[0] != 3:
|
|||||||
print('ERROR: This is Python 3 script!')
|
print('ERROR: This is Python 3 script!')
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
from kcc.shared import dependencyCheck
|
|
||||||
dependencyCheck(2)
|
|
||||||
|
|
||||||
from multiprocessing import freeze_support
|
from multiprocessing import freeze_support
|
||||||
from kcc import __version__
|
from kindlecomicconverter.startup import startC2E
|
||||||
from kcc.comic2ebook import main
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
freeze_support()
|
freeze_support()
|
||||||
print('comic2ebook v' + __version__ + ' - Written by Ciro Mattia Gonano and Pawel Jastrzebski.')
|
startC2E()
|
||||||
sys.exit(main(sys.argv[1:]))
|
|
||||||
|
|||||||
11
kcc-c2p.py
11
kcc-c2p.py
@@ -2,7 +2,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -23,14 +23,9 @@ if sys.version_info[0] != 3:
|
|||||||
print('ERROR: This is Python 3 script!')
|
print('ERROR: This is Python 3 script!')
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
from kcc.shared import dependencyCheck
|
|
||||||
dependencyCheck(1)
|
|
||||||
|
|
||||||
from multiprocessing import freeze_support
|
from multiprocessing import freeze_support
|
||||||
from kcc import __version__
|
from kindlecomicconverter.startup import startC2P
|
||||||
from kcc.comic2panel import main
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
freeze_support()
|
freeze_support()
|
||||||
print('comic2panel v' + __version__ + ' - Written by Ciro Mattia Gonano and Pawel Jastrzebski.')
|
startC2P()
|
||||||
sys.exit(main(sys.argv[1:]))
|
|
||||||
|
|||||||
6
kcc.iss
6
kcc.iss
@@ -1,5 +1,5 @@
|
|||||||
#define MyAppName "Kindle Comic Converter"
|
#define MyAppName "Kindle Comic Converter"
|
||||||
#define MyAppVersion "5.0.1"
|
#define MyAppVersion "5.4.1"
|
||||||
#define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
|
#define MyAppPublisher "Ciro Mattia Gonano, Paweł Jastrzębski"
|
||||||
#define MyAppURL "http://kcc.iosphe.re/"
|
#define MyAppURL "http://kcc.iosphe.re/"
|
||||||
#define MyAppExeName "KCC.exe"
|
#define MyAppExeName "KCC.exe"
|
||||||
@@ -12,7 +12,7 @@ AppPublisher={#MyAppPublisher}
|
|||||||
AppPublisherURL={#MyAppURL}
|
AppPublisherURL={#MyAppURL}
|
||||||
AppSupportURL={#MyAppURL}
|
AppSupportURL={#MyAppURL}
|
||||||
AppUpdatesURL={#MyAppURL}
|
AppUpdatesURL={#MyAppURL}
|
||||||
AppCopyright=Copyright (C) 2012-2015 Ciro Mattia Gonano and Paweł Jastrzębski
|
AppCopyright=Copyright (C) 2012-2017 Ciro Mattia Gonano and Paweł Jastrzębski
|
||||||
ArchitecturesAllowed=x64
|
ArchitecturesAllowed=x64
|
||||||
DefaultDirName={pf}\{#MyAppName}
|
DefaultDirName={pf}\{#MyAppName}
|
||||||
DefaultGroupName={#MyAppName}
|
DefaultGroupName={#MyAppName}
|
||||||
@@ -49,6 +49,7 @@ Source: "LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion solidbreak
|
|||||||
Source: "other\windows\Additional-LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
|
Source: "other\windows\Additional-LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
Source: "other\windows\UnRAR.exe"; DestDir: "{app}"; Flags: ignoreversion
|
Source: "other\windows\UnRAR.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
Source: "other\windows\7za.exe"; DestDir: "{app}"; Flags: ignoreversion
|
Source: "other\windows\7za.exe"; DestDir: "{app}"; Flags: ignoreversion
|
||||||
|
Source: "other\windows\vc_redist.x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall
|
||||||
|
|
||||||
[Icons]
|
[Icons]
|
||||||
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
|
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
|
||||||
@@ -56,6 +57,7 @@ Name: "{group}\Readme"; Filename: "https://github.com/ciromattia/kcc#kcc"
|
|||||||
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
|
Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
|
||||||
|
|
||||||
[Run]
|
[Run]
|
||||||
|
Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/install /passive /norestart"; StatusMsg: "Installing Microsoft Visual C++ 2015 Redistributable Package..."
|
||||||
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
|
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall
|
||||||
|
|
||||||
[Messages]
|
[Messages]
|
||||||
|
|||||||
29
kcc.py
29
kcc.py
@@ -2,7 +2,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -39,7 +39,7 @@ elif sys.platform.startswith('win'):
|
|||||||
class _Popen(forking.Popen):
|
class _Popen(forking.Popen):
|
||||||
def __init__(self, *args, **kw):
|
def __init__(self, *args, **kw):
|
||||||
if hasattr(sys, 'frozen'):
|
if hasattr(sys, 'frozen'):
|
||||||
# noinspection PyProtectedMember
|
# noinspection PyUnresolvedReferences,PyProtectedMember
|
||||||
os.putenv('_MEIPASS2', sys._MEIPASS)
|
os.putenv('_MEIPASS2', sys._MEIPASS)
|
||||||
try:
|
try:
|
||||||
super(_Popen, self).__init__(*args, **kw)
|
super(_Popen, self).__init__(*args, **kw)
|
||||||
@@ -56,24 +56,17 @@ elif sys.platform.startswith('win'):
|
|||||||
else:
|
else:
|
||||||
os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/windows/;' + os.environ['PATH']
|
os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/windows/;' + os.environ['PATH']
|
||||||
os.chdir(os.path.dirname(os.path.abspath(__file__)))
|
os.chdir(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
# Load additional Sentry configuration
|
||||||
from kcc.shared import dependencyCheck
|
if getattr(sys, 'frozen', False):
|
||||||
dependencyCheck(3)
|
try:
|
||||||
|
import kindlecomicconverter.sentry
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
from multiprocessing import freeze_support
|
from multiprocessing import freeze_support
|
||||||
from kcc import KCC_gui
|
from kindlecomicconverter.startup import start
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
freeze_support()
|
freeze_support()
|
||||||
KCCAplication = KCC_gui.QApplicationMessaging(sys.argv)
|
start()
|
||||||
if KCCAplication.isRunning():
|
|
||||||
if len(sys.argv) > 1:
|
|
||||||
KCCAplication.sendMessage(sys.argv[1])
|
|
||||||
else:
|
|
||||||
KCCAplication.sendMessage('ARISE')
|
|
||||||
else:
|
|
||||||
KCCWindow = KCC_gui.QMainWindowKCC()
|
|
||||||
KCCUI = KCC_gui.KCCGUI(KCCAplication, KCCWindow)
|
|
||||||
if len(sys.argv) > 1:
|
|
||||||
KCCUI.handleMessage(sys.argv[1])
|
|
||||||
sys.exit(KCCAplication.exec_())
|
|
||||||
|
|||||||
@@ -1,147 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'MetaEditor.ui'
|
|
||||||
#
|
|
||||||
# Created: Sun Feb 8 11:52:00 2015
|
|
||||||
# by: PyQt5 UI code generator 5.4
|
|
||||||
#
|
|
||||||
# WARNING! All changes made in this file will be lost!
|
|
||||||
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
|
||||||
|
|
||||||
class Ui_MetaEditorDialog(object):
|
|
||||||
def setupUi(self, MetaEditorDialog):
|
|
||||||
MetaEditorDialog.setObjectName("MetaEditorDialog")
|
|
||||||
MetaEditorDialog.resize(400, 260)
|
|
||||||
MetaEditorDialog.setMinimumSize(QtCore.QSize(400, 260))
|
|
||||||
MetaEditorDialog.setMaximumSize(QtCore.QSize(400, 260))
|
|
||||||
icon = QtGui.QIcon()
|
|
||||||
icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
MetaEditorDialog.setWindowIcon(icon)
|
|
||||||
self.horizontalLayoutWidget = QtWidgets.QWidget(MetaEditorDialog)
|
|
||||||
self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 220, 381, 31))
|
|
||||||
self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
|
|
||||||
self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget)
|
|
||||||
self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.horizontalLayout.setObjectName("horizontalLayout")
|
|
||||||
self.StatusLabel = QtWidgets.QLabel(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.StatusLabel.sizePolicy().hasHeightForWidth())
|
|
||||||
self.StatusLabel.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.StatusLabel.setFont(font)
|
|
||||||
self.StatusLabel.setStyleSheet("color: rgb(255, 0, 0);")
|
|
||||||
self.StatusLabel.setObjectName("StatusLabel")
|
|
||||||
self.horizontalLayout.addWidget(self.StatusLabel)
|
|
||||||
self.OKButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.OKButton.sizePolicy().hasHeightForWidth())
|
|
||||||
self.OKButton.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.OKButton.setFont(font)
|
|
||||||
icon1 = QtGui.QIcon()
|
|
||||||
icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.OKButton.setIcon(icon1)
|
|
||||||
self.OKButton.setObjectName("OKButton")
|
|
||||||
self.horizontalLayout.addWidget(self.OKButton)
|
|
||||||
self.CancelButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.CancelButton.sizePolicy().hasHeightForWidth())
|
|
||||||
self.CancelButton.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.CancelButton.setFont(font)
|
|
||||||
icon2 = QtGui.QIcon()
|
|
||||||
icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.CancelButton.setIcon(icon2)
|
|
||||||
self.CancelButton.setObjectName("CancelButton")
|
|
||||||
self.horizontalLayout.addWidget(self.CancelButton)
|
|
||||||
self.EditorFrame = QtWidgets.QFrame(MetaEditorDialog)
|
|
||||||
self.EditorFrame.setGeometry(QtCore.QRect(10, 10, 381, 211))
|
|
||||||
self.EditorFrame.setObjectName("EditorFrame")
|
|
||||||
self.formLayoutWidget = QtWidgets.QWidget(self.EditorFrame)
|
|
||||||
self.formLayoutWidget.setGeometry(QtCore.QRect(0, 0, 381, 211))
|
|
||||||
self.formLayoutWidget.setObjectName("formLayoutWidget")
|
|
||||||
self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget)
|
|
||||||
self.formLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.formLayout.setObjectName("formLayout")
|
|
||||||
self.label = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label.setObjectName("label")
|
|
||||||
self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label)
|
|
||||||
self.SeriesLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.SeriesLine.setObjectName("SeriesLine")
|
|
||||||
self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.SeriesLine)
|
|
||||||
self.label_2 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_2.setObjectName("label_2")
|
|
||||||
self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2)
|
|
||||||
self.VolumeLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.VolumeLine.setObjectName("VolumeLine")
|
|
||||||
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.VolumeLine)
|
|
||||||
self.label_3 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_3.setObjectName("label_3")
|
|
||||||
self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3)
|
|
||||||
self.NumberLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.NumberLine.setObjectName("NumberLine")
|
|
||||||
self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.NumberLine)
|
|
||||||
self.label_4 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_4.setObjectName("label_4")
|
|
||||||
self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4)
|
|
||||||
self.WriterLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.WriterLine.setObjectName("WriterLine")
|
|
||||||
self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.WriterLine)
|
|
||||||
self.label_5 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_5.setObjectName("label_5")
|
|
||||||
self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5)
|
|
||||||
self.PencillerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.PencillerLine.setObjectName("PencillerLine")
|
|
||||||
self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.PencillerLine)
|
|
||||||
self.label_6 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_6.setObjectName("label_6")
|
|
||||||
self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
|
|
||||||
self.InkerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.InkerLine.setObjectName("InkerLine")
|
|
||||||
self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.InkerLine)
|
|
||||||
self.label_7 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_7.setObjectName("label_7")
|
|
||||||
self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7)
|
|
||||||
self.ColoristLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.ColoristLine.setObjectName("ColoristLine")
|
|
||||||
self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.ColoristLine)
|
|
||||||
self.label_8 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_8.setTextFormat(QtCore.Qt.RichText)
|
|
||||||
self.label_8.setOpenExternalLinks(True)
|
|
||||||
self.label_8.setObjectName("label_8")
|
|
||||||
self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8)
|
|
||||||
self.MUidLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.MUidLine.setObjectName("MUidLine")
|
|
||||||
self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.MUidLine)
|
|
||||||
|
|
||||||
self.retranslateUi(MetaEditorDialog)
|
|
||||||
QtCore.QMetaObject.connectSlotsByName(MetaEditorDialog)
|
|
||||||
|
|
||||||
def retranslateUi(self, MetaEditorDialog):
|
|
||||||
_translate = QtCore.QCoreApplication.translate
|
|
||||||
MetaEditorDialog.setWindowTitle(_translate("MetaEditorDialog", "Metadata editor"))
|
|
||||||
self.OKButton.setText(_translate("MetaEditorDialog", "Save"))
|
|
||||||
self.CancelButton.setText(_translate("MetaEditorDialog", "Cancel"))
|
|
||||||
self.label.setText(_translate("MetaEditorDialog", "Series:"))
|
|
||||||
self.label_2.setText(_translate("MetaEditorDialog", "Volume:"))
|
|
||||||
self.label_3.setText(_translate("MetaEditorDialog", "Number:"))
|
|
||||||
self.label_4.setText(_translate("MetaEditorDialog", "Writer:"))
|
|
||||||
self.label_5.setText(_translate("MetaEditorDialog", "Penciller:"))
|
|
||||||
self.label_6.setText(_translate("MetaEditorDialog", "Inker:"))
|
|
||||||
self.label_7.setText(_translate("MetaEditorDialog", "Colorist:"))
|
|
||||||
self.label_8.setText(_translate("MetaEditorDialog", "<html><head/><body><p><a href=\"https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support\"><span style=\" text-decoration: underline; color:#0000ff;\">MUid:</span></a></p></body></html>"))
|
|
||||||
|
|
||||||
from . import KCC_rc
|
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'gui/MetaEditor-Linux.ui'
|
|
||||||
#
|
|
||||||
# Created: Wed Oct 28 08:59:02 2015
|
|
||||||
# by: PyQt5 UI code generator 5.2.1
|
|
||||||
#
|
|
||||||
# WARNING! All changes made in this file will be lost!
|
|
||||||
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
|
||||||
|
|
||||||
class Ui_MetaEditorDialog(object):
|
|
||||||
def setupUi(self, MetaEditorDialog):
|
|
||||||
MetaEditorDialog.setObjectName("MetaEditorDialog")
|
|
||||||
MetaEditorDialog.resize(400, 290)
|
|
||||||
MetaEditorDialog.setMinimumSize(QtCore.QSize(400, 290))
|
|
||||||
MetaEditorDialog.setMaximumSize(QtCore.QSize(400, 290))
|
|
||||||
icon = QtGui.QIcon()
|
|
||||||
icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
MetaEditorDialog.setWindowIcon(icon)
|
|
||||||
self.horizontalLayoutWidget = QtWidgets.QWidget(MetaEditorDialog)
|
|
||||||
self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 250, 381, 31))
|
|
||||||
self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
|
|
||||||
self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget)
|
|
||||||
self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.horizontalLayout.setObjectName("horizontalLayout")
|
|
||||||
self.StatusLabel = QtWidgets.QLabel(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.StatusLabel.sizePolicy().hasHeightForWidth())
|
|
||||||
self.StatusLabel.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.StatusLabel.setFont(font)
|
|
||||||
self.StatusLabel.setStyleSheet("color: rgb(255, 0, 0);")
|
|
||||||
self.StatusLabel.setObjectName("StatusLabel")
|
|
||||||
self.horizontalLayout.addWidget(self.StatusLabel)
|
|
||||||
self.OKButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.OKButton.sizePolicy().hasHeightForWidth())
|
|
||||||
self.OKButton.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.OKButton.setFont(font)
|
|
||||||
icon1 = QtGui.QIcon()
|
|
||||||
icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.OKButton.setIcon(icon1)
|
|
||||||
self.OKButton.setObjectName("OKButton")
|
|
||||||
self.horizontalLayout.addWidget(self.OKButton)
|
|
||||||
self.CancelButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.CancelButton.sizePolicy().hasHeightForWidth())
|
|
||||||
self.CancelButton.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.CancelButton.setFont(font)
|
|
||||||
icon2 = QtGui.QIcon()
|
|
||||||
icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.CancelButton.setIcon(icon2)
|
|
||||||
self.CancelButton.setObjectName("CancelButton")
|
|
||||||
self.horizontalLayout.addWidget(self.CancelButton)
|
|
||||||
self.EditorFrame = QtWidgets.QFrame(MetaEditorDialog)
|
|
||||||
self.EditorFrame.setGeometry(QtCore.QRect(10, 10, 381, 241))
|
|
||||||
self.EditorFrame.setObjectName("EditorFrame")
|
|
||||||
self.formLayoutWidget = QtWidgets.QWidget(self.EditorFrame)
|
|
||||||
self.formLayoutWidget.setGeometry(QtCore.QRect(0, 0, 381, 266))
|
|
||||||
self.formLayoutWidget.setObjectName("formLayoutWidget")
|
|
||||||
self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget)
|
|
||||||
self.formLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.formLayout.setObjectName("formLayout")
|
|
||||||
self.label = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label.setObjectName("label")
|
|
||||||
self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label)
|
|
||||||
self.SeriesLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.SeriesLine.setObjectName("SeriesLine")
|
|
||||||
self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.SeriesLine)
|
|
||||||
self.label_2 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_2.setObjectName("label_2")
|
|
||||||
self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2)
|
|
||||||
self.VolumeLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.VolumeLine.setObjectName("VolumeLine")
|
|
||||||
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.VolumeLine)
|
|
||||||
self.label_3 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_3.setObjectName("label_3")
|
|
||||||
self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3)
|
|
||||||
self.NumberLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.NumberLine.setObjectName("NumberLine")
|
|
||||||
self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.NumberLine)
|
|
||||||
self.label_4 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_4.setObjectName("label_4")
|
|
||||||
self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4)
|
|
||||||
self.WriterLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.WriterLine.setObjectName("WriterLine")
|
|
||||||
self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.WriterLine)
|
|
||||||
self.label_5 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_5.setObjectName("label_5")
|
|
||||||
self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5)
|
|
||||||
self.PencillerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.PencillerLine.setObjectName("PencillerLine")
|
|
||||||
self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.PencillerLine)
|
|
||||||
self.label_6 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_6.setObjectName("label_6")
|
|
||||||
self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
|
|
||||||
self.InkerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.InkerLine.setObjectName("InkerLine")
|
|
||||||
self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.InkerLine)
|
|
||||||
self.label_7 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_7.setObjectName("label_7")
|
|
||||||
self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7)
|
|
||||||
self.ColoristLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.ColoristLine.setObjectName("ColoristLine")
|
|
||||||
self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.ColoristLine)
|
|
||||||
self.label_8 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_8.setTextFormat(QtCore.Qt.RichText)
|
|
||||||
self.label_8.setOpenExternalLinks(True)
|
|
||||||
self.label_8.setObjectName("label_8")
|
|
||||||
self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8)
|
|
||||||
self.MUidLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.MUidLine.setObjectName("MUidLine")
|
|
||||||
self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.MUidLine)
|
|
||||||
|
|
||||||
self.retranslateUi(MetaEditorDialog)
|
|
||||||
QtCore.QMetaObject.connectSlotsByName(MetaEditorDialog)
|
|
||||||
|
|
||||||
def retranslateUi(self, MetaEditorDialog):
|
|
||||||
_translate = QtCore.QCoreApplication.translate
|
|
||||||
MetaEditorDialog.setWindowTitle(_translate("MetaEditorDialog", "Metadata editor"))
|
|
||||||
self.OKButton.setText(_translate("MetaEditorDialog", "Save"))
|
|
||||||
self.CancelButton.setText(_translate("MetaEditorDialog", "Cancel"))
|
|
||||||
self.label.setText(_translate("MetaEditorDialog", "Series:"))
|
|
||||||
self.label_2.setText(_translate("MetaEditorDialog", "Volume:"))
|
|
||||||
self.label_3.setText(_translate("MetaEditorDialog", "Number:"))
|
|
||||||
self.label_4.setText(_translate("MetaEditorDialog", "Writer:"))
|
|
||||||
self.label_5.setText(_translate("MetaEditorDialog", "Penciller:"))
|
|
||||||
self.label_6.setText(_translate("MetaEditorDialog", "Inker:"))
|
|
||||||
self.label_7.setText(_translate("MetaEditorDialog", "Colorist:"))
|
|
||||||
self.label_8.setText(_translate("MetaEditorDialog", "<html><head/><body><p><a href=\"https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support\"><span style=\" text-decoration: underline; color:#0000ff;\">MUid:</span></a></p></body></html>"))
|
|
||||||
|
|
||||||
from . import KCC_rc
|
|
||||||
@@ -1,149 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
# Form implementation generated from reading ui file '/Users/pawelj/Documents/KCC/gui/MetaEditor.ui'
|
|
||||||
#
|
|
||||||
# Created: Sun Feb 8 12:47:09 2015
|
|
||||||
# by: PyQt5 UI code generator 5.4
|
|
||||||
#
|
|
||||||
# WARNING! All changes made in this file will be lost!
|
|
||||||
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
|
||||||
|
|
||||||
class Ui_MetaEditorDialog(object):
|
|
||||||
def setupUi(self, MetaEditorDialog):
|
|
||||||
MetaEditorDialog.setObjectName("MetaEditorDialog")
|
|
||||||
MetaEditorDialog.resize(400, 295)
|
|
||||||
MetaEditorDialog.setMinimumSize(QtCore.QSize(400, 295))
|
|
||||||
MetaEditorDialog.setMaximumSize(QtCore.QSize(400, 295))
|
|
||||||
icon = QtGui.QIcon()
|
|
||||||
icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
MetaEditorDialog.setWindowIcon(icon)
|
|
||||||
self.horizontalLayoutWidget = QtWidgets.QWidget(MetaEditorDialog)
|
|
||||||
self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 260, 381, 32))
|
|
||||||
self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
|
|
||||||
self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget)
|
|
||||||
self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.horizontalLayout.setObjectName("horizontalLayout")
|
|
||||||
self.StatusLabel = QtWidgets.QLabel(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.StatusLabel.sizePolicy().hasHeightForWidth())
|
|
||||||
self.StatusLabel.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(10)
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.StatusLabel.setFont(font)
|
|
||||||
self.StatusLabel.setStyleSheet("color: rgb(255, 0, 0);")
|
|
||||||
self.StatusLabel.setObjectName("StatusLabel")
|
|
||||||
self.horizontalLayout.addWidget(self.StatusLabel)
|
|
||||||
self.OKButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.OKButton.sizePolicy().hasHeightForWidth())
|
|
||||||
self.OKButton.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.OKButton.setFont(font)
|
|
||||||
icon1 = QtGui.QIcon()
|
|
||||||
icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.OKButton.setIcon(icon1)
|
|
||||||
self.OKButton.setObjectName("OKButton")
|
|
||||||
self.horizontalLayout.addWidget(self.OKButton)
|
|
||||||
self.CancelButton = QtWidgets.QPushButton(self.horizontalLayoutWidget)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.CancelButton.sizePolicy().hasHeightForWidth())
|
|
||||||
self.CancelButton.setSizePolicy(sizePolicy)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setBold(True)
|
|
||||||
font.setWeight(75)
|
|
||||||
self.CancelButton.setFont(font)
|
|
||||||
icon2 = QtGui.QIcon()
|
|
||||||
icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.CancelButton.setIcon(icon2)
|
|
||||||
self.CancelButton.setObjectName("CancelButton")
|
|
||||||
self.horizontalLayout.addWidget(self.CancelButton)
|
|
||||||
self.EditorFrame = QtWidgets.QFrame(MetaEditorDialog)
|
|
||||||
self.EditorFrame.setGeometry(QtCore.QRect(10, 10, 381, 251))
|
|
||||||
self.EditorFrame.setObjectName("EditorFrame")
|
|
||||||
self.formLayoutWidget = QtWidgets.QWidget(self.EditorFrame)
|
|
||||||
self.formLayoutWidget.setGeometry(QtCore.QRect(0, 0, 381, 250))
|
|
||||||
self.formLayoutWidget.setObjectName("formLayoutWidget")
|
|
||||||
self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget)
|
|
||||||
self.formLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.formLayout.setFieldGrowthPolicy(QtWidgets.QFormLayout.ExpandingFieldsGrow)
|
|
||||||
self.formLayout.setObjectName("formLayout")
|
|
||||||
self.label = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label.setObjectName("label")
|
|
||||||
self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label)
|
|
||||||
self.SeriesLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.SeriesLine.setObjectName("SeriesLine")
|
|
||||||
self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.SeriesLine)
|
|
||||||
self.label_2 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_2.setObjectName("label_2")
|
|
||||||
self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2)
|
|
||||||
self.VolumeLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.VolumeLine.setObjectName("VolumeLine")
|
|
||||||
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.VolumeLine)
|
|
||||||
self.label_3 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_3.setObjectName("label_3")
|
|
||||||
self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3)
|
|
||||||
self.NumberLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.NumberLine.setObjectName("NumberLine")
|
|
||||||
self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.NumberLine)
|
|
||||||
self.label_4 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_4.setObjectName("label_4")
|
|
||||||
self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4)
|
|
||||||
self.WriterLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.WriterLine.setObjectName("WriterLine")
|
|
||||||
self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.WriterLine)
|
|
||||||
self.label_5 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_5.setObjectName("label_5")
|
|
||||||
self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5)
|
|
||||||
self.PencillerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.PencillerLine.setObjectName("PencillerLine")
|
|
||||||
self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.PencillerLine)
|
|
||||||
self.label_6 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_6.setObjectName("label_6")
|
|
||||||
self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
|
|
||||||
self.InkerLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.InkerLine.setObjectName("InkerLine")
|
|
||||||
self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.InkerLine)
|
|
||||||
self.label_7 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_7.setObjectName("label_7")
|
|
||||||
self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7)
|
|
||||||
self.ColoristLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.ColoristLine.setObjectName("ColoristLine")
|
|
||||||
self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.ColoristLine)
|
|
||||||
self.label_8 = QtWidgets.QLabel(self.formLayoutWidget)
|
|
||||||
self.label_8.setTextFormat(QtCore.Qt.RichText)
|
|
||||||
self.label_8.setOpenExternalLinks(True)
|
|
||||||
self.label_8.setObjectName("label_8")
|
|
||||||
self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8)
|
|
||||||
self.MUidLine = QtWidgets.QLineEdit(self.formLayoutWidget)
|
|
||||||
self.MUidLine.setObjectName("MUidLine")
|
|
||||||
self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.MUidLine)
|
|
||||||
|
|
||||||
self.retranslateUi(MetaEditorDialog)
|
|
||||||
QtCore.QMetaObject.connectSlotsByName(MetaEditorDialog)
|
|
||||||
|
|
||||||
def retranslateUi(self, MetaEditorDialog):
|
|
||||||
_translate = QtCore.QCoreApplication.translate
|
|
||||||
MetaEditorDialog.setWindowTitle(_translate("MetaEditorDialog", "Metadata editor"))
|
|
||||||
self.OKButton.setText(_translate("MetaEditorDialog", "Save"))
|
|
||||||
self.CancelButton.setText(_translate("MetaEditorDialog", "Cancel"))
|
|
||||||
self.label.setText(_translate("MetaEditorDialog", "Series:"))
|
|
||||||
self.label_2.setText(_translate("MetaEditorDialog", "Volume:"))
|
|
||||||
self.label_3.setText(_translate("MetaEditorDialog", "Number:"))
|
|
||||||
self.label_4.setText(_translate("MetaEditorDialog", "Writer:"))
|
|
||||||
self.label_5.setText(_translate("MetaEditorDialog", "Penciller:"))
|
|
||||||
self.label_6.setText(_translate("MetaEditorDialog", "Inker:"))
|
|
||||||
self.label_7.setText(_translate("MetaEditorDialog", "Colorist:"))
|
|
||||||
self.label_8.setText(_translate("MetaEditorDialog", "<html><head/><body><p><a href=\"https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support\"><span style=\" text-decoration: underline; color:#0000ff;\">MUid:</span></a></p></body></html>"))
|
|
||||||
|
|
||||||
from . import KCC_rc
|
|
||||||
314
kcc/KCC_ui.py
314
kcc/KCC_ui.py
@@ -1,314 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'gui\KCC.ui'
|
|
||||||
#
|
|
||||||
# Created by: PyQt5 UI code generator 5.5.1
|
|
||||||
#
|
|
||||||
# WARNING! All changes made in this file will be lost!
|
|
||||||
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
|
||||||
|
|
||||||
class Ui_KCC(object):
|
|
||||||
def setupUi(self, KCC):
|
|
||||||
KCC.setObjectName("KCC")
|
|
||||||
KCC.resize(420, 390)
|
|
||||||
KCC.setMinimumSize(QtCore.QSize(420, 390))
|
|
||||||
KCC.setMaximumSize(QtCore.QSize(420, 390))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
KCC.setFont(font)
|
|
||||||
icon = QtGui.QIcon()
|
|
||||||
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 = QtWidgets.QWidget(KCC)
|
|
||||||
self.Form.setObjectName("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("DeviceBox")
|
|
||||||
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("FormatBox")
|
|
||||||
self.ConvertButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.ConvertButton.setGeometry(QtCore.QRect(160, 200, 91, 32))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.ConvertButton.setIcon(icon1)
|
|
||||||
self.ConvertButton.setObjectName("ConvertButton")
|
|
||||||
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(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.DirectoryButton.setIcon(icon2)
|
|
||||||
self.DirectoryButton.setObjectName("DirectoryButton")
|
|
||||||
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(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.FileButton.setIcon(icon3)
|
|
||||||
self.FileButton.setObjectName("FileButton")
|
|
||||||
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(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.ClearButton.setIcon(icon4)
|
|
||||||
self.ClearButton.setObjectName("ClearButton")
|
|
||||||
self.Options = QtWidgets.QFrame(self.Form)
|
|
||||||
self.Options.setGeometry(QtCore.QRect(10, 237, 401, 70))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
self.Options.setFont(font)
|
|
||||||
self.Options.setObjectName("Options")
|
|
||||||
self.gridLayout = QtWidgets.QGridLayout(self.Options)
|
|
||||||
self.gridLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.gridLayout.setHorizontalSpacing(40)
|
|
||||||
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.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))
|
|
||||||
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.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
|
|
||||||
self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
|
|
||||||
self.JobList.setObjectName("JobList")
|
|
||||||
self.OptionsGamma = QtWidgets.QFrame(self.Form)
|
|
||||||
self.OptionsGamma.setEnabled(True)
|
|
||||||
self.OptionsGamma.setGeometry(QtCore.QRect(10, 305, 401, 35))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
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.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, 31))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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("")
|
|
||||||
self.ProgressBar.setObjectName("ProgressBar")
|
|
||||||
self.OptionsCustom = QtWidgets.QFrame(self.Form)
|
|
||||||
self.OptionsCustom.setGeometry(QtCore.QRect(10, 340, 401, 25))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
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(15)
|
|
||||||
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
|
|
||||||
self.wLabel = QtWidgets.QLabel(self.OptionsCustom)
|
|
||||||
self.wLabel.setObjectName("wLabel")
|
|
||||||
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.setFocusPolicy(QtCore.Qt.ClickFocus)
|
|
||||||
self.customWidth.setAcceptDrops(False)
|
|
||||||
self.customWidth.setMaxLength(4)
|
|
||||||
self.customWidth.setObjectName("customWidth")
|
|
||||||
self.horizontalLayout_2.addWidget(self.customWidth)
|
|
||||||
self.hLabel = QtWidgets.QLabel(self.OptionsCustom)
|
|
||||||
self.hLabel.setObjectName("hLabel")
|
|
||||||
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.setFocusPolicy(QtCore.Qt.ClickFocus)
|
|
||||||
self.customHeight.setAcceptDrops(False)
|
|
||||||
self.customHeight.setMaxLength(4)
|
|
||||||
self.customHeight.setObjectName("customHeight")
|
|
||||||
self.horizontalLayout_2.addWidget(self.customHeight)
|
|
||||||
self.EditorButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.EditorButton.setGeometry(QtCore.QRect(10, 10, 200, 32))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
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(211, 10, 200, 32))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
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("MS Shell Dlg 2")
|
|
||||||
font.setPointSize(8)
|
|
||||||
self.statusBar.setFont(font)
|
|
||||||
self.statusBar.setSizeGripEnabled(False)
|
|
||||||
self.statusBar.setObjectName("statusBar")
|
|
||||||
KCC.setStatusBar(self.statusBar)
|
|
||||||
self.ActionBasic = QtWidgets.QAction(KCC)
|
|
||||||
self.ActionBasic.setCheckable(True)
|
|
||||||
self.ActionBasic.setChecked(False)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
self.ActionBasic.setFont(font)
|
|
||||||
self.ActionBasic.setObjectName("ActionBasic")
|
|
||||||
self.ActionAdvanced = QtWidgets.QAction(KCC)
|
|
||||||
self.ActionAdvanced.setCheckable(True)
|
|
||||||
self.ActionAdvanced.setObjectName("ActionAdvanced")
|
|
||||||
|
|
||||||
self.retranslateUi(KCC)
|
|
||||||
QtCore.QMetaObject.connectSlotsByName(KCC)
|
|
||||||
KCC.setTabOrder(self.DirectoryButton, self.FileButton)
|
|
||||||
KCC.setTabOrder(self.FileButton, self.ConvertButton)
|
|
||||||
KCC.setTabOrder(self.ConvertButton, self.ClearButton)
|
|
||||||
|
|
||||||
def retranslateUi(self, KCC):
|
|
||||||
_translate = QtCore.QCoreApplication.translate
|
|
||||||
KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter"))
|
|
||||||
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.RotateBox.setToolTip(_translate("KCC", "<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>"))
|
|
||||||
self.RotateBox.setText(_translate("KCC", "Spread splitter"))
|
|
||||||
self.QualityBox.setToolTip(_translate("KCC", "<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>"))
|
|
||||||
self.QualityBox.setText(_translate("KCC", "HQ zoom"))
|
|
||||||
self.GammaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable automatic gamma correction.</p></body></html>"))
|
|
||||||
self.GammaBox.setText(_translate("KCC", "Custom gamma"))
|
|
||||||
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.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable conversion to grayscale.</p></body></html>"))
|
|
||||||
self.ColorBox.setText(_translate("KCC", "Color mode"))
|
|
||||||
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 special parsing mode for Korean Webtoons.</p></body></html>"))
|
|
||||||
self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
|
|
||||||
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.GammaLabel.setText(_translate("KCC", "Gamma: Auto"))
|
|
||||||
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 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 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 style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
|
|
||||||
self.customHeight.setInputMask(_translate("KCC", "0000"))
|
|
||||||
self.EditorButton.setText(_translate("KCC", "Editor"))
|
|
||||||
self.WikiButton.setText(_translate("KCC", "Wiki"))
|
|
||||||
self.ActionBasic.setText(_translate("KCC", "Basic"))
|
|
||||||
self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
|
|
||||||
|
|
||||||
from . import KCC_rc
|
|
||||||
@@ -1,299 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'gui/KCC-Linux.ui'
|
|
||||||
#
|
|
||||||
# Created: Wed Oct 28 08:34:21 2015
|
|
||||||
# by: PyQt5 UI code generator 5.2.1
|
|
||||||
#
|
|
||||||
# WARNING! All changes made in this file will be lost!
|
|
||||||
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
|
||||||
|
|
||||||
class Ui_KCC(object):
|
|
||||||
def setupUi(self, KCC):
|
|
||||||
KCC.setObjectName("KCC")
|
|
||||||
KCC.resize(420, 390)
|
|
||||||
KCC.setMinimumSize(QtCore.QSize(420, 390))
|
|
||||||
KCC.setMaximumSize(QtCore.QSize(420, 390))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
KCC.setFont(font)
|
|
||||||
icon = QtGui.QIcon()
|
|
||||||
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 = QtWidgets.QWidget(KCC)
|
|
||||||
self.Form.setObjectName("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("DeviceBox")
|
|
||||||
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("FormatBox")
|
|
||||||
self.ConvertButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.ConvertButton.setGeometry(QtCore.QRect(160, 200, 91, 32))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.ConvertButton.setIcon(icon1)
|
|
||||||
self.ConvertButton.setObjectName("ConvertButton")
|
|
||||||
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(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.DirectoryButton.setIcon(icon2)
|
|
||||||
self.DirectoryButton.setObjectName("DirectoryButton")
|
|
||||||
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(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.FileButton.setIcon(icon3)
|
|
||||||
self.FileButton.setObjectName("FileButton")
|
|
||||||
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(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.ClearButton.setIcon(icon4)
|
|
||||||
self.ClearButton.setObjectName("ClearButton")
|
|
||||||
self.Options = QtWidgets.QFrame(self.Form)
|
|
||||||
self.Options.setGeometry(QtCore.QRect(10, 237, 401, 70))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
self.Options.setFont(font)
|
|
||||||
self.Options.setObjectName("Options")
|
|
||||||
self.gridLayout = QtWidgets.QGridLayout(self.Options)
|
|
||||||
self.gridLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.gridLayout.setHorizontalSpacing(25)
|
|
||||||
self.gridLayout.setVerticalSpacing(4)
|
|
||||||
self.gridLayout.setObjectName("gridLayout")
|
|
||||||
self.MangaBox = QtWidgets.QCheckBox(self.Options)
|
|
||||||
self.MangaBox.setFocusPolicy(QtCore.Qt.NoFocus)
|
|
||||||
self.MangaBox.setObjectName("MangaBox")
|
|
||||||
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))
|
|
||||||
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(18, 18))
|
|
||||||
self.JobList.setObjectName("JobList")
|
|
||||||
self.OptionsGamma = QtWidgets.QFrame(self.Form)
|
|
||||||
self.OptionsGamma.setEnabled(True)
|
|
||||||
self.OptionsGamma.setGeometry(QtCore.QRect(10, 305, 401, 35))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
self.OptionsGamma.setFont(font)
|
|
||||||
self.OptionsGamma.setObjectName("OptionsGamma")
|
|
||||||
self.horizontalLayout = QtWidgets.QHBoxLayout(self.OptionsGamma)
|
|
||||||
self.horizontalLayout.setSpacing(15)
|
|
||||||
self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.horizontalLayout.setObjectName("horizontalLayout")
|
|
||||||
self.GammaLabel = QtWidgets.QLabel(self.OptionsGamma)
|
|
||||||
self.GammaLabel.setObjectName("GammaLabel")
|
|
||||||
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, 31))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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("")
|
|
||||||
self.ProgressBar.setObjectName("ProgressBar")
|
|
||||||
self.OptionsCustom = QtWidgets.QFrame(self.Form)
|
|
||||||
self.OptionsCustom.setGeometry(QtCore.QRect(10, 336, 401, 25))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
self.OptionsCustom.setFont(font)
|
|
||||||
self.OptionsCustom.setObjectName("OptionsCustom")
|
|
||||||
self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.OptionsCustom)
|
|
||||||
self.horizontalLayout_2.setSpacing(10)
|
|
||||||
self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
|
|
||||||
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
|
|
||||||
self.wLabel = QtWidgets.QLabel(self.OptionsCustom)
|
|
||||||
self.wLabel.setObjectName("wLabel")
|
|
||||||
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.setFocusPolicy(QtCore.Qt.ClickFocus)
|
|
||||||
self.customWidth.setAcceptDrops(False)
|
|
||||||
self.customWidth.setMaxLength(4)
|
|
||||||
self.customWidth.setObjectName("customWidth")
|
|
||||||
self.horizontalLayout_2.addWidget(self.customWidth)
|
|
||||||
self.hLabel = QtWidgets.QLabel(self.OptionsCustom)
|
|
||||||
self.hLabel.setObjectName("hLabel")
|
|
||||||
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.setFocusPolicy(QtCore.Qt.ClickFocus)
|
|
||||||
self.customHeight.setAcceptDrops(False)
|
|
||||||
self.customHeight.setMaxLength(4)
|
|
||||||
self.customHeight.setObjectName("customHeight")
|
|
||||||
self.horizontalLayout_2.addWidget(self.customHeight)
|
|
||||||
self.EditorButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.EditorButton.setGeometry(QtCore.QRect(10, 10, 200, 32))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
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(211, 10, 200, 32))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(9)
|
|
||||||
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")
|
|
||||||
KCC.setCentralWidget(self.Form)
|
|
||||||
self.statusBar = QtWidgets.QStatusBar(KCC)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(8)
|
|
||||||
self.statusBar.setFont(font)
|
|
||||||
self.statusBar.setSizeGripEnabled(False)
|
|
||||||
self.statusBar.setObjectName("statusBar")
|
|
||||||
KCC.setStatusBar(self.statusBar)
|
|
||||||
self.ActionBasic = QtWidgets.QAction(KCC)
|
|
||||||
self.ActionBasic.setCheckable(True)
|
|
||||||
self.ActionBasic.setChecked(False)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
self.ActionBasic.setFont(font)
|
|
||||||
self.ActionBasic.setObjectName("ActionBasic")
|
|
||||||
self.ActionAdvanced = QtWidgets.QAction(KCC)
|
|
||||||
self.ActionAdvanced.setCheckable(True)
|
|
||||||
self.ActionAdvanced.setObjectName("ActionAdvanced")
|
|
||||||
|
|
||||||
self.retranslateUi(KCC)
|
|
||||||
QtCore.QMetaObject.connectSlotsByName(KCC)
|
|
||||||
KCC.setTabOrder(self.DirectoryButton, self.FileButton)
|
|
||||||
KCC.setTabOrder(self.FileButton, self.ConvertButton)
|
|
||||||
KCC.setTabOrder(self.ConvertButton, self.ClearButton)
|
|
||||||
|
|
||||||
def retranslateUi(self, KCC):
|
|
||||||
_translate = QtCore.QCoreApplication.translate
|
|
||||||
KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter"))
|
|
||||||
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.RotateBox.setToolTip(_translate("KCC", "<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>"))
|
|
||||||
self.RotateBox.setText(_translate("KCC", "Spread splitter"))
|
|
||||||
self.QualityBox.setToolTip(_translate("KCC", "<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>"))
|
|
||||||
self.QualityBox.setText(_translate("KCC", "HQ zoom"))
|
|
||||||
self.GammaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable automatic gamma correction.</p></body></html>"))
|
|
||||||
self.GammaBox.setText(_translate("KCC", "Custom gamma"))
|
|
||||||
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.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable conversion to grayscale.</p></body></html>"))
|
|
||||||
self.ColorBox.setText(_translate("KCC", "Color mode"))
|
|
||||||
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 special parsing mode for Korean Webtoons.</p></body></html>"))
|
|
||||||
self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
|
|
||||||
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.GammaLabel.setText(_translate("KCC", "Gamma: Auto"))
|
|
||||||
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 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 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 style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
|
|
||||||
self.customHeight.setInputMask(_translate("KCC", "0000"))
|
|
||||||
self.EditorButton.setText(_translate("KCC", "Editor"))
|
|
||||||
self.WikiButton.setText(_translate("KCC", "Wiki"))
|
|
||||||
self.ActionBasic.setText(_translate("KCC", "Basic"))
|
|
||||||
self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
|
|
||||||
|
|
||||||
from . import KCC_rc
|
|
||||||
@@ -1,317 +0,0 @@
|
|||||||
# -*- coding: utf-8 -*-
|
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'KCC-OSX.ui'
|
|
||||||
#
|
|
||||||
# Created by: PyQt5 UI code generator 5.5.1
|
|
||||||
#
|
|
||||||
# WARNING! All changes made in this file will be lost!
|
|
||||||
|
|
||||||
from PyQt5 import QtCore, QtGui, QtWidgets
|
|
||||||
|
|
||||||
class Ui_KCC(object):
|
|
||||||
def setupUi(self, KCC):
|
|
||||||
KCC.setObjectName("KCC")
|
|
||||||
KCC.resize(420, 390)
|
|
||||||
KCC.setMinimumSize(QtCore.QSize(420, 390))
|
|
||||||
KCC.setMaximumSize(QtCore.QSize(420, 390))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(11)
|
|
||||||
KCC.setFont(font)
|
|
||||||
icon = QtGui.QIcon()
|
|
||||||
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 = QtWidgets.QWidget(KCC)
|
|
||||||
self.Form.setObjectName("Form")
|
|
||||||
self.DeviceBox = QtWidgets.QComboBox(self.Form)
|
|
||||||
self.DeviceBox.setGeometry(QtCore.QRect(8, 204, 151, 26))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(11)
|
|
||||||
self.DeviceBox.setFont(font)
|
|
||||||
self.DeviceBox.setFocusPolicy(QtCore.Qt.NoFocus)
|
|
||||||
self.DeviceBox.setObjectName("DeviceBox")
|
|
||||||
self.FormatBox = QtWidgets.QComboBox(self.Form)
|
|
||||||
self.FormatBox.setGeometry(QtCore.QRect(264, 204, 150, 26))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(11)
|
|
||||||
self.FormatBox.setFont(font)
|
|
||||||
self.FormatBox.setFocusPolicy(QtCore.Qt.NoFocus)
|
|
||||||
self.FormatBox.setObjectName("FormatBox")
|
|
||||||
self.ConvertButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.ConvertButton.setGeometry(QtCore.QRect(159, 200, 104, 41))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.ConvertButton.setIcon(icon1)
|
|
||||||
self.ConvertButton.setObjectName("ConvertButton")
|
|
||||||
self.DirectoryButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.DirectoryButton.setGeometry(QtCore.QRect(4, 160, 158, 41))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(11)
|
|
||||||
self.DirectoryButton.setFont(font)
|
|
||||||
self.DirectoryButton.setFocusPolicy(QtCore.Qt.NoFocus)
|
|
||||||
icon2 = QtGui.QIcon()
|
|
||||||
icon2.addPixmap(QtGui.QPixmap(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.DirectoryButton.setIcon(icon2)
|
|
||||||
self.DirectoryButton.setObjectName("DirectoryButton")
|
|
||||||
self.FileButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.FileButton.setGeometry(QtCore.QRect(260, 160, 157, 41))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(11)
|
|
||||||
self.FileButton.setFont(font)
|
|
||||||
self.FileButton.setFocusPolicy(QtCore.Qt.NoFocus)
|
|
||||||
icon3 = QtGui.QIcon()
|
|
||||||
icon3.addPixmap(QtGui.QPixmap(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.FileButton.setIcon(icon3)
|
|
||||||
self.FileButton.setObjectName("FileButton")
|
|
||||||
self.ClearButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.ClearButton.setGeometry(QtCore.QRect(159, 160, 104, 41))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(11)
|
|
||||||
self.ClearButton.setFont(font)
|
|
||||||
self.ClearButton.setFocusPolicy(QtCore.Qt.NoFocus)
|
|
||||||
icon4 = QtGui.QIcon()
|
|
||||||
icon4.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
|
||||||
self.ClearButton.setIcon(icon4)
|
|
||||||
self.ClearButton.setObjectName("ClearButton")
|
|
||||||
self.Options = QtWidgets.QFrame(self.Form)
|
|
||||||
self.Options.setGeometry(QtCore.QRect(10, 237, 401, 70))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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.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.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.OptionsGamma = QtWidgets.QFrame(self.Form)
|
|
||||||
self.OptionsGamma.setEnabled(True)
|
|
||||||
self.OptionsGamma.setGeometry(QtCore.QRect(10, 305, 401, 35))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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.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, 31))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(11)
|
|
||||||
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("")
|
|
||||||
self.ProgressBar.setObjectName("ProgressBar")
|
|
||||||
self.OptionsCustom = QtWidgets.QFrame(self.Form)
|
|
||||||
self.OptionsCustom.setGeometry(QtCore.QRect(10, 337, 401, 25))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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.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.setFocusPolicy(QtCore.Qt.ClickFocus)
|
|
||||||
self.customWidth.setAcceptDrops(False)
|
|
||||||
self.customWidth.setMaxLength(4)
|
|
||||||
self.customWidth.setObjectName("customWidth")
|
|
||||||
self.horizontalLayout_2.addWidget(self.customWidth)
|
|
||||||
self.hLabel = QtWidgets.QLabel(self.OptionsCustom)
|
|
||||||
self.hLabel.setObjectName("hLabel")
|
|
||||||
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.setFocusPolicy(QtCore.Qt.ClickFocus)
|
|
||||||
self.customHeight.setAcceptDrops(False)
|
|
||||||
self.customHeight.setMaxLength(4)
|
|
||||||
self.customHeight.setObjectName("customHeight")
|
|
||||||
self.horizontalLayout_2.addWidget(self.customHeight)
|
|
||||||
self.EditorButton = QtWidgets.QPushButton(self.Form)
|
|
||||||
self.EditorButton.setGeometry(QtCore.QRect(4, 10, 210, 41))
|
|
||||||
font = QtGui.QFont()
|
|
||||||
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.setPointSize(11)
|
|
||||||
self.statusBar.setFont(font)
|
|
||||||
self.statusBar.setSizeGripEnabled(False)
|
|
||||||
self.statusBar.setObjectName("statusBar")
|
|
||||||
KCC.setStatusBar(self.statusBar)
|
|
||||||
self.ActionBasic = QtWidgets.QAction(KCC)
|
|
||||||
self.ActionBasic.setCheckable(True)
|
|
||||||
self.ActionBasic.setChecked(False)
|
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setPointSize(11)
|
|
||||||
self.ActionBasic.setFont(font)
|
|
||||||
self.ActionBasic.setObjectName("ActionBasic")
|
|
||||||
self.ActionAdvanced = QtWidgets.QAction(KCC)
|
|
||||||
self.ActionAdvanced.setCheckable(True)
|
|
||||||
self.ActionAdvanced.setObjectName("ActionAdvanced")
|
|
||||||
|
|
||||||
self.retranslateUi(KCC)
|
|
||||||
QtCore.QMetaObject.connectSlotsByName(KCC)
|
|
||||||
KCC.setTabOrder(self.DirectoryButton, self.FileButton)
|
|
||||||
KCC.setTabOrder(self.FileButton, self.ConvertButton)
|
|
||||||
KCC.setTabOrder(self.ConvertButton, self.ClearButton)
|
|
||||||
|
|
||||||
def retranslateUi(self, KCC):
|
|
||||||
_translate = QtCore.QCoreApplication.translate
|
|
||||||
KCC.setWindowTitle(_translate("KCC", "Kindle Comic Converter"))
|
|
||||||
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.RotateBox.setToolTip(_translate("KCC", "<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>"))
|
|
||||||
self.RotateBox.setText(_translate("KCC", "Spread splitter"))
|
|
||||||
self.QualityBox.setToolTip(_translate("KCC", "<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>"))
|
|
||||||
self.QualityBox.setText(_translate("KCC", "HQ zoom"))
|
|
||||||
self.GammaBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable automatic gamma correction.</p></body></html>"))
|
|
||||||
self.GammaBox.setText(_translate("KCC", "Custom gamma"))
|
|
||||||
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.ColorBox.setToolTip(_translate("KCC", "<html><head/><body><p style=\'white-space:pre\'>Disable conversion to grayscale.</p></body></html>"))
|
|
||||||
self.ColorBox.setText(_translate("KCC", "Color mode"))
|
|
||||||
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 special parsing mode for Korean Webtoons.</p></body></html>"))
|
|
||||||
self.WebtoonBox.setText(_translate("KCC", "Webtoon mode"))
|
|
||||||
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.GammaLabel.setText(_translate("KCC", "Gamma: Auto"))
|
|
||||||
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 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 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 style=\'white-space:pre\'>Resolution of target device.</p></body></html>"))
|
|
||||||
self.customHeight.setInputMask(_translate("KCC", "0000"))
|
|
||||||
self.EditorButton.setText(_translate("KCC", "Editor"))
|
|
||||||
self.WikiButton.setText(_translate("KCC", "Wiki"))
|
|
||||||
self.ActionBasic.setText(_translate("KCC", "Basic"))
|
|
||||||
self.ActionAdvanced.setText(_translate("KCC", "Advanced"))
|
|
||||||
|
|
||||||
from . import KCC_rc
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
272
kindlecomicconverter/KCC_ui.py
Normal file
272
kindlecomicconverter/KCC_ui.py
Normal file
@@ -0,0 +1,272 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
# Form implementation generated from reading ui file 'gui\KCC.ui'
|
||||||
|
#
|
||||||
|
# Created by: PyQt5 UI code generator 5.8.1
|
||||||
|
#
|
||||||
|
# WARNING! All changes made in this file will be lost!
|
||||||
|
|
||||||
|
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||||
|
|
||||||
|
class Ui_mainWindow(object):
|
||||||
|
def setupUi(self, mainWindow):
|
||||||
|
mainWindow.setObjectName("mainWindow")
|
||||||
|
mainWindow.resize(450, 400)
|
||||||
|
icon = QtGui.QIcon()
|
||||||
|
icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
mainWindow.setWindowIcon(icon)
|
||||||
|
self.centralWidget = QtWidgets.QWidget(mainWindow)
|
||||||
|
self.centralWidget.setObjectName("centralWidget")
|
||||||
|
self.gridLayout = QtWidgets.QGridLayout(self.centralWidget)
|
||||||
|
self.gridLayout.setContentsMargins(-1, -1, -1, 5)
|
||||||
|
self.gridLayout.setObjectName("gridLayout")
|
||||||
|
self.progressBar = QtWidgets.QProgressBar(self.centralWidget)
|
||||||
|
self.progressBar.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
font = QtGui.QFont()
|
||||||
|
font.setBold(True)
|
||||||
|
font.setWeight(75)
|
||||||
|
self.progressBar.setFont(font)
|
||||||
|
self.progressBar.setVisible(False)
|
||||||
|
self.progressBar.setAlignment(QtCore.Qt.AlignJustify|QtCore.Qt.AlignVCenter)
|
||||||
|
self.progressBar.setObjectName("progressBar")
|
||||||
|
self.gridLayout.addWidget(self.progressBar, 1, 0, 1, 2)
|
||||||
|
self.jobList = QtWidgets.QListWidget(self.centralWidget)
|
||||||
|
self.jobList.setStyleSheet("QListWidget#jobList {background:#ffffff;background-image:url(:/Other/icons/list_background.png);background-position:center center;background-repeat:no-repeat;color:rgb(0,0,0);}")
|
||||||
|
self.jobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
|
||||||
|
self.jobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
|
||||||
|
self.jobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
|
||||||
|
self.jobList.setObjectName("jobList")
|
||||||
|
self.gridLayout.addWidget(self.jobList, 2, 0, 1, 2)
|
||||||
|
self.customWidget = QtWidgets.QWidget(self.centralWidget)
|
||||||
|
self.customWidget.setVisible(False)
|
||||||
|
self.customWidget.setObjectName("customWidget")
|
||||||
|
self.gridLayout_3 = QtWidgets.QGridLayout(self.customWidget)
|
||||||
|
self.gridLayout_3.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.gridLayout_3.setObjectName("gridLayout_3")
|
||||||
|
self.hLabel = QtWidgets.QLabel(self.customWidget)
|
||||||
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
|
||||||
|
sizePolicy.setHorizontalStretch(0)
|
||||||
|
sizePolicy.setVerticalStretch(0)
|
||||||
|
sizePolicy.setHeightForWidth(self.hLabel.sizePolicy().hasHeightForWidth())
|
||||||
|
self.hLabel.setSizePolicy(sizePolicy)
|
||||||
|
self.hLabel.setObjectName("hLabel")
|
||||||
|
self.gridLayout_3.addWidget(self.hLabel, 0, 2, 1, 1)
|
||||||
|
self.widthBox = QtWidgets.QSpinBox(self.customWidget)
|
||||||
|
self.widthBox.setMaximum(2160)
|
||||||
|
self.widthBox.setObjectName("widthBox")
|
||||||
|
self.gridLayout_3.addWidget(self.widthBox, 0, 1, 1, 1)
|
||||||
|
self.wLabel = QtWidgets.QLabel(self.customWidget)
|
||||||
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
|
||||||
|
sizePolicy.setHorizontalStretch(0)
|
||||||
|
sizePolicy.setVerticalStretch(0)
|
||||||
|
sizePolicy.setHeightForWidth(self.wLabel.sizePolicy().hasHeightForWidth())
|
||||||
|
self.wLabel.setSizePolicy(sizePolicy)
|
||||||
|
self.wLabel.setObjectName("wLabel")
|
||||||
|
self.gridLayout_3.addWidget(self.wLabel, 0, 0, 1, 1)
|
||||||
|
self.heightBox = QtWidgets.QSpinBox(self.customWidget)
|
||||||
|
self.heightBox.setMaximum(3840)
|
||||||
|
self.heightBox.setObjectName("heightBox")
|
||||||
|
self.gridLayout_3.addWidget(self.heightBox, 0, 3, 1, 1)
|
||||||
|
self.gridLayout.addWidget(self.customWidget, 6, 0, 1, 2)
|
||||||
|
self.optionWidget = QtWidgets.QWidget(self.centralWidget)
|
||||||
|
self.optionWidget.setObjectName("optionWidget")
|
||||||
|
self.gridLayout_2 = QtWidgets.QGridLayout(self.optionWidget)
|
||||||
|
self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.gridLayout_2.setObjectName("gridLayout_2")
|
||||||
|
self.mangaBox = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.mangaBox.setObjectName("mangaBox")
|
||||||
|
self.gridLayout_2.addWidget(self.mangaBox, 0, 0, 1, 1)
|
||||||
|
self.rotateBox = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.rotateBox.setTristate(True)
|
||||||
|
self.rotateBox.setObjectName("rotateBox")
|
||||||
|
self.gridLayout_2.addWidget(self.rotateBox, 0, 1, 1, 1)
|
||||||
|
self.qualityBox = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.qualityBox.setTristate(True)
|
||||||
|
self.qualityBox.setObjectName("qualityBox")
|
||||||
|
self.gridLayout_2.addWidget(self.qualityBox, 0, 2, 1, 1)
|
||||||
|
self.webtoonBox = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.webtoonBox.setObjectName("webtoonBox")
|
||||||
|
self.gridLayout_2.addWidget(self.webtoonBox, 1, 0, 1, 1)
|
||||||
|
self.upscaleBox = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.upscaleBox.setTristate(True)
|
||||||
|
self.upscaleBox.setObjectName("upscaleBox")
|
||||||
|
self.gridLayout_2.addWidget(self.upscaleBox, 1, 1, 1, 1)
|
||||||
|
self.gammaBox = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.gammaBox.setObjectName("gammaBox")
|
||||||
|
self.gridLayout_2.addWidget(self.gammaBox, 1, 2, 1, 1)
|
||||||
|
self.borderBox = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.borderBox.setTristate(True)
|
||||||
|
self.borderBox.setObjectName("borderBox")
|
||||||
|
self.gridLayout_2.addWidget(self.borderBox, 2, 0, 1, 1)
|
||||||
|
self.outputSplit = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.outputSplit.setObjectName("outputSplit")
|
||||||
|
self.gridLayout_2.addWidget(self.outputSplit, 2, 1, 1, 1)
|
||||||
|
self.colorBox = QtWidgets.QCheckBox(self.optionWidget)
|
||||||
|
self.colorBox.setObjectName("colorBox")
|
||||||
|
self.gridLayout_2.addWidget(self.colorBox, 2, 2, 1, 1)
|
||||||
|
self.gridLayout.addWidget(self.optionWidget, 4, 0, 1, 2)
|
||||||
|
self.gammaWidget = QtWidgets.QWidget(self.centralWidget)
|
||||||
|
self.gammaWidget.setVisible(False)
|
||||||
|
self.gammaWidget.setObjectName("gammaWidget")
|
||||||
|
self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.gammaWidget)
|
||||||
|
self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
|
||||||
|
self.gammaLabel = QtWidgets.QLabel(self.gammaWidget)
|
||||||
|
self.gammaLabel.setObjectName("gammaLabel")
|
||||||
|
self.horizontalLayout_2.addWidget(self.gammaLabel)
|
||||||
|
self.gammaSlider = QtWidgets.QSlider(self.gammaWidget)
|
||||||
|
self.gammaSlider.setMaximum(250)
|
||||||
|
self.gammaSlider.setSingleStep(5)
|
||||||
|
self.gammaSlider.setOrientation(QtCore.Qt.Horizontal)
|
||||||
|
self.gammaSlider.setObjectName("gammaSlider")
|
||||||
|
self.horizontalLayout_2.addWidget(self.gammaSlider)
|
||||||
|
self.gridLayout.addWidget(self.gammaWidget, 5, 0, 1, 2)
|
||||||
|
self.toolWidget = QtWidgets.QWidget(self.centralWidget)
|
||||||
|
self.toolWidget.setObjectName("toolWidget")
|
||||||
|
self.horizontalLayout = QtWidgets.QHBoxLayout(self.toolWidget)
|
||||||
|
self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.horizontalLayout.setObjectName("horizontalLayout")
|
||||||
|
self.editorButton = QtWidgets.QPushButton(self.toolWidget)
|
||||||
|
self.editorButton.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
icon1 = QtGui.QIcon()
|
||||||
|
icon1.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
self.editorButton.setIcon(icon1)
|
||||||
|
self.editorButton.setObjectName("editorButton")
|
||||||
|
self.horizontalLayout.addWidget(self.editorButton)
|
||||||
|
self.wikiButton = QtWidgets.QPushButton(self.toolWidget)
|
||||||
|
self.wikiButton.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
icon2 = QtGui.QIcon()
|
||||||
|
icon2.addPixmap(QtGui.QPixmap(":/Other/icons/wiki.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
self.wikiButton.setIcon(icon2)
|
||||||
|
self.wikiButton.setObjectName("wikiButton")
|
||||||
|
self.horizontalLayout.addWidget(self.wikiButton)
|
||||||
|
self.gridLayout.addWidget(self.toolWidget, 0, 0, 1, 2)
|
||||||
|
self.buttonWidget = QtWidgets.QWidget(self.centralWidget)
|
||||||
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
|
||||||
|
sizePolicy.setHorizontalStretch(0)
|
||||||
|
sizePolicy.setVerticalStretch(0)
|
||||||
|
sizePolicy.setHeightForWidth(self.buttonWidget.sizePolicy().hasHeightForWidth())
|
||||||
|
self.buttonWidget.setSizePolicy(sizePolicy)
|
||||||
|
self.buttonWidget.setObjectName("buttonWidget")
|
||||||
|
self.gridLayout_4 = QtWidgets.QGridLayout(self.buttonWidget)
|
||||||
|
self.gridLayout_4.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.gridLayout_4.setObjectName("gridLayout_4")
|
||||||
|
self.directoryButton = QtWidgets.QPushButton(self.buttonWidget)
|
||||||
|
self.directoryButton.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
icon3 = QtGui.QIcon()
|
||||||
|
icon3.addPixmap(QtGui.QPixmap(":/Other/icons/folder_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
self.directoryButton.setIcon(icon3)
|
||||||
|
self.directoryButton.setObjectName("directoryButton")
|
||||||
|
self.gridLayout_4.addWidget(self.directoryButton, 0, 0, 1, 1)
|
||||||
|
self.fileButton = QtWidgets.QPushButton(self.buttonWidget)
|
||||||
|
self.fileButton.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
icon4 = QtGui.QIcon()
|
||||||
|
icon4.addPixmap(QtGui.QPixmap(":/Other/icons/document_new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
self.fileButton.setIcon(icon4)
|
||||||
|
self.fileButton.setObjectName("fileButton")
|
||||||
|
self.gridLayout_4.addWidget(self.fileButton, 0, 3, 1, 1)
|
||||||
|
self.deviceBox = QtWidgets.QComboBox(self.buttonWidget)
|
||||||
|
self.deviceBox.setMinimumSize(QtCore.QSize(0, 28))
|
||||||
|
self.deviceBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToMinimumContentsLength)
|
||||||
|
self.deviceBox.setObjectName("deviceBox")
|
||||||
|
self.gridLayout_4.addWidget(self.deviceBox, 1, 0, 1, 1)
|
||||||
|
self.formatBox = QtWidgets.QComboBox(self.buttonWidget)
|
||||||
|
self.formatBox.setMinimumSize(QtCore.QSize(0, 28))
|
||||||
|
self.formatBox.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToMinimumContentsLength)
|
||||||
|
self.formatBox.setObjectName("formatBox")
|
||||||
|
self.gridLayout_4.addWidget(self.formatBox, 1, 3, 1, 1)
|
||||||
|
self.convertButton = QtWidgets.QPushButton(self.buttonWidget)
|
||||||
|
self.convertButton.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
font = QtGui.QFont()
|
||||||
|
font.setBold(True)
|
||||||
|
font.setWeight(75)
|
||||||
|
self.convertButton.setFont(font)
|
||||||
|
icon5 = QtGui.QIcon()
|
||||||
|
icon5.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
self.convertButton.setIcon(icon5)
|
||||||
|
self.convertButton.setObjectName("convertButton")
|
||||||
|
self.gridLayout_4.addWidget(self.convertButton, 1, 2, 1, 1)
|
||||||
|
self.clearButton = QtWidgets.QPushButton(self.buttonWidget)
|
||||||
|
self.clearButton.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
icon6 = QtGui.QIcon()
|
||||||
|
icon6.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
self.clearButton.setIcon(icon6)
|
||||||
|
self.clearButton.setObjectName("clearButton")
|
||||||
|
self.gridLayout_4.addWidget(self.clearButton, 0, 2, 1, 1)
|
||||||
|
self.directoryButton.raise_()
|
||||||
|
self.clearButton.raise_()
|
||||||
|
self.fileButton.raise_()
|
||||||
|
self.deviceBox.raise_()
|
||||||
|
self.convertButton.raise_()
|
||||||
|
self.formatBox.raise_()
|
||||||
|
self.gridLayout.addWidget(self.buttonWidget, 3, 0, 1, 2)
|
||||||
|
mainWindow.setCentralWidget(self.centralWidget)
|
||||||
|
self.statusBar = QtWidgets.QStatusBar(mainWindow)
|
||||||
|
self.statusBar.setSizeGripEnabled(False)
|
||||||
|
self.statusBar.setObjectName("statusBar")
|
||||||
|
mainWindow.setStatusBar(self.statusBar)
|
||||||
|
|
||||||
|
self.retranslateUi(mainWindow)
|
||||||
|
QtCore.QMetaObject.connectSlotsByName(mainWindow)
|
||||||
|
mainWindow.setTabOrder(self.convertButton, self.clearButton)
|
||||||
|
mainWindow.setTabOrder(self.clearButton, self.directoryButton)
|
||||||
|
mainWindow.setTabOrder(self.directoryButton, self.fileButton)
|
||||||
|
mainWindow.setTabOrder(self.fileButton, self.deviceBox)
|
||||||
|
mainWindow.setTabOrder(self.deviceBox, self.formatBox)
|
||||||
|
mainWindow.setTabOrder(self.formatBox, self.mangaBox)
|
||||||
|
mainWindow.setTabOrder(self.mangaBox, self.rotateBox)
|
||||||
|
mainWindow.setTabOrder(self.rotateBox, self.qualityBox)
|
||||||
|
mainWindow.setTabOrder(self.qualityBox, self.webtoonBox)
|
||||||
|
mainWindow.setTabOrder(self.webtoonBox, self.upscaleBox)
|
||||||
|
mainWindow.setTabOrder(self.upscaleBox, self.gammaBox)
|
||||||
|
mainWindow.setTabOrder(self.gammaBox, self.borderBox)
|
||||||
|
mainWindow.setTabOrder(self.borderBox, self.outputSplit)
|
||||||
|
mainWindow.setTabOrder(self.outputSplit, self.colorBox)
|
||||||
|
mainWindow.setTabOrder(self.colorBox, self.editorButton)
|
||||||
|
mainWindow.setTabOrder(self.editorButton, self.wikiButton)
|
||||||
|
mainWindow.setTabOrder(self.wikiButton, self.jobList)
|
||||||
|
mainWindow.setTabOrder(self.jobList, self.gammaSlider)
|
||||||
|
mainWindow.setTabOrder(self.gammaSlider, self.widthBox)
|
||||||
|
mainWindow.setTabOrder(self.widthBox, self.heightBox)
|
||||||
|
|
||||||
|
def retranslateUi(self, mainWindow):
|
||||||
|
_translate = QtCore.QCoreApplication.translate
|
||||||
|
mainWindow.setWindowTitle(_translate("mainWindow", "Kindle Comic Converter"))
|
||||||
|
self.hLabel.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Resolution of the target device.</p></body></html>"))
|
||||||
|
self.hLabel.setText(_translate("mainWindow", "Custom height:"))
|
||||||
|
self.widthBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Resolution of the target device.</p></body></html>"))
|
||||||
|
self.wLabel.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Resolution of the target device.</p></body></html>"))
|
||||||
|
self.wLabel.setText(_translate("mainWindow", "Custom width:"))
|
||||||
|
self.heightBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Resolution of the target device.</p></body></html>"))
|
||||||
|
self.mangaBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Enable right-to-left reading.</p></body></html>"))
|
||||||
|
self.mangaBox.setText(_translate("mainWindow", "Manga mode"))
|
||||||
|
self.rotateBox.setToolTip(_translate("mainWindow", "<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>"))
|
||||||
|
self.rotateBox.setText(_translate("mainWindow", "Spread splitter"))
|
||||||
|
self.qualityBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - 4 panels<br/></span>Zoom each corner separately.</p><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Indeterminate - 2 panels<br/></span>Zoom only the top and bottom of the page.</p><p><span style=\" font-weight:600; text-decoration: underline;\">Checked - 4 high-quality panels<br/></span>Zoom each corner separately. Try to increase the quality of magnification. Check wiki for more details.</p></body></html>"))
|
||||||
|
self.qualityBox.setText(_translate("mainWindow", "Panel View 4/2/HQ"))
|
||||||
|
self.webtoonBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Enable special parsing mode for Korean Webtoons.</p></body></html>"))
|
||||||
|
self.webtoonBox.setText(_translate("mainWindow", "Webtoon mode"))
|
||||||
|
self.upscaleBox.setToolTip(_translate("mainWindow", "<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("mainWindow", "Stretch/Upscale"))
|
||||||
|
self.gammaBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Disable automatic gamma correction.</p></body></html>"))
|
||||||
|
self.gammaBox.setText(_translate("mainWindow", "Custom gamma"))
|
||||||
|
self.borderBox.setToolTip(_translate("mainWindow", "<html><head/><body><p><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Autodetection<br/></span>The 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("mainWindow", "W/B margins"))
|
||||||
|
self.outputSplit.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Unchecked - Automatic mode<br/></span>The output will be split automatically.</p><p style=\'white-space:pre\'><span style=\" font-weight:600; text-decoration: underline;\">Checked - Volume mode<br/></span>Every subdirectory will be considered as a separate volume.</p></body></html>"))
|
||||||
|
self.outputSplit.setText(_translate("mainWindow", "Output split"))
|
||||||
|
self.colorBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Disable conversion to grayscale.</p></body></html>"))
|
||||||
|
self.colorBox.setText(_translate("mainWindow", "Color mode"))
|
||||||
|
self.gammaLabel.setText(_translate("mainWindow", "Gamma: Auto"))
|
||||||
|
self.editorButton.setText(_translate("mainWindow", "Editor"))
|
||||||
|
self.wikiButton.setText(_translate("mainWindow", "Wiki"))
|
||||||
|
self.directoryButton.setToolTip(_translate("mainWindow", "<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("mainWindow", "Add directory"))
|
||||||
|
self.fileButton.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Add CBR, CBZ, CB7 or PDF file to queue.</p></body></html>"))
|
||||||
|
self.fileButton.setText(_translate("mainWindow", "Add file"))
|
||||||
|
self.deviceBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Target device.</p></body></html>"))
|
||||||
|
self.formatBox.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Output format.</p></body></html>"))
|
||||||
|
self.convertButton.setToolTip(_translate("mainWindow", "<html><head/><body><p style=\'white-space:pre\'>Shift+Click to select the output directory.</p></body></html>"))
|
||||||
|
self.convertButton.setText(_translate("mainWindow", "Convert"))
|
||||||
|
self.clearButton.setText(_translate("mainWindow", "Clear list"))
|
||||||
|
|
||||||
|
from . import KCC_rc
|
||||||
124
kindlecomicconverter/KCC_ui_editor.py
Normal file
124
kindlecomicconverter/KCC_ui_editor.py
Normal file
@@ -0,0 +1,124 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
# Form implementation generated from reading ui file 'gui\MetaEditor.ui'
|
||||||
|
#
|
||||||
|
# Created by: PyQt5 UI code generator 5.6
|
||||||
|
#
|
||||||
|
# WARNING! All changes made in this file will be lost!
|
||||||
|
|
||||||
|
from PyQt5 import QtCore, QtGui, QtWidgets
|
||||||
|
|
||||||
|
class Ui_editorDialog(object):
|
||||||
|
def setupUi(self, editorDialog):
|
||||||
|
editorDialog.setObjectName("editorDialog")
|
||||||
|
editorDialog.resize(400, 260)
|
||||||
|
editorDialog.setMinimumSize(QtCore.QSize(400, 260))
|
||||||
|
icon = QtGui.QIcon()
|
||||||
|
icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
editorDialog.setWindowIcon(icon)
|
||||||
|
self.verticalLayout = QtWidgets.QVBoxLayout(editorDialog)
|
||||||
|
self.verticalLayout.setContentsMargins(-1, -1, -1, 5)
|
||||||
|
self.verticalLayout.setObjectName("verticalLayout")
|
||||||
|
self.editorWidget = QtWidgets.QWidget(editorDialog)
|
||||||
|
self.editorWidget.setObjectName("editorWidget")
|
||||||
|
self.gridLayout = QtWidgets.QGridLayout(self.editorWidget)
|
||||||
|
self.gridLayout.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.gridLayout.setObjectName("gridLayout")
|
||||||
|
self.label_1 = QtWidgets.QLabel(self.editorWidget)
|
||||||
|
self.label_1.setObjectName("label_1")
|
||||||
|
self.gridLayout.addWidget(self.label_1, 0, 0, 1, 1)
|
||||||
|
self.seriesLine = QtWidgets.QLineEdit(self.editorWidget)
|
||||||
|
self.seriesLine.setObjectName("seriesLine")
|
||||||
|
self.gridLayout.addWidget(self.seriesLine, 0, 1, 1, 1)
|
||||||
|
self.label_2 = QtWidgets.QLabel(self.editorWidget)
|
||||||
|
self.label_2.setObjectName("label_2")
|
||||||
|
self.gridLayout.addWidget(self.label_2, 1, 0, 1, 1)
|
||||||
|
self.volumeLine = QtWidgets.QLineEdit(self.editorWidget)
|
||||||
|
self.volumeLine.setObjectName("volumeLine")
|
||||||
|
self.gridLayout.addWidget(self.volumeLine, 1, 1, 1, 1)
|
||||||
|
self.label_3 = QtWidgets.QLabel(self.editorWidget)
|
||||||
|
self.label_3.setObjectName("label_3")
|
||||||
|
self.gridLayout.addWidget(self.label_3, 2, 0, 1, 1)
|
||||||
|
self.numberLine = QtWidgets.QLineEdit(self.editorWidget)
|
||||||
|
self.numberLine.setObjectName("numberLine")
|
||||||
|
self.gridLayout.addWidget(self.numberLine, 2, 1, 1, 1)
|
||||||
|
self.label_4 = QtWidgets.QLabel(self.editorWidget)
|
||||||
|
self.label_4.setObjectName("label_4")
|
||||||
|
self.gridLayout.addWidget(self.label_4, 3, 0, 1, 1)
|
||||||
|
self.writerLine = QtWidgets.QLineEdit(self.editorWidget)
|
||||||
|
self.writerLine.setObjectName("writerLine")
|
||||||
|
self.gridLayout.addWidget(self.writerLine, 3, 1, 1, 1)
|
||||||
|
self.label_5 = QtWidgets.QLabel(self.editorWidget)
|
||||||
|
self.label_5.setObjectName("label_5")
|
||||||
|
self.gridLayout.addWidget(self.label_5, 4, 0, 1, 1)
|
||||||
|
self.pencillerLine = QtWidgets.QLineEdit(self.editorWidget)
|
||||||
|
self.pencillerLine.setObjectName("pencillerLine")
|
||||||
|
self.gridLayout.addWidget(self.pencillerLine, 4, 1, 1, 1)
|
||||||
|
self.label_6 = QtWidgets.QLabel(self.editorWidget)
|
||||||
|
self.label_6.setObjectName("label_6")
|
||||||
|
self.gridLayout.addWidget(self.label_6, 5, 0, 1, 1)
|
||||||
|
self.inkerLine = QtWidgets.QLineEdit(self.editorWidget)
|
||||||
|
self.inkerLine.setObjectName("inkerLine")
|
||||||
|
self.gridLayout.addWidget(self.inkerLine, 5, 1, 1, 1)
|
||||||
|
self.label_7 = QtWidgets.QLabel(self.editorWidget)
|
||||||
|
self.label_7.setObjectName("label_7")
|
||||||
|
self.gridLayout.addWidget(self.label_7, 6, 0, 1, 1)
|
||||||
|
self.coloristLine = QtWidgets.QLineEdit(self.editorWidget)
|
||||||
|
self.coloristLine.setObjectName("coloristLine")
|
||||||
|
self.gridLayout.addWidget(self.coloristLine, 6, 1, 1, 1)
|
||||||
|
self.label_8 = QtWidgets.QLabel(self.editorWidget)
|
||||||
|
self.label_8.setOpenExternalLinks(True)
|
||||||
|
self.label_8.setObjectName("label_8")
|
||||||
|
self.gridLayout.addWidget(self.label_8, 7, 0, 1, 1)
|
||||||
|
self.muidLine = QtWidgets.QLineEdit(self.editorWidget)
|
||||||
|
self.muidLine.setObjectName("muidLine")
|
||||||
|
self.gridLayout.addWidget(self.muidLine, 7, 1, 1, 1)
|
||||||
|
self.verticalLayout.addWidget(self.editorWidget)
|
||||||
|
self.optionWidget = QtWidgets.QWidget(editorDialog)
|
||||||
|
self.optionWidget.setObjectName("optionWidget")
|
||||||
|
self.horizontalLayout = QtWidgets.QHBoxLayout(self.optionWidget)
|
||||||
|
self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
|
||||||
|
self.horizontalLayout.setObjectName("horizontalLayout")
|
||||||
|
self.statusLabel = QtWidgets.QLabel(self.optionWidget)
|
||||||
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding)
|
||||||
|
sizePolicy.setHorizontalStretch(0)
|
||||||
|
sizePolicy.setVerticalStretch(0)
|
||||||
|
sizePolicy.setHeightForWidth(self.statusLabel.sizePolicy().hasHeightForWidth())
|
||||||
|
self.statusLabel.setSizePolicy(sizePolicy)
|
||||||
|
self.statusLabel.setText("")
|
||||||
|
self.statusLabel.setObjectName("statusLabel")
|
||||||
|
self.horizontalLayout.addWidget(self.statusLabel)
|
||||||
|
self.okButton = QtWidgets.QPushButton(self.optionWidget)
|
||||||
|
self.okButton.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
icon1 = QtGui.QIcon()
|
||||||
|
icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
self.okButton.setIcon(icon1)
|
||||||
|
self.okButton.setObjectName("okButton")
|
||||||
|
self.horizontalLayout.addWidget(self.okButton)
|
||||||
|
self.cancelButton = QtWidgets.QPushButton(self.optionWidget)
|
||||||
|
self.cancelButton.setMinimumSize(QtCore.QSize(0, 30))
|
||||||
|
icon2 = QtGui.QIcon()
|
||||||
|
icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
|
||||||
|
self.cancelButton.setIcon(icon2)
|
||||||
|
self.cancelButton.setObjectName("cancelButton")
|
||||||
|
self.horizontalLayout.addWidget(self.cancelButton)
|
||||||
|
self.verticalLayout.addWidget(self.optionWidget)
|
||||||
|
|
||||||
|
self.retranslateUi(editorDialog)
|
||||||
|
QtCore.QMetaObject.connectSlotsByName(editorDialog)
|
||||||
|
|
||||||
|
def retranslateUi(self, editorDialog):
|
||||||
|
_translate = QtCore.QCoreApplication.translate
|
||||||
|
editorDialog.setWindowTitle(_translate("editorDialog", "Metadata editor"))
|
||||||
|
self.label_1.setText(_translate("editorDialog", "Series:"))
|
||||||
|
self.label_2.setText(_translate("editorDialog", "Volume:"))
|
||||||
|
self.label_3.setText(_translate("editorDialog", "Number:"))
|
||||||
|
self.label_4.setText(_translate("editorDialog", "Writer:"))
|
||||||
|
self.label_5.setText(_translate("editorDialog", "Penciller:"))
|
||||||
|
self.label_6.setText(_translate("editorDialog", "Inker:"))
|
||||||
|
self.label_7.setText(_translate("editorDialog", "Colorist:"))
|
||||||
|
self.label_8.setText(_translate("editorDialog", "<html><head/><body><p><a href=\"https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support\"><span style=\" text-decoration: underline; color:#0000ff;\">MUid:</span></a></p></body></html>"))
|
||||||
|
self.okButton.setText(_translate("editorDialog", "Save"))
|
||||||
|
self.cancelButton.setText(_translate("editorDialog", "Cancel"))
|
||||||
|
|
||||||
|
from . import KCC_rc
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
__version__ = '5.0.1'
|
__version__ = '5.4.1'
|
||||||
__license__ = 'ISC'
|
__license__ = 'ISC'
|
||||||
__copyright__ = '2012-2015, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
|
__copyright__ = '2012-2017, Ciro Mattia Gonano <ciromattia@gmail.com>, Pawel Jastrzebski <pawelj@iosphe.re>'
|
||||||
__docformat__ = 'restructuredtext en'
|
__docformat__ = 'restructuredtext en'
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -16,18 +16,13 @@
|
|||||||
# PERFORMANCE OF THIS SOFTWARE.
|
# PERFORMANCE OF THIS SOFTWARE.
|
||||||
#
|
#
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
import os
|
||||||
from zipfile import is_zipfile, ZipFile
|
from zipfile import is_zipfile, ZipFile
|
||||||
from subprocess import STDOUT, PIPE
|
from subprocess import STDOUT, PIPE
|
||||||
from psutil import Popen
|
from psutil import Popen
|
||||||
from shutil import move, copy
|
from shutil import move
|
||||||
try:
|
|
||||||
from scandir import walk
|
|
||||||
except ImportError:
|
|
||||||
walk = os.walk
|
|
||||||
from . import rarfile
|
from . import rarfile
|
||||||
from .shared import check7ZFile as is_7zfile, saferReplace
|
from .shared import check7ZFile as is_7zfile
|
||||||
|
|
||||||
|
|
||||||
class CBxArchive:
|
class CBxArchive:
|
||||||
@@ -50,12 +45,12 @@ class CBxArchive:
|
|||||||
filelist = []
|
filelist = []
|
||||||
for f in cbzFile.namelist():
|
for f in cbzFile.namelist():
|
||||||
if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('humbs.db'):
|
if f.startswith('__MACOSX') or f.endswith('.DS_Store') or f.endswith('humbs.db'):
|
||||||
pass # skip MacOS special files
|
pass
|
||||||
elif f.endswith('/'):
|
elif f.endswith('/'):
|
||||||
try:
|
try:
|
||||||
os.makedirs(os.path.join(targetdir, f))
|
os.makedirs(os.path.join(targetdir, f))
|
||||||
except Exception:
|
except Exception:
|
||||||
pass # the dir exists so we are going to extract the images only.
|
pass
|
||||||
else:
|
else:
|
||||||
filelist.append(f)
|
filelist.append(f)
|
||||||
cbzFile.extractall(targetdir, filelist)
|
cbzFile.extractall(targetdir, filelist)
|
||||||
@@ -63,24 +58,18 @@ class CBxArchive:
|
|||||||
def extractCBR(self, targetdir):
|
def extractCBR(self, targetdir):
|
||||||
cbrFile = rarfile.RarFile(self.origFileName)
|
cbrFile = rarfile.RarFile(self.origFileName)
|
||||||
cbrFile.extractall(targetdir)
|
cbrFile.extractall(targetdir)
|
||||||
for root, dirnames, filenames in walk(targetdir):
|
for root, _, filenames in os.walk(targetdir):
|
||||||
for filename in filenames:
|
for filename in filenames:
|
||||||
if filename.startswith('__MACOSX') or filename.endswith('.DS_Store') or filename.endswith('humbs.db'):
|
if filename.startswith('__MACOSX') or filename.endswith('.DS_Store') or filename.endswith('humbs.db'):
|
||||||
os.remove(os.path.join(root, filename))
|
os.remove(os.path.join(root, filename))
|
||||||
|
|
||||||
def extractCB7(self, targetdir):
|
def extractCB7(self, targetdir):
|
||||||
# Workaround for some wide UTF-8 + Popen abnormalities
|
|
||||||
if sys.platform.startswith('darwin'):
|
|
||||||
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 -xr!Thumbs.db -o"' +
|
output = Popen('7za x "' + self.origFileName + '" -xr!__MACOSX -xr!.DS_Store -xr!thumbs.db -xr!Thumbs.db -o"' +
|
||||||
targetdir + '"', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
|
targetdir + '"', stdout=PIPE, stderr=STDOUT, stdin=PIPE, shell=True)
|
||||||
extracted = False
|
extracted = False
|
||||||
for line in output.stdout:
|
for line in output.stdout:
|
||||||
if b"Everything is Ok" in line:
|
if b"Everything is Ok" in line:
|
||||||
extracted = True
|
extracted = True
|
||||||
if sys.platform.startswith('darwin'):
|
|
||||||
os.remove(self.origFileName)
|
|
||||||
if not extracted:
|
if not extracted:
|
||||||
raise OSError
|
raise OSError
|
||||||
|
|
||||||
@@ -96,10 +85,6 @@ class CBxArchive:
|
|||||||
adir.remove('ComicInfo.xml')
|
adir.remove('ComicInfo.xml')
|
||||||
if len(adir) == 1 and os.path.isdir(os.path.join(targetdir, adir[0])):
|
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])):
|
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)):
|
|
||||||
saferReplace(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)
|
move(os.path.join(targetdir, adir[0], f), targetdir)
|
||||||
os.rmdir(os.path.join(targetdir, adir[0]))
|
os.rmdir(os.path.join(targetdir, adir[0]))
|
||||||
return targetdir
|
return targetdir
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -36,17 +36,13 @@ from uuid import uuid4
|
|||||||
from slugify import slugify as slugifyExt
|
from slugify import slugify as slugifyExt
|
||||||
from PIL import Image
|
from PIL import Image
|
||||||
from subprocess import STDOUT, PIPE
|
from subprocess import STDOUT, PIPE
|
||||||
from psutil import Popen, virtual_memory
|
from psutil import Popen, virtual_memory, disk_usage
|
||||||
from html import escape
|
from html import escape
|
||||||
try:
|
try:
|
||||||
from PyQt5 import QtCore
|
from PyQt5 import QtCore
|
||||||
except ImportError:
|
except ImportError:
|
||||||
QtCore = None
|
QtCore = None
|
||||||
try:
|
from .shared import md5Checksum, getImageFileName, walkSort, walkLevel, sanitizeTrace
|
||||||
from scandir import walk
|
|
||||||
except ImportError:
|
|
||||||
walk = os.walk
|
|
||||||
from .shared import md5Checksum, getImageFileName, walkSort, walkLevel, saferReplace, saferRemove
|
|
||||||
from . import comic2panel
|
from . import comic2panel
|
||||||
from . import image
|
from . import image
|
||||||
from . import cbxarchive
|
from . import cbxarchive
|
||||||
@@ -64,7 +60,10 @@ def main(argv=None):
|
|||||||
if len(args) == 0:
|
if len(args) == 0:
|
||||||
parser.print_help()
|
parser.print_help()
|
||||||
return 0
|
return 0
|
||||||
sources = set([source for arg in args for source in glob(arg)])
|
if sys.platform.startswith('win'):
|
||||||
|
sources = set([source for arg in args for source in glob(arg)])
|
||||||
|
else:
|
||||||
|
sources = set(args)
|
||||||
if len(sources) == 0:
|
if len(sources) == 0:
|
||||||
print('No matching files found.')
|
print('No matching files found.')
|
||||||
return 1
|
return 1
|
||||||
@@ -82,18 +81,15 @@ def buildHTML(path, imgfile, imgfilepath):
|
|||||||
imgfilepath = md5Checksum(imgfilepath)
|
imgfilepath = md5Checksum(imgfilepath)
|
||||||
filename = getImageFileName(imgfile)
|
filename = getImageFileName(imgfile)
|
||||||
deviceres = options.profileData[1]
|
deviceres = options.profileData[1]
|
||||||
if "Rotated" in options.imgIndex[imgfilepath]:
|
if "Rotated" in options.imgMetadata[imgfilepath]:
|
||||||
rotatedPage = True
|
rotatedPage = True
|
||||||
else:
|
else:
|
||||||
rotatedPage = False
|
rotatedPage = False
|
||||||
if "BlackFill" in options.imgIndex[imgfilepath]:
|
if "BlackBackground" in options.imgMetadata[imgfilepath]:
|
||||||
additionalStyle = 'background-color:#000000;'
|
additionalStyle = 'background-color:#000000;'
|
||||||
else:
|
else:
|
||||||
additionalStyle = 'background-color:#FFFFFF;'
|
additionalStyle = 'background-color:#FFFFFF;'
|
||||||
htmlpath = ''
|
|
||||||
postfix = ''
|
postfix = ''
|
||||||
size = ''
|
|
||||||
imgfilepv = ''
|
|
||||||
backref = 1
|
backref = 1
|
||||||
head = path
|
head = path
|
||||||
while True:
|
while True:
|
||||||
@@ -106,6 +102,11 @@ def buildHTML(path, imgfile, imgfilepath):
|
|||||||
if not os.path.exists(htmlpath):
|
if not os.path.exists(htmlpath):
|
||||||
os.makedirs(htmlpath)
|
os.makedirs(htmlpath)
|
||||||
htmlfile = os.path.join(htmlpath, filename[0] + '.xhtml')
|
htmlfile = os.path.join(htmlpath, filename[0] + '.xhtml')
|
||||||
|
imgsize = Image.open(os.path.join(head, "Images", postfix, imgfile)).size
|
||||||
|
if options.hq:
|
||||||
|
imgsizeframe = deviceres
|
||||||
|
else:
|
||||||
|
imgsizeframe = imgsize
|
||||||
f = open(htmlfile, "w", encoding='UTF-8')
|
f = open(htmlfile, "w", encoding='UTF-8')
|
||||||
f.writelines(["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
|
f.writelines(["<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n",
|
||||||
"<!DOCTYPE html>\n",
|
"<!DOCTYPE html>\n",
|
||||||
@@ -114,26 +115,25 @@ def buildHTML(path, imgfile, imgfilepath):
|
|||||||
"<title>", escape(filename[0]), "</title>\n",
|
"<title>", escape(filename[0]), "</title>\n",
|
||||||
"<link href=\"", "../" * (backref - 1), "style.css\" type=\"text/css\" rel=\"stylesheet\"/>\n",
|
"<link href=\"", "../" * (backref - 1), "style.css\" type=\"text/css\" rel=\"stylesheet\"/>\n",
|
||||||
"<meta name=\"viewport\" "
|
"<meta name=\"viewport\" "
|
||||||
"content=\"width=" + str(deviceres[0]) + ", height=" + str(deviceres[1]) + "\"/>\n"
|
"content=\"width=" + str(imgsize[0]) + ", height=" + str(imgsize[1]) + "\"/>\n"
|
||||||
"</head>\n",
|
"</head>\n",
|
||||||
"<body style=\"background-image: ",
|
"<body style=\"" + additionalStyle + "\">\n",
|
||||||
"url('", "../" * backref, "Images/", postfix, imgfile, "'); " + additionalStyle + "\">\n"])
|
"<div style=\"text-align:center;top:" + getTopMargin(deviceres, imgsize) + "%;\">\n",
|
||||||
|
"<img width=\"" + str(imgsizeframe[0]) + "\" height=\"" + str(imgsizeframe[1]) + "\" ",
|
||||||
|
"src=\"", "../" * backref, "Images/", postfix, imgfile, "\"/>\n</div>\n"])
|
||||||
if options.iskindle and options.panelview:
|
if options.iskindle and options.panelview:
|
||||||
if options.hqmode:
|
if options.autoscale:
|
||||||
imgfilepv = list(os.path.splitext(imgfile))
|
size = (getPanelViewResolution(imgsize, deviceres))
|
||||||
imgfilepv[0] += "-hq"
|
else:
|
||||||
imgfilepv = "".join(imgfilepv)
|
if options.hq:
|
||||||
if os.path.isfile(os.path.join(head, "Images", postfix, imgfilepv)):
|
size = imgsize
|
||||||
size = Image.open(os.path.join(head, "Images", postfix, imgfilepv)).size
|
else:
|
||||||
if not options.hqmode or not size:
|
size = (int(imgsize[0] * 1.5), int(imgsize[1] * 1.5))
|
||||||
imgfilepv = imgfile
|
if size[0] - deviceres[0] < deviceres[0] * 0.01:
|
||||||
sizeTmp = Image.open(os.path.join(head, "Images", postfix, imgfilepv)).size
|
|
||||||
size = (int(sizeTmp[0] * 1.5), int(sizeTmp[1] * 1.5))
|
|
||||||
if size[0] <= deviceres[0]:
|
|
||||||
noHorizontalPV = True
|
noHorizontalPV = True
|
||||||
else:
|
else:
|
||||||
noHorizontalPV = False
|
noHorizontalPV = False
|
||||||
if size[1] <= deviceres[1]:
|
if size[1] - deviceres[1] < deviceres[1] * 0.01:
|
||||||
noVerticalPV = True
|
noVerticalPV = True
|
||||||
else:
|
else:
|
||||||
noVerticalPV = False
|
noVerticalPV = False
|
||||||
@@ -190,7 +190,7 @@ def buildHTML(path, imgfile, imgfilepath):
|
|||||||
for box in boxes:
|
for box in boxes:
|
||||||
f.writelines(["<div class=\"PV-P\" id=\"" + box + "-P\" style=\"" + additionalStyle + "\">\n",
|
f.writelines(["<div class=\"PV-P\" id=\"" + box + "-P\" style=\"" + additionalStyle + "\">\n",
|
||||||
"<img style=\"" + boxStyles[box] + "\" src=\"", "../" * backref, "Images/", postfix,
|
"<img style=\"" + boxStyles[box] + "\" src=\"", "../" * backref, "Images/", postfix,
|
||||||
imgfilepv, "\" width=\"" + str(size[0]) + "\" height=\"" + str(size[1]) + "\"/>\n",
|
imgfile, "\" width=\"" + str(size[0]) + "\" height=\"" + str(size[1]) + "\"/>\n",
|
||||||
"</div>\n"])
|
"</div>\n"])
|
||||||
f.writelines(["</body>\n",
|
f.writelines(["</body>\n",
|
||||||
"</html>\n"])
|
"</html>\n"])
|
||||||
@@ -333,29 +333,6 @@ def buildOPF(dstdir, title, filelist, cover=None):
|
|||||||
f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n")
|
f.write("</manifest>\n<spine page-progression-direction=\"rtl\" toc=\"ncx\">\n")
|
||||||
else:
|
else:
|
||||||
f.write("</manifest>\n<spine page-progression-direction=\"ltr\" toc=\"ncx\">\n")
|
f.write("</manifest>\n<spine page-progression-direction=\"ltr\" toc=\"ncx\">\n")
|
||||||
# if options.iskindle and options.profile != 'Custom':
|
|
||||||
# if options.righttoleft:
|
|
||||||
# nextflow = 'right'
|
|
||||||
# else:
|
|
||||||
# nextflow = 'left'
|
|
||||||
# for entry in reflist:
|
|
||||||
# if '-kcc-b' in entry:
|
|
||||||
# if options.righttoleft:
|
|
||||||
# f.write("<itemref idref=\"page_" + entry + "\" properties=\"page-spread-right\"/>\n")
|
|
||||||
# else:
|
|
||||||
# f.write("<itemref idref=\"page_" + entry + "\" properties=\"page-spread-left\"/>\n")
|
|
||||||
# elif '-kcc-c' in entry:
|
|
||||||
# if options.righttoleft:
|
|
||||||
# f.write("<itemref idref=\"page_" + entry + "\" properties=\"page-spread-left\"/>\n")
|
|
||||||
# else:
|
|
||||||
# f.write("<itemref idref=\"page_" + entry + "\" properties=\"page-spread-right\"/>\n")
|
|
||||||
# else:
|
|
||||||
# f.write("<itemref idref=\"page_" + entry + "\" properties=\"facing-page-" + nextflow + "\"/>\n")
|
|
||||||
# if nextflow == 'right':
|
|
||||||
# nextflow = 'left'
|
|
||||||
# else:
|
|
||||||
# nextflow = 'right'
|
|
||||||
# else:
|
|
||||||
for entry in reflist:
|
for entry in reflist:
|
||||||
f.write("<itemref idref=\"page_" + entry + "\"/>\n")
|
f.write("<itemref idref=\"page_" + entry + "\"/>\n")
|
||||||
f.write("</spine>\n</package>\n")
|
f.write("</spine>\n</package>\n")
|
||||||
@@ -384,9 +361,6 @@ def buildEPUB(path, chapterNames, tomeNumber):
|
|||||||
"display: block;\n",
|
"display: block;\n",
|
||||||
"margin: 0;\n",
|
"margin: 0;\n",
|
||||||
"padding: 0;\n",
|
"padding: 0;\n",
|
||||||
"background-position: center center;\n",
|
|
||||||
"background-repeat: no-repeat;\n",
|
|
||||||
"background-size: auto auto;\n",
|
|
||||||
"}\n",
|
"}\n",
|
||||||
"#PV {\n",
|
"#PV {\n",
|
||||||
"position: absolute;\n",
|
"position: absolute;\n",
|
||||||
@@ -453,21 +427,19 @@ def buildEPUB(path, chapterNames, tomeNumber):
|
|||||||
"display: none;\n",
|
"display: none;\n",
|
||||||
"}\n"])
|
"}\n"])
|
||||||
f.close()
|
f.close()
|
||||||
for (dirpath, dirnames, filenames) in walk(os.path.join(path, 'OEBPS', 'Images')):
|
for dirpath, dirnames, filenames in os.walk(os.path.join(path, 'OEBPS', 'Images')):
|
||||||
chapter = False
|
chapter = False
|
||||||
dirnames, filenames = walkSort(dirnames, filenames)
|
dirnames, filenames = walkSort(dirnames, filenames)
|
||||||
for afile in filenames:
|
for afile in filenames:
|
||||||
filename = getImageFileName(afile)
|
filelist.append(buildHTML(dirpath, afile, os.path.join(dirpath, afile)))
|
||||||
if not filename[0].endswith('-hq'):
|
if not chapter:
|
||||||
filelist.append(buildHTML(dirpath, afile, os.path.join(dirpath, afile)))
|
chapterlist.append((dirpath.replace('Images', 'Text'), filelist[-1][1]))
|
||||||
if not chapter:
|
chapter = True
|
||||||
chapterlist.append((dirpath.replace('Images', 'Text'), filelist[-1][1]))
|
if cover is None:
|
||||||
chapter = True
|
cover = os.path.join(os.path.join(path, 'OEBPS', 'Images'),
|
||||||
if cover is None:
|
'cover' + getImageFileName(filelist[-1][1])[1])
|
||||||
cover = os.path.join(os.path.join(path, 'OEBPS', 'Images'),
|
options.covers.append((image.Cover(os.path.join(filelist[-1][0], filelist[-1][1]), cover, options,
|
||||||
'cover' + getImageFileName(filelist[-1][1])[1])
|
tomeNumber), options.uuid))
|
||||||
options.covers.append((image.Cover(os.path.join(filelist[-1][0], filelist[-1][1]), cover, options,
|
|
||||||
tomeNumber), options.uuid))
|
|
||||||
# Overwrite chapternames if tree is flat and ComicInfo.xml has bookmarks
|
# Overwrite chapternames if tree is flat and ComicInfo.xml has bookmarks
|
||||||
if not chapterNames and options.chapters:
|
if not chapterNames and options.chapters:
|
||||||
chapterlist = []
|
chapterlist = []
|
||||||
@@ -490,13 +462,13 @@ def buildEPUB(path, chapterNames, tomeNumber):
|
|||||||
|
|
||||||
def imgDirectoryProcessing(path):
|
def imgDirectoryProcessing(path):
|
||||||
global workerPool, workerOutput
|
global workerPool, workerOutput
|
||||||
workerPool = Pool()
|
workerPool = Pool(maxtasksperchild=100)
|
||||||
workerOutput = []
|
workerOutput = []
|
||||||
options.imgIndex = {}
|
options.imgMetadata = {}
|
||||||
options.imgPurgeIndex = []
|
options.imgOld = []
|
||||||
work = []
|
work = []
|
||||||
pagenumber = 0
|
pagenumber = 0
|
||||||
for (dirpath, dirnames, filenames) in walk(path):
|
for dirpath, _, filenames in os.walk(path):
|
||||||
for afile in filenames:
|
for afile in filenames:
|
||||||
pagenumber += 1
|
pagenumber += 1
|
||||||
work.append([afile, dirpath, options])
|
work.append([afile, dirpath, options])
|
||||||
@@ -512,24 +484,24 @@ def imgDirectoryProcessing(path):
|
|||||||
raise UserWarning("Conversion interrupted.")
|
raise UserWarning("Conversion interrupted.")
|
||||||
if len(workerOutput) > 0:
|
if len(workerOutput) > 0:
|
||||||
rmtree(os.path.join(path, '..', '..'), True)
|
rmtree(os.path.join(path, '..', '..'), True)
|
||||||
raise RuntimeError("One of workers crashed. Cause: " + workerOutput[0])
|
raise RuntimeError("One of workers crashed. Cause: " + workerOutput[0][0], workerOutput[0][1])
|
||||||
for file in options.imgPurgeIndex:
|
for file in options.imgOld:
|
||||||
if os.path.isfile(file):
|
if os.path.isfile(file):
|
||||||
saferRemove(file)
|
os.remove(file)
|
||||||
else:
|
else:
|
||||||
rmtree(os.path.join(path, '..', '..'), True)
|
rmtree(os.path.join(path, '..', '..'), True)
|
||||||
raise UserWarning("Source directory is empty.")
|
raise UserWarning("Source directory is empty.")
|
||||||
|
|
||||||
|
|
||||||
def imgFileProcessingTick(output):
|
def imgFileProcessingTick(output):
|
||||||
if isinstance(output, str):
|
if isinstance(output, tuple):
|
||||||
workerOutput.append(output)
|
workerOutput.append(output)
|
||||||
workerPool.terminate()
|
workerPool.terminate()
|
||||||
else:
|
else:
|
||||||
for page in output:
|
for page in output:
|
||||||
if page is not None:
|
if page is not None:
|
||||||
options.imgIndex[page[0]] = page[1]
|
options.imgMetadata[page[0]] = page[1]
|
||||||
options.imgPurgeIndex.append(page[2])
|
options.imgOld.append(page[2])
|
||||||
if GUI:
|
if GUI:
|
||||||
GUI.progressBarTick.emit('tick')
|
GUI.progressBarTick.emit('tick')
|
||||||
if not GUI.conversionAlive:
|
if not GUI.conversionAlive:
|
||||||
@@ -544,11 +516,11 @@ def imgFileProcessing(work):
|
|||||||
output = []
|
output = []
|
||||||
workImg = image.ComicPageParser((dirpath, afile), opt)
|
workImg = image.ComicPageParser((dirpath, afile), opt)
|
||||||
for i in workImg.payload:
|
for i in workImg.payload:
|
||||||
img = image.ComicPage(i[0], i[1], i[2], i[3], i[4], opt)
|
img = image.ComicPage(opt, *i)
|
||||||
if not opt.webtoon:
|
if opt.cropping == 2 and not opt.webtoon:
|
||||||
img.cropWhiteSpace()
|
img.cropPageNumber(opt.croppingp)
|
||||||
if opt.cutpagenumbers and not opt.webtoon:
|
if opt.cropping > 0 and not opt.webtoon:
|
||||||
img.cutPageNumber()
|
img.cropMargin(opt.croppingp)
|
||||||
img.autocontrastImage()
|
img.autocontrastImage()
|
||||||
img.resizeImage()
|
img.resizeImage()
|
||||||
if opt.forcepng and not opt.forcecolor:
|
if opt.forcepng and not opt.forcecolor:
|
||||||
@@ -556,11 +528,13 @@ def imgFileProcessing(work):
|
|||||||
output.append(img.saveToDir())
|
output.append(img.saveToDir())
|
||||||
return output
|
return output
|
||||||
except Exception:
|
except Exception:
|
||||||
return str(sys.exc_info()[1])
|
return str(sys.exc_info()[1]), sanitizeTrace(sys.exc_info()[2])
|
||||||
|
|
||||||
|
|
||||||
def getWorkFolder(afile):
|
def getWorkFolder(afile):
|
||||||
if os.path.isdir(afile):
|
if os.path.isdir(afile):
|
||||||
|
if disk_usage(gettempdir())[2] < getDirectorySize(afile) * 2.5:
|
||||||
|
raise UserWarning("Not enough disk space to perform conversion.")
|
||||||
workdir = mkdtemp('', 'KCC-')
|
workdir = mkdtemp('', 'KCC-')
|
||||||
try:
|
try:
|
||||||
os.rmdir(workdir)
|
os.rmdir(workdir)
|
||||||
@@ -571,26 +545,30 @@ def getWorkFolder(afile):
|
|||||||
except:
|
except:
|
||||||
rmtree(workdir, True)
|
rmtree(workdir, True)
|
||||||
raise UserWarning("Failed to prepare a workspace.")
|
raise UserWarning("Failed to prepare a workspace.")
|
||||||
elif os.path.isfile(afile) and afile.lower().endswith('.pdf'):
|
|
||||||
pdf = pdfjpgextract.PdfJpgExtract(afile)
|
|
||||||
path, njpg = pdf.extract()
|
|
||||||
if njpg == 0:
|
|
||||||
rmtree(path, True)
|
|
||||||
raise UserWarning("Failed to extract images from PDF file.")
|
|
||||||
elif os.path.isfile(afile):
|
elif os.path.isfile(afile):
|
||||||
workdir = mkdtemp('', 'KCC-')
|
if disk_usage(gettempdir())[2] < os.path.getsize(afile) * 2.5:
|
||||||
cbx = cbxarchive.CBxArchive(afile)
|
raise UserWarning("Not enough disk space to perform conversion.")
|
||||||
if cbx.isCbxFile():
|
if afile.lower().endswith('.pdf'):
|
||||||
try:
|
pdf = pdfjpgextract.PdfJpgExtract(afile)
|
||||||
path = cbx.extract(workdir)
|
path, njpg = pdf.extract()
|
||||||
except:
|
if njpg == 0:
|
||||||
rmtree(workdir, True)
|
rmtree(path, True)
|
||||||
raise UserWarning("Failed to extract archive.")
|
raise UserWarning("Failed to extract images from PDF file.")
|
||||||
else:
|
else:
|
||||||
rmtree(workdir, True)
|
workdir = mkdtemp('', 'KCC-')
|
||||||
raise UserWarning("Failed to detect archive format.")
|
cbx = cbxarchive.CBxArchive(afile)
|
||||||
|
if cbx.isCbxFile():
|
||||||
|
try:
|
||||||
|
path = cbx.extract(workdir)
|
||||||
|
except:
|
||||||
|
rmtree(workdir, True)
|
||||||
|
raise UserWarning("Failed to extract archive.")
|
||||||
|
else:
|
||||||
|
rmtree(workdir, True)
|
||||||
|
raise UserWarning("Failed to detect archive format.")
|
||||||
else:
|
else:
|
||||||
raise UserWarning("Failed to open source file/directory.")
|
raise UserWarning("Failed to open source file/directory.")
|
||||||
|
sanitizePermissions(path)
|
||||||
newpath = mkdtemp('', 'KCC-')
|
newpath = mkdtemp('', 'KCC-')
|
||||||
copytree(path, os.path.join(newpath, 'OEBPS', 'Images'))
|
copytree(path, os.path.join(newpath, 'OEBPS', 'Images'))
|
||||||
rmtree(path, True)
|
rmtree(path, True)
|
||||||
@@ -656,9 +634,9 @@ def getComicInfo(path, originalPath):
|
|||||||
if xml.data['Series']:
|
if xml.data['Series']:
|
||||||
options.title = escape(xml.data['Series'])
|
options.title = escape(xml.data['Series'])
|
||||||
if xml.data['Volume']:
|
if xml.data['Volume']:
|
||||||
titleSuffix += ' V' + xml.data['Volume']
|
titleSuffix += ' V' + xml.data['Volume'].zfill(2)
|
||||||
if xml.data['Number']:
|
if xml.data['Number']:
|
||||||
titleSuffix += ' #' + xml.data['Number']
|
titleSuffix += ' #' + xml.data['Number'].zfill(3)
|
||||||
options.title += titleSuffix
|
options.title += titleSuffix
|
||||||
for field in ['Writers', 'Pencillers', 'Inkers', 'Colorists']:
|
for field in ['Writers', 'Pencillers', 'Inkers', 'Colorists']:
|
||||||
for person in xml.data[field]:
|
for person in xml.data[field]:
|
||||||
@@ -693,13 +671,23 @@ def getCoversFromMCB(mangaID):
|
|||||||
|
|
||||||
def getDirectorySize(start_path='.'):
|
def getDirectorySize(start_path='.'):
|
||||||
total_size = 0
|
total_size = 0
|
||||||
for dirpath, dirnames, filenames in walk(start_path):
|
for dirpath, _, filenames in os.walk(start_path):
|
||||||
for f in filenames:
|
for f in filenames:
|
||||||
fp = os.path.join(dirpath, f)
|
fp = os.path.join(dirpath, f)
|
||||||
total_size += os.path.getsize(fp)
|
total_size += os.path.getsize(fp)
|
||||||
return total_size
|
return total_size
|
||||||
|
|
||||||
|
|
||||||
|
def getTopMargin(deviceres, size):
|
||||||
|
y = int((deviceres[1] - size[1]) / 2) / deviceres[1] * 100
|
||||||
|
return str(round(y, 1))
|
||||||
|
|
||||||
|
|
||||||
|
def getPanelViewResolution(imageSize, deviceRes):
|
||||||
|
scale = float(deviceRes[0]) / float(imageSize[0])
|
||||||
|
return int(deviceRes[0]), int(scale * imageSize[1])
|
||||||
|
|
||||||
|
|
||||||
def getPanelViewSize(deviceres, size):
|
def getPanelViewSize(deviceres, size):
|
||||||
x = int(deviceres[0] / 2 - size[0] / 2) / deviceres[0] * 100
|
x = int(deviceres[0] / 2 - size[0] / 2) / deviceres[0] * 100
|
||||||
y = int(deviceres[1] / 2 - size[1] / 2) / deviceres[1] * 100
|
y = int(deviceres[1] / 2 - size[1] / 2) / deviceres[1] * 100
|
||||||
@@ -708,7 +696,7 @@ def getPanelViewSize(deviceres, size):
|
|||||||
|
|
||||||
def sanitizeTree(filetree):
|
def sanitizeTree(filetree):
|
||||||
chapterNames = {}
|
chapterNames = {}
|
||||||
for root, dirs, files in walk(filetree, False):
|
for root, dirs, files in os.walk(filetree, False):
|
||||||
for name in files:
|
for name in files:
|
||||||
splitname = os.path.splitext(name)
|
splitname = os.path.splitext(name)
|
||||||
slugified = slugify(splitname[0])
|
slugified = slugify(splitname[0])
|
||||||
@@ -718,7 +706,7 @@ def sanitizeTree(filetree):
|
|||||||
newKey = os.path.join(root, slugified + splitname[1])
|
newKey = os.path.join(root, slugified + splitname[1])
|
||||||
key = os.path.join(root, name)
|
key = os.path.join(root, name)
|
||||||
if key != newKey:
|
if key != newKey:
|
||||||
saferReplace(key, newKey)
|
os.replace(key, newKey)
|
||||||
for name in dirs:
|
for name in dirs:
|
||||||
tmpName = name
|
tmpName = name
|
||||||
slugified = slugify(name)
|
slugified = slugify(name)
|
||||||
@@ -728,13 +716,13 @@ def sanitizeTree(filetree):
|
|||||||
newKey = os.path.join(root, slugified)
|
newKey = os.path.join(root, slugified)
|
||||||
key = os.path.join(root, name)
|
key = os.path.join(root, name)
|
||||||
if key != newKey:
|
if key != newKey:
|
||||||
saferReplace(key, newKey)
|
os.replace(key, newKey)
|
||||||
return chapterNames
|
return chapterNames
|
||||||
|
|
||||||
|
|
||||||
def sanitizeTreeKobo(filetree):
|
def sanitizeTreeKobo(filetree):
|
||||||
pageNumber = 0
|
pageNumber = 0
|
||||||
for root, dirs, files in walk(filetree):
|
for root, dirs, files in os.walk(filetree):
|
||||||
dirs, files = walkSort(dirs, files)
|
dirs, files = walkSort(dirs, files)
|
||||||
for name in files:
|
for name in files:
|
||||||
splitname = os.path.splitext(name)
|
splitname = os.path.splitext(name)
|
||||||
@@ -746,74 +734,36 @@ def sanitizeTreeKobo(filetree):
|
|||||||
newKey = os.path.join(root, slugified + splitname[1])
|
newKey = os.path.join(root, slugified + splitname[1])
|
||||||
key = os.path.join(root, name)
|
key = os.path.join(root, name)
|
||||||
if key != newKey:
|
if key != newKey:
|
||||||
saferReplace(key, newKey)
|
os.replace(key, newKey)
|
||||||
|
|
||||||
|
|
||||||
def sanitizePermissions(filetree):
|
def sanitizePermissions(filetree):
|
||||||
for root, dirs, files in walk(filetree, False):
|
for root, dirs, files in os.walk(filetree, False):
|
||||||
for name in files:
|
for name in files:
|
||||||
os.chmod(os.path.join(root, name), S_IWRITE | S_IREAD)
|
os.chmod(os.path.join(root, name), S_IWRITE | S_IREAD)
|
||||||
for name in dirs:
|
for name in dirs:
|
||||||
os.chmod(os.path.join(root, name), S_IWRITE | S_IREAD | S_IEXEC)
|
os.chmod(os.path.join(root, name), S_IWRITE | S_IREAD | S_IEXEC)
|
||||||
|
|
||||||
|
|
||||||
# noinspection PyUnboundLocalVariable
|
|
||||||
def splitDirectory(path):
|
def splitDirectory(path):
|
||||||
# Detect directory stucture
|
level = -1
|
||||||
for root, dirs, files in walkLevel(os.path.join(path, 'OEBPS', 'Images'), 0):
|
for root, _, files in os.walk(os.path.join(path, 'OEBPS', 'Images')):
|
||||||
subdirectoryNumber = len(dirs)
|
for f in files:
|
||||||
filesNumber = len(files)
|
if f.endswith('.jpg') or f.endswith('.jpeg') or f.endswith('.png') or f.endswith('.gif'):
|
||||||
if subdirectoryNumber == 0:
|
newLevel = os.path.join(root, f).replace(os.path.join(path, 'OEBPS', 'Images'), '').count(os.sep)
|
||||||
# No subdirectories
|
if level != -1 and level != newLevel:
|
||||||
mode = 0
|
level = 0
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
level = newLevel
|
||||||
|
if level > 0:
|
||||||
|
splitter = splitProcess(os.path.join(path, 'OEBPS', 'Images'), level)
|
||||||
|
path = [path]
|
||||||
|
for tome in splitter:
|
||||||
|
path.append(tome)
|
||||||
|
return path
|
||||||
else:
|
else:
|
||||||
if filesNumber > 0:
|
raise UserWarning('Unsupported directory structure.')
|
||||||
print('WARNING: Automatic output splitting failed.')
|
|
||||||
if GUI:
|
|
||||||
GUI.addMessage.emit('Automatic output splitting failed. <a href='
|
|
||||||
'"https://github.com/ciromattia/kcc/wiki'
|
|
||||||
'/Automatic-output-splitting">'
|
|
||||||
'More details.</a>', 'warning', False)
|
|
||||||
GUI.addMessage.emit('', '', False)
|
|
||||||
return [path]
|
|
||||||
detectedSubSubdirectories = False
|
|
||||||
detectedFilesInSubdirectories = False
|
|
||||||
for root, dirs, files in walkLevel(os.path.join(path, 'OEBPS', 'Images'), 1):
|
|
||||||
if root != os.path.join(path, 'OEBPS', 'Images'):
|
|
||||||
if len(dirs) != 0:
|
|
||||||
detectedSubSubdirectories = True
|
|
||||||
elif len(dirs) == 0 and detectedSubSubdirectories:
|
|
||||||
print('WARNING: Automatic output splitting failed.')
|
|
||||||
if GUI:
|
|
||||||
GUI.addMessage.emit('Automatic output splitting failed. <a href='
|
|
||||||
'"https://github.com/ciromattia/kcc/wiki'
|
|
||||||
'/Automatic-output-splitting">'
|
|
||||||
'More details.</a>', 'warning', False)
|
|
||||||
GUI.addMessage.emit('', '', False)
|
|
||||||
return [path]
|
|
||||||
if len(files) != 0:
|
|
||||||
detectedFilesInSubdirectories = True
|
|
||||||
if detectedSubSubdirectories:
|
|
||||||
# Two levels of subdirectories
|
|
||||||
mode = 2
|
|
||||||
else:
|
|
||||||
# One level of subdirectories
|
|
||||||
mode = 1
|
|
||||||
if detectedFilesInSubdirectories and detectedSubSubdirectories:
|
|
||||||
print('WARNING: Automatic output splitting failed.')
|
|
||||||
if GUI:
|
|
||||||
GUI.addMessage.emit('Automatic output splitting failed. <a href='
|
|
||||||
'"https://github.com/ciromattia/kcc/wiki'
|
|
||||||
'/Automatic-output-splitting">'
|
|
||||||
'More details.</a>', 'warning', False)
|
|
||||||
GUI.addMessage.emit('', '', False)
|
|
||||||
return [path]
|
|
||||||
# Split directories
|
|
||||||
splitter = splitProcess(os.path.join(path, 'OEBPS', 'Images'), mode)
|
|
||||||
path = [path]
|
|
||||||
for tome in splitter:
|
|
||||||
path.append(tome)
|
|
||||||
return path
|
|
||||||
|
|
||||||
|
|
||||||
def splitProcess(path, mode):
|
def splitProcess(path, mode):
|
||||||
@@ -824,10 +774,15 @@ def splitProcess(path, mode):
|
|||||||
targetSize = 104857600
|
targetSize = 104857600
|
||||||
else:
|
else:
|
||||||
targetSize = 419430400
|
targetSize = 419430400
|
||||||
if mode == 0:
|
if options.batchsplit == 2 and mode == 2:
|
||||||
|
mode = 3
|
||||||
|
if mode < 3:
|
||||||
for root, dirs, files in walkLevel(path, 0):
|
for root, dirs, files in walkLevel(path, 0):
|
||||||
for name in files:
|
for name in files if mode == 1 else dirs:
|
||||||
size = os.path.getsize(os.path.join(root, name))
|
if mode == 1:
|
||||||
|
size = os.path.getsize(os.path.join(root, name))
|
||||||
|
else:
|
||||||
|
size = getDirectorySize(os.path.join(root, name))
|
||||||
if currentSize + size > targetSize:
|
if currentSize + size > targetSize:
|
||||||
currentTarget, pathRoot = createNewTome()
|
currentTarget, pathRoot = createNewTome()
|
||||||
output.append(pathRoot)
|
output.append(pathRoot)
|
||||||
@@ -836,57 +791,28 @@ def splitProcess(path, mode):
|
|||||||
currentSize += size
|
currentSize += size
|
||||||
if path != currentTarget:
|
if path != currentTarget:
|
||||||
move(os.path.join(root, name), os.path.join(currentTarget, name))
|
move(os.path.join(root, name), os.path.join(currentTarget, name))
|
||||||
elif mode == 1:
|
else:
|
||||||
for root, dirs, files in walkLevel(path, 0):
|
|
||||||
for name in dirs:
|
|
||||||
size = getDirectorySize(os.path.join(root, name))
|
|
||||||
if currentSize + size > targetSize:
|
|
||||||
currentTarget, pathRoot = createNewTome()
|
|
||||||
output.append(pathRoot)
|
|
||||||
currentSize = size
|
|
||||||
else:
|
|
||||||
currentSize += size
|
|
||||||
if path != currentTarget:
|
|
||||||
move(os.path.join(root, name), os.path.join(currentTarget, name))
|
|
||||||
elif mode == 2:
|
|
||||||
firstTome = True
|
firstTome = True
|
||||||
for root, dirs, files in walkLevel(path, 0):
|
for root, dirs, _ in walkLevel(path, 0):
|
||||||
for name in dirs:
|
for name in dirs:
|
||||||
size = getDirectorySize(os.path.join(root, name))
|
if not firstTome:
|
||||||
currentSize = 0
|
currentTarget, pathRoot = createNewTome()
|
||||||
if size > targetSize:
|
output.append(pathRoot)
|
||||||
if not firstTome:
|
move(os.path.join(root, name), os.path.join(currentTarget, name))
|
||||||
currentTarget, pathRoot = createNewTome()
|
|
||||||
output.append(pathRoot)
|
|
||||||
else:
|
|
||||||
firstTome = False
|
|
||||||
for rootInside, dirsInside, filesInside in walkLevel(os.path.join(root, name), 0):
|
|
||||||
for nameInside in dirsInside:
|
|
||||||
size = getDirectorySize(os.path.join(rootInside, nameInside))
|
|
||||||
if currentSize + size > targetSize:
|
|
||||||
currentTarget, pathRoot = createNewTome()
|
|
||||||
output.append(pathRoot)
|
|
||||||
currentSize = size
|
|
||||||
else:
|
|
||||||
currentSize += size
|
|
||||||
if path != currentTarget:
|
|
||||||
move(os.path.join(rootInside, nameInside), os.path.join(currentTarget, nameInside))
|
|
||||||
else:
|
else:
|
||||||
if not firstTome:
|
firstTome = False
|
||||||
currentTarget, pathRoot = createNewTome()
|
|
||||||
output.append(pathRoot)
|
|
||||||
move(os.path.join(root, name), os.path.join(currentTarget, name))
|
|
||||||
else:
|
|
||||||
firstTome = False
|
|
||||||
return output
|
return output
|
||||||
|
|
||||||
|
|
||||||
def detectCorruption(tmpPath, orgPath):
|
def detectCorruption(tmpPath, orgPath):
|
||||||
imageNumber = 0
|
imageNumber = 0
|
||||||
imageSmaller = 0
|
imageSmaller = 0
|
||||||
for root, dirs, files in walk(tmpPath, False):
|
alreadyProcessed = False
|
||||||
|
for root, _, files in os.walk(tmpPath, False):
|
||||||
for name in files:
|
for name in files:
|
||||||
if getImageFileName(name) is not None:
|
if getImageFileName(name) is not None:
|
||||||
|
if not alreadyProcessed and getImageFileName(name)[0].endswith('-kcc'):
|
||||||
|
alreadyProcessed = True
|
||||||
path = os.path.join(root, name)
|
path = os.path.join(root, name)
|
||||||
pathOrg = orgPath + path.split('OEBPS' + os.path.sep + 'Images')[1]
|
pathOrg = orgPath + path.split('OEBPS' + os.path.sep + 'Images')[1]
|
||||||
if os.path.getsize(path) == 0:
|
if os.path.getsize(path) == 0:
|
||||||
@@ -907,12 +833,18 @@ def detectCorruption(tmpPath, orgPath):
|
|||||||
else:
|
else:
|
||||||
raise RuntimeError('Image file %s is corrupted.' % pathOrg)
|
raise RuntimeError('Image file %s is corrupted.' % pathOrg)
|
||||||
else:
|
else:
|
||||||
saferRemove(os.path.join(root, name))
|
os.remove(os.path.join(root, name))
|
||||||
|
if alreadyProcessed:
|
||||||
|
print("WARNING: Source files are probably created by KCC. The second conversion will decrease quality.")
|
||||||
|
if GUI:
|
||||||
|
GUI.addMessage.emit('Source files are probably created by KCC. The second conversion will decrease quality.'
|
||||||
|
, 'warning', False)
|
||||||
|
GUI.addMessage.emit('', '', False)
|
||||||
if imageSmaller > imageNumber * 0.25 and not options.upscale and not options.stretch:
|
if imageSmaller > imageNumber * 0.25 and not options.upscale and not options.stretch:
|
||||||
print("WARNING: More than 1/4 of images are smaller than target device resolution. "
|
print("WARNING: More than 25% of images are smaller than target device resolution. "
|
||||||
"Consider enabling stretching or upscaling to improve readability.")
|
"Consider enabling stretching or upscaling to improve readability.")
|
||||||
if GUI:
|
if GUI:
|
||||||
GUI.addMessage.emit('More than 1/4 of images are smaller than target device resolution.', 'warning', False)
|
GUI.addMessage.emit('More than 25% of images are smaller than target device resolution.', 'warning', False)
|
||||||
GUI.addMessage.emit('Consider enabling stretching or upscaling to improve readability.', 'warning', False)
|
GUI.addMessage.emit('Consider enabling stretching or upscaling to improve readability.', 'warning', False)
|
||||||
GUI.addMessage.emit('', '', False)
|
GUI.addMessage.emit('', '', False)
|
||||||
|
|
||||||
@@ -935,7 +867,7 @@ def makeZIP(zipFilename, baseDir, isEPUB=False):
|
|||||||
zipOutput = ZipFile(zipFilename, 'w', ZIP_DEFLATED)
|
zipOutput = ZipFile(zipFilename, 'w', ZIP_DEFLATED)
|
||||||
if isEPUB:
|
if isEPUB:
|
||||||
zipOutput.writestr('mimetype', 'application/epub+zip', ZIP_STORED)
|
zipOutput.writestr('mimetype', 'application/epub+zip', ZIP_STORED)
|
||||||
for dirpath, dirnames, filenames in walk(baseDir):
|
for dirpath, _, filenames in os.walk(baseDir):
|
||||||
for name in filenames:
|
for name in filenames:
|
||||||
path = os.path.normpath(os.path.join(dirpath, name))
|
path = os.path.normpath(os.path.join(dirpath, name))
|
||||||
aPath = os.path.normpath(os.path.join(dirpath.replace(baseDir, ''), name))
|
aPath = os.path.normpath(os.path.join(dirpath.replace(baseDir, ''), name))
|
||||||
@@ -955,10 +887,14 @@ def makeParser():
|
|||||||
otherOptions = OptionGroup(psr, "OTHER")
|
otherOptions = OptionGroup(psr, "OTHER")
|
||||||
|
|
||||||
mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV",
|
mainOptions.add_option("-p", "--profile", action="store", dest="profile", default="KV",
|
||||||
help="Device profile (Available options: K1, K2, K345, KDX, KPW, KV, KoMT, KoG, KoGHD,"
|
help="Device profile (Available options: K1, K2, K34, K578, KDX, KPW, KV, KoMT, KoG, KoGHD,"
|
||||||
" KoA, KoAHD, KoAH2O) [Default=KV]")
|
" KoA, KoAHD, KoAH2O, KoAO) [Default=KV]")
|
||||||
mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
|
mainOptions.add_option("-m", "--manga-style", action="store_true", dest="righttoleft", default=False,
|
||||||
help="Manga style (right-to-left reading and splitting)")
|
help="Manga style (right-to-left reading and splitting)")
|
||||||
|
mainOptions.add_option("-q", "--hq", action="store_true", dest="hq", default=False,
|
||||||
|
help="Try to increase the quality of magnification")
|
||||||
|
mainOptions.add_option("-2", "--two-panel", action="store_true", dest="autoscale", default=False,
|
||||||
|
help="Display two not four panels in Panel View mode")
|
||||||
mainOptions.add_option("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
|
mainOptions.add_option("-w", "--webtoon", action="store_true", dest="webtoon", default=False,
|
||||||
help="Webtoon processing mode"),
|
help="Webtoon processing mode"),
|
||||||
|
|
||||||
@@ -968,8 +904,9 @@ def makeParser():
|
|||||||
help="Comic title [Default=filename or directory name]")
|
help="Comic title [Default=filename or directory name]")
|
||||||
outputOptions.add_option("-f", "--format", action="store", dest="format", default="Auto",
|
outputOptions.add_option("-f", "--format", action="store", dest="format", default="Auto",
|
||||||
help="Output format (Available options: Auto, MOBI, EPUB, CBZ) [Default=Auto]")
|
help="Output format (Available options: Auto, MOBI, EPUB, CBZ) [Default=Auto]")
|
||||||
outputOptions.add_option("-b", "--batchsplit", action="store_true", dest="batchsplit", default=False,
|
outputOptions.add_option("-b", "--batchsplit", type="int", dest="batchsplit", default="0",
|
||||||
help="Split output into multiple files"),
|
help="Split output into multiple files. 0: Don't split 1: Automatic mode "
|
||||||
|
"2: Consider every subdirectory as separate volume [Default=0]")
|
||||||
|
|
||||||
processingOptions.add_option("-u", "--upscale", action="store_true", dest="upscale", default=False,
|
processingOptions.add_option("-u", "--upscale", action="store_true", dest="upscale", default=False,
|
||||||
help="Resize images smaller than device's resolution")
|
help="Resize images smaller than device's resolution")
|
||||||
@@ -979,8 +916,10 @@ def makeParser():
|
|||||||
help="Double page parsing mode. 0: Split 1: Rotate 2: Both [Default=0]")
|
help="Double page parsing mode. 0: Split 1: Rotate 2: Both [Default=0]")
|
||||||
processingOptions.add_option("-g", "--gamma", type="float", dest="gamma", default="0.0",
|
processingOptions.add_option("-g", "--gamma", type="float", dest="gamma", default="0.0",
|
||||||
help="Apply gamma correction to linearize the image [Default=Auto]")
|
help="Apply gamma correction to linearize the image [Default=Auto]")
|
||||||
processingOptions.add_option("--hq", action="store_true", dest="hqmode", default=False,
|
processingOptions.add_option("-c", "--cropping", type="int", dest="cropping", default="2",
|
||||||
help="Enable high quality Panel View")
|
help="Set cropping mode. 0: Disabled 1: Margins 2: Margins + page numbers [Default=2]")
|
||||||
|
processingOptions.add_option("--cp", "--croppingpower", type="float", dest="croppingp", default="1.0",
|
||||||
|
help="Set cropping power [Default=1.0]")
|
||||||
processingOptions.add_option("--blackborders", action="store_true", dest="black_borders", default=False,
|
processingOptions.add_option("--blackborders", action="store_true", dest="black_borders", default=False,
|
||||||
help="Disable autodetection and force black borders")
|
help="Disable autodetection and force black borders")
|
||||||
processingOptions.add_option("--whiteborders", action="store_true", dest="white_borders", default=False,
|
processingOptions.add_option("--whiteborders", action="store_true", dest="white_borders", default=False,
|
||||||
@@ -989,8 +928,6 @@ def makeParser():
|
|||||||
help="Don't convert images to grayscale")
|
help="Don't convert images to grayscale")
|
||||||
processingOptions.add_option("--forcepng", action="store_true", dest="forcepng", default=False,
|
processingOptions.add_option("--forcepng", action="store_true", dest="forcepng", default=False,
|
||||||
help="Create PNG files instead JPEG")
|
help="Create PNG files instead JPEG")
|
||||||
processingOptions.add_option("--nocutpagenumbers", action="store_false", dest="cutpagenumbers", default=True,
|
|
||||||
help="Don't try to cut page numbers from images")
|
|
||||||
|
|
||||||
customProfileOptions.add_option("--customwidth", type="int", dest="customwidth", default=0,
|
customProfileOptions.add_option("--customwidth", type="int", dest="customwidth", default=0,
|
||||||
help="Replace screen width provided by device profile")
|
help="Replace screen width provided by device profile")
|
||||||
@@ -1014,38 +951,38 @@ def checkOptions():
|
|||||||
options.iskindle = False
|
options.iskindle = False
|
||||||
options.bordersColor = None
|
options.bordersColor = None
|
||||||
if options.format == 'Auto':
|
if options.format == 'Auto':
|
||||||
if options.profile in ['K1', 'K2', 'K345', 'KPW', 'KV']:
|
if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV']:
|
||||||
options.format = 'MOBI'
|
options.format = 'MOBI'
|
||||||
elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O']:
|
elif options.profile in ['OTHER', 'KoMT', 'KoG', 'KoGHD', 'KoA', 'KoAHD', 'KoAH2O', 'KoAO']:
|
||||||
options.format = 'EPUB'
|
options.format = 'EPUB'
|
||||||
elif options.profile in ['KDX']:
|
elif options.profile in ['KDX']:
|
||||||
options.format = 'CBZ'
|
options.format = 'CBZ'
|
||||||
if options.profile in ['K1', 'K2', 'K345', 'KPW', 'KV']:
|
if options.profile in ['K1', 'K2', 'K34', 'K578', 'KPW', 'KV']:
|
||||||
options.iskindle = True
|
options.iskindle = True
|
||||||
if options.white_borders:
|
if options.white_borders:
|
||||||
options.bordersColor = 'white'
|
options.bordersColor = 'white'
|
||||||
if options.black_borders:
|
if options.black_borders:
|
||||||
options.bordersColor = 'black'
|
options.bordersColor = 'black'
|
||||||
# Splitting MOBI is not optional
|
# Splitting MOBI is not optional
|
||||||
if options.format == 'MOBI':
|
if options.format == 'MOBI' and options.batchsplit != 2:
|
||||||
options.batchsplit = True
|
options.batchsplit = 1
|
||||||
# Older Kindle don't need higher resolution files due lack of Panel View.
|
# Older Kindle models don't support Panel View.
|
||||||
if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'KDX':
|
if options.profile == 'K1' or options.profile == 'K2' or options.profile == 'K34' or options.profile == 'KDX':
|
||||||
options.panelview = False
|
options.panelview = False
|
||||||
options.hqmode = False
|
options.hq = False
|
||||||
# Webtoon mode mandatory options
|
# Webtoon mode mandatory options
|
||||||
if options.webtoon:
|
if options.webtoon:
|
||||||
options.panelview = False
|
options.panelview = False
|
||||||
options.hqmode = False
|
|
||||||
options.righttoleft = False
|
options.righttoleft = False
|
||||||
options.upscale = True
|
options.upscale = True
|
||||||
|
options.hq = False
|
||||||
# Disable all Kindle features for other e-readers
|
# Disable all Kindle features for other e-readers
|
||||||
if options.profile == 'OTHER':
|
if options.profile == 'OTHER':
|
||||||
options.panelview = False
|
options.panelview = False
|
||||||
options.hqmode = False
|
options.hq = False
|
||||||
if 'Ko' in options.profile:
|
if 'Ko' in options.profile:
|
||||||
options.panelview = False
|
options.panelview = False
|
||||||
options.hqmode = False
|
options.hq = False
|
||||||
# CBZ files on Kindle DX/DXG support higher resolution
|
# CBZ files on Kindle DX/DXG support higher resolution
|
||||||
if options.profile == 'KDX' and options.format == 'CBZ':
|
if options.profile == 'KDX' and options.format == 'CBZ':
|
||||||
options.customheight = 1200
|
options.customheight = 1200
|
||||||
@@ -1058,7 +995,7 @@ def checkOptions():
|
|||||||
if options.customheight != 0:
|
if options.customheight != 0:
|
||||||
Y = options.customheight
|
Y = options.customheight
|
||||||
newProfile = ("Custom", (int(X), int(Y)), image.ProfileData.Palette16,
|
newProfile = ("Custom", (int(X), int(Y)), image.ProfileData.Palette16,
|
||||||
image.ProfileData.Profiles[options.profile][3], (int(int(X) * 1.5), int(int(Y) * 1.5)))
|
image.ProfileData.Profiles[options.profile][3])
|
||||||
image.ProfileData.Profiles["Custom"] = newProfile
|
image.ProfileData.Profiles["Custom"] = newProfile
|
||||||
options.profile = "Custom"
|
options.profile = "Custom"
|
||||||
options.profileData = image.ProfileData.Profiles[options.profile]
|
options.profileData = image.ProfileData.Profiles[options.profile]
|
||||||
@@ -1117,8 +1054,8 @@ def makeBook(source, qtGUI=None):
|
|||||||
getComicInfo(os.path.join(path, "OEBPS", "Images"), source)
|
getComicInfo(os.path.join(path, "OEBPS", "Images"), source)
|
||||||
detectCorruption(os.path.join(path, "OEBPS", "Images"), source)
|
detectCorruption(os.path.join(path, "OEBPS", "Images"), source)
|
||||||
if options.webtoon:
|
if options.webtoon:
|
||||||
if image.ProfileData.Profiles[options.profile][1][1] > 1000:
|
if image.ProfileData.Profiles[options.profile][1][1] > 1024:
|
||||||
y = 1000
|
y = 1024
|
||||||
else:
|
else:
|
||||||
y = image.ProfileData.Profiles[options.profile][1][1]
|
y = image.ProfileData.Profiles[options.profile][1][1]
|
||||||
comic2panel.main(['-y ' + str(y), '-i', '-m', path], qtGUI)
|
comic2panel.main(['-y ' + str(y), '-i', '-m', path], qtGUI)
|
||||||
@@ -1131,7 +1068,7 @@ def makeBook(source, qtGUI=None):
|
|||||||
chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
|
chapterNames = sanitizeTree(os.path.join(path, 'OEBPS', 'Images'))
|
||||||
if 'Ko' in options.profile and options.format == 'CBZ':
|
if 'Ko' in options.profile and options.format == 'CBZ':
|
||||||
sanitizeTreeKobo(os.path.join(path, 'OEBPS', 'Images'))
|
sanitizeTreeKobo(os.path.join(path, 'OEBPS', 'Images'))
|
||||||
if options.batchsplit:
|
if options.batchsplit > 0:
|
||||||
tomes = splitDirectory(path)
|
tomes = splitDirectory(path)
|
||||||
else:
|
else:
|
||||||
tomes = [path]
|
tomes = [path]
|
||||||
@@ -1176,7 +1113,6 @@ def makeBook(source, qtGUI=None):
|
|||||||
if not GUI and options.format == 'MOBI':
|
if not GUI and options.format == 'MOBI':
|
||||||
print("Creating MOBI files...")
|
print("Creating MOBI files...")
|
||||||
work = []
|
work = []
|
||||||
k = kindle.Kindle()
|
|
||||||
for i in filepath:
|
for i in filepath:
|
||||||
work.append([i])
|
work.append([i])
|
||||||
output = makeMOBI(work, GUI)
|
output = makeMOBI(work, GUI)
|
||||||
@@ -1185,6 +1121,7 @@ def makeBook(source, qtGUI=None):
|
|||||||
print('Error: KindleGen failed to create MOBI!')
|
print('Error: KindleGen failed to create MOBI!')
|
||||||
print(errors)
|
print(errors)
|
||||||
return filepath
|
return filepath
|
||||||
|
k = kindle.Kindle()
|
||||||
if k.path and k.coverSupport:
|
if k.path and k.coverSupport:
|
||||||
print("Kindle detected. Uploading covers...")
|
print("Kindle detected. Uploading covers...")
|
||||||
for i in filepath:
|
for i in filepath:
|
||||||
@@ -1239,6 +1176,8 @@ def makeMOBIWorker(item):
|
|||||||
kindlegenErrorCode = 23026
|
kindlegenErrorCode = 23026
|
||||||
if kindlegenErrorCode > 0:
|
if kindlegenErrorCode > 0:
|
||||||
break
|
break
|
||||||
|
if ":I1036: Mobi file built successfully" in line:
|
||||||
|
output.terminate()
|
||||||
else:
|
else:
|
||||||
# ERROR: EPUB too big
|
# ERROR: EPUB too big
|
||||||
kindlegenErrorCode = 23026
|
kindlegenErrorCode = 23026
|
||||||
@@ -1259,9 +1198,11 @@ def makeMOBI(work, qtGUI=None):
|
|||||||
threadNumber = 1
|
threadNumber = 1
|
||||||
elif 2 < availableMemory <= 4:
|
elif 2 < availableMemory <= 4:
|
||||||
threadNumber = 2
|
threadNumber = 2
|
||||||
else:
|
elif 4 < availableMemory <= 8:
|
||||||
threadNumber = 4
|
threadNumber = 4
|
||||||
makeMOBIWorkerPool = Pool(threadNumber)
|
else:
|
||||||
|
threadNumber = None
|
||||||
|
makeMOBIWorkerPool = Pool(threadNumber, maxtasksperchild=10)
|
||||||
for i in work:
|
for i in work:
|
||||||
makeMOBIWorkerPool.apply_async(func=makeMOBIWorker, args=(i, ), callback=makeMOBIWorkerTick)
|
makeMOBIWorkerPool.apply_async(func=makeMOBIWorker, args=(i, ), callback=makeMOBIWorkerTick)
|
||||||
makeMOBIWorkerPool.close()
|
makeMOBIWorkerPool.close()
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -23,16 +23,12 @@ import sys
|
|||||||
from shutil import rmtree, copytree, move
|
from shutil import rmtree, copytree, move
|
||||||
from optparse import OptionParser, OptionGroup
|
from optparse import OptionParser, OptionGroup
|
||||||
from multiprocessing import Pool
|
from multiprocessing import Pool
|
||||||
from PIL import Image, ImageStat, ImageOps
|
from PIL import Image, ImageChops, ImageOps, ImageDraw
|
||||||
from .shared import getImageFileName, walkLevel, walkSort
|
from .shared import getImageFileName, walkLevel, walkSort, sanitizeTrace
|
||||||
try:
|
try:
|
||||||
from PyQt5 import QtCore
|
from PyQt5 import QtCore
|
||||||
except ImportError:
|
except ImportError:
|
||||||
QtCore = None
|
QtCore = None
|
||||||
try:
|
|
||||||
from scandir import walk
|
|
||||||
except ImportError:
|
|
||||||
walk = os.walk
|
|
||||||
|
|
||||||
|
|
||||||
def mergeDirectoryTick(output):
|
def mergeDirectoryTick(output):
|
||||||
@@ -52,7 +48,7 @@ def mergeDirectory(work):
|
|||||||
imagesValid = []
|
imagesValid = []
|
||||||
sizes = []
|
sizes = []
|
||||||
targetHeight = 0
|
targetHeight = 0
|
||||||
for root, dirs, files in walkLevel(directory, 0):
|
for root, _, files in walkLevel(directory, 0):
|
||||||
for name in files:
|
for name in files:
|
||||||
if getImageFileName(name) is not None:
|
if getImageFileName(name) is not None:
|
||||||
i = Image.open(os.path.join(root, name))
|
i = Image.open(os.path.join(root, name))
|
||||||
@@ -71,8 +67,7 @@ def mergeDirectory(work):
|
|||||||
result = Image.new('RGB', (targetWidth, targetHeight))
|
result = Image.new('RGB', (targetWidth, targetHeight))
|
||||||
y = 0
|
y = 0
|
||||||
for i in imagesValid:
|
for i in imagesValid:
|
||||||
img = Image.open(i)
|
img = Image.open(i).convert('RGB')
|
||||||
img = img.convert('RGB')
|
|
||||||
if img.size[0] < targetWidth:
|
if img.size[0] < targetWidth:
|
||||||
img = ImageOps.fit(img, (targetWidth, img.size[1]), method=Image.BICUBIC, centering=(0.5, 0.5))
|
img = ImageOps.fit(img, (targetWidth, img.size[1]), method=Image.BICUBIC, centering=(0.5, 0.5))
|
||||||
result.paste(img, (0, y))
|
result.paste(img, (0, y))
|
||||||
@@ -81,33 +76,11 @@ def mergeDirectory(work):
|
|||||||
savePath = os.path.split(imagesValid[0])
|
savePath = os.path.split(imagesValid[0])
|
||||||
result.save(os.path.join(savePath[0], os.path.splitext(savePath[1])[0] + '.png'), 'PNG')
|
result.save(os.path.join(savePath[0], os.path.splitext(savePath[1])[0] + '.png'), 'PNG')
|
||||||
except Exception:
|
except Exception:
|
||||||
return str(sys.exc_info()[1])
|
return str(sys.exc_info()[1]), sanitizeTrace(sys.exc_info()[2])
|
||||||
|
|
||||||
|
|
||||||
def sanitizePanelSize(panel, opt):
|
def detectSolid(img):
|
||||||
newPanels = []
|
return not ImageChops.invert(img).getbbox() or not img.getbbox()
|
||||||
if panel[2] > 6 * opt.height:
|
|
||||||
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])
|
|
||||||
newPanels.append([panel[1] - diff * 5, panel[1] - diff * 4, diff])
|
|
||||||
newPanels.append([panel[1] - diff * 4, 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] > 3 * opt.height:
|
|
||||||
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] > 1.5 * opt.height:
|
|
||||||
newPanels.append([panel[0], panel[1] - int(panel[2] / 2), int(panel[2] / 2)])
|
|
||||||
newPanels.append([panel[1] - int(panel[2] / 2), panel[1], int(panel[2] / 2)])
|
|
||||||
else:
|
|
||||||
newPanels = [panel]
|
|
||||||
return newPanels
|
|
||||||
|
|
||||||
|
|
||||||
def splitImageTick(output):
|
def splitImageTick(output):
|
||||||
@@ -125,56 +98,60 @@ def splitImage(work):
|
|||||||
path = work[0]
|
path = work[0]
|
||||||
name = work[1]
|
name = work[1]
|
||||||
opt = work[2]
|
opt = work[2]
|
||||||
# Hardcoded options
|
|
||||||
threshold = 1.0
|
|
||||||
delta = 15
|
|
||||||
fileExpanded = os.path.splitext(name)
|
|
||||||
filePath = os.path.join(path, name)
|
filePath = os.path.join(path, name)
|
||||||
image = Image.open(filePath)
|
imgOrg = Image.open(filePath).convert('RGB')
|
||||||
image = image.convert('RGB')
|
imgProcess = Image.open(filePath).convert('1')
|
||||||
widthImg, heightImg = image.size
|
widthImg, heightImg = imgOrg.size
|
||||||
if heightImg > opt.height:
|
if heightImg > opt.height:
|
||||||
if opt.debug:
|
if opt.debug:
|
||||||
from PIL import ImageDraw
|
drawImg = Image.open(filePath).convert(mode='RGBA')
|
||||||
debugImage = Image.open(filePath)
|
draw = ImageDraw.Draw(drawImg)
|
||||||
draw = ImageDraw.Draw(debugImage)
|
|
||||||
|
|
||||||
# Find panels
|
# Find panels
|
||||||
y1 = 0
|
yWork = 0
|
||||||
y2 = 15
|
panelDetected = False
|
||||||
panels = []
|
panels = []
|
||||||
while y2 < heightImg:
|
while yWork < heightImg:
|
||||||
while ImageStat.Stat(image.crop([0, y1, widthImg, y2])).var[0] < threshold and y2 < heightImg:
|
tmpImg = imgProcess.crop([0, yWork, widthImg, yWork + 4])
|
||||||
y2 += delta
|
solid = detectSolid(tmpImg)
|
||||||
y2 -= delta
|
if not solid and not panelDetected:
|
||||||
y1Temp = y2
|
panelDetected = True
|
||||||
y1 = y2 + delta
|
panelY1 = yWork - 2
|
||||||
y2 = y1 + delta
|
if solid and panelDetected:
|
||||||
while ImageStat.Stat(image.crop([0, y1, widthImg, y2])).var[0] >= threshold and y2 < heightImg:
|
panelDetected = False
|
||||||
y1 += delta
|
panelY2 = yWork + 6
|
||||||
y2 += delta
|
panels.append((panelY1, panelY2, panelY2 - panelY1))
|
||||||
if y1 + delta >= heightImg:
|
yWork += 5
|
||||||
y1 = heightImg - 1
|
|
||||||
y2Temp = y1
|
# Split too big panels
|
||||||
if opt.debug:
|
panelsProcessed = []
|
||||||
draw.line([(0, y1Temp), (widthImg, y1Temp)], fill=(0, 255, 0))
|
for panel in panels:
|
||||||
draw.line([(0, y2Temp), (widthImg, y2Temp)], fill=(255, 0, 0))
|
if panel[2] <= opt.height * 1.5:
|
||||||
panelHeight = y2Temp - y1Temp
|
panelsProcessed.append(panel)
|
||||||
if panelHeight > delta:
|
elif panel[2] < opt.height * 2:
|
||||||
# Panels that can't be cut nicely will be forcefully splitted
|
diff = panel[2] - opt.height
|
||||||
panelsCleaned = sanitizePanelSize([y1Temp, y2Temp, panelHeight], opt)
|
panelsProcessed.append((panel[0], panel[1] - diff, opt.height))
|
||||||
for panel in panelsCleaned:
|
panelsProcessed.append((panel[1] - opt.height, panel[1], opt.height))
|
||||||
panels.append(panel)
|
else:
|
||||||
|
parts = round(panel[2] / opt.height)
|
||||||
|
diff = panel[2] // parts
|
||||||
|
for x in range(0, parts):
|
||||||
|
panelsProcessed.append((panel[0] + (x * diff), panel[1] - ((parts - x - 1) * diff), diff))
|
||||||
|
|
||||||
if opt.debug:
|
if opt.debug:
|
||||||
|
for panel in panelsProcessed:
|
||||||
|
# noinspection PyUnboundLocalVariable
|
||||||
|
draw.rectangle([(0, panel[0]), (widthImg, panel[1])], (0, 255, 0, 128), (0, 0, 255, 255))
|
||||||
# noinspection PyUnboundLocalVariable
|
# noinspection PyUnboundLocalVariable
|
||||||
debugImage.save(os.path.join(path, fileExpanded[0] + '-debug.png'), 'PNG')
|
debugImage = Image.alpha_composite(imgOrg.convert(mode='RGBA'), drawImg)
|
||||||
|
debugImage.save(os.path.join(path, os.path.splitext(name)[0] + '-debug.png'), 'PNG')
|
||||||
|
|
||||||
# Create virtual pages
|
# Create virtual pages
|
||||||
pages = []
|
pages = []
|
||||||
currentPage = []
|
currentPage = []
|
||||||
pageLeft = opt.height
|
pageLeft = opt.height
|
||||||
panelNumber = 0
|
panelNumber = 0
|
||||||
for panel in panels:
|
for panel in panelsProcessed:
|
||||||
if pageLeft - panel[2] > 0:
|
if pageLeft - panel[2] > 0:
|
||||||
pageLeft -= panel[2]
|
pageLeft -= panel[2]
|
||||||
currentPage.append(panelNumber)
|
currentPage.append(panelNumber)
|
||||||
@@ -194,18 +171,18 @@ def splitImage(work):
|
|||||||
pageHeight = 0
|
pageHeight = 0
|
||||||
targetHeight = 0
|
targetHeight = 0
|
||||||
for panel in page:
|
for panel in page:
|
||||||
pageHeight += panels[panel][2]
|
pageHeight += panelsProcessed[panel][2]
|
||||||
if pageHeight > delta:
|
if pageHeight > 15:
|
||||||
newPage = Image.new('RGB', (widthImg, pageHeight))
|
newPage = Image.new('RGB', (widthImg, pageHeight))
|
||||||
for panel in page:
|
for panel in page:
|
||||||
panelImg = image.crop([0, panels[panel][0], widthImg, panels[panel][1]])
|
panelImg = imgOrg.crop([0, panelsProcessed[panel][0], widthImg, panelsProcessed[panel][1]])
|
||||||
newPage.paste(panelImg, (0, targetHeight))
|
newPage.paste(panelImg, (0, targetHeight))
|
||||||
targetHeight += panels[panel][2]
|
targetHeight += panelsProcessed[panel][2]
|
||||||
newPage.save(os.path.join(path, fileExpanded[0] + '-' + str(pageNumber) + '.png'), 'PNG')
|
newPage.save(os.path.join(path, os.path.splitext(name)[0] + '-' + str(pageNumber) + '.png'), 'PNG')
|
||||||
pageNumber += 1
|
pageNumber += 1
|
||||||
os.remove(filePath)
|
os.remove(filePath)
|
||||||
except Exception:
|
except Exception:
|
||||||
return str(sys.exc_info()[1])
|
return str(sys.exc_info()[1]), sanitizeTrace(sys.exc_info()[2])
|
||||||
|
|
||||||
|
|
||||||
def main(argv=None, qtGUI=None):
|
def main(argv=None, qtGUI=None):
|
||||||
@@ -220,7 +197,7 @@ def main(argv=None, qtGUI=None):
|
|||||||
mainOptions.add_option("-m", "--merge", action="store_true", dest="merge", default=False,
|
mainOptions.add_option("-m", "--merge", action="store_true", dest="merge", default=False,
|
||||||
help="Combine every directory into a single image before splitting")
|
help="Combine every directory into a single image before splitting")
|
||||||
otherOptions.add_option("-d", "--debug", action="store_true", dest="debug", default=False,
|
otherOptions.add_option("-d", "--debug", action="store_true", dest="debug", default=False,
|
||||||
help="Create debug file for every splitted image")
|
help="Create debug file for every split image")
|
||||||
otherOptions.add_option("-h", "--help", action="help",
|
otherOptions.add_option("-h", "--help", action="help",
|
||||||
help="Show this help message and exit")
|
help="Show this help message and exit")
|
||||||
parser.add_option_group(mainOptions)
|
parser.add_option_group(mainOptions)
|
||||||
@@ -242,15 +219,15 @@ def main(argv=None, qtGUI=None):
|
|||||||
work = []
|
work = []
|
||||||
pagenumber = 1
|
pagenumber = 1
|
||||||
splitWorkerOutput = []
|
splitWorkerOutput = []
|
||||||
splitWorkerPool = Pool()
|
splitWorkerPool = Pool(maxtasksperchild=10)
|
||||||
if options.merge:
|
if options.merge:
|
||||||
print("Merging images...")
|
print("Merging images...")
|
||||||
directoryNumer = 1
|
directoryNumer = 1
|
||||||
mergeWork = []
|
mergeWork = []
|
||||||
mergeWorkerOutput = []
|
mergeWorkerOutput = []
|
||||||
mergeWorkerPool = Pool()
|
mergeWorkerPool = Pool(maxtasksperchild=10)
|
||||||
mergeWork.append([options.targetDir])
|
mergeWork.append([options.targetDir])
|
||||||
for root, dirs, files in walk(options.targetDir, False):
|
for root, dirs, files in os.walk(options.targetDir, False):
|
||||||
dirs, files = walkSort(dirs, files)
|
dirs, files = walkSort(dirs, files)
|
||||||
for directory in dirs:
|
for directory in dirs:
|
||||||
directoryNumer += 1
|
directoryNumer += 1
|
||||||
@@ -267,9 +244,10 @@ def main(argv=None, qtGUI=None):
|
|||||||
raise UserWarning("Conversion interrupted.")
|
raise UserWarning("Conversion interrupted.")
|
||||||
if len(mergeWorkerOutput) > 0:
|
if len(mergeWorkerOutput) > 0:
|
||||||
rmtree(options.targetDir, True)
|
rmtree(options.targetDir, True)
|
||||||
raise RuntimeError("One of workers crashed. Cause: " + mergeWorkerOutput[0])
|
raise RuntimeError("One of workers crashed. Cause: " + mergeWorkerOutput[0][0],
|
||||||
|
mergeWorkerOutput[0][1])
|
||||||
print("Splitting images...")
|
print("Splitting images...")
|
||||||
for root, dirs, files in walk(options.targetDir, False):
|
for root, _, files in os.walk(options.targetDir, False):
|
||||||
for name in files:
|
for name in files:
|
||||||
if getImageFileName(name) is not None:
|
if getImageFileName(name) is not None:
|
||||||
pagenumber += 1
|
pagenumber += 1
|
||||||
@@ -290,7 +268,8 @@ def main(argv=None, qtGUI=None):
|
|||||||
raise UserWarning("Conversion interrupted.")
|
raise UserWarning("Conversion interrupted.")
|
||||||
if len(splitWorkerOutput) > 0:
|
if len(splitWorkerOutput) > 0:
|
||||||
rmtree(options.targetDir, True)
|
rmtree(options.targetDir, True)
|
||||||
raise RuntimeError("One of workers crashed. Cause: " + splitWorkerOutput[0])
|
raise RuntimeError("One of workers crashed. Cause: " + splitWorkerOutput[0][0],
|
||||||
|
splitWorkerOutput[0][1])
|
||||||
if options.inPlace:
|
if options.inPlace:
|
||||||
rmtree(options.sourceDir)
|
rmtree(options.sourceDir)
|
||||||
move(options.targetDir, options.sourceDir)
|
move(options.targetDir, options.sourceDir)
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Based on initial version of DualMetaFix. Copyright (C) 2013 Kevin Hendricks
|
# Based on initial version of DualMetaFix. Copyright (C) 2013 Kevin Hendricks
|
||||||
# Changes for KCC Copyright (C) 2014-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Changes for KCC Copyright (C) 2014-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
# Copyright (C) 2010 Alex Yatskov
|
# Copyright (C) 2010 Alex Yatskov
|
||||||
# Copyright (C) 2011 Stanislav (proDOOMman) Kosolapov <prodoomman@gmail.com>
|
# Copyright (C) 2011 Stanislav (proDOOMman) Kosolapov <prodoomman@gmail.com>
|
||||||
|
# Copyright (c) 2016 Alberto Planas <aplanas@gmail.com>
|
||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# 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
|
# it under the terms of the GNU General Public License as published by
|
||||||
@@ -20,7 +21,7 @@ import os
|
|||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
from urllib.request import Request, urlopen
|
from urllib.request import Request, urlopen
|
||||||
from urllib.parse import quote
|
from urllib.parse import quote
|
||||||
from PIL import Image, ImageOps, ImageStat, ImageChops
|
from PIL import Image, ImageOps, ImageStat, ImageChops, ImageFilter
|
||||||
from .shared import md5Checksum
|
from .shared import md5Checksum
|
||||||
from . import __version__
|
from . import __version__
|
||||||
|
|
||||||
@@ -77,19 +78,21 @@ class ProfileData:
|
|||||||
]
|
]
|
||||||
|
|
||||||
Profiles = {
|
Profiles = {
|
||||||
'K1': ("Kindle 1", (600, 670), Palette4, 1.8, (900, 1005)),
|
'K1': ("Kindle 1", (600, 670), Palette4, 1.8),
|
||||||
'K2': ("Kindle 2", (600, 670), Palette15, 1.8, (900, 1005)),
|
'K2': ("Kindle 2", (600, 670), Palette15, 1.8),
|
||||||
'K345': ("Kindle", (600, 800), Palette16, 1.8, (900, 1200)),
|
'K34': ("Kindle Keyboard/Touch", (600, 800), Palette16, 1.8),
|
||||||
'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8, (1236, 1500)),
|
'K578': ("Kindle", (600, 800), Palette16, 1.8),
|
||||||
'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8, (1137, 1536)),
|
'KDX': ("Kindle DX/DXG", (824, 1000), Palette16, 1.8),
|
||||||
'KV': ("Kindle Paperwhite 3/Voyage", (1072, 1448), Palette16, 1.8, (1608, 2172)),
|
'KPW': ("Kindle Paperwhite 1/2", (758, 1024), Palette16, 1.8),
|
||||||
'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8, (900, 1200)),
|
'KV': ("Kindle Paperwhite 3/Voyage/Oasis", (1072, 1448), Palette16, 1.8),
|
||||||
'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.8, (1152, 1536)),
|
'KoMT': ("Kobo Mini/Touch", (600, 800), Palette16, 1.8),
|
||||||
'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.8, (1608, 2172)),
|
'KoG': ("Kobo Glo", (768, 1024), Palette16, 1.8),
|
||||||
'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.8, (1137, 1536)),
|
'KoGHD': ("Kobo Glo HD", (1072, 1448), Palette16, 1.8),
|
||||||
'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.8, (1620, 2160)),
|
'KoA': ("Kobo Aura", (758, 1024), Palette16, 1.8),
|
||||||
'KoAH2O': ("Kobo Aura H2O", (1080, 1430), Palette16, 1.8, (1620, 2145)),
|
'KoAHD': ("Kobo Aura HD", (1080, 1440), Palette16, 1.8),
|
||||||
'OTHER': ("Other", (0, 0), Palette16, 1.8, (0, 0)),
|
'KoAH2O': ("Kobo Aura H2O", (1080, 1430), Palette16, 1.8),
|
||||||
|
'KoAO': ("Kobo Aura ONE", (1404, 1872), Palette16, 1.8),
|
||||||
|
'OTHER': ("Other", (0, 0), Palette16, 1.8),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -103,8 +106,6 @@ class ComicPageParser:
|
|||||||
self.color = self.colorCheck()
|
self.color = self.colorCheck()
|
||||||
self.fill = self.fillCheck()
|
self.fill = self.fillCheck()
|
||||||
self.splitCheck()
|
self.splitCheck()
|
||||||
if self.opt.hqmode:
|
|
||||||
self.sizeCheck()
|
|
||||||
|
|
||||||
def getImageHistogram(self, image):
|
def getImageHistogram(self, image):
|
||||||
histogram = image.histogram()
|
histogram = image.histogram()
|
||||||
@@ -118,15 +119,15 @@ class ComicPageParser:
|
|||||||
def splitCheck(self):
|
def splitCheck(self):
|
||||||
width, height = self.image.size
|
width, height = self.image.size
|
||||||
dstwidth, dstheight = self.size
|
dstwidth, dstheight = self.size
|
||||||
# Only split if origin is not oriented the same as target
|
if (width > height) != (dstwidth > dstheight) and width <= dstheight and height <= dstwidth \
|
||||||
if (width > height) != (dstwidth > dstheight) and not self.opt.webtoon:
|
and not self.opt.webtoon and self.opt.splitter == 1:
|
||||||
|
self.payload.append(['R', self.source, self.image.rotate(90, Image.BICUBIC, True), self.color, self.fill])
|
||||||
|
elif (width > height) != (dstwidth > dstheight) and not self.opt.webtoon:
|
||||||
if self.opt.splitter != 1:
|
if self.opt.splitter != 1:
|
||||||
if width > height:
|
if width > height:
|
||||||
# Source is landscape, so split by the width
|
|
||||||
leftbox = (0, 0, int(width / 2), height)
|
leftbox = (0, 0, int(width / 2), height)
|
||||||
rightbox = (int(width / 2), 0, width, height)
|
rightbox = (int(width / 2), 0, width, height)
|
||||||
else:
|
else:
|
||||||
# Source is portrait and target is landscape, so split by the height
|
|
||||||
leftbox = (0, 0, width, int(height / 2))
|
leftbox = (0, 0, width, int(height / 2))
|
||||||
rightbox = (0, int(height / 2), width, height)
|
rightbox = (0, int(height / 2), width, height)
|
||||||
if self.opt.righttoleft:
|
if self.opt.righttoleft:
|
||||||
@@ -203,29 +204,18 @@ class ComicPageParser:
|
|||||||
else:
|
else:
|
||||||
return 'white'
|
return 'white'
|
||||||
|
|
||||||
def sizeCheck(self):
|
|
||||||
additionalPayload = []
|
|
||||||
width, height = self.image.size
|
|
||||||
dstwidth, dstheight = self.size
|
|
||||||
for work in self.payload:
|
|
||||||
if width > dstwidth and height > dstheight:
|
|
||||||
additionalPayload.append([work[0] + '+', work[1], work[2].copy(), work[3], work[4]])
|
|
||||||
self.payload = self.payload + additionalPayload
|
|
||||||
|
|
||||||
|
|
||||||
class ComicPage:
|
class ComicPage:
|
||||||
def __init__(self, mode, path, image, color, fill, options):
|
def __init__(self, options, mode, path, image, color, fill):
|
||||||
self.opt = options
|
self.opt = options
|
||||||
_, self.size, self.palette, self.gamma, self.panelviewsize = self.opt.profileData
|
_, self.size, self.palette, self.gamma = self.opt.profileData
|
||||||
|
if self.opt.hq:
|
||||||
|
self.size = (int(self.size[0] * 1.5), int(self.size[1] * 1.5))
|
||||||
self.image = image
|
self.image = image
|
||||||
self.color = color
|
self.color = color
|
||||||
self.fill = fill
|
self.fill = fill
|
||||||
self.rotated = False
|
self.rotated = False
|
||||||
self.orgPath = os.path.join(path[0], path[1])
|
self.orgPath = os.path.join(path[0], path[1])
|
||||||
if '+' in mode:
|
|
||||||
self.hqMode = True
|
|
||||||
else:
|
|
||||||
self.hqMode = False
|
|
||||||
if 'N' in mode:
|
if 'N' in mode:
|
||||||
self.targetPath = os.path.join(path[0], os.path.splitext(path[1])[0]) + '-KCC'
|
self.targetPath = os.path.join(path[0], os.path.splitext(path[1])[0]) + '-KCC'
|
||||||
elif 'R' in mode:
|
elif 'R' in mode:
|
||||||
@@ -244,18 +234,16 @@ class ComicPage:
|
|||||||
if self.rotated:
|
if self.rotated:
|
||||||
flags.append('Rotated')
|
flags.append('Rotated')
|
||||||
if self.fill != 'white':
|
if self.fill != 'white':
|
||||||
flags.append('BlackFill')
|
flags.append('BlackBackground')
|
||||||
if self.hqMode:
|
|
||||||
self.targetPath += '-HQ'
|
|
||||||
if self.opt.forcepng:
|
if self.opt.forcepng:
|
||||||
self.targetPath += '.png'
|
self.targetPath += '.png'
|
||||||
self.image.save(self.targetPath, 'PNG', optimize=1)
|
self.image.save(self.targetPath, 'PNG', optimize=1)
|
||||||
else:
|
else:
|
||||||
self.targetPath += '.jpg'
|
self.targetPath += '.jpg'
|
||||||
self.image.save(self.targetPath, 'JPEG', optimize=1, quality=80)
|
self.image.save(self.targetPath, 'JPEG', optimize=1, quality=85)
|
||||||
return [md5Checksum(self.targetPath), flags, self.orgPath]
|
return [md5Checksum(self.targetPath), flags, self.orgPath]
|
||||||
except IOError:
|
except IOError as err:
|
||||||
raise RuntimeError('Cannot save image.')
|
raise RuntimeError('Cannot save image. ' + str(err))
|
||||||
|
|
||||||
def autocontrastImage(self):
|
def autocontrastImage(self):
|
||||||
gamma = self.opt.gamma
|
gamma = self.opt.gamma
|
||||||
@@ -280,130 +268,69 @@ class ComicPage:
|
|||||||
self.image = self.image.quantize(palette=palImg)
|
self.image = self.image.quantize(palette=palImg)
|
||||||
|
|
||||||
def resizeImage(self):
|
def resizeImage(self):
|
||||||
if self.hqMode:
|
if self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1]:
|
||||||
size = (self.panelviewsize[0], self.panelviewsize[1])
|
method = Image.BICUBIC
|
||||||
if self.image.size[0] > size[0] or self.image.size[1] > size[1]:
|
|
||||||
self.image.thumbnail(size, Image.LANCZOS)
|
|
||||||
else:
|
else:
|
||||||
size = (self.size[0], self.size[1])
|
method = Image.LANCZOS
|
||||||
if self.image.size[0] <= size[0] and self.image.size[1] <= size[1]:
|
if self.opt.stretch:
|
||||||
method = Image.BICUBIC
|
self.image = self.image.resize(self.size, method)
|
||||||
|
elif self.image.size[0] <= self.size[0] and self.image.size[1] <= self.size[1] and not self.opt.upscale:
|
||||||
|
if self.opt.format == 'CBZ':
|
||||||
|
borderw = int((self.size[0] - self.image.size[0]) / 2)
|
||||||
|
borderh = int((self.size[1] - self.image.size[1]) / 2)
|
||||||
|
self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=self.fill)
|
||||||
|
if self.image.size[0] != self.size[0] or self.image.size[1] != self.size[1]:
|
||||||
|
self.image = ImageOps.fit(self.image, self.size, method=Image.BICUBIC, centering=(0.5, 0.5))
|
||||||
|
else:
|
||||||
|
if self.opt.format == 'CBZ':
|
||||||
|
ratioDev = float(self.size[0]) / float(self.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=(int(diff / 2), 0), fill=self.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, int(diff / 2)), fill=self.fill)
|
||||||
|
self.image = ImageOps.fit(self.image, self.size, method=method, centering=(0.5, 0.5))
|
||||||
else:
|
else:
|
||||||
method = Image.LANCZOS
|
hpercent = self.size[1] / float(self.image.size[1])
|
||||||
if self.opt.stretch:
|
wsize = int((float(self.image.size[0]) * float(hpercent)))
|
||||||
self.image = self.image.resize(size, method)
|
self.image = self.image.resize((wsize, self.size[1]), method)
|
||||||
elif self.image.size[0] <= size[0] and self.image.size[1] <= size[1] and not self.opt.upscale:
|
if self.image.size[0] > self.size[0] or self.image.size[1] > self.size[1]:
|
||||||
if self.opt.format == 'CBZ':
|
self.image.thumbnail(self.size, Image.LANCZOS)
|
||||||
borderw = int((size[0] - self.image.size[0]) / 2)
|
|
||||||
borderh = int((size[1] - self.image.size[1]) / 2)
|
|
||||||
self.image = ImageOps.expand(self.image, border=(borderw, borderh), fill=self.fill)
|
|
||||||
if self.image.size[0] != size[0] or self.image.size[1] != size[1]:
|
|
||||||
self.image = ImageOps.fit(self.image, size, method=Image.BICUBIC, centering=(0.5, 0.5))
|
|
||||||
else:
|
|
||||||
if self.opt.format == 'CBZ':
|
|
||||||
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=(int(diff / 2), 0), fill=self.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, int(diff / 2)), fill=self.fill)
|
|
||||||
self.image = ImageOps.fit(self.image, size, method=method, centering=(0.5, 0.5))
|
|
||||||
else:
|
|
||||||
hpercent = size[1] / float(self.image.size[1])
|
|
||||||
wsize = int((float(self.image.size[0]) * float(hpercent)))
|
|
||||||
self.image = self.image.resize((wsize, size[1]), method)
|
|
||||||
if self.image.size[0] > size[0] or self.image.size[1] > size[1]:
|
|
||||||
self.image.thumbnail(size, Image.LANCZOS)
|
|
||||||
|
|
||||||
def cutPageNumber(self):
|
def getBoundingBox(self, tmpImg):
|
||||||
if ImageChops.invert(self.image).getbbox() is not None:
|
min_margin = [int(0.005 * i + 0.5) for i in tmpImg.size]
|
||||||
widthImg, heightImg = self.image.size
|
max_margin = [int(0.1 * i + 0.5) for i in tmpImg.size]
|
||||||
delta = 2
|
bbox = tmpImg.getbbox()
|
||||||
diff = delta
|
bbox = (
|
||||||
fixedThreshold = 5
|
max(0, min(max_margin[0], bbox[0] - min_margin[0])),
|
||||||
if ImageStat.Stat(self.image).var[0] < 2 * fixedThreshold:
|
max(0, min(max_margin[1], bbox[1] - min_margin[1])),
|
||||||
return self.image
|
min(tmpImg.size[0],
|
||||||
while ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0] < fixedThreshold\
|
max(tmpImg.size[0] - max_margin[0], bbox[2] + min_margin[0])),
|
||||||
and diff < heightImg:
|
min(tmpImg.size[1],
|
||||||
diff += delta
|
max(tmpImg.size[1] - max_margin[1], bbox[3] + min_margin[1])),
|
||||||
diff -= delta
|
)
|
||||||
pageNumberCut1 = diff
|
return bbox
|
||||||
if diff < delta:
|
|
||||||
diff = delta
|
|
||||||
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:
|
|
||||||
oldStat = ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0]
|
|
||||||
diff += delta
|
|
||||||
diff -= delta
|
|
||||||
pageNumberCut2 = diff
|
|
||||||
diff += delta
|
|
||||||
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:
|
|
||||||
diff += delta
|
|
||||||
diff -= delta
|
|
||||||
pageNumberCut3 = diff
|
|
||||||
delta = 5
|
|
||||||
diff = delta
|
|
||||||
while ImageStat.Stat(self.image.crop((0, heightImg - pageNumberCut2, diff, heightImg))).var[0]\
|
|
||||||
< fixedThreshold and diff < widthImg:
|
|
||||||
diff += delta
|
|
||||||
diff -= delta
|
|
||||||
pageNumberX1 = diff
|
|
||||||
diff = delta
|
|
||||||
while ImageStat.Stat(self.image.crop((widthImg - diff, heightImg - pageNumberCut2,
|
|
||||||
widthImg, heightImg))).var[0] < fixedThreshold and diff < widthImg:
|
|
||||||
diff += delta
|
|
||||||
diff -= delta
|
|
||||||
pageNumberX2 = widthImg - diff
|
|
||||||
if pageNumberCut3 - pageNumberCut1 > 2 * delta\
|
|
||||||
and float(pageNumberX2 - pageNumberX1) / float(pageNumberCut2 - pageNumberCut1) <= 9.0\
|
|
||||||
and ImageStat.Stat(self.image.crop((0, heightImg - pageNumberCut3, widthImg, heightImg))).var[0]\
|
|
||||||
/ ImageStat.Stat(self.image).var[0] < 0.1\
|
|
||||||
and pageNumberCut3 < heightImg / 4 - delta:
|
|
||||||
diff = pageNumberCut3
|
|
||||||
else:
|
|
||||||
diff = pageNumberCut1
|
|
||||||
self.image = self.image.crop((0, 0, widthImg, heightImg - diff))
|
|
||||||
|
|
||||||
def cropWhiteSpace(self):
|
def cropPageNumber(self, power):
|
||||||
if ImageChops.invert(self.image).getbbox() is not None:
|
if self.fill != 'white':
|
||||||
widthImg, heightImg = self.image.size
|
tmpImg = self.image.convert(mode='L')
|
||||||
delta = 10
|
else:
|
||||||
diff = delta
|
tmpImg = ImageOps.invert(self.image.convert(mode='L'))
|
||||||
fixedThreshold = 0.1
|
tmpImg = tmpImg.point(lambda x: x and 255)
|
||||||
# top
|
tmpImg = tmpImg.filter(ImageFilter.MinFilter(size=3))
|
||||||
while ImageStat.Stat(self.image.crop((0, 0, widthImg, diff))).var[0] < fixedThreshold and diff < heightImg:
|
tmpImg = tmpImg.filter(ImageFilter.GaussianBlur(radius=5))
|
||||||
diff += delta
|
tmpImg = tmpImg.point(lambda x: (x >= 16 * power) and x)
|
||||||
diff -= delta
|
self.image = self.image.crop(tmpImg.getbbox()) if tmpImg.getbbox() else self.image
|
||||||
self.image = self.image.crop((0, diff, widthImg, heightImg))
|
|
||||||
widthImg, heightImg = self.image.size
|
def cropMargin(self, power):
|
||||||
diff = delta
|
if self.fill != 'white':
|
||||||
# left
|
tmpImg = self.image.convert(mode='L')
|
||||||
while ImageStat.Stat(self.image.crop((0, 0, diff, heightImg))).var[0] < fixedThreshold and diff < widthImg:
|
else:
|
||||||
diff += delta
|
tmpImg = ImageOps.invert(self.image.convert(mode='L'))
|
||||||
diff -= delta
|
tmpImg = tmpImg.filter(ImageFilter.GaussianBlur(radius=3))
|
||||||
self.image = self.image.crop((diff, 0, widthImg, heightImg))
|
tmpImg = tmpImg.point(lambda x: (x >= 16 * power) and x)
|
||||||
widthImg, heightImg = self.image.size
|
self.image = self.image.crop(self.getBoundingBox(tmpImg)) if tmpImg.getbbox() else self.image
|
||||||
diff = delta
|
|
||||||
# down
|
|
||||||
while ImageStat.Stat(self.image.crop((0, heightImg - diff, widthImg, heightImg))).var[0] < fixedThreshold\
|
|
||||||
and diff < heightImg:
|
|
||||||
diff += delta
|
|
||||||
diff -= delta
|
|
||||||
self.image = self.image.crop((0, 0, widthImg, heightImg - diff))
|
|
||||||
widthImg, heightImg = self.image.size
|
|
||||||
diff = delta
|
|
||||||
# right
|
|
||||||
while ImageStat.Stat(self.image.crop((widthImg - diff, 0, widthImg, heightImg))).var[0] < fixedThreshold\
|
|
||||||
and diff < widthImg:
|
|
||||||
diff += delta
|
|
||||||
diff -= delta
|
|
||||||
self.image = self.image.crop((0, 0, widthImg - diff, heightImg))
|
|
||||||
|
|
||||||
|
|
||||||
class Cover:
|
class Cover:
|
||||||
@@ -420,44 +347,30 @@ class Cover:
|
|||||||
source = urlopen(Request(quote(self.options.remoteCovers[self.tomeNumber]).replace('%3A', ':', 1),
|
source = urlopen(Request(quote(self.options.remoteCovers[self.tomeNumber]).replace('%3A', ':', 1),
|
||||||
headers={'User-Agent': 'KindleComicConverter/' + __version__})).read()
|
headers={'User-Agent': 'KindleComicConverter/' + __version__})).read()
|
||||||
self.image = Image.open(BytesIO(source))
|
self.image = Image.open(BytesIO(source))
|
||||||
self.processExternal()
|
|
||||||
except Exception:
|
except Exception:
|
||||||
self.image = Image.open(source)
|
self.image = Image.open(source)
|
||||||
self.processInternal()
|
|
||||||
else:
|
else:
|
||||||
self.image = Image.open(source)
|
self.image = Image.open(source)
|
||||||
self.processInternal()
|
self.process()
|
||||||
|
|
||||||
def processInternal(self):
|
def process(self):
|
||||||
self.image = self.image.convert('RGB')
|
|
||||||
self.image = self.trim()
|
|
||||||
self.save()
|
|
||||||
|
|
||||||
def processExternal(self):
|
|
||||||
self.image = self.image.convert('RGB')
|
self.image = self.image.convert('RGB')
|
||||||
|
self.image = ImageOps.autocontrast(self.image)
|
||||||
|
if not self.options.forcecolor:
|
||||||
|
self.image = self.image.convert('L')
|
||||||
self.image.thumbnail(self.options.profileData[1], Image.LANCZOS)
|
self.image.thumbnail(self.options.profileData[1], Image.LANCZOS)
|
||||||
self.save()
|
self.save()
|
||||||
|
|
||||||
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):
|
def save(self):
|
||||||
try:
|
try:
|
||||||
self.image.save(self.target, "JPEG", optimize=1, quality=80)
|
self.image.save(self.target, "JPEG", optimize=1, quality=85)
|
||||||
except IOError:
|
except IOError:
|
||||||
raise RuntimeError('Failed to process downloaded cover.')
|
raise RuntimeError('Failed to process downloaded cover.')
|
||||||
|
|
||||||
def saveToKindle(self, kindle, asin):
|
def saveToKindle(self, kindle, asin):
|
||||||
self.image = self.image.resize((300, 470), Image.ANTIALIAS).convert('L')
|
self.image = self.image.resize((300, 470), Image.ANTIALIAS)
|
||||||
try:
|
try:
|
||||||
self.image.save(os.path.join(kindle.path.split('documents')[0], 'system', 'thumbnails',
|
self.image.save(os.path.join(kindle.path.split('documents')[0], 'system', 'thumbnails',
|
||||||
'thumbnail_' + asin + '_EBOK_portrait.jpg'), 'JPEG')
|
'thumbnail_' + asin + '_EBOK_portrait.jpg'), 'JPEG', optimize=1, quality=85)
|
||||||
except IOError:
|
except IOError:
|
||||||
raise RuntimeError('Failed to upload cover.')
|
raise RuntimeError('Failed to upload cover.')
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Based upon the code snippet by Ned Batchelder
|
# Based upon the code snippet by Ned Batchelder
|
||||||
# (http://nedbatchelder.com/blog/200712/extracting_jpgs_from_pdfs.html)
|
# (http://nedbatchelder.com/blog/200712/extracting_jpgs_from_pdfs.html)
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
# Copyright (c) 2013-2015 Pawel Jastrzebski <pawelj@iosphe.re>
|
# Copyright (c) 2013-2017 Pawel Jastrzebski <pawelj@iosphe.re>
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and/or distribute this software for
|
# Permission to use, copy, modify, and/or distribute this software for
|
||||||
# any purpose with or without fee is hereby granted, provided that the
|
# any purpose with or without fee is hereby granted, provided that the
|
||||||
@@ -17,20 +17,14 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from sys import version_info
|
|
||||||
from hashlib import md5
|
from hashlib import md5
|
||||||
from html.parser import HTMLParser
|
from html.parser import HTMLParser
|
||||||
from distutils.version import StrictVersion
|
from distutils.version import StrictVersion
|
||||||
from time import sleep
|
|
||||||
from shutil import rmtree, copy
|
from shutil import rmtree, copy
|
||||||
from tempfile import mkdtemp
|
from tempfile import mkdtemp
|
||||||
from zipfile import ZipFile, ZIP_DEFLATED
|
from zipfile import ZipFile, ZIP_DEFLATED
|
||||||
from re import split
|
from re import split
|
||||||
from traceback import format_tb
|
from traceback import format_tb
|
||||||
try:
|
|
||||||
from scandir import walk
|
|
||||||
except ImportError:
|
|
||||||
walk = os.walk
|
|
||||||
|
|
||||||
|
|
||||||
class HTMLStripper(HTMLParser):
|
class HTMLStripper(HTMLParser):
|
||||||
@@ -71,7 +65,7 @@ def walkLevel(some_dir, level=1):
|
|||||||
some_dir = some_dir.rstrip(os.path.sep)
|
some_dir = some_dir.rstrip(os.path.sep)
|
||||||
assert os.path.isdir(some_dir)
|
assert os.path.isdir(some_dir)
|
||||||
num_sep = some_dir.count(os.path.sep)
|
num_sep = some_dir.count(os.path.sep)
|
||||||
for root, dirs, files in walk(some_dir):
|
for root, dirs, files in os.walk(some_dir):
|
||||||
dirs, files = walkSort(dirs, files)
|
dirs, files = walkSort(dirs, files)
|
||||||
yield root, dirs, files
|
yield root, dirs, files
|
||||||
num_sep_this = root.count(os.path.sep)
|
num_sep_this = root.count(os.path.sep)
|
||||||
@@ -96,30 +90,6 @@ def check7ZFile(filePath):
|
|||||||
return header == b"7z\xbc\xaf'\x1c"
|
return header == b"7z\xbc\xaf'\x1c"
|
||||||
|
|
||||||
|
|
||||||
def saferReplace(old, new):
|
|
||||||
for x in range(10):
|
|
||||||
try:
|
|
||||||
os.replace(old, new)
|
|
||||||
except PermissionError:
|
|
||||||
sleep(1)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
raise PermissionError("Failed to move the file.")
|
|
||||||
|
|
||||||
|
|
||||||
def saferRemove(target):
|
|
||||||
for x in range(10):
|
|
||||||
try:
|
|
||||||
os.remove(target)
|
|
||||||
except PermissionError:
|
|
||||||
sleep(1)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
raise PermissionError("Failed to remove the file.")
|
|
||||||
|
|
||||||
|
|
||||||
def removeFromZIP(zipfname, *filenames):
|
def removeFromZIP(zipfname, *filenames):
|
||||||
tempdir = mkdtemp('', 'KCC-')
|
tempdir = mkdtemp('', 'KCC-')
|
||||||
try:
|
try:
|
||||||
@@ -129,24 +99,21 @@ def removeFromZIP(zipfname, *filenames):
|
|||||||
for item in zipread.infolist():
|
for item in zipread.infolist():
|
||||||
if item.filename not in filenames:
|
if item.filename not in filenames:
|
||||||
zipwrite.writestr(item, zipread.read(item.filename))
|
zipwrite.writestr(item, zipread.read(item.filename))
|
||||||
for x in range(50):
|
copy(tempname, zipfname)
|
||||||
try:
|
|
||||||
copy(tempname, zipfname)
|
|
||||||
except PermissionError:
|
|
||||||
sleep(0.1)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
raise PermissionError
|
|
||||||
finally:
|
finally:
|
||||||
rmtree(tempdir, True)
|
rmtree(tempdir, True)
|
||||||
|
|
||||||
|
|
||||||
def sanitizeTrace(traceback):
|
def sanitizeTrace(traceback):
|
||||||
return ''.join(format_tb(traceback))\
|
return ''.join(format_tb(traceback))\
|
||||||
.replace('C:\\Users\\pawel\\Documents\\Projekty\\KCC\\', '')\
|
.replace('C:/projects/kcc/', '') \
|
||||||
.replace('C:\\Python34\\', '')\
|
.replace('c:/projects/kcc/', '') \
|
||||||
.replace('c:\\python34\\', '')
|
.replace('C:/python36-x64/', '')\
|
||||||
|
.replace('c:/python36-x64/', '')\
|
||||||
|
.replace('C:\\projects\\kcc\\', '') \
|
||||||
|
.replace('c:\\projects\\kcc\\', '') \
|
||||||
|
.replace('C:\\python36-x64\\', '')\
|
||||||
|
.replace('c:\\python36-x64\\', '')
|
||||||
|
|
||||||
|
|
||||||
def dependencyCheck(level):
|
def dependencyCheck(level):
|
||||||
@@ -154,36 +121,33 @@ def dependencyCheck(level):
|
|||||||
if level > 2:
|
if level > 2:
|
||||||
try:
|
try:
|
||||||
from PyQt5.QtCore import qVersion as qtVersion
|
from PyQt5.QtCore import qVersion as qtVersion
|
||||||
if StrictVersion('5.2.1') > StrictVersion(qtVersion()):
|
if StrictVersion('5.6.0') > StrictVersion(qtVersion()):
|
||||||
missing.append('PyQt 5.2.1+')
|
missing.append('PyQt 5.6.0+')
|
||||||
except ImportError:
|
except ImportError:
|
||||||
missing.append('PyQt 5.2.1+')
|
missing.append('PyQt 5.6.0+')
|
||||||
|
try:
|
||||||
|
import raven
|
||||||
|
except ImportError:
|
||||||
|
missing.append('raven 6.0.0+')
|
||||||
if level > 1:
|
if level > 1:
|
||||||
try:
|
try:
|
||||||
from psutil import __version__ as psutilVersion
|
from psutil import __version__ as psutilVersion
|
||||||
if StrictVersion('3.2.2') > StrictVersion(psutilVersion):
|
if StrictVersion('5.0.0') > StrictVersion(psutilVersion):
|
||||||
missing.append('psutil 3.2.2+')
|
missing.append('psutil 5.0.0+')
|
||||||
except ImportError:
|
except ImportError:
|
||||||
missing.append('psutil 3.2.2+')
|
missing.append('psutil 5.0.0+')
|
||||||
try:
|
try:
|
||||||
from slugify import __version__ as slugifyVersion
|
from slugify import __version__ as slugifyVersion
|
||||||
if StrictVersion('1.1.4') > StrictVersion(slugifyVersion):
|
if StrictVersion('1.2.1') > StrictVersion(slugifyVersion):
|
||||||
missing.append('python-slugify 1.1.4+')
|
missing.append('python-slugify 1.2.1+')
|
||||||
except ImportError:
|
except ImportError:
|
||||||
missing.append('python-slugify 1.1.4+')
|
missing.append('python-slugify 1.2.1+')
|
||||||
try:
|
try:
|
||||||
from PIL import PILLOW_VERSION as pillowVersion
|
from PIL import PILLOW_VERSION as pillowVersion
|
||||||
if StrictVersion('3.0.0') > StrictVersion(pillowVersion):
|
if StrictVersion('4.0.0') > StrictVersion(pillowVersion):
|
||||||
missing.append('Pillow 3.0.0+')
|
missing.append('Pillow 4.0.0+')
|
||||||
except ImportError:
|
except ImportError:
|
||||||
missing.append('Pillow 3.0.0+')
|
missing.append('Pillow 4.0.0+')
|
||||||
if version_info[1] < 5:
|
|
||||||
try:
|
|
||||||
from scandir import __version__ as scandirVersion
|
|
||||||
if StrictVersion('1.1') > StrictVersion(scandirVersion):
|
|
||||||
missing.append('scandir 1.1+')
|
|
||||||
except ImportError:
|
|
||||||
missing.append('scandir 1.1+')
|
|
||||||
if len(missing) > 0:
|
if len(missing) > 0:
|
||||||
print('ERROR: ' + ', '.join(missing) + ' is not installed!')
|
print('ERROR: ' + ', '.join(missing) + ' is not installed!')
|
||||||
exit(1)
|
exit(1)
|
||||||
56
kindlecomicconverter/startup.py
Normal file
56
kindlecomicconverter/startup.py
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# Copyright (c) 2012-2014 Ciro Mattia Gonano <ciromattia@gmail.com>
|
||||||
|
# Copyright (c) 2013-2017 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.
|
||||||
|
#
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from . import __version__
|
||||||
|
from .shared import dependencyCheck
|
||||||
|
|
||||||
|
|
||||||
|
def start():
|
||||||
|
dependencyCheck(3)
|
||||||
|
from . import KCC_gui
|
||||||
|
os.environ['QT_AUTO_SCREEN_SCALE_FACTOR'] = "1"
|
||||||
|
KCCAplication = KCC_gui.QApplicationMessaging(sys.argv)
|
||||||
|
if KCCAplication.isRunning():
|
||||||
|
if len(sys.argv) > 1:
|
||||||
|
KCCAplication.sendMessage(sys.argv[1])
|
||||||
|
else:
|
||||||
|
KCCAplication.sendMessage('ARISE')
|
||||||
|
else:
|
||||||
|
KCCWindow = KCC_gui.QMainWindowKCC()
|
||||||
|
KCCUI = KCC_gui.KCCGUI(KCCAplication, KCCWindow)
|
||||||
|
if len(sys.argv) > 1:
|
||||||
|
KCCUI.handleMessage(sys.argv[1])
|
||||||
|
sys.exit(KCCAplication.exec_())
|
||||||
|
|
||||||
|
|
||||||
|
def startC2E():
|
||||||
|
dependencyCheck(2)
|
||||||
|
from .comic2ebook import main
|
||||||
|
print('comic2ebook v' + __version__ + ' - Written by Ciro Mattia Gonano and Pawel Jastrzebski.')
|
||||||
|
sys.exit(main(sys.argv[1:]))
|
||||||
|
|
||||||
|
|
||||||
|
def startC2P():
|
||||||
|
dependencyCheck(1)
|
||||||
|
from .comic2panel import main
|
||||||
|
print('comic2panel v' + __version__ + ' - Written by Ciro Mattia Gonano and Pawel Jastrzebski.')
|
||||||
|
sys.exit(main(sys.argv[1:]))
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
kindlecomicconverter: statically-linked-binary usr/bin/kcc
|
|
||||||
kindlecomicconverter: binary-without-manpage usr/bin/kcc
|
kindlecomicconverter: binary-without-manpage usr/bin/kcc
|
||||||
kindlecomicconverter: wrong-name-for-changelog-of-native-package usr/share/doc/kindlecomicconverter/changelog.Debian.gz
|
kindlecomicconverter: wrong-name-for-changelog-of-native-package usr/share/doc/kindlecomicconverter/changelog.Debian.gz
|
||||||
kindlecomicconverter: file-missing-in-md5sums usr/share/doc/kindlecomicconverter/changelog.Debian.gz
|
kindlecomicconverter: file-missing-in-md5sums usr/share/doc/kindlecomicconverter/changelog.Debian.gz
|
||||||
|
kindlecomicconverter: hardening-no-relro usr/bin/kcc
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ Name=Kindle Comic Converter
|
|||||||
GenericName=Kindle Comic Converter
|
GenericName=Kindle Comic Converter
|
||||||
Comment=Comic and Manga converter for e-book readers
|
Comment=Comic and Manga converter for e-book readers
|
||||||
Icon=/usr/share/kindlecomicconverter/comic2ebook.png
|
Icon=/usr/share/kindlecomicconverter/comic2ebook.png
|
||||||
Exec=/usr/bin/kcc
|
Exec=/usr/bin/kcc %f
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Categories=Graphics;
|
Categories=Graphics;
|
||||||
MimeType=application/zip;application/x-rar;application/x-7z-compressed;
|
MimeType=application/zip;application/x-rar;application/x-7z-compressed;
|
||||||
|
|||||||
BIN
other/linux/sentry.py.enc
Normal file
BIN
other/linux/sentry.py.enc
Normal file
Binary file not shown.
BIN
other/osx/7za
BIN
other/osx/7za
Binary file not shown.
@@ -6,10 +6,31 @@
|
|||||||
<string>English</string>
|
<string>English</string>
|
||||||
<key>CFBundleDisplayName</key>
|
<key>CFBundleDisplayName</key>
|
||||||
<string>Kindle Comic Converter</string>
|
<string>Kindle Comic Converter</string>
|
||||||
|
<key>CFBundleDocumentTypes</key>
|
||||||
|
<array>
|
||||||
|
<dict>
|
||||||
|
<key>CFBundleTypeExtensions</key>
|
||||||
|
<array>
|
||||||
|
<string>cbz</string>
|
||||||
|
<string>cbr</string>
|
||||||
|
<string>cb7</string>
|
||||||
|
<string>zip</string>
|
||||||
|
<string>rar</string>
|
||||||
|
<string>7z</string>
|
||||||
|
<string>pdf</string>
|
||||||
|
</array>
|
||||||
|
<key>CFBundleTypeIconFile</key>
|
||||||
|
<string>comic2ebook.icns</string>
|
||||||
|
<key>CFBundleTypeName</key>
|
||||||
|
<string>Comics</string>
|
||||||
|
<key>CFBundleTypeRole</key>
|
||||||
|
<string>Editor</string>
|
||||||
|
</dict>
|
||||||
|
</array>
|
||||||
<key>CFBundleExecutable</key>
|
<key>CFBundleExecutable</key>
|
||||||
<string>MacOS/Kindle Comic Converter</string>
|
<string>MacOS/Kindle Comic Converter</string>
|
||||||
<key>CFBundleGetInfoString</key>
|
<key>CFBundleGetInfoString</key>
|
||||||
<string>KindleComicConverter 5.0.1, written 2012-2015 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
|
<string>KindleComicConverter 5.4.1, written 2012-2017 by Ciro Mattia Gonano and Pawel Jastrzebski</string>
|
||||||
<key>CFBundleIconFile</key>
|
<key>CFBundleIconFile</key>
|
||||||
<string>comic2ebook.icns</string>
|
<string>comic2ebook.icns</string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIdentifier</key>
|
||||||
@@ -21,11 +42,11 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>5.0.1</string>
|
<string>5.4.1</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>5.0.1</string>
|
<string>5.4.1</string>
|
||||||
<key>LSEnvironment</key>
|
<key>LSEnvironment</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>PATH</key>
|
<key>PATH</key>
|
||||||
@@ -34,7 +55,7 @@
|
|||||||
<key>LSHasLocalizedDisplayName</key>
|
<key>LSHasLocalizedDisplayName</key>
|
||||||
<false/>
|
<false/>
|
||||||
<key>LSMinimumSystemVersion</key>
|
<key>LSMinimumSystemVersion</key>
|
||||||
<string>10.9.0</string>
|
<string>10.10.0</string>
|
||||||
<key>NSAppleScriptEnabled</key>
|
<key>NSAppleScriptEnabled</key>
|
||||||
<false/>
|
<false/>
|
||||||
<key>NSHumanReadableCopyright</key>
|
<key>NSHumanReadableCopyright</key>
|
||||||
|
|||||||
BIN
other/osx/sentry.py.enc
Normal file
BIN
other/osx/sentry.py.enc
Normal file
Binary file not shown.
BIN
other/osx/unrar
BIN
other/osx/unrar
Binary file not shown.
Binary file not shown.
BIN
other/windows/Cert.pfx.enc
Normal file
BIN
other/windows/Cert.pfx.enc
Normal file
Binary file not shown.
@@ -3,19 +3,20 @@
|
|||||||
{\flomajor\f31500\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
|
{\flomajor\f31500\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
|
||||||
{\fhimajor\f31502\fbidi \fswiss\fcharset238\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
|
{\fhimajor\f31502\fbidi \fswiss\fcharset238\fprq2{\*\panose 020f0302020204030204}Calibri Light;}{\fbimajor\f31503\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
|
||||||
{\flominor\f31504\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
|
{\flominor\f31504\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
|
||||||
{\fhiminor\f31506\fbidi \fswiss\fcharset238\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f41\fbidi \froman\fcharset0\fprq2 Times New Roman;}
|
{\fhiminor\f31506\fbidi \fswiss\fcharset238\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f44\fbidi \froman\fcharset0\fprq2 Times New Roman;}
|
||||||
{\f40\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f42\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f44\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
|
{\f43\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f45\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f46\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f47\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
|
||||||
{\f45\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f46\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f41\fbidi \froman\fcharset0\fprq2 Times New Roman;}
|
{\f48\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f49\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f50\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f44\fbidi \froman\fcharset0\fprq2 Times New Roman;}
|
||||||
{\f40\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f42\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f44\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
|
{\f43\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f45\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f46\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f47\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
|
||||||
{\f45\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f46\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f411\fbidi \fswiss\fcharset0\fprq2 Calibri;}
|
{\f48\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f49\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f50\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f414\fbidi \fswiss\fcharset0\fprq2 Calibri;}
|
||||||
{\f410\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f412\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f413\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f416\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
|
{\f413\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\f415\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f416\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f417\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}
|
||||||
{\f417\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31510\fbidi \froman\fcharset0\fprq2 Times New Roman;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
|
{\f418\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\f419\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f420\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31510\fbidi \froman\fcharset0\fprq2 Times New Roman;}
|
||||||
{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
|
{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
|
||||||
{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
|
{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
|
||||||
{\fdbmajor\f31520\fbidi \froman\fcharset0\fprq2 Times New Roman;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
|
{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31520\fbidi \froman\fcharset0\fprq2 Times New Roman;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
|
||||||
{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
|
{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
|
||||||
{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31530\fbidi \fswiss\fcharset0\fprq2 Calibri Light;}
|
{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
|
||||||
{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}
|
{\fhimajor\f31530\fbidi \fswiss\fcharset0\fprq2 Calibri Light;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}
|
||||||
|
{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}
|
||||||
{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31540\fbidi \froman\fcharset0\fprq2 Times New Roman;}
|
{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31540\fbidi \froman\fcharset0\fprq2 Times New Roman;}
|
||||||
{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
|
{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
|
||||||
{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
|
{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
|
||||||
@@ -26,20 +27,21 @@
|
|||||||
{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
|
{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
|
||||||
{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31570\fbidi \fswiss\fcharset0\fprq2 Calibri;}
|
{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31570\fbidi \fswiss\fcharset0\fprq2 Calibri;}
|
||||||
{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
|
{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
|
||||||
{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31580\fbidi \froman\fcharset0\fprq2 Times New Roman;}
|
{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
|
||||||
{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
|
{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31580\fbidi \froman\fcharset0\fprq2 Times New Roman;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
|
||||||
{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
|
{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
|
||||||
{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;
|
{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
|
||||||
\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;
|
{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
|
||||||
\chyperlink\ctint255\cshade255\red5\green99\blue193;\cfollowedhyperlink\ctint255\cshade255\red149\green79\blue114;}{\*\defchp \f31506\fs22\lang1045\langfe1033\langfenp1033 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1
|
\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\chyperlink\ctint255\cshade255\red5\green99\blue193;\cfollowedhyperlink\ctint255\cshade255\red149\green79\blue114;}{\*\defchp
|
||||||
\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0
|
\f31506\fs22\lang1045\langfe1033\langfenp1033 }{\*\defpap \ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1
|
||||||
\f31506\fs22\lang1045\langfe1033\cgrid\langnp1045\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
|
\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1045\langfe1033\cgrid\langnp1045\langfenp1033 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive
|
||||||
|
\ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
|
||||||
\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1
|
\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1
|
||||||
\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31506\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1045\langfe1033\cgrid\langnp1045\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive
|
\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31506\afs22\alang1025 \ltrch\fcs0 \f31506\fs22\lang1045\langfe1033\cgrid\langnp1045\langfenp1033 \snext11 \ssemihidden \sunhideused Normal Table;}{\*\cs15 \additive
|
||||||
\rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf17 \sbasedon10 \sunhideused \styrsid3562894 Hyperlink;}{\*\cs16 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf18 \sbasedon10 \ssemihidden \sunhideused \styrsid7678248 FollowedHyperlink;}}{\*\rsidtbl \rsid1081196
|
\rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf17 \sbasedon10 \sunhideused \styrsid3562894 Hyperlink;}{\*\cs16 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf18 \sbasedon10 \ssemihidden \sunhideused \styrsid7678248 FollowedHyperlink;}}{\*\rsidtbl \rsid1081196
|
||||||
\rsid3146412\rsid3562894\rsid5731975\rsid7678248\rsid9265883\rsid11107340\rsid12600926\rsid13187577}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info
|
\rsid3146412\rsid3562894\rsid5731975\rsid7678248\rsid9265883\rsid11107340\rsid11629590\rsid12600926\rsid13187577}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info
|
||||||
{\author Pawe\'b3 Jastrz\'eabski}{\operator Pawe\'b3 Jastrz\'eabski}{\creatim\yr2013\mo10\dy29\hr15\min17}{\revtim\yr2013\mo10\dy29\hr15\min28}{\version8}{\edmins8}{\nofpages1}{\nofwords33}{\nofchars200}{\nofcharsws232}{\vern57435}}{\*\xmlnstbl {\xmlns1 h
|
{\author Pawe\'b3 Jastrz\'eabski}{\operator Pawe\'b3 Jastrz\'eabski}{\creatim\yr2013\mo10\dy29\hr15\min17}{\revtim\yr2017\mo8\dy20\hr17\min40}{\version9}{\edmins8}{\nofpages1}{\nofwords33}{\nofchars201}{\nofcharsws233}{\vern39}}{\*\xmlnstbl {\xmlns1 http:
|
||||||
ttp://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl1417\margr1417\margt1417\margb1417\gutter0\ltrsect
|
//schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl1417\margr1417\margt1417\margb1417\gutter0\ltrsect
|
||||||
\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
|
\deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
|
||||||
\showxmlerrors1\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1417\dgvorigin1417\dghshow1\dgvshow1
|
\showxmlerrors1\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1417\dgvorigin1417\dghshow1\dgvshow1
|
||||||
\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
|
\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
|
||||||
@@ -52,12 +54,13 @@ ttp://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\ma
|
|||||||
\b\fs52\cf6\lang2057\langfe1033\langnp2057\insrsid13187577\charrsid3562894
|
\b\fs52\cf6\lang2057\langfe1033\langnp2057\insrsid13187577\charrsid3562894
|
||||||
\par }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid1081196 Creation of}{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
\par }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid1081196 Creation of}{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
||||||
\b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 MOBI}{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 files }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
\b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 MOBI}{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 files }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
||||||
\fs28\lang2057\langfe1033\langnp2057\insrsid5731975\charrsid12600926 require additional software.}{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926
|
\fs28\lang2057\langfe1033\langnp2057\insrsid5731975\charrsid12600926 require}{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid11629590 s}{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
||||||
|
\fs28\lang2057\langfe1033\langnp2057\insrsid5731975\charrsid12600926 additional software.}{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926
|
||||||
\par }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 Please download: }{\field\flddirty{\*\fldinst {\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
\par }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 Please download: }{\field\flddirty{\*\fldinst {\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
||||||
\b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 HYPERLINK "http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211" }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926
|
\b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 HYPERLINK "http://www.amazon.com/gp/feature.html?ie=UTF8&docId=1000765211" }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926
|
||||||
{\*\datafield
|
{\*\datafield
|
||||||
00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b9600000068007400740070003a002f002f007700770077002e0061006d0061007a006f006e002e0063006f006d002f00670070002f0066006500610074007500720065002e00680074006d006c003f00690065003d00
|
00d0c9ea79f9bace118c8200aa004ba90b0200000003000000e0c9ea79f9bace118c8200aa004ba90b9600000068007400740070003a002f002f007700770077002e0061006d0061007a006f006e002e0063006f006d002f00670070002f0066006500610074007500720065002e00680074006d006c003f00690065003d00
|
||||||
5500540046003800260064006f006300490064003d0031003000300030003700360035003200310031000000795881f43b1d7f48af2c825dc485276300000000a5ab000000}}}{\fldrslt {\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
5500540046003800260064006f006300490064003d0031003000300030003700360035003200310031000000795881f43b1d7f48af2c825dc485276300000000a5ab00000000}}}{\fldrslt {\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
||||||
\cs15\b\fs28\ul\cf17\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 KindleGen}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
\cs15\b\fs28\ul\cf17\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 KindleGen}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\rtlch\fcs1 \af0\afs24 \ltrch\fcs0
|
||||||
\b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926
|
\b\fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926
|
||||||
\par }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 And place }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \i\fs28\lang2057\langfe1033\langnp2057\insrsid5731975\charrsid12600926 kindlegen.exe}{\rtlch\fcs1
|
\par }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \fs28\lang2057\langfe1033\langnp2057\insrsid3562894\charrsid12600926 And place }{\rtlch\fcs1 \af0\afs24 \ltrch\fcs0 \i\fs28\lang2057\langfe1033\langnp2057\insrsid5731975\charrsid12600926 kindlegen.exe}{\rtlch\fcs1
|
||||||
@@ -119,7 +122,7 @@ d40384e4350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719a
|
|||||||
617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
|
617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
|
||||||
6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
|
6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
|
||||||
656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
|
656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
|
||||||
{\*\latentstyles\lsdstimax371\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
|
{\*\latentstyles\lsdstimax375\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
|
||||||
\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
|
\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
|
||||||
\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
|
\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
|
||||||
\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
|
\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
|
||||||
@@ -196,7 +199,8 @@ d40384e4350d363f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719a
|
|||||||
\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
|
\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
|
||||||
\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
|
\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
|
||||||
\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
|
\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
|
||||||
\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;}}{\*\datastore 010500000200000018000000
|
\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
|
||||||
|
\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;}}{\*\datastore 010500000200000018000000
|
||||||
4d73786d6c322e534158584d4c5265616465722e362e30000000000000000000000e0000
|
4d73786d6c322e534158584d4c5265616465722e362e30000000000000000000000e0000
|
||||||
d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff0900060000000000000000000000010000000100000000000000001000000200000001000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff0900060000000000000000000000010000000100000000000000001000000200000001000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
@@ -206,24 +210,24 @@ fffffffffffffffffdffffff04000000feffffff05000000fefffffffeffffffffffffffffffffff
|
|||||||
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffff010000000c6ad98892f1d411a65f0040963251e50000000000000000000000006069
|
ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffff010000000c6ad98892f1d411a65f0040963251e5000000000000000000000000b00f
|
||||||
e214b3d4ce010300000080020000000000004d0073006f004400610074006100530074006f0072006500000000000000000000000000000000000000000000000000000000000000000000000000000000001a000101ffffffffffffffff0200000000000000000000000000000000000000000000006069e214b3d4ce01
|
9da8ca19d30103000000c0020000000000004d0073006f004400610074006100530074006f0072006500000000000000000000000000000000000000000000000000000000000000000000000000000000001a000101ffffffffffffffff020000000000000000000000000000000000000000000000b00f9da8ca19d301
|
||||||
6069e214b3d4ce010000000000000000000000003500d900ca00dd00ce004400cc00c8005a0045004700c400cd0057004900c500d400c900cb00ce00570051003d003d000000000000000000000000000000000032000101ffffffffffffffff0300000000000000000000000000000000000000000000006069e214b3d4
|
b00f9da8ca19d301000000000000000000000000ca0041004300c300d300d300c70058004d00d4003000c9004d00c200590043003100320055004a00300051003d003d000000000000000000000000000000000032000101ffffffffffffffff030000000000000000000000000000000000000000000000b00f9da8ca19
|
||||||
ce016069e214b3d4ce010000000000000000000000004900740065006d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000201ffffffff04000000ffffffff000000000000000000000000000000000000000000000000
|
d301b00f9da8ca19d3010000000000000000000000004900740065006d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000201ffffffff04000000ffffffff000000000000000000000000000000000000000000000000
|
||||||
00000000000000000000000000000000fc00000000000000010000000200000003000000feffffff0500000006000000070000000800000009000000feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
00000000000000000000000000000000320100000000000001000000020000000300000004000000feffffff060000000700000008000000090000000a000000feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3c623a536f75726365732053656c65637465645374796c653d225c415041536978746845646974696f6e4f66666963654f6e6c696e652e78736c22205374796c654e616d653d22415041222056657273696f6e3d22362220786d6c6e733a
|
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d226e6f223f3e3c623a536f75726365732053656c65637465645374796c653d225c41504153697874684564697469
|
||||||
623d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f6772617068792220786d6c6e733d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e74
|
6f6e4f66666963654f6e6c696e652e78736c22205374796c654e616d653d22415041222056657273696f6e3d22362220786d6c6e733a623d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222078
|
||||||
2f323030362f6269626c696f677261706879223e3c2f623a536f75726365733e000000003c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d226e6f223f3e0d0a3c64733a6461746173746f72654974656d2064733a6974656d49443d227b42384244
|
6d6c6e733d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879223e3c2f623a536f75726365733e00000000000000000000000000003c3f786d6c2076657273696f6e3d22312e302220656e636f6469
|
||||||
394137462d323833422d343136342d413442352d3632323544323941454535397d2220786d6c6e733a64733d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f637573746f6d586d6c223e3c64733a736368656d61526566733e3c
|
6e673d225554462d3822207374616e64616c6f6e653d226e6f223f3e0d0a3c64733a6461746173746f72654974656d2064733a6974656d49443d227b43464133303041382d443733392d343633332d413933322d3236303236444335303936397d2220786d6c6e733a64733d22687474703a2f2f736368656d61732e6f70
|
||||||
64733a736368656d615265662064733a7572693d22687474703a2f2f736368656d61732e6f70656e500072006f007000650072007400690065007300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000200ffffffffffffffffffffffff000000000000
|
656e786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f637573500072006f007000650072007400690065007300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000200ffffffffffffffffffffffff000000000000
|
||||||
0000000000000000000000000000000000000000000000000000000000000400000055010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000
|
0000000000000000000000000000000000000000000000000000000000000500000055010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000
|
||||||
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000
|
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000
|
||||||
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff
|
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff
|
||||||
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000786d6c666f726d6174732e6f72672f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222f3e3c2f64733a736368656d61526566733e3c2f64733a6461746173746f
|
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746f6d586d6c223e3c64733a736368656d61526566733e3c64733a736368656d615265662064733a7572693d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f7267
|
||||||
72654974656d3e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
2f6f6666696365446f63756d656e742f323030362f6269626c696f677261706879222f3e3c2f64733a736368656d61526566733e3c2f64733a6461746173746f72654974656d3e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
|
||||||
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105000000000000}}
|
00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000105000000000000}}
|
||||||
Binary file not shown.
3
other/windows/sentry.py.enc
Normal file
3
other/windows/sentry.py.enc
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
éd¼7¶ÍÑ<>ßñ|l“z6¯n¸I_œ—Å ž :£ê-ˆ!ën‚BCDÇ}fðzIe|¦ÜÖà\9KW°f½H[íY¶LYô7^Ï@mª*<2A>YmÎ_z`3©WS D{Ö "áˆa@>®;}\¥—,D›š˜Ý·Ý!yX<79>±è–<C3A8>¯~ÿ~Y_æxdÕï BøŠ T
|
||||||
|
B”𢯣
|
||||||
|
uô|91u~¿Pa¸¸LDÜjh
|
||||||
BIN
other/windows/vc_redist.x64.exe
Normal file
BIN
other/windows/vc_redist.x64.exe
Normal file
Binary file not shown.
5
requirements.txt
Normal file
5
requirements.txt
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
PyQt5>=5.6.0
|
||||||
|
Pillow>=4.0.0
|
||||||
|
psutil>=5.0.0
|
||||||
|
python-slugify>=1.2.1
|
||||||
|
raven>=6.0.0
|
||||||
4
setup.bat
Normal file
4
setup.bat
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
@echo off
|
||||||
|
verpatch\lib\win\verpatch dist\KCC.exe %1 /va /pv %1 /s product "Kindle Comic Converter" /s description "Kindle Comic Converter" /s copyright "Copyright (C) 2012-2017 Ciro Mattia Gonano and Pawel Jastrzebski"
|
||||||
|
"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe" sign /f "%APPVEYOR_BUILD_FOLDER%\other\windows\Cert.pfx" /p "%CERT_PASS%" /t http://time.certum.pl /d "Kindle Comic Converter" /du "http://kcc.iosphe.re/" dist/KCC.exe
|
||||||
|
iscc /SSignTool="""C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe"" sign /f ""%APPVEYOR_BUILD_FOLDER%\other\windows\Cert.pfx"" /p ""%CERT_PASS%"" /t http://time.certum.pl $p" kcc.iss >nul 2>&1
|
||||||
131
setup.py
131
setup.py
@@ -2,11 +2,11 @@
|
|||||||
"""
|
"""
|
||||||
pip/pyinstaller build script for KCC.
|
pip/pyinstaller build script for KCC.
|
||||||
|
|
||||||
Usage (Windows):
|
Install as Python package:
|
||||||
py -3 setup.py build_binary
|
python3 setup.py install
|
||||||
|
|
||||||
Usage (Linux/OS X):
|
Create EXE/APP/DEB:
|
||||||
python3 setup.py build_binary or python3 setup.py build_binary --pyz
|
python3 setup.py build_binary
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
@@ -14,31 +14,28 @@ import sys
|
|||||||
import shutil
|
import shutil
|
||||||
import setuptools
|
import setuptools
|
||||||
import distutils.cmd
|
import distutils.cmd
|
||||||
from distutils.command.build import build
|
from kindlecomicconverter import __version__
|
||||||
from kcc import __version__
|
|
||||||
|
|
||||||
NAME = 'KindleComicConverter'
|
NAME = 'KindleComicConverter'
|
||||||
MAIN = 'kcc.py'
|
MAIN = 'kcc.py'
|
||||||
VERSION = __version__
|
VERSION = __version__
|
||||||
OPTIONS = {}
|
|
||||||
|
|
||||||
|
|
||||||
class BuildBinaryCommand(distutils.cmd.Command):
|
class BuildBinaryCommand(distutils.cmd.Command):
|
||||||
description = 'build binary release'
|
description = 'build binary release'
|
||||||
user_options = [
|
user_options = []
|
||||||
('pyz', None, 'build PYZ package'),
|
|
||||||
]
|
|
||||||
|
|
||||||
def initialize_options(self):
|
def initialize_options(self):
|
||||||
# noinspection PyAttributeOutsideInit
|
pass
|
||||||
self.pyz = False
|
|
||||||
|
|
||||||
def finalize_options(self):
|
def finalize_options(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
# noinspection PyShadowingNames
|
||||||
def run(self):
|
def run(self):
|
||||||
|
VERSION = __version__
|
||||||
if sys.platform == 'darwin':
|
if sys.platform == 'darwin':
|
||||||
os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s --noupx kcc.py')
|
os.system('pyinstaller -y -F -i icons/comic2ebook.icns -n "Kindle Comic Converter" -w -s kcc.py')
|
||||||
shutil.copy('other/osx/7za', 'dist/Kindle Comic Converter.app/Contents/Resources')
|
shutil.copy('other/osx/7za', 'dist/Kindle Comic Converter.app/Contents/Resources')
|
||||||
shutil.copy('other/osx/unrar', 'dist/Kindle Comic Converter.app/Contents/Resources')
|
shutil.copy('other/osx/unrar', 'dist/Kindle Comic Converter.app/Contents/Resources')
|
||||||
shutil.copy('other/osx/Info.plist', 'dist/Kindle Comic Converter.app/Contents')
|
shutil.copy('other/osx/Info.plist', 'dist/Kindle Comic Converter.app/Contents')
|
||||||
@@ -46,83 +43,37 @@ class BuildBinaryCommand(distutils.cmd.Command):
|
|||||||
shutil.copy('other/windows/Additional-LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
|
shutil.copy('other/windows/Additional-LICENSE.txt', 'dist/Kindle Comic Converter.app/Contents/Resources')
|
||||||
os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/unrar', 0o777)
|
os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/unrar', 0o777)
|
||||||
os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 0o777)
|
os.chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 0o777)
|
||||||
if os.path.isfile('setup.sh'):
|
|
||||||
os.system('./setup.sh')
|
|
||||||
os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
|
os.system('appdmg kcc.json dist/KindleComicConverter_osx_' + VERSION + '.dmg')
|
||||||
exit(0)
|
exit(0)
|
||||||
elif sys.platform == 'win32':
|
elif sys.platform == 'win32':
|
||||||
os.system('pyinstaller -y -F -i icons\comic2ebook.ico -n KCC -w --noupx kcc.py')
|
os.system('pyinstaller -y -F -i icons\comic2ebook.ico -n KCC -w --noupx kcc.py')
|
||||||
if os.path.isfile('setup.bat'):
|
if os.getenv('APPVEYOR'):
|
||||||
|
if len(VERSION) == 3:
|
||||||
|
VERSION = VERSION + '.0'
|
||||||
os.system('setup.bat ' + VERSION)
|
os.system('setup.bat ' + VERSION)
|
||||||
exit(0)
|
exit(0)
|
||||||
else:
|
else:
|
||||||
if self.pyz:
|
os.system('pyinstaller -y -F kcc.py')
|
||||||
script = '''
|
os.system('mkdir -p dist/usr/bin dist/usr/share/applications dist/usr/share/doc/kindlecomicconverter '
|
||||||
cp kcc.py __main__.py
|
'dist/usr/share/kindlecomicconverter dist/usr/share/lintian/overrides')
|
||||||
zip kcc.zip __main__.py kcc/*.py
|
os.system('mv dist/kcc dist/usr/bin')
|
||||||
echo "#!/usr/bin/env python3" > kcc-bin
|
os.system('cp icons/comic2ebook.png dist/usr/share/kindlecomicconverter')
|
||||||
cat kcc.zip >> kcc-bin
|
os.system('cp LICENSE.txt dist/usr/share/doc/kindlecomicconverter/copyright')
|
||||||
chmod +x kcc-bin
|
os.system('cp other/linux/kindlecomicconverter.desktop dist/usr/share/applications')
|
||||||
|
os.system('cp other/linux/kindlecomicconverter dist/usr/share/lintian/overrides')
|
||||||
cp kcc-c2e.py __main__.py
|
os.chdir('dist')
|
||||||
zip kcc-c2e.zip __main__.py kcc/*.py
|
os.system('fpm -f -s dir -t deb -n kindlecomicconverter -v ' + VERSION +
|
||||||
echo "#!/usr/bin/env python3" > kcc-c2e-bin
|
' -m "Paweł Jastrzębski <pawelj@iosphe.re>" --license "ISC" '
|
||||||
cat kcc-c2e.zip >> kcc-c2e-bin
|
'--description "$(printf "Comic and Manga converter for e-book '
|
||||||
chmod +x kcc-c2e-bin
|
'readers.\nThis app allows you to transform your PNG, JPG, GIF, '
|
||||||
|
'CBZ, CBR and CB7 files\ninto EPUB or MOBI format e-books.")" '
|
||||||
cp kcc-c2p.py __main__.py
|
'--url "https://kcc.iosphe.re/" --deb-priority "optional" --vendor "" '
|
||||||
zip kcc-c2p.zip __main__.py kcc/*.py
|
'--category "graphics" -d "unrar | unrar-free" -d "p7zip-full" -d "libc6" usr')
|
||||||
echo "#!/usr/bin/env python3" > kcc-c2p-bin
|
exit(0)
|
||||||
cat kcc-c2p.zip >> kcc-c2p-bin
|
|
||||||
chmod +x kcc-c2p-bin
|
|
||||||
|
|
||||||
mkdir dist
|
|
||||||
tar --xform s:^.*/:: \
|
|
||||||
--xform s/LICENSE.txt/LICENSE/ \
|
|
||||||
--xform s/kcc-bin/kcc/ \
|
|
||||||
--xform s/kcc-c2p-bin/kcc-c2p/ \
|
|
||||||
--xform s/kcc-c2e-bin/kcc-c2e/ \
|
|
||||||
--xform s/comic2ebook/kcc/ \
|
|
||||||
-czf dist/KindleComicConverter_linux_''' + VERSION + '''.tar.gz \
|
|
||||||
kcc-bin kcc-c2e-bin kcc-c2p-bin LICENSE.txt README.md icons/comic2ebook.png
|
|
||||||
rm __main__.py kcc.zip kcc-c2e.zip kcc-c2p.zip kcc-bin kcc-c2e-bin kcc-c2p-bin
|
|
||||||
'''
|
|
||||||
os.system("bash -c '%s'" % script)
|
|
||||||
exit(0)
|
|
||||||
else:
|
|
||||||
os.system('docker build --no-cache -t kcc . && docker run --rm -v ' + os.getcwd() +
|
|
||||||
':/out kcc && docker rmi kcc')
|
|
||||||
exit(0)
|
|
||||||
|
|
||||||
|
|
||||||
class BuildCommand(build):
|
|
||||||
def run(self):
|
|
||||||
os.makedirs('build/_scripts/', exist_ok=True)
|
|
||||||
shutil.copyfile('kcc.py', 'build/_scripts/kcc')
|
|
||||||
shutil.copyfile('kcc-c2e.py', 'build/_scripts/kcc-c2e')
|
|
||||||
shutil.copyfile('kcc-c2p.py', 'build/_scripts/kcc-c2p')
|
|
||||||
# noinspection PyShadowingNames
|
|
||||||
OPTIONS = dict(
|
|
||||||
scripts=['build/_scripts/kcc',
|
|
||||||
'build/_scripts/kcc-c2e',
|
|
||||||
'build/_scripts/kcc-c2p'],
|
|
||||||
packages=['kcc'],
|
|
||||||
install_requires=[
|
|
||||||
'Pillow>=3.0.0',
|
|
||||||
'psutil>=3.2.2',
|
|
||||||
'python-slugify>=1.1.4',
|
|
||||||
],
|
|
||||||
zip_safe=False,
|
|
||||||
)
|
|
||||||
if sys.version_info[1] < 5:
|
|
||||||
OPTIONS['install_requires'].append('scandir>=1.1.0')
|
|
||||||
build.run(self)
|
|
||||||
|
|
||||||
|
|
||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
cmdclass={
|
cmdclass={
|
||||||
'build_binary': BuildBinaryCommand,
|
'build_binary': BuildBinaryCommand,
|
||||||
'build': BuildCommand,
|
|
||||||
},
|
},
|
||||||
name=NAME,
|
name=NAME,
|
||||||
version=VERSION,
|
version=VERSION,
|
||||||
@@ -130,7 +81,25 @@ setuptools.setup(
|
|||||||
author_email='ciromattia@gmail.com, pawelj@iosphe.re',
|
author_email='ciromattia@gmail.com, pawelj@iosphe.re',
|
||||||
description='Comic and Manga converter for e-book readers.',
|
description='Comic and Manga converter for e-book readers.',
|
||||||
license='ISC License (ISCL)',
|
license='ISC License (ISCL)',
|
||||||
keywords='kindle comic mobipocket mobi cbz cbr manga',
|
keywords=['kindle', 'kobo', 'comic', 'manga', 'mobi', 'epub', 'cbz'],
|
||||||
url='http://github.com/ciromattia/kcc',
|
url='http://github.com/ciromattia/kcc',
|
||||||
**OPTIONS
|
entry_points={
|
||||||
|
'console_scripts': [
|
||||||
|
'kcc-c2e = kindlecomicconverter.startup:startC2E',
|
||||||
|
'kcc-c2p = kindlecomicconverter.startup:startC2P',
|
||||||
|
],
|
||||||
|
'gui_scripts': [
|
||||||
|
'kcc = kindlecomicconverter.startup:start',
|
||||||
|
],
|
||||||
|
},
|
||||||
|
packages=['kindlecomicconverter'],
|
||||||
|
install_requires=[
|
||||||
|
'PyQt5>=5.6.0',
|
||||||
|
'Pillow>=4.0.0',
|
||||||
|
'psutil>=5.0.0',
|
||||||
|
'python-slugify>=1.2.1',
|
||||||
|
'raven>=6.0.0',
|
||||||
|
],
|
||||||
|
classifiers=[],
|
||||||
|
zip_safe=False,
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user