diff --git a/htdocs/index.html b/htdocs/index.html index 4e6bb6d8..fed38b00 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -308,7 +308,7 @@ - + diff --git a/htdocs/lib/UI.js b/htdocs/lib/UI.js index bfa3c58c..1544b184 100644 --- a/htdocs/lib/UI.js +++ b/htdocs/lib/UI.js @@ -322,7 +322,7 @@ UI.wfThemes = { 'default' : [0x000000, 0xFFFFFF], 'teejeez' : [0x000000, 0x0000FF, 0x00FFFF, 0x00FF00, 0xFFFF00, 0xFF0000, 0xFF00FF, 0xFFFFFF], 'ha7ilm' : [0x000000, 0x2E6893, 0x69A5D0, 0x214B69, 0x9DC4E0, 0xFFF775, 0xFF8A8A, 0xB20000], - 'zoran' : [0x000000, 0x000965, 0x00E0FF, 0x2EFF00, 0xFFEC00, 0xFF0000], + 'ocean' : [0x000000, 0x000965, 0x00E0FF, 0x2EFF00, 0xFFEC00, 0xFF0000], 'eclipse' : [ 0x000020, 0x000030, 0x000050, 0x000091, 0x1E90FF, 0xFFFFFF, 0xFFFF00, 0xFE6D16, 0xFF0000, 0xC60000, 0x9F0000, 0x750000, 0x4A0000 diff --git a/owrx/waterfall.py b/owrx/waterfall.py index 6c8acab7..0fafdc81 100644 --- a/owrx/waterfall.py +++ b/owrx/waterfall.py @@ -284,7 +284,7 @@ class Ha7ilmWaterfall(Waterfall): super().__init__([0x000000, 0x2E6893, 0x69A5D0, 0x214B69, 0x9DC4E0, 0xFFF775, 0xFF8A8A, 0xB20000]) -class ZoranWaterfall(Waterfall): +class OceanWaterfall(Waterfall): def __init__(self): super().__init__([0x000000, 0x000965, 0x00E0FF, 0x2EFF00, 0xFFEC00, 0xFF0000]) @@ -311,10 +311,10 @@ class CustomWaterfall(Waterfall): class WaterfallOptions(DropdownEnum): DEFAULT = ("Google Turbo Theme (OpenWebRX default)", GoogleTurboWaterfall) TEEJEEZ = ("Theme by Teejeez (default in OpenWebRX < 0.20)", TeejeezWaterfall) - HA7ILM = ("Legacy Theme by Andras (HA7ILM)", Ha7ilmWaterfall) - ZORAN = ("Theme by Zoran (9A6NDZ)", ZoranWaterfall) + HA7ILM = ("Legacy Theme by Andras (HA7ILM)", Ha7ilmWaterfall) + OCEAN = ("Blue Ocean Theme by Zoran (9A6NDZ)", OceanWaterfall) ECLIPSE = ("Eclipse Theme by Dimitar (LZ2DMV) and LZ4ZD", EclipseWaterfall) - CUSTOM = ("Custom", CustomWaterfall) + CUSTOM = ("Custom", CustomWaterfall) def __new__(cls, *args, **kwargs): description, waterfallClass = args