Add resource file - Incorporates icons from the Papirus-Dark icon theme

More keyboard shortcuts

__main__.py

@@ -148,9 +148,13 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
         self.lib_ref.create_proxymodel()
 
         # Keyboard shortcuts
-        self.exit_all = QtWidgets.QShortcut(QtGui.QKeySequence('Ctrl+Q'), self)
-        self.exit_all.setContext(QtCore.Qt.ApplicationShortcut)
-        self.exit_all.activated.connect(self.closeEvent)
+        self.ks_close_tab = QtWidgets.QShortcut(QtGui.QKeySequence('Ctrl+W'), self)
+        self.ks_close_tab.setContext(QtCore.Qt.ApplicationShortcut)
+        self.ks_close_tab.activated.connect(self.tab_close)
+
+        self.ks_exit_all = QtWidgets.QShortcut(QtGui.QKeySequence('Ctrl+Q'), self)
+        self.ks_exit_all.setContext(QtCore.Qt.ApplicationShortcut)
+        self.ks_exit_all.activated.connect(self.closeEvent)
 
         # Open last... open books.
         self.open_files(self.last_open_books)
@@ -266,7 +270,12 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
             self.statusMessage.setText(
                 current_author + ' - ' + current_title)
 
-    def tab_close(self, tab_index):
+    def tab_close(self, tab_index=None):
+        if not tab_index:
+            tab_index = self.tabWidget.currentIndex()
+            if tab_index == 0:
+                return
+
         tab_metadata = self.tabWidget.widget(tab_index).metadata
 
         self.thread = BackGroundTabUpdate(
@@ -353,7 +362,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
                 self.tabWidget.setCurrentIndex(self.tabWidget.count() - 1)
 
         if not found_a_focusable_tab:
-            self.tabWidget.setCurrentIndex(0)
+            self.tabWidget.setCurrentIndex(self.tabWidget.count() - 1)
 
     def get_color(self):
         signal_sender = self.sender().objectName()

library.py

@@ -105,7 +105,10 @@ class Library:
             # QtCore.Qt.DisplayRole is the same as item.setText()
             # The model is a single row and has no columns
             img_pixmap = QtGui.QPixmap()
-            img_pixmap.loadFromData(cover)
+            if cover:
+                img_pixmap.loadFromData(cover)
+            else:
+                img_pixmap.load(':/images/NotFound.png')
             img_pixmap = img_pixmap.scaled(420, 600, QtCore.Qt.IgnoreAspectRatio)
             item = QtGui.QStandardItem()
             item.setToolTip(tooltip_string)

resources/checkmark.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1" viewBox="0 0 16 16">
+ <g transform="translate(0 -1036.4)">
+  <circle fill="#4caf50" cx="8" cy="1044.4" r="7"/>
+  <path fill="#fff" d="m11.535 1040.8-4.2422 4.2422-2.8281-2.8281-1.4141 1.4141 2.8281 2.8281 1.4141 1.4141 5.6563-5.6563-1.4141-1.4141z"/>
+ </g>
+</svg>

resources/error.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1" viewBox="0 0 16 16">
+ <g transform="translate(0 -1036.4)">
+  <circle fill="#f44336" cx="8" cy="1044.4" r="7"/>
+  <g fill="#fff" transform="matrix(.70711 .70711 -.70711 .70711 740.82 300.23)">
+   <rect width="2" height="10" x="1043.4" y="-13" transform="rotate(90)"/>
+   <rect width="2" height="10" x="-9" y="-1049.4" transform="scale(-1)"/>
+  </g>
+ </g>
+</svg>

resources/resources.qrc

@@ -0,0 +1,7 @@
+<RCC>
+  <qresource prefix="images">
+    <file>NotFound.png</file>
+    <file>checkmark.svg</file>
+    <file>error.svg</file>
+  </qresource>
+</RCC>

sorter.py

@@ -114,11 +114,6 @@ class BookSorter:
             # Different modes require different values
             if self.mode == 'addition':
                 cover_image = book_ref.get_cover_image()
-                # TODO
-                if not cover_image:
-                    with open('resources/NotFound.png', 'rb') as stand_in:
-                        cover_image = stand_in.read()
-
                 self.all_books[file_md5] = {
                     'title': title,
                     'author': author,

widgets.py

@@ -1,12 +1,12 @@
 #!usr/bin/env python3
 
 import os
-import shutil
 from PyQt5 import QtWidgets, QtGui, QtCore
 
-import pie_chart
-import database
 import sorter
+import database
+import pie_chart
+import resources
 
 
 class BookToolBar(QtWidgets.QToolBar):
@@ -307,7 +307,7 @@ class Tab(QtWidgets.QWidget):
         self.contentView.setAlignment(QtCore.Qt.AlignCenter)
 
         self.generate_keyboard_shortcuts()
-        
+
         self.gridLayout.addWidget(self.contentView, 0, 0, 1, 1)
         self.parent.addTab(self, title)
 
@@ -416,7 +416,6 @@ class LibraryDelegate(QtWidgets.QStyledItemDelegate):
         # Color icon slightly red
         # if option.state & QtWidgets.QStyle.State_Selected:
             # painter.fillRect(option.rect, QtGui.QColor().fromRgb(255, 0, 0, 20))
-        # Also, painter.setOpacity(n)
 
         option = option.__class__(option)
         file_exists = index.data(QtCore.Qt.UserRole + 5)
@@ -426,7 +425,7 @@ class LibraryDelegate(QtWidgets.QStyledItemDelegate):
         # Calculate progress on the basis of lines
 
         if not file_exists:
-            read_icon = QtGui.QIcon.fromTheme('vcs-conflicting').pixmap(36)
+            read_icon = QtGui.QIcon(':/images/error.svg').pixmap(36)
             painter.setOpacity(.7)
             QtWidgets.QStyledItemDelegate.paint(self, painter, option, index)
             painter.setOpacity(1)
@@ -443,7 +442,7 @@ class LibraryDelegate(QtWidgets.QStyledItemDelegate):
 
             if current_chapter == total_chapters:
                 QtWidgets.QStyledItemDelegate.paint(self, painter, option, index)
-                read_icon = QtGui.QIcon.fromTheme('vcs-normal').pixmap(36)
+                read_icon = QtGui.QIcon(':/images/checkmark.svg').pixmap(36)
             elif current_chapter == 1:
                 QtWidgets.QStyledItemDelegate.paint(self, painter, option, index)
             else: