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

Jump to bottom

Add system tray icon with a simple tooltip #64

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add system tray icon with a simple tooltip #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
79 changes: 78 additions & 1 deletion src/mainwindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

#include "utils.h"

#include <QCloseEvent>
#include <QDebug>
#include <QLabel>
#include <QMenuBar>
Expand Down Expand Up @@ -60,6 +61,7 @@ struct PlatformStat
MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent)
, m_view(nullptr)
, m_systemTrayIcon(nullptr)
{
QIcon appIcon = QIcon();
appIcon.addFile(QStringLiteral(":/images/128-apps-icemon.png"), QSize(128, 128));
Expand All @@ -81,7 +83,7 @@ MainWindow::MainWindow(QWidget *parent)
m_jobStatsWidget->setVisible(false);
statusBar()->addPermanentWidget(m_jobStatsWidget);

QAction *action = fileMenu->addAction(tr("&Quit"), this, SLOT(close()), tr("Ctrl+Q"));
QAction *action = fileMenu->addAction(tr("&Quit"), this, SLOT(quit()), tr("Ctrl+Q"));
action->setIcon(QIcon::fromTheme(QStringLiteral("application-exit")));
action->setMenuRole(QAction::QuitRole);

Expand Down Expand Up @@ -122,6 +124,26 @@ MainWindow::MainWindow(QWidget *parent)
connect(action, SIGNAL(triggered()), this, SLOT(configureView()));
m_configureViewAction = action;

if (QSystemTrayIcon::isSystemTrayAvailable())
{
action = viewMenu->addAction(tr("Show in System Tray"));
action->setIcon(QIcon::fromTheme(QStringLiteral("systemtray")));
action->setCheckable(true);
connect(action, SIGNAL(triggered()), this, SLOT(updateSystemTrayVisible()));
m_showInSystemTrayAction = action;

QMenu *systrayMenu = new QMenu(this);
QAction *quitAction = systrayMenu->addAction(tr("&Quit"), this, SLOT(quit()), tr("Ctrl+Q"));
quitAction->setIcon(QIcon::fromTheme(QStringLiteral("application-exit")));
quitAction->setMenuRole(QAction::QuitRole);

m_systemTrayIcon = new QSystemTrayIcon(this);
m_systemTrayIcon->setIcon(appIcon);
m_systemTrayIcon->setToolTip(windowTitle());
m_systemTrayIcon->setContextMenu(systrayMenu);
connect(m_systemTrayIcon, &QSystemTrayIcon::activated, this, &MainWindow::systemTrayIconActivated);
}

action = helpMenu->addAction(tr("About Qt..."));
connect(action, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
action->setMenuRole(QAction::AboutQtRole);
Expand All @@ -145,6 +167,18 @@ MainWindow::~MainWindow()

void MainWindow::closeEvent(QCloseEvent *e)
{
if (m_systemTrayIcon->isVisible())
{
QMessageBox::information(this, tr("Systray"),
tr("The program will keep running in the "
"system tray. To terminate the program, "
"choose <b>Quit</b> in the context menu "
"of the system tray entry."));
hide();
e->ignore();
return;
}

writeSettings();

QMainWindow::closeEvent(e);
Expand All @@ -155,17 +189,22 @@ void MainWindow::readSettings()
QSettings settings;
restoreGeometry(settings.value(QStringLiteral("geometry")).toByteArray());
restoreState(settings.value(QStringLiteral("windowState")).toByteArray());
bool showSystemTray = settings.value(QStringLiteral("showSystemTray")).toBool();
QString viewId = settings.value(QStringLiteral("currentView")).toString();

auto view = StatusViewFactory::create(viewId, this);
setView(view);

m_showInSystemTrayAction->setChecked(showSystemTray);
updateSystemTrayVisible();
}

void MainWindow::writeSettings()
{
QSettings settings;
settings.setValue(QStringLiteral("geometry"), saveGeometry());
settings.setValue(QStringLiteral("windowState"), saveState());
settings.setValue(QStringLiteral("showSystemTray"), m_systemTrayIcon->isVisible());
settings.setValue(QStringLiteral("currentView"), (m_view ? m_view->id() : QString()));
settings.sync();
}
Expand Down Expand Up @@ -246,6 +285,39 @@ void MainWindow::configureView()
m_view->configureView();
}

void MainWindow::updateSystemTrayVisible()
{
if (m_showInSystemTrayAction->isChecked()) {
m_systemTrayIcon->show();
} else {
m_systemTrayIcon->hide();
}
}

void MainWindow::quit()
{
writeSettings();
qApp->quit();
}

void MainWindow::systemTrayIconActivated(QSystemTrayIcon::ActivationReason reason)
{
switch (reason) {
case QSystemTrayIcon::Trigger:
if (isVisible())
hide();
else
show();
break;

case QSystemTrayIcon::DoubleClick:
case QSystemTrayIcon::MiddleClick:
case QSystemTrayIcon::Unknown:
default:
;
}
}

void MainWindow::about()
{
QString about = tr("<p><strong>%1</strong><br/>"
Expand Down Expand Up @@ -305,6 +377,7 @@ void MainWindow::updateJobStats()
if (!m_monitor->schedulerState()) {
m_jobStatsWidget->clear();
m_jobStatsWidget->setVisible(false);
m_systemTrayIcon->setToolTip(tr("Scheduler is offline."));
return;
}

Expand Down Expand Up @@ -336,6 +409,7 @@ void MainWindow::updateJobStats()

// Compose the text
QString text;
QString textNoHTML;
foreach (auto pair, statistics) {
const QString& platform = pair.first;
const PlatformStat& stat = pair.second;
Expand All @@ -345,13 +419,16 @@ void MainWindow::updateJobStats()

if (!text.isEmpty()) {
text.append(QStringLiteral(" - "));
textNoHTML.append(QStringLiteral(" - "));
}

text.append(QStringLiteral("<strong>%2/%3</strong> on %1").arg(platform).arg(stat.jobs).arg(stat.maxJobs));
textNoHTML.append(QStringLiteral("%2/%3 on %1").arg(platform).arg(stat.jobs).arg(stat.maxJobs));
}

m_jobStatsWidget->setText(tr("| Active jobs: %1").arg(text));
m_jobStatsWidget->setVisible(true);
m_systemTrayIcon->setToolTip(tr("Active jobs: %1").arg(textNoHTML));
}

void MainWindow::setCurrentNet(const QByteArray &netname)
Expand Down
6 changes: 6 additions & 0 deletions src/mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include <QMainWindow>
#include <QPointer>
#include <QSystemTrayIcon>

#include "monitor.h"
#include "job.h"
Expand Down Expand Up @@ -60,6 +61,9 @@ class MainWindow
private slots:
void pauseView();
void configureView();
void updateSystemTrayVisible();
void systemTrayIconActivated(QSystemTrayIcon::ActivationReason reason);
void quit();

void about();

Expand All @@ -81,13 +85,15 @@ private slots:
HostInfoManager *m_hostInfoManager;
QPointer<Monitor> m_monitor;
StatusView *m_view;
QSystemTrayIcon* m_systemTrayIcon;

QLabel *m_schedStatusWidget;
QLabel *m_jobStatsWidget;

QActionGroup *m_viewMode;
QAction *m_configureViewAction;
QAction *m_pauseViewAction;
QAction *m_showInSystemTrayAction;

JobList m_activeJobs;
};
Expand Down