Skip to content

Commit

Permalink
Windows build
Browse files Browse the repository at this point in the history
  • Loading branch information
playtomax-team committed Dec 19, 2018
1 parent 4c58610 commit 78195e7
Show file tree
Hide file tree
Showing 41 changed files with 2,125 additions and 47 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ node_modules/*
/index.js.map
/package-lock.json
/src/electron/package-lock.json
/src/electron/test
9 changes: 5 additions & 4 deletions dist/web/static/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -498,9 +498,9 @@ html, body {

.message-box-window {
width: 340px;
height: 200px;
height: 130px;
margin: auto;
margin-top: 86px;
margin-top: 180px;
font-size: 14px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
Expand All @@ -516,7 +516,7 @@ html, body {
}

.message-box-content {
height: 170px;
height: 100px;
overflow: auto;
}

Expand All @@ -526,7 +526,8 @@ html, body {
}

.message-box-buttons .btn {
margin-left: 8px;
margin-left: 12px;
min-width: 50px;
}

.processing-shader {
Expand Down
34 changes: 17 additions & 17 deletions dist/web/static/js/index.js

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions dist/web/static/localization/en.csv
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,21 @@ EXPORTER_ERROR;Export error: %s
CUSTOM_EXPORTER_ERROR;Template error: %s
FILE_EXT;File extension:
DOCUMENTATION;documentation
SAVE_CHANGES_CONFIRM;Save project changes?
MENU_FILE;File
MENU_FILE_PROJECT_NEW;New project
MENU_FILE_PROJECT_LOAD;Open project
MENU_FILE_PROJECT_LOAD_RECENT;Open recent
MENU_FILE_PROJECT_SAVE;Save project
MENU_FILE_PROJECT_SAVE_AS;Save project as...
MENU_FILE_PREFERENCES_SAVE;Save preferences
MENU_FILE_EXIT;Exit
MENU_ACTIONS;Actions
MENU_ACTIONS_ADD_IMAGES;Add images
MENU_ACTIONS_ADD_FOLDER;Add folder
MENU_ACTIONS_DELETE;Delete
MENU_ACTIONS_CLEAR;Clear
MENU_ACTIONS_EXPORT;Export
MENU_LANGUAGE;Language
MENU_HELP;Help
MENU_HELP_ABOUT;About
13 changes: 13 additions & 0 deletions dist/web/static/localization/ru.csv
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,21 @@ EXPORTER_ERROR;Ошибка при экспортировании: %s
CUSTOM_EXPORTER_ERROR;Ошибка в шаблоне: %s
FILE_EXT;Расширение файла:
DOCUMENTATION;документация
SAVE_CHANGES_CONFIRM;Сохранить изменения в проекте?
MENU_FILE;Файл
MENU_FILE_PROJECT_NEW;Новый проект
MENU_FILE_PROJECT_LOAD;Открыть проект
MENU_FILE_PROJECT_LOAD_RECENT;Открыть последний
MENU_FILE_PROJECT_SAVE;Сохранить проект
MENU_FILE_PROJECT_SAVE_AS;Сохранить проект как...
MENU_FILE_PREFERENCES_SAVE;Сохранить настройки
MENU_FILE_EXIT;Выход
MENU_ACTIONS;Действия
MENU_ACTIONS_ADD_IMAGES;Добавить изображения
MENU_ACTIONS_ADD_FOLDER;Добавить папку
MENU_ACTIONS_DELETE;Удалить
MENU_ACTIONS_CLEAR;Очистить
MENU_ACTIONS_EXPORT;Экспорт
MENU_LANGUAGE;Язык
MENU_HELP;Помощь
MENU_HELP_ABOUT;О программе
Binary file added dist/win/FreeTexturePacker.exe
Binary file not shown.
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "free-tex-packer",
"displayName": "Free texture packer",
"version": "0.3.8",
"version": "0.4.1",
"description": "Free online texture packer",
"url": "http://free-tex-packer.com/",
"main": "src/index.js",
Expand All @@ -13,7 +13,8 @@
"scripts": {
"start": "webpack-dev-server --host 0.0.0.0 --port 4000",
"start-electron": "webpack-dev-server --host 0.0.0.0 --port 4000 --platform electron",
"build-web": "webpack --build --platform web"
"build-web": "webpack --build --platform web",
"build-electron": "webpack --build --platform electron"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/client/platform/electron/FileSystem.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class FileSystem {
let path;

if(pathToLoad) {
path = pathToLoad;
path = FileSystem.fixPath(pathToLoad);
}
else {
path = dialog.showOpenDialog({
Expand Down
6 changes: 5 additions & 1 deletion src/electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let CURRENT_PROJECT = "";
let CURRENT_PROJECT_M0DIFIED = false;

function createWindow() {
let mainWindowState = windowStateKeeper({
let mainWindowState = windowStateKeeper({
defaultWidth: 1280,
defaultHeight: 800
});
Expand Down Expand Up @@ -58,6 +58,10 @@ function createWindow() {
CURRENT_PROJECT = "";
CURRENT_PROJECT_M0DIFIED = false;
updateWindowTitle();

if(argv.env !== 'development' && process.argv.length > 1) {
sendMessage({actionName: 'project-load', custom: process.argv[1]});
}
});

onProjectLoaded();
Expand Down
56 changes: 37 additions & 19 deletions src/electron/package.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,39 @@
{
"name": "desktop-free-tex-packer",
"version": "0.0.1",
"description": "Desktop free texture packer",
"main": "main.js",
"scripts": {
"start": "electron . --env development",
"start-prod": "electron ."
},
"keywords": [],
"author": "Alexander Norinchak",
"license": "ISC",
"devDependencies": {
"electron": "^3.0.7"
},
"dependencies": {
"electron-window-state": "^5.0.3",
"optimist": "^0.6.1",
"tinify": "^1.3.0"
}
"name": "desktop-free-tex-packer",
"version": "0.4.1",
"description": "Desktop free texture packer (beta)",
"main": "main.js",
"scripts": {
"start": "electron . --env development",
"start-prod": "electron .",
"build": "electron-builder && node ./postbuild.js"
},
"build": {
"appId": "com.free.tex.packer",
"productName": "Free texture packer",
"artifactName": "FreeTexturePacker.${ext}",
"win": {
"target": "nsis",
"icon": "./resources/icons/medium.png"
},
"directories": {
"output": "../../dist/${os}"
},
"fileAssociations": {
"ext": "ftpp",
"name": "Free texture packer project"
}
},
"keywords": [],
"author": "Alexander Norinchak",
"license": "ISC",
"devDependencies": {
"electron": "^3.0.7",
"electron-builder": "^20.38.4"
},
"dependencies": {
"electron-window-state": "^5.0.3",
"optimist": "^0.6.1",
"tinify": "^1.3.0"
}
}
30 changes: 30 additions & 0 deletions src/electron/postbuild.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
let fs = require("fs");

function deleteFile(path) {
try {fs.unlinkSync(path)}
catch(e) {}
}

function deleteFolder(path) {
try {
if (fs.existsSync(path)) {
fs.readdirSync(path).forEach(function (file) {
let curPath = path + "/" + file;

if (fs.lstatSync(curPath).isDirectory()) {
deleteFolder(curPath);
} else {
fs.unlinkSync(curPath);
}
});

fs.rmdirSync(path);
}
}
catch(e) {}
}

deleteFile("../../dist/builder-effective-config.yaml");
deleteFile("../../dist/win/FreeTexturePacker.exe.blockmap");
deleteFolder("../../dist/${os}");
deleteFolder("../../dist/win/win-unpacked");
Binary file added src/electron/resources/icons/medium.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 26 additions & 1 deletion src/electron/www/index.html
Original file line number Diff line number Diff line change
@@ -1 +1,26 @@
Desktop free texture packer
<!DOCTYPE html>
<html>

<head>

<title>Free texture packer - sprite sheets for games and sites</title>

<meta http-equiv="Content-Type" content="text/html, charset=utf-8" />
<meta name="description" content="Free texture packer creates sprite sheets for you game or site. Rotation, trimming, multipacking, various export formats (json, xml, css, pixi.js, phaser, cocos2d). Zip support." />
<meta name="keywords" content="texturepacker, texture, packer, pixi.js, phaser, cocos2d" />

<link rel="shortcut icon" href="static/images/favicon.ico" type="image/x-icon">
<link rel="icon" href="static/images/favicon.ico" type="image/x-icon">

<link rel="stylesheet" type="text/css" href="static/css/index.css"/>
<link rel="stylesheet" type="text/css" href="static/css/color-gray.css"/>

<script src="static/js/index.js"></script>

</head>

<body class="color-900">
<div id="root" class="main-container"></div>
</body>

</html>
48 changes: 48 additions & 0 deletions src/electron/www/static/css/color-gray.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.color-white {color: #ffffff;}
.color-black {color: #000000;}
.color-50 {color: #fafafa;}
.color-100 {color: #f5f5f5;}
.color-200 {color: #eeeeee;}
.color-300 {color: #e0e0e0;}
.color-400 {color: #bdbdbd;}
.color-500 {color: #9e9e9e;}
.color-600 {color: #757575;}
.color-700 {color: #616161;}
.color-800 {color: #424242;}
.color-900 {color: #212121;}
.color-a100 {color: #f5f5f5;}
.color-a200 {color: #eeeeee;}
.color-a400 {color: #bdbdbd;}
.color-a700 {color: #616161;}
.back-white {background-color: #ffffff;}
.back-black {background-color: #000000;}
.back-50 {background-color: #fafafa;}
.back-100 {background-color: #f5f5f5;}
.back-200 {background-color: #eeeeee;}
.back-300 {background-color: #e0e0e0;}
.back-400 {background-color: #bdbdbd;}
.back-500 {background-color: #9e9e9e;}
.back-600 {background-color: #757575;}
.back-700 {background-color: #616161;}
.back-800 {background-color: #424242;}
.back-900 {background-color: #212121;}
.back-a100 {background-color: #f5f5f5;}
.back-a200 {background-color: #eeeeee;}
.back-a400 {background-color: #bdbdbd;}
.back-a700 {background-color: #616161;}
.border-color-white {border-color: #ffffff;}
.border-color-black {border-color: #000000;}
.border-color-50 {border-color: #fafafa;}
.border-color-100 {border-color: #f5f5f5;}
.border-color-200 {border-color: #eeeeee;}
.border-color-300 {border-color: #e0e0e0;}
.border-color-400 {border-color: #bdbdbd;}
.border-color-500 {border-color: #9e9e9e;}
.border-color-600 {border-color: #757575;}
.border-color-700 {border-color: #616161;}
.border-color-800 {border-color: #424242;}
.border-color-900 {border-color: #212121;}
.border-color-a100 {border-color: #f5f5f5;}
.border-color-a200 {border-color: #eeeeee;}
.border-color-a400 {border-color: #bdbdbd;}
.border-color-a700 {border-color: #616161;}
48 changes: 48 additions & 0 deletions src/electron/www/static/css/color-teal.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
.color-white {color: #ffffff;}
.color-black {color: #000000;}
.color-50 {color: #e0f2f1;}
.color-100 {color: #b2dfdb;}
.color-200 {color: #80cbc4;}
.color-300 {color: #4db6ac;}
.color-400 {color: #26a69a;}
.color-500 {color: #009688;}
.color-600 {color: #00897b;}
.color-700 {color: #00796b;}
.color-800 {color: #00695c;}
.color-900 {color: #004d40;}
.color-a100 {color: #a7ffeb;}
.color-a200 {color: #64ffda;}
.color-a400 {color: #1de9b6;}
.color-a700 {color: #00bfa5;}
.back-white {background-color: #ffffff;}
.back-black {background-color: #000000;}
.back-50 {background-color: #e0f2f1;}
.back-100 {background-color: #b2dfdb;}
.back-200 {background-color: #80cbc4;}
.back-300 {background-color: #4db6ac;}
.back-400 {background-color: #26a69a;}
.back-500 {background-color: #009688;}
.back-600 {background-color: #00897b;}
.back-700 {background-color: #00796b;}
.back-800 {background-color: #00695c;}
.back-900 {background-color: #004d40;}
.back-a100 {background-color: #a7ffeb;}
.back-a200 {background-color: #64ffda;}
.back-a400 {background-color: #1de9b6;}
.back-a700 {background-color: #00bfa5;}
.border-color-white {border-color: #ffffff;}
.border-color-black {border-color: #000000;}
.border-color-50 {border-color: #e0f2f1;}
.border-color-100 {border-color: #b2dfdb;}
.border-color-200 {border-color: #80cbc4;}
.border-color-300 {border-color: #4db6ac;}
.border-color-400 {border-color: #26a69a;}
.border-color-500 {border-color: #009688;}
.border-color-600 {border-color: #00897b;}
.border-color-700 {border-color: #00796b;}
.border-color-800 {border-color: #00695c;}
.border-color-900 {border-color: #004d40;}
.border-color-a100 {border-color: #a7ffeb;}
.border-color-a200 {border-color: #64ffda;}
.border-color-a400 {border-color: #1de9b6;}
.border-color-a700 {border-color: #00bfa5;}
19 changes: 19 additions & 0 deletions src/electron/www/static/css/index-electron.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
html, body {
overflow: hidden;
}

.main-header {
display: none;
}

.main-layout {
clear: both;
height: -webkit-calc(100% - 20px);
height: -moz-calc(100% - 20px);
height: -o-calc(100% - 20px);
height: calc(100% - 20px);
box-sizing: border-box;
margin-bottom: 10px;
margin-left: auto;
margin-right: auto;
}
Loading

0 comments on commit 78195e7

Please sign in to comment.