From 67de77538cc0c317a0fc3d1ce628ed829f2bd9e1 Mon Sep 17 00:00:00 2001 From: Paweł Jastrzębski Date: Sat, 15 Jul 2017 12:00:19 +0200 Subject: Disable Panel View for Kindle Keyboard (#238) --- kindlecomicconverter/KCC_gui.py | 2 +- kindlecomicconverter/comic2ebook.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 5a3b538..bd47eb0 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -950,7 +950,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'DefaultUpscale': False, 'Label': 'K1'}, "Kindle 2": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K2'}, - "Kindle 3": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, + "Kindle 3": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K3'}, } profilesGUI = [ diff --git a/kindlecomicconverter/comic2ebook.py b/kindlecomicconverter/comic2ebook.py index 1bffcc4..b7487b8 100755 --- a/kindlecomicconverter/comic2ebook.py +++ b/kindlecomicconverter/comic2ebook.py @@ -967,7 +967,7 @@ def checkOptions(): if options.format == 'MOBI' and options.batchsplit != 2: options.batchsplit = 1 # 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 == 'K3' or options.profile == 'KDX': options.panelview = False options.hq = False # Webtoon mode mandatory options -- cgit 1.4.1 From 9babe68d2aefe6760fbc500ecdc16a102eff9093 Mon Sep 17 00:00:00 2001 From: Paweł Jastrzębski Date: Wed, 16 Aug 2017 18:55:20 +0200 Subject: Start using Travis CI as OS X binary builder --- .travis.yml | 24 ++++++++++++++++++++++++ other/osx/sentry.py.enc | Bin 0 -> 176 bytes 2 files changed, 24 insertions(+) create mode 100644 .travis.yml create mode 100644 other/osx/sentry.py.enc diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b1d9a4c --- /dev/null +++ b/.travis.yml @@ -0,0 +1,24 @@ +language: generic +os: osx +osx_image: xcode6.4 +before_install: +- brew update +- brew install python3 +- brew upgrade node +- pip3 install --upgrade pip setuptools wheel +- openssl aes-256-cbc -K $encrypted_ed1022070d5f_key -iv $encrypted_ed1022070d5f_iv -in other/osx/sentry.py.enc -out kindlecomicconverter/sentry.py -d +install: +- pip3 install -r requirements.txt +- pip3 install pyinstaller certifi +- npm install appdmg +script: python3 setup.py build_binary +deploy: + provider: releases + api_key: + secure: hLjRHmcFILPvKtn0PzWrt/8ImFKGmSKzdIOj6VNANwFDPl+2tIl3pVl7MlRq6KBYU8RiV+cUDVvxG7T59WY4Dd74FSvECKjaNdSo2+00oiuovr0PHznvzH+/gDY2GOrgZihOILILgx0HYRqLQls+h5vlPPQwW6XShvaFfGT20837+ycT6EQ77mZAfXpm7agUe8tjdxV/qqrnFnHasymZiqkqd3+uZa07QfZHh1piwdNR/fAKwJXufcFcntOSs/lyTlFMIuwdtAv2mixqm3ePTrMYEX3hqv6b+dy7Usc3d88M9NKBemggQdHSWbM+xedtSEM/h2MQS/VLXsmTsXx2MgAs8r1uTf2/uecbpeOZMcFgiOx1q/nqbUnEjGPhyeaA3VNMGaXrKmiXXIe2ZHmFALTHfXoMfznJTJa53JJ7yWAmMtryt7WRNGv3TvdLkK6Jn+GY6jtvGpOWPDTGUM6afoRUyeyAb5owZGBcSCTNv+ZJFpiJPOBRg80hX3iiCtWT3q4AC6OqNko20j/yesFPTh1z+dSTGnu9TUFF5b8FcVzUSkd+y153IxVsuveq7U18uczDX+GtP/2HlMHBwwxqC/cgBibxLLsQYK7MK9esocxT4X/otsNLKgvCPhFSZ19YpHSzYSvyOtziE49n63bqbagRxK+sR5UYz8MoQeCkn24= + file_glob: true + file: dist/KindleComicConverter_osx_* + skip_cleanup: true + on: + repo: AcidWeb/kcc + tags: true diff --git a/other/osx/sentry.py.enc b/other/osx/sentry.py.enc new file mode 100644 index 0000000..15fca24 Binary files /dev/null and b/other/osx/sentry.py.enc differ -- cgit 1.4.1 From 066d1401bd712263ddcbf6182f49f77e04fc71e6 Mon Sep 17 00:00:00 2001 From: Paweł Jastrzębski Date: Thu, 17 Aug 2017 10:11:24 +0200 Subject: Cleaned profile list --- kindlecomicconverter/KCC_gui.py | 18 +++++++++++------- kindlecomicconverter/comic2ebook.py | 8 ++++---- kindlecomicconverter/image.py | 4 ++-- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index bd47eb0..f1cdd5a 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -927,7 +927,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Kindle PW 1/2": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'KPW'}, "Kindle": {'PVOptions': True, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'Label': 'K45'}, + 'DefaultUpscale': False, 'Label': 'K578'}, "Kindle DX/DXG": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 2, 'DefaultUpscale': False, 'Label': 'KDX'}, "Kobo Mini/Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 1, @@ -950,8 +950,10 @@ class KCCGUI(KCC_ui.Ui_mainWindow): 'DefaultUpscale': False, 'Label': 'K1'}, "Kindle 2": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, 'DefaultUpscale': False, 'Label': 'K2'}, - "Kindle 3": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, - 'DefaultUpscale': False, 'Label': 'K3'}, + "Kindle Keyboard": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': False, 'Label': 'K34'}, + "Kindle Touch": {'PVOptions': False, 'ForceExpert': False, 'DefaultFormat': 0, + 'DefaultUpscale': False, 'Label': 'K34'}, } profilesGUI = [ "Kindle Oasis", @@ -964,16 +966,18 @@ class KCCGUI(KCC_ui.Ui_mainWindow): "Kobo Aura H2O", "Kobo Aura HD", "Kobo Aura", - "Kobo Glo HD", - "Kobo Glo", - "Kobo Mini/Touch", "Separator", "Other", "Separator", + "Kindle Touch", + "Kindle Keyboard", "Kindle DX/DXG", - "Kindle 3", "Kindle 2", "Kindle 1", + "Separator", + "Kobo Glo HD", + "Kobo Glo", + "Kobo Mini/Touch", ] statusBarLabel = QtWidgets.QLabel('HOMEPAGE - Date: Sat, 19 Aug 2017 20:26:18 +0200 Subject: Updated Docker recipe --- docker/Build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Build b/docker/Build index 6135fb9..53ca557 100755 --- a/docker/Build +++ b/docker/Build @@ -2,7 +2,7 @@ set -e pip3 install --upgrade pip setuptools wheel -pip3 install pillow python-slugify psutil pyinstaller raven pyqt5 certifi +pip3 install pillow python-slugify psutil raven pyqt5 certifi https://github.com/pyinstaller/pyinstaller/archive/develop.zip gem install fpm cd /app -- cgit 1.4.1