Skip to content

Commit 3f09c5b

Browse files
committed
Version 0.3 released
1 parent 0793cbb commit 3f09c5b

31 files changed

+597
-478
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
*~
22
*.swp
3+
*.pyc
4+
35
node_modules/
46
src/js/ext/
57
bower_components/
6-
server/venv
8+
venv
79
images/ext
810

911

README.md

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ You can install/uninstall/update all add-on's released on GitHub with this appli
88

99
## Download URL
1010

11-
|Version|URL|
11+
|Version|Download URL|
1212
|---|---|
13-
|0.1|Download|
13+
|0.3|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v0.3)|
14+
|0.2|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v0.2)|
15+
|0.1|[Download](https://github.com/nutti/Blender-Add-on-Manager/releases/tag/v0.1)|
1416

1517

1618
## Support Languages
@@ -39,14 +41,16 @@ See [Wiki Page](https://github.com/nutti/Blender-Add-on-Manager-for-GitHub/wiki/
3941
Project "Blender Add-on Manager" is on going.
4042
See the link below for further details.
4143

42-
* [Blender Artist Thread]()
44+
* [Blender Artist Thread](https://blenderartists.org/forum/showthread.php?418833-Blender-Add-on-Manager-(About-2-000-add-ons-are-available))
4345

4446

4547
## Change Log
4648

47-
|Version|URL|
48-
|---|---|
49-
|0.1|First release for testing|
49+
|Version|Release Date|Change Log|
50+
|---|---|---|
51+
|0.3|2017.4.11|[1] Move config/DB file to user directory<br>[2] Improve server's stability<br>[3] Error popup<br>[4] Fix bug<br> - Failed to run application developed by unidentified developer on macOS<br> - Failed to load add-on at Blender installed by this application|
52+
|0.2|2017.4.2|[1] Support macOS<br>[2] Add features<br> - Link button to Add-on repository<br> - Case-insensitive search<br>[3]Fix bug<br> - Failed to install when ```__init__.py``` is located on the top directory|
53+
|0.1|2017.3.25|First release for testing|
5054

5155

5256
## Bug Report / Feature Request
@@ -61,6 +65,36 @@ https://github.com/nutti/Blender-Add-on-Manager-for-GitHub/issues
6165
If you want to contribute this project, please send pull request to **develop** branch.
6266
DO NOT send pull request to **master** branch.
6367

68+
https://github.com/nutti/Blender-Add-on-Manager/tree/develop
69+
70+
To build and run application for testing.
71+
72+
```sh
73+
$ git clone https://github.com/nutti/Blender-Add-on-Manager.git
74+
$ cd Blender-Add-on-Manager
75+
$ npm install
76+
$ bower install
77+
$ gulp
78+
$ gulp start
79+
```
80+
81+
To build application for relase.
82+
83+
```sh
84+
$ git clone https://github.com/nutti/Blender-Add-on-Manager.git
85+
$ cd Blender-Add-on-Manager
86+
$ npm install
87+
$ bower install
88+
$ gulp
89+
90+
$ npm run build # for Windows/linux
91+
92+
or
93+
94+
$ node build_mac.js # for macOS
95+
```
96+
97+
6498
## License
6599

66100
MIT License.

build.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
const packager = require('electron-packager');
2-
const fs = require('fs');
3-
const fsext = require('fs-extra');
42
const package = require('./package.json');
53

64
packager({
@@ -28,7 +26,5 @@ packager({
2826
for (var i = 0; i < appPaths.length; ++i) {
2927
var path = appPaths[i];
3028
console.log("Build is done. (path=" + path + ")");
31-
fs.mkdirSync(path + '/config');
32-
fsext.copySync('./config/config.json', path + '/config/config.json');
3329
}
3430
});

build_mac.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
const packager = require('electron-packager');
2-
const fs = require('fs');
3-
const fsext = require('fs-extra');
42
const package = require('./package.json');
53

64
packager({
@@ -15,6 +13,7 @@ packager({
1513
asar: true,
1614
prune: true,
1715
ignore: "node_modules/electron-connect",
16+
"sign": "Developer ID Application: COLORFUL PICO",
1817
"appVersion": package['version'],
1918
"version-string": {
2019
companyName: "colorful-pico.net",
@@ -28,7 +27,5 @@ packager({
2827
for (var i = 0; i < appPaths.length; ++i) {
2928
var path = appPaths[i];
3029
console.log("Build is done. (path=" + path + ")");
31-
fs.mkdirSync(path + '/config');
32-
fsext.copySync('./config/config.json', path + '/config/config.json');
3330
}
3431
});

main.js

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22

33
var fs = require('fs');
44
var electron = require('electron');
5-
const path = require('path');
65

76
var app = electron.app;
87
var BrowserWindow = electron.BrowserWindow;
98
var crashReporter = electron.crashReporter;
109

1110
var mainWindow = null;
12-
var config = null;
13-
14-
var CONFIG_FILE_PATH = path.join(__dirname, "config.json");
1511

1612
const DEBUG = false;
1713

@@ -22,33 +18,13 @@ crashReporter.start({
2218
autoSubmit: false
2319
});
2420

25-
function isExistFile(file) {
26-
try {
27-
fs.statSync(file);
28-
return true;
29-
}
30-
catch (err) {
31-
return false; // 'ENOENT'
32-
}
33-
}
34-
3521

3622
app.on('window-all-closed', function() {
3723
if (process.platform != 'darwin') {
3824
app.quit();
3925
}
4026
});
4127

42-
app.on('login', function(event, webContents, request, authInfo, callback) {
43-
event.preventDefault();
44-
45-
if (config == undefined) { return; }
46-
if (config.proxy == undefined) { return; }
47-
if (config.proxy.username == undefined || config.proxy.password == undefined) { return; }
48-
49-
callback(config.proxy.username, config.proxy.password);
50-
});
51-
5228
app.on('ready', function() {
5329
mainWindow = new BrowserWindow({
5430
width: 1024,
@@ -60,12 +36,6 @@ app.on('ready', function() {
6036

6137
if (DEBUG) { mainWindow.openDevTools(); }
6238

63-
// read configuration file
64-
if (!isExistFile(CONFIG_FILE_PATH)) { throw new Error(CONFIG_FILE_PATH + "is not exist"); }
65-
var text = fs.readFileSync(CONFIG_FILE_PATH, 'utf8');
66-
config = JSON.parse(text);
67-
68-
//mainWindow.loadURL('file://' + __dirname + '/src/html/index.html');
6939
mainWindow.loadURL('file://' + __dirname + '/html/index.html');
7040
mainWindow.show();
7141

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Blender_Add-on_Manager",
3-
"version": "0.2.0",
3+
"version": "0.3.0",
44
"description": "Blender Add-on Manager",
55
"main": "main.js",
66
"scripts": {

requirements.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
aniso8601==1.2.0
2+
appdirs==1.4.3
23
click==6.6
34
Flask==0.11.1
45
Flask-RESTful==0.3.5
6+
gunicorn==19.7.1
57
itsdangerous==0.24
68
Jinja2==2.8
79
MarkupSafe==0.23
10+
packaging==16.8
811
pymongo==3.4.0
12+
pyparsing==2.2.0
913
python-dateutil==2.6.0
1014
pytz==2016.7
1115
six==1.10.0
1216
Werkzeug==0.11.11
13-
wheel==0.26.0

src/client/html/index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
</script>
1818
<link rel="stylesheet" href="../css/main.css">
1919
<script type="text/javascript" src="../js/app.js"></script>
20+
<script type="text/javascript" src="../js/db.js"></script>
21+
<script type="text/javascript" src="../js/ui.js"></script>
22+
<script type="text/javascript" src="../js/error.js"></script>
23+
<script type="text/javascript" src="../js/addon.js"></script>
24+
<script type="text/javascript" src="../js/task.js"></script>
2025
</head>
2126
<body class="app-body">
2227
<div ng-controller="MainController as main" class="frame">
Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
<div id="error-popup" class="error-popup">
22
<div class="error-popup-header">
3-
<button type="button" class="close" ng-click="$dismiss()" aria-hidden="true">x</button>
4-
<h3>Error!!</h3>
3+
<h3>{{ errTitle }}</h3>
4+
<h4>{{ errMsg }}</h4>
55
</div>
66
<div class="error-popup-body">
7-
Error body
7+
{{ errCallTrace }}
88
</div>
99
<div class="error-popup-footer">
10-
<button class="btn btn-danger" ng-click="$close()">Close</button>
10+
<div class="close-button-wrapper">
11+
<div class="text-button-wrapper">
12+
<div class="remove text-button" ng-click="closeErrorPopup();">
13+
Close
14+
</div>
15+
</div>
16+
</div>
1117
</div>
1218
</div>
19+
<div id="error-popup-background" class="error-popup-background"></div>

src/client/js/addon.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
'use strict';

0 commit comments

Comments
 (0)