From 39c072050b56c48d47a6504d5311b4f54327d939 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Sun, 11 May 2025 12:50:00 +0200 Subject: [PATCH] Add shapes to default status labels (#2332) --- novelwriter/core/project.py | 16 +++++----- .../coreProject_NewFileFolder_nwProject.nwx | 18 +++++------ .../coreProject_NewRoot_nwProject.nwx | 18 +++++------ .../coreTools_DocDuplicator_nwProject.nwx | 18 +++++------ .../coreTools_ProjectBuilderA_nwProject.nwx | 18 +++++------ .../coreTools_ProjectBuilderB_nwProject.nwx | 18 +++++------ .../guiEditor_Main_Final_nwProject.nwx | 20 ++++++------- .../guiEditor_Main_Initial_nwProject.nwx | 18 +++++------ .../test_dialogs/test_dlg_projectsettings.py | 30 +++++++++---------- 9 files changed, 87 insertions(+), 87 deletions(-) diff --git a/novelwriter/core/project.py b/novelwriter/core/project.py index 9ad46682..fb71e9ac 100644 --- a/novelwriter/core/project.py +++ b/novelwriter/core/project.py @@ -483,14 +483,14 @@ class NWProject: def setDefaultStatusImport(self) -> None: """Set the default status and importance values.""" - self._data.itemStatus.add(None, self.tr("New"), (100, 100, 100), "SQUARE", 0) - self._data.itemStatus.add(None, self.tr("Note"), (200, 50, 0), "SQUARE", 0) - self._data.itemStatus.add(None, self.tr("Draft"), (200, 150, 0), "SQUARE", 0) - self._data.itemStatus.add(None, self.tr("Finished"), (50, 200, 0), "SQUARE", 0) - self._data.itemImport.add(None, self.tr("New"), (100, 100, 100), "SQUARE", 0) - self._data.itemImport.add(None, self.tr("Minor"), (200, 50, 0), "SQUARE", 0) - self._data.itemImport.add(None, self.tr("Major"), (200, 150, 0), "SQUARE", 0) - self._data.itemImport.add(None, self.tr("Main"), (50, 200, 0), "SQUARE", 0) + self._data.itemStatus.add(None, self.tr("New"), (120, 120, 120), "STAR", 0) + self._data.itemStatus.add(None, self.tr("Note"), (205, 171, 143), "TRIANGLE", 0) + self._data.itemStatus.add(None, self.tr("Draft"), (143, 240, 164), "CIRCLE_T", 0) + self._data.itemStatus.add(None, self.tr("Finished"), (249, 240, 107), "STAR", 0) + self._data.itemImport.add(None, self.tr("New"), (120, 120, 120), "SQUARE", 0) + self._data.itemImport.add(None, self.tr("Minor"), (220, 138, 221), "BLOCK_2", 0) + self._data.itemImport.add(None, self.tr("Major"), (220, 138, 221), "BLOCK_3", 0) + self._data.itemImport.add(None, self.tr("Main"), (220, 138, 221), "BLOCK_4", 0) return def setProjectLang(self, language: str | None) -> None: diff --git a/tests/reference/coreProject_NewFileFolder_nwProject.nwx b/tests/reference/coreProject_NewFileFolder_nwProject.nwx index 80142d13..6b5adc10 100644 --- a/tests/reference/coreProject_NewFileFolder_nwProject.nwx +++ b/tests/reference/coreProject_NewFileFolder_nwProject.nwx @@ -1,5 +1,5 @@ - + New Project Jane Doe @@ -16,16 +16,16 @@ - New - Note - Draft - Finished + New + Note + Draft + Finished - New - Minor - Major - Main + New + Minor + Major + Main diff --git a/tests/reference/coreProject_NewRoot_nwProject.nwx b/tests/reference/coreProject_NewRoot_nwProject.nwx index 5d583362..bb72469a 100644 --- a/tests/reference/coreProject_NewRoot_nwProject.nwx +++ b/tests/reference/coreProject_NewRoot_nwProject.nwx @@ -1,5 +1,5 @@ - + New Project Jane Doe @@ -16,16 +16,16 @@ - New - Note - Draft - Finished + New + Note + Draft + Finished - New - Minor - Major - Main + New + Minor + Major + Main diff --git a/tests/reference/coreTools_DocDuplicator_nwProject.nwx b/tests/reference/coreTools_DocDuplicator_nwProject.nwx index 2f571386..1405e3e9 100644 --- a/tests/reference/coreTools_DocDuplicator_nwProject.nwx +++ b/tests/reference/coreTools_DocDuplicator_nwProject.nwx @@ -1,5 +1,5 @@ - + New Project Jane Doe @@ -16,16 +16,16 @@ - New - Note - Draft - Finished + New + Note + Draft + Finished - New - Minor - Major - Main + New + Minor + Major + Main diff --git a/tests/reference/coreTools_ProjectBuilderA_nwProject.nwx b/tests/reference/coreTools_ProjectBuilderA_nwProject.nwx index a35421d0..fbe4eb4c 100644 --- a/tests/reference/coreTools_ProjectBuilderA_nwProject.nwx +++ b/tests/reference/coreTools_ProjectBuilderA_nwProject.nwx @@ -1,5 +1,5 @@ - + Test Project A Jane Doe @@ -16,16 +16,16 @@ - New - Note - Draft - Finished + New + Note + Draft + Finished - New - Minor - Major - Main + New + Minor + Major + Main diff --git a/tests/reference/coreTools_ProjectBuilderB_nwProject.nwx b/tests/reference/coreTools_ProjectBuilderB_nwProject.nwx index 0185bc6a..203e7fbf 100644 --- a/tests/reference/coreTools_ProjectBuilderB_nwProject.nwx +++ b/tests/reference/coreTools_ProjectBuilderB_nwProject.nwx @@ -1,5 +1,5 @@ - + Test Project B Jane Doe @@ -16,16 +16,16 @@ - New - Note - Draft - Finished + New + Note + Draft + Finished - New - Minor - Major - Main + New + Minor + Major + Main diff --git a/tests/reference/guiEditor_Main_Final_nwProject.nwx b/tests/reference/guiEditor_Main_Final_nwProject.nwx index e90fa531..ac0d929b 100644 --- a/tests/reference/guiEditor_Main_Final_nwProject.nwx +++ b/tests/reference/guiEditor_Main_Final_nwProject.nwx @@ -1,6 +1,6 @@ - - + + New Project Jane Doe @@ -16,16 +16,16 @@ - New - Note - Draft - Finished + New + Note + Draft + Finished - New - Minor - Major - Main + New + Minor + Major + Main diff --git a/tests/reference/guiEditor_Main_Initial_nwProject.nwx b/tests/reference/guiEditor_Main_Initial_nwProject.nwx index 27e64dac..1c94d8c6 100644 --- a/tests/reference/guiEditor_Main_Initial_nwProject.nwx +++ b/tests/reference/guiEditor_Main_Initial_nwProject.nwx @@ -1,5 +1,5 @@ - + New Project Jane Doe @@ -16,16 +16,16 @@ - New - Note - Draft - Finished + New + Note + Draft + Finished - New - Minor - Major - Main + New + Minor + Major + Main diff --git a/tests/test_dialogs/test_dlg_projectsettings.py b/tests/test_dialogs/test_dlg_projectsettings.py index d28322d4..edd0cebe 100644 --- a/tests/test_dialogs/test_dlg_projectsettings.py +++ b/tests/test_dialogs/test_dlg_projectsettings.py @@ -214,18 +214,18 @@ def testDlgProjSettings_StatusImport(qtbot, monkeypatch, nwGUI, projPath, mockRn assert update[0][0] == C.sNew assert update[0][1].name == "New" - assert update[0][1].color == QColor(100, 100, 100) - assert update[0][1].shape == nwStatusShape.SQUARE + assert update[0][1].color == QColor(120, 120, 120) + assert update[0][1].shape == nwStatusShape.STAR assert update[1][0] == C.sDraft assert update[1][1].name == "Draft" - assert update[1][1].color == QColor(200, 150, 0) - assert update[1][1].shape == nwStatusShape.SQUARE + assert update[1][1].color == QColor(143, 240, 164) + assert update[1][1].shape == nwStatusShape.CIRCLE_T assert update[2][0] == C.sFinished assert update[2][1].name == "Finished" - assert update[2][1].color == QColor(50, 200, 0) - assert update[2][1].shape == nwStatusShape.SQUARE + assert update[2][1].color == QColor(249, 240, 107) + assert update[2][1].shape == nwStatusShape.STAR assert update[3][0] is None assert update[3][1].name == "Final" @@ -289,18 +289,18 @@ def testDlgProjSettings_StatusImport(qtbot, monkeypatch, nwGUI, projPath, mockRn assert update[0][0] == C.iNew assert update[0][1].name == "New" - assert update[0][1].color == QColor(100, 100, 100) + assert update[0][1].color == QColor(120, 120, 120) assert update[0][1].shape == nwStatusShape.SQUARE assert update[1][0] == C.iMajor assert update[1][1].name == "Major" - assert update[1][1].color == QColor(200, 150, 0) - assert update[1][1].shape == nwStatusShape.SQUARE + assert update[1][1].color == QColor(220, 138, 221) + assert update[1][1].shape == nwStatusShape.BLOCK_3 assert update[2][0] == C.iMain assert update[2][1].name == "Main" - assert update[2][1].color == QColor(50, 200, 0) - assert update[2][1].shape == nwStatusShape.SQUARE + assert update[2][1].color == QColor(220, 138, 221) + assert update[2][1].shape == nwStatusShape.BLOCK_4 assert update[3][0] is None assert update[3][1].name == "Final" @@ -354,10 +354,10 @@ def testDlgProjSettings_StatusImportExport(qtbot, monkeypatch, nwGUI, projPath, assert expFile.is_file() is True assert expFile.read_text().split() == [ - "SQUARE,#646464,New", - "SQUARE,#c83200,Note", - "SQUARE,#c89600,Draft", - "SQUARE,#32c800,Finished", + "STAR,#787878,New", + "TRIANGLE,#cdab8f,Note", + "CIRCLE_T,#8ff0a4,Draft", + "STAR,#f9f06b,Finished", ] # Import Error