4.1.0 (#288)

* Add resize for background and text for Overlay (#210) * Add resize for background and text for Overlay * reverse buttons * Remove mocha * 206 handle port conflict gracefully (#227) * check for pre-defined 12 ports. If none are available, then display an error message and quite gracefully * formatting errors * resolve merge conflict * removed console log messages * Add opacity and separate fonts for overlay (#226) lint fixes remove logo Gurbani font size fix defaults * 182 present next line in a different style (#215) * 182 Added opacity for next line. Combined animation for all but the main gurbani line * 182: Change Style of next Line * 182 Added opacity for next line. Combined animation for all but the main gurbani line * 182: Change Style of next Line * 182 Added opacity for next line. Combined animation for all but the main gurbani line * 182: Change Style of next Line * Supporting next line Gurbani Font Sizes 1 through 16 * New UI (#228) * Allows choosing source in search settings * Adds rehatnamas in search sources * implements new UI * Adds plus minus button overlay and minor bug fixes * Update defaults.json * Fixes bugs in high priority list * Fixes height issue when keyboard is opened * Fixes the sync between settings * Uses constant keys for source id * Fixes issues in the PR 228 * Fixes minor bugs * WIP: Fixes clutters issue in new UI (#229) * Fixes clutter issues in new ui * Increases navigator width for mac * Shortens the search type label * Fixes z-index of footer * Fixes minimize icon in presenter view * Adds dropdown for search type; Adds minimize/maximize button in non presenter window * Adds minimize icon on all views * Fixes select dropdown and viewer size in presentation mode * Fixes issue #234: presenter view when casting in new UI not correct size (#237) * Fixes size of viewer window in presenter view (issue 234) * Fixes overflow on smaller screen in presenter-view * [235] Fixes Cast not showing next line for new UI (#238) * [246] Prevents multiple instances of secondary windows (#247) * [231] Allow Scripture filtering and quick swith between search types * Hide scripture filter if all is selected and no results. fix ang search default. * default only for all * Shows presenter-view without external display (#248) * Shows presenter-view without external display * fixes presenter-view switching while casting * Fixes anncouncement box style and scripture filter style * Show empty slide on obs * Show which scripture is selected * Show maximize when search panel is minimized * Update copyright in about STTM * Overlap text (#278) * changes how transitions function to prevent overlapping * lints properly * Adds display options tab (#243) * Adds display tab * adds options in the display tab * Maintains consistency with event listeners * Switches to dropdown instead of select for more tabs * Fixes cast menu in windows (#277) * Adds Debounce for shabad selection (#284) * Debounce search results click * Debounce hukamnamaButton and anandKarajButton * debounce on leading edge * remove console log * Update version and changelog (#287) * Update version and changelog * Update CHANGELOG.md * Update CHANGELOG.md
KhalisFoundation · Aug 27, 2018 · 31df747 · 31df747
1 parent aa35007
commit 31df747
Show file tree

Hide file tree

Showing 43 changed files with 1,281 additions and 492 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 ## SikhiToTheMax Desktop App
 
+### 4.1.0 - _180824_
+
+#### Improved
+  * **User Interface** - Wow! What is this beautiful new software that lets me present Gurbani and looks amazing? Actually, it's the same SikhiToTheMax, but Guru Sahib has done Kirpa on Sevadars to deliver a new version that is much more intuitive. It's the first step in a brand new experience that is coming. In this iteration, controls are closer to where you need them.
+  * **Search by Ang** - Searching by Ang or page number has its own dedicated field
+  * Bug Fixes
+  * Style Fixes
+
+#### Added
+  * **Scripture Filtering** - Narrow down your search to different scriptures
+  * **Single Screen Presenter View** - Get the benefits of presenter view without having to connect a second screen
+  * **Bani Overlay** - Overlay Editor now provides a way to adjust the background size and opacity and the text size. Gurbani can also be coloured separately from the other text
+
 ### 4.0.6 - _180718_
 #### Improved
  * **Search speed** - _First Letter Start (Gurmukhi)_ search has gotten a huge performance boost, nearing instant from the time you type a letter to when results are shown

diff --git a/app.js b/app.js
@@ -14,9 +14,27 @@ const io = require('socket.io')(http);
 
 expressApp.use(express.static(path.join(__dirname, 'www', 'obs')));
 
-http.listen(1397); // TODO: move to config file
-
 const { app, BrowserWindow, dialog, ipcMain } = electron;
+
+const op = require('openport');
+
+op.find(
+  {
+    // Re: http://www.sikhiwiki.org/index.php/Gurgadi
+    ports: [1397, 1469, 1539, 1552, 1574, 1581, 1606, 1644, 1661, 1665, 1675, 1708],
+    count: 1,
+  },
+  (err, port) => {
+    if (err) {
+      dialog.showErrorBox('Overlay Error', 'No free ports available. Close other applications and Reboot the machine');
+      app.exit(-1);
+      return;
+    }
+    global.overlayPort = port;
+    // console.log(`Overlay Port No ${port}`);
+    http.listen(port);
+  });
+
 const store = new Store({
   configName: 'user-preferences',
   defaults: defaultPrefs,
@@ -45,22 +63,28 @@ const viewerWindowPos = {};
 
 function openSecondaryWindow(windowName) {
   const window = secondaryWindows[windowName];
-  window.obj = new BrowserWindow({
-    width: 725,
-    height: 800,
-    show: false,
-  });
-  window.obj.webContents.on('did-finish-load', () => {
-    window.obj.show();
-  });
-  window.obj.loadURL(window.url);
+  const openWindow = BrowserWindow.getAllWindows().filter(item => item.getURL() === window.url);
 
-  window.obj.on('close', () => {
-    window.obj = false;
-    if (window.onClose) {
-      window.onClose();
-    }
-  });
+  if (openWindow.length > 0) {
+    openWindow[0].show();
+  } else {
+    window.obj = new BrowserWindow({
+      width: 725,
+      height: 800,
+      show: false,
+    });
+    window.obj.webContents.on('did-finish-load', () => {
+      window.obj.show();
+    });
+    window.obj.loadURL(window.url);
+
+    window.obj.on('close', () => {
+      window.obj = false;
+      if (window.onClose) {
+        window.onClose();
+      }
+    });
+  }
 }
 
 autoUpdater.logger = log;
@@ -101,7 +125,7 @@ autoUpdater.on('update-downloaded', () => {
     message: 'Update available.',
     detail: 'Update downloaded and ready to install',
     cancelId: 0,
-  }, (response) => {
+  }, response => {
     if (response === 1) {
       autoUpdater.quitAndInstall();
     }
@@ -126,7 +150,7 @@ function checkForExternalDisplay() {
   const electronScreen = electron.screen;
   const displays = electronScreen.getAllDisplays();
   let externalDisplay = null;
-  Object.keys(displays).forEach((i) => {
+  Object.keys(displays).forEach(i => {
     if (displays[i].bounds.x !== 0 || displays[i].bounds.y !== 0) {
       externalDisplay = displays[i];
     }
@@ -187,6 +211,7 @@ function createViewer(ipcData) {
       });
     });
   }
+  mainWindow.webContents.send('presenter-view');
 }
 
 app.on('ready', () => {
@@ -299,6 +324,25 @@ ipcMain.on('show-line', (event, arg) => {
   }
 });
 
+ipcMain.on('show-empty-slide', () => {
+  const overlayPrefs = store.get('obs');
+  const emptyLine = {
+    Line: {
+      Gurmukhi: '',
+      English: '',
+      PunjabiUni: '',
+      Transliteration: '',
+    },
+  };
+  const payload = Object.assign(emptyLine, overlayPrefs);
+
+  io.emit('show-line', payload);
+
+  if (overlayPrefs.live) {
+    createBroadcastFiles(emptyLine);
+  }
+});
+
 ipcMain.on('show-text', (event, arg) => {
   if (viewerWindow) {
     viewerWindow.webContents.send('show-text', arg);
@@ -331,6 +375,7 @@ ipcMain.on('update-settings', () => {
   if (viewerWindow) {
     viewerWindow.webContents.send('update-settings');
   }
+  mainWindow.webContents.send('sync-settings');
 });
 
 module.exports = {