Skip to content

Commit

Permalink
v3.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sidneys committed Jan 20, 2017
1 parent 0a47efd commit ee991f6
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 12 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ cache:
addons:
apt:
packages:
- bsdtar
- icnsutils
- gcc-multilib
- g++-multilib
Expand Down
6 changes: 4 additions & 2 deletions app/scripts/menus/tray-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,11 @@ class TrayMenu extends Tray {
this.on('click', () => {
logger.debug('tray-menu', 'Tray:click');

let mainWindow = BrowserWindow.getAllWindows()[0];

if (platformHelper.isWindows) {
let mainWindow = BrowserWindow.getAllWindows()[0];

if (!mainWindow) { return; }

if (mainWindow.isVisible()) {
mainWindow.hide();
} else {
Expand Down
28 changes: 25 additions & 3 deletions app/scripts/windows/main-window.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const appIcon = path.join(appRootPath, 'icons', platformHelper.type, 'icon' + pl
/**
* @global
*/
let mainWindow = {};
let mainWindow;


/**
Expand Down Expand Up @@ -173,6 +173,28 @@ class MainWindow extends BrowserWindow {
}
}


/**
* Create Window
*/
let createMainWindow = () => {
logger.debug('main-window', 'createMainWindow()');

if (mainWindow) { return; }

mainWindow = new MainWindow();
};

/**
* Get Window
*/
let getMainWindow = () => {
logger.debug('main-window', 'getMainWindow()');

return mainWindow;
};


/** @listens Electron.App#on */
app.on('activate', () => {
logger.debug('main-window', 'App:activate');
Expand All @@ -184,11 +206,11 @@ app.on('activate', () => {
app.on('ready', () => {
logger.debug('main-window', 'App:ready');

mainWindow = new MainWindow();
createMainWindow();
});


/**
* @exports
*/
module.exports = mainWindow;
module.exports = getMainWindow();
2 changes: 1 addition & 1 deletion lib/deploy-github.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ let getArtifactsList = function(directory) {
return;
}

let installerFilePathPattern = path.join(path.resolve(directoryOutput), '**', '*.{dmg,exe,deb,zip,json}');
let installerFilePathPattern = path.join(path.resolve(directoryOutput), '**', '*.{AppImage,deb,dmg,exe,json,pacman,zip}');
let installerIgnorePatternList = [
path.join(path.resolve(directoryOutput), 'mac', '*.app', '**', '*'),
path.join(path.resolve(directoryOutput), '*-unpacked', '**', '*'),
Expand Down
35 changes: 29 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pb-for-desktop",
"productName": "PB for Desktop",
"version": "3.2.1",
"version": "3.3.0",
"description": "PushBullet desktop application for macOS, Windows and Linux",
"license": "MIT",
"homepage": "https://sidneys.github.io/pb-for-desktop",
Expand Down Expand Up @@ -47,11 +47,11 @@
"app-root-path": "^2.0.1",
"appdirectory": "^0.1.0",
"auto-launch": "^5.0.1",
"babel-cli": "^6.18.0",
"babel-cli": "^6.22.2",
"babel-preset-electron": "^0.37.8",
"chalk": "^1.1.3",
"electron-auto-updater": "^1.0.0",
"electron-compile": "^5.1.2",
"electron-compile": "^5.1.3",
"electron-compilers": "^5.3.2",
"electron-connect": "^0.6.1",
"electron-editor-context-menu": "^1.1.1",
Expand All @@ -69,9 +69,9 @@
"semver-regex": "^1.0.0"
},
"devDependencies": {
"electron": "^1.4.14",
"electron": "^1.4.15",
"electron-builder": "^11.4.4",
"electron-builder-squirrel-windows": "^11.4.0",
"electron-builder-squirrel-windows": "^11.5.0",
"fkill": "^4.1.0",
"glob": "^7.1.1",
"gulp": "^3.9.1",
Expand Down Expand Up @@ -126,14 +126,37 @@
},
"linux": {
"target": [
"deb"
"AppImage",
"deb",
"pacman"
],
"category": "Utility"
},
"AppImage": {
"includeRequiredLib": true
},
"deb": {
"depends": [
"libappindicator1",
"libnotify-bin",
"libnotify4"
]
},
"appImage": {
"includeRequiredLib": true
},
"dmg": {
"background": "./icons/darwin/background-setup.png",
"icon": "./icons/darwin/icon-setup.icns"
},
"pacman": {
"depends": [
"libappindicator-gtk2",
"libappindicator-gtk3",
"libappindicator-sharp",

This comment has been minimized.

Copy link
@bilelmoussaoui

bilelmoussaoui Jan 22, 2017

@sidneys why libappindicator-sharp is needed?

"libnotify"
]
},
"squirrelWindows": {
"iconUrl": "https://raw.githubusercontent.com/sidneys/pb-for-desktop/release/icons/win32/icon.ico",
"loadingGif": "./icons/win32/background-setup.gif"
Expand Down

0 comments on commit ee991f6

Please sign in to comment.