From 46ecb2cf703b4b627dbcb323eb05426cef37a9d6 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Thu, 24 Oct 2024 23:57:39 +0200 Subject: [PATCH] Add mentions to outline --- novelwriter/constants.py | 56 +++++++++++++++--------------- novelwriter/enum.py | 35 ++++++++++--------- novelwriter/gui/outline.py | 70 ++++++++++++++++++++------------------ 3 files changed, 83 insertions(+), 78 deletions(-) diff --git a/novelwriter/constants.py b/novelwriter/constants.py index daf09fcb..3fa2d7c8 100644 --- a/novelwriter/constants.py +++ b/novelwriter/constants.py @@ -237,35 +237,37 @@ class nwLabels: "note": QT_TRANSLATE_NOOP("Constant", "Project Note"), } KEY_NAME = { - nwKeyWords.TAG_KEY: QT_TRANSLATE_NOOP("Constant", "Tag"), - nwKeyWords.POV_KEY: QT_TRANSLATE_NOOP("Constant", "Point of View"), - nwKeyWords.FOCUS_KEY: QT_TRANSLATE_NOOP("Constant", "Focus"), - nwKeyWords.CHAR_KEY: QT_TRANSLATE_NOOP("Constant", "Characters"), - nwKeyWords.PLOT_KEY: QT_TRANSLATE_NOOP("Constant", "Plot"), - nwKeyWords.TIME_KEY: QT_TRANSLATE_NOOP("Constant", "Timeline"), - nwKeyWords.WORLD_KEY: QT_TRANSLATE_NOOP("Constant", "Locations"), - nwKeyWords.OBJECT_KEY: QT_TRANSLATE_NOOP("Constant", "Objects"), - nwKeyWords.ENTITY_KEY: QT_TRANSLATE_NOOP("Constant", "Entities"), - nwKeyWords.CUSTOM_KEY: QT_TRANSLATE_NOOP("Constant", "Custom"), + nwKeyWords.TAG_KEY: QT_TRANSLATE_NOOP("Constant", "Tag"), + nwKeyWords.POV_KEY: QT_TRANSLATE_NOOP("Constant", "Point of View"), + nwKeyWords.FOCUS_KEY: QT_TRANSLATE_NOOP("Constant", "Focus"), + nwKeyWords.CHAR_KEY: QT_TRANSLATE_NOOP("Constant", "Characters"), + nwKeyWords.PLOT_KEY: QT_TRANSLATE_NOOP("Constant", "Plot"), + nwKeyWords.TIME_KEY: QT_TRANSLATE_NOOP("Constant", "Timeline"), + nwKeyWords.WORLD_KEY: QT_TRANSLATE_NOOP("Constant", "Locations"), + nwKeyWords.OBJECT_KEY: QT_TRANSLATE_NOOP("Constant", "Objects"), + nwKeyWords.ENTITY_KEY: QT_TRANSLATE_NOOP("Constant", "Entities"), + nwKeyWords.CUSTOM_KEY: QT_TRANSLATE_NOOP("Constant", "Custom"), + nwKeyWords.MENTION_KEY: QT_TRANSLATE_NOOP("Constant", "Mentions"), } OUTLINE_COLS = { - nwOutline.TITLE: QT_TRANSLATE_NOOP("Constant", "Title"), - nwOutline.LEVEL: QT_TRANSLATE_NOOP("Constant", "Level"), - nwOutline.LABEL: QT_TRANSLATE_NOOP("Constant", "Document"), - nwOutline.LINE: QT_TRANSLATE_NOOP("Constant", "Line"), - nwOutline.CCOUNT: QT_TRANSLATE_NOOP("Constant", "Chars"), - nwOutline.WCOUNT: QT_TRANSLATE_NOOP("Constant", "Words"), - nwOutline.PCOUNT: QT_TRANSLATE_NOOP("Constant", "Pars"), - nwOutline.POV: QT_TRANSLATE_NOOP("Constant", "POV"), - nwOutline.FOCUS: QT_TRANSLATE_NOOP("Constant", "Focus"), - nwOutline.CHAR: KEY_NAME[nwKeyWords.CHAR_KEY], - nwOutline.PLOT: KEY_NAME[nwKeyWords.PLOT_KEY], - nwOutline.WORLD: KEY_NAME[nwKeyWords.WORLD_KEY], - nwOutline.TIME: KEY_NAME[nwKeyWords.TIME_KEY], - nwOutline.OBJECT: KEY_NAME[nwKeyWords.OBJECT_KEY], - nwOutline.ENTITY: KEY_NAME[nwKeyWords.ENTITY_KEY], - nwOutline.CUSTOM: KEY_NAME[nwKeyWords.CUSTOM_KEY], - nwOutline.SYNOP: QT_TRANSLATE_NOOP("Constant", "Synopsis"), + nwOutline.TITLE: QT_TRANSLATE_NOOP("Constant", "Title"), + nwOutline.LEVEL: QT_TRANSLATE_NOOP("Constant", "Level"), + nwOutline.LABEL: QT_TRANSLATE_NOOP("Constant", "Document"), + nwOutline.LINE: QT_TRANSLATE_NOOP("Constant", "Line"), + nwOutline.CCOUNT: QT_TRANSLATE_NOOP("Constant", "Chars"), + nwOutline.WCOUNT: QT_TRANSLATE_NOOP("Constant", "Words"), + nwOutline.PCOUNT: QT_TRANSLATE_NOOP("Constant", "Pars"), + nwOutline.POV: QT_TRANSLATE_NOOP("Constant", "POV"), + nwOutline.FOCUS: QT_TRANSLATE_NOOP("Constant", "Focus"), + nwOutline.CHAR: KEY_NAME[nwKeyWords.CHAR_KEY], + nwOutline.PLOT: KEY_NAME[nwKeyWords.PLOT_KEY], + nwOutline.WORLD: KEY_NAME[nwKeyWords.WORLD_KEY], + nwOutline.TIME: KEY_NAME[nwKeyWords.TIME_KEY], + nwOutline.OBJECT: KEY_NAME[nwKeyWords.OBJECT_KEY], + nwOutline.ENTITY: KEY_NAME[nwKeyWords.ENTITY_KEY], + nwOutline.CUSTOM: KEY_NAME[nwKeyWords.CUSTOM_KEY], + nwOutline.MENTION: KEY_NAME[nwKeyWords.MENTION_KEY], + nwOutline.SYNOP: QT_TRANSLATE_NOOP("Constant", "Synopsis"), } BUILD_FMT = { nwBuildFmt.ODT: QT_TRANSLATE_NOOP("Constant", "Open Document (.odt)"), diff --git a/novelwriter/enum.py b/novelwriter/enum.py index c36e258f..200baa2b 100644 --- a/novelwriter/enum.py +++ b/novelwriter/enum.py @@ -158,23 +158,24 @@ class nwFocus(Enum): class nwOutline(Enum): - TITLE = 0 - LEVEL = 1 - LABEL = 2 - LINE = 3 - CCOUNT = 4 - WCOUNT = 5 - PCOUNT = 6 - POV = 7 - FOCUS = 8 - CHAR = 9 - PLOT = 10 - TIME = 11 - WORLD = 12 - OBJECT = 13 - ENTITY = 14 - CUSTOM = 15 - SYNOP = 16 + TITLE = 0 + LEVEL = 1 + LABEL = 2 + LINE = 3 + CCOUNT = 4 + WCOUNT = 5 + PCOUNT = 6 + POV = 7 + FOCUS = 8 + CHAR = 9 + PLOT = 10 + TIME = 11 + WORLD = 12 + OBJECT = 13 + ENTITY = 14 + CUSTOM = 15 + MENTION = 16 + SYNOP = 17 class nwBuildFmt(Enum): diff --git a/novelwriter/gui/outline.py b/novelwriter/gui/outline.py index fc9b9d48..dac7cc85 100644 --- a/novelwriter/gui/outline.py +++ b/novelwriter/gui/outline.py @@ -312,43 +312,45 @@ class GuiOutlineToolBar(QToolBar): class GuiOutlineTree(QTreeWidget): DEF_WIDTH = { - nwOutline.TITLE: 200, - nwOutline.LEVEL: 40, - nwOutline.LABEL: 150, - nwOutline.LINE: 40, - nwOutline.CCOUNT: 50, - nwOutline.WCOUNT: 50, - nwOutline.PCOUNT: 50, - nwOutline.POV: 100, - nwOutline.FOCUS: 100, - nwOutline.CHAR: 100, - nwOutline.PLOT: 100, - nwOutline.TIME: 100, - nwOutline.WORLD: 100, - nwOutline.OBJECT: 100, - nwOutline.ENTITY: 100, - nwOutline.CUSTOM: 100, - nwOutline.SYNOP: 200, + nwOutline.TITLE: 200, + nwOutline.LEVEL: 40, + nwOutline.LABEL: 150, + nwOutline.LINE: 40, + nwOutline.CCOUNT: 50, + nwOutline.WCOUNT: 50, + nwOutline.PCOUNT: 50, + nwOutline.POV: 100, + nwOutline.FOCUS: 100, + nwOutline.CHAR: 100, + nwOutline.PLOT: 100, + nwOutline.TIME: 100, + nwOutline.WORLD: 100, + nwOutline.OBJECT: 100, + nwOutline.ENTITY: 100, + nwOutline.CUSTOM: 100, + nwOutline.MENTION: 100, + nwOutline.SYNOP: 200, } DEF_HIDDEN = { - nwOutline.TITLE: False, - nwOutline.LEVEL: True, - nwOutline.LABEL: False, - nwOutline.LINE: True, - nwOutline.CCOUNT: True, - nwOutline.WCOUNT: False, - nwOutline.PCOUNT: False, - nwOutline.POV: False, - nwOutline.FOCUS: True, - nwOutline.CHAR: False, - nwOutline.PLOT: False, - nwOutline.TIME: True, - nwOutline.WORLD: False, - nwOutline.OBJECT: True, - nwOutline.ENTITY: True, - nwOutline.CUSTOM: True, - nwOutline.SYNOP: False, + nwOutline.TITLE: False, + nwOutline.LEVEL: True, + nwOutline.LABEL: False, + nwOutline.LINE: True, + nwOutline.CCOUNT: True, + nwOutline.WCOUNT: False, + nwOutline.PCOUNT: False, + nwOutline.POV: False, + nwOutline.FOCUS: True, + nwOutline.CHAR: False, + nwOutline.PLOT: False, + nwOutline.TIME: True, + nwOutline.WORLD: False, + nwOutline.OBJECT: True, + nwOutline.ENTITY: True, + nwOutline.CUSTOM: True, + nwOutline.MENTION: True, + nwOutline.SYNOP: False, } D_HANDLE = QtUserRole