diff --git a/resources/comic2ebook.icns b/comic2ebook.icns
similarity index 100%
rename from resources/comic2ebook.icns
rename to comic2ebook.icns
diff --git a/resources/comic2ebook.ico b/comic2ebook.ico
similarity index 100%
rename from resources/comic2ebook.ico
rename to comic2ebook.ico
diff --git a/kcc.py b/kcc.py
index 10b400a..563530c 100644
--- a/kcc.py
+++ b/kcc.py
@@ -26,11 +26,14 @@ from kcc import gui
from sys import platform
import os
+root = Tk()
+root.resizable(width=False, height=False)
+root.config(padx=5, pady=5, takefocus=True)
+root.title("Kindle Comic Converter v" + __version__)
+root.wm_attributes("-topmost", 1)
if platform == 'darwin':
os.environ['PATH'] = '/usr/local/bin:' + os.environ['PATH']
-root = Tk()
-root.resizable(width=FALSE, height=FALSE)
-root.config(padx=5, pady=5)
-gui.MainWindow(master=root, title="Kindle Comic Converter v" + __version__)
-root.tkraise()
+elif platform == 'win32':
+ root.iconbitmap(default='comic2ebook.ico')
+gui.MainWindow(master=root)
root.mainloop()
diff --git a/kcc/gui.py b/kcc/gui.py
index 86469e6..a87abe0 100644
--- a/kcc/gui.py
+++ b/kcc/gui.py
@@ -251,9 +251,7 @@ class MainWindow:
os.chmod(path, stat.S_IWRITE)
os.remove(path)
- def __init__(self, master, title):
+ def __init__(self, master):
self.filelist = []
self.master = master
- self.master.title(title)
- self.master.iconbitmap(default='resources/comic2ebook.ico')
self.initialize()
diff --git a/resources/Info.plist b/resources/Info.plist
deleted file mode 100644
index dde0c5b..0000000
--- a/resources/Info.plist
+++ /dev/null
@@ -1,65 +0,0 @@
-
-
-
-
- CFBundleAllowMixedLocalizations
-
- CFBundleDevelopmentRegion
- English
- CFBundleDocumentTypes
-
-
- CFBundleTypeExtensions
-
- *
-
- CFBundleTypeOSTypes
-
- ****
-
- CFBundleTypeRole
- Viewer
-
-
- CFBundleExecutable
- droplet
- CFBundleGetInfoString
- KindleComicConverter 2.0, Written 2012 by Ciro Mattia Gonano
- CFBundleIconFile
- droplet
- CFBundleIdentifier
- com.github.ciromattia.kcc
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleName
- KindleComicConverter 1.20
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- 1.0
- CFBundleSignature
- dplt
- LSMinimumSystemVersionByArchitecture
-
- x86_64
- 10.6
-
- LSRequiresCarbon
-
- WindowState
-
- dividerCollapsed
-
- eventLogLevel
- -1
- name
- ScriptWindowState
- positionOfDivider
- 568
- savedFrame
- 144 338 889 690 0 0 1680 1028
- selectedTabView
- event log
-
-
-
diff --git a/resources/Scripts/main.scpt b/resources/Scripts/main.scpt
deleted file mode 100644
index 33780b1..0000000
Binary files a/resources/Scripts/main.scpt and /dev/null differ
diff --git a/resources/description.rtfd/TXT.rtf b/resources/description.rtfd/TXT.rtf
deleted file mode 100644
index c8de892..0000000
--- a/resources/description.rtfd/TXT.rtf
+++ /dev/null
@@ -1,22 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
-{\fonttbl\f0\fnil\fcharset0 Verdana;}
-{\colortbl;\red255\green255\blue255;\red76\green78\blue78;}
-\pard\tx576\tx1152\tx1728\tx2304\tx2880\tx3456\tx4032\tx4608\tx5184\tx5760\tx6337\tx6913\tx7489\tx8065\tx8641\tx9217\tx9793\tx10369\tx10945\tx11521\tx12097\tx12674\tx13250\tx13826\tx14402\tx14978\tx15554\tx16130\tx16706\tx17282\tx17858\tx18435\tx19011\tx19587\tx20163\tx20739\tx21315\tx21891\tx22467\tx23043\tx23619\tx24195\tx24772\tx25348\tx25924\tx26500\tx27076\tx27652\tx28228\tx28804\tx29380\tx29956\tx30532\tx31109\tx31685\tx32261\tx32837\tx33413\tx33989\tx34565\tx35141\tx35717\tx36293\tx36870\tx37446\tx38022\tx38598\tx39174\tx39750\tx40326\tx40902\tx41478\tx42054\tx42630\tx43207\tx43783\tx44359\tx44935\tx45511\tx46087\tx46663\tx47239\tx47815\tx48391\tx48967\tx49544\tx50120\tx50696\tx51272\tx51848\tx52424\tx53000\tx53576\tx54152\tx54728\tx55305\tx55881\tx56457\tx57033\tx57609\li785\fi-786\pardirnatural
-
-\f0\fs24 \cf2 \CocoaLigature0 Copyright (c) 2012 Ciro Mattia Gonano \
-\
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.\
-\
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.\
-\
-This script heavily relies on KindleStrip (C) by Paul Durrant and released in public domain (http://www.mobileread.com/forums/showthread.php?t=96903)\
-Also, you need to have kindlegen v2.7 (with KF8 support) which is downloadable from Amazon website.\
-\
-Changelog:\
- 1.0: first release\
- 1.10: add CBZ/CBR support to comic2ebook.py\
- 1.11: add CBZ/CBR support to KindleComicConverter\
- 1.2: added image page splitting and optimizations\
-\
-Todo:\
- - bundle a script to manipulate images (to get rid of Mangle/E-nki/whatsoever)}
\ No newline at end of file
diff --git a/resources/droplet.rsrc b/resources/droplet.rsrc
deleted file mode 100644
index f8bf4f2..0000000
Binary files a/resources/droplet.rsrc and /dev/null differ
diff --git a/setup.py b/setup.py
index cc4781a..b346663 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ if sys.platform == 'darwin':
options=dict(
py2app=dict(
argv_emulation=True,
- iconfile='resources/comic2ebook.icns',
+ iconfile='comic2ebook.icns',
plist=dict(
CFBundleName=NAME,
CFBundleShortVersionString=VERSION,
@@ -43,7 +43,7 @@ elif sys.platform == 'win32':
from cx_Freeze import setup, Executable
base = "Win32GUI"
extra_options = dict(
- executables=[Executable("kcc.py", base=base, icon='resources/comic2ebook.ico',
+ executables=[Executable("kcc.py", base=base, icon='comic2ebook.ico',
appendScriptToExe=True, appendScriptToLibrary=False)],
options=dict(
build_exe=dict(