diff --git a/css/style.css b/css/style.css index 17dccec..9e3d298 100644 --- a/css/style.css +++ b/css/style.css @@ -20,6 +20,10 @@ html, body { border: 1px solid #ddd; } +.full-width { + width: 100%; +} + /* Launcher View */ .launcher { @@ -147,6 +151,10 @@ html, body { flex-direction: column; } +.edit .title { + margin-top: 5px; +} + .edit .menu-bar { padding: 5px 10px; display: flex; @@ -158,23 +166,32 @@ html, body { } .edit .left { - flex: 2; + flex: 1; + display: flex; } .edit .main { flex: 3; + display: flex; } .edit .right { flex: 1; + display: flex; } .edit .workspace { display: flex; flex-direction: row; padding: 10px; + flex: 1; } +.edit .workspace .main { + flex-direction: column; +} + + .edit .left-menu { display: flex; flex-direction: column; @@ -187,6 +204,10 @@ html, body { flex-direction: column; } +.edit .workspace .right { + flex-direction: column; +} + .edit .item-form { display: flex; flex-direction: row; @@ -197,6 +218,11 @@ html, body { width: 100%; } +.edit .apps-list { + overflow: auto; + margin-top: 5px; +} + .edit .apps-list .icon-theme-selector > select { width: 100%; } @@ -205,21 +231,25 @@ html, body { list-style: none; padding: 0; height: 100%; - margin: 10px 0 0 0; - overflow-y: auto; display: block; + margin-right: 5px; } .edit .desktop-app > .app-icon { - height: 35px; - width: 35px; + height: 20px; + width: auto; display: inline-block; vertical-align: middle; margin-right: 10px; } +.edit .desktop-app.list-group-item { + padding: 5px 10px; +} + .edit .profile-tree { padding: 0 5px; + width: 100%; } .edit .profile-tree ul { diff --git a/default-profile.json b/default-profile.json index f9779d0..4bf6228 100644 --- a/default-profile.json +++ b/default-profile.json @@ -19,7 +19,7 @@ "_key": "item_1444480285022_2" }, { - "label": "Level 2-2", + "label": "Level 2-3", "icon": "chromium-browser", "items": [ { @@ -36,7 +36,15 @@ "label": "Atom", "icon": "atom", "exec": "/usr/share/atom/atom %U", - "_key": "item_1444480288996_7" + "_key": "item_1444480288996_7", + "items": [] + }, + { + "label": "Firefox Developer Edition Web Browser", + "icon": "firefox", + "exec": "firefox %u", + "_key": "item_1444761351301_2", + "selected": true } ], "_key": "item_1444480285022_5" @@ -49,4 +57,4 @@ } ], "_key": "item_1444480285021_0" -} +} \ No newline at end of file diff --git a/js/components/edit/edit-view.js b/js/components/edit/edit-view.js index e252aa3..c8a7074 100644 --- a/js/components/edit/edit-view.js +++ b/js/components/edit/edit-view.js @@ -26,14 +26,18 @@ var EditView = React.createClass({
- +
+ +
+ Thème + Applications
+ Arbre de profil
+ Édition
diff --git a/js/components/edit/item-form.js b/js/components/edit/item-form.js index 58933a9..874b38e 100644 --- a/js/components/edit/item-form.js +++ b/js/components/edit/item-form.js @@ -17,7 +17,8 @@ var ItemForm = React.createClass({ this.setState({ label: props.item.label, icon: props.item.icon, - exec: props.item.exec + exec: props.item.exec, + background: props.item.background }); } @@ -31,25 +32,27 @@ var ItemForm = React.createClass({
-
-
-
+
+ +
); diff --git a/js/util/promises.js b/js/util/promises.js index f7ddfda..07ded5c 100644 --- a/js/util/promises.js +++ b/js/util/promises.js @@ -6,7 +6,7 @@ exports.seq = function(items, generator) { var p = Promise.resolve(); for(var i = 0, len = items.length; i < len; ++i) { - p = p.then(generateNextHandler(items[i], i === 0)); + p = p.then(generateNextHandler(items[i], i === 0)) } return p.then(function(lastResult) { @@ -23,3 +23,9 @@ exports.seq = function(items, generator) { } }; + +exports.delay = function(delay) { + return new Promise(function(resolve) { + setTimeout(resolve, delay); + }); +}; diff --git a/main.js b/main.js index edd65bb..0e16d00 100644 --- a/main.js +++ b/main.js @@ -1,5 +1,6 @@ var app = require('app'); // Module to control application life. var BrowserWindow = require('browser-window'); // Module to create native browser window. +var Menu = require('menu'); var isDev = process.env.NODE_ENV === 'development'; var constants = require('./'+(isDev ? 'js': 'js-compiled')+'/util/const'); @@ -23,6 +24,7 @@ app.on('ready', function() { frame: !asDesktop, width: asDesktop ? size.width : undefined, height: asDesktop ? size.height : undefined, + 'auto-hide-menu-bar': true, x: asDesktop ? 0 : undefined, y: asDesktop ? 0 : undefined, });