about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Jastrzębski <pawelj@vulturis.eu>2014-05-29 22:00:57 +0200
committerPaweł Jastrzębski <pawelj@vulturis.eu>2014-05-29 22:01:21 +0200
commit56195d301dcdb8c9105327c49a63bbdc1c254e82 (patch)
treee4de5676d9da3bd0cb9d9ffcfa4e1bf158901db5
parentUpdated UnRAR (diff)
downloadkcc-56195d301dcdb8c9105327c49a63bbdc1c254e82.tar.gz
kcc-56195d301dcdb8c9105327c49a63bbdc1c254e82.tar.bz2
kcc-56195d301dcdb8c9105327c49a63bbdc1c254e82.zip
Tweaked merge
-rw-r--r--kcc/KCC_gui.py2
-rwxr-xr-xkcc/comic2ebook.py5
2 files changed, 1 insertions, 6 deletions
diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py
index def0420..16cc616 100644
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -380,7 +380,7 @@ class WorkerThread(QtCore.QThread):
         if GUI.MangaBox.isChecked():
             options.righttoleft = True
         if GUI.RotateBox.isChecked():
-            options.roate = True
+            options.rotate = True
         if GUI.QualityBox.checkState() == 1:
             options.quality = 1
         elif GUI.QualityBox.checkState() == 2:
diff --git a/kcc/comic2ebook.py b/kcc/comic2ebook.py
index 7d554f6..cc6c522 100755
--- a/kcc/comic2ebook.py
+++ b/kcc/comic2ebook.py
@@ -225,7 +225,6 @@ def buildNCX(dstdir, title, chapters, chapterNames):
                 + ".html\"/></navPoint>\n")
     f.write("</navMap>\n</ncx>")
     f.close()
-    return
 
 
 def buildOPF(dstdir, title, filelist, cover=None):
@@ -304,7 +303,6 @@ def buildOPF(dstdir, title, filelist, cover=None):
                   "</rootfiles>\n",
                   "</container>"])
     f.close()
-    return
 
 
 def applyImgOptimization(img, opt, hqImage=None):
@@ -952,7 +950,6 @@ def makeParser():
     psr.add_option_group(processingOptions)
     psr.add_option_group(customProfileOptions)
     psr.add_option_group(otherOptions)
-
     return psr
 
 
@@ -1030,7 +1027,6 @@ def makeBook(source, qtGUI=None):
             else:
                 filepath.append(getOutputFilename(source, options.output, '.cbz', ''))
             makeZIP(tome + '_comic', os.path.join(tome, "OEBPS", "Images"))
-
         else:
             print("\nCreating EPUB structure...")
             genEpubStruct(tome, chapterNames)
@@ -1046,7 +1042,6 @@ def makeBook(source, qtGUI=None):
 
         if GUI:
             GUI.progressBarTick.emit('tick')
-
     return filepath