Merge pull request #73 from openframeworks/openInIDE

open in IDE

Author: ofZach

projectGeneratorElectron/app.js

@@ -294,6 +294,10 @@ ipc.on('selectAddons', function(arg) {
 //-------------------------------------------
 // allow main to send UI messages
 ipc.on('sendUIMessage', function(arg) {
+
+    // check if it has "success" message: 
+
+
     displayModal(arg);
 });
 
@@ -481,6 +485,11 @@ function setup() {
             }
         });
 
+         $("#IDEButton").on("click", function() {  
+            launchInIDE();
+         });
+
+
          $("#verboseOption").checkbox();
          $("#verboseOption").on("change", function() {
             if ($("#verboseOption").filter(":checked").length > 0) {
@@ -849,6 +858,13 @@ function displayModal(message) {
 		var shell = require('shell');
 		shell.openExternal( $(this).prop("href") );
     });
+
+    if (message.indexOf("Success!") > -1){
+        $("#IDEButton").show();
+    } else {
+        $("#IDEButton").hide();
+    }
+
     $("#uiModal").modal('show');
 }
 
@@ -914,3 +930,15 @@ function getRandomSketchName(){
         ipc.send('getRandomSketchName', path );
     }
 }
+
+function launchInIDE(){
+
+    var project = {};
+    project['projectName'] = $("#projectName").val();
+    project['projectPath'] = $("#projectPath").val();
+    project['platform'] = defaultSettings['defaultPlatform']; // ignores OS selection
+    project['ofPath'] = $("#ofPath").val();
+
+    ipc.send('launchProjectinIDE', project );
+}
+

projectGeneratorElectron/index.html

@@ -67,8 +67,7 @@
 			font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
 			font-size: 9px;
 			white-space: pre;
- 			word-wrap: normal;
-  			overflow-x: scroll;
+ 			word-wrap: break-word;
 		}
 
 		</style>
@@ -301,6 +300,7 @@
 				<p>Sorry, I've got nothing to say...</p>
 			</div>
 			<div class="actions">
+				<div class="ui cancel button" id="IDEButton" style="display: none;">Open in IDE</div>
 				<div class="ui cancel button">Close</div>
 			</div>
 		</div>

projectGeneratorElectron/index.js

@@ -92,8 +92,8 @@ var platforms = {
     "osx": "OS X (Xcode)",
     "vs": "Windows (Visual Studio 2015)",
     "ios": "iOS (Xcode)",
-    "linux": "Linux 32-bit (Code::Blocks)",
-    "linux64": "Linux 64-bit (Code::Blocks)",
+    "linux": "Linux 32-bit (qtCreator)",
+    "linux64": "Linux 64-bit (qtCreator)",
     "linuxarmv6l": "Linux ARMv6 (Makefiles)",
     "linuxarmv7l": "Linux ARMv7 (Makefiles)"
 };
@@ -301,9 +301,13 @@ function parseAddonsAndUpdateSelect(arg) {
     //path = require('path').resolve(__dirname, defaultOfPath + "/addons");
     addons = getDirectories(arg + "/addons","ofx");
 
-    addons = addons.filter( function(addon) {
-        return addonsToSkip.indexOf(addon)==-1;
-    });
+    if (addons){
+    if (addons.length > 0){
+        addons = addons.filter( function(addon) {
+            return addonsToSkip.indexOf(addon)==-1;
+        });
+    }
+    }
 
     console.log("Reloading the addons folder, these were found:");
     console.log(addons);
@@ -571,15 +575,17 @@ ipc.on('update', function(event, arg) {
                 '<strong>Success!</strong><br>' +
                 'Updating your project was successful! <a href="file:///' + update['updatePath'] + '" class="monospace" data-toggle="external_target">' + update['updatePath'] + '</a><br><br>' +
                 '<button class="btn btn-default console-feature" onclick="$(\'#fullConsoleOutput\').toggle();">Show full log</button><br>' +
-                '<div id="fullConsoleOutput"><br><textarea class="selectable">' + stdout + '</textarea></div>'
+                '<div id="fullConsoleOutput"><br><textarea class="selectable">' + stdout + '\n\n\n(command used:' + wholeString + ')\n\n\n</textarea></div>'
             );
+
+            //
             event.sender.send('updateCompleted', true);
         } else {
             event.sender.send('consoleMessage', "<strong>" + wholeString + "</strong><br>" + error.message);
             event.sender.send('sendUIMessage',
                 '<strong>Error...</strong><br>' +
                 'There was a problem updating your project... <span class="monospace">' + update['updatePath'] + '</span>' +
-                '<div id="fullConsoleOutput" class="not-hidden"><br><textarea class="selectable">' + error.message + '</textarea></div>'
+                '<div id="fullConsoleOutput" class="not-hidden"><br><textarea class="selectable">' + error.message + '\n\n\n(command used:' + wholeString + ')\n\n\n</textarea></div>'
             );
         }
     });
@@ -665,7 +671,7 @@ ipc.on('generate', function(event, arg) {
             event.sender.send('sendUIMessage',
                 '<strong>Success!</strong><br>' +
                 'Your can now find your project in <a href="file:///' + fullPath + '" data-toggle="external_target" class="monospace">' + fullPath + '</a><br><br>' +
-                '<div id="fullConsoleOutput" class="not-hidden"><br><textarea class="selectable">' + stdout + '</textarea></div>'
+                '<div id="fullConsoleOutput" class="not-hidden"><br><textarea class="selectable">' + stdout + '\n\n\n(command used: ' + wholeString + ')\n\n\n</textarea></div>'
             );
             event.sender.send('generateCompleted', true);
         } else if (error !== null) {
@@ -684,7 +690,7 @@ ipc.on('generate', function(event, arg) {
                 '<strong>Error!</strong><br>' +
                 '<strong>Error...</strong><br>' +
                 'There was a problem generating your project... <span class="monospace">' + fullPath + '</span>' +
-                '<div id="fullConsoleOutput" class="not-hidden"><br><textarea class="selectable">' + stdout + '</textarea></div>'
+                '<div id="fullConsoleOutput" class="not-hidden"><br><textarea class="selectable">' + stdout + '\n\n\n(command used: ' + wholeString + ')\n\n\n</textarea></div>'
 
             );
 
@@ -770,6 +776,54 @@ ipc.on('pickProjectImport', function(event, arg) {
     });
 });
 
+
+ipc.on('launchProjectinIDE', function(event, arg) {
+    
+    if( arg.platform != obj.defaultPlatform ){
+        event.sender.send('projectLaunchCompleted', false);
+        return;
+    }
+
+    var pathTemp = require('path');
+    var fsTemp = require('fs');
+    var fullPath = pathTemp.join(arg['projectPath'], arg['projectName']);
+
+    if( fsTemp.statSync(fullPath).isDirectory() == false ){
+        // project doesn't exist
+        event.sender.send('projectLaunchCompleted', false );
+        return;
+    }
+
+    // // launch xcode
+    if( arg.platform == 'osx' ){
+        var osxPath = pathTemp.join(fullPath, arg['projectName'] + '.xcodeproj');
+        console.log( osxPath );
+        if( fsTemp.statSync(osxPath).isDirectory() == true ){ // note: .xcodeproj is a folder, not a file
+                var exec = require('child_process').exec;
+                exec('open ' + osxPath, function callback(error, stdout, stderr){
+                    return;
+                });
+        }
+        else {
+            console.log('OSX project file not found!');
+        }
+    } else if( arg.platform == 'linux' || arg.platform == 'linux64' ){
+        var linuxPath = pathTemp.join(fullPath, arg['projectName'] + '.qbs');
+        console.log( linuxPath );
+        var exec = require('child_process').exec;
+        exec('xdg-open ' + linuxPath, function callback(error, stdout, stderr){
+            return;
+        });
+    } else {    
+        var windowsPath = pathTemp.join(fullPath, arg['projectName'] + '.sln');
+        console.log( windowsPath );
+        var exec = require('child_process').exec;
+        exec('start ' + windowsPath, function callback(error, stdout, stderr){
+            return;
+        });
+    }
+});
+
 ipc.on('quit', function(event, arg) {
     app.quit();
 });