diff --git a/.gitignore b/.gitignore index f045556..574218a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ # IntelliJ project files .idea + +# vscode project files +.vscode diff --git a/CHANGELOG.md b/CHANGELOG.md index b6e5000..ada4d01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,45 +1,67 @@ # Changelog + All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.1.0] - 2020-05-19 + +### Added + +- New provider Open Map API for weather data +- Add weather Icon + city name in same canvas and render from it +- Display city name +- Generic link to "Get API Key" dependant on the selected provider +- Added badge of version + +### Changed + +- Align software and hardware display +- Fix small bugs + ## [2.0.2] - 2020-04-25 ### Changed + - New function to set default value for dropdown - Cleaned javascript code ## [2.0.1] - 2020-04-20 ### Added + - Catch failure in response from weatherAPI to display error alert - Show the city name in the software title - Initial gitignore and Changelog files ### Changed + - Updated manifest file (tooltip, author full name, author website, description, version bump) - Force the city name to be transformed to lowercase - Added a link in plugin to submit a bug report - Screenshot for readme updated ### Removed + - hidden .idea folder has been deleted ## [2.0.0] - 2020-04-18 ### Added + - Possible selection of temperature units (celsius or fahrenheit) - Set frequency of fetching of data (on push, 10 minutes, 30 minutes, 1 hour) ### Changed -- Select provider drop down list -- Rework the whole script for fetching data while implementing setInterval to get relevant data -### Removed +- Select provider drop down list +- Rework the whole script for fetching data while implementing setInterval to get relevant data ## [1.0.0] - 2020-04-16 + ### Added + - Initial structure of plugin - link to weatherAPI to fetch data - Inputs provided are API key and City @@ -48,3 +70,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.0.0]: https://github.com/JaouherK/streamDeck-weatherPlugin/releases/tag/v1.0 [2.0.1]: https://github.com/JaouherK/streamDeck-weatherPlugin/releases/tag/v2.0.1 [2.0.2]: https://github.com/JaouherK/streamDeck-weatherPlugin/releases/tag/v2.0.2 +[2.0.2]: https://github.com/JaouherK/streamDeck-weatherPlugin/releases/tag/v2.1.0 diff --git a/README.md b/README.md index 4947163..d341264 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,31 @@ -# Description +# Weather -`Weather` is a plugin that displays the weather condition and the temperature of a given city. It is connected to WeatherApi provider and needs an API Key to connect. +[![badge](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/JaouherK/a489177df4f24946281bdc1b21524b13/raw/2a1aa8de67ca47bf45667a18bd2cdd8bc6ea0e30/weatherMetaData.json)](https://github.com/JaouherK/streamDeck-weatherPlugin/releases/tag/v2.1.0) + +`Weather` is a plugin that displays the weather condition as a picture image, the city name and the temperature of a given location. It is connected to multiple providers and needs an API Key to connect. + +Possible providers: + +- WeatherAPI +- OpenWeather Optionally, you can choose the frequency of fetching updated data and the temperature unit ( Celsius or Fahrenheit). +# Button settings + +The button is configured as follows: + +- Title: Please do not set any value in order to display the temperature correctly +- Image: Please do not update picture in order to display the weather icon correctly +- Provider: the weather information provider: WeatherAPI or OpenWeather +- API key: your provider account key available in your account information on the associated provider website +- City Name: the city for which the information will be displayed on the button +- Temperature: the temperature unit ( Celsius or Fahrenheit) +- Fetch frequency: how often the data is updated (beware for free accounts the limits set by the provider) +- "Get my API key" button: to retrieve the key for your account +- "Report bug" button: to report a bug + # Features - code written in Javascript @@ -13,16 +34,14 @@ Optionally, you can choose the frequency of fetching updated data and the temper - Choose temperature unit - choose fetching frequency of the weather data -![](screenshot.png) - +![screen](screenshot.png) # Installation In the Release folder, you can find the file `com.jk.weather.streamDeckPlugin`. If you double-click this file on your machine, Stream Deck will install the plugin. - # Source code The `Sources` folder contains the source code of the plugin. -
Application main icon made by Smashicons from www.flaticon.com
+Application main icon made by [Smashicons](https://www.flaticon.com/authors/smashicons) from [www.flaticon.com](https://www.flaticon.com/) diff --git a/Release/com.jk.weather.streamDeckPlugin b/Release/com.jk.weather.streamDeckPlugin index acd5bd2..e421115 100644 Binary files a/Release/com.jk.weather.streamDeckPlugin and b/Release/com.jk.weather.streamDeckPlugin differ diff --git a/Sources/com.jk.weather.sdPlugin/manifest.json b/Sources/com.jk.weather.sdPlugin/manifest.json index a99067c..089f090 100644 --- a/Sources/com.jk.weather.sdPlugin/manifest.json +++ b/Sources/com.jk.weather.sdPlugin/manifest.json @@ -1,41 +1,40 @@ { - "Actions": [ - { - "Icon": "resources/actionIcon", - "Name": "Weather", - "States": [ - { - "Image": "resources/actionDefaultImage", - "TitleAlignment": "bottom", - "FontSize": "10" - } - ], - "SupportedInMultiActions": true, - "Tooltip": "Get current weather condition and temperature of a given city", - "UUID": "com.jk.weather.action" - } - ], - "SDKVersion": 2, - "Author": "Jaouher Kharrat", - "CodePath": "plugin/main.html", - "Description": "Easily get a preview of the weather condition and the temperature of a given city.", - "Name": "Weather", - "Icon": "resources/pluginIcon", - "PropertyInspectorPath": "pi/main_pi.html", - "URL": "https://github.com/JaouherK", - "Version": "2.0.2", - "OS": [ - { - "Platform": "mac", - "MinimumVersion" : "10.11" - }, - { - "Platform": "windows", - "MinimumVersion" : "10" - } - ], - "Software": - { - "MinimumVersion" : "4.1" - } + "Actions": [ + { + "Icon": "resources/actionIcon", + "Name": "Weather", + "States": [ + { + "Image": "resources/actionDefaultImage", + "TitleAlignment": "bottom", + "FontSize": "10" + } + ], + "SupportedInMultiActions": true, + "Tooltip": "Get current weather condition and temperature of a given city", + "UUID": "com.jk.weather.action" + } + ], + "SDKVersion": 2, + "Author": "Jaouher Kharrat", + "CodePath": "plugin/main.html", + "Description": "Easily get a preview of the weather condition and the temperature of a given city.", + "Name": "Weather", + "Icon": "resources/pluginIcon", + "PropertyInspectorPath": "pi/main_pi.html", + "URL": "https://github.com/JaouherK", + "Version": "2.1.0", + "OS": [ + { + "Platform": "mac", + "MinimumVersion": "10.11" + }, + { + "Platform": "windows", + "MinimumVersion": "10" + } + ], + "Software": { + "MinimumVersion": "4.1" } +} diff --git a/Sources/com.jk.weather.sdPlugin/pi/main_pi.html b/Sources/com.jk.weather.sdPlugin/pi/main_pi.html index 8db60cd..434843b 100644 --- a/Sources/com.jk.weather.sdPlugin/pi/main_pi.html +++ b/Sources/com.jk.weather.sdPlugin/pi/main_pi.html @@ -1,64 +1,96 @@ - - - + + com.jk.weather.pi - + - + - - - - + diff --git a/Sources/com.jk.weather.sdPlugin/pi/main_pi.js b/Sources/com.jk.weather.sdPlugin/pi/main_pi.js index 707d5d3..26555c8 100644 --- a/Sources/com.jk.weather.sdPlugin/pi/main_pi.js +++ b/Sources/com.jk.weather.sdPlugin/pi/main_pi.js @@ -1,98 +1,118 @@ let websocket = null, - uuid = null, - actionInfo = {}; + uuid = null, + actionInfo = {}; -function connectElgatoStreamDeckSocket(inPort, inPropertyInspectorUUID, inRegisterEvent, inInfo, inActionInfo) { +function connectElgatoStreamDeckSocket( + inPort, + inPropertyInspectorUUID, + inRegisterEvent, + inInfo, + inActionInfo +) { + uuid = inPropertyInspectorUUID; + actionInfo = JSON.parse(inActionInfo); - uuid = inPropertyInspectorUUID; - actionInfo = JSON.parse(inActionInfo); + websocket = new WebSocket("ws://localhost:" + inPort); - websocket = new WebSocket("ws://localhost:" + inPort); - - websocket.onopen = function () { - // WebSocket is connected, register the Property Inspector - let json = { - event: inRegisterEvent, - uuid: inPropertyInspectorUUID - }; - websocket.send(JSON.stringify(json)); - - json = { - event: "getSettings", - context: uuid, - }; - websocket.send(JSON.stringify(json)); + websocket.onopen = function () { + // WebSocket is connected, register the Property Inspector + let json = { + event: inRegisterEvent, + uuid: inPropertyInspectorUUID, + }; + websocket.send(JSON.stringify(json)); - json = { - event: "getGlobalSettings", - context: uuid, - }; - websocket.send(JSON.stringify(json)); + json = { + event: "getSettings", + context: uuid, }; + websocket.send(JSON.stringify(json)); - websocket.onmessage = function (evt) { - // Received message from Stream Deck - const jsonObj = JSON.parse(evt.data); - if (jsonObj.event === "didReceiveSettings") { - const payload = jsonObj.payload.settings; - initiateElement("cityName", payload.cityName); - initiateElement("frequency", payload.frequency, 0); - initiateElement("unit", payload.unit, "celsius"); - } - if (jsonObj.event === "didReceiveGlobalSettings") { - const payload = jsonObj.payload.settings; - initiateElement("apiKey", payload.apiKey); - const el = document.querySelector(".sdpi-wrapper"); - el && el.classList.remove("hidden"); - } + json = { + event: "getGlobalSettings", + context: uuid, }; + websocket.send(JSON.stringify(json)); + }; + websocket.onmessage = function (evt) { + // Received message from Stream Deck + const jsonObj = JSON.parse(evt.data); + if (jsonObj.event === "didReceiveSettings") { + const payload = jsonObj.payload.settings; + initiateElement("cityName", payload.cityName); + initiateElement("frequency", payload.frequency, 0); + initiateElement("unit", payload.unit, "celsius"); + } + if (jsonObj.event === "didReceiveGlobalSettings") { + const payload = jsonObj.payload.settings; + initiateElement("apiKey", payload.apiKey); + initiateElement("provider", payload.provider, "weatherApi"); + const el = document.querySelector(".sdpi-wrapper"); + el && el.classList.remove("hidden"); + } + }; } function initiateElement(element, value, fallback = "") { - if (typeof value === 'undefined') { - document.getElementById(element).value = fallback; - return; - } - document.getElementById(element).value = value; + if (typeof value === "undefined") { + document.getElementById(element).value = fallback; + return; + } + document.getElementById(element).value = value; } function updateSettings() { - if (websocket && (websocket.readyState === 1)) { - let payload = {}; - payload.cityName = document.getElementById("cityName").value; - payload.frequency = document.getElementById("frequency").value; - payload.unit = document.getElementById("unit").value; - const json = { - event: "setSettings", - context: uuid, - payload: payload - }; - websocket.send(JSON.stringify(json)); - } + if (websocket && websocket.readyState === 1) { + let payload = {}; + payload.cityName = document.getElementById("cityName").value; + payload.frequency = document.getElementById("frequency").value; + payload.unit = document.getElementById("unit").value; + const json = { + event: "setSettings", + context: uuid, + payload: payload, + }; + websocket.send(JSON.stringify(json)); + } } -function updateApiKey() { - if (websocket && (websocket.readyState === 1)) { - let payload = {}; - payload.apiKey = document.getElementById("apiKey").value; - const json = { - event: "setGlobalSettings", - context: uuid, - payload - }; - websocket.send(JSON.stringify(json)); - } +function updateGlobal() { + if (websocket && websocket.readyState === 1) { + let payload = {}; + payload.provider = document.getElementById("provider").value; + payload.apiKey = document.getElementById("apiKey").value; + const json = { + event: "setGlobalSettings", + context: uuid, + payload, + }; + websocket.send(JSON.stringify(json)); + } } function openPage(site) { - if (websocket && (websocket.readyState === 1)) { - const json = { - event: "openUrl", - payload: { - url: `https://${site}` - } - }; - websocket.send(JSON.stringify(json)); - } + if (websocket && websocket.readyState === 1) { + const json = { + event: "openUrl", + payload: { + url: `https://${site}`, + }, + }; + websocket.send(JSON.stringify(json)); + } +} + +function getProviderUrl() { + const provider = document.getElementById("provider").value; + let url; + switch (provider) { + case "weatherApi": + url = "weatherapi.com/my/"; + break; + case "openWeatherMap": + url = "home.openweathermap.org/api_keys"; + break; + } + return url; } diff --git a/Sources/com.jk.weather.sdPlugin/pi/sdpi.css b/Sources/com.jk.weather.sdPlugin/pi/sdpi.css index 362f2b1..9ef7647 100644 --- a/Sources/com.jk.weather.sdPlugin/pi/sdpi.css +++ b/Sources/com.jk.weather.sdPlugin/pi/sdpi.css @@ -1,83 +1,85 @@ html { - --sdpi-bgcolor: #2D2D2D; - --sdpi-background: #3D3D3D; - --sdpi-color: #d8d8d8; - --sdpi-bordercolor: #3a3a3a; - --sdpi-borderradius: 0px; - --sdpi-width: 224px; - --sdpi-fontweight: 600; - --sdpi-letterspacing: -0.25pt; - height: 100%; - width: 100%; - overflow: hidden; + --sdpi-bgcolor: #2d2d2d; + --sdpi-background: #3d3d3d; + --sdpi-color: #d8d8d8; + --sdpi-bordercolor: #3a3a3a; + --sdpi-borderradius: 0px; + --sdpi-width: 224px; + --sdpi-fontweight: 600; + --sdpi-letterspacing: -0.25pt; + height: 100%; + width: 100%; + overflow: hidden; } html, body { - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - font-size: 9pt; - background-color: var(--sdpi-bgcolor); - color: #9a9a9a; + font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", + "Segoe UI Symbol"; + font-size: 9pt; + background-color: var(--sdpi-bgcolor); + color: #9a9a9a; } body { - height: 100%; - padding: 0; - overflow-x: hidden; - overflow-y: auto; - margin: 0; - -webkit-overflow-scrolling: touch; - -webkit-text-size-adjust: 100%; - -webkit-font-smoothing: antialiased; + height: 100%; + padding: 0; + overflow-x: hidden; + overflow-y: auto; + margin: 0; + -webkit-overflow-scrolling: touch; + -webkit-text-size-adjust: 100%; + -webkit-font-smoothing: antialiased; } mark { - background-color: var(--sdpi-bgcolor); - color: var(--sdpi-color); + background-color: var(--sdpi-bgcolor); + color: var(--sdpi-color); } .hidden { - display: none; + display: none; } hr, hr2 { - -webkit-margin-before: 1em; - -webkit-margin-after: 1em; - border-style: none; - background: var(--sdpi-background); - height: 1px; + -webkit-margin-before: 1em; + -webkit-margin-after: 1em; + border-style: none; + background: var(--sdpi-background); + height: 1px; } hr2, .sdpi-heading { - display: flex; - flex-basis: 100%; - align-items: center; - color: inherit; - font-size: 9pt; - margin: 8px 0px; + display: flex; + flex-basis: 100%; + align-items: center; + color: inherit; + font-size: 9pt; + margin: 8px 0px; } .sdpi-heading::before, .sdpi-heading::after { - content: ""; - flex-grow: 1; - background: var(--sdpi-background); - height: 1px; - font-size: 0px; - line-height: 0px; - margin: 0px 16px; + content: ""; + flex-grow: 1; + background: var(--sdpi-background); + height: 1px; + font-size: 0px; + line-height: 0px; + margin: 0px 16px; } hr2 { - height: 2px; + height: 2px; } hr, hr2 { - margin-left: 16px; - margin-right: 16px; + margin-left: 16px; + margin-right: 16px; } .sdpi-item-value, @@ -85,105 +87,103 @@ option, input, select, button { - font-size: 10pt; - font-weight: var(--sdpi-fontweight); - letter-spacing: var(--sdpi-letterspacing); + font-size: 10pt; + font-weight: var(--sdpi-fontweight); + letter-spacing: var(--sdpi-letterspacing); } - .win .sdpi-item-value, .win option, .win input, .win select, .win button { - font-size: 11px; - font-style: normal; - letter-spacing: inherit; - font-weight: 100; + font-size: 11px; + font-style: normal; + letter-spacing: inherit; + font-weight: 100; } .win button { - font-size: 12px; + font-size: 12px; } ::-webkit-progress-value, meter::-webkit-meter-optimum-value { - border-radius: 2px; + border-radius: 2px; } ::-webkit-progress-bar, meter::-webkit-meter-bar { - border-radius: 3px; - background: var(--sdpi-background); + border-radius: 3px; + background: var(--sdpi-background); } ::-webkit-progress-bar:active, meter::-webkit-meter-bar:active { - border-radius: 3px; - background: #222222; + border-radius: 3px; + background: #222222; } ::-webkit-progress-value:active, meter::-webkit-meter-optimum-value:active { - background: #99f; + background: #99f; } progress, progress.sdpi-item-value { - min-height: 5px !important; - height: 5px; - background-color: #303030; + min-height: 5px !important; + height: 5px; + background-color: #303030; } progress { - margin-top: 8px !important; - margin-bottom: 8px !important; + margin-top: 8px !important; + margin-bottom: 8px !important; } .full progress, progress.full { - margin-top: 3px !important; + margin-top: 3px !important; } ::-webkit-progress-inner-element { - background-color: transparent; + background-color: transparent; } - .sdpi-item[type="progress"] { - margin-top: 4px !important; - margin-bottom: 12px; - min-height: 15px; + margin-top: 4px !important; + margin-bottom: 12px; + min-height: 15px; } .sdpi-item-child.full:last-child { - margin-bottom: 4px; + margin-bottom: 4px; } .tabs { - display: flex; + display: flex; - border-bottom: 1px solid #D7DBDD; + border-bottom: 1px solid #d7dbdd; } .tab { - cursor: pointer; - padding: 5px 30px; - color: #16a2d7; - font-size: 9pt; - border-bottom: 2px solid transparent; + cursor: pointer; + padding: 5px 30px; + color: #16a2d7; + font-size: 9pt; + border-bottom: 2px solid transparent; } .tab.is-tab-selected { - border-bottom-color: #4ebbe4; + border-bottom-color: #4ebbe4; } select { - -webkit-appearance: none; - -moz-appearance: none; - -o-appearance: none; - appearance: none; - background: url(caret.svg) no-repeat 97% center; + -webkit-appearance: none; + -moz-appearance: none; + -o-appearance: none; + appearance: none; + background: url(caret.svg) no-repeat 97% center; } label.sdpi-file-label, @@ -191,14 +191,14 @@ input[type="button"], input[type="submit"], input[type="reset"], input[type="file"], -input[type=file]::-webkit-file-upload-button, +input[type="file"]::-webkit-file-upload-button, button, select { - color: var(--sdpi-color); - border: 1pt solid #303030; - font-size: 8pt; - background-color: var(--sdpi-background); - border-radius: var(--sdpi-borderradius); + color: var(--sdpi-color); + border: 1pt solid #303030; + font-size: 8pt; + background-color: var(--sdpi-background); + border-radius: var(--sdpi-borderradius); } label.sdpi-file-label, @@ -206,176 +206,175 @@ input[type="button"], input[type="submit"], input[type="reset"], input[type="file"], -input[type=file]::-webkit-file-upload-button, +input[type="file"]::-webkit-file-upload-button, button { - border: 1pt solid var(--sdpi-color); - border-radius: var(--sdpi-borderradius); - min-height: 23px !important; - height: 23px !important; - margin-right: 8px; + border: 1pt solid var(--sdpi-color); + border-radius: var(--sdpi-borderradius); + min-height: 23px !important; + height: 23px !important; + margin-right: 8px; } -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { - -webkit-appearance: none; - margin: 0; +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + -webkit-appearance: none; + margin: 0; } input[type="file"] { - border-radius: var(--sdpi-borderradius); - max-width: 220px; + border-radius: var(--sdpi-borderradius); + max-width: 220px; } option { - height: 1.5em; - padding: 4px; + height: 1.5em; + padding: 4px; } /* SDPI */ .sdpi-wrapper { - overflow-x: hidden; + overflow-x: hidden; } .sdpi-item { - display: flex; - flex-direction: row; - min-height: 32px; - align-items: center; - margin-top: 2px; - max-width: 344px; + display: flex; + flex-direction: row; + min-height: 32px; + align-items: center; + margin-top: 2px; + max-width: 344px; } .sdpi-item:first-child { - margin-top: 1px; + margin-top: 1px; } .sdpi-item:last-child { - margin-bottom: 0px; + margin-bottom: 0px; } .sdpi-item > *:not(.sdpi-item-label):not(meter):not(details) { - min-height: 26px; - padding: 0px 4px 0px 4px; + min-height: 26px; + padding: 0px 4px 0px 4px; } .sdpi-item > *:not(.sdpi-item-label.empty):not(meter) { - min-height: 26px; - padding: 0px 4px 0px 4px; + min-height: 26px; + padding: 0px 4px 0px 4px; } - .sdpi-item-group { - padding: 0 !important; + padding: 0 !important; } meter.sdpi-item-value { - margin-left: 6px; + margin-left: 6px; } .sdpi-item[type="group"] { - display: block; - margin-top: 12px; - margin-bottom: 12px; - /* border: 1px solid white; */ - flex-direction: unset; - text-align: left; + display: block; + margin-top: 12px; + margin-bottom: 12px; + /* border: 1px solid white; */ + flex-direction: unset; + text-align: left; } .sdpi-item[type="group"] > .sdpi-item-label, .sdpi-item[type="group"].sdpi-item-label { - width: 96%; - text-align: left; - font-weight: 700; - margin-bottom: 4px; - padding-left: 4px; + width: 96%; + text-align: left; + font-weight: 700; + margin-bottom: 4px; + padding-left: 4px; } dl, ul, ol { - -webkit-margin-before: 0px; - -webkit-margin-after: 4px; - -webkit-padding-start: 1em; - max-height: 90px; - overflow-y: scroll; - cursor: pointer; - user-select: none; + -webkit-margin-before: 0px; + -webkit-margin-after: 4px; + -webkit-padding-start: 1em; + max-height: 90px; + overflow-y: scroll; + cursor: pointer; + user-select: none; } table.sdpi-item-value, dl.sdpi-item-value, ul.sdpi-item-value, ol.sdpi-item-value { - -webkit-margin-before: 4px; - -webkit-margin-after: 8px; - -webkit-padding-start: 1em; - width: var(--sdpi-width); - text-align: center; + -webkit-margin-before: 4px; + -webkit-margin-after: 8px; + -webkit-padding-start: 1em; + width: var(--sdpi-width); + text-align: center; } table > caption { - margin: 2px; + margin: 2px; } .list, .sdpi-item[type="list"] { - align-items: baseline; + align-items: baseline; } .sdpi-item-label { - text-align: right; - flex: none; - width: 94px; - padding-right: 4px; - font-weight: 600; - -webkit-user-select: none; + text-align: right; + flex: none; + width: 94px; + padding-right: 4px; + font-weight: 600; + -webkit-user-select: none; } .win .sdpi-item-label, .sdpi-item-label > small { - font-weight: normal; + font-weight: normal; } .sdpi-item-label:after { - content: ": "; + content: ": "; } .sdpi-item-label.empty:after { - content: ""; + content: ""; } .sdpi-test, .sdpi-item-value { - flex: 1 0 0; - /* flex-grow: 1; + flex: 1 0 0; + /* flex-grow: 1; flex-shrink: 0; */ - margin-right: 14px; - margin-left: 4px; - justify-content: space-evenly; + margin-right: 14px; + margin-left: 4px; + justify-content: space-evenly; } canvas.sdpi-item-value { - max-width: 144px; - max-height: 144px; - width: 144px; - height: 144px; - margin: 0 auto; - cursor: pointer; + max-width: 144px; + max-height: 144px; + width: 144px; + height: 144px; + margin: 0 auto; + cursor: pointer; } input.sdpi-item-value { - margin-left: 5px; + margin-left: 5px; } .sdpi-item-value button, button.sdpi-item-value { - margin-left: 7px; - margin-right: 19px; + margin-left: 7px; + margin-right: 19px; } .sdpi-item-value.range { - margin-left: 0px; + margin-left: 0px; } table, @@ -385,65 +384,65 @@ ol.sdpi-item-value, .sdpi-item-value > dl, .sdpi-item-value > ul, .sdpi-item-value > ol { - list-style-type: none; - list-style-position: outside; - margin-left: -4px; - margin-right: -4px; - padding: 4px; - border: 1px solid var(--sdpi-bordercolor); + list-style-type: none; + list-style-position: outside; + margin-left: -4px; + margin-right: -4px; + padding: 4px; + border: 1px solid var(--sdpi-bordercolor); } dl.sdpi-item-value, ul.sdpi-item-value, ol.sdpi-item-value, .sdpi-item-value > ol { - list-style-type: none; - list-style-position: inside; - margin-left: 5px; - margin-right: 12px; - padding: 4px !important; + list-style-type: none; + list-style-position: inside; + margin-left: 5px; + margin-right: 12px; + padding: 4px !important; } ol.sdpi-item-value, .sdpi-item-value > ol[listtype="none"] { - list-style-type: none; + list-style-type: none; } ol.sdpi-item-value[type="decimal"], .sdpi-item-value > ol[type="decimal"] { - list-style-type: decimal; + list-style-type: decimal; } ol.sdpi-item-value[type="decimal-leading-zero"], .sdpi-item-value > ol[type="decimal-leading-zero"] { - list-style-type: decimal-leading-zero; + list-style-type: decimal-leading-zero; } ol.sdpi-item-value[type="lower-alpha"], .sdpi-item-value > ol[type="lower-alpha"] { - list-style-type: lower-alpha; + list-style-type: lower-alpha; } ol.sdpi-item-value[type="upper-alpha"], .sdpi-item-value > ol[type="upper-alpha"] { - list-style-type: upper-alpha; + list-style-type: upper-alpha; } ol.sdpi-item-value[type="upper-roman"], .sdpi-item-value > ol[type="upper-roman"] { - list-style-type: upper-roman; + list-style-type: upper-roman; } ol.sdpi-item-value[type="lower-roman"], .sdpi-item-value > ol[type="lower-roman"] { - list-style-type: upper-roman; + list-style-type: upper-roman; } tr:nth-child(even), .sdpi-item-value > ul > li:nth-child(even), .sdpi-item-value > ol > li:nth-child(even), li:nth-child(even) { - background-color: rgba(0, 0, 0, .2) + background-color: rgba(0, 0, 0, 0.2); } td:hover, @@ -451,41 +450,41 @@ td:hover, .sdpi-item-value > ol > li:hover:nth-child(even), li:hover:nth-child(even), li:hover { - background-color: rgba(255, 255, 255, .1); + background-color: rgba(255, 255, 255, 0.1); } td.selected, td.selected:hover, li.selected:hover, li.selected { - color: white; - background-color: #77f; + color: white; + background-color: #77f; } tr { - border: 1px solid var(--sdpi-bordercolor); + border: 1px solid var(--sdpi-bordercolor); } td { - border-right: 1px solid var(--sdpi-bordercolor); - -webkit-user-select: none; + border-right: 1px solid var(--sdpi-bordercolor); + -webkit-user-select: none; } tr:last-child, td:last-child { - border: none; + border: none; } .sdpi-item-value.select, .sdpi-item-value > select { - margin-right: 13px; - margin-left: 4px; + margin-right: 13px; + margin-left: 4px; } .sdpi-item-child, .sdpi-item-group > .sdpi-item > input[type="color"] { - margin-top: 0.4em; - margin-right: 4px; + margin-top: 0.4em; + margin-right: 4px; } .full, @@ -496,21 +495,21 @@ td:last-child { .sdpi-item-child.full > *, .full > .sdpi-item-child, .full > .sdpi-item-child > * { - display: flex; - flex: 1 1 0; - margin-bottom: 4px; - margin-left: 0px; - width: 100%; + display: flex; + flex: 1 1 0; + margin-bottom: 4px; + margin-left: 0px; + width: 100%; - justify-content: space-evenly; + justify-content: space-evenly; } .sdpi-item-group > .sdpi-item > input[type="color"] { - margin-top: 0px; + margin-top: 0px; } ::-webkit-calendar-picker-indicator:focus, -input[type=file]::-webkit-file-upload-button:focus, +input[type="file"]::-webkit-file-upload-button:focus, button:focus, textarea:focus, input:focus, @@ -519,361 +518,358 @@ option:focus, details:focus, summary:focus, .custom-select select { - outline: none; + outline: none; } summary { - cursor: default; - -webkit-user-select: none; + cursor: default; + -webkit-user-select: none; } .pointer, summary .pointer { - cursor: pointer; + cursor: pointer; } details.message { - padding: 4px 18px 4px 12px; + padding: 4px 18px 4px 12px; } details.message summary { - font-size: 10pt; - font-weight: 600; - min-height: 18px; + font-size: 10pt; + font-weight: 600; + min-height: 18px; } details.message:first-child { - margin-top: 4px; - margin-left: 0; - padding-left: 106px; + margin-top: 4px; + margin-left: 0; + padding-left: 106px; } details.message h1 { - text-align: left; + text-align: left; } .message > summary::-webkit-details-marker { - display: none; + display: none; } .info20, .question, .caution, .info { - background-repeat: no-repeat; - background-position: 70px center; + background-repeat: no-repeat; + background-position: 70px center; } .info20 { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Cpath fill='%23999' d='M10,20 C4.4771525,20 0,15.5228475 0,10 C0,4.4771525 4.4771525,0 10,0 C15.5228475,0 20,4.4771525 20,10 C20,15.5228475 15.5228475,20 10,20 Z M10,8 C8.8954305,8 8,8.84275812 8,9.88235294 L8,16.1176471 C8,17.1572419 8.8954305,18 10,18 C11.1045695,18 12,17.1572419 12,16.1176471 L12,9.88235294 C12,8.84275812 11.1045695,8 10,8 Z M10,3 C8.8954305,3 8,3.88165465 8,4.96923077 L8,5.03076923 C8,6.11834535 8.8954305,7 10,7 C11.1045695,7 12,6.11834535 12,5.03076923 L12,4.96923077 C12,3.88165465 11.1045695,3 10,3 Z'/%3E%3C/svg%3E%0A"); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Cpath fill='%23999' d='M10,20 C4.4771525,20 0,15.5228475 0,10 C0,4.4771525 4.4771525,0 10,0 C15.5228475,0 20,4.4771525 20,10 C20,15.5228475 15.5228475,20 10,20 Z M10,8 C8.8954305,8 8,8.84275812 8,9.88235294 L8,16.1176471 C8,17.1572419 8.8954305,18 10,18 C11.1045695,18 12,17.1572419 12,16.1176471 L12,9.88235294 C12,8.84275812 11.1045695,8 10,8 Z M10,3 C8.8954305,3 8,3.88165465 8,4.96923077 L8,5.03076923 C8,6.11834535 8.8954305,7 10,7 C11.1045695,7 12,6.11834535 12,5.03076923 L12,4.96923077 C12,3.88165465 11.1045695,3 10,3 Z'/%3E%3C/svg%3E%0A"); } .info { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Cpath fill='%23999' d='M10,18 C5.581722,18 2,14.418278 2,10 C2,5.581722 5.581722,2 10,2 C14.418278,2 18,5.581722 18,10 C18,14.418278 14.418278,18 10,18 Z M10,8 C9.44771525,8 9,8.42137906 9,8.94117647 L9,14.0588235 C9,14.5786209 9.44771525,15 10,15 C10.5522847,15 11,14.5786209 11,14.0588235 L11,8.94117647 C11,8.42137906 10.5522847,8 10,8 Z M10,5 C9.44771525,5 9,5.44082732 9,5.98461538 L9,6.01538462 C9,6.55917268 9.44771525,7 10,7 C10.5522847,7 11,6.55917268 11,6.01538462 L11,5.98461538 C11,5.44082732 10.5522847,5 10,5 Z'/%3E%3C/svg%3E%0A"); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Cpath fill='%23999' d='M10,18 C5.581722,18 2,14.418278 2,10 C2,5.581722 5.581722,2 10,2 C14.418278,2 18,5.581722 18,10 C18,14.418278 14.418278,18 10,18 Z M10,8 C9.44771525,8 9,8.42137906 9,8.94117647 L9,14.0588235 C9,14.5786209 9.44771525,15 10,15 C10.5522847,15 11,14.5786209 11,14.0588235 L11,8.94117647 C11,8.42137906 10.5522847,8 10,8 Z M10,5 C9.44771525,5 9,5.44082732 9,5.98461538 L9,6.01538462 C9,6.55917268 9.44771525,7 10,7 C10.5522847,7 11,6.55917268 11,6.01538462 L11,5.98461538 C11,5.44082732 10.5522847,5 10,5 Z'/%3E%3C/svg%3E%0A"); } .info2 { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 15 15'%3E%3Cpath fill='%23999' d='M7.5,15 C3.35786438,15 0,11.6421356 0,7.5 C0,3.35786438 3.35786438,0 7.5,0 C11.6421356,0 15,3.35786438 15,7.5 C15,11.6421356 11.6421356,15 7.5,15 Z M7.5,2 C6.67157287,2 6,2.66124098 6,3.47692307 L6,3.52307693 C6,4.33875902 6.67157287,5 7.5,5 C8.32842705,5 9,4.33875902 9,3.52307693 L9,3.47692307 C9,2.66124098 8.32842705,2 7.5,2 Z M5,6 L5,7.02155172 L6,7 L6,12 L5,12.0076778 L5,13 L10,13 L10,12 L9,12.0076778 L9,6 L5,6 Z'/%3E%3C/svg%3E%0A"); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='15' height='15' viewBox='0 0 15 15'%3E%3Cpath fill='%23999' d='M7.5,15 C3.35786438,15 0,11.6421356 0,7.5 C0,3.35786438 3.35786438,0 7.5,0 C11.6421356,0 15,3.35786438 15,7.5 C15,11.6421356 11.6421356,15 7.5,15 Z M7.5,2 C6.67157287,2 6,2.66124098 6,3.47692307 L6,3.52307693 C6,4.33875902 6.67157287,5 7.5,5 C8.32842705,5 9,4.33875902 9,3.52307693 L9,3.47692307 C9,2.66124098 8.32842705,2 7.5,2 Z M5,6 L5,7.02155172 L6,7 L6,12 L5,12.0076778 L5,13 L10,13 L10,12 L9,12.0076778 L9,6 L5,6 Z'/%3E%3C/svg%3E%0A"); } .sdpi-more-info { - background-image: linear-gradient(to right, #00000000 0%, #00000040 80%), url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpolygon fill='%23999' points='4 7 8 7 8 5 12 8 8 11 8 9 4 9'/%3E%3C/svg%3E%0A"); + background-image: linear-gradient(to right, #00000000 0%, #00000040 80%), + url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' viewBox='0 0 16 16'%3E%3Cpolygon fill='%23999' points='4 7 8 7 8 5 12 8 8 11 8 9 4 9'/%3E%3C/svg%3E%0A"); } .caution { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Cpath fill='%23999' fill-rule='evenodd' d='M9.03952676,0.746646542 C9.57068894,-0.245797319 10.4285735,-0.25196227 10.9630352,0.746646542 L19.7705903,17.2030214 C20.3017525,18.1954653 19.8777595,19 18.8371387,19 L1.16542323,19 C0.118729947,19 -0.302490098,18.2016302 0.231971607,17.2030214 L9.03952676,0.746646542 Z M10,2.25584053 L1.9601405,17.3478261 L18.04099,17.3478261 L10,2.25584053 Z M10,5.9375 C10.531043,5.9375 10.9615385,6.37373537 10.9615385,6.91185897 L10.9615385,11.6923077 C10.9615385,12.2304313 10.531043,12.6666667 10,12.6666667 C9.46895697,12.6666667 9.03846154,12.2304313 9.03846154,11.6923077 L9.03846154,6.91185897 C9.03846154,6.37373537 9.46895697,5.9375 10,5.9375 Z M10,13.4583333 C10.6372516,13.4583333 11.1538462,13.9818158 11.1538462,14.6275641 L11.1538462,14.6641026 C11.1538462,15.3098509 10.6372516,15.8333333 10,15.8333333 C9.36274837,15.8333333 8.84615385,15.3098509 8.84615385,14.6641026 L8.84615385,14.6275641 C8.84615385,13.9818158 9.36274837,13.4583333 10,13.4583333 Z'/%3E%3C/svg%3E%0A"); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Cpath fill='%23999' fill-rule='evenodd' d='M9.03952676,0.746646542 C9.57068894,-0.245797319 10.4285735,-0.25196227 10.9630352,0.746646542 L19.7705903,17.2030214 C20.3017525,18.1954653 19.8777595,19 18.8371387,19 L1.16542323,19 C0.118729947,19 -0.302490098,18.2016302 0.231971607,17.2030214 L9.03952676,0.746646542 Z M10,2.25584053 L1.9601405,17.3478261 L18.04099,17.3478261 L10,2.25584053 Z M10,5.9375 C10.531043,5.9375 10.9615385,6.37373537 10.9615385,6.91185897 L10.9615385,11.6923077 C10.9615385,12.2304313 10.531043,12.6666667 10,12.6666667 C9.46895697,12.6666667 9.03846154,12.2304313 9.03846154,11.6923077 L9.03846154,6.91185897 C9.03846154,6.37373537 9.46895697,5.9375 10,5.9375 Z M10,13.4583333 C10.6372516,13.4583333 11.1538462,13.9818158 11.1538462,14.6275641 L11.1538462,14.6641026 C11.1538462,15.3098509 10.6372516,15.8333333 10,15.8333333 C9.36274837,15.8333333 8.84615385,15.3098509 8.84615385,14.6641026 L8.84615385,14.6275641 C8.84615385,13.9818158 9.36274837,13.4583333 10,13.4583333 Z'/%3E%3C/svg%3E%0A"); } .question { - background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Cpath fill='%23999' d='M10,18 C5.581722,18 2,14.418278 2,10 C2,5.581722 5.581722,2 10,2 C14.418278,2 18,5.581722 18,10 C18,14.418278 14.418278,18 10,18 Z M6.77783203,7.65332031 C6.77783203,7.84798274 6.85929281,8.02888914 7.0222168,8.19604492 C7.18514079,8.36320071 7.38508996,8.44677734 7.62207031,8.44677734 C8.02409055,8.44677734 8.29703704,8.20768468 8.44091797,7.72949219 C8.59326248,7.27245865 8.77945854,6.92651485 8.99951172,6.69165039 C9.2195649,6.45678594 9.56233491,6.33935547 10.027832,6.33935547 C10.4256205,6.33935547 10.7006836,6.37695313 11.0021973,6.68847656 C11.652832,7.53271484 10.942627,8.472229 10.3750916,9.1321106 C9.80755615,9.79199219 8.29492188,11.9897461 10.027832,12.1347656 C10.4498423,12.1700818 10.7027991,11.9147157 10.7832031,11.4746094 C11.0021973,9.59857178 13.1254883,8.82415771 13.1254883,7.53271484 C13.1254883,7.07568131 12.9974785,6.65250846 12.7414551,6.26318359 C12.4854317,5.87385873 12.1225609,5.56600048 11.652832,5.33959961 C11.1831031,5.11319874 10.6414419,5 10.027832,5 C9.36767248,5 8.79004154,5.13541531 8.29492187,5.40625 C7.79980221,5.67708469 7.42317837,6.01879677 7.16503906,6.43139648 C6.90689975,6.8439962 6.77783203,7.25130007 6.77783203,7.65332031 Z M10.0099668,15 C10.2713191,15 10.5016601,14.9108147 10.7009967,14.7324415 C10.9003332,14.5540682 11,14.3088087 11,13.9966555 C11,13.7157177 10.9047629,13.4793767 10.7142857,13.2876254 C10.5238086,13.0958742 10.2890379,13 10.0099668,13 C9.72646591,13 9.48726565,13.0958742 9.2923588,13.2876254 C9.09745196,13.4793767 9,13.7157177 9,13.9966555 C9,14.313268 9.10077419,14.5596424 9.30232558,14.735786 C9.50387698,14.9119295 9.73975502,15 10.0099668,15 Z'/%3E%3C/svg%3E%0A"); + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='20' viewBox='0 0 20 20'%3E%3Cpath fill='%23999' d='M10,18 C5.581722,18 2,14.418278 2,10 C2,5.581722 5.581722,2 10,2 C14.418278,2 18,5.581722 18,10 C18,14.418278 14.418278,18 10,18 Z M6.77783203,7.65332031 C6.77783203,7.84798274 6.85929281,8.02888914 7.0222168,8.19604492 C7.18514079,8.36320071 7.38508996,8.44677734 7.62207031,8.44677734 C8.02409055,8.44677734 8.29703704,8.20768468 8.44091797,7.72949219 C8.59326248,7.27245865 8.77945854,6.92651485 8.99951172,6.69165039 C9.2195649,6.45678594 9.56233491,6.33935547 10.027832,6.33935547 C10.4256205,6.33935547 10.7006836,6.37695313 11.0021973,6.68847656 C11.652832,7.53271484 10.942627,8.472229 10.3750916,9.1321106 C9.80755615,9.79199219 8.29492188,11.9897461 10.027832,12.1347656 C10.4498423,12.1700818 10.7027991,11.9147157 10.7832031,11.4746094 C11.0021973,9.59857178 13.1254883,8.82415771 13.1254883,7.53271484 C13.1254883,7.07568131 12.9974785,6.65250846 12.7414551,6.26318359 C12.4854317,5.87385873 12.1225609,5.56600048 11.652832,5.33959961 C11.1831031,5.11319874 10.6414419,5 10.027832,5 C9.36767248,5 8.79004154,5.13541531 8.29492187,5.40625 C7.79980221,5.67708469 7.42317837,6.01879677 7.16503906,6.43139648 C6.90689975,6.8439962 6.77783203,7.25130007 6.77783203,7.65332031 Z M10.0099668,15 C10.2713191,15 10.5016601,14.9108147 10.7009967,14.7324415 C10.9003332,14.5540682 11,14.3088087 11,13.9966555 C11,13.7157177 10.9047629,13.4793767 10.7142857,13.2876254 C10.5238086,13.0958742 10.2890379,13 10.0099668,13 C9.72646591,13 9.48726565,13.0958742 9.2923588,13.2876254 C9.09745196,13.4793767 9,13.7157177 9,13.9966555 C9,14.313268 9.10077419,14.5596424 9.30232558,14.735786 C9.50387698,14.9119295 9.73975502,15 10.0099668,15 Z'/%3E%3C/svg%3E%0A"); } - .sdpi-more-info { - position: fixed; - left: 0px; - right: 0px; - bottom: 0px; - min-height: 16px; - padding-right: 16px; - text-align: right; - -webkit-touch-callout: none; - cursor: pointer; - user-select: none; - background-position: right center; - background-repeat: no-repeat; - border-radius: var(--sdpi-borderradius); - text-decoration: none; - color: var(--sdpi-color); + position: fixed; + left: 0px; + right: 0px; + bottom: 0px; + min-height: 16px; + padding-right: 16px; + text-align: right; + -webkit-touch-callout: none; + cursor: pointer; + user-select: none; + background-position: right center; + background-repeat: no-repeat; + border-radius: var(--sdpi-borderradius); + text-decoration: none; + color: var(--sdpi-color); } .sdpi-more-info-button { - display: flex; - align-self: right; - margin-left: auto; - position: fixed; - right: 17px; - bottom: 0px; + display: flex; + align-self: right; + margin-left: auto; + position: fixed; + right: 17px; + bottom: 0px; } details a { - background-position: right !important; - min-height: 24px; - display: inline-block; - line-height: 24px; - padding-right: 28px; + background-position: right !important; + min-height: 24px; + display: inline-block; + line-height: 24px; + padding-right: 28px; } input:not([type="range"]), textarea { - -webkit-appearance: none; - background: var(--sdpi-background); - color: var(--sdpi-color); - font-weight: normal; - font-size: 9pt; - border: none; - margin-top: 2px; - margin-bottom: 2px; + -webkit-appearance: none; + background: var(--sdpi-background); + color: var(--sdpi-color); + font-weight: normal; + font-size: 9pt; + border: none; + margin-top: 2px; + margin-bottom: 2px; } textarea + label { - display: flex; - justify-content: flex-end + display: flex; + justify-content: flex-end; } input[type="radio"], input[type="checkbox"] { - display: none; + display: none; } input[type="radio"] + label, input[type="checkbox"] + label { - font-size: 9pt; - color: var(--sdpi-color); - font-weight: normal; - margin-right: 8px; - -webkit-user-select: none; + font-size: 9pt; + color: var(--sdpi-color); + font-weight: normal; + margin-right: 8px; + -webkit-user-select: none; } input[type="radio"] + label:after, input[type="checkbox"] + label:after { - content: " " !important; + content: " " !important; } .sdpi-item[type="radio"] > .sdpi-item-value, .sdpi-item[type="checkbox"] > .sdpi-item-value { - padding-top: 2px; + padding-top: 2px; } .sdpi-item[type="checkbox"] > .sdpi-item-value > * { - margin-top: 4px; + margin-top: 4px; } .sdpi-item[type="checkbox"] .sdpi-item-child, .sdpi-item[type="radio"] .sdpi-item-child { - display: inline-block; + display: inline-block; } .sdpi-item[type="range"] .sdpi-item-value, .sdpi-item[type="meter"] .sdpi-item-child, .sdpi-item[type="progress"] .sdpi-item-child { - display: flex; + display: flex; } .sdpi-item[type="range"] .sdpi-item-value { - min-height: 26px; + min-height: 26px; } .sdpi-item[type="range"] .sdpi-item-value span, .sdpi-item[type="meter"] .sdpi-item-child span, .sdpi-item[type="progress"] .sdpi-item-child span { - margin-top: -2px; - min-width: 8px; - text-align: right; - user-select: none; - cursor: pointer; + margin-top: -2px; + min-width: 8px; + text-align: right; + user-select: none; + cursor: pointer; } .sdpi-item[type="range"] .sdpi-item-value span { - margin-top: 7px; - text-align: right; + margin-top: 7px; + text-align: right; } span + input[type="range"] { - display: flex; - max-width: 168px; - + display: flex; + max-width: 168px; } .sdpi-item[type="range"] .sdpi-item-value span:first-child, .sdpi-item[type="meter"] .sdpi-item-child span:first-child, .sdpi-item[type="progress"] .sdpi-item-child span:first-child { - margin-right: 4px; + margin-right: 4px; } .sdpi-item[type="range"] .sdpi-item-value span:last-child, .sdpi-item[type="meter"] .sdpi-item-child span:last-child, .sdpi-item[type="progress"] .sdpi-item-child span:last-child { - margin-left: 4px; + margin-left: 4px; } .reverse { - transform: rotate(180deg); + transform: rotate(180deg); } .sdpi-item[type="meter"] .sdpi-item-child meter + span:last-child { - margin-left: -10px; + margin-left: -10px; } .sdpi-item[type="progress"] .sdpi-item-child meter + span:last-child { - margin-left: -14px; + margin-left: -14px; } .sdpi-item[type="radio"] > .sdpi-item-value > * { - margin-top: 2px; + margin-top: 2px; } details { - padding: 8px 18px 8px 12px; - min-width: 86px; + padding: 8px 18px 8px 12px; + min-width: 86px; } details > h4 { - border-bottom: 1px solid var(--sdpi-bordercolor); + border-bottom: 1px solid var(--sdpi-bordercolor); } legend { - display: none; + display: none; } .sdpi-item-value > textarea { - padding: 0px; - width: 227px; - margin-left: 1px; + padding: 0px; + width: 227px; + margin-left: 1px; } input[type="radio"] + label span, input[type="checkbox"] + label span { - display: inline-block; - width: 16px; - height: 16px; - margin: 2px 4px 2px 0; - border-radius: 3px; - vertical-align: middle; - background: var(--sdpi-background); - cursor: pointer; - border: 1px solid rgba(0, 0, 0, .2); + display: inline-block; + width: 16px; + height: 16px; + margin: 2px 4px 2px 0; + border-radius: 3px; + vertical-align: middle; + background: var(--sdpi-background); + cursor: pointer; + border: 1px solid rgba(0, 0, 0, 0.2); } input[type="radio"] + label span { - border-radius: 100%; + border-radius: 100%; } input[type="radio"]:checked + label span, input[type="checkbox"]:checked + label span { - background-color: #77f; - background-image: url(check.svg); - background-repeat: no-repeat; - background-position: center center; - border: 1px solid rgb(0, 0, 0, .4); + background-color: #77f; + background-image: url(check.svg); + background-repeat: no-repeat; + background-position: center center; + border: 1px solid rgb(0, 0, 0, 0.4); } input[type="radio"]:active:checked + label span, input[type="radio"]:active + label span, input[type="checkbox"]:active:checked + label span, input[type="checkbox"]:active + label span { - background-color: #303030; + background-color: #303030; } input[type="radio"]:checked + label span { - background-image: url(rcheck.svg); + background-image: url(rcheck.svg); } - input[type="range"] { - width: var(--sdpi-width); - height: 30px; - overflow: hidden; - cursor: pointer; - background: transparent !important; + width: var(--sdpi-width); + height: 30px; + overflow: hidden; + cursor: pointer; + background: transparent !important; } .sdpi-item > input[type="range"] { - margin-left: 8px; - max-width: var(--sdpi-width); - width: var(--sdpi-width); - padding: 0px; + margin-left: 8px; + max-width: var(--sdpi-width); + width: var(--sdpi-width); + padding: 0px; } input[type="range"]::-webkit-slider-runnable-track { - height: 5px; - background: #979797; - border-radius: 3px; - padding: 0px !important; - border: 1px solid var(--sdpi-background); + height: 5px; + background: #979797; + border-radius: 3px; + padding: 0px !important; + border: 1px solid var(--sdpi-background); } input[type="range"]::-webkit-slider-thumb { - position: relative; - -webkit-appearance: none; - background-color: var(--sdpi-color); - width: 12px; - height: 12px; - border-radius: 20px; - margin-top: -5px; - border: none; - + position: relative; + -webkit-appearance: none; + background-color: var(--sdpi-color); + width: 12px; + height: 12px; + border-radius: 20px; + margin-top: -5px; + border: none; } input[type="range"i] { - margin: 0; + margin: 0; } input[type="range"]::-webkit-slider-thumb::before { - position: absolute; - content: ""; - height: 5px; - /* equal to height of runnable track or 1 less */ - width: 500px; - /* make this bigger than the widest range input element */ - left: -502px; - /* this should be -2px - width */ - top: 8px; - /* don't change this */ - background: #77f; + position: absolute; + content: ""; + height: 5px; + /* equal to height of runnable track or 1 less */ + width: 500px; + /* make this bigger than the widest range input element */ + left: -502px; + /* this should be -2px - width */ + top: 8px; + /* don't change this */ + background: #77f; } input[type="color"] { - min-width: 32px; - min-height: 32px; - width: 32px; - height: 32px; - padding: 0; - background-color: var(--sdpi-bgcolor); - flex: none; + min-width: 32px; + min-height: 32px; + width: 32px; + height: 32px; + padding: 0; + background-color: var(--sdpi-bgcolor); + flex: none; } ::-webkit-color-swatch { - min-width: 24px; + min-width: 24px; } textarea { - height: 3em; - word-break: break-word; - line-height: 1.5em; + height: 3em; + word-break: break-word; + line-height: 1.5em; } .textarea { - padding: 0px !important; + padding: 0px !important; } textarea { - width: 221px; - /*98%;*/ - height: 96%; - min-height: 6em; - resize: none; - border-radius: var(--sdpi-borderradius); + width: 221px; + /*98%;*/ + height: 96%; + min-height: 6em; + resize: none; + border-radius: var(--sdpi-borderradius); } /* CAROUSEL */ @@ -883,143 +879,143 @@ textarea { .sdpi-item.card-carousel-wrapper, .sdpi-item > .card-carousel-wrapper { - padding: 0; + padding: 0; } - .card-carousel-wrapper { - display: flex; - align-items: center; - justify-content: center; - margin: 12px auto; - color: #666a73; + display: flex; + align-items: center; + justify-content: center; + margin: 12px auto; + color: #666a73; } .card-carousel { - display: flex; - justify-content: center; - width: 278px; + display: flex; + justify-content: center; + width: 278px; } .card-carousel--overflow-container { - overflow: hidden; + overflow: hidden; } .card-carousel--nav__left, .card-carousel--nav__right { - /* display: inline-block; */ - width: 12px; - height: 12px; - border-top: 2px solid #42b883; - border-right: 2px solid #42b883; - cursor: pointer; - margin: 0 4px; - transition: transform 150ms linear; + /* display: inline-block; */ + width: 12px; + height: 12px; + border-top: 2px solid #42b883; + border-right: 2px solid #42b883; + cursor: pointer; + margin: 0 4px; + transition: transform 150ms linear; } .card-carousel--nav__left[disabled], .card-carousel--nav__right[disabled] { - opacity: 0.2; - border-color: black; + opacity: 0.2; + border-color: black; } .card-carousel--nav__left { - transform: rotate(-135deg); + transform: rotate(-135deg); } .card-carousel--nav__left:active { - transform: rotate(-135deg) scale(0.85); + transform: rotate(-135deg) scale(0.85); } .card-carousel--nav__right { - transform: rotate(45deg); + transform: rotate(45deg); } .card-carousel--nav__right:active { - transform: rotate(45deg) scale(0.85); + transform: rotate(45deg) scale(0.85); } .card-carousel-cards { - display: flex; - transition: transform 150ms ease-out; - transform: translatex(0px); + display: flex; + transition: transform 150ms ease-out; + transform: translatex(0px); } .card-carousel-cards .card-carousel--card { - margin: 0 5px; - cursor: pointer; - /* box-shadow: 0 4px 15px 0 rgba(40, 44, 53, 0.06), 0 2px 2px 0 rgba(40, 44, 53, 0.08); */ - background-color: #fff; - border-radius: 4px; - z-index: 3; + margin: 0 5px; + cursor: pointer; + /* box-shadow: 0 4px 15px 0 rgba(40, 44, 53, 0.06), 0 2px 2px 0 rgba(40, 44, 53, 0.08); */ + background-color: #fff; + border-radius: 4px; + z-index: 3; } .xxcard-carousel-cards .card-carousel--card:first-child { - margin-left: 0; + margin-left: 0; } .xxcard-carousel-cards .card-carousel--card:last-child { - margin-right: 0; + margin-right: 0; } .card-carousel-cards .card-carousel--card img { - vertical-align: bottom; - border-top-left-radius: 4px; - border-top-right-radius: 4px; - transition: opacity 150ms linear; - width: 60px; + vertical-align: bottom; + border-top-left-radius: 4px; + border-top-right-radius: 4px; + transition: opacity 150ms linear; + width: 60px; } .card-carousel-cards .card-carousel--card img:hover { - opacity: 0.5; + opacity: 0.5; } .card-carousel-cards .card-carousel--card--footer { - border-top: 0; - max-width: 80px; - overflow: hidden; - display: flex; - height: 100%; - flex-direction: column; + border-top: 0; + max-width: 80px; + overflow: hidden; + display: flex; + height: 100%; + flex-direction: column; } .card-carousel-cards .card-carousel--card--footer p { - padding: 3px 0; - margin: 0; - margin-bottom: 2px; - font-size: 15px; - font-weight: 500; - color: #2c3e50; + padding: 3px 0; + margin: 0; + margin-bottom: 2px; + font-size: 15px; + font-weight: 500; + color: #2c3e50; } .card-carousel-cards .card-carousel--card--footer p:nth-of-type(2) { - font-size: 12px; - font-weight: 300; - padding: 6px; - color: #666a73; + font-size: 12px; + font-weight: 300; + padding: 6px; + color: #666a73; } - h1 { - font-size: 1.3em; - font-weight: 500; - text-align: center; - margin-bottom: 12px; + font-size: 1.3em; + font-weight: 500; + text-align: center; + margin-bottom: 12px; } ::-webkit-datetime-edit { - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - background: url(elg_calendar_inv.svg) no-repeat left center; - padding-right: 1em; - padding-left: 25px; - background-position: 4px 0px; + font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", + "Segoe UI Symbol"; + background: url(elg_calendar_inv.svg) no-repeat left center; + padding-right: 1em; + padding-left: 25px; + background-position: 4px 0px; } ::-webkit-datetime-edit-fields-wrapper { } ::-webkit-datetime-edit-text { - padding: 0 0.3em; + padding: 0 0.3em; } ::-webkit-datetime-edit-month-field { @@ -1032,63 +1028,62 @@ h1 { } ::-webkit-inner-spin-button { - - /* display: none; */ + /* display: none; */ } ::-webkit-calendar-picker-indicator { - background: transparent; - font-size: 17px; + background: transparent; + font-size: 17px; } ::-webkit-calendar-picker-indicator:focus { - background-color: rgba(0, 0, 0, 0.2); + background-color: rgba(0, 0, 0, 0.2); } input[type="date"] { - -webkit-align-items: center; - display: -webkit-inline-flex; - font-family: monospace; - overflow: hidden; - padding: 0; - -webkit-padding-start: 1px; + -webkit-align-items: center; + display: -webkit-inline-flex; + font-family: monospace; + overflow: hidden; + padding: 0; + -webkit-padding-start: 1px; } input::-webkit-datetime-edit { - -webkit-flex: 1; - -webkit-user-modify: read-only !important; - display: inline-block; - min-width: 0; - overflow: hidden; + -webkit-flex: 1; + -webkit-user-modify: read-only !important; + display: inline-block; + min-width: 0; + overflow: hidden; } input[type="file"] { - opacity: 0; - display: none; + opacity: 0; + display: none; } .sdpi-item > input[type="file"] { - opacity: 1; - display: flex; + opacity: 1; + display: flex; } input[type="file"] + span { - display: flex; - flex: 0 1 auto; - background-color: #0000ff50; + display: flex; + flex: 0 1 auto; + background-color: #0000ff50; } label.sdpi-file-label { - cursor: pointer; - user-select: none; - display: inline-block; - min-height: 21px !important; - height: 21px !important; - line-height: 20px; - padding: 0px 4px; - margin: auto; - margin-right: 0px; - float: right; + cursor: pointer; + user-select: none; + display: inline-block; + min-height: 21px !important; + height: 21px !important; + line-height: 20px; + padding: 0px 4px; + margin: auto; + margin-right: 0px; + float: right; } .sdpi-file-label > label:active, @@ -1097,170 +1092,171 @@ label.sdpi-file-label:active, label.sdpi-file-info:active, input[type="file"]::-webkit-file-upload-button:active, button:active { - background-color: var(--sdpi-color); - color: #303030; + background-color: var(--sdpi-color); + color: #303030; } - input:required:invalid, input:focus:invalid { - background: var(--sdpi-background) url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5IiBoZWlnaHQ9IjkiIHZpZXdCb3g9IjAgMCA5IDkiPgogICAgPHBhdGggZmlsbD0iI0Q4RDhEOCIgZD0iTTQuNSwwIEM2Ljk4NTI4MTM3LC00LjU2NTM4NzgyZS0xNiA5LDIuMDE0NzE4NjMgOSw0LjUgQzksNi45ODUyODEzNyA2Ljk4NTI4MTM3LDkgNC41LDkgQzIuMDE0NzE4NjMsOSAzLjA0MzU5MTg4ZS0xNiw2Ljk4NTI4MTM3IDAsNC41IEMtMy4wNDM1OTE4OGUtMTYsMi4wMTQ3MTg2MyAyLjAxNDcxODYzLDQuNTY1Mzg3ODJlLTE2IDQuNSwwIFogTTQsMSBMNCw2IEw1LDYgTDUsMSBMNCwxIFogTTQuNSw4IEM0Ljc3NjE0MjM3LDggNSw3Ljc3NjE0MjM3IDUsNy41IEM1LDcuMjIzODU3NjMgNC43NzYxNDIzNyw3IDQuNSw3IEM0LjIyMzg1NzYzLDcgNCw3LjIyMzg1NzYzIDQsNy41IEM0LDcuNzc2MTQyMzcgNC4yMjM4NTc2Myw4IDQuNSw4IFoiLz4KICA8L3N2Zz4) no-repeat 98% center; + background: var(--sdpi-background) + url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5IiBoZWlnaHQ9IjkiIHZpZXdCb3g9IjAgMCA5IDkiPgogICAgPHBhdGggZmlsbD0iI0Q4RDhEOCIgZD0iTTQuNSwwIEM2Ljk4NTI4MTM3LC00LjU2NTM4NzgyZS0xNiA5LDIuMDE0NzE4NjMgOSw0LjUgQzksNi45ODUyODEzNyA2Ljk4NTI4MTM3LDkgNC41LDkgQzIuMDE0NzE4NjMsOSAzLjA0MzU5MTg4ZS0xNiw2Ljk4NTI4MTM3IDAsNC41IEMtMy4wNDM1OTE4OGUtMTYsMi4wMTQ3MTg2MyAyLjAxNDcxODYzLDQuNTY1Mzg3ODJlLTE2IDQuNSwwIFogTTQsMSBMNCw2IEw1LDYgTDUsMSBMNCwxIFogTTQuNSw4IEM0Ljc3NjE0MjM3LDggNSw3Ljc3NjE0MjM3IDUsNy41IEM1LDcuMjIzODU3NjMgNC43NzYxNDIzNyw3IDQuNSw3IEM0LjIyMzg1NzYzLDcgNCw3LjIyMzg1NzYzIDQsNy41IEM0LDcuNzc2MTQyMzcgNC4yMjM4NTc2Myw4IDQuNSw4IFoiLz4KICA8L3N2Zz4) + no-repeat 98% center; } input:required:valid { - background: var(--sdpi-background) url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5IiBoZWlnaHQ9IjkiIHZpZXdCb3g9IjAgMCA5IDkiPjxwb2x5Z29uIGZpbGw9IiNEOEQ4RDgiIHBvaW50cz0iNS4yIDEgNi4yIDEgNi4yIDcgMy4yIDcgMy4yIDYgNS4yIDYiIHRyYW5zZm9ybT0icm90YXRlKDQwIDQuNjc3IDQpIi8+PC9zdmc+) no-repeat 98% center; + background: var(--sdpi-background) + url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI5IiBoZWlnaHQ9IjkiIHZpZXdCb3g9IjAgMCA5IDkiPjxwb2x5Z29uIGZpbGw9IiNEOEQ4RDgiIHBvaW50cz0iNS4yIDEgNi4yIDEgNi4yIDcgMy4yIDcgMy4yIDYgNS4yIDYiIHRyYW5zZm9ybT0icm90YXRlKDQwIDQuNjc3IDQpIi8+PC9zdmc+) + no-repeat 98% center; } .tooltip, :tooltip, :title { - color: yellow; + color: yellow; } [title]:hover { - display: flex; - align-items: center; - justify-content: center; + display: flex; + align-items: center; + justify-content: center; } [title]:hover::after { - content: ''; - position: absolute; - bottom: -1000px; - left: 8px; - display: none; - color: #fff; - border: 8px solid transparent; - border-bottom: 8px solid #000; + content: ""; + position: absolute; + bottom: -1000px; + left: 8px; + display: none; + color: #fff; + border: 8px solid transparent; + border-bottom: 8px solid #000; } [title]:hover::before { - content: attr(title); - display: flex; - justify-content: center; - align-self: center; - padding: 6px 12px; - border-radius: 5px; - background: rgba(0, 0, 0, 0.8); - color: var(--sdpi-color); - font-size: 9pt; - font-family: sans-serif; - opacity: 1; - position: absolute; - height: auto; - /* width: 50%; + content: attr(title); + display: flex; + justify-content: center; + align-self: center; + padding: 6px 12px; + border-radius: 5px; + background: rgba(0, 0, 0, 0.8); + color: var(--sdpi-color); + font-size: 9pt; + font-family: sans-serif; + opacity: 1; + position: absolute; + height: auto; + /* width: 50%; left: 35%; */ - text-align: center; - bottom: 2px; - z-index: 100; - box-shadow: 0px 3px 6px rgba(0, 0, 0, .5); - /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ + text-align: center; + bottom: 2px; + z-index: 100; + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.5); + /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ } .sdpi-item-group.file { - width: 232px; - display: flex; - align-items: center; + width: 232px; + display: flex; + align-items: center; } .sdpi-file-info { - overflow-wrap: break-word; - word-wrap: break-word; - hyphens: auto; + overflow-wrap: break-word; + word-wrap: break-word; + hyphens: auto; - min-width: 132px; - max-width: 144px; - max-height: 32px; - margin-top: 0px; - margin-left: 5px; - display: inline-block; - overflow: hidden; - padding: 6px 4px; - background-color: var(--sdpi-background); + min-width: 132px; + max-width: 144px; + max-height: 32px; + margin-top: 0px; + margin-left: 5px; + display: inline-block; + overflow: hidden; + padding: 6px 4px; + background-color: var(--sdpi-background); } - ::-webkit-scrollbar { - width: 8px; + width: 8px; } ::-webkit-scrollbar-track { - -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); } ::-webkit-scrollbar-thumb { - background-color: #999999; - outline: 1px solid slategrey; - border-radius: 8px; + background-color: #999999; + outline: 1px solid slategrey; + border-radius: 8px; } a { - color: #7397d2; + color: #7397d2; } .testcontainer { - display: flex; - background-color: #0000ff20; - max-width: 400px; - height: 200px; - align-content: space-evenly; + display: flex; + background-color: #0000ff20; + max-width: 400px; + height: 200px; + align-content: space-evenly; } -input[type=range] { - -webkit-appearance: none; - /* background-color: green; */ - height: 6px; - margin-top: 12px; - z-index: 0; - overflow: visible; +input[type="range"] { + -webkit-appearance: none; + /* background-color: green; */ + height: 6px; + margin-top: 12px; + z-index: 0; + overflow: visible; } - ::-webkit-slider-thumb { - -webkit-appearance: none; - background-color: var(--sdpi-color); - width: 16px; - height: 16px; - border-radius: 20px; - margin-top: -6px; - border: 1px solid #999999; + -webkit-appearance: none; + background-color: var(--sdpi-color); + width: 16px; + height: 16px; + border-radius: 20px; + margin-top: -6px; + border: 1px solid #999999; } .sdpi-item[type="range"] .sdpi-item-group { - display: flex; - flex-direction: column; + display: flex; + flex-direction: column; } .xxsdpi-item[type="range"] .sdpi-item-group input { - max-width: 204px; + max-width: 204px; } .sdpi-item[type="range"] .sdpi-item-group span { - margin-left: 0px !important; + margin-left: 0px !important; } .sdpi-item[type="range"] .sdpi-item-group > .sdpi-item-child { - display: flex; - flex-direction: row; + display: flex; + flex-direction: row; } :disabled { - color: #993333; + color: #993333; } select, select option { - color: var(--sdpi-color); + color: var(--sdpi-color); } select.disabled, select option:disabled { - color: #fd9494; - font-style: italic; + color: #fd9494; + font-style: italic; } .runningAppsContainer { - display: none; + display: none; } /* debug @@ -1270,63 +1266,63 @@ select option:disabled { */ .min80 > .sdpi-item-child { - min-width: 80px; + min-width: 80px; } .min100 > .sdpi-item-child { - min-width: 100px; + min-width: 100px; } .min120 > .sdpi-item-child { - min-width: 120px; + min-width: 120px; } .min140 > .sdpi-item-child { - min-width: 140px; + min-width: 140px; } .min160 > .sdpi-item-child { - min-width: 160px; + min-width: 160px; } .min200 > .sdpi-item-child { - min-width: 200px; + min-width: 200px; } .max40 { - flex-basis: 40%; - flex-grow: 0; + flex-basis: 40%; + flex-grow: 0; } .max30 { - flex-basis: 30%; - flex-grow: 0; + flex-basis: 30%; + flex-grow: 0; } .max20 { - flex-basis: 20%; - flex-grow: 0; + flex-basis: 20%; + flex-grow: 0; } .up20 { - margin-top: -20px; + margin-top: -20px; } .alignCenter { - align-items: center; + align-items: center; } .alignTop { - align-items: flex-start; + align-items: flex-start; } .alignBaseline { - align-items: baseline; + align-items: baseline; } .noMargins, .noMargins *, .noInnerMargins * { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } diff --git a/Sources/com.jk.weather.sdPlugin/plugin/main.html b/Sources/com.jk.weather.sdPlugin/plugin/main.html index 83a3115..91e4e21 100644 --- a/Sources/com.jk.weather.sdPlugin/plugin/main.html +++ b/Sources/com.jk.weather.sdPlugin/plugin/main.html @@ -1,12 +1,12 @@ - + - - + com.jk.weather - - - + + + + diff --git a/Sources/com.jk.weather.sdPlugin/plugin/main.js b/Sources/com.jk.weather.sdPlugin/plugin/main.js index a001144..923b99f 100644 --- a/Sources/com.jk.weather.sdPlugin/plugin/main.js +++ b/Sources/com.jk.weather.sdPlugin/plugin/main.js @@ -1,145 +1,212 @@ let websocket = null, - pluginUUID = null; -apiKey = ""; - -function connectElgatoStreamDeckSocket(inPort, inPluginUUID, inRegisterEvent, inInfo) { - pluginUUID = inPluginUUID; - - // Open the web socket - websocket = new WebSocket("ws://localhost:" + inPort); + pluginUUID = null, + apiKey = "", + provider = ""; + +function connectElgatoStreamDeckSocket( + inPort, + inPluginUUID, + inRegisterEvent, + inInfo +) { + pluginUUID = inPluginUUID; + + // Open the web socket + websocket = new WebSocket("ws://localhost:" + inPort); + + websocket.onopen = function () { + // WebSocket is connected, register the plugin + const json = { + event: inRegisterEvent, + uuid: inPluginUUID, + }; - websocket.onopen = function () { - // WebSocket is connected, register the plugin + websocket.send(JSON.stringify(json)); + }; + + websocket.onmessage = function (evt) { + // Received message from Stream Deck + const jsonObj = JSON.parse(evt.data); + const context = jsonObj["context"]; + + if (jsonObj["event"] === "keyUp") { + let cityName = ""; + let unit = ""; + let frequency = null; + if ( + jsonObj.payload.settings != null && + jsonObj.payload.settings.hasOwnProperty("cityName") && + jsonObj.payload.settings.hasOwnProperty("unit") && + jsonObj.payload.settings.hasOwnProperty("frequency") + ) { + cityName = jsonObj.payload.settings["cityName"].toLowerCase(); + unit = jsonObj.payload.settings["unit"]; + frequency = + jsonObj.payload.settings["frequency"] !== "0" + ? parseInt(jsonObj.payload.settings["frequency"]) + : false; + } + + if (cityName === "" || apiKey === "") { const json = { - event: inRegisterEvent, - uuid: inPluginUUID + event: "showAlert", + context: jsonObj.context, }; - websocket.send(JSON.stringify(json)); - }; - - websocket.onmessage = function (evt) { - // Received message from Stream Deck - const jsonObj = JSON.parse(evt.data); - const context = jsonObj["context"]; - - if (jsonObj["event"] === "keyUp") { - let cityName = ""; - let unit = ""; - let frequency = null; - if ( - jsonObj.payload.settings != null && - jsonObj.payload.settings.hasOwnProperty("cityName") && - jsonObj.payload.settings.hasOwnProperty("unit") && - jsonObj.payload.settings.hasOwnProperty("frequency") - ) { - cityName = jsonObj.payload.settings["cityName"].toLowerCase(); - unit = jsonObj.payload.settings["unit"]; - frequency = (jsonObj.payload.settings["frequency"] !== "0") ? parseInt(jsonObj.payload.settings["frequency"]) : false; - } - - if (cityName === "" || apiKey === "") { - const json = { - event: "showAlert", - context: jsonObj.context, - }; - websocket.send(JSON.stringify(json)); - } else { - requestSending(context, cityName, unit); - if (frequency) { - setInterval(() => requestSending(context, cityName, unit), frequency); - } - } - } else if (jsonObj["event"] === "didReceiveGlobalSettings") { - if (jsonObj.payload.settings != null && jsonObj.payload.settings.hasOwnProperty("apiKey")) { - apiKey = jsonObj.payload.settings["apiKey"]; - } - - } else if (jsonObj["event"] === "keyDown") { - const json = { - event: "getGlobalSettings", - context: pluginUUID - }; - - websocket.send(JSON.stringify(json)); + } else { + sendRequest(context, cityName, unit); + if (frequency) { + setInterval(() => sendRequest(context, cityName, unit), frequency); } + } + } else if (jsonObj["event"] === "didReceiveGlobalSettings") { + if ( + jsonObj.payload.settings != null && + jsonObj.payload.settings.hasOwnProperty("apiKey") + ) { + apiKey = jsonObj.payload.settings["apiKey"]; + provider = jsonObj.payload.settings["provider"]; + } + } else if (jsonObj["event"] === "keyDown") { + const json = { + event: "getGlobalSettings", + context: pluginUUID, + }; + + websocket.send(JSON.stringify(json)); + } + }; +} + +function prepareUrl(cityName, unit) { + let url; + const u = unit === "celsius" ? "metric" : "imperial"; + switch (provider) { + case "weatherApi": + url = `https://api.weatherapi.com/v1/current.json?key=${apiKey}&q=${cityName}&aqi=no`; + break; + case "openWeatherMap": + url = `https://api.openweathermap.org/data/2.5/weather?q=${cityName}&appid=${apiKey}&units=${u}`; + break; + } + return url; +} + +function prepareTemperature(response, unit) { + let temp; + switch (provider) { + case "weatherApi": + if (unit === "celsius") { + temp = response.current.temp_c ? response.current.temp_c + "°C" : "NaN"; + } + if (unit === "fahrenheit") { + temp = response.current.temp_f ? response.current.temp_f + "°F" : "NaN"; + } + break; + case "openWeatherMap": + if (unit === "celsius") { + temp = response.main.temp ? response.main.temp + "°C" : "NaN"; + } + if (unit === "fahrenheit") { + temp = response.main.temp ? response.main.temp + "°F" : "NaN"; + } + break; + } + return temp; +} + +function setImageAndCity(response, context, city) { + let url; + const defaultImg = + "https://raw.githubusercontent.com/JaouherK/streamDeck-weatherPlugin/master/Sources/com.jk.weather.sdPlugin/resources/actionIcon.png"; + switch (provider) { + case "weatherApi": + url = + response.current.condition.icon != null + ? "https:" + response.current.condition.icon + : defaultImg; + break; + case "openWeatherMap": + url = + response.weather[0].icon != null + ? "https://openweathermap.org/img/wn/" + + response.weather[0].icon + + ".png" + : defaultImg; + break; + } + dataFromCanvasDraw(url, city, (dataUrl) => { + let json = { + event: "setImage", + context, + payload: { + image: dataUrl, + }, }; + websocket.send(JSON.stringify(json)); + }); + + return url; } +function sendRequest(context, cityName, unit) { + const request = new XMLHttpRequest(); + const url = prepareUrl(cityName, unit); + request.open("GET", url); + request.send(); + request.onreadystatechange = function () { + if (request.readyState === XMLHttpRequest.DONE) { + if (request.status === 200) { + const response = JSON.parse(request.responseText); + const temperature = prepareTemperature(response, unit); + + let jsonDeck = { + event: "setTitle", + context, + payload: { + title: temperature, + }, + }; -function requestSending(context, cityName, unit) { - const request = new XMLHttpRequest(); - request.open("GET", "https://api.weatherapi.com/v1/current.json?key=" + apiKey + "&q=" + cityName + "&aqi=no"); - request.send(); - request.onreadystatechange = function () { - if (request.readyState === XMLHttpRequest.DONE) { - if (request.status === 200) { - const response = JSON.parse(request.responseText); - let temperature = ""; - if (unit === "celsius") { - temperature = response.current.temp_c ? response.current.temp_c + "°C" : "NaN"; - } - if (unit === "fahrenheit") { - temperature = response.current.temp_f ? response.current.temp_f + "°F" : "NaN"; - } - let jsonDeck = { - event: "setTitle", - context, - payload: { - title: temperature, - target: 1 - } - }; - - websocket.send(JSON.stringify(jsonDeck)); - - let jsonSoftware = { - event: "setTitle", - context: context, - payload: { - title: cityName, - target: 2 - } - }; - - websocket.send(JSON.stringify(jsonSoftware)); - - if (response.current.condition.icon != null) { - toDataURL( - "https:" + response.current.condition.icon, - (dataUrl) => { - let json = { - event: "setImage", - context, - payload: { - image: dataUrl, - target: 1 - } - }; - websocket.send(JSON.stringify(json)); - }) - } - } else { - const json = { - event: "showAlert", - context, - }; - websocket.send(JSON.stringify(json)); - } - } + websocket.send(JSON.stringify(jsonDeck)); + + setImageAndCity(response, context, cityName); + } else { + const json = { + event: "showAlert", + context, + }; + websocket.send(JSON.stringify(json)); + } } + }; } -function toDataURL(url, callback) { - let xhr = new XMLHttpRequest(); - xhr.onload = function () { - let reader = new FileReader(); - reader.onloadend = function () { - callback(reader.result); - } - reader.readAsDataURL(xhr.response); - }; - xhr.open("GET", url); - xhr.responseType = "blob"; - xhr.send(); +function dataFromCanvasDraw(url, city, callback) { + const canvas = document.getElementById("idCanvas"); + const context = canvas.getContext("2d"); + let imageObj = new Image(); + imageObj.setAttribute("crossOrigin", "anonymous"); + + imageObj.onload = ((city) => { + const canvas = document.getElementById("idCanvas"); + context.clearRect(0, 0, canvas.width, canvas.height); + context.drawImage( + imageObj, + 0, + 0, + imageObj.width, + imageObj.height, + 0, + 0, + canvas.width, + canvas.height + ); + context.font = "small-caps bold 13px Arial"; + context.fillStyle = "white"; + context.fillText(city, 65, 13); + const dataURL = canvas.toDataURL(); + callback(dataURL); + }).bind(this, city); + imageObj.src = url; }