The new look for Linux: light and dark, Manrope, vaults down the left

README.md

@@ -213,8 +213,12 @@ with the Secret Key from your Emergency Kit.
   copied passwords are cleared after 30 seconds — but a clipboard manager
   (GNOME or KDE clipboard history, CopyQ, …) may keep its own copy, which
   no application can reach.
-- **Fonts.** DejaVu Sans, which Ubuntu ships; elsewhere fontconfig picks the
-  nearest.
+- **Fonts.** From 1.1 the app brings its own typeface, Manrope (SIL Open
+  Font License); it is copied to `~/.fonts` at the first start, which is
+  how the toolkit makes a font known. Codes and fingerprints use DejaVu
+  Sans Mono, which Ubuntu ships.
+- **Light and dark** *(1.1)* follow the desktop where it reports one;
+  *Settings → Appearance* chooses one either way.
 - **A package instead of an installer.** The `.deb` does what the Windows
   installer does: a menu entry, data in your home folder, removal that keeps
   the vaults. Unlike the Windows installer it does not offer to move a vault
@@ -249,6 +253,7 @@ Where that README names a Windows version, read the Linux one beside it:
 | 3.0.0-alpha.7 | 1.0.0-alpha.7 | recovering an account with the 12-word phrase, a new phrase (Server 2.0.0-alpha.4) |
 | 3.0.0-alpha.8 | 1.0.0-alpha.8 | security fix: signed vault keys (Server 2.0.0-alpha.5) |
 | 3.0.0 | 1.0.0 | SecretSpace 3, the first release: everything from the alpha rows (Server 2.0.0) |
+| 3.1.0-alpha.1, alpha.2 | 1.1.0-alpha.2 | the new look: light and dark, the Manrope typeface, vaults down the left of the main window |
 
 (0.2.0 added the `.deb` package, which has no Windows counterpart.)
 

deb/build_deb.py

@@ -64,7 +64,8 @@
 ]
 
 #: Files of sourceFiles/ that go into the package; the tests stay behind.
-SOURCE_PATTERNS = (".py", ".png")
+#: The typeface (Manrope) travels with the program, licence beside it.
+SOURCE_PATTERNS = (".py", ".png", ".ttf", "-OFL.txt")
 
 LAUNCHER = f"""#!/bin/sh
 # -I: the user's PYTHONPATH and ~/.local packages must not replace the
@@ -173,8 +174,16 @@ def copyright_text(pins):
 
 Files: *
 Copyright: usermaneGermane
-License: none
- No licence has been granted yet.
+License: GPL-3.0-only
+ SecretSpace is free software under the GNU General Public License,
+ version 3 only. On Debian systems its text is in
+ /usr/share/common-licenses/GPL-3.
+
+Files: usr/lib/secretspace/sourceFiles/Manrope-*.ttf
+Copyright: 2018 The Manrope Project Authors
+License: OFL-1.1
+ The SIL Open Font License, version 1.1; its text is in
+ /usr/lib/secretspace/sourceFiles/Manrope-OFL.txt.
 
 Files: usr/lib/secretspace/lib/*
 Comment: bundled Python libraries; each one's licence is in its

deb/tests/test_build_deb.py

@@ -117,6 +117,15 @@ def test_maintainer_scripts_compile_and_clean(tree):
     assert "py3clean -p secretspace" in read(tree, "DEBIAN", "prerm")
 
 
+def test_the_typeface_travels_with_its_licence(tree):
+    src = os.path.join(tree, "usr", "lib", "secretspace", "sourceFiles")
+    assert {"Manrope-Regular.ttf", "Manrope-Bold.ttf",
+            "Manrope-OFL.txt"} <= set(os.listdir(src))
+    text = read(tree, "usr", "share", "doc", "secretspace", "copyright")
+    assert "OFL-1.1" in text and "GPL-3.0-only" in text
+    assert "No licence has been granted" not in text
+
+
 def test_copyright_lists_bundled_libraries(tree):
     assert "fakelib 1.0" in read(tree, "usr", "share", "doc", "secretspace", "copyright")
 

sourceFiles/Manrope-OFL.txt

@@ -0,0 +1,93 @@
+Copyright 2018 The Manrope Project Authors (https://github.com/googlefonts/manrope)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

sourceFiles/appconfig.py

@@ -52,6 +52,12 @@ def autolock_minutes() -> int:
     return value if 0 <= value <= 24 * 60 else DEFAULT_AUTOLOCK_MINUTES
 
 
+def appearance() -> str:
+    """Light, dark or what the system uses; see theme.APPEARANCES."""
+    value = load_config().get("appearance")
+    return value if value in ("system", "light", "dark") else "system"
+
+
 def sort_order() -> str:
     """How the account list is ordered; see vault.SORT_ORDERS."""
     value = load_config().get("sort_order")

sourceFiles/dialogs.py

@@ -27,7 +27,8 @@
 import totp
 import vault
 from theme import (F, TEXT, MUTED, GREEN, GREEN_HOVER, INPUT_BG, BORDER,
-                   CARD, CARD_HOVER, ON_ACCENT, MONO, DANGER, tile_colors)
+                   CARD, CARD_HOVER, ON_ACCENT, MONO, DANGER, tile_colors,
+                   apply_appearance)
 from vault import (add_account, validate_username, export_csv, export_json,
                    update_entry, find_duplicate)
 from widgets import (Tooltip, dialog_shell, section, setting_row, option_menu, note,
@@ -743,6 +744,23 @@ def set_autolock(choice):
     lock_menu.pack()
     lock_menu.set(label_for(appconfig.autolock_minutes()))
 
+    # ---- look ----
+    look = section(wrap, "Appearance")
+    looks = {"system": "Same as the system", "light": "Light", "dark": "Dark"}
+
+    def set_look(choice):
+        mode = next(k for k, v in looks.items() if v == choice)
+        appconfig.save_config(appearance=mode)
+        apply_appearance(mode)
+
+    look_menu = option_menu(
+        setting_row(look, "Light or dark",
+                    "Follows your system unless you choose one here.", hint,
+                    first=True),
+        list(looks.values()), set_look, width=180)
+    look_menu.pack()
+    look_menu.set(looks[appconfig.appearance()])
+
     # ---- sync ----
     syn = section(wrap, "Sync")
     server = app.account.server