From b4a405c57e6c832bf7c3fd1b99e3969466ea948b Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" Date: Sat, 25 May 2019 19:30:18 +0200 Subject: [PATCH] Doxument view can now be closed --- nw/gui/mainmenu.py | 7 +++++++ nw/gui/winmain.py | 13 +++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/nw/gui/mainmenu.py b/nw/gui/mainmenu.py index f770d1c3..3eb9d9b6 100644 --- a/nw/gui/mainmenu.py +++ b/nw/gui/mainmenu.py @@ -263,6 +263,13 @@ class GuiMainMenu(QMenuBar): menuItem.triggered.connect(lambda : self.theParent.viewDocument(None)) self.docuMenu.addAction(menuItem) + # Document > Close Preview + menuItem = QAction(QIcon.fromTheme("text-html"), "Close Document View", self) + menuItem.setStatusTip("Close Document View Pane") + menuItem.setShortcut("Ctrl+Shift+R") + menuItem.triggered.connect(self.theParent.closeDocViewer) + self.docuMenu.addAction(menuItem) + # # Document > Separator # self.docuMenu.addSeparator() diff --git a/nw/gui/winmain.py b/nw/gui/winmain.py index 76f98219..54738d59 100644 --- a/nw/gui/winmain.py +++ b/nw/gui/winmain.py @@ -172,8 +172,7 @@ class GuiMain(QMainWindow): def clearGUI(self): self.treeView.clearTree() self.docEditor.clearEditor() - self.docViewer.clearViewer() - self.docViewer.setVisible(False) + self.closeDocViewer() return True ## @@ -451,6 +450,16 @@ class GuiMain(QMainWindow): self.docViewer.setFocus() return + def closeDocViewer(self): + self.docViewer.clearViewer() + self.theProject.setLastViewed(None) + bPos = self.splitMain.sizes() + self.docViewer.setVisible(False) + vPos = [bPos[1],0] + self.splitView.setSizes(vPos) + self.docEditor.changeWidth() + return + ## # Internal Functions ##