Skip to content
This repository has been archived by the owner on Aug 13, 2021. It is now read-only.

Commit

Permalink
Removed all URealms assets
Browse files Browse the repository at this point in the history
  • Loading branch information
thepaperpilot committed May 9, 2017
1 parent 8844e53 commit 721f14b
Show file tree
Hide file tree
Showing 306 changed files with 4 additions and 4 deletions.
Binary file added src/assets/icons/icon.icns
Binary file not shown.
Binary file added src/assets/icons/icon.ico
Binary file not shown.
Binary file removed src/icon.icns
Binary file not shown.
Binary file removed src/icon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function createWindow () {
settings.load()

// Create the browser window.
mainWindow = new BrowserWindow({width: 1280, height: 720, backgroundColor: '#2a323d', minWidth: 1280, minHeight: 720, icon: path.join(__dirname, 'icon.ico')})
mainWindow = new BrowserWindow({width: 1280, height: 720, backgroundColor: '#2a323d', minWidth: 1280, minHeight: 720, icon: path.join(__dirname, 'assets', 'icons', 'icon.ico')})

// and load the index.html of the app.
mainWindow.loadURL(url.format({
Expand Down
2 changes: 1 addition & 1 deletion src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "main.js",
"scripts": {
"start": "electron .",
"package": "electron-packager ./ BabbleBuds --all --out ../out --icon icon.icns"
"package": "electron-packager ./ BabbleBuds --all --out ../out --icon assets/icons/icon.icns"
},
"repository": "https://github.com/thepaperpilot/babble-buds",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions src/renderer-process/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,9 @@ exports.popIn = function() {

exports.popOut = function() {
if (project.project.transparent)
popout = new BrowserWindow({frame: false, parent: remote.getCurrentWindow(), icon: path.join(__dirname, '../icon.ico'), transparent: true})
popout = new BrowserWindow({frame: false, parent: remote.getCurrentWindow(), icon: path.join(__dirname, 'assets', 'icons', 'icon.ico'), transparent: true})
else
popout = new BrowserWindow({frame: false, parent: remote.getCurrentWindow(), icon: path.join(__dirname, '../icon.ico'), backgroundColor: project.project.greenScreen})
popout = new BrowserWindow({frame: false, parent: remote.getCurrentWindow(), icon: path.join(__dirname, 'assets', 'icons', 'icon.ico'), backgroundColor: project.project.greenScreen})
// popout.setIgnoreMouseEvents(true)
popout.on('close', () => {
application.closePopout()
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 721f14b

Please sign in to comment.