Skip to content

Modify the Quit button on the Main Window to be a Hide button if the Tray is active. #353

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

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

Modify the Quit button on the Main Window to be a Hide button if the Tray is active. #353

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
20 changes: 16 additions & 4 deletions src/core/ui/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent),
actOptions = new QAction(QIcon::fromTheme(QStringLiteral("configure")), tr("Options"), this);
actAbout = new QAction(QIcon::fromTheme(QStringLiteral("help-about")), tr("About"), this);
actQuit = new QAction(QIcon::fromTheme(QStringLiteral("application-exit")), tr("Quit"), this);
actHideQuit = new QAction(QIcon::fromTheme(QStringLiteral("application-exit")), tr("QuitHide"), this);

// connect actions to slots
Core *c = Core::instance();
Expand All @@ -67,9 +68,9 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent),

QWidget* spacer = new QWidget();
spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
_ui->toolBar->addWidget(spacer);
_ui->toolBar->addWidget(spacer);

_ui->toolBar->addAction(actQuit);
_ui->toolBar->addAction(actHideQuit);

connect(_ui->delayBox, &QSpinBox::valueChanged, this, &MainWindow::delayBoxChange);
connect(_ui->checkIncludeCursor, &QCheckBox::toggled, this, &MainWindow::checkIncludeCursor);
Expand Down Expand Up @@ -285,14 +286,14 @@ void MainWindow::show()
{
if (!isVisible() && !_trayed)
showNormal();
if (_trayIcon){
if (_trayIcon) {
if (_conf->getShowTrayIcon())
{
_trayIcon->blockSignals(false);
_trayIcon->setContextMenu(_trayMenu);
}

_trayIcon->setVisible(true);
_trayIcon->setVisible(true);
}
QMainWindow::show();
}
Expand Down Expand Up @@ -511,6 +512,17 @@ void MainWindow::updateUI()
_ui->checkIncludeCursor->setChecked(_conf->getIncludeCursor());

updateShortcuts();
Core* c = Core::instance();

if (_conf->getShowTrayIcon()) {
disconnect(actHideQuit, &QAction::triggered, c, &Core::coreQuit);
connect(actHideQuit, &QAction::triggered, this, &MainWindow::windowHideShow);
actHideQuit->setText(tr("Hide"));
} else {
disconnect(actHideQuit, &QAction::triggered, this, &MainWindow::windowHideShow);
connect(actHideQuit, &QAction::triggered, c, &Core::coreQuit);
actHideQuit->setText(tr("Quit"));
}

// create tray object, but not with the "-n" option
if (!Core::instance()->noWin() && _conf->getShowTrayIcon() && !_trayIcon)
Expand Down
1 change: 1 addition & 0 deletions src/core/ui/mainwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public Q_SLOTS:
QAction *actOptions;
QAction *actAbout;
QAction *actQuit;
QAction *actHideQuit;
Config *_conf;
QMenu *_trayMenu;
bool _trayed;
Expand Down