Skip to content

Commit

Permalink
Minor Updates
Browse files Browse the repository at this point in the history
- Updated logo
- Fixed wrong analysis output title
- Updated README
- Updated package.json
- Edited app window size
- Minor adjustment to Travis CI
  • Loading branch information
Allcharles committed Jul 9, 2019
1 parent 7c25930 commit 3660f42
Show file tree
Hide file tree
Showing 12 changed files with 159 additions and 51 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ addons:

before_install:
- npm install
- npm run dependencies
- npm run ap_download:linux
before_script:
- export DISPLAY=:99.0
Expand All @@ -31,4 +32,4 @@ script:
matrix:
include:
- os: linux
dist: xenial
dist: xenial
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,16 @@ npm run electron:mac
- Basic analysis
- Linux Support
- Loading bars for file analysis
- Multiple analyses
- Pre-built analysis tools

## Features Coming Soon

- Advanced analysis options
- Analysis spectrogram display
- Config File Editor
- Link to Analysis Output
- Event Detection Helper utility
- Multiple analysis

## History

Expand Down
36 changes: 17 additions & 19 deletions main.ts
Original file line number Diff line number Diff line change
@@ -1,42 +1,43 @@
import { app, BrowserWindow, screen } from 'electron';
import { app, BrowserWindow } from 'electron';
import * as path from 'path';
import * as url from 'url';

let win, serve;
let win: BrowserWindow, serve: boolean;
const args = process.argv.slice(1);
serve = args.some(val => val === '--serve');

function createWindow() {

const electronScreen = screen;
const size = electronScreen.getPrimaryDisplay().workAreaSize;
const size = { width: 1250, height: 1000 };

// Create the browser window.
win = new BrowserWindow({
x: 0,
y: 0,
width: size.width,
center: true,
height: size.height,
title: 'AP Desktop',
width: size.width,
webPreferences: {
nodeIntegration: true,
},
nodeIntegration: true
}
});
win.maximize();

if (serve) {
require('electron-reload')(__dirname, {
electron: require(`${__dirname}/node_modules/electron`)
});
win.loadURL('http://localhost:4200');
} else {
win.loadURL(url.format({
pathname: path.join(__dirname, 'dist/index.html'),
protocol: 'file:',
slashes: true
}));
win.loadURL(
url.format({
pathname: path.join(__dirname, 'dist/index.html'),
protocol: 'file:',
slashes: true
})
);
}

if (serve) {
//win.webContents.openDevTools();
win.webContents.openDevTools();
}

// Emitted when the window is closed.
Expand All @@ -46,11 +47,9 @@ function createWindow() {
// when you should delete the corresponding element.
win = null;
});

}

try {

// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
// Some APIs can only be used after this event occurs.
Expand All @@ -72,7 +71,6 @@ try {
createWindow();
}
});

} catch (e) {
// Catch Error
// throw e;
Expand Down
44 changes: 19 additions & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ap-desktop",
"version": "3.0.0",
"version": "3.0.1",
"description": "Graphical User Interface (GUI) for QUT EcoAcoustics Analysis Programs tool.",
"homepage": "https://github.com/QutEcoacoustics/ap-desktop",
"author": {
Expand Down Expand Up @@ -71,7 +71,7 @@
"karma-coverage-istanbul-reporter": "2.0.4",
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.0",
"mocha": "6.1.2",
"mocha": "^6.1.4",
"npm-run-all": "4.1.5",
"rxjs": "6.5.2",
"spectron": "5.0.0",
Expand All @@ -90,7 +90,6 @@
"@angular/cdk": "^8.0.1",
"@angular/material": "^8.0.1",
"@swimlane/ngx-datatable": "^15.0.2",
"fs": "0.0.1-security",
"hammerjs": "^2.0.8",
"js-yaml": "^3.13.1",
"shelljs": "^0.8.3"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="container mt-3">
<div class="card shadow">
<div class="card-header text-white d-flex">
<div class="header">Audio Files</div>
<div class="header">Select Output Folder</div>
<div class="flex-fill"></div>
<form class="form-inline my-0">
<button
Expand Down
117 changes: 116 additions & 1 deletion src/assets/ap_desktop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/favicon.256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/favicon.512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/favicon.icns
Binary file not shown.
Binary file modified src/favicon.ico
Binary file not shown.
Binary file modified src/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3660f42

Please sign in to comment.