From 6500975cc36cb770fa354e0c47884807cd3a15f6 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:39:10 +0100 Subject: [PATCH 1/3] Replace template root folder icon --- novelwriter/assets/icons/typicons_dark/icons.conf | 2 +- .../assets/icons/typicons_dark/mixed_document-new.svg | 6 ++++++ .../assets/icons/typicons_dark/typ_document-add-col.svg | 8 -------- novelwriter/assets/icons/typicons_light/icons.conf | 2 +- .../assets/icons/typicons_light/mixed_document-new.svg | 6 ++++++ .../assets/icons/typicons_light/typ_document-add-col.svg | 8 -------- 6 files changed, 14 insertions(+), 18 deletions(-) create mode 100644 novelwriter/assets/icons/typicons_dark/mixed_document-new.svg delete mode 100644 novelwriter/assets/icons/typicons_dark/typ_document-add-col.svg create mode 100644 novelwriter/assets/icons/typicons_light/mixed_document-new.svg delete mode 100644 novelwriter/assets/icons/typicons_light/typ_document-add-col.svg diff --git a/novelwriter/assets/icons/typicons_dark/icons.conf b/novelwriter/assets/icons/typicons_dark/icons.conf index 442f0d82..250bac57 100644 --- a/novelwriter/assets/icons/typicons_dark/icons.conf +++ b/novelwriter/assets/icons/typicons_dark/icons.conf @@ -40,7 +40,7 @@ cls_none = typ_cancel.svg cls_novel = typ_book.svg cls_object = typ_key.svg cls_plot = typ_puzzle.svg -cls_template = typ_document-add-col.svg +cls_template = mixed_document-new.svg cls_timeline = typ_calendar.svg cls_trash = typ_trash.svg cls_world = typ_location.svg diff --git a/novelwriter/assets/icons/typicons_dark/mixed_document-new.svg b/novelwriter/assets/icons/typicons_dark/mixed_document-new.svg new file mode 100644 index 00000000..6752917f --- /dev/null +++ b/novelwriter/assets/icons/typicons_dark/mixed_document-new.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/novelwriter/assets/icons/typicons_dark/typ_document-add-col.svg b/novelwriter/assets/icons/typicons_dark/typ_document-add-col.svg deleted file mode 100644 index 404a2653..00000000 --- a/novelwriter/assets/icons/typicons_dark/typ_document-add-col.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/novelwriter/assets/icons/typicons_light/icons.conf b/novelwriter/assets/icons/typicons_light/icons.conf index 4c6d1890..65419898 100644 --- a/novelwriter/assets/icons/typicons_light/icons.conf +++ b/novelwriter/assets/icons/typicons_light/icons.conf @@ -40,7 +40,7 @@ cls_none = typ_cancel.svg cls_novel = typ_book.svg cls_object = typ_key.svg cls_plot = typ_puzzle.svg -cls_template = typ_document-add-col.svg +cls_template = mixed_document-new.svg cls_timeline = typ_calendar.svg cls_trash = typ_trash.svg cls_world = typ_location.svg diff --git a/novelwriter/assets/icons/typicons_light/mixed_document-new.svg b/novelwriter/assets/icons/typicons_light/mixed_document-new.svg new file mode 100644 index 00000000..6d905312 --- /dev/null +++ b/novelwriter/assets/icons/typicons_light/mixed_document-new.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/novelwriter/assets/icons/typicons_light/typ_document-add-col.svg b/novelwriter/assets/icons/typicons_light/typ_document-add-col.svg deleted file mode 100644 index 23518846..00000000 --- a/novelwriter/assets/icons/typicons_light/typ_document-add-col.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - From 3c8e3b36536aca78bdf92d05c4ca7836a75727d1 Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:39:28 +0100 Subject: [PATCH 2/3] Rename buttons on welcome dialog --- novelwriter/tools/welcome.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index 51335306..e0dd3f1b 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -107,11 +107,11 @@ class GuiWelcome(QDialog): # Buttons # ======= - self.btnList = QPushButton(self.tr("List Projects"), self) + self.btnList = QPushButton(self.tr("List"), self) self.btnList.setIcon(SHARED.theme.getIcon("list")) self.btnList.clicked.connect(self._showOpenProjectPage) - self.btnNew = QPushButton(self.tr("New Project"), self) + self.btnNew = QPushButton(self.tr("New"), self) self.btnNew.setIcon(SHARED.theme.getIcon("add")) self.btnNew.clicked.connect(self._showNewProjectPage) From dfd4df46ce26eb9dfa93ca14d19b4df3124ec26c Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:45:01 +0100 Subject: [PATCH 3/3] Drop the welcome dialog help text now that the language option has been dropped --- novelwriter/tools/welcome.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/novelwriter/tools/welcome.py b/novelwriter/tools/welcome.py index e0dd3f1b..99d0c901 100644 --- a/novelwriter/tools/welcome.py +++ b/novelwriter/tools/welcome.py @@ -48,7 +48,6 @@ from novelwriter.core.coretools import ProjectBuilder from novelwriter.extensions.switch import NSwitch from novelwriter.extensions.modified import NSpinBox from novelwriter.extensions.versioninfo import VersionInfoWidget -from novelwriter.extensions.configlayout import NColourLabel logger = logging.getLogger(__name__) @@ -564,10 +563,6 @@ class _NewProjectForm(QWidget): # Project Settings # ================ - self.projHelp = NColourLabel(self.tr( - "These setting can be changed later from Project Settings." - ), color=SHARED.theme.helpText, parent=self) - # Project Name self.projName = QLineEdit(self) self.projName.setMaxLength(200) @@ -697,7 +692,6 @@ class _NewProjectForm(QWidget): self.formBox = QVBoxLayout() self.formBox.addWidget(QLabel("{0}".format(self.tr("Create New Project")))) - self.formBox.addWidget(self.projHelp) self.formBox.addLayout(self.projectForm) self.formBox.addSpacing(sPx) self.formBox.addWidget(self.extraWidget)