diff --git a/CHANGELOG.md b/CHANGELOG.md index aae726f4c..a54a35cd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ ## New Updates +### 9.0.2 - _May 2, 2022_ + +Based on user feedback, are happy to announce some updates to SikhiToTheMax Desktop. + +- Ability to hide shabad (refer to screenshot below). This feature will hide the currently selected shabad and its panktee from the display, as well as from the video overlay capability. + ![](./assets/img/help_images/search-results.png) + +- We have made some improvements to shabad rendered to support smaller screen sizes. +- An icon will now display when Bani Controller (Mobile Device Sync) is live. + ### 9.0.0 - _April 22, 2022_ We are excited to launch the latest version of SikhiToTheMax 9.0, which features several enhancements and performance improvements. diff --git a/app.js b/app.js index ffb22652c..899378c36 100644 --- a/app.js +++ b/app.js @@ -644,6 +644,16 @@ ipcMain.on('show-text', (event, arg) => { } }); +ipcMain.on('toggle-viewer-window', (event, arg) => { + if (viewerWindow) { + if (arg) { + viewerWindow.show(); + } else { + viewerWindow.hide(); + } + } +}); + ipcMain.on('presenter-view', (event, arg) => { if (viewerWindow) { if (!arg) { diff --git a/package.json b/package.json index a9be09a4b..89d4abdcf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "productName": "SikhiToTheMax", "name": "sttm-desktop", - "version": "9.0.1", + "version": "9.0.2", "description": "The SikhiToTheMax desktop app", "main": "app.js", "scripts": { diff --git a/www/assets/img/help_images/hide-external-window.png b/www/assets/img/help_images/hide-external-window.png new file mode 100644 index 000000000..ee7ce80ea Binary files /dev/null and b/www/assets/img/help_images/hide-external-window.png differ diff --git a/www/configs/overlay.json b/www/configs/overlay.json index be3212638..bc6c198ef 100644 --- a/www/configs/overlay.json +++ b/www/configs/overlay.json @@ -171,10 +171,12 @@ "settings": { "reset": { "icon": "reset.svg", + "tooltip": "Reset Defaults", "initialValue": false }, "overlayLarivaar": { "icon": "link.png", + "tooltip": "Toggle Larivaar", "initialValue": false }, "larivaarAssist": { @@ -186,10 +188,12 @@ }, "toggle-logo": { "icon": "sttm.png", + "tooltip": "Toggle Logo", "initialValue": false }, "toggle-annoucement": { "icon": "megaphone.png", + "tooltip": "Toggle Annoucement", "initialValue": false }, "toggle-link": { @@ -198,6 +202,7 @@ }, "green-screen-toggle": { "type": "icon-toggle", + "tooltip": "Toggle Green Screen", "icon": "rectangle.svg", "initialValue": false } diff --git a/www/locales/en.json b/www/locales/en.json index 5b0e36aba..a5c6c83c6 100644 --- a/www/locales/en.json +++ b/www/locales/en.json @@ -474,5 +474,9 @@ }, "SHORTCUT": { "COPY_TO_CLIPBOARD": "Verse copied to clipboard!" + }, + "SHABAD_PANE": { + "SHOW_DISPLAY": "SHOW DISPLAY", + "HIDE_SCREEN": "HIDE SCREEN" } } diff --git a/www/main/navigator/shabad/ShabadContent.jsx b/www/main/navigator/shabad/ShabadContent.jsx index 9d287b821..b42641fb4 100644 --- a/www/main/navigator/shabad/ShabadContent.jsx +++ b/www/main/navigator/shabad/ShabadContent.jsx @@ -450,6 +450,9 @@ const ShabadContent = () => { ); }} > +
+ sync +
); diff --git a/www/main/navigator/shabad/ShabadHeader.jsx b/www/main/navigator/shabad/ShabadHeader.jsx index 33f384cb7..43269d71b 100644 --- a/www/main/navigator/shabad/ShabadHeader.jsx +++ b/www/main/navigator/shabad/ShabadHeader.jsx @@ -1,7 +1,13 @@ -import React from 'react'; +import React, { useEffect, useState } from 'react'; import { useStoreState, useStoreActions } from 'easy-peasy'; -function ShabadHeader() { +const electron = require('electron'); + +const { ipcRenderer, remote } = electron; +const { i18n } = remote.require('./app'); + +const ShabadHeader = () => { + const [showViewer, setShowViewer] = useState(true); const { activeShabadId, activeVerseId, isDontSaveHistory } = useStoreState( state => state.navigator, ); @@ -32,12 +38,22 @@ function ShabadHeader() { } }; + useEffect(() => { + ipcRenderer.send('toggle-viewer-window', showViewer); + }, [showViewer]); + return ( - <> +
+ - +
); -} +}; export default ShabadHeader; diff --git a/www/main/overlay/components/OverlaySetting.jsx b/www/main/overlay/components/OverlaySetting.jsx index a53ba7868..87d89e988 100644 --- a/www/main/overlay/components/OverlaySetting.jsx +++ b/www/main/overlay/components/OverlaySetting.jsx @@ -101,6 +101,7 @@ const OverlaySetting = ({ settingObj, stateVar, stateFunction }) => {
{ {verseObj && !isMiscSlide && ( <> {verseObj.Gurmukhi && ( -
{ vishraamPlacement={verseObj.Visraam ? JSON.parse(verseObj.Visraam) : {}} vishraamSource={vishraamSource} /> -
+ )} {translationVisibility && verseObj.Translations && ( diff --git a/www/src/scss/navigator/shabad/_shabad.scss b/www/src/scss/navigator/shabad/_shabad.scss index 1087e61b8..449b51654 100644 --- a/www/src/scss/navigator/shabad/_shabad.scss +++ b/www/src/scss/navigator/shabad/_shabad.scss @@ -6,9 +6,6 @@ &:hover { outline: 0; - .pane-header { - border-bottom: 1px solid #01579b; - } } .shabad-list { height: calc(100% - 40px); @@ -17,4 +14,27 @@ .fa-check { color: $grey; } + + &-header { + @include flex($ai-value: center, $jc-value: flex-end); + + :nth-child(n) { + margin-left: 10px; + } + + .toggle-viewer-btn { + height: 30px; + padding: 0 0.9em; + margin: unset; + background: $dark-grey; + + &.btn-danger { + background: $bright-red; + } + } + + i { + font-size: 16px; + } + } } diff --git a/www/src/scss/styles.scss b/www/src/scss/styles.scss index e04ac23e1..03709d2d8 100644 --- a/www/src/scss/styles.scss +++ b/www/src/scss/styles.scss @@ -781,11 +781,11 @@ body.show-overlay { } } -.controller-on #shabad-page .controller-signal { +.controller-on .shabad-pane .controller-signal { display: block; } -#shabad-page { +.shabad-pane { .controller-signal { bottom: 10px; display: none; @@ -793,10 +793,9 @@ body.show-overlay { position: absolute; right: 10px; width: 20px; - } - - img { - width: 20px; + img { + width: 100%; + } } } diff --git a/www/src/scss/themes/helpers/_variables.scss b/www/src/scss/themes/helpers/_variables.scss index 773b1909a..c038383fc 100644 --- a/www/src/scss/themes/helpers/_variables.scss +++ b/www/src/scss/themes/helpers/_variables.scss @@ -28,6 +28,7 @@ $not-so-white: #e0e0e0; $transparent-blue: #cfd8dc; $red: #de636f; +$bright-red: #ff0000; $cadmium-orange: #e18030; $light-green: #27ae60; diff --git a/www/src/scss/viewer/verse-slide/_verse-slide.scss b/www/src/scss/viewer/verse-slide/_verse-slide.scss index 41a4b7dfb..ccf627762 100644 --- a/www/src/scss/viewer/verse-slide/_verse-slide.scss +++ b/www/src/scss/viewer/verse-slide/_verse-slide.scss @@ -24,6 +24,8 @@ .slide-gurbani { @extend .gurmukhi-vaak-thick; font-size: 45px; + font-weight: normal; + line-height: 1.15; } .slide-announcement { @@ -39,7 +41,9 @@ } .padchhed span { - margin: 0 5px; + display: inline-block; + margin: 0 0.15em; + white-space: nowrap; } .slide-translation {