Merge branch 'main' into outline_view

This commit is contained in:
Veronica Berglyd Olsen
2022-05-22 18:15:36 +02:00
20 changed files with 252 additions and 124 deletions
+6 -11
View File
@@ -102,6 +102,7 @@ class GuiMain(QMainWindow):
# Sizes
mPx = self.mainConf.pxInt(4)
hWd = self.mainConf.pxInt(4)
# Main GUI Elements
self.statusBar = GuiMainStatus(self)
@@ -148,18 +149,21 @@ class GuiMain(QMainWindow):
self.splitView = QSplitter(Qt.Vertical)
self.splitView.addWidget(self.docViewer)
self.splitView.addWidget(self.viewMeta)
self.splitView.setHandleWidth(hWd)
self.splitView.setSizes(self.mainConf.getViewPanePos())
# Splitter : Document Editor / Document Viewer
self.splitDocs = QSplitter(Qt.Horizontal)
self.splitDocs.addWidget(self.docEditor)
self.splitDocs.addWidget(self.splitView)
self.splitDocs.setHandleWidth(hWd)
# Splitter : Project Tree / Main Tabs
self.splitMain = QSplitter(Qt.Horizontal)
self.splitMain.setContentsMargins(0, 0, mPx, 0)
self.splitMain.setContentsMargins(0, 0, 0, 0)
self.splitMain.addWidget(self.treePane)
self.splitMain.addWidget(self.splitDocs)
self.splitMain.setHandleWidth(hWd)
self.splitMain.setSizes(self.mainConf.getMainPanePos())
# Main Stack : Editor / Outline
@@ -1389,7 +1393,7 @@ class GuiMain(QMainWindow):
return True
def _updateWindowTitle(self, projName=None):
"""Set the window title and add the project's working title.
"""Set the window title and add the project's name.
"""
winTitle = self.mainConf.appName
if projName is not None:
@@ -1488,15 +1492,6 @@ class GuiMain(QMainWindow):
elif view == nwView.OUTLINE:
self.mainStack.setCurrentWidget(self.projView)
elif view == nwView.DETAILS:
self.showProjectDetailsDialog()
elif view == nwView.STATS:
self.showWritingStatsDialog()
elif view == nwView.SET_PROJ:
self.showProjectSettingsDialog()
return
@pyqtSlot()