mirror of
https://github.com/ciromattia/kcc
synced 2025-12-18 12:11:46 +00:00
Updated OSX release to QT 5.5
This commit is contained in:
@@ -462,6 +462,12 @@
|
|||||||
<property name="selectionMode">
|
<property name="selectionMode">
|
||||||
<enum>QAbstractItemView::NoSelection</enum>
|
<enum>QAbstractItemView::NoSelection</enum>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="verticalScrollMode">
|
||||||
|
<enum>QAbstractItemView::ScrollPerPixel</enum>
|
||||||
|
</property>
|
||||||
|
<property name="horizontalScrollMode">
|
||||||
|
<enum>QAbstractItemView::ScrollPerPixel</enum>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QPushButton" name="BasicModeButton">
|
<widget class="QPushButton" name="BasicModeButton">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
|
|||||||
@@ -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.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.setProperty("showDropIndicator", False)
|
||||||
self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
|
self.JobList.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection)
|
||||||
|
self.JobList.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
|
||||||
|
self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
|
||||||
self.JobList.setObjectName("JobList")
|
self.JobList.setObjectName("JobList")
|
||||||
self.BasicModeButton = QtWidgets.QPushButton(self.Form)
|
self.BasicModeButton = QtWidgets.QPushButton(self.Form)
|
||||||
self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 156, 41))
|
self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 156, 41))
|
||||||
|
|||||||
@@ -133,10 +133,10 @@ 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.0') > StrictVersion(qtVersion()):
|
if StrictVersion('5.4.0') > StrictVersion(qtVersion()):
|
||||||
missing.append('PyQt 5.2.0+')
|
missing.append('PyQt 5.4.0+')
|
||||||
except ImportError:
|
except ImportError:
|
||||||
missing.append('PyQt 5.2.0+')
|
missing.append('PyQt 5.4.0+')
|
||||||
if level > 1:
|
if level > 1:
|
||||||
try:
|
try:
|
||||||
from psutil import __version__ as psutilVersion
|
from psutil import __version__ as psutilVersion
|
||||||
@@ -146,10 +146,10 @@ def dependencyCheck(level):
|
|||||||
missing.append('psutil 3.0.0+')
|
missing.append('psutil 3.0.0+')
|
||||||
try:
|
try:
|
||||||
from slugify import __version__ as slugifyVersion
|
from slugify import __version__ as slugifyVersion
|
||||||
if StrictVersion('1.1.2') > StrictVersion(slugifyVersion):
|
if StrictVersion('1.1.3') > StrictVersion(slugifyVersion):
|
||||||
missing.append('python-slugify 1.1.2+')
|
missing.append('python-slugify 1.1.3+')
|
||||||
except ImportError:
|
except ImportError:
|
||||||
missing.append('python-slugify 1.1.2+')
|
missing.append('python-slugify 1.1.3+')
|
||||||
try:
|
try:
|
||||||
from PIL import PILLOW_VERSION as pillowVersion
|
from PIL import PILLOW_VERSION as pillowVersion
|
||||||
if StrictVersion('2.8.2') > StrictVersion(pillowVersion):
|
if StrictVersion('2.8.2') > StrictVersion(pillowVersion):
|
||||||
|
|||||||
8
setup.py
8
setup.py
@@ -33,7 +33,7 @@ if platform == 'darwin':
|
|||||||
py2app=dict(
|
py2app=dict(
|
||||||
argv_emulation=True,
|
argv_emulation=True,
|
||||||
iconfile='icons/comic2ebook.icns',
|
iconfile='icons/comic2ebook.icns',
|
||||||
includes=['sip', 'PyQt5.QtPrintSupport'],
|
includes=['sip'],
|
||||||
resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'],
|
resources=['LICENSE.txt', 'other/qt.conf', 'other/Additional-LICENSE.txt', 'other/unrar', 'other/7za'],
|
||||||
plist=dict(
|
plist=dict(
|
||||||
CFBundleName='Kindle Comic Converter',
|
CFBundleName='Kindle Comic Converter',
|
||||||
@@ -49,7 +49,7 @@ if platform == 'darwin':
|
|||||||
CFBundleTypeRole='Editor',
|
CFBundleTypeRole='Editor',
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
LSMinimumSystemVersion='10.10.0',
|
LSMinimumSystemVersion='10.8.0',
|
||||||
LSEnvironment=dict(
|
LSEnvironment=dict(
|
||||||
PATH='./../Resources:/usr/local/bin:/usr/bin:/bin'
|
PATH='./../Resources:/usr/local/bin:/usr/bin:/bin'
|
||||||
),
|
),
|
||||||
@@ -135,7 +135,7 @@ else:
|
|||||||
install_requires=[
|
install_requires=[
|
||||||
'Pillow>=2.8.2',
|
'Pillow>=2.8.2',
|
||||||
'psutil>=3.0.0',
|
'psutil>=3.0.0',
|
||||||
'python-slugify>=1.1.2',
|
'python-slugify>=1.1.3',
|
||||||
'scandir>=1.1.0',
|
'scandir>=1.1.0',
|
||||||
],
|
],
|
||||||
zip_safe=False,
|
zip_safe=False,
|
||||||
@@ -158,4 +158,4 @@ if platform == 'darwin':
|
|||||||
copyfile('other/libqcocoa.dylib', 'dist/Kindle Comic Converter.app/Contents/PlugIns/platforms/libqcocoa.dylib')
|
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/unrar', 0o777)
|
||||||
chmod('dist/Kindle Comic Converter.app/Contents/Resources/7za', 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')
|
||||||
|
|||||||
Reference in New Issue
Block a user