Remove the old merge document menu entry
This commit is contained in:
@@ -244,11 +244,6 @@ class GuiMainMenu(QMenuBar):
|
|||||||
self.aImportFile.triggered.connect(lambda: self.mainGui.importDocument())
|
self.aImportFile.triggered.connect(lambda: self.mainGui.importDocument())
|
||||||
self.docuMenu.addAction(self.aImportFile)
|
self.docuMenu.addAction(self.aImportFile)
|
||||||
|
|
||||||
# Document > Merge Documents
|
|
||||||
self.aMergeDocs = QAction(self.tr("Merge Folder to Document"), self)
|
|
||||||
self.aMergeDocs.triggered.connect(lambda: self.mainGui.mergeDocuments())
|
|
||||||
self.docuMenu.addAction(self.aMergeDocs)
|
|
||||||
|
|
||||||
# Document > Split Document
|
# Document > Split Document
|
||||||
self.aSplitDoc = QAction(self.tr("Split Document to Folder"), self)
|
self.aSplitDoc = QAction(self.tr("Split Document to Folder"), self)
|
||||||
self.aSplitDoc.triggered.connect(lambda: self.mainGui.splitDocument())
|
self.aSplitDoc.triggered.connect(lambda: self.mainGui.splitDocument())
|
||||||
|
|||||||
+2
-14
@@ -44,8 +44,8 @@ from novelwriter.gui import (
|
|||||||
GuiViewsBar
|
GuiViewsBar
|
||||||
)
|
)
|
||||||
from novelwriter.dialogs import (
|
from novelwriter.dialogs import (
|
||||||
GuiAbout, GuiDocMerge, GuiDocSplit, GuiPreferences, GuiProjectDetails,
|
GuiAbout, GuiDocSplit, GuiPreferences, GuiProjectDetails, GuiProjectLoad,
|
||||||
GuiProjectLoad, GuiProjectSettings, GuiUpdates, GuiWordList
|
GuiProjectSettings, GuiUpdates, GuiWordList
|
||||||
)
|
)
|
||||||
from novelwriter.tools import (
|
from novelwriter.tools import (
|
||||||
GuiBuildNovel, GuiLipsum, GuiProjectWizard, GuiWritingStats
|
GuiBuildNovel, GuiLipsum, GuiProjectWizard, GuiWritingStats
|
||||||
@@ -745,18 +745,6 @@ class GuiMain(QMainWindow):
|
|||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def mergeDocuments(self):
|
|
||||||
"""Merge multiple documents to one single new document.
|
|
||||||
"""
|
|
||||||
if not self.hasProject:
|
|
||||||
logger.error("No project open")
|
|
||||||
return False
|
|
||||||
|
|
||||||
dlgMerge = GuiDocMerge(self)
|
|
||||||
dlgMerge.exec_()
|
|
||||||
|
|
||||||
return True
|
|
||||||
|
|
||||||
def splitDocument(self):
|
def splitDocument(self):
|
||||||
"""Split a single document into multiple documents.
|
"""Split a single document into multiple documents.
|
||||||
"""
|
"""
|
||||||
|
|||||||
@@ -54,7 +54,6 @@ def testGuiMain_ProjectBlocker(monkeypatch, nwGUI):
|
|||||||
assert nwGUI.saveDocument() is False
|
assert nwGUI.saveDocument() is False
|
||||||
assert nwGUI.viewDocument(None) is False
|
assert nwGUI.viewDocument(None) is False
|
||||||
assert nwGUI.importDocument() is False
|
assert nwGUI.importDocument() is False
|
||||||
assert nwGUI.mergeDocuments() is False
|
|
||||||
assert nwGUI.splitDocument() is False
|
assert nwGUI.splitDocument() is False
|
||||||
assert nwGUI.openSelectedItem() is False
|
assert nwGUI.openSelectedItem() is False
|
||||||
assert nwGUI.editItemLabel() is False
|
assert nwGUI.editItemLabel() is False
|
||||||
|
|||||||
Reference in New Issue
Block a user