mirror of
https://github.com/overte-org/overte.git
synced 2025-04-20 13:03:55 +02:00
Merge pull request #64 from birarda/console-dev
switch to a tray only console for MVP
This commit is contained in:
Stephen Birarda
commit
6ae4fc55a7
26 changed files with 211 additions and 904 deletions
|
|
@ -10,7 +10,7 @@
|
|||
"devDependencies": {
|
||||
"electron-compilers": "^1.0.1",
|
||||
"electron-packager": "^5.1.1",
|
||||
"electron-prebuilt": "0.36.0"
|
||||
"electron-prebuilt": "0.35.4"
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
@ -20,12 +20,11 @@
|
|||
"scripts": {
|
||||
"start": "electron . --local-debug-builds --debug",
|
||||
"local-release": "electron . --local-release-builds --debug",
|
||||
"package-darwin": "electron-packager . High\\ Fidelity --overwrite --platform=darwin --arch=x64 --version=0.36.0 --icon=resources/console.icns",
|
||||
"package-win": "electron-packager . High\\ Fidelity --overwrite --platform=win32 --arch=x64 --version=0.36.0 --icon=resources/console.ico",
|
||||
"package-linux": "electron-packager . High\\ Fidelity --overwrite --platform=linux --arch=x64 --version=0.36.0"
|
||||
"package-darwin": "electron-packager . High\\ Fidelity --overwrite --platform=darwin --arch=x64 --version=0.35.4 --icon=resources/console.icns",
|
||||
"package-win": "electron-packager . High\\ Fidelity --overwrite --platform=win32 --arch=x64 --version=0.35.4 --icon=resources/console.ico",
|
||||
"package-linux": "electron-packager . High\\ Fidelity --overwrite --platform=linux --arch=x64 --version=0.35.4"
|
||||
},
|
||||
"dependencies": {
|
||||
"electron-compile": "^1.0.2",
|
||||
"extend": "^3.0.0",
|
||||
"yargs": "^3.30.0"
|
||||
}
|
||||
|
|
|
|||
BIN
console/resources/console-tray-Template.png
Normal file
BIN
console/resources/console-tray-Template.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
BIN
console/resources/console-tray-Template@2x.png
Normal file
BIN
console/resources/console-tray-Template@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.7 KiB |
|
|
@ -1,288 +0,0 @@
|
|||
@light-gray: #949494;
|
||||
|
||||
// the following block avoids (only with two things in body) the bounce effect on OS X when scrolling
|
||||
html {
|
||||
overflow: hidden;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'Raleway';
|
||||
font-style: normal;
|
||||
font-weight: 400;
|
||||
src: url('../vendor/Raleway/Raleway-Regular.ttf');
|
||||
}
|
||||
|
||||
body {
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
font-family: 'Raleway';
|
||||
background-image: url('../images/background.jpg');
|
||||
margin: 0;
|
||||
font-size: 11px;
|
||||
letter-spacing: 0.075rem;
|
||||
}
|
||||
|
||||
input, textarea, select, a, button {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.light-gray {
|
||||
color: @light-gray;
|
||||
}
|
||||
|
||||
h4 {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
header {
|
||||
margin: 50px 75px 35px 75px;
|
||||
|
||||
#console-version {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
#console-tray {
|
||||
display: inline-block;
|
||||
margin: 0px 75px;
|
||||
color: white;
|
||||
|
||||
a {
|
||||
color: white;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
p {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#navigation, #servers, .tray-line {
|
||||
display: inline-block;
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.tray-line {
|
||||
background-color: @light-gray;
|
||||
width: 1px;
|
||||
height: 130px;
|
||||
margin-top: 35px;
|
||||
}
|
||||
|
||||
@square-side: 97px;
|
||||
|
||||
#servers {
|
||||
h4 {
|
||||
margin-left: 7px;
|
||||
}
|
||||
|
||||
margin-left: 20px;
|
||||
img {
|
||||
position: relative;
|
||||
top: -5px;
|
||||
width: @square-side;
|
||||
height: @square-side;
|
||||
}
|
||||
}
|
||||
|
||||
.tray-square {
|
||||
width: @square-side;
|
||||
height: @square-side;
|
||||
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
img {
|
||||
width: 25px;
|
||||
}
|
||||
}
|
||||
|
||||
.nav-item {
|
||||
margin-right: 20px;
|
||||
float: left;
|
||||
width: @square-side;
|
||||
|
||||
&#nav-search {
|
||||
.nav-square {
|
||||
background-color: @light-gray;
|
||||
box-shadow: 0px 3px 3px #000000;
|
||||
}
|
||||
}
|
||||
|
||||
&#nav-last-visited {
|
||||
.nav-square {
|
||||
background-color: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@focus-background: #A6A7AA;
|
||||
@dark-gray: #585858;
|
||||
|
||||
@focus-height: 270px;
|
||||
|
||||
#tray-focus {
|
||||
margin-top: 5px;
|
||||
width: 100%;
|
||||
height: @focus-height;
|
||||
background-color: @focus-background;
|
||||
|
||||
color: @dark-gray;
|
||||
|
||||
#server-info {
|
||||
@info-padding-top-bottom: 10px;
|
||||
height: @focus-height - @info-padding-top-bottom - @info-padding-top-bottom;
|
||||
padding: @info-padding-top-bottom 75px;
|
||||
|
||||
@title-margin-left: 255px;
|
||||
|
||||
h2 {
|
||||
color: black;
|
||||
font-size: 36px;
|
||||
margin-left: @title-margin-left;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.server-box {
|
||||
float: left;
|
||||
margin-top: 5px;
|
||||
|
||||
.title {
|
||||
border-bottom: 1px solid @dark-gray;
|
||||
margin-bottom: 20px;
|
||||
|
||||
p {
|
||||
color: white;
|
||||
margin-top: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
.process-status {
|
||||
@status-red: #BD5F6D;
|
||||
@status-green: #59AEA8;
|
||||
@status-orange: #D89C40;
|
||||
|
||||
margin-bottom: 10px;
|
||||
|
||||
.circle {
|
||||
display: inline-block;
|
||||
margin-left: 10px;
|
||||
margin-right: 5px;
|
||||
border-radius: 50%;
|
||||
border: 1px solid #696A6B;
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
|
||||
&.stopped {
|
||||
background-color: @status-red;
|
||||
}
|
||||
|
||||
&.started {
|
||||
background-color: @status-green;
|
||||
}
|
||||
|
||||
&.stopping {
|
||||
background-color: @status-orange;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&#left-box {
|
||||
h4 {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 10px;
|
||||
width: 215px;
|
||||
}
|
||||
}
|
||||
|
||||
&#right-box {
|
||||
position: absolute;
|
||||
margin-left: @title-margin-left;
|
||||
|
||||
#go-server-button {
|
||||
float: left;
|
||||
box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.5);
|
||||
cursor: pointer;
|
||||
border: none;
|
||||
margin-top: 10px;
|
||||
background-color: #129EC0;
|
||||
width: 150px;
|
||||
|
||||
&.disabled {
|
||||
cursor: default;
|
||||
background-color: #86888F;
|
||||
}
|
||||
|
||||
img {
|
||||
padding: 10px 0px;
|
||||
width: 50px;
|
||||
}
|
||||
}
|
||||
|
||||
#server-stopped-text {
|
||||
float: left;
|
||||
margin: 20px 0px 0px 20px;
|
||||
color: red;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#manage-server {
|
||||
text-align: center;
|
||||
background-color: #232323;
|
||||
height: 140px;
|
||||
|
||||
#manage-buttons {
|
||||
display: inline-block;
|
||||
|
||||
@blue: #08A6E0;
|
||||
|
||||
#manage-separator {
|
||||
width: 1px
|
||||
}
|
||||
|
||||
@side-margin: 20px;
|
||||
|
||||
.manage-button {
|
||||
vertical-align: top;
|
||||
text-decoration: none;
|
||||
display: inline-block;
|
||||
margin: 40px @side-margin 20px @side-margin;
|
||||
width: 75px;
|
||||
|
||||
img {
|
||||
display: block;
|
||||
margin: 0 auto;
|
||||
width: 20px;
|
||||
}
|
||||
|
||||
p {
|
||||
color: @blue;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&#stop {
|
||||
margin-right: @side-margin + 2;
|
||||
}
|
||||
|
||||
&#settings {
|
||||
margin-left: @side-margin + 2;
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
opacity: 0.3;
|
||||
}
|
||||
}
|
||||
|
||||
#manage-separator {
|
||||
display: inline-block;
|
||||
width: 2px;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 96 KiB |
|
|
@ -1,18 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="96.3px" height="32px" viewBox="0 0 96.3 32" enable-background="new 0 0 96.3 32" xml:space="preserve">
|
||||
<path fill="#FFFFFF" d="M32.8,26.8h-6.3c-1.7,0-2.7-1.6-3.7-3c-0.4-0.6-1-1.5-1.3-1.7c-0.3,0.2-1,1.1-1.3,1.6
|
||||
c-1,1.4-2.1,3.1-3.9,3.1h-6.1c-2.6,0-5.4-1.3-7.1-3.4c-1.4-1.7-2-3.7-1.6-5.6l0.9-4.2C3.1,9.8,5.9,5.2,11,5.2h21
|
||||
c5.4,0,7.7,5.8,8.7,8.3l0.1,0.2l0.9,4.1c0.4,2-0.2,4-1.5,5.7C38.3,25.5,35.6,26.8,32.8,26.8L32.8,26.8z M21.5,19.7
|
||||
c1.4,0,2.4,1.4,3.3,2.8c0.4,0.6,1.3,2,1.7,2h6.3c2.1,0,4.2-1,5.4-2.5c0.6-0.8,1.3-2,1-3.7l-0.8-4c-1.4-3.5-3.2-6.8-6.5-6.8H11
|
||||
c-3.6,0-5.7,3.4-6.4,6.7l-0.8,4.1c-0.2,1.2,0.2,2.5,1.1,3.7c1.3,1.6,3.3,2.5,5.3,2.5h6.1c0.5,0,1.4-1.3,2-2.1
|
||||
C19.1,21.1,20,19.8,21.5,19.7C21.4,19.7,21.4,19.7,21.5,19.7z"/>
|
||||
<g>
|
||||
<path fill="#FFFFFF" d="M55.2,16c0-5.7,4.2-9.5,9.4-9.5c3.3,0,5.5,1.4,7.1,3.4L70,11c-1.2-1.5-3.1-2.5-5.3-2.5
|
||||
c-4,0-7.1,3.1-7.1,7.5c0,4.3,3.1,7.5,7.1,7.5c2.2,0,4-1,5-2v-3.7h-6.3v-2h8.6v6.6c-1.7,1.9-4.2,3.2-7.2,3.2
|
||||
C59.4,25.5,55.2,21.7,55.2,16z"/>
|
||||
<path fill="#FFFFFF" d="M76.8,16c0-5.4,3.7-9.5,9.1-9.5s9.1,4.1,9.1,9.5s-3.7,9.5-9.1,9.5S76.8,21.4,76.8,16z M92.7,16
|
||||
c0-4.3-2.7-7.5-6.8-7.5c-4.1,0-6.7,3.2-6.7,7.5c0,4.3,2.6,7.5,6.7,7.5C90,23.4,92.7,20.2,92.7,16z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB |
|
|
@ -1,17 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<path fill="#FFFFFF" d="M6.5,22.1c-0.4,0-0.7-0.1-1-0.4l-4.9-4.9c-0.6-0.6-0.6-1.5,0-2.1c0.6-0.6,1.5-0.6,2.1,0l4.9,4.9
|
||||
c0.6,0.6,0.6,1.5,0,2.1C7.3,22,6.9,22.1,6.5,22.1z"/>
|
||||
<path fill="#FFFFFF" d="M6.6,22.1c-0.4,0-0.8-0.1-1-0.4c-0.6-0.6-0.6-1.5,0-2.1l4.9-4.8c0.6-0.6,1.5-0.5,2.1,0
|
||||
c0.6,0.6,0.6,1.5,0,2.1l-4.9,4.8C7.4,21.9,7,22.1,6.6,22.1z"/>
|
||||
</g>
|
||||
<path fill="#FFFFFF" d="M6.3,29c-0.8,0-1.4-0.6-1.5-1.4c0-0.8,0.6-1.5,1.4-1.5c0.1,0,0.1,0,5.8,0c3.3,0,7.4,0,7.7,0
|
||||
c5.2-0.5,9.3-5,9.3-10.3c0-5.7-4.7-10.4-10.4-10.4c-2.1,0-5.2,0.5-7.5,2.9c-2.2,2.3-3.2,5.9-2.9,10.4c0,0.8-0.6,1.5-1.4,1.5
|
||||
c-0.8,0-1.5-0.6-1.5-1.4c-0.3-5.3,1-9.7,3.7-12.5c2.3-2.5,5.7-3.8,9.6-3.8c7.3,0,13.3,6,13.3,13.3c0,6.9-5.1,12.6-12,13.2
|
||||
c-0.1,0-0.1,0-7.9,0C9.1,29,6.5,29,6.3,29C6.3,29,6.3,29,6.3,29z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
|
||||
<path fill="#18A6DF" d="M25.4,10.3H12c-0.8,0-1.4-0.6-1.4-1.4s0.6-1.4,1.4-1.4h13.4c0.8,0,1.4,0.6,1.4,1.4S26.2,10.3,25.4,10.3z"/>
|
||||
<path fill="#18A6DF" d="M25.4,21.2H12c-0.8,0-1.4-0.6-1.4-1.4s0.6-1.4,1.4-1.4h13.4c0.8,0,1.4,0.6,1.4,1.4S26.2,21.2,25.4,21.2z"/>
|
||||
<path fill="#18A6DF" d="M25.4,15.7H12c-0.8,0-1.4-0.6-1.4-1.4S11.3,13,12,13h13.4c0.8,0,1.4,0.6,1.4,1.4S26.2,15.7,25.4,15.7z"/>
|
||||
<path fill="#18A6DF" d="M27,27.7H6.5C5.7,27.7,5,27,5,26.2V6.3c0-0.8,0.6-1.4,1.4-1.4s1.4,0.6,1.4,1.4v18.5H27
|
||||
c0.8,0,1.4,0.6,1.4,1.4S27.8,27.7,27,27.7z"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 918 B |
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="1.7px" height="133.7px" viewBox="0 0 1.7 133.7" enable-background="new 0 0 1.7 133.7" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<line fill="none" stroke="#3F403F" stroke-miterlimit="10" x1="0.9" y1="0" x2="0.9" y2="1.5"/>
|
||||
|
||||
<line fill="none" stroke="#3F403F" stroke-miterlimit="10" stroke-dasharray="2.9648,2.9648" x1="0.9" y1="4.5" x2="0.9" y2="133.4"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 649 B |
|
|
@ -1,26 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<path fill="#18A6DF" d="M10.9,29.1H4.1c-0.8,0-1.4-0.6-1.4-1.4s0.6-1.4,1.4-1.4h6.8c0.8,0,1.4,0.6,1.4,1.4S11.7,29.1,10.9,29.1z"
|
||||
/>
|
||||
<path fill="#18A6DF" d="M11,28.9C11,28.9,11,28.9,11,28.9c-0.8,0-1.5-0.7-1.4-1.5l0.1-6.8c0-0.8,0.7-1.4,1.4-1.4c0,0,0,0,0,0
|
||||
c0.8,0,1.4,0.7,1.4,1.5l-0.1,6.8C12.4,28.3,11.8,28.9,11,28.9z"/>
|
||||
</g>
|
||||
<path fill="#18A6DF" d="M9.6,27.7c-0.3,0-0.7-0.1-1-0.4c-3.8-3.4-7.2-9.1-5.6-15.2c1.5-5.6,7.1-9.5,13.3-9.3c0.8,0,1.4,0.7,1.4,1.5
|
||||
c0,0.8-0.7,1.4-1.5,1.4c-4.8-0.2-9.3,2.9-10.4,7.2c-1.3,4.8,1.7,9.6,4.7,12.3c0.6,0.5,0.6,1.4,0.1,2C10.4,27.5,10,27.7,9.6,27.7z"
|
||||
/>
|
||||
</g>
|
||||
<g>
|
||||
<g>
|
||||
<path fill="#18A6DF" d="M28.2,6h-6.8C20.6,6,20,5.3,20,4.5s0.6-1.4,1.4-1.4h6.8c0.8,0,1.4,0.6,1.4,1.4S29,6,28.2,6z"/>
|
||||
<path fill="#18A6DF" d="M21.2,12.9C21.2,12.9,21.2,12.9,21.2,12.9c-0.8,0-1.5-0.7-1.4-1.5l0.1-6.8c0-0.8,0.7-1.5,1.5-1.4
|
||||
c0.8,0,1.4,0.7,1.4,1.5l-0.1,6.8C22.7,12.2,22,12.9,21.2,12.9z"/>
|
||||
</g>
|
||||
<path fill="#18A6DF" d="M16.4,29.4c-0.2,0-0.3,0-0.5,0c-0.8,0-1.4-0.7-1.4-1.5c0-0.8,0.7-1.4,1.5-1.4c4.8,0.2,9.3-2.9,10.4-7.2
|
||||
c1.3-4.8-1.7-9.6-4.7-12.3c-0.6-0.5-0.6-1.4-0.1-2c0.5-0.6,1.4-0.6,2-0.1c3.8,3.4,7.2,9.1,5.6,15.2C27.7,25.5,22.4,29.4,16.4,29.4z
|
||||
"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB |
|
|
@ -1,14 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
|
||||
<path fill="#58595B" d="M22.5,14.6h-9.5c-0.7,0-1.2-0.6-1.2-1.2s0.6-1.2,1.2-1.2h9.5c0.7,0,1.2,0.6,1.2,1.2S23.2,14.6,22.5,14.6z"/>
|
||||
<path fill="#58595B" d="M17.7,19.4c-0.7,0-1.2-0.6-1.2-1.2V8.6c0-0.7,0.6-1.2,1.2-1.2S19,7.9,19,8.6v9.5
|
||||
C19,18.8,18.4,19.4,17.7,19.4z"/>
|
||||
<g>
|
||||
<path fill="#58595B" d="M3.9,30.2c-0.4,0-0.7-0.1-1-0.4c-0.6-0.6-0.6-1.5,0-2.1l6.1-6.1c0.6-0.6,1.5-0.6,2.1,0
|
||||
c0.6,0.6,0.6,1.5,0,2.1L5,29.8C4.7,30.1,4.3,30.2,3.9,30.2z"/>
|
||||
<path fill="#58595B" d="M17.7,4.5c4.9,0,8.9,4,8.9,8.9c0,4.9-4,8.9-8.9,8.9s-8.9-4-8.9-8.9C8.8,8.5,12.8,4.5,17.7,4.5 M17.7,1.6
|
||||
c-6.5,0-11.8,5.3-11.8,11.8c0,6.5,5.3,11.8,11.8,11.8c6.5,0,11.8-5.3,11.8-11.8C29.5,6.9,24.2,1.6,17.7,1.6L17.7,1.6z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 73 KiB |
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
|
||||
<path fill="#18A6DF" d="M16,26.9c-0.4,0-0.8,0-1.2,0c-0.2,0-0.3-0.1-0.3-0.2c-0.4-1-0.8-1.9-1.2-2.9c-0.1-0.3-0.8-0.6-1.2-0.5
|
||||
c-0.9,0.4-1.9,0.8-2.8,1.2c-0.2,0.1-0.3,0.1-0.5-0.1c-0.5-0.5-1.1-1.1-1.6-1.6c-0.2-0.2-0.2-0.3-0.1-0.5c0.4-0.9,0.8-1.9,1.1-2.8
|
||||
c0.1-0.3-0.2-1-0.5-1.2C6.9,18,5.9,17.6,5,17.2c-0.2-0.1-0.3-0.2-0.3-0.4c0-0.7,0-1.5,0-2.2c0-0.2,0.1-0.3,0.3-0.4
|
||||
c0.9-0.4,1.9-0.8,2.8-1.2c0.4-0.2,0.6-0.8,0.5-1.2C7.9,10.9,7.5,9.9,7.1,9C7,8.8,7,8.7,7.2,8.6C7.8,8,8.3,7.5,8.8,6.9
|
||||
C9,6.8,9,6.8,9.2,6.9c1,0.4,1.9,0.8,2.9,1.2c0.4,0.1,1-0.1,1.2-0.5c0.4-0.9,0.8-1.9,1.2-2.8c0.1-0.2,0.2-0.3,0.4-0.3
|
||||
c0.8,0,1.5,0,2.3,0c0.2,0,0.3,0.1,0.4,0.3c0.4,0.9,0.8,1.9,1.2,2.8c0.2,0.4,0.8,0.7,1.2,0.5c0.9-0.4,1.9-0.8,2.8-1.2
|
||||
c0.2-0.1,0.3-0.1,0.5,0.1c0.5,0.5,1.1,1.1,1.6,1.6c0.1,0.1,0.2,0.2,0.1,0.4c-0.4,1-0.8,1.9-1.2,2.9c-0.1,0.3,0.1,1,0.5,1.1
|
||||
c1,0.4,1.9,0.8,2.9,1.2c0.2,0.1,0.2,0.2,0.2,0.4c0,0.8,0,1.5,0,2.3c0,0.2-0.1,0.3-0.3,0.4c-1,0.4-1.9,0.8-2.9,1.2
|
||||
c-0.3,0.1-0.6,0.8-0.4,1.1c0.4,0.9,0.8,1.9,1.2,2.8c0.1,0.2,0.1,0.3-0.1,0.5c-0.5,0.5-1.1,1.1-1.6,1.6c-0.1,0.1-0.2,0.2-0.4,0.1
|
||||
c-1-0.4-1.9-0.8-2.9-1.2c-0.3-0.1-1,0.1-1.1,0.5c-0.4,1-0.8,1.9-1.2,2.9c-0.1,0.2-0.2,0.3-0.4,0.2C16.7,26.9,16.4,26.9,16,26.9z
|
||||
M15.9,19.9c2.5,0,4.3-2.3,4.2-4.3c-0.1-1.8-1.6-4.1-4.2-4.1c-2.6,0-4.3,2.4-4.2,4.3C11.8,17.6,13.3,19.9,15.9,19.9z"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.7 KiB |
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
|
||||
<path fill="#18A6DF" d="M24.9,25.5H7.5c-0.7,0-1.2-0.5-1.2-1.2V7.5c0-0.7,0.5-1.2,1.2-1.2s1.2,0.5,1.2,1.2v15.6h16.2
|
||||
c0.7,0,1.2,0.5,1.2,1.2C26.1,25,25.6,25.5,24.9,25.5z"/>
|
||||
<path fill="#18A6DF" d="M24.9,25.5c-0.7,0-1.2-0.5-1.2-1.2V8.7H7.5c-0.7,0-1.2-0.5-1.2-1.2s0.5-1.2,1.2-1.2h17.4
|
||||
c0.7,0,1.2,0.5,1.2,1.2v16.8C26.1,25,25.6,25.5,24.9,25.5z"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 722 B |
|
|
@ -1,112 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>High Fidelity</title>
|
||||
<script>
|
||||
window.$ = window.jQuery = require('./vendor/jQuery/jquery-2.1.4.min.js');
|
||||
</script>
|
||||
<script src="index.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="css/style.less" />
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<div id="console-version">
|
||||
<p class="light-gray">Version <span class="number">1.0.0</span></p>
|
||||
</div>
|
||||
<div id="hf-brand">
|
||||
<img src="images/logo-512.png" width="190" />
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<div id="console-tray">
|
||||
<div id="navigation">
|
||||
<h4 class="light-gray">NAVIGATE</h4>
|
||||
<div id="nav-search" class="nav-item">
|
||||
<div class="tray-square nav-square">
|
||||
<img src="images/search.svg" />
|
||||
</div>
|
||||
<p>Search</p>
|
||||
</div>
|
||||
<div id="nav-last-visited" class="nav-item">
|
||||
<a href="#" id="last-visited-link">
|
||||
<div class="tray-square nav-square">
|
||||
<img src="images/last-visited.svg" />
|
||||
</div>
|
||||
<p>Last visited</p>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="tray-line"></div>
|
||||
<div id="servers">
|
||||
<h4 class="light-gray">MY SERVER</h4>
|
||||
<div class="tray-square">
|
||||
<img src="images/server.png" />
|
||||
</div>
|
||||
<p>Home</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="tray-focus">
|
||||
<div id="server-focus">
|
||||
<div id="server-info">
|
||||
<h2>Home</h2>
|
||||
<div id="left-box" class="server-box">
|
||||
<div class="title">
|
||||
<h4 id="status">STATUS</h4>
|
||||
</div>
|
||||
|
||||
<div id="ds-status" class="process-status">
|
||||
<div class="circle stopped"></div>
|
||||
<span>Domain Server</span>
|
||||
</div>
|
||||
<div id="ac-status" class="process-status">
|
||||
<div class="circle stopped"></div>
|
||||
<span>Assignment Clients</span>
|
||||
</div>
|
||||
</div>
|
||||
<div id="right-box" class="server-box">
|
||||
<div class="title">
|
||||
<p id="server-url">hifi://localhost</p>
|
||||
</div>
|
||||
<p>
|
||||
This is your domain. 4096 cubic kilometers of space for you<br>
|
||||
to build, explore, and share. We’ve started you off with a<br>
|
||||
home full of goodies to help you learn the ropes. Enjoy!
|
||||
</p>
|
||||
<button id="go-server-button">
|
||||
<img src="images/go-hmd.svg" />
|
||||
</button>
|
||||
<div id="server-stopped-text">
|
||||
<span>Server stopped<br>Click "Restart"</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="manage-server">
|
||||
<div id="manage-buttons">
|
||||
<a id="restart" href="#" class="manage-button">
|
||||
<img src="images/restart.svg" />
|
||||
<p>Restart</p>
|
||||
</a>
|
||||
<a id="stop" href="#" class="manage-button">
|
||||
<img src="images/stop.svg" />
|
||||
<p>Stop</p>
|
||||
</a>
|
||||
<div id="manage-separator">
|
||||
<img src="images/manage-button-sep.svg"/>
|
||||
</div>
|
||||
|
||||
<!-- TODO: handle the case where the DS HTTP port is non-standard -->
|
||||
<a id="settings" href="http://localhost:40100/settings" target="_blank" class="manage-button">
|
||||
<img src="images/settings.svg" />
|
||||
<p>Settings</p>
|
||||
</a>
|
||||
<a id="open-logs" href="#" class="manage-button">
|
||||
<img src="images/logs.svg" />
|
||||
<p>Logs</p>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,110 +0,0 @@
|
|||
$(function() {
|
||||
const ipcRenderer = require('electron').ipcRenderer;
|
||||
const HFProcess = require('./modules/hf-process.js');
|
||||
|
||||
var settingsButton = $('#manage-server #settings');
|
||||
|
||||
function toggleManageButton(button, enabled) {
|
||||
if (enabled) {
|
||||
button.attr('href', '#');
|
||||
button.removeClass('disabled');
|
||||
} else {
|
||||
button.removeAttr('href');
|
||||
button.addClass('disabled');
|
||||
}
|
||||
}
|
||||
|
||||
function onProcessUpdate(event, arg) {
|
||||
console.log("update", event, arg);
|
||||
|
||||
// var interfaceState = arg.interface.state;
|
||||
// $('#process-interface .status').text(interfaceState);
|
||||
// var interfaceOn = interfaceState != 'stopped';
|
||||
// $('#process-interface .power-on').prop('disabled', interfaceOn);
|
||||
// $('#process-interface .power-off').prop('disabled', !interfaceOn);
|
||||
|
||||
var sendingProcess = arg;
|
||||
|
||||
var processCircle = null;
|
||||
if (sendingProcess.name == "domain-server") {
|
||||
processCircle = $('#ds-status .circle');
|
||||
} else if (sendingProcess.name == "ac-monitor") {
|
||||
processCircle = $('#ac-status .circle');
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
if (sendingProcess.name == "domain-server") {
|
||||
toggleManageButton(settingsButton,
|
||||
sendingProcess.state == HFProcess.ProcessStates.STARTED);
|
||||
}
|
||||
|
||||
switch (sendingProcess.state) {
|
||||
case HFProcess.ProcessStates.STOPPED:
|
||||
processCircle.attr('class', 'circle stopped');
|
||||
break;
|
||||
case HFProcess.ProcessStates.STOPPING:
|
||||
processCircle.attr('class', 'circle stopping');
|
||||
break;
|
||||
case HFProcess.ProcessStates.STARTED:
|
||||
processCircle.attr('class', 'circle started');
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
function onProcessGroupUpdate(event, arg) {
|
||||
var sendingGroup = arg;
|
||||
var stopButton = $('#manage-server #stop');
|
||||
var goButton = $('#go-server-button');
|
||||
var serverStopped = $('#server-stopped-text');
|
||||
|
||||
switch (sendingGroup.state) {
|
||||
case HFProcess.ProcessGroupStates.STOPPED:
|
||||
case HFProcess.ProcessGroupStates.STOPPING:
|
||||
// if the process group is stopping, the stop button should be disabled
|
||||
toggleManageButton(stopButton, false);
|
||||
|
||||
// disable the go button
|
||||
goButton.addClass('disabled');
|
||||
|
||||
// show the server stopped text
|
||||
serverStopped.show();
|
||||
|
||||
break;
|
||||
case HFProcess.ProcessGroupStates.STARTED:
|
||||
// if the process group is going, the stop button should be active
|
||||
toggleManageButton(stopButton, true);
|
||||
|
||||
// enable the go button
|
||||
goButton.removeClass('disabled');
|
||||
|
||||
// hide the server stopped text
|
||||
serverStopped.hide();
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
$('#last-visited-link').click(function() {
|
||||
ipcRenderer.send('start-interface');
|
||||
});
|
||||
|
||||
$('#go-server-button:not(.disabled)').click(function(){
|
||||
ipcRenderer.send('start-interface', { url: 'hifi://localhost' });
|
||||
})
|
||||
|
||||
$('#manage-server #restart').click(function() {
|
||||
ipcRenderer.send('restart-server', { name: 'home' });
|
||||
});
|
||||
$('#manage-server #stop').click(function() {
|
||||
ipcRenderer.send('stop-server', { name: 'home' });
|
||||
});
|
||||
$('#open-logs').click(function() {
|
||||
ipcRenderer.send('open-logs');
|
||||
});
|
||||
|
||||
ipcRenderer.on('process-update', onProcessUpdate);
|
||||
ipcRenderer.on('process-group-update', onProcessGroupUpdate);
|
||||
|
||||
ipcRenderer.send('update-all-processes');
|
||||
});
|
||||
|
|
@ -2,7 +2,8 @@
|
|||
|
||||
var electron = require('electron');
|
||||
var app = electron.app; // Module to control application life.
|
||||
var BrowserWindow = require('browser-window'); // Module to create native browser window.
|
||||
var BrowserWindow = electron.BrowserWindow;
|
||||
|
||||
var Menu = require('menu');
|
||||
var Tray = require('tray');
|
||||
var shell = require('shell');
|
||||
|
|
@ -13,27 +14,31 @@ var path = require('path');
|
|||
var hfprocess = require('./modules/hf-process.js');
|
||||
var Process = hfprocess.Process;
|
||||
var ProcessGroup = hfprocess.ProcessGroup;
|
||||
var ProcessGroupStates = hfprocess.ProcessGroupStates;
|
||||
|
||||
const ipcMain = electron.ipcMain;
|
||||
|
||||
// Keep a global reference of the window object, if you don't, the window will
|
||||
// be closed automatically when the JavaScript object is garbage collected.
|
||||
var mainWindow = null;
|
||||
var tray = null;
|
||||
const osType = os.type();
|
||||
|
||||
var path = require('path');
|
||||
var TRAY_ICON = path.join(__dirname, '../resources/console-tray.png');
|
||||
var APP_ICON = path.join(__dirname, '../resources/console.png');
|
||||
|
||||
// Quit when all windows are closed.
|
||||
app.on('window-all-closed', function() {
|
||||
// On OS X it is common for applications and their menu bar
|
||||
// to stay active until the user quits explicitly with Cmd + Q
|
||||
if (process.platform != 'darwin') {
|
||||
app.quit();
|
||||
}
|
||||
const TRAY_FILENAME = (osType == "Darwin" ? "console-tray-Template.png" : "console-tray.png");
|
||||
const TRAY_ICON = path.join(__dirname, '../resources/' + TRAY_FILENAME);
|
||||
const APP_ICON = path.join(__dirname, '../resources/console.png');
|
||||
|
||||
// print out uncaught exceptions in the console
|
||||
process.on('uncaughtException', console.log.bind(console));
|
||||
|
||||
var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
|
||||
// Someone tried to run a second instance, focus the window (if there is one)
|
||||
return true;
|
||||
});
|
||||
|
||||
if (shouldQuit) {
|
||||
app.quit();
|
||||
return;
|
||||
}
|
||||
|
||||
// Check command line arguments to see how to find binaries
|
||||
var argv = require('yargs').argv;
|
||||
var pathFinder = require('./modules/path-finder.js');
|
||||
|
|
@ -50,77 +55,144 @@ if (argv.localDebugBuilds || argv.localReleaseBuilds) {
|
|||
acPath = pathFinder.discoveredPath("assignment-client", argv.localReleaseBuilds);
|
||||
}
|
||||
|
||||
// if at this point any of the paths are null, we're missing something we wanted to find
|
||||
// TODO: show an error for the binaries that couldn't be found
|
||||
|
||||
function openFileBrowser(path) {
|
||||
var type = os.type();
|
||||
console.log(type);
|
||||
if (type == "Windows_NT") {
|
||||
if (osType == "Windows_NT") {
|
||||
childProcess.exec('start ' + path);
|
||||
} else if (type == "Darwin") {
|
||||
} else if (osType == "Darwin") {
|
||||
childProcess.exec('open ' + path);
|
||||
} else if (type == "Linux") {
|
||||
} else if (osType == "Linux") {
|
||||
childProcess.exec('xdg-open ' + path);
|
||||
}
|
||||
}
|
||||
|
||||
// if at this point any of the paths are null, we're missing something we wanted to find
|
||||
// TODO: show an error for the binaries that couldn't be found
|
||||
function startInterface(url) {
|
||||
var argArray = [];
|
||||
|
||||
// check if we have a url parameter to include
|
||||
if (url) {
|
||||
argArray = ["--url", url];
|
||||
}
|
||||
|
||||
// create a new Interface instance - Interface makes sure only one is running at a time
|
||||
var pInterface = new Process('interface', interfacePath, argArray);
|
||||
pInterface.start();
|
||||
}
|
||||
|
||||
var tray = null;
|
||||
var homeServer = null;
|
||||
|
||||
const GO_HOME_INDEX = 0;
|
||||
const SERVER_LABEL_INDEX = 2;
|
||||
const RESTART_INDEX = 3;
|
||||
const STOP_INDEX = 4;
|
||||
const SETTINGS_INDEX = 5;
|
||||
|
||||
function buildMenuArray(serverState) {
|
||||
var menuArray = [
|
||||
{
|
||||
label: 'Go Home',
|
||||
click: function() { startInterface('hifi://localhost'); },
|
||||
enabled: false
|
||||
},
|
||||
{
|
||||
type: 'separator'
|
||||
},
|
||||
{
|
||||
label: "Server - Stopped",
|
||||
enabled: false
|
||||
},
|
||||
{
|
||||
label: "Start",
|
||||
click: function() { homeServer.restart(); }
|
||||
},
|
||||
{
|
||||
label: "Stop",
|
||||
visible: false,
|
||||
click: function() { homeServer.stop(); }
|
||||
},
|
||||
{
|
||||
label: "Settings",
|
||||
click: function() { shell.openExternal('http://localhost:40100/settings'); },
|
||||
enabled: false
|
||||
},
|
||||
{
|
||||
label: "View Logs",
|
||||
click: function() { openFileBrowser(logPath); }
|
||||
},
|
||||
{
|
||||
type: 'separator'
|
||||
},
|
||||
{
|
||||
label: 'Quit',
|
||||
accelerator: 'Command+Q',
|
||||
click: function() { app.quit(); }
|
||||
}
|
||||
];
|
||||
|
||||
updateMenuArray(menuArray, serverState);
|
||||
|
||||
return menuArray;
|
||||
}
|
||||
|
||||
function updateMenuArray(menuArray, serverState) {
|
||||
// update the tray menu state
|
||||
var running = serverState == ProcessGroupStates.STARTED;
|
||||
|
||||
var serverLabelItem = menuArray[SERVER_LABEL_INDEX];
|
||||
var restartItem = menuArray[RESTART_INDEX];
|
||||
|
||||
// Go Home is only enabled if running
|
||||
menuArray[GO_HOME_INDEX].enabled = running;
|
||||
|
||||
// Stop is only visible if running
|
||||
menuArray[STOP_INDEX].visible = running;
|
||||
|
||||
// Settings is only visible if running
|
||||
menuArray[SETTINGS_INDEX].enabled = running;
|
||||
|
||||
if (serverState == ProcessGroupStates.STARTED) {
|
||||
serverLabelItem.label = "Server - Started";
|
||||
restartItem.label = "Restart";
|
||||
} else if (serverState == ProcessGroupStates.STOPPED) {
|
||||
serverLabelItem.label = "Server - Stopped";
|
||||
restartItem.label = "Start";
|
||||
} else if (serverState == ProcessGroupStates.STOPPING) {
|
||||
serverLabelItem.label = "Server - Stopping";
|
||||
restartItem.label = "Restart";
|
||||
}
|
||||
}
|
||||
|
||||
function updateTrayMenu(serverState) {
|
||||
if (tray) {
|
||||
var menuArray = buildMenuArray(serverState);
|
||||
tray.setContextMenu(Menu.buildFromTemplate(menuArray));
|
||||
}
|
||||
}
|
||||
|
||||
var hiddenWindow = null;
|
||||
|
||||
// This method will be called when Electron has finished
|
||||
// initialization and is ready to create browser windows.
|
||||
app.on('ready', function() {
|
||||
// Create tray icon
|
||||
tray = new Tray(TRAY_ICON);
|
||||
tray.setToolTip('High Fidelity');
|
||||
var contextMenu = Menu.buildFromTemplate([{
|
||||
label: 'Quit',
|
||||
accelerator: 'Command+Q',
|
||||
click: function() { app.quit(); }
|
||||
}]);
|
||||
tray.setContextMenu(contextMenu);
|
||||
|
||||
// Require electron-compile to use LESS files in place of basic CSS
|
||||
require('electron-compile').init();
|
||||
|
||||
// Create the browser window.
|
||||
mainWindow = new BrowserWindow({
|
||||
title: "High Fidelity",
|
||||
width: 970,
|
||||
height: 775,
|
||||
icon: APP_ICON,
|
||||
resizable: false
|
||||
});
|
||||
|
||||
// In debug mode, keep the menu bar, but auto-hide it so the UI still looks the same.
|
||||
if (debug) {
|
||||
mainWindow.setAutoHideMenuBar(true);
|
||||
} else {
|
||||
mainWindow.setMenu(null);
|
||||
if (app.dock) {
|
||||
// hide the dock icon on OS X
|
||||
app.dock.hide()
|
||||
}
|
||||
|
||||
// and load the index.html of the app.
|
||||
mainWindow.loadURL('file://' + __dirname + '/index.html');
|
||||
|
||||
// Open the DevTools.
|
||||
mainWindow.webContents.openDevTools();
|
||||
|
||||
// Emitted when the window is closed.
|
||||
mainWindow.on('closed', function() {
|
||||
// Dereference the window object, usually you would store windows
|
||||
// in an array if your app supports multi windows, this is the time
|
||||
// when you should delete the corresponding element.
|
||||
mainWindow = null;
|
||||
});
|
||||
|
||||
// When a link is clicked that has `_target="_blank"`, open it in the user's native browser
|
||||
mainWindow.webContents.on('new-window', function(e, url) {
|
||||
e.preventDefault();
|
||||
shell.openExternal(url);
|
||||
});
|
||||
|
||||
var logPath = path.join(app.getAppPath(), 'logs');
|
||||
|
||||
// Create tray icon
|
||||
tray = new Tray(TRAY_ICON);
|
||||
tray.setToolTip('High Fidelity');
|
||||
|
||||
updateTrayMenu(ProcessGroupStates.STOPPED);
|
||||
|
||||
if (interfacePath && dsPath && acPath) {
|
||||
var homeServer = new ProcessGroup('home', [
|
||||
homeServer = new ProcessGroup('home', [
|
||||
new Process('domain-server', dsPath),
|
||||
new Process('ac-monitor', acPath, ['-n6', '--log-directory', logPath])
|
||||
]);
|
||||
|
|
@ -134,58 +206,11 @@ app.on('ready', function() {
|
|||
home: homeServer
|
||||
};
|
||||
|
||||
function sendProcessUpdate(process) {
|
||||
if (mainWindow) {
|
||||
console.log("Sending process update to web view for " + process.name);
|
||||
mainWindow.webContents.send('process-update', process);
|
||||
}
|
||||
};
|
||||
|
||||
function sendProcessGroupUpdate(processGroup) {
|
||||
if (mainWindow) {
|
||||
mainWindow.webContents.send('process-group-update', processGroup);
|
||||
}
|
||||
}
|
||||
|
||||
// handle process updates
|
||||
homeServer.on('process-update', sendProcessUpdate);
|
||||
homeServer.on('state-update', sendProcessGroupUpdate);
|
||||
// homeServer.on('process-update', sendProcessUpdate);
|
||||
homeServer.on('state-update', function(processGroup) { updateTrayMenu(processGroup.state); });
|
||||
|
||||
// start the home server
|
||||
homeServer.start();
|
||||
|
||||
ipcMain.on('start-interface', function(event, arg) {
|
||||
// check if we have a url parameter to include
|
||||
var argArray = [];
|
||||
if (arg && arg.url) {
|
||||
argArray = ["--url", arg.url];
|
||||
}
|
||||
|
||||
// create a new Interface instance - Interface makes sure only one is running at a time
|
||||
var pInterface = new Process('interface', interfacePath, argArray);
|
||||
pInterface.start();
|
||||
});
|
||||
|
||||
ipcMain.on('restart-server', function(event, arg) {
|
||||
homeServer.restart();
|
||||
});
|
||||
|
||||
ipcMain.on('stop-server', function(event, arg) {
|
||||
homeServer.stop();
|
||||
});
|
||||
|
||||
ipcMain.on('open-logs', function(event, arg) {
|
||||
openFileBrowser(logPath);
|
||||
});
|
||||
|
||||
ipcMain.on('update-all-processes', function(event, arg) {
|
||||
// enumerate our processes and call sendProcessUpdate to update
|
||||
// the window with their status
|
||||
for (let process of homeServer.processes) {
|
||||
sendProcessUpdate(process);
|
||||
}
|
||||
|
||||
sendProcessGroupUpdate(homeServer);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
94
console/src/vendor/Raleway/OFL.txt
vendored
94
console/src/vendor/Raleway/OFL.txt
vendored
|
|
@ -1,94 +0,0 @@
|
|||
Copyright (c) 2010, Matt McInerney (matt@pixelspread.com),
|
||||
Copyright (c) 2011, Pablo Impallari (www.impallari.com|impallari@gmail.com),
|
||||
Copyright (c) 2011, Rodrigo Fuenzalida (www.rfuenzalida.com|hello@rfuenzalida.com), with Reserved Font Name Raleway
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
BIN
console/src/vendor/Raleway/Raleway-Regular.ttf
vendored
BIN
console/src/vendor/Raleway/Raleway-Regular.ttf
vendored
Binary file not shown.
|
|
@ -33,6 +33,9 @@
|
|||
#include <QtGui/QMouseEvent>
|
||||
#include <QtGui/QDesktopServices>
|
||||
|
||||
#include <QtNetwork/QLocalSocket>
|
||||
#include <QtNetwork/QLocalServer>
|
||||
|
||||
#include <QtWidgets/QActionGroup>
|
||||
#include <QtWidgets/QDesktopWidget>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
|
|
@ -5115,3 +5118,30 @@ void Application::setActiveDisplayPlugin(const QString& pluginName) {
|
|||
}
|
||||
updateDisplayMode();
|
||||
}
|
||||
|
||||
void Application::handleLocalServerConnection() {
|
||||
auto server = qobject_cast<QLocalServer*>(sender());
|
||||
|
||||
qDebug() << "Got connection on local server from additional instance - waiting for parameters";
|
||||
|
||||
auto socket = server->nextPendingConnection();
|
||||
|
||||
connect(socket, &QLocalSocket::readyRead, this, &Application::readArgumentsFromLocalSocket);
|
||||
|
||||
qApp->getWindow()->raise();
|
||||
qApp->getWindow()->activateWindow();
|
||||
}
|
||||
|
||||
void Application::readArgumentsFromLocalSocket() {
|
||||
auto socket = qobject_cast<QLocalSocket*>(sender());
|
||||
|
||||
auto message = socket->readAll();
|
||||
socket->deleteLater();
|
||||
|
||||
qDebug() << "Read from connection: " << message;
|
||||
|
||||
// If we received a message, try to open it as a URL
|
||||
if (message.length() > 0) {
|
||||
qApp->openUrl(QString::fromUtf8(message));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -264,6 +264,9 @@ public slots:
|
|||
void loadScriptURLDialog();
|
||||
void toggleLogDialog();
|
||||
|
||||
void handleLocalServerConnection();
|
||||
void readArgumentsFromLocalSocket();
|
||||
|
||||
ScriptEngine* loadScript(const QString& scriptFilename = QString(), bool isUserLoaded = true,
|
||||
bool loadScriptFromEditor = false, bool activateMainWindow = false, bool reload = false);
|
||||
void stopAllScripts(bool restart = false);
|
||||
|
|
|
|||
|
|
@ -42,52 +42,48 @@ static BOOL CALLBACK enumWindowsCallback(HWND hWnd, LPARAM lParam) {
|
|||
#endif
|
||||
|
||||
int main(int argc, const char* argv[]) {
|
||||
QString applicationName = "High Fidelity Interface";
|
||||
QString applicationName = "High Fidelity Interface - " + qgetenv("USERNAME");
|
||||
|
||||
// Try to create a shared memory block - if it can't be created, there is an instance of
|
||||
// interface already running.
|
||||
QSharedMemory sharedMemory { applicationName };
|
||||
if (!sharedMemory.create(1, QSharedMemory::ReadOnly)) {
|
||||
// Connect to and send message to existing interface instance
|
||||
QLocalSocket socket;
|
||||
// Connect to and send message to existing interface instance
|
||||
QLocalSocket socket;
|
||||
|
||||
socket.connectToServer(applicationName);
|
||||
socket.connectToServer(applicationName);
|
||||
|
||||
// Try to connect - if we can't connect, interface has probably just gone down
|
||||
if (socket.waitForConnected(100)) {
|
||||
static const int LOCAL_SERVER_TIMEOUT_MS = 500;
|
||||
|
||||
QStringList arguments;
|
||||
for (int i = 0; i < argc; ++i) {
|
||||
arguments << argv[i];
|
||||
}
|
||||
// Try to connect - if we can't connect, interface has probably just gone down
|
||||
if (socket.waitForConnected(LOCAL_SERVER_TIMEOUT_MS)) {
|
||||
|
||||
QCommandLineParser parser;
|
||||
QCommandLineOption urlOption("url", "", "value");
|
||||
parser.addOption(urlOption);
|
||||
parser.process(arguments);
|
||||
|
||||
if (parser.isSet(urlOption)) {
|
||||
QUrl url = QUrl(parser.value(urlOption));
|
||||
if (url.isValid() && url.scheme() == HIFI_URL_SCHEME) {
|
||||
socket.write(url.toString().toUtf8());
|
||||
socket.waitForBytesWritten(5000);
|
||||
}
|
||||
}
|
||||
|
||||
socket.close();
|
||||
QStringList arguments;
|
||||
for (int i = 0; i < argc; ++i) {
|
||||
arguments << argv[i];
|
||||
}
|
||||
|
||||
QCommandLineParser parser;
|
||||
QCommandLineOption urlOption("url", "", "value");
|
||||
parser.addOption(urlOption);
|
||||
parser.process(arguments);
|
||||
|
||||
if (parser.isSet(urlOption)) {
|
||||
QUrl url = QUrl(parser.value(urlOption));
|
||||
if (url.isValid() && url.scheme() == HIFI_URL_SCHEME) {
|
||||
socket.write(url.toString().toUtf8());
|
||||
socket.waitForBytesWritten(5000);
|
||||
}
|
||||
}
|
||||
|
||||
socket.close();
|
||||
|
||||
qDebug() << "Interface instance appears to be running, exiting";
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
QElapsedTimer startupTime;
|
||||
startupTime.start();
|
||||
|
||||
// Debug option to demonstrate that the client's local time does not
|
||||
// need to be in sync with any other network node. This forces clock
|
||||
|
||||
// Debug option to demonstrate that the client's local time does not
|
||||
// need to be in sync with any other network node. This forces clock
|
||||
// skew for the individual client
|
||||
const char* CLOCK_SKEW = "--clockSkew";
|
||||
const char* clockSkewOption = getCmdOption(argc, argv, CLOCK_SKEW);
|
||||
|
|
@ -109,36 +105,16 @@ int main(int argc, const char* argv[]) {
|
|||
// Setup local server
|
||||
QLocalServer server { &app };
|
||||
|
||||
// We have already acquired the shared memory block, so we can safely remove
|
||||
// any existing servers. This can occur on Unix platforms after a crash.
|
||||
// We failed to connect to a local server, so we remove any existing servers.
|
||||
server.removeServer(applicationName);
|
||||
server.listen(applicationName);
|
||||
|
||||
QObject::connect(&server, &QLocalServer::newConnection, qApp, [&server]() {
|
||||
qDebug() << "Got connection on local server";
|
||||
|
||||
auto socket = server.nextPendingConnection();
|
||||
|
||||
QObject::connect(socket, &QLocalSocket::readyRead, qApp, [&socket]() {
|
||||
auto message = socket->readAll();
|
||||
socket->close();
|
||||
|
||||
qDebug() << "Read from connection: " << message;
|
||||
|
||||
// If we received a message, try to open it as a URL
|
||||
if (message.length() > 0) {
|
||||
qApp->openUrl(QString::fromUtf8(message));
|
||||
}
|
||||
});
|
||||
|
||||
qApp->getWindow()->raise();
|
||||
qApp->getWindow()->activateWindow();
|
||||
});
|
||||
QObject::connect(&server, &QLocalServer::newConnection, &app, &Application::handleLocalServerConnection);
|
||||
|
||||
QTranslator translator;
|
||||
translator.load("i18n/interface_en");
|
||||
app.installTranslator(&translator);
|
||||
|
||||
|
||||
qCDebug(interfaceapp, "Created QT Application.");
|
||||
exitCode = app.exec();
|
||||
server.close();
|
||||
|
|
@ -148,4 +124,4 @@ int main(int argc, const char* argv[]) {
|
|||
|
||||
qCDebug(interfaceapp, "Normal exit.");
|
||||
return exitCode;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue