public/kcc
1
0
Fork 0
mirror of https://github.com/ciromattia/kcc synced 2025-12-13 01:36:27 +00:00
Code Issues Releases Wiki Activity

Updated OSX setup

Browse Source
This commit is contained in:
Paweł Jastrzębski
2013-10-12 17:54:21 +02:00
parent 4c5ebe5949
commit fceac407ee
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -42,6 +42,7 @@ You can find the latest released binary at the following links:
- Python 2.7 - Included in MacOS and Linux, follow the [official documentation](http://www.python.org/getit/windows/) to install on Windows. - Python 2.7 - Included in MacOS and Linux, follow the [official documentation](http://www.python.org/getit/windows/) to install on Windows.
- PyQt4 - Please refer to official documentation for installing into your system. - PyQt4 - Please refer to official documentation for installing into your system.
- [Pillow](http://pypi.python.org/pypi/Pillow/) 2.2.1+ - For comic optimizations. Please refer to official documentation for installing into your system. - [Pillow](http://pypi.python.org/pypi/Pillow/) 2.2.1+ - For comic optimizations. Please refer to official documentation for installing into your system.
- **To build OS X release a modified QT is required: **[Patch](https://github.com/ciromattia/kcc/blob/master/other/QT-4.8.5-QListWidget.patch)
## USAGE ## USAGE

24
other/QT-4.8.5-QListWidget.patch
View File

@@ -1,37 +1,35 @@
--- qt-4.8.5/src/gui/kernel/qwidget_mac.mm 2011-12-15 10:38:21.000000000 -0800 --- qt-4.8.5/src/gui/kernel/qwidget_mac.mm 2013-06-07 07:16:59.000000000 +0200
+++ qt-4.8.5/src/gui/kernel/qwidget_mac.mm 2012-09-18 17:17:03.000000000 -0700 +++ qt-4.8.5-fix/src/gui/kernel/qwidget_mac.mm 2013-10-11 23:00:15.000000000 +0200
@@ -1,22 +1,41 @@ @@ -4715,15 +4715,13 @@ void QWidgetPrivate::scroll_sys(int dx,
@@ -4684,15 +4703,14 @@
} }
// Scroll the whole widget if qscrollRect is not valid: // Scroll the whole widget if qscrollRect is not valid:
- QRect validScrollRect = qscrollRect.isValid() ? qscrollRect : q->rect(); - QRect validScrollRect = qscrollRect.isValid() ? qscrollRect : q->rect();
- validScrollRect &= clipRect(); - validScrollRect &= clipRect();
+ QRect validScrollRect = qscrollRect.isValid() ? qscrollRect : QRect(0, 0, q->width(), q->height()); + QRect validScrollRect = qscrollRect.isValid() ? qscrollRect : QRect(0, 0, q->width(), q->height());
// If q is overlapped by other widgets, we cannot just blit pixels since // If q is overlapped by other widgets, we cannot just blit pixels since
// this will move overlapping widgets as well. In case we just update: // this will move overlapping widgets as well. In case we just update:
const bool overlapped = isOverlapped(validScrollRect.translated(data.crect.topLeft())); const bool overlapped = isOverlapped(validScrollRect.translated(data.crect.topLeft()));
const bool accelerateScroll = accelEnv && isOpaque && !overlapped; const bool accelerateScroll = accelEnv && isOpaque && !overlapped;
const bool isAlien = (q->internalWinId() == 0); const bool isAlien = (q->internalWinId() == 0);
- const QPoint scrollDelta(dx, dy); - const QPoint scrollDelta(dx, dy);
+
// If qscrollRect is valid, we are _not_ supposed to scroll q's children (as documented). // If qscrollRect is valid, we are _not_ supposed to scroll q's children (as documented).
// But we do scroll children (and the whole of q) if qscrollRect is invalid. This case is // But we do scroll children (and the whole of q) if qscrollRect is invalid. This case is
@@ -4714,7 +4732,6 @@ @@ -4745,7 +4743,6 @@ void QWidgetPrivate::scroll_sys(int dx,
}else { }else {
update_sys(qscrollRect); update_sys(qscrollRect);
} }
- return; - return;
} }
#ifdef QT_MAC_USE_COCOA #ifdef QT_MAC_USE_COCOA
@@ -4731,6 +4748,7 @@ @@ -4762,6 +4759,7 @@ void QWidgetPrivate::scroll_sys(int dx,
// moved when the parent is scrolled. All directly or indirectly moved // moved when the parent is scrolled. All directly or indirectly moved
// children will receive a move event before the function call returns. // children will receive a move event before the function call returns.
QWidgetList movedChildren; QWidgetList movedChildren;
+ const QPoint scrollDelta(dx, dy); + const QPoint scrollDelta(dx, dy);
if (scrollChildren) { if (scrollChildren) {
QObjectList children = q->children(); QObjectList children = q->children();

2
other/qt.conf
View File

@@ -1,2 +0,0 @@
[Paths]
Plugins = DumbHackThatFixPY2APP

5
setup.py
View File

@@ -23,7 +23,10 @@ if platform == "darwin":
argv_emulation=True, argv_emulation=True,
iconfile='icons/comic2ebook.icns', iconfile='icons/comic2ebook.icns',
includes=['PIL', 'sip', 'PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtNetwork'], includes=['PIL', 'sip', 'PyQt4', 'PyQt4.QtCore', 'PyQt4.QtGui', 'PyQt4.QtNetwork'],
resources=['other/qt.conf', 'LICENSE.txt', 'other/Additional-LICENSE.txt'], excludes=['PyQt4.QtDeclarative', 'PyQt4.QtDesigner', 'PyQt4.QtHelp', 'PyQt4.QtMultimedia',
'PyQt4.QtOpenGL', 'PyQt4.QtScript', 'PyQt4.QtScriptTools', 'PyQt4.QtSql', 'PyQt4.QtSvg',
'PyQt4.QtXmlPatterns', 'PyQt4.QtXml', 'PyQt4.QtWebKit', 'PyQt4.QtTest'],
resources=['LICENSE.txt', 'other/Additional-LICENSE.txt'],
plist=dict( plist=dict(
CFBundleName=NAME, CFBundleName=NAME,
CFBundleShortVersionString=VERSION, CFBundleShortVersionString=VERSION,