diff --git a/CREDITS.md b/CREDITS.md index c058105e..913530c3 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -58,9 +58,11 @@ Some of the assets bundled with novelWriter were adapted from the following sour ## Fonts -The font used for the main novelWriter logo, mimetype and text banners is: +The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are +used on buttons and icons. * Pridi by Cadson Demak (Open Font License, Version 1.1) +* Source Sans Pro by Paul D. Hunt (SIL Open Font License) ## Special Mentions diff --git a/novelwriter/assets/icons/typicons_dark/icons.conf b/novelwriter/assets/icons/typicons_dark/icons.conf index 250bac57..d5725121 100644 --- a/novelwriter/assets/icons/typicons_dark/icons.conf +++ b/novelwriter/assets/icons/typicons_dark/icons.conf @@ -53,6 +53,7 @@ fmt_bold = nw_tb-bold.svg fmt_bold-md = nw_tb-bold-md.svg fmt_italic = nw_tb-italic.svg fmt_italic-md = nw_tb-italic-md.svg +fmt_mark = nw_tb-mark.svg fmt_strike = nw_tb-strike.svg fmt_strike-md = nw_tb-strike-md.svg fmt_subscript = nw_tb-subscript.svg diff --git a/novelwriter/assets/icons/typicons_dark/nw_tb-mark.svg b/novelwriter/assets/icons/typicons_dark/nw_tb-mark.svg new file mode 100644 index 00000000..5539581a --- /dev/null +++ b/novelwriter/assets/icons/typicons_dark/nw_tb-mark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/novelwriter/assets/icons/typicons_light/icons.conf b/novelwriter/assets/icons/typicons_light/icons.conf index 65419898..5720ba58 100644 --- a/novelwriter/assets/icons/typicons_light/icons.conf +++ b/novelwriter/assets/icons/typicons_light/icons.conf @@ -53,6 +53,7 @@ fmt_bold = nw_tb-bold.svg fmt_bold-md = nw_tb-bold-md.svg fmt_italic = nw_tb-italic.svg fmt_italic-md = nw_tb-italic-md.svg +fmt_mark = nw_tb-mark.svg fmt_strike = nw_tb-strike.svg fmt_strike-md = nw_tb-strike-md.svg fmt_subscript = nw_tb-subscript.svg diff --git a/novelwriter/assets/icons/typicons_light/nw_tb-mark.svg b/novelwriter/assets/icons/typicons_light/nw_tb-mark.svg new file mode 100644 index 00000000..dcf138de --- /dev/null +++ b/novelwriter/assets/icons/typicons_light/nw_tb-mark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/novelwriter/assets/text/credits_en.htm b/novelwriter/assets/text/credits_en.htm index 3733090e..35129dcf 100644 --- a/novelwriter/assets/text/credits_en.htm +++ b/novelwriter/assets/text/credits_en.htm @@ -8,9 +8,9 @@

Contributors

- Concept: Marian Lückhof (@Number042)
- Internationalisation: Bruno Meneguello (@bkmeneguello)
- Setup and Packaging: Rachel Powers (@Ryex) + • Concept: Marian Lückhof (@Number042)
+ • Internationalisation: Bruno Meneguello (@bkmeneguello)
+ • Setup and Packaging: Rachel Powers (@Ryex)

For other contributions, see the project's Contributors page.

@@ -24,20 +24,20 @@

The default language is English (UK) with English (US) as an option. These are the original translators for the languages currently available:

- Dutch: Martijn van der Kleijn (@mvdkleijn)
- French: Jan Lüdke (@jyhelle)
- German: Myian (@heymyian)
- Italian: Riccardo Mangili
- Japanese: hebekeg (@hebekeg)
- Latin American Spanish: Tommy Marplatt (@tmarplatt)
- Norwegian: Veronica Berglyd Olsen (@vkbo)
- Portuguese: Bruno Meneguello (@bkmeneguello)
- Simplified Chinese: Qianzhi Long (@longqzh) + • Dutch: Martijn van der Kleijn (@mvdkleijn)
+ • French: Jan Lüdke (@jyhelle)
+ • German: Myian (@heymyian)
+ • Italian: Riccardo Mangili
+ • Japanese: hebekeg (@hebekeg)
+ • Latin American Spanish: Tommy Marplatt (@tmarplatt)
+ • Norwegian: Veronica Berglyd Olsen (@vkbo)
+ • Portuguese: Bruno Meneguello (@bkmeneguello)
+ • Simplified Chinese: Qianzhi Long (@longqzh)

