saret/Lector
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
BasioMeusPuga
2018-03-30 11:06:48 +05:30
parent 0d015ad72e
commit 2f4adfc183
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lector/__main__.py
View File

@@ -71,6 +71,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
self.comic_profile = {} self.comic_profile = {}
self.database_path = None self.database_path = None
self.active_library_filters = [] self.active_library_filters = []
self.active_bookmark_docks = []
# Initialize application # Initialize application
Settings(self).read_settings() # This should populate all variables that need Settings(self).read_settings() # This should populate all variables that need
@@ -86,7 +87,6 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
# Widget declarations # Widget declarations
self.libraryFilterMenu = QtWidgets.QMenu() self.libraryFilterMenu = QtWidgets.QMenu()
self.statusMessage = QtWidgets.QLabel() self.statusMessage = QtWidgets.QLabel()
self.distractionFreeToggle = QtWidgets.QToolButton()
# Reference variables # Reference variables
self.alignment_dict = { self.alignment_dict = {
@@ -389,7 +389,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
return return
self.settingsDialog.okButton.setEnabled(False) self.settingsDialog.okButton.setEnabled(False)
self.reloadLibrary.setEnabled(False) self.libraryToolBar.reloadLibraryButton.setEnabled(False)
self.settings['last_open_path'] = os.path.dirname(opened_files[0][0]) self.settings['last_open_path'] = os.path.dirname(opened_files[0][0])
self.statusBar.setVisible(True) self.statusBar.setVisible(True)
@@ -946,6 +946,8 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
self.settingsDialog.hide() self.settingsDialog.hide()
self.definitionDialog.hide() self.definitionDialog.hide()
self.temp_dir.remove() self.temp_dir.remove()
for i in self.active_bookmark_docks:
i.setVisible(False)
self.settings['last_open_books'] = [] self.settings['last_open_books'] = []
if self.tabWidget.count() > 1: if self.tabWidget.count() > 1:

1
lector/sorter.py
View File

@@ -175,7 +175,6 @@ class BookSorter:
book_ref.read_book() book_ref.read_book()
if book_ref.book: if book_ref.book:
this_book = {} this_book = {}
this_book[file_md5] = { this_book[file_md5] = {
'hash': file_md5, 'hash': file_md5,

2
lector/widgets.py
View File

@@ -1038,9 +1038,11 @@ class PliantDockWidget(QtWidgets.QDockWidget):
self.setGeometry(dock_x, dock_y, dock_width, dock_height) self.setGeometry(dock_x, dock_y, dock_width, dock_height)
self.main_window.bookToolBar.bookmarkButton.setChecked(True) self.main_window.bookToolBar.bookmarkButton.setChecked(True)
self.main_window.active_bookmark_docks.append(self)
def hideEvent(self, event): def hideEvent(self, event):
self.main_window.bookToolBar.bookmarkButton.setChecked(False) self.main_window.bookToolBar.bookmarkButton.setChecked(False)
self.main_window.active_bookmark_docks.remove(self)
class PliantQGraphicsScene(QtWidgets.QGraphicsScene): class PliantQGraphicsScene(QtWidgets.QGraphicsScene):