Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding apptitle to the tooltip #1072

Merged
merged 3 commits into from
Jan 17, 2024
Merged

adding apptitle to the tooltip #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
120354b
adding apptitle to the tooltip
IsmaelMartinez Jan 16, 2024
96100fb
Increase package.json version
IsmaelMartinez Jan 16, 2024
f5d5dc8
reverting the change in electron-is-dev library as it requires moving…
IsmaelMartinez Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/menus/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class Menus {

this.initializeEventHandlers();

this.tray = new Tray(this.window, appMenu.submenu, this.iconPath);
this.tray = new Tray(this.window, appMenu.submenu, this.iconPath, this.config);
this.spellCheckProvider = new SpellCheckProvider(this.window, this.logger);
}

Expand Down
5 changes: 3 additions & 2 deletions app/menus/tray.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
const { Tray, Menu, ipcMain, nativeImage } = require('electron');

class ApplicationTray {
constructor(window, appMenu, iconPath) {
constructor(window, appMenu, iconPath, config) {
this.window = window;
this.iconPath = iconPath;
this.appMenu = appMenu;
this.config = config;
this.addTray();
}

addTray() {
this.tray = new Tray(this.iconPath);
this.tray.setToolTip('Microsoft Teams');
this.tray.setToolTip(this.config.appTitle);
this.tray.on('click', () => this.showAndFocusWindow());
this.tray.setContextMenu(Menu.buildFromTemplate(this.appMenu));

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "teams-for-linux",
"version": "1.4.3",
"version": "1.4.4",
"main": "app/index.js",
"description": "Unofficial client for Microsoft Teams for Linux",
"homepage": "https://github.com/IsmaelMartinez/teams-for-linux",
Expand Down Expand Up @@ -49,7 +49,7 @@
},
"devDependencies": {
"@electron/fuses": "^1.7.0",
"electron": "28.0.0",
"electron": "28.1.3",
"electron-builder": "24.9.1",
"eslint": "8.56.0",
"yarn": "1.22.21"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,10 +851,10 @@ electron-window-state@5.0.3:
jsonfile "^4.0.0"
mkdirp "^0.5.1"

electron@28.0.0:
version "28.0.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-28.0.0.tgz#21e5590c967125a3c1ec6b0d8d923baf9eb6fd72"
integrity sha512-eDhnCFBvG0PGFVEpNIEdBvyuGUBsFdlokd+CtuCe2ER3P+17qxaRfWRxMmksCOKgDHb5Wif5UxqOkZSlA4snlw==
electron@28.1.3:
version "28.1.3"
resolved "https://registry.yarnpkg.com/electron/-/electron-28.1.3.tgz#38382a177af2fa6026b02eb4e4ebde067fb30154"
integrity sha512-NSFyTo6SndTPXzU18XRePv4LnjmuM9rF5GMKta1/kPmi02ISoSRonnD7wUlWXD2x53XyJ6d/TbSVesMW6sXkEQ==
dependencies:
"@electron/get" "^2.0.0"
"@types/node" "^18.11.18"
Expand Down
Loading