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

Refactor variable names. Slight cleanup.

Browse Source
This commit is contained in:
BasioMeusPuga
2018-03-02 20:28:50 +05:30
parent ca2f3469d1
commit 12199dbd75
3 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
TODO
View File

@@ -21,7 +21,7 @@ TODO
✓ Mass tagging ✓ Mass tagging
✓ Add capability to sort by new ✓ Add capability to sort by new
✓ Table view ✓ Table view
Context menu: Cache, Read, Edit database, delete, Mark read/unread ✓ Context menu: Cache, Read, Edit database, delete, Mark read/unread
Information dialog widget Information dialog widget
Allow editing of database data through the UI + for Bookmarks Allow editing of database data through the UI + for Bookmarks
Set focus to newly added file Set focus to newly added file
@@ -41,12 +41,12 @@ TODO
✓ Line spacing ✓ Line spacing
✓ Record progress ✓ Record progress
✓ Text alignment ✓ Text alignment
Background color ✓ Background color
Bookmarks ✓ Bookmarks
✓ Creation ✓ Creation
✓ Navigation ✓ Navigation
Editing: Name, Location ✓ Editing: Name
Deletion ✓ Deletion
Set context menu for definitions and the like Set context menu for definitions and the like
Search document using QTextCursor? Search document using QTextCursor?
Cache multiple images Cache multiple images

58
__main__.py
View File

@@ -55,7 +55,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
self.bookToolBar = BookToolBar(self) self.bookToolBar = BookToolBar(self)
# Widget declarations # Widget declarations
self.library_filter_menu = QtWidgets.QMenu() self.libraryFilterMenu = QtWidgets.QMenu()
self.statusMessage = QtWidgets.QLabel() self.statusMessage = QtWidgets.QLabel()
self.toolbarToggle = QtWidgets.QToolButton() self.toolbarToggle = QtWidgets.QToolButton()
self.reloadLibrary = QtWidgets.QToolButton() self.reloadLibrary = QtWidgets.QToolButton()
@@ -68,10 +68,10 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
database.DatabaseInit(self.database_path) database.DatabaseInit(self.database_path)
# Initialize settings dialog # Initialize settings dialog
self.settings_dialog = SettingsUI(self) self.settingsDialog = SettingsUI(self)
# Initialize metadata dialog # Initialize metadata dialog
self.metadata_dialog = MetadataUI(self) self.metadataDialog = MetadataUI(self)
# Statusbar widgets # Statusbar widgets
self.statusMessage.setObjectName('statusMessage') self.statusMessage.setObjectName('statusMessage')
@@ -200,7 +200,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
self.reloadLibrary.setIcon(QtGui.QIcon.fromTheme('reload')) self.reloadLibrary.setIcon(QtGui.QIcon.fromTheme('reload'))
self.reloadLibrary.setObjectName('reloadLibrary') self.reloadLibrary.setObjectName('reloadLibrary')
self.reloadLibrary.setAutoRaise(True) self.reloadLibrary.setAutoRaise(True)
self.reloadLibrary.clicked.connect(self.settings_dialog.start_library_scan) self.reloadLibrary.clicked.connect(self.settingsDialog.start_library_scan)
self.tabWidget.tabBar().setTabButton( self.tabWidget.tabBar().setTabButton(
0, QtWidgets.QTabBar.RightSide, self.reloadLibrary) 0, QtWidgets.QTabBar.RightSide, self.reloadLibrary)
@@ -246,20 +246,20 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
self.tableView.customContextMenuRequested.connect(self.generate_library_context_menu) self.tableView.customContextMenuRequested.connect(self.generate_library_context_menu)
# Keyboard shortcuts # Keyboard shortcuts
self.ks_close_tab = QtWidgets.QShortcut(QtGui.QKeySequence('Ctrl+W'), self) self.ksCloseTab = QtWidgets.QShortcut(QtGui.QKeySequence('Ctrl+W'), self)
self.ks_close_tab.setContext(QtCore.Qt.ApplicationShortcut) self.ksCloseTab.setContext(QtCore.Qt.ApplicationShortcut)
self.ks_close_tab.activated.connect(self.tab_close) self.ksCloseTab.activated.connect(self.tab_close)
self.ks_exit_all = QtWidgets.QShortcut(QtGui.QKeySequence('Ctrl+Q'), self) self.ksExitAll = QtWidgets.QShortcut(QtGui.QKeySequence('Ctrl+Q'), self)
self.ks_exit_all.setContext(QtCore.Qt.ApplicationShortcut) self.ksExitAll.setContext(QtCore.Qt.ApplicationShortcut)
self.ks_exit_all.activated.connect(self.closeEvent) self.ksExitAll.activated.connect(self.closeEvent)
self.listView.setFocus() self.listView.setFocus()
self.open_books_at_startup() self.open_books_at_startup()
# Scan the library @ startup # Scan the library @ startup
if self.settings['scan_library']: if self.settings['scan_library']:
self.settings_dialog.start_library_scan() self.settingsDialog.start_library_scan()
def generate_library_context_menu(self, position): def generate_library_context_menu(self, position):
# TODO # TODO
@@ -407,7 +407,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
def test_function(self): def test_function(self):
print('Caesar si viveret, ad remum dareris') print('Caesar si viveret, ad remum dareris')
self.metadata_dialog.show() self.metadataDialog.show()
def resizeEvent(self, event=None): def resizeEvent(self, event=None):
if event: if event:
@@ -457,7 +457,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
if not opened_files[0]: if not opened_files[0]:
return return
self.settings_dialog.okButton.setEnabled(False) self.settingsDialog.okButton.setEnabled(False)
self.reloadLibrary.setEnabled(False) self.reloadLibrary.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])
@@ -524,8 +524,8 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
confirm_deletion.exec_() confirm_deletion.exec_()
def move_on(self): def move_on(self):
self.settings_dialog.okButton.setEnabled(True) self.settingsDialog.okButton.setEnabled(True)
self.settings_dialog.okButton.setToolTip( self.settingsDialog.okButton.setToolTip(
'Save changes and start library scan') 'Save changes and start library scan')
self.reloadLibrary.setEnabled(True) self.reloadLibrary.setEnabled(True)
@@ -951,10 +951,10 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
self.format_contentView() self.format_contentView()
def show_settings(self): def show_settings(self):
if not self.settings_dialog.isVisible(): if not self.settingsDialog.isVisible():
self.settings_dialog.show() self.settingsDialog.show()
else: else:
self.settings_dialog.hide() self.settingsDialog.hide()
def generate_library_filter_menu(self, directory_list=None): def generate_library_filter_menu(self, directory_list=None):
# TODO # TODO
@@ -963,7 +963,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
# Behavior for clicking on All # Behavior for clicking on All
# Don't show anything for less than 2 library folders # Don't show anything for less than 2 library folders
self.library_filter_menu.clear() self.libraryFilterMenu.clear()
def generate_name(path_data): def generate_name(path_data):
this_filter = path_data[1] this_filter = path_data[1]
@@ -979,18 +979,18 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
filter_list = list(map(generate_name, checked)) filter_list = list(map(generate_name, checked))
filter_list.sort() filter_list.sort()
filter_list.append('Manually Added') filter_list.append('Manually Added')
filter_actions = [QtWidgets.QAction(i, self.library_filter_menu) for i in filter_list] filter_actions = [QtWidgets.QAction(i, self.libraryFilterMenu) for i in filter_list]
filter_all = QtWidgets.QAction('All', self.library_filter_menu) filter_all = QtWidgets.QAction('All', self.libraryFilterMenu)
filter_actions.append(filter_all) filter_actions.append(filter_all)
for i in filter_actions: for i in filter_actions:
i.setCheckable(True) i.setCheckable(True)
i.setChecked(True) i.setChecked(True)
i.triggered.connect(self.set_library_filter) i.triggered.connect(self.set_library_filter)
self.library_filter_menu.addActions(filter_actions) self.libraryFilterMenu.addActions(filter_actions)
self.library_filter_menu.insertSeparator(filter_all) self.libraryFilterMenu.insertSeparator(filter_all)
self.libraryToolBar.libraryFilterButton.setMenu(self.library_filter_menu) self.libraryToolBar.libraryFilterButton.setMenu(self.libraryFilterMenu)
def set_library_filter(self, event=None): def set_library_filter(self, event=None):
self.active_library_filters = [] self.active_library_filters = []
@@ -998,19 +998,19 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
if self.sender(): # Program startup sends a None here if self.sender(): # Program startup sends a None here
if self.sender().text() == 'All': if self.sender().text() == 'All':
for i in self.library_filter_menu.actions(): for i in self.libraryFilterMenu.actions():
i.setChecked(self.sender().isChecked()) i.setChecked(self.sender().isChecked())
for i in self.library_filter_menu.actions()[:-2]: for i in self.libraryFilterMenu.actions()[:-2]:
if i.isChecked(): if i.isChecked():
self.active_library_filters.append(i.text()) self.active_library_filters.append(i.text())
else: else:
something_was_unchecked = True something_was_unchecked = True
if something_was_unchecked: if something_was_unchecked:
self.library_filter_menu.actions()[-1].setChecked(False) self.libraryFilterMenu.actions()[-1].setChecked(False)
else: else:
self.library_filter_menu.actions()[-1].setChecked(True) self.libraryFilterMenu.actions()[-1].setChecked(True)
self.lib_ref.update_proxymodels() self.lib_ref.update_proxymodels()
@@ -1028,7 +1028,7 @@ class MainUI(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
def closeEvent(self, event=None): def closeEvent(self, event=None):
# All tabs must be iterated upon here # All tabs must be iterated upon here
self.hide() self.hide()
self.settings_dialog.hide() self.settingsDialog.hide()
self.temp_dir.remove() self.temp_dir.remove()
self.settings['last_open_books'] = [] self.settings['last_open_books'] = []

3
models.py
View File

@@ -66,10 +66,7 @@ class ItemProxyModel(QtCore.QSortFilterProxyModel):
class TableProxyModel(QtCore.QSortFilterProxyModel): class TableProxyModel(QtCore.QSortFilterProxyModel):
def __init__(self, temp_dir, parent=None): def __init__(self, temp_dir, parent=None):
# TODO
# The setData method
super(TableProxyModel, self).__init__(parent) super(TableProxyModel, self).__init__(parent)
self.setObjectName('asdasd')
self.header_data = [ self.header_data = [
None, 'Title', 'Author', 'Year', '%', 'Tags'] None, 'Title', 'Author', 'Year', '%', 'Tags']
self.temp_dir = temp_dir self.temp_dir = temp_dir