forked from lxqt/lxqt-panel
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implemented auto-hiding for Status Notifier (lxqt#1412)
* Implemented auto-hiding for Status Notifier The items can be auto-hidden or always shown/hidden. The default is "Always show". If there are (auto-)hidden items, an extra button will appear, which shows all items when clicked; then (auto-)hidden items will be made hidden again after 2 seconds if the the mouse cursor leaves Status Notifier. The auto-hidden items that need attention are shown for 5 minutes (the interval is configurable). Apart from explicit attention requests, an icon change is also interpreted as an attention request with auto-hiding. That's useful, for example, when a battery or WiFi icon changes. Closes lxqt/lxqt#1012 * Hide/show status notifier button more appropriately Hide the status notifier button if all auto-hiding items have attention and there is no item in the hiding list; show it otherwise. Previously, the button was shown when auto-hiding items existed, even when all of them had attention and no item was in the hiding list. Also, optimized the code a little. * Wait for c-tor before announcing the title of a Status Notifier item Because of a possible race condition. * Code cleanup for Status Notifier's auto-hiding
- Loading branch information
Showing
10 changed files
with
593 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| /* BEGIN_COMMON_COPYRIGHT_HEADER | ||
| * (c)LGPL2+ | ||
| * | ||
| * LXQt - a lightweight, Qt based, desktop toolset | ||
| * https://lxqt.org | ||
| * | ||
| * Copyright: 2020 LXQt team | ||
| * | ||
| * This program or library is free software; you can redistribute it | ||
| * and/or modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * You should have received a copy of the GNU Lesser General | ||
| * Public License along with this library; if not, write to the | ||
| * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| * Boston, MA 02110-1301 USA | ||
| * | ||
| * END_COMMON_COPYRIGHT_HEADER */ | ||
|
|
||
| #include "statusnotifierconfiguration.h" | ||
| #include "ui_statusnotifierconfiguration.h" | ||
| #include <QPushButton> | ||
| #include <QComboBox> | ||
|
|
||
| StatusNotifierConfiguration::StatusNotifierConfiguration(PluginSettings *settings, QWidget *parent): | ||
| LXQtPanelPluginConfigDialog(settings, parent), | ||
| ui(new Ui::StatusNotifierConfiguration) | ||
| { | ||
| setAttribute(Qt::WA_DeleteOnClose); | ||
| setObjectName(QStringLiteral("StatusNotifierConfigurationWindow")); | ||
| ui->setupUi(this); | ||
|
|
||
| if (QPushButton *closeBtn = ui->buttons->button(QDialogButtonBox::Close)) | ||
| closeBtn->setDefault(true); | ||
| connect(ui->buttons, &QDialogButtonBox::clicked, this, &StatusNotifierConfiguration::dialogButtonsAction); | ||
|
|
||
| ui->tableWidget->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); | ||
| ui->tableWidget->horizontalHeader()->setSectionsClickable(false); | ||
| ui->tableWidget->sortByColumn(0, Qt::AscendingOrder); | ||
|
|
||
| loadSettings(); | ||
|
|
||
| connect(ui->attentionSB, &QAbstractSpinBox::editingFinished, this, &StatusNotifierConfiguration::saveSettings); | ||
| } | ||
|
|
||
| StatusNotifierConfiguration::~StatusNotifierConfiguration() | ||
| { | ||
| delete ui; | ||
| } | ||
|
|
||
| void StatusNotifierConfiguration::loadSettings() | ||
| { | ||
| ui->attentionSB->setValue(settings().value(QStringLiteral("attentionPeriod"), 5).toInt()); | ||
| mAutoHideList = settings().value(QStringLiteral("autoHideList")).toStringList(); | ||
| mHideList = settings().value(QStringLiteral("hideList")).toStringList(); | ||
| } | ||
|
|
||
| void StatusNotifierConfiguration::saveSettings() | ||
| { | ||
| settings().setValue(QStringLiteral("attentionPeriod"), ui->attentionSB->value()); | ||
| settings().setValue(QStringLiteral("autoHideList"), mAutoHideList); | ||
| settings().setValue(QStringLiteral("hideList"), mHideList); | ||
| } | ||
|
|
||
| void StatusNotifierConfiguration::addItems(const QStringList &items) | ||
| { | ||
| ui->tableWidget->setRowCount(items.size()); | ||
| ui->tableWidget->setSortingEnabled(false); | ||
| int index = 0; | ||
| for (const auto &item : items) | ||
| { | ||
| // first column | ||
| QTableWidgetItem *widgetItem = new QTableWidgetItem(item); | ||
| widgetItem->setFlags(widgetItem->flags() & ~Qt::ItemIsEditable & ~Qt::ItemIsSelectable); | ||
| ui->tableWidget->setItem(index, 0, widgetItem); | ||
| // second column | ||
| QComboBox *cb = new QComboBox(); | ||
| cb->addItems(QStringList() << tr("Always show") << tr("Auto-hide") << tr("Always hide")); | ||
| if (mAutoHideList.contains(item)) | ||
| cb->setCurrentIndex(1); | ||
| else if (mHideList.contains(item)) | ||
| cb->setCurrentIndex(2); | ||
| connect(cb, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [this, item] (int indx) { | ||
| if (indx == 0) | ||
| { | ||
| mAutoHideList.removeAll(item); | ||
| mHideList.removeAll(item); | ||
| } | ||
| else if (indx == 1) | ||
| { | ||
| mHideList.removeAll(item); | ||
| if (!mAutoHideList.contains(item)) | ||
| mAutoHideList << item; | ||
| } | ||
| else if (indx == 2) | ||
| { | ||
| mAutoHideList.removeAll(item); | ||
| if (!mHideList.contains(item)) | ||
| mHideList << item; | ||
| } | ||
| saveSettings(); | ||
| }); | ||
| ui->tableWidget->setCellWidget(index, 1, cb); | ||
| ++ index; | ||
| } | ||
| ui->tableWidget->setSortingEnabled(true); | ||
| ui->tableWidget->horizontalHeader()->setSortIndicatorShown(false); | ||
| ui->tableWidget->setCurrentCell(0, 1); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* BEGIN_COMMON_COPYRIGHT_HEADER | ||
| * (c)LGPL2+ | ||
| * | ||
| * LXQt - a lightweight, Qt based, desktop toolset | ||
| * https://lxqt.org | ||
| * | ||
| * Copyright: 2020 LXQt team | ||
| * | ||
| * This program or library is free software; you can redistribute it | ||
| * and/or modify it under the terms of the GNU Lesser General Public | ||
| * License as published by the Free Software Foundation; either | ||
| * version 2.1 of the License, or (at your option) any later version. | ||
| * | ||
| * This library is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * You should have received a copy of the GNU Lesser General | ||
| * Public License along with this library; if not, write to the | ||
| * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| * Boston, MA 02110-1301 USA | ||
| * | ||
| * END_COMMON_COPYRIGHT_HEADER */ | ||
|
|
||
| #ifndef STATUSNOTIFIERCONFIGURATION_H | ||
| #define STATUSNOTIFIERCONFIGURATION_H | ||
|
|
||
| #include "../panel/lxqtpanelpluginconfigdialog.h" | ||
| #include "../panel/pluginsettings.h" | ||
|
|
||
| namespace Ui { | ||
| class StatusNotifierConfiguration; | ||
| } | ||
|
|
||
| class StatusNotifierConfiguration : public LXQtPanelPluginConfigDialog | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| explicit StatusNotifierConfiguration(PluginSettings *settings, QWidget *parent = nullptr); | ||
| ~StatusNotifierConfiguration(); | ||
|
|
||
| void addItems(const QStringList &items); | ||
|
|
||
| private: | ||
| Ui::StatusNotifierConfiguration *ui; | ||
|
|
||
| QStringList mAutoHideList; | ||
| QStringList mHideList; | ||
|
|
||
| void loadSettings(); | ||
|
|
||
| private slots: | ||
| void saveSettings(); | ||
| }; | ||
|
|
||
| #endif // STATUSNOTIFIERCONFIGURATION_H |
Oops, something went wrong.