Merge branch 'feature/show-menu-bar' of https://github.com/fearenales/nativefier into fearenales-feature/show-menu-bar

# Conflicts:
#	app/nativefier.json
#	app/src/main.js
#	src/buildApp.js

README.md

@@ -159,6 +159,14 @@ Width of the packaged application, defaults to `1280px`.
 
 Height of the packaged application, defaults to `800px`.
 
+#### [show-menu-bar]
+
+```
+-m, --show-menu-bar
+```
+
+Specifies if the menu bar should be shown.
+
 #### [user-agent]
 
 ```

app/nativefier.json

@@ -3,5 +3,6 @@
   "targetUrl": "http:\/\/www.google.com",
   "badge": false,
   "width": 1280,
-  "height": 800
+  "height": 800,
+  "showMenuBar": false,
 }

app/src/components/mainWindow/mainWindow.js

@@ -28,6 +28,7 @@ function createMainWindow(options, onAppQuit, setDockBadge) {
             height: mainWindowState.height,
             x: mainWindowState.x,
             y: mainWindowState.y,
+            'auto-hide-menu-bar': !options.showMenuBar,
             title: options.name,
             'web-preferences': {
                 javascript: true,

src/buildApp.js

@@ -31,7 +31,7 @@ function buildApp(options, callback) {
 
     async.waterfall([
         callback => {
-            copyPlaceholderApp(options.dir, tmpPath, options.name, options.targetUrl, options.counter, options.width, options.height, options.userAgent, callback);
+            copyPlaceholderApp(options.dir, tmpPath, options.name, options.targetUrl, options.counter, options.width, options.height, options.showMenuBar, options.userAgent, callback);
         },
 
         (tempDir, callback) => {
@@ -62,10 +62,11 @@ function buildApp(options, callback) {
  * @param {boolean} counter
  * @param {number} width
  * @param {number} height
+ * @param {boolean} showMenuBar
  * @param {string} userAgent
  * @param {tempDirCallback} callback
  */
-function copyPlaceholderApp(srcAppDir, tempDir, name, targetURL, counter, width, height, userAgent, callback) {
+function copyPlaceholderApp(srcAppDir, tempDir, name, targetURL, counter, width, height, showMenuBar, userAgent, callback) {
     const loadedPackageJson = packageJson;
     copy(srcAppDir, tempDir, function(error) {
         if (error) {
@@ -80,6 +81,7 @@ function copyPlaceholderApp(srcAppDir, tempDir, name, targetURL, counter, width,
             counter: counter,
             width: width,
             height: height,
+            showMenuBar: showMenuBar,
             userAgent: userAgent,
             nativefierVersion: loadedPackageJson.version
         };

src/cli.js

@@ -25,6 +25,7 @@ function main(program) {
                 program.counter,
                 program.width,
                 program.height,
+                program.showMenuBar,
                 program.userAgent,
                 program.honest,
                 callback);
@@ -38,7 +39,6 @@ function main(program) {
             console.error(error);
             return;
         }
-
         console.log(`App built to ${appPath}`);
     });
 }
@@ -61,6 +61,7 @@ if (require.main === module) {
         .option('-i, --icon <value>', 'the icon file to use as the icon for the app (should be a .icns file on OSX)')
         .option('-w, --width <value>', 'set window width, defaults to 1280px', parseInt)
         .option('-h, --height <value>', 'set window height, defaults to 800px', parseInt)
+        .option('-m, --show-menu-bar', 'set menu bar visible, defaults to false')
         .option('-u, --user-agent <value>', 'set the user agent string for the app')
         .option('--honest', 'prevent the nativefied app from changing the user agent string to masquerade as a regular chrome browser')
         .parse(process.argv);

src/options.js

@@ -22,6 +22,7 @@ function optionsFactory(name,
                         counter = false,
                         width = 1280,
                         height = 800,
+                        showMenuBar = false,
                         userAgent,
                         honest = false,
                         callback) {
@@ -60,6 +61,7 @@ function optionsFactory(name,
         counter: counter,
         width: width,
         height: height,
+        showMenuBar: showMenuBar,
         userAgent: userAgent
     };