Application icon and .desktop file

Rearrange modules because of single-version-externally-managed

lector/__main__.py

@@ -43,14 +43,18 @@
 from lector.metadatadialog import MetadataUI
 from lector.definitionsdialog import DefinitionsUI
 
-from resources import mainwindow, resources
+from lector.resources import mainwindow, resources
 
 
 class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
     def __init__(self):
         super(MainUI, self).__init__()
         self.setupUi(self)
 
+        # Set window icon
+        self.setWindowIcon(
+            QtGui.QIcon(':/images/Lector.png'))
+
         # Central Widget - Make borders disappear
         self.centralWidget().layout().setContentsMargins(0, 0, 0, 0)
         self.gridLayout_2.setContentsMargins(0, 0, 0, 0)

lector/definitionsdialog.py

@@ -18,8 +18,7 @@
 
 import requests
 from PyQt5 import QtWidgets, QtCore, QtGui, QtMultimedia
-
-from resources import definitions
+from lector.resources import definitions
 
 
 class DefinitionsUI(QtWidgets.QDialog, definitions.Ui_Dialog):

lector/delegates.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from PyQt5 import QtWidgets, QtGui, QtCore
-from resources import pie_chart
+from lector.resources import pie_chart
 
 
 class LibraryDelegate(QtWidgets.QStyledItemDelegate):

lector/guifunctions.py

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from PyQt5 import QtGui
-from resources import resources
+from lector.resources import resources
 
 
 class QImageFactory:

lector/library.py

@@ -20,7 +20,6 @@
 import pickle
 import pathlib
 from PyQt5 import QtGui, QtCore
-
 from lector import database
 from lector.models import TableProxyModel, ItemProxyModel
 

lector/metadatadialog.py

@@ -20,8 +20,7 @@
 
 from lector import database
 from lector.widgets import PliantQGraphicsScene
-
-from resources import metadata
+from lector.resources import metadata
 
 
 class MetadataUI(QtWidgets.QDialog, metadata.Ui_Dialog):

lector/models.py

@@ -19,7 +19,7 @@
 import pathlib
 
 from PyQt5 import QtCore, QtWidgets
-from resources import pie_chart
+from lector.resources import pie_chart
 
 
 class BookmarkProxyModel(QtCore.QSortFilterProxyModel):

parsers/comicbooks.py → lector/parsers/comicbooks.py

@@ -22,7 +22,7 @@
 import os
 import time
 import zipfile
-from rarfile import rarfile
+from lector.rarfile import rarfile
 
 
 class ParseCOMIC:

parsers/epub.py → lector/parsers/epub.py

@@ -19,7 +19,7 @@
 import os
 import zipfile
 
-from ePub.read_epub import EPUB
+from lector.ePub.read_epub import EPUB
 
 
 class ParseEPUB:

parsers/mobi.py → lector/parsers/mobi.py

@@ -24,8 +24,8 @@
 import shutil
 import zipfile
 
-from ePub.read_epub import EPUB
-import KindleUnpack.kindleunpack as KindleUnpack
+from lector.ePub.read_epub import EPUB
+import lector.KindleUnpack.kindleunpack as KindleUnpack
 
 
 class ParseMOBI:

lector/resources/raw/lector.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Categories=Qt;KDE;Graphics;Viewer;
+Comment=A Qt based ebook reader
+Exec=lector %U
+GenericName=eBook Reader
+Icon=Lector
+MimeType=application/pdf;application/x-cbr;application/ereader;application/x-mobipocket-subscription;application/x-mobipocket-ebook;application/x-mobi8-ebook;application/epub+zip;application/x-cbz;
+Name=Lector
+Type=Application
+X-KDE-StartupNotify=false

resources/raw/resources.qrc → lector/resources/raw/resources.qrc

@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="images">
+    <file>Lector.png</file>
     <file>DarkIcons/tableofcontents.svg</file>
     <file>LightIcons/tableofcontents.svg</file>
     <file>DarkIcons/filesaveas.svg</file>

lector/settingsdialog.py

@@ -27,8 +27,7 @@
 from lector import database
 from lector.models import MostExcellentFileSystemModel
 from lector.threaded import BackGroundBookSearch, BackGroundBookAddition
-
-from resources import settingswindow
+from lector.resources import settingswindow
 
 
 class SettingsUI(QtWidgets.QDialog, settingswindow.Ui_Dialog):
@@ -46,7 +45,7 @@ def __init__(self, parent=None):
         self.aboutBox.setVisible(False)
         install_dir = os.path.realpath(__file__)
         install_dir = pathlib.Path(install_dir).parents[1]
-        aboutfile_path = os.path.join(install_dir, 'resources', 'about.html')
+        aboutfile_path = os.path.join(install_dir, 'lector', 'resources', 'about.html')
         with open(aboutfile_path) as about_html:
             self.aboutBox.setHtml(about_html.read())
 

lector/sorter.py

@@ -44,10 +44,10 @@
 
 from lector import database
 
-from parsers.pdf import ParsePDF
-from parsers.epub import ParseEPUB
-from parsers.mobi import ParseMOBI
-from parsers.comicbooks import ParseCOMIC
+from lector.parsers.pdf import ParsePDF
+from lector.parsers.epub import ParseEPUB
+from lector.parsers.mobi import ParseMOBI
+from lector.parsers.comicbooks import ParseCOMIC
 
 sorter = {
     'pdf': ParsePDF,

lector/toolbars.py

@@ -16,7 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
 from PyQt5 import QtWidgets, QtCore
 
 

lector/widgets.py

@@ -21,7 +21,6 @@
 # Double page, Continuous etc
 # Especially for comics
 
-
 import os
 import uuid
 import zipfile
@@ -32,7 +31,7 @@
 except ImportError:
     pass
 
-from rarfile import rarfile
+from lector.rarfile import rarfile
 
 from lector.models import BookmarkProxyModel
 from lector.delegates import BookmarkDelegate

setup.cfg

@@ -1,5 +1,3 @@
-[bdist_wheel]
-# This flag says that the code is written to work on both Python 2 and Python
-# 3. If at all possible, it is good practice to do this. If you cannot, you
-# will need to generate wheels for each Python version that you support.
-universal=1
+[install]
+single-version-externally-managed=1
+record=install.txt

setup.py

@@ -5,8 +5,8 @@
 HERE = path.abspath(path.dirname(__file__))
 
 MAJOR_VERSION = '0'
-MINOR_VERSION = '2'
-MICRO_VERSION = '1'
+MINOR_VERSION = '3'
+MICRO_VERSION = '0'
 VERSION = "{}.{}.{}".format(MAJOR_VERSION, MINOR_VERSION, MICRO_VERSION)
 
 # Get the long description from the README file
@@ -62,6 +62,10 @@
     python_requires='>=3.6, <4.0',
 
     package_data={'': ['about.html']},
+    data_files=[
+        ('share/icons/hicolor/scalable/apps', ['lector/resources/raw/Lector.png']),
+        ('share/applications', ['lector/resources/raw/lector.desktop'])
+        ],
     include_package_data=True,
 
     # List additional groups of dependencies here (e.g. development