diff --git a/Makefile b/Makefile index 02912e34..fa34ae41 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ all: debug: source: rm -f *.*~ *~ + rm -f translations/*~ rm -f orgs/*~ rm -f scripts/*~ rm -rf __pycache__ diff --git a/fonts/LICENSES b/fonts/LICENSES index 88cb5acd..83d2f472 100644 --- a/fonts/LICENSES +++ b/fonts/LICENSES @@ -3,7 +3,7 @@ Font Licenses Absortile is under GPL. See https://www.ffonts.net/Absortile.font Bedstead is under CC0. See below and https://fontlibrary.org/en/font/bedstead CheGuevaraTextSans-Regular is under CC0. See https://fonts2u.com/cheguevara-text-sans-regular.font -Domestic_Manners is under GPLv2. See https://www.1001fonts.com/domestic-manners-font.html +Domestic_Manners by Dustin Norlander is under GPLv2. See https://www.1001fonts.com/domestic-manners-font.html Edition is public domain. See https://www.fontspace.com/edition-font-f35311 ElectrumADFExp-Regular is by Arkandis Digital Foundry under GPLv2. See https://www.1001fonts.com/electrum-adf-exp-font.html GeneralFailureRegular is public domain. See https://www.fontspace.com/general-failure-font-f32565 diff --git a/img/banner_blue.png b/img/banner_blue.png new file mode 100644 index 00000000..b6a7467b Binary files /dev/null and b/img/banner_blue.png differ diff --git a/img/image_blue.png b/img/image_blue.png new file mode 100644 index 00000000..ad1eb732 Binary files /dev/null and b/img/image_blue.png differ diff --git a/theme.py b/theme.py index 3d94e54d..5cfa5ff5 100644 --- a/theme.py +++ b/theme.py @@ -18,7 +18,8 @@ def getThemesList() -> []: also used to create the web interface dropdown list and to lookup function names """ - return ('Default', 'LCD', 'Light', 'Purple', 'Hacker', 'HighVis') + return ('Default', 'Blue', 'LCD', 'Light', + 'Purple', 'Hacker', 'HighVis') def setThemeInConfig(baseDir: str, name: str) -> bool: @@ -50,15 +51,6 @@ def removeTheme(baseDir: str): os.remove(baseDir + '/' + filename) -def setThemeDefault(baseDir: str): - removeTheme(baseDir) - setThemeInConfig(baseDir, 'default') - themeParams = { - "dummyValue": "1234", - } - setThemeFromDict(baseDir, 'default', themeParams) - - def setCSSparam(css: str, param: str, value: str) -> str: """Sets a CSS parameter to a given value """ @@ -152,6 +144,38 @@ def setCustomFont(baseDir: str): cssfile.write(css) +def setThemeDefault(baseDir: str): + removeTheme(baseDir) + setThemeInConfig(baseDir, 'default') + themeParams = { + "dummyValue": "1234" + } + setThemeFromDict(baseDir, 'default', themeParams) + + +def setThemeBlue(baseDir: str): + removeTheme(baseDir) + setThemeInConfig(baseDir, 'blue') + themeParams = { + "main-bg-color": "#002365", + "text-entry-background": "#002365", + "main-bg-color-reply": "#002365", + "main-bg-color-report": "#002365", + "main-header-color-roles": "#002365", + "main-link-color": "#002365", + "main-visited-color": "#002365", + "button-text": "#002365", + "color: #FFFFFE;": "color: #002365;", + "day-number2": "#002365", + "time-color": "#002365", + "dropdown-fg-color": "#002365", + "font-color-header": "#002365", + "*font-family": "'Domestic_Manners'", + "*src": "url('./fonts/Domestic_Manners.ttf') format('truetype')" + } + setThemeFromDict(baseDir, 'blue', themeParams) + + def setThemeHighVis(baseDir: str): themeParams = { "font-size-header": "22px", diff --git a/translations/ar.json b/translations/ar.json index 1979a6ce..8c2f4c98 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "إظهار / إخفاء الأزرار", "Custom Font": "خط مخصص", "Remove the custom font": "إزالة الخط المخصص", - "LCD": "LCD" + "LCD": "شاشات الكريستال السائل", + "Blue": "أزرق" } diff --git a/translations/ca.json b/translations/ca.json index 04c541c5..3838bd83 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Mostra / Oculta els botons", "Custom Font": "Tipus de lletra personalitzats", "Remove the custom font": "Elimineu el tipus de lletra personalitzat", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Blau" } diff --git a/translations/cy.json b/translations/cy.json index ecd835e4..c1d29fc8 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Dangos / Cuddio Botymau", "Custom Font": "Ffont Custom", "Remove the custom font": "Tynnwch y ffont arferiad", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Glas" } diff --git a/translations/de.json b/translations/de.json index 92f3acc0..22600897 100644 --- a/translations/de.json +++ b/translations/de.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Schaltflächen ein- / ausblenden", "Custom Font": "Benutzerdefinierte Schriftart", "Remove the custom font": "Entfernen Sie die benutzerdefinierte Schriftart", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Blau" } diff --git a/translations/en.json b/translations/en.json index 697244ca..0279ede3 100644 --- a/translations/en.json +++ b/translations/en.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Show/Hide Buttons", "Custom Font": "Custom Font", "Remove the custom font": "Remove the custom font", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Blue" } diff --git a/translations/es.json b/translations/es.json index e1c59df1..7b6b08de 100644 --- a/translations/es.json +++ b/translations/es.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Botones Mostrar / Ocultar", "Custom Font": "Fuente personalizada", "Remove the custom font": "Eliminar la fuente personalizada", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Azul" } diff --git a/translations/fr.json b/translations/fr.json index 7c091a17..7df5f5eb 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Afficher / masquer les boutons", "Custom Font": "Police personnalisée", "Remove the custom font": "Supprimer la police personnalisée", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Bleue" } diff --git a/translations/ga.json b/translations/ga.json index fcb3595c..236e707e 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Taispeáin / Folaigh Cnaipí", "Custom Font": "Cló Saincheaptha", "Remove the custom font": "Bain an cló saincheaptha", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Gorm" } diff --git a/translations/hi.json b/translations/hi.json index 787ea3c2..9972ab58 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "बटन दिखाएँ / छिपाएँ", "Custom Font": "कस्टम फ़ॉन्ट", "Remove the custom font": "कस्टम फ़ॉन्ट निकालें", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "नीला" } diff --git a/translations/it.json b/translations/it.json index 83d12ed1..cb5bdc03 100644 --- a/translations/it.json +++ b/translations/it.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Mostra / Nascondi pulsanti", "Custom Font": "Carattere personalizzato", "Remove the custom font": "Rimuovi il carattere personalizzato", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Blu" } diff --git a/translations/ja.json b/translations/ja.json index 0cc793f2..f41c8411 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "ボタンの表示/非表示", "Custom Font": "カスタムフォント", "Remove the custom font": "カスタムフォントを削除する", - "LCD": "LCD" + "LCD": "液晶", + "Blue": "青い" } diff --git a/translations/oc.json b/translations/oc.json index c688069f..e496ed9c 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -221,5 +221,6 @@ "Show/Hide Buttons": "Show/Hide Buttons", "Custom Font": "Custom Font", "Remove the custom font": "Remove the custom font", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Blue" } diff --git a/translations/pt.json b/translations/pt.json index a4d415d5..379dbdba 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Botões Mostrar / Ocultar", "Custom Font": "Fonte Personalizada", "Remove the custom font": "Remova a fonte personalizada", - "LCD": "LCD" + "LCD": "LCD", + "Blue": "Azul" } diff --git a/translations/ru.json b/translations/ru.json index d7947dbe..cefef26b 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -225,5 +225,6 @@ "Show/Hide Buttons": "Показать / Скрыть кнопки", "Custom Font": "Пользовательский шрифт", "Remove the custom font": "Удалить пользовательский шрифт", - "LCD": "LCD" + "LCD": "ЖК", + "Blue": "синий" } diff --git a/translations/zh.json b/translations/zh.json index 35ef69f3..d4e87c85 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -224,5 +224,6 @@ "Show/Hide Buttons": "显示/隐藏按钮", "Custom Font": "自定义字体", "Remove the custom font": "删除自定义字体", - "LCD": "LCD" + "LCD": "液晶显示器", + "Blue": "蓝色" }