Additional larger translation contributions:

- French: Albert Aribaud (@aaribaud) + • French: Albert Aribaud (@aaribaud)

Translations are managed on Crowdin, and @@ -47,27 +47,29 @@ more contributions are listed on the project's Qt5 by Qt Company
- PyQt5 by Riverbank Computing
- Enchant by Dom Lachowicz
- PyEnchant by Dimitri Merejkowsky + • Qt5 by Qt Company
+ • PyQt5 by Riverbank Computing
+ • Enchant by Dom Lachowicz
+ • PyEnchant by Dimitri Merejkowsky

Assets

Some of the assets bundled with novelWriter were adapted from the following sources:

- Typicons icons by Stephen Hutchings (CC BY-SA 4.0)
- Tomorrow syntax themes by Chris Kempson (MIT License)
- Owl syntax themes by Sarah Drasner (MIT License)
- Solarized themes by Ethan Schoonover (MIT License) + • Typicons icons by Stephen Hutchings (CC BY-SA 4.0)
+ • Tomorrow syntax themes by Chris Kempson (MIT License)
+ • Owl syntax themes by Sarah Drasner (MIT License)
+ • Solarized themes by Ethan Schoonover (MIT License)

Fonts

-

The font used for the main novelWriter logo, mimetype and text banners is:

+

The font used for the main novelWriter logo, mimetype and text banners is Pridi. Other fonts are +used on buttons and icons.

- Pridi by Cadson Demak (Open Font License, Version 1.1) + • Pridi by Cadson Demak (Open Font License, Version 1.1)
+ • Source Sans Pro by Paul D. Hunt (SIL Open Font License)

Special Mentions

diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py index 31233002..33f6672b 100644 --- a/novelwriter/gui/doceditor.py +++ b/novelwriter/gui/doceditor.py @@ -2317,7 +2317,7 @@ class GuiDocToolBar(QWidget): self.tbMark = QToolButton(self) self.tbMark.setIconSize(iconSize) - self.tbMark.setToolTip(self.tr("Shortcode Mark")) + self.tbMark.setToolTip(self.tr("Shortcode Highlight")) self.tbMark.clicked.connect( lambda: self.requestDocAction.emit(nwDocAction.SC_MARK) ) @@ -2379,6 +2379,7 @@ class GuiDocToolBar(QWidget): self.tbItalic.setIcon(SHARED.theme.getIcon("fmt_italic")) self.tbStrike.setIcon(SHARED.theme.getIcon("fmt_strike")) self.tbUnderline.setIcon(SHARED.theme.getIcon("fmt_underline")) + self.tbMark.setIcon(SHARED.theme.getIcon("fmt_mark")) self.tbSuperscript.setIcon(SHARED.theme.getIcon("fmt_superscript")) self.tbSubscript.setIcon(SHARED.theme.getIcon("fmt_subscript")) diff --git a/novelwriter/gui/mainmenu.py b/novelwriter/gui/mainmenu.py index 88f6bf41..c8cc263b 100644 --- a/novelwriter/gui/mainmenu.py +++ b/novelwriter/gui/mainmenu.py @@ -673,7 +673,7 @@ class GuiMainMenu(QMenuBar): ) # Shortcode Mark - self.aScMark = self.mShortcodes.addAction(self.tr("Mark")) + self.aScMark = self.mShortcodes.addAction(self.tr("Highlight")) self.aScMark.triggered.connect( lambda: self.requestDocAction.emit(nwDocAction.SC_MARK) ) diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py index 48a0317d..fb8ca63c 100644 --- a/novelwriter/gui/theme.py +++ b/novelwriter/gui/theme.py @@ -450,8 +450,8 @@ class GuiIcons: "search_regex", "search_word", # Format Icons - "fmt_bold", "fmt_bold-md", "fmt_italic", "fmt_italic-md", "fmt_strike", "fmt_strike-md", - "fmt_subscript", "fmt_superscript", "fmt_underline", + "fmt_bold", "fmt_bold-md", "fmt_italic", "fmt_italic-md", "fmt_mark", "fmt_strike", + "fmt_strike-md", "fmt_subscript", "fmt_superscript", "fmt_underline", # General Button Icons "add", "add_document", "backward", "bookmark", "browse", "checked", "close", "cross",