Skip to content

Commit d35def8

Browse files
authored
Merge pull request #35 from mathoudebine/feature/cyberpunk-theme
Feature/cyberpunk theme
2 parents 4dbe36b + 37f1685 commit d35def8

File tree

17 files changed

+432
-6
lines changed

17 files changed

+432
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Some themes are already included for a quick start!
4343
* Auto detect comm port. No longer need to hard set it, or if it changes on you then the config is wrong.
4444

4545
Screenshots from the latest version using included themes:
46-
<img src="res/docs/Theme3.5Inch.jpg" height="400" /> <img src="res/docs/ThemeTerminal.jpg" height="400" /> <img src="res/docs/ThemeLandscape6Grid.jpg" width="400" />
46+
<img src="res/docs/Theme3.5Inch.jpg" height="400" /> <img src="res/docs/ThemeTerminal.jpg" height="400" /> <img src="res/docs/ThemeCyberpunk.png" height="400" /> <img src="res/docs/ThemeLandscape6Grid.jpg" width="400" />
4747

4848
### [> Themes creation/edition](https://github.com/mathoudebine/turing-smart-screen-python/wiki/System-monitor-:-themes)
4949

config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ config:
77
COM_PORT: "AUTO"
88

99
# Theme to use (located in res/themes)
10-
# THEME: Terminal_theme
10+
# THEME: Terminal
1111
# THEME: Landscape6Grid
12-
THEME: 3.5inchTheme2_theme
12+
# THEME: Cyberpunk
13+
THEME: 3.5inchTheme2
1314

1415
display:
1516
# Display resolution in portrait orientation

res/docs/ThemeCyberpunk.png

29.8 KB
Loading
20.5 KB
Binary file not shown.
21.7 KB
Binary file not shown.
31.7 KB
Binary file not shown.
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
2+
This license is copied below, and is also available with a FAQ at:
3+
http://scripts.sil.org/OFL
4+
5+
SIL Open Font License v1.1
6+
====================================================
7+
8+
9+
Preamble
10+
----------
11+
12+
The goals of the Open Font License (OFL) are to stimulate worldwide
13+
development of collaborative font projects, to support the font creation
14+
efforts of academic and linguistic communities, and to provide a free and
15+
open framework in which fonts may be shared and improved in partnership
16+
with others.
17+
18+
The OFL allows the licensed fonts to be used, studied, modified and
19+
redistributed freely as long as they are not sold by themselves. The
20+
fonts, including any derivative works, can be bundled, embedded,
21+
redistributed and/or sold with any software provided that any reserved
22+
names are not used by derivative works. The fonts and derivatives,
23+
however, cannot be released under any other type of license. The
24+
requirement for fonts to remain under this license does not apply
25+
to any document created using the fonts or their derivatives.
26+
27+
28+
Definitions
29+
-------------
30+
31+
`"Font Software"` refers to the set of files released by the Copyright
32+
Holder(s) under this license and clearly marked as such. This may
33+
include source files, build scripts and documentation.
34+
35+
`"Reserved Font Name"` refers to any names specified as such after the
36+
copyright statement(s).
37+
38+
`"Original Version"` refers to the collection of Font Software components as
39+
distributed by the Copyright Holder(s).
40+
41+
`"Modified Version"` refers to any derivative made by adding to, deleting,
42+
or substituting -- in part or in whole -- any of the components of the
43+
Original Version, by changing formats or by porting the Font Software to a
44+
new environment.
45+
46+
`"Author"` refers to any designer, engineer, programmer, technical
47+
writer or other person who contributed to the Font Software.
48+
49+
50+
Permission & Conditions
51+
------------------------
52+
53+
Permission is hereby granted, free of charge, to any person obtaining
54+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
55+
redistribute, and sell modified and unmodified copies of the Font
56+
Software, subject to the following conditions:
57+
58+
1. Neither the Font Software nor any of its individual components,
59+
in Original or Modified Versions, may be sold by itself.
60+
61+
2. Original or Modified Versions of the Font Software may be bundled,
62+
redistributed and/or sold with any software, provided that each copy
63+
contains the above copyright notice and this license. These can be
64+
included either as stand-alone text files, human-readable headers or
65+
in the appropriate machine-readable metadata fields within text or
66+
binary files as long as those fields can be easily viewed by the user.
67+
68+
3. No Modified Version of the Font Software may use the Reserved Font
69+
Name(s) unless explicit written permission is granted by the corresponding
70+
Copyright Holder. This restriction only applies to the primary font name as
71+
presented to the users.
72+
73+
4. The name(s) of the Copyright Holder(s) or the Author(s) of the Font
74+
Software shall not be used to promote, endorse or advertise any
75+
Modified Version, except to acknowledge the contribution(s) of the
76+
Copyright Holder(s) and the Author(s) or with their explicit written
77+
permission.
78+
79+
5. The Font Software, modified or unmodified, in part or in whole,
80+
must be distributed entirely under this license, and must not be
81+
distributed under any other license. The requirement for fonts to
82+
remain under this license does not apply to any document created
83+
using the Font Software.
84+
85+
86+
Termination
87+
-----------
88+
89+
This license becomes null and void if any of the above conditions are
90+
not met.
91+
92+
93+
DISCLAIMER
94+
95+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
96+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
97+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
98+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
99+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
100+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
101+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
102+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
103+
OTHER DEALINGS IN THE FONT SOFTWARE.
File renamed without changes.

0 commit comments

Comments
 (0)