Moved main menu to its own class, and reshuffled some of the logic in opening and saving projects

This commit is contained in:
Veronica K. B. Olsen
2019-04-27 14:49:54 +02:00
parent 3b43b75b3a
commit fdf41f383a
3 changed files with 175 additions and 166 deletions
+102 -96
View File
@@ -13,36 +13,31 @@
import logging import logging
import nw import nw
from PyQt5.QtWidgets import QMenu from PyQt5.QtWidgets import qApp, QMenuBar, QAction
# from os import path from PyQt5.QtGui import QIcon
# from PyQt5.QtWidgets import qApp, QWidget, QMainWindow, QVBoxLayout, QFrame, QSplitter, QAction, QToolBar, QFileDialog, QStackedWidget
# from PyQt5.QtCore import Qt, QSize, pyqtSlot
# from PyQt5.QtGui import QIcon
# from nw.gui.doctree import GuiDocTree from nw.enum import nwItemClass, nwDocAction
# from nw.gui.doctreectx import GuiDocTreeCtx
# from nw.gui.doceditor import GuiDocEditor
# from nw.gui.docdetails import GuiDocDetails
# from nw.gui.projecteditor import GuiProjectEditor
# from nw.gui.statusbar import GuiMainStatus
# from nw.project.project import NWProject
# from nw.project.document import NWDoc
# from nw.project.item import NWItem
# from nw.enum import nwItemType, nwItemClass, nwDocAction, nwItemAction
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class GuiMainMenu(QMenu): class GuiMainMenu(QMenuBar):
def __init__(self, theParent, theProject): def __init__(self, theParent, theProject):
QMenu.__init__(self, theParent) QMenuBar.__init__(self, theParent)
logger.debug("Initialising Main Menu ...") logger.debug("Initialising Main Menu ...")
self.mainConf = nw.CONFIG self.mainConf = nw.CONFIG
self.theProject = NWProject() self.theParent = theParent
self.theDocument = NWDoc(self.theProject, self) self.theProject = theProject
self._buildMenu() self._buildProjectMenu()
self._buildItemMenu()
self._buildEditMenu()
self._buildFormatMenu()
self._buildHelpMenu()
# Function Pointers
self._docAction = self.theParent.docEditor.docAction
logger.debug("Main Menu initialisation complete") logger.debug("Main Menu initialisation complete")
@@ -50,103 +45,116 @@ class GuiMainMenu(QMenu):
def openRecentProject(self, menuItem, recentItem): def openRecentProject(self, menuItem, recentItem):
logger.verbose("User requested opening recent project #%d" % recentItem) logger.verbose("User requested opening recent project #%d" % recentItem)
self.theProject.openProject(self.mainConf.recentList[recentItem]) self.theParent.openProject(self.mainConf.recentList[recentItem])
self.treeView.buildTree()
self._setWindowTitle(self.theProject.projName)
return True return True
## ##
# GUI Builders # Menu Action
## ##
def _buildMenu(self): def _menuExit(self):
self.theParent.closeMain()
qApp.quit()
return True
def _showAbout(self):
self.docTabs.createTab(None,nw.DOCTYPE_ABOUT)
return True
##
# Menu Builders
##
def _buildProjectMenu(self):
# Project # Project
projMenu = self.addMenu("&Project") self.projMenu = self.addMenu("&Project")
# Project > New Project # Project > New Project
menuItem = QAction(QIcon.fromTheme("folder-new"), "New Project", self) menuItem = QAction(QIcon.fromTheme("folder-new"), "New Project", self)
menuItem.setStatusTip("Create New Project") menuItem.setStatusTip("Create New Project")
menuItem.triggered.connect(self.newProject) menuItem.triggered.connect(self.theParent.newProject)
projMenu.addAction(menuItem) self.projMenu.addAction(menuItem)
# Project > Open Project # Project > Open Project
menuItem = QAction(QIcon.fromTheme("folder-open"), "Open Project", self) menuItem = QAction(QIcon.fromTheme("folder-open"), "Open Project", self)
menuItem.setStatusTip("Open Project") menuItem.setStatusTip("Open Project")
menuItem.setShortcut("Ctrl+Shift+O") menuItem.setShortcut("Ctrl+Shift+O")
menuItem.triggered.connect(self.openProject) menuItem.triggered.connect(lambda : self.theParent.openProject(None))
projMenu.addAction(menuItem) self.projMenu.addAction(menuItem)
# Project > Save Project # Project > Save Project
menuItem = QAction(QIcon.fromTheme("document-save"), "Save Project", self) menuItem = QAction(QIcon.fromTheme("document-save"), "Save Project", self)
menuItem.setStatusTip("Save Project") menuItem.setStatusTip("Save Project")
menuItem.setShortcut("Ctrl+Shift+S") menuItem.setShortcut("Ctrl+Shift+S")
menuItem.triggered.connect(self.saveProject) menuItem.triggered.connect(self.theParent.saveProject)
projMenu.addAction(menuItem) self.projMenu.addAction(menuItem)
# Project > Recent Projects # Project > Recent Projects
recentMenu = projMenu.addMenu(QIcon.fromTheme("document-open-recent"),"Recent Projects") recentMenu = self.projMenu.addMenu(QIcon.fromTheme("document-open-recent"),"Recent Projects")
for n in range(len(self.mainConf.recentList)): for n in range(len(self.mainConf.recentList)):
recentProject = self.mainConf.recentList[n] recentProject = self.mainConf.recentList[n]
if recentProject == "": continue if recentProject == "": continue
menuItem = QAction(QIcon.fromTheme("folder-open"), "%d: %s" % (n,recentProject), projMenu) menuItem = QAction(QIcon.fromTheme("folder-open"), "%d: %s" % (n,recentProject), self.projMenu)
menuItem.triggered.connect(lambda menuItem, n=n : self.openRecentProject(menuItem, n)) menuItem.triggered.connect(lambda menuItem, n=n : self.openRecentProject(menuItem, n))
recentMenu.addAction(menuItem) recentMenu.addAction(menuItem)
# Project > Separator # Project > Separator
projMenu.addSeparator() self.projMenu.addSeparator()
# Project > Project Settings # Project > Project Settings
menuItem = QAction(QIcon.fromTheme("document-properties"), "Project Settings", self) menuItem = QAction(QIcon.fromTheme("document-properties"), "Project Settings", self)
menuItem.setStatusTip("Project Settings") menuItem.setStatusTip("Project Settings")
menuItem.triggered.connect(self.editProject) menuItem.triggered.connect(self.theParent.editProjectDialog)
projMenu.addAction(menuItem) self.projMenu.addAction(menuItem)
# Project > Separator # Project > Separator
projMenu.addSeparator() self.projMenu.addSeparator()
# Project > Exit # Project > Exit
menuItem = QAction(QIcon.fromTheme("application-exit"), "Exit", self) menuItem = QAction(QIcon.fromTheme("application-exit"), "Exit", self)
menuItem.setStatusTip("Exit %s" % nw.__package__) menuItem.setStatusTip("Exit %s" % nw.__package__)
menuItem.setShortcut("Ctrl+Q") menuItem.setShortcut("Ctrl+Q")
menuItem.triggered.connect(self._menuExit) menuItem.triggered.connect(self._menuExit)
projMenu.addAction(menuItem) self.projMenu.addAction(menuItem)
############################################################################################ return
def _buildItemMenu(self):
# Item # Item
itemMenu = self.addMenu("&Item") self.itemMenu = self.addMenu("&Item")
# Item > New # Item > New
menuItem = QAction(QIcon.fromTheme("document-new"), "&New Document", self) menuItem = QAction(QIcon.fromTheme("document-new"), "&New Document", self)
menuItem.setStatusTip("Create New Document") menuItem.setStatusTip("Create New Document")
menuItem.setShortcut("Ctrl+N") menuItem.setShortcut("Ctrl+N")
itemMenu.addAction(menuItem) self.itemMenu.addAction(menuItem)
# Item > Open # Item > Open
menuItem = QAction(QIcon.fromTheme("document-open"), "&Open Document", self) menuItem = QAction(QIcon.fromTheme("document-open"), "&Open Document", self)
menuItem.setStatusTip("Open Selected Document") menuItem.setStatusTip("Open Selected Document")
menuItem.setShortcut("Ctrl+O") menuItem.setShortcut("Ctrl+O")
itemMenu.addAction(menuItem) self.itemMenu.addAction(menuItem)
# Item > Save # Item > Save
menuItem = QAction(QIcon.fromTheme("document-save"), "&Save Document", self) menuItem = QAction(QIcon.fromTheme("document-save"), "&Save Document", self)
menuItem.setStatusTip("Save Current Document") menuItem.setStatusTip("Save Current Document")
menuItem.setShortcut("Ctrl+S") menuItem.setShortcut("Ctrl+S")
menuItem.triggered.connect(self.saveDocument) menuItem.triggered.connect(self.theParent.saveDocument)
itemMenu.addAction(menuItem) self.itemMenu.addAction(menuItem)
# Item > Separator # Item > Separator
itemMenu.addSeparator() self.itemMenu.addSeparator()
# Item > New Folder # Item > New Folder
menuItem = QAction(QIcon.fromTheme("folder-new"), "New Folder", self) menuItem = QAction(QIcon.fromTheme("folder-new"), "New Folder", self)
menuItem.setStatusTip("New Folder") menuItem.setStatusTip("New Folder")
menuItem.setShortcut("Ctrl+Shift+N") menuItem.setShortcut("Ctrl+Shift+N")
itemMenu.addAction(menuItem) self.itemMenu.addAction(menuItem)
# Item > New Root # Item > New Root
rootMenu = itemMenu.addMenu(QIcon.fromTheme("folder-new"), "Create Root Group") rootMenu = self.itemMenu.addMenu(QIcon.fromTheme("folder-new"), "Create Root Group")
self.rootItems = {} self.rootItems = {}
self.rootItems[nwItemClass.NOVEL] = QAction(QIcon.fromTheme("folder-new"), "Novel Root", rootMenu) self.rootItems[nwItemClass.NOVEL] = QAction(QIcon.fromTheme("folder-new"), "Novel Root", rootMenu)
self.rootItems[nwItemClass.PLOT] = QAction(QIcon.fromTheme("folder-new"), "Plot Root", rootMenu) self.rootItems[nwItemClass.PLOT] = QAction(QIcon.fromTheme("folder-new"), "Plot Root", rootMenu)
@@ -158,148 +166,146 @@ class GuiMainMenu(QMenu):
rootMenu.addActions(self.rootItems.values()) rootMenu.addActions(self.rootItems.values())
# Item > Separator # Item > Separator
itemMenu.addSeparator() self.itemMenu.addSeparator()
# Item > Delete Item # Item > Delete Item
menuItem = QAction(QIcon.fromTheme("folder-delete"), "Delete Item", self) menuItem = QAction(QIcon.fromTheme("folder-delete"), "Delete Item", self)
menuItem.setStatusTip("Delete Selected Item") menuItem.setStatusTip("Delete Selected Item")
menuItem.setShortcut("Del") menuItem.setShortcut("Del")
itemMenu.addAction(menuItem) self.itemMenu.addAction(menuItem)
############################################################################################ return
def _buildEditMenu(self):
# Edit # Edit
editMenu = self.addMenu("&Edit") self.editMenu = self.addMenu("&Edit")
# Edit > Undo # Edit > Undo
menuItem = QAction(QIcon.fromTheme("edit-undo"), "Undo", self) menuItem = QAction(QIcon.fromTheme("edit-undo"), "Undo", self)
menuItem.setStatusTip("Undo Last Change") menuItem.setStatusTip("Undo Last Change")
menuItem.setShortcut("Ctrl+Z") menuItem.setShortcut("Ctrl+Z")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.UNDO)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.UNDO))
editMenu.addAction(menuItem) self.editMenu.addAction(menuItem)
# Edit > Redo # Edit > Redo
menuItem = QAction(QIcon.fromTheme("edit-redo"), "Redo", self) menuItem = QAction(QIcon.fromTheme("edit-redo"), "Redo", self)
menuItem.setStatusTip("Redo Last Change") menuItem.setStatusTip("Redo Last Change")
menuItem.setShortcut("Ctrl+Y") menuItem.setShortcut("Ctrl+Y")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.REDO)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.REDO))
editMenu.addAction(menuItem) self.editMenu.addAction(menuItem)
# Edit > Separator # Edit > Separator
editMenu.addSeparator() self.editMenu.addSeparator()
# Edit > Cut # Edit > Cut
menuItem = QAction(QIcon.fromTheme("edit-cut"), "Cut", self) menuItem = QAction(QIcon.fromTheme("edit-cut"), "Cut", self)
menuItem.setStatusTip("Cut Selected Text") menuItem.setStatusTip("Cut Selected Text")
menuItem.setShortcut("Ctrl+X") menuItem.setShortcut("Ctrl+X")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.CUT)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.CUT))
editMenu.addAction(menuItem) self.editMenu.addAction(menuItem)
# Edit > Copy # Edit > Copy
menuItem = QAction(QIcon.fromTheme("edit-copy"), "Copy", self) menuItem = QAction(QIcon.fromTheme("edit-copy"), "Copy", self)
menuItem.setStatusTip("Copy Selected Text") menuItem.setStatusTip("Copy Selected Text")
menuItem.setShortcut("Ctrl+C") menuItem.setShortcut("Ctrl+C")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.COPY)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.COPY))
editMenu.addAction(menuItem) self.editMenu.addAction(menuItem)
# Edit > Paste # Edit > Paste
menuItem = QAction(QIcon.fromTheme("edit-paste"), "Paste", self) menuItem = QAction(QIcon.fromTheme("edit-paste"), "Paste", self)
menuItem.setStatusTip("Paste Text from Clipboard") menuItem.setStatusTip("Paste Text from Clipboard")
menuItem.setShortcut("Ctrl+V") menuItem.setShortcut("Ctrl+V")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.PASTE)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.PASTE))
editMenu.addAction(menuItem) self.editMenu.addAction(menuItem)
# Edit > Separator # Edit > Separator
editMenu.addSeparator() self.editMenu.addSeparator()
# Edit > Select All # Edit > Select All
menuItem = QAction(QIcon.fromTheme("edit-select-all"), "Select All", self) menuItem = QAction(QIcon.fromTheme("edit-select-all"), "Select All", self)
menuItem.setStatusTip("Select All Text in Document") menuItem.setStatusTip("Select All Text in Document")
menuItem.setShortcut("Ctrl+A") menuItem.setShortcut("Ctrl+A")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.SEL_ALL)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.SEL_ALL))
editMenu.addAction(menuItem) self.editMenu.addAction(menuItem)
# Edit > Select Paragraph # Edit > Select Paragraph
menuItem = QAction(QIcon.fromTheme("edit-select-all"), "Select Paragraph", self) menuItem = QAction(QIcon.fromTheme("edit-select-all"), "Select Paragraph", self)
menuItem.setStatusTip("Select All Text in Paragraph") menuItem.setStatusTip("Select All Text in Paragraph")
menuItem.setShortcut("Ctrl+Shift+A") menuItem.setShortcut("Ctrl+Shift+A")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.SEL_PARA)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.SEL_PARA))
editMenu.addAction(menuItem) self.editMenu.addAction(menuItem)
# Edit > Separator # Edit > Separator
editMenu.addSeparator() self.editMenu.addSeparator()
# Edit > Settings # Edit > Settings
menuItem = QAction(QIcon.fromTheme("applications-system"), "Program Setting", self) menuItem = QAction(QIcon.fromTheme("applications-system"), "Program Setting", self)
menuItem.setStatusTip("Change %s Settings" % nw.__package__) menuItem.setStatusTip("Change %s Settings" % nw.__package__)
editMenu.addAction(menuItem) self.editMenu.addAction(menuItem)
############################################################################################ return
def _buildFormatMenu(self):
# Format # Format
fmtMenu = self.addMenu("&Format") self.fmtMenu = self.addMenu("&Format")
# Format > Bold Text # Format > Bold Text
menuItem = QAction(QIcon.fromTheme("format-text-bold"), "Bold Text", self) menuItem = QAction(QIcon.fromTheme("format-text-bold"), "Bold Text", self)
menuItem.setStatusTip("Make Selected Text Bold") menuItem.setStatusTip("Make Selected Text Bold")
menuItem.setShortcut("Ctrl+B") menuItem.setShortcut("Ctrl+B")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.BOLD)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.BOLD))
fmtMenu.addAction(menuItem) self.fmtMenu.addAction(menuItem)
# Format > Italic Text # Format > Italic Text
menuItem = QAction(QIcon.fromTheme("format-text-italic"), "Italic Text", self) menuItem = QAction(QIcon.fromTheme("format-text-italic"), "Italic Text", self)
menuItem.setStatusTip("Make Selected Text Italic") menuItem.setStatusTip("Make Selected Text Italic")
menuItem.setShortcut("Ctrl+I") menuItem.setShortcut("Ctrl+I")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.ITALIC)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.ITALIC))
fmtMenu.addAction(menuItem) self.fmtMenu.addAction(menuItem)
# Format > Underline Text # Format > Underline Text
menuItem = QAction(QIcon.fromTheme("format-text-underline"), "Underline Text", self) menuItem = QAction(QIcon.fromTheme("format-text-underline"), "Underline Text", self)
menuItem.setStatusTip("Underline Selected Text") menuItem.setStatusTip("Underline Selected Text")
menuItem.setShortcut("Ctrl+U") menuItem.setShortcut("Ctrl+U")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.U_LINE)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.U_LINE))
fmtMenu.addAction(menuItem) self.fmtMenu.addAction(menuItem)
# Edit > Separator # Edit > Separator
fmtMenu.addSeparator() self.fmtMenu.addSeparator()
# Format > Double Quotes # Format > Double Quotes
menuItem = QAction(QIcon.fromTheme("insert-text"), "Wrap Double Quotes", self) menuItem = QAction(QIcon.fromTheme("insert-text"), "Wrap Double Quotes", self)
menuItem.setStatusTip("Wrap Selected Text in Double Quotes") menuItem.setStatusTip("Wrap Selected Text in Double Quotes")
menuItem.setShortcut("Ctrl+D") menuItem.setShortcut("Ctrl+D")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.D_QUOTE)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.D_QUOTE))
fmtMenu.addAction(menuItem) self.fmtMenu.addAction(menuItem)
# Format > Single Quotes # Format > Single Quotes
menuItem = QAction(QIcon.fromTheme("insert-text"), "Wrap Single Quotes", self) menuItem = QAction(QIcon.fromTheme("insert-text"), "Wrap Single Quotes", self)
menuItem.setStatusTip("Wrap Selected Text in Single Quotes") menuItem.setStatusTip("Wrap Selected Text in Single Quotes")
menuItem.setShortcut("Ctrl+Shift+D") menuItem.setShortcut("Ctrl+Shift+D")
menuItem.triggered.connect(lambda: self.docEditor.docAction(nwDocAction.S_QUOTE)) menuItem.triggered.connect(lambda: self._docAction(nwDocAction.S_QUOTE))
fmtMenu.addAction(menuItem) self.fmtMenu.addAction(menuItem)
############################################################################################ return
def _buildHelpMenu(self):
# Help # Help
helpMenu = self.addMenu("&Help") self.helpMenu = self.addMenu("&Help")
# Help > About # Help > About
menuItem = QAction(QIcon.fromTheme("help-about"), "About %s" % nw.__package__, self) menuItem = QAction(QIcon.fromTheme("help-about"), "About %s" % nw.__package__, self)
menuItem.setStatusTip("About %s" % nw.__package__) menuItem.setStatusTip("About %s" % nw.__package__)
menuItem.triggered.connect(self._showAbout) menuItem.triggered.connect(self._showAbout)
helpMenu.addAction(menuItem) self.helpMenu.addAction(menuItem)
# Help > About Qt5 # Help > About Qt5
menuItem = QAction(QIcon.fromTheme("help-about"), "About Qt5", self) menuItem = QAction(QIcon.fromTheme("help-about"), "About Qt5", self)
menuItem.setStatusTip("About Qt5") menuItem.setStatusTip("About Qt5")
helpMenu.addAction(menuItem) self.helpMenu.addAction(menuItem)
if not self.mainConf.debugGUI:
return
############################################################################################
# Debug GUI
debugMenu = self.addMenu("&Debug")
return return
+66 -67
View File
@@ -22,6 +22,7 @@ from nw.gui.doctree import GuiDocTree
from nw.gui.doctreectx import GuiDocTreeCtx from nw.gui.doctreectx import GuiDocTreeCtx
from nw.gui.doceditor import GuiDocEditor from nw.gui.doceditor import GuiDocEditor
from nw.gui.docdetails import GuiDocDetails from nw.gui.docdetails import GuiDocDetails
from nw.gui.mainmenu import GuiMainMenu
from nw.gui.projecteditor import GuiProjectEditor from nw.gui.projecteditor import GuiProjectEditor
from nw.gui.statusbar import GuiMainStatus from nw.gui.statusbar import GuiMainStatus
from nw.project.project import NWProject from nw.project.project import NWProject
@@ -49,6 +50,8 @@ class GuiMain(QMainWindow):
self.docEditor = GuiDocEditor(self) self.docEditor = GuiDocEditor(self)
self.docDetails = GuiDocDetails(self.theProject) self.docDetails = GuiDocDetails(self.theProject)
self.treeView = GuiDocTree(self.theProject) self.treeView = GuiDocTree(self.theProject)
self.mainMenu = GuiMainMenu(self, self.theProject)
self.statusBar = GuiMainStatus()
# Assemble Main Window # Assemble Main Window
self.stackPane = QStackedWidget() self.stackPane = QStackedWidget()
@@ -70,16 +73,15 @@ class GuiMain(QMainWindow):
self.setCentralWidget(self.splitMain) self.setCentralWidget(self.splitMain)
# Build Menus # Build GUI Elements
self._buildMenu()
self.treeView.setContextMenuPolicy(Qt.CustomContextMenu) self.treeView.setContextMenuPolicy(Qt.CustomContextMenu)
self.treeView.customContextMenuRequested.connect(self._openDocTreeContextMenu) self.treeView.customContextMenuRequested.connect(self._openDocTreeContextMenu)
self.treeView.itemSelectionChanged.connect(self._treeSingleClick) self.treeView.itemSelectionChanged.connect(self._treeSingleClick)
self.treeView.itemDoubleClicked.connect(self._treeDoubleClick) self.treeView.itemDoubleClicked.connect(self._treeDoubleClick)
self.treeView.buildTree() self.treeView.buildTree()
# Build Status Bar # Set Main Window Elements
self.statusBar = GuiMainStatus() self.setMenuBar(self.mainMenu)
self.setStatusBar(self.statusBar) self.setStatusBar(self.statusBar)
self.statusBar.showMessage("Ready") self.statusBar.showMessage("Ready")
@@ -106,47 +108,24 @@ class GuiMain(QMainWindow):
self.treeView.buildTree() self.treeView.buildTree()
return return
def openProject(self): def openProject(self, projFile=None):
dlgOpt = QFileDialog.Options() if projFile is None:
dlgOpt |= QFileDialog.DontUseNativeDialog projFile = self.openProjectDialog()
projPath, _ = QFileDialog.getOpenFileName( if projFile is None:
self,"Open novelWriter Project","","novelWriter Project File (nwProject.nwx);;All Files (*)", options=dlgOpt
)
if projPath:
self.theProject.openProject(projPath)
self.treeView.buildTree()
self._setWindowTitle(self.theProject.projName)
else:
return False return False
self.theProject.openProject(projFile)
self.treeView.buildTree()
self._setWindowTitle(self.theProject.projName)
return True return True
def saveProject(self): def saveProject(self):
if self.theProject.projPath is None: if self.theProject.projPath is None:
dlgOpt = QFileDialog.Options() projPath = self.saveProjectDialog()
dlgOpt |= QFileDialog.DontUseNativeDialog self.theProject.setProjectPath(projPath)
projPath, _ = QFileDialog.getSaveFileName(
self,"Save novelWriter Project","","novelWriter Project File (nwProject.nwx);;All Files (*)", options=dlgOpt
)
if projPath:
self.theProject.setProjectPath(projPath)
else:
return False
self.treeView.saveTreeOrder() self.treeView.saveTreeOrder()
self.theProject.saveProject() self.theProject.saveProject()
return True return True
def editProject(self):
dlgProj = GuiProjectEditor(self, self.theProject)
dlgProj.exec_()
return True
def openRecentProject(self, menuItem, recentItem):
logger.verbose("User requested opening recent project #%d" % recentItem)
self.theProject.openProject(self.mainConf.recentList[recentItem])
self.treeView.buildTree()
self._setWindowTitle(self.theProject.projName)
return True
## ##
# Document Actions # Document Actions
## ##
@@ -166,27 +145,39 @@ class GuiMain(QMainWindow):
return return
## ##
# Internal Functions # Main Dialogs
## ##
def _treeSingleClick(self): def openProjectDialog(self):
sHandle = self.treeView.getSelectedHandle() dlgOpt = QFileDialog.Options()
if sHandle is not None: dlgOpt |= QFileDialog.DontUseNativeDialog
self.docDetails.buildViewBox(sHandle) projFile, _ = QFileDialog.getOpenFileName(
return self,"Open novelWriter Project","","novelWriter Project File (nwProject.nwx);;All Files (*)", options=dlgOpt
)
if projFile:
return projFile
return None
def _treeDoubleClick(self, tItem, colNo): def saveProjectDialog(self):
tHandle = tItem.text(3) dlgOpt = QFileDialog.Options()
logger.verbose("User double clicked tree item with handle %s" % tHandle) dlgOpt |= QFileDialog.DontUseNativeDialog
nwItem = self.theProject.getItem(tHandle) projPath, _ = QFileDialog.getSaveFileName(
if nwItem.itemType == nwItemType.FILE: self,"Save novelWriter Project","","novelWriter Project File (nwProject.nwx);;All Files (*)", options=dlgOpt
logger.verbose("Requested item %s is a file" % tHandle) )
self.openDocument(tHandle) if projPath:
else: return projPath
logger.verbose("Requested item %s is a folder" % tHandle) return None
return
def _closeMain(self): def editProjectDialog(self):
dlgProj = GuiProjectEditor(self, self.theProject)
dlgProj.exec_()
return True
##
# Main Window Actions
##
def closeMain(self):
logger.info("Exiting %s" % nw.__package__) logger.info("Exiting %s" % nw.__package__)
self.mainConf.setWinSize(self.width(), self.height()) self.mainConf.setWinSize(self.width(), self.height())
self.mainConf.setTreeColWidths(self.treeView.getColumnSizes()) self.mainConf.setTreeColWidths(self.treeView.getColumnSizes())
@@ -194,6 +185,10 @@ class GuiMain(QMainWindow):
self.mainConf.saveConfig() self.mainConf.saveConfig()
return return
##
# Internal Functions
##
def _setWindowTitle(self, projName=None): def _setWindowTitle(self, projName=None):
winTitle = "%s [%s]" % (nw.__package__, nw.__version__) winTitle = "%s [%s]" % (nw.__package__, nw.__version__)
if projName is not None: if projName is not None:
@@ -201,19 +196,6 @@ class GuiMain(QMainWindow):
self.setWindowTitle(winTitle) self.setWindowTitle(winTitle)
return True return True
##
# Menu Action
##
def _menuExit(self):
self._closeMain()
qApp.quit()
return True
def _showAbout(self):
self.docTabs.createTab(None,nw.DOCTYPE_ABOUT)
return True
## ##
# DocTree Context Menu # DocTree Context Menu
## ##
@@ -271,7 +253,7 @@ class GuiMain(QMainWindow):
return return
def closeEvent(self, theEvent): def closeEvent(self, theEvent):
self._closeMain() self.closeMain()
QMainWindow.closeEvent(self,theEvent) QMainWindow.closeEvent(self,theEvent)
return return
@@ -279,6 +261,23 @@ class GuiMain(QMainWindow):
# Signal Handlers # Signal Handlers
## ##
def _treeSingleClick(self):
sHandle = self.treeView.getSelectedHandle()
if sHandle is not None:
self.docDetails.buildViewBox(sHandle)
return
def _treeDoubleClick(self, tItem, colNo):
tHandle = tItem.text(3)
logger.verbose("User double clicked tree item with handle %s" % tHandle)
nwItem = self.theProject.getItem(tHandle)
if nwItem.itemType == nwItemType.FILE:
logger.verbose("Requested item %s is a file" % tHandle)
self.openDocument(tHandle)
else:
logger.verbose("Requested item %s is a folder" % tHandle)
return
def _splitMainMove(self, pWidth, pHeight): def _splitMainMove(self, pWidth, pHeight):
"""Alert dependent GUI elements that the main pane splitter has been moved. """Alert dependent GUI elements that the main pane splitter has been moved.
""" """
+6 -2
View File
@@ -176,8 +176,12 @@ class NWProject():
return False return False
if not path.isdir(self.projPath): if not path.isdir(self.projPath):
logger.info("Created folder %s" % self.projPath) try:
mkdir(self.projPath) mkdir(self.projPath)
logger.info("Created folder %s" % self.projPath)
except:
logger.error("Could not create folder %s" % self.projPath)
return False
logger.debug("Saving project: %s" % self.projPath) logger.debug("Saving project: %s" % self.projPath)