Merge pull request #2 from jonathanschneider/dev

Bug fix
jonathanschneider · Apr 10, 2021 · 4682fb6 · 4682fb6
2 parents da63031 + e2fb549
commit 4682fb6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/lib/editPro7.js b/lib/editPro7.js
@@ -45,14 +45,20 @@ async function fillNotesSub(presentation) {
       // Filter slides with text
       if (action.type === 'ACTION_TYPE_PRESENTATION_SLIDE' && action.slide.presentation.baseSlide.elements !== undefined) {
 
-        // Get text from RTF
-        let text = await getText(action.slide.presentation.baseSlide.elements[0].element.text.rtfData);
-
-        // Reassemble RTF for notes
-        let buffer = Buffer.from(notesStyle + text + '}'); // Encode base64
-        action.slide.presentation.notes = {
-          'rtfData': buffer.toString('base64')
-        };
+        if (process.platform === 'darwin') { // If platform is macOS extract text from RTF and copy to slide notes with pre-defined formatting
+          // Get text from RTF
+          let text = await getText(action.slide.presentation.baseSlide.elements[0].element.text.rtfData);
+
+          // Reassemble RTF for notes
+          let buffer = Buffer.from(notesStyle + text + '}'); // Encode base64
+          action.slide.presentation.notes = {
+            'rtfData': buffer.toString('base64')
+          };
+        } else { // If platform is Windows simply copy text with formatting to slide notes
+          action.slide.presentation.notes = {
+            'rtfData': action.slide.presentation.baseSlide.elements[0].element.text.rtfData
+          };
+        }
       }
     }
   }
@@ -68,7 +74,10 @@ async function mergeLanguages(paths) {
 
   // cues Array does not represent order of slides; order of slides is defined in cueGroups Array
   // Create lists of cue identifiers from cueGroups Array with index of cue in cues Array
-  let cueIds = [[], []];
+  let cueIds = [
+    [],
+    []
+  ];
   presentations.forEach((presentation, i) => {
     presentation.cueGroups.forEach(cueGroup => {
       cueGroup.cueIdentifiers.forEach(id => {

diff --git a/main.js b/main.js
@@ -20,7 +20,11 @@ function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({
     width: 700,
-    height: 550,
+    height: 507,
+    useContentSize: true,
+    minWidth: 700,
+    minHeight: 507,
+    autoHideMenuBar: true
   });
 
   // and load the index.html of the app.
@@ -57,7 +61,7 @@ ipcMain.on('open-file-dialog', (event, selection) => {
 });
 
 // Show error messages
-ipcMain.on('open-error-dialog', (event, error) => {  
+ipcMain.on('open-error-dialog', (event, error) => {
   console.error('Error:', error); // Log for developing purposes
   dialog.showErrorBox('Oops! Something went wrong!', error);
 });

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "ProPresenter-Suite",
   "productName": "ProPresenter Suite",
   "description": "Functions to manipulate ProPresenter 6/7 files",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": "main.js",
   "scripts": {
     "start": "electron .",