Skip to content

Commit

Permalink
Icons and minor fixes...
Browse files Browse the repository at this point in the history
  • Loading branch information
matejmosko committed Sep 14, 2017
1 parent 2e759c6 commit 274d1b2
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 10 deletions.
Binary file added build/icons/128x128.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 added build/icons/256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions img/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 8 additions & 2 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ function createWindow() {
width: windowState.main.bounds && windowState.main.bounds.width || 800,
height: windowState.main.bounds && windowState.main.bounds.height || 600,
icon: path.resolve(__dirname, 'img/icon.png'),
title: 'imp Console',
title: 'impressPlayer Console',
show: false,
backgroundColor: '#13132A'
});

Expand All @@ -153,6 +154,11 @@ function createWindow() {
slashes: true
}));

impWindows.main.on('ready-to-show', function() {
impWindows.main.show();
impWindows.main.focus();
});

impWindows.main.webContents.on('did-frame-finish-load', function() {
//impWindows.main.webContents.executeJavaScript(require(path.resolve(app.getAppPath(), "./js/console-script.js")));
});
Expand Down Expand Up @@ -194,7 +200,7 @@ function createProjector() {
width: windowState.projector.bounds && windowState.projector.bounds.width || 800,
height: windowState.projector.bounds && windowState.projector.bounds.height || 600,
icon: path.resolve(__dirname, 'img/icon.png'),
title: 'imp Projector',
title: 'impressPlayer Console',
backgroundColor: '#13132A',
show: false
});
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"asar": true,
"compression": "maximum",
"npmRebuild": true,
"nodeGypRebuild": false,
"linux": {
"target": "AppImage",
"category": "Office"
Expand Down
2 changes: 1 addition & 1 deletion templates/console.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<meta charset="UTF-8">
<title>impPlayer</title>
<title>impressPlayer Console</title>
<base href="{{{dirname}}}/js" />
<link rel="import" href="{{{appPath}}}/node_modules/xel/xel.min.html">
<!--<link rel="stylesheet" href="./node_modules/xel/stylesheets/material.theme.css">-->
Expand Down
2 changes: 1 addition & 1 deletion templates/projector.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=1280" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<title>impProjector</title>
<title>impressPlayer Projector</title>
<link rel="stylesheet" href="{{{appPath}}}/css/styles-projector.css">
<script>
</script>
Expand Down
2 changes: 1 addition & 1 deletion templates/viewer.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes" />
<base id="baseTag" href=".">
<title>impViewer</title>
<title>impressPlayer Viewer</title>
<style id="defaultStyleBox"></style>
<link id="projectionStyleLink" rel="stylesheet" type="text/css" href="style.css">
<style id="printStyleBox" media="print"></style>
Expand Down

0 comments on commit 274d1b2

Please sign in to comment.