about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Jastrzębski <pawelj@vulturis.eu>2013-11-09 20:09:34 +0100
committerPaweł Jastrzębski <pawelj@vulturis.eu>2013-11-09 20:09:34 +0100
commit0a30f1ffb9c79c32141b4f9c37b4fbcd36e17565 (patch)
tree4270d616ede4a706c37e67dd2050331a40160699
parentTweak for Windows development environment (diff)
downloadkcc-0a30f1ffb9c79c32141b4f9c37b4fbcd36e17565.tar.gz
kcc-0a30f1ffb9c79c32141b4f9c37b4fbcd36e17565.tar.bz2
kcc-0a30f1ffb9c79c32141b4f9c37b4fbcd36e17565.zip
Implemented OSX PATH change to Windows code too + minor tweaks
-rw-r--r--.gitignore10
-rw-r--r--README.md2
-rw-r--r--kcc.py1
-rwxr-xr-xkcc/image.py2
4 files changed, 8 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 107cc77..822e4a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,11 @@
 *.cbz
 *.cbr
 .idea
+.DS_Store
+Thumbs.db
 build
 dist
-test
 Output
-kindlegen*
+test
 solaio
-.DS_Store
-Thumbs.db
-7za.exe
-UnRAR.exe
+kindlegen*
diff --git a/README.md b/README.md
index d741a75..02539ab 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ You can find the latest released binary at the following links:
 - [PyQt4](http://www.riverbankcomputing.co.uk/software/pyqt/download) - 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.
 - [Psutil](https://code.google.com/p/psutil/) - Please refer to official documentation for installing into your system.
-- **To build OS X release on Mavericks (10.9) you need a modified QT:** [Patch](https://github.com/ciromattia/kcc/blob/master/other/QT-4.8.5-QListWidget.patch); if you use [Homebrew](http://brew.sh) take a look at [PR #23793](https://github.com/mxcl/homebrew/pull/23793).
+- **To build OS X release you need a modified QT:** [Patch](https://github.com/ciromattia/kcc/blob/master/other/QT-4.8.5-QListWidget.patch)
 
 ## USAGE
 
diff --git a/kcc.py b/kcc.py
index baba705..aeaae42 100644
--- a/kcc.py
+++ b/kcc.py
@@ -52,6 +52,7 @@ else:
     if getattr(sys, 'frozen', False):
         os.chdir(os.path.dirname(os.path.abspath(sys.executable)))
     else:
+        os.environ['PATH'] = os.path.dirname(os.path.abspath(__file__)) + '/other/;' + os.environ['PATH']
         os.chdir(os.path.dirname(os.path.abspath(__file__)))
     from kcc import KCC_ui
 
diff --git a/kcc/image.py b/kcc/image.py
index 96f8396..306d945 100755
--- a/kcc/image.py
+++ b/kcc/image.py
@@ -491,6 +491,7 @@ class ComicPage:
                 startY = stopY + 1
                 stopY = startY + 3
                 if stopY > self.image.size[1] and searching:
+                    startY = self.image.size[1] - 3
                     stopY = self.image.size[1]
                     searching = False
             # Search fom vertical solid lines
@@ -504,6 +505,7 @@ class ComicPage:
                 startX = stopX + 1
                 stopX = startX + 3
                 if stopX > self.image.size[0] and searching:
+                    startX = self.image.size[0] - 3
                     stopX = self.image.size[0]
                     searching = False
             if fill > 0: