diff options
| -rw-r--r-- | gui/KCC-OSX.ui | 6 | ||||
| -rw-r--r-- | kcc/KCC_ui_osx.py | 2 | ||||
| -rw-r--r-- | kcc/shared.py | 12 | ||||
| -rwxr-xr-x | setup.py | 8 |
4 files changed, 18 insertions, 10 deletions
diff --git a/gui/KCC-OSX.ui b/gui/KCC-OSX.ui index 19768ee..7000969 100644 --- a/gui/KCC-OSX.ui +++ b/gui/KCC-OSX.ui @@ -462,6 +462,12 @@ <property name="selectionMode"> <enum>QAbstractItemView::NoSelection</enum> </property> + <property name="verticalScrollMode"> + <enum>QAbstractItemView::ScrollPerPixel</enum> + </property> + <property name="horizontalScrollMode"> + <enum>QAbstractItemView::ScrollPerPixel</enum> + </property> </widget> <widget class="QPushButton" name="BasicModeButton"> <property name="geometry"> diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py index 6184b04..55f1a19 100644 --- a/kcc/KCC_ui_osx.py +++ b/kcc/KCC_ui_osx.py @@ -188,6 +188,8 @@ class Ui_KCC(object): 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.BasicModeButton = QtWidgets.QPushButton(self.Form) self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 156, 41)) diff --git a/kcc/shared.py b/kcc/shared.py index fdde6e6..eac6bf8 100644 --- a/kcc/shared.py +++ b/kcc/shared.py @@ -133,10 +133,10 @@ def dependencyCheck(level): if level > 2: try: from PyQt5.QtCore import qVersion as qtVersion - if StrictVersion('5.2.0') > StrictVersion(qtVersion()): - missing.append('PyQt 5.2.0+') + if StrictVersion('5.4.0') > StrictVersion(qtVersion()): + missing.append('PyQt 5.4.0+') except ImportError: - missing.append('PyQt 5.2.0+') + missing.append('PyQt 5.4.0+') if level > 1: try: from psutil import __version__ as psutilVersion @@ -146,10 +146,10 @@ def dependencyCheck(level): missing.append('psutil 3.0.0+') try: from slugify import __version__ as slugifyVersion - if StrictVersion('1.1.2') > StrictVersion(slugifyVersion): - missing.append('python-slugify 1.1.2+') + if StrictVersion('1.1.3') > StrictVersion(slugifyVersion): + missing.append('python-slugify 1.1.3+') except ImportError: - missing.append('python-slugify 1.1.2+') + missing.append('python-slugify 1.1.3+') try: from PIL import PILLOW_VERSION as pillowVersion if StrictVersion('2.8.2') > StrictVersion(pillowVersion): diff --git a/setup.py b/setup.py index 149e627..8a7c8cc 100755 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ if platform == 'darwin': py2app=dict( argv_emulation=True, iconfile='icons/comic2ebook.icns', - includes=['sip', 'PyQt5.QtPrintSupport'], + includes=['sip'], resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'], plist=dict( CFBundleName='Kindle Comic Converter', @@ -49,7 +49,7 @@ if platform == 'darwin': CFBundleTypeRole='Editor', ) ], - LSMinimumSystemVersion='10.10.0', + LSMinimumSystemVersion='10.8.0', LSEnvironment=dict( PATH='./../Resources:/usr/local/bin:/usr/bin:/bin' ), @@ -135,7 +135,7 @@ else: install_requires=[ 'Pillow>=2.8.2', 'psutil>=3.0.0', - 'python-slugify>=1.1.2', + 'python-slugify>=1.1.3', 'scandir>=1.1.0', ], zip_safe=False, @@ -158,4 +158,4 @@ if platform == 'darwin': copyfile('other/libqcocoa.dylib', 'dist/Kindle Comic Converter.app/Contents/PlugIns/platforms/libqcocoa.dylib') chmod('dist/Kindle Comic Converter.app/Contents/Resources/unrar', 0o777) chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 0o777) - system('appdmg setup.json KindleComicConverter_osx_' + VERSION + '.dmg') + system('appdmg setup.json dist/KindleComicConverter_osx_' + VERSION + '.dmg') |