Skip to content

Commit

Permalink
Merge branch 'main' into refactor/open-links
Browse files Browse the repository at this point in the history
  • Loading branch information
setchy authored Jun 10, 2024
2 parents dc0276c + 9568069 commit 7d57a13
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ jobs:
APPLEID_TEAM_ID: ${{ secrets.appleid_teamid }}
CSC_LINK: ${{ secrets.mac_certs }}
CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
GH_TOKEN: ${{ secrets.gh_token }}
NOTARIZE: true
- uses: actions/upload-artifact@v4
with:
Expand All @@ -55,8 +54,6 @@ jobs:
OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
- run: pnpm make:win --publish onTagOrDraft
env:
GH_TOKEN: ${{ secrets.gh_token }}
- uses: actions/upload-artifact@v4
with:
name: Gitify-release-win
Expand All @@ -80,8 +77,6 @@ jobs:
OAUTH_CLIENT_ID: ${{ secrets.oauth_client_id }}
OAUTH_CLIENT_SECRET: ${{ secrets.oauth_client_secret }}
- run: pnpm make:linux --publish onTagOrDraft
env:
GH_TOKEN: ${{ secrets.gh_token }}
- uses: actions/upload-artifact@v4
with:
name: Gitify-release-linux
Expand Down
15 changes: 14 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { ipcMain: ipc, app, nativeTheme } = require('electron');
const { ipcMain: ipc, app, nativeTheme, Menu } = require('electron');
const { menubar } = require('menubar');
const { autoUpdater } = require('electron-updater');
const { onFirstRunMaybe } = require('./first-run');
Expand All @@ -23,6 +23,15 @@ const browserWindowOpts = {
},
};

const contextMenu = Menu.buildFromTemplate([
{
label: 'Quit',
click: () => {
app.quit();
},
},
]);

app.on('ready', async () => {
await onFirstRunMaybe();
});
Expand All @@ -41,6 +50,10 @@ mb.on('ready', () => {

mb.hideWindow();

mb.tray.on('right-click', (_event, bounds) => {
mb.tray.popUpContextMenu(contextMenu, { x: bounds.x, y: bounds.y });
});

// Force the window to retrieve its previous zoom factor
mb.window.webContents.setZoomFactor(mb.window.webContents.getZoomFactor());

Expand Down

0 comments on commit 7d57a13

Please sign in to comment.