2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-05 09:05:14 +00:00

Use LXQt's StatusNotifierItem implementation instead of appindicator

This commit is contained in:
Ilya Fedin
2020-01-31 10:34:37 +04:00
committed by John Preston
parent 1b1f9d9985
commit 3b4dfa1381
22 changed files with 1089 additions and 567 deletions

View File

@@ -144,14 +144,10 @@ void MainWindow::firstShow() {
if (Platform::IsLinux()) {
trayIconMenu->addAction(tr::lng_open_from_tray(tr::now), this, SLOT(showFromTray()));
trayIconMenu->addAction(tr::lng_minimize_to_tray(tr::now), this, SLOT(minimizeToTray()));
trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()));
trayIconMenu->addAction(tr::lng_quit_from_tray(tr::now), this, SLOT(quitFromTray()));
} else {
trayIconMenu->addAction(tr::lng_minimize_to_tray(tr::now), this, SLOT(minimizeToTray()));
trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()));
trayIconMenu->addAction(tr::lng_quit_from_tray(tr::now), this, SLOT(quitFromTray()));
}
trayIconMenu->addAction(tr::lng_minimize_to_tray(tr::now), this, SLOT(minimizeToTray()));
trayIconMenu->addAction(notificationActionText, this, SLOT(toggleDisplayNotifyFromTray()));
trayIconMenu->addAction(tr::lng_quit_from_tray(tr::now), this, SLOT(quitFromTray()));
Global::RefWorkMode().setForced(Global::WorkMode().value(), true);
psFirstShow();
@@ -564,7 +560,7 @@ void MainWindow::updateTrayMenu(bool force) {
auto actions = iconMenu->actions();
if (Platform::IsLinux()) {
auto minimizeAction = actions.at(1);
minimizeAction->setDisabled(!isVisible());
minimizeAction->setEnabled(isVisible());
} else {
updateIsActive(0);
auto active = isActive();
@@ -588,12 +584,6 @@ void MainWindow::updateTrayMenu(bool force) {
: tr::lng_enable_notifications_from_tray(tr::now);
notificationAction->setText(notificationActionText);
#ifndef Q_OS_WIN
if (trayIcon && trayIcon->contextMenu() != iconMenu) {
trayIcon->setContextMenu(iconMenu);
}
#endif // !Q_OS_WIN
psTrayMenuUpdated();
}