Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop the view column in the viewer panel

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2023-12-03 18:18:00 +01:00
parent 847d8ab726
commit cbb000a18f
1 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/docviewerpanel.py
+9 -27
View File
@@ -201,8 +201,7 @@ class _ViewPanelBackRefs(QTreeWidget):
C_DATA = 0 C_DATA = 0
C_DOC = 0 C_DOC = 0
C_EDIT = 1 C_EDIT = 1
C_VIEW = 2 C_TITLE = 2
C_TITLE = 3
D_HANDLE = Qt.ItemDataRole.UserRole D_HANDLE = Qt.ItemDataRole.UserRole
@@ -215,7 +214,7 @@ class _ViewPanelBackRefs(QTreeWidget):
iPx = SHARED.theme.baseIconSize iPx = SHARED.theme.baseIconSize
cMg = CONFIG.pxInt(6) cMg = CONFIG.pxInt(6)
self.setHeaderLabels([self.tr("Document"), "", "", self.tr("First Heading")]) self.setHeaderLabels([self.tr("Document"), "", self.tr("First Heading")])
self.setIndentation(0) self.setIndentation(0)
self.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection) self.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
self.setIconSize(QSize(iPx, iPx)) self.setIconSize(QSize(iPx, iPx))
@@ -227,15 +226,12 @@ class _ViewPanelBackRefs(QTreeWidget):
treeHeader.setMinimumSectionSize(iPx + cMg) # See Issue #1627 treeHeader.setMinimumSectionSize(iPx + cMg) # See Issue #1627
treeHeader.setSectionResizeMode(self.C_DOC, QHeaderView.ResizeMode.ResizeToContents) treeHeader.setSectionResizeMode(self.C_DOC, QHeaderView.ResizeMode.ResizeToContents)
treeHeader.setSectionResizeMode(self.C_EDIT, QHeaderView.ResizeMode.Fixed) treeHeader.setSectionResizeMode(self.C_EDIT, QHeaderView.ResizeMode.Fixed)
treeHeader.setSectionResizeMode(self.C_VIEW, QHeaderView.ResizeMode.Fixed)
treeHeader.setSectionResizeMode(self.C_TITLE, QHeaderView.ResizeMode.ResizeToContents) treeHeader.setSectionResizeMode(self.C_TITLE, QHeaderView.ResizeMode.ResizeToContents)
treeHeader.resizeSection(self.C_EDIT, iPx + cMg) treeHeader.resizeSection(self.C_EDIT, iPx + cMg)
treeHeader.resizeSection(self.C_VIEW, iPx + cMg)
treeHeader.setSectionsMovable(False) treeHeader.setSectionsMovable(False)
# Cache Icons Locally # Cache Icons Locally
self._editIcon = SHARED.theme.getIcon("edit") self._editIcon = SHARED.theme.getIcon("edit")
self._viewIcon = SHARED.theme.getIcon("view")
# Signals # Signals
self.clicked.connect(self._treeItemClicked) self.clicked.connect(self._treeItemClicked)
@@ -246,11 +242,9 @@ class _ViewPanelBackRefs(QTreeWidget):
def updateTheme(self) -> None: def updateTheme(self) -> None:
"""Update theme elements.""" """Update theme elements."""
self._editIcon = SHARED.theme.getIcon("edit") self._editIcon = SHARED.theme.getIcon("edit")
self._viewIcon = SHARED.theme.getIcon("view")
for i in range(self.topLevelItemCount()): for i in range(self.topLevelItemCount()):
if item := self.topLevelItem(i): if item := self.topLevelItem(i):
item.setIcon(self.C_EDIT, self._editIcon) item.setIcon(self.C_EDIT, self._editIcon)
item.setIcon(self.C_VIEW, self._viewIcon)
return return
def clearContent(self) -> None: def clearContent(self) -> None:
@@ -286,15 +280,13 @@ class _ViewPanelBackRefs(QTreeWidget):
tHandle = index.siblingAtColumn(self.C_DATA).data(self.D_HANDLE) tHandle = index.siblingAtColumn(self.C_DATA).data(self.D_HANDLE)
if index.column() == self.C_EDIT: if index.column() == self.C_EDIT:
self._parent.openDocumentRequest.emit(tHandle, nwDocMode.EDIT, "", True) self._parent.openDocumentRequest.emit(tHandle, nwDocMode.EDIT, "", True)
elif index.column() == self.C_VIEW:
self._parent.openDocumentRequest.emit(tHandle, nwDocMode.VIEW, "", True)
return return
@pyqtSlot("QModelIndex") @pyqtSlot("QModelIndex")
def _treeItemDoubleClicked(self, index: QModelIndex) -> None: def _treeItemDoubleClicked(self, index: QModelIndex) -> None:
"""Emit follow tag signal on user double click.""" """Emit follow tag signal on user double click."""
tHandle = index.siblingAtColumn(self.C_DATA).data(self.D_HANDLE) tHandle = index.siblingAtColumn(self.C_DATA).data(self.D_HANDLE)
if index.column() == self.C_DOC: if index.column() != self.C_EDIT:
self._parent.openDocumentRequest.emit(tHandle, nwDocMode.VIEW, "", True) self._parent.openDocumentRequest.emit(tHandle, nwDocMode.VIEW, "", True)
return return
@@ -318,7 +310,6 @@ class _ViewPanelBackRefs(QTreeWidget):
trItem.setIcon(self.C_DOC, docIcon) trItem.setIcon(self.C_DOC, docIcon)
trItem.setText(self.C_DOC, nwItem.itemName) trItem.setText(self.C_DOC, nwItem.itemName)
trItem.setIcon(self.C_EDIT, self._editIcon) trItem.setIcon(self.C_EDIT, self._editIcon)
trItem.setIcon(self.C_VIEW, self._viewIcon)
trItem.setText(self.C_TITLE, hItem.title) trItem.setText(self.C_TITLE, hItem.title)
trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec) trItem.setData(self.C_TITLE, Qt.ItemDataRole.DecorationRole, hDec)
trItem.setData(self.C_DATA, self.D_HANDLE, tHandle) trItem.setData(self.C_DATA, self.D_HANDLE, tHandle)
@@ -337,11 +328,10 @@ class _ViewPanelKeyWords(QTreeWidget):
C_DATA = 0 C_DATA = 0
C_NAME = 0 C_NAME = 0
C_EDIT = 1 C_EDIT = 1
C_VIEW = 2 C_IMPORT = 2
C_IMPORT = 3 C_DOC = 3
C_DOC = 4 C_TITLE = 4
C_TITLE = 5 C_SHORT = 5
C_SHORT = 6
D_TAG = Qt.ItemDataRole.UserRole D_TAG = Qt.ItemDataRole.UserRole
@@ -356,7 +346,7 @@ class _ViewPanelKeyWords(QTreeWidget):
cMg = CONFIG.pxInt(6) cMg = CONFIG.pxInt(6)
self.setHeaderLabels([ self.setHeaderLabels([
self.tr("Tag"), "", "", self.tr("Importance"), self.tr("Document"), self.tr("Tag"), "", self.tr("Importance"), self.tr("Document"),
self.tr("Heading"), self.tr("Short Description") self.tr("Heading"), self.tr("Short Description")
]) ])
self.setIndentation(0) self.setIndentation(0)
@@ -373,15 +363,12 @@ class _ViewPanelKeyWords(QTreeWidget):
treeHeader.setStretchLastSection(True) treeHeader.setStretchLastSection(True)
treeHeader.setMinimumSectionSize(iPx + cMg) # See Issue #1627 treeHeader.setMinimumSectionSize(iPx + cMg) # See Issue #1627
treeHeader.setSectionResizeMode(self.C_EDIT, QHeaderView.ResizeMode.Fixed) treeHeader.setSectionResizeMode(self.C_EDIT, QHeaderView.ResizeMode.Fixed)
treeHeader.setSectionResizeMode(self.C_VIEW, QHeaderView.ResizeMode.Fixed)
treeHeader.resizeSection(self.C_EDIT, iPx + cMg) treeHeader.resizeSection(self.C_EDIT, iPx + cMg)
treeHeader.resizeSection(self.C_VIEW, iPx + cMg)
treeHeader.setSectionsMovable(False) treeHeader.setSectionsMovable(False)
# Cache Icons Locally # Cache Icons Locally
self._classIcon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[itemClass]) self._classIcon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[itemClass])
self._editIcon = SHARED.theme.getIcon("edit") self._editIcon = SHARED.theme.getIcon("edit")
self._viewIcon = SHARED.theme.getIcon("view")
# Signals # Signals
self.clicked.connect(self._treeItemClicked) self.clicked.connect(self._treeItemClicked)
@@ -393,11 +380,9 @@ class _ViewPanelKeyWords(QTreeWidget):
"""Update theme elements.""" """Update theme elements."""
self._classIcon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[self._class]) self._classIcon = SHARED.theme.getIcon(nwLabels.CLASS_ICON[self._class])
self._editIcon = SHARED.theme.getIcon("edit") self._editIcon = SHARED.theme.getIcon("edit")
self._viewIcon = SHARED.theme.getIcon("view")
for i in range(self.topLevelItemCount()): for i in range(self.topLevelItemCount()):
if item := self.topLevelItem(i): if item := self.topLevelItem(i):
item.setIcon(self.C_EDIT, self._editIcon) item.setIcon(self.C_EDIT, self._editIcon)
item.setIcon(self.C_VIEW, self._viewIcon)
return return
def countEntries(self) -> int: def countEntries(self) -> int:
@@ -428,7 +413,6 @@ class _ViewPanelKeyWords(QTreeWidget):
trItem.setIcon(self.C_NAME, self._classIcon) trItem.setIcon(self.C_NAME, self._classIcon)
trItem.setText(self.C_NAME, name) trItem.setText(self.C_NAME, name)
trItem.setIcon(self.C_EDIT, self._editIcon) trItem.setIcon(self.C_EDIT, self._editIcon)
trItem.setIcon(self.C_VIEW, self._viewIcon)
trItem.setIcon(self.C_IMPORT, impIcon) trItem.setIcon(self.C_IMPORT, impIcon)
trItem.setText(self.C_IMPORT, impLabel) trItem.setText(self.C_IMPORT, impLabel)
trItem.setIcon(self.C_DOC, docIcon) trItem.setIcon(self.C_DOC, docIcon)
@@ -480,15 +464,13 @@ class _ViewPanelKeyWords(QTreeWidget):
tag = index.siblingAtColumn(self.C_DATA).data(self.D_TAG) tag = index.siblingAtColumn(self.C_DATA).data(self.D_TAG)
if index.column() == self.C_EDIT: if index.column() == self.C_EDIT:
self._parent.loadDocumentTagRequest.emit(tag, nwDocMode.EDIT) self._parent.loadDocumentTagRequest.emit(tag, nwDocMode.EDIT)
elif index.column() == self.C_VIEW:
self._parent.loadDocumentTagRequest.emit(tag, nwDocMode.VIEW)
return return
@pyqtSlot("QModelIndex") @pyqtSlot("QModelIndex")
def _treeItemDoubleClicked(self, index: QModelIndex) -> None: def _treeItemDoubleClicked(self, index: QModelIndex) -> None:
"""Emit follow tag signal on user double click.""" """Emit follow tag signal on user double click."""
tag = index.siblingAtColumn(self.C_DATA).data(self.D_TAG) tag = index.siblingAtColumn(self.C_DATA).data(self.D_TAG)
if index.column() == self.C_NAME: if index.column() != self.C_EDIT:
self._parent.loadDocumentTagRequest.emit(tag, nwDocMode.VIEW) self._parent.loadDocumentTagRequest.emit(tag, nwDocMode.VIEW)
return return