re commit

.gitignore

@@ -19,3 +19,4 @@ d3dcompiler_47.dll
 credits.html
 build/Entry_1.0.0_Setup.exe
 build/엔트리_1.0.1_Setup.exe
+build/*.exe

bower.json

@@ -8,7 +8,5 @@
     "sound_lib"
   ],
   "dependencies": {
-    "entry-offline-editor-win32" : "https://github.com/entrylabs/entry-offline/releases/download/v1.0.0/Entry_1.0.0_Setup.exe",
-    "entry-offline-editor-osx64" : "https://github.com/entrylabs/entry-offline/releases/download/v1.0.0/Entry_1.0.0_64.dmg"
   }
 }

build/entry.nsi

@@ -28,7 +28,7 @@
 Name "엔트리"
 
 ; The file to write
-OutFile "Entry_1.0.6_Setup.exe"
+OutFile "Entry_1.0.7_Setup.exe"
 
 ; The default installation directory
 InstallDir "C:\Entry"

entry/controllers/filters.js

@@ -55,3 +55,27 @@ common.filter('text', function() {
         }
     }
 });
+
+
+common.filter('nameTranslate', function() {
+    return function(str, type) {
+        var dict = SpriteNames;
+        if (type == 'picture')
+            dict = PictureNames;
+        else if (type == 'sound')
+            dict = SoundNames;
+
+        var lang = localStorage.getItem('lang') || 'ko';
+        if (window.lang)
+            lang = window.lang;
+
+        if (window.user && window.user.language)
+            lang = window.user.language;
+
+        if (!dict || lang == 'ko' || lang == 'code') {
+            return str;
+        } else {
+            return dict[str] ? dict[str] : str;
+        }
+    }
+});

entry/controllers/native_controll.js

@@ -26,7 +26,7 @@ if(options.debug) {
 var _real_path = '.';
 var _real_path_with_protocol = '';
 
-console.log = function () {};
+// console.log = function () {};
 console.fslog = function (text) {
     // var data = fs.readFileSync(_real_path + '/debug.log', 'utf8');
     // data += '\n\r' + new Date() + ' : ' + text;

entry/controllers/picture.js

@@ -9,6 +9,7 @@ angular.module('common').controller('PictureController',
 	    $scope.menu = "";
 
 	    $scope.searchWord = '';
+	    $scope.language = localStorage.getItem('lang') || 'ko';
 
 	    // 현재 선택한 탭
 	    $scope.currentTab = 'system'; //for modal(sprite,upload,paint,character,text,etc)
@@ -113,11 +114,32 @@ angular.module('common').controller('PictureController',
 	    };
 
 	    var filterPictureData = function (keyword, cb) {
-	    	var filtered_data = $scope.orgPictureData.filter(function (item) {
-	    		return Object.keys(keyword).every(function (key) {
-	    			return item[key].indexOf(keyword[key]) >= 0;
+	    	var filtered_data = [];
+	    	if($scope.language === 'ko') {
+		    	filtered_data = $scope.orgPictureData.filter(function (item) {
+		    		return Object.keys(keyword).every(function (key) {
+		    			return item[key].indexOf(keyword[key]) >= 0;
+		    		});
+		    	});
+	    	} else {
+	    		var engData = [];
+	    		Object.keys(PictureNames).forEach(function (key) {
+	    			Object.keys(keyword).forEach(function (key2) {
+		    			if(PictureNames[key].indexOf(keyword[key2]) >= 0) {
+		    				engData.push(key);
+		    			}
+
+		    		});
 	    		});
-	    	});
+
+	    		$scope.orgPictureData.forEach(function (item) {
+		    		engData.forEach(function (key) {
+		    			if(item.name === key) {
+		    				filtered_data.push(item);
+			    		}
+		    		});
+		    	});
+	    	}
 
 	    	if($.isFunction(cb)) {
 	    		cb(filtered_data);
@@ -143,6 +165,7 @@ angular.module('common').controller('PictureController',
                             break;
                         }
                     }
+
                     $scope.systemPictures.push(picture);
                 }
                 $scope.collapse(0);

entry/controllers/workspace.js

@@ -80,12 +80,12 @@ angular.module('workspace').controller("WorkspaceController",
 		$scope.setOfflineHW = function() {
 			$('#entryCategoryarduino').mouseup(function() {
 					Entry.HW.prototype.downloadConnector = function() {
-						$('#saveArduinoPlugin').attr('nwsaveas', 'Entry_HW_v1.1.3.exe').trigger('click');
+						$('#saveArduinoPlugin').attr('nwsaveas', 'Entry_HW_v1.1.4.exe').trigger('click');
 						$("#saveArduinoPlugin").on("change", function () {
 							var filePath = $('#saveArduinoPlugin').val();
 							if (filePath !== "") {
 								var fs = require("fs");
-									fs.readFile("./hardware/plugin/Entry_HW_v1.1.3.exe", function (err, stream) {
+									fs.readFile("./hardware/plugin/Entry_HW_v1.1.4.exe", function (err, stream) {
 										fs.writeFile(filePath, stream, 'utf8', function (err) {
 											if (err)
 												alert("Unable to save file");

entry/entry_offline.html

@@ -5,14 +5,19 @@
 		<title>
 			엔트리
 		</title>
+
+		<!--
 		<link rel='stylesheet'  href='./bower_components/entryjs/dist/entry.css' />
-		<link rel='stylesheet'  href='./bower_components/bootstrap/dist/css/bootstrap.min.css' />
 		<link rel='stylesheet'  href='./css/nanumbarungothic.css' />
 		<link rel='stylesheet'  href='./css/header.css' />
 		<link rel='stylesheet'  href='./css/workspace_header.css' />
 		<link rel='stylesheet'  href='./css/workspace.css' />
 		<link rel='stylesheet'  href='./css/modal.css' />
+		<link rel='stylesheet'  href='./bower_components/bootstrap/dist/css/bootstrap.css' />
+	-->
 		<link rel='stylesheet'  href='./css/developer.css' />
+		<script type="text/javascript" src="./controllers/main.js"></script>
+		<script type="text/javascript" src="./controllers/ws.js"></script>
 		<script type='text/javascript' src='./bower_components/jquery/dist/jquery.min.js'></script>
 		<script type='text/javascript' src='./bower_components/jquery-ui/jquery-ui.min.js'></script>
 		<script type='text/javascript' src='./bower_components/angular/angular.min.js'></script>
@@ -30,16 +35,19 @@
 		<script type='text/javascript' src='./bower_components/SoundJS/lib/soundjs-0.6.0.combined.js'></script>
 		<script type='text/javascript' src='./bower_components/SoundJS/lib/flashaudioplugin-0.6.0.combined.js'></script>
 		<script type='text/javascript' src='./bower_components/webfontloader/webfontloader.js'></script>
+        <script type='text/javascript' src='./controllers/app.js'></script>
 		<script type='text/javascript' src='./bower_components/entryjs/extern/blockly/blockly_compressed.js'></script>
 		<script type='text/javascript' src='./bower_components/entryjs/extern/util/static.js'></script>
 		<script type='text/javascript' src='./bower_components/entryjs/extern/util/CanvasInput.js'></script>
 		<script type='text/javascript' src='./bower_components/entryjs/extern/util/handle.js'></script>
 		<script type='text/javascript' src='./bower_components/entryjs/extern/util/ndgmr.Collision.js'></script>
 		<script type='text/javascript' src='./bower_components/entryjs/dist/entry.js'></script>
 
-        <script type='text/javascript' src='./controllers/app.js'></script>
     	<script type='text/javascript' src='./controllers/context.js'></script>
         <script type="text/javascript" src="./controllers/filters.js"></script>
+        <script type="text/javascript" src="./lang/pictures.js"></script>
+        <script type="text/javascript" src="./lang/sounds.js"></script>
+        <script type="text/javascript" src="./lang/sprites.js"></script>
         <script type="text/javascript" src="./controllers/native_menu.js"></script>
         <script type="text/javascript" src="./controllers/native_controll.js"></script>
 		<script type="text/javascript" src="./controllers/directives.js"></script>