From 7922211899b3727e63401561dc6773f7e1adc0b0 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 23 Nov 2018 18:39:35 +0000 Subject: added support for progress indicator in the Windows taskbar (taskbar plugin) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8465 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/General.pro | 3 + src/plugins/General/taskbar/taskbar.pro | 19 +++++ src/plugins/General/taskbar/taskbarfactory.cpp | 58 ++++++++++++++ src/plugins/General/taskbar/taskbarfactory.h | 45 +++++++++++ src/plugins/General/taskbar/taskbarhelper.cpp | 103 +++++++++++++++++++++++++ src/plugins/General/taskbar/taskbarhelper.h | 52 +++++++++++++ 6 files changed, 280 insertions(+) create mode 100644 src/plugins/General/taskbar/taskbar.pro create mode 100644 src/plugins/General/taskbar/taskbarfactory.cpp create mode 100644 src/plugins/General/taskbar/taskbarfactory.h create mode 100644 src/plugins/General/taskbar/taskbarhelper.cpp create mode 100644 src/plugins/General/taskbar/taskbarhelper.h (limited to 'src') diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro index 9be5056e1..b3b636c9e 100644 --- a/src/plugins/General/General.pro +++ b/src/plugins/General/General.pro @@ -11,11 +11,14 @@ SUBDIRS += statusicon \ copypaste \ rgscan \ hotkey + unix:SUBDIRS += mpris \ kdenotify \ converter \ gnomehotkey +win32:SUBDIRS += taskbar + contains(CONFIG, UDISKS2_PLUGIN){ unix:SUBDIRS += udisks2 } diff --git a/src/plugins/General/taskbar/taskbar.pro b/src/plugins/General/taskbar/taskbar.pro new file mode 100644 index 000000000..98d5a95ad --- /dev/null +++ b/src/plugins/General/taskbar/taskbar.pro @@ -0,0 +1,19 @@ +include(../../plugins.pri) + +TARGET = $$PLUGINS_PREFIX/General/taskbar + +QT += winextras + +HEADERS += taskbarfactory.h \ + taskbarhelper.h + +SOURCES += taskbarfactory.cpp \ + taskbarhelper.cpp + +#RESOURCES = translations/translations.qrc + +LIBS += $$QMMPUI_LIB + +target.path = $$PLUGIN_DIR/General +INSTALLS += target + diff --git a/src/plugins/General/taskbar/taskbarfactory.cpp b/src/plugins/General/taskbar/taskbarfactory.cpp new file mode 100644 index 000000000..a3ab76ce2 --- /dev/null +++ b/src/plugins/General/taskbar/taskbarfactory.cpp @@ -0,0 +1,58 @@ +/*************************************************************************** + * Copyright (C) 2018 by Ilya Kotov * + * forkotov02@ya.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#include +#include "taskbarhelper.h" +#include "taskbarfactory.h" + +GeneralProperties TaskbarFactory::properties() const +{ + GeneralProperties properties; + properties.name = tr("Taskbar Plugin"); + properties.shortName = "taskbar"; + properties.hasAbout = true; + properties.hasSettings = false; + properties.visibilityControl = false; + return properties; +} + +QObject *TaskbarFactory::create(QObject *parent) +{ + return new TaskbarHelper(parent); +} + +QDialog *TaskbarFactory::createConfigDialog(QWidget *parent) +{ + Q_UNUSED(parent); + return 0; +} + +void TaskbarFactory::showAbout(QWidget *parent) +{ + QMessageBox::about (parent, tr("About Taskbar Plugin"), + tr("Qmmp Taskbar Plugin")+"\n"+ + tr("This plugin adds support for progress indicator in the Windows taskbar")+"\n"+ + tr("Written by: Ilya Kotov ")); +} + +QString TaskbarFactory::translation() const +{ + return QLatin1String(":/taskbar_plugin_"); +} diff --git a/src/plugins/General/taskbar/taskbarfactory.h b/src/plugins/General/taskbar/taskbarfactory.h new file mode 100644 index 000000000..bdc4e06db --- /dev/null +++ b/src/plugins/General/taskbar/taskbarfactory.h @@ -0,0 +1,45 @@ +/*************************************************************************** + * Copyright (C) 2018 by Ilya Kotov * + * forkotov02@ya.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#ifndef TASKBARFACTORY_H +#define TASKBARFACTORY_H + +/** + @author Ilya Kotov +*/ +#include +#include + +#include +#include + +class TaskbarFactory : public QObject, public GeneralFactory +{ +Q_OBJECT +Q_PLUGIN_METADATA(IID "org.qmmp.qmmpui.GeneralFactoryInterface.1.0") +Q_INTERFACES(GeneralFactory) +public: + GeneralProperties properties() const; + QObject *create(QObject *parent); + QDialog *createConfigDialog(QWidget *parent); + void showAbout(QWidget *parent); + QString translation() const; +}; + +#endif diff --git a/src/plugins/General/taskbar/taskbarhelper.cpp b/src/plugins/General/taskbar/taskbarhelper.cpp new file mode 100644 index 000000000..3336fcec7 --- /dev/null +++ b/src/plugins/General/taskbar/taskbarhelper.cpp @@ -0,0 +1,103 @@ +/*************************************************************************** + * Copyright (C) 2018 by Ilya Kotov * + * forkotov02@ya.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "taskbarhelper.h" + +TaskbarHelper::TaskbarHelper(QObject *parent) : QObject(parent) +{ + SoundCore *core = SoundCore::instance(); + connect(core, &SoundCore::stateChanged, this, &TaskbarHelper::onStateChanged); + connect(core, &SoundCore::elapsedChanged, this, &TaskbarHelper::onElapsedChanged); + QTimer::singleShot(0, this, &TaskbarHelper::init); +} + +TaskbarHelper::~TaskbarHelper() +{ + if(!m_button.isNull()) + m_button->deleteLater(); +} + +void TaskbarHelper::init() +{ + if(!m_button.isNull()) + return; + + //find main window add create QWinTaskbarButton object + for(QWidget *w : qApp->topLevelWidgets()) + { + QMainWindow *mw = nullptr; + if((mw = qobject_cast(w))) + { + mw->winId(); //load window handle + if(mw->windowHandle()) + { + m_button = new QWinTaskbarButton(mw); + m_button->setWindow(mw->windowHandle()); + onStateChanged(SoundCore::instance()->state()); + } + break; + } + } +} + +void TaskbarHelper::onStateChanged(Qmmp::State state) +{ + if(!m_button.isNull()) + { + QWinTaskbarProgress *progress = m_button->progress(); + SoundCore *core = SoundCore::instance(); + switch (state) + { + case Qmmp::Playing: + progress->show(); + progress->setRange(0, core->duration()); + progress->setValue(core->elapsed()); + progress->resume(); + break; + case Qmmp::Paused: + progress->show(); + progress->pause(); + break; + default: + progress->setValue(0); + progress->hide(); + } + } +} + +void TaskbarHelper::onElapsedChanged(qint64 elapsed) +{ + if(!m_button.isNull()) + { + QWinTaskbarProgress *progress = m_button->progress(); + progress->setValue(elapsed); + } +} diff --git a/src/plugins/General/taskbar/taskbarhelper.h b/src/plugins/General/taskbar/taskbarhelper.h new file mode 100644 index 000000000..d139f848f --- /dev/null +++ b/src/plugins/General/taskbar/taskbarhelper.h @@ -0,0 +1,52 @@ +/*************************************************************************** + * Copyright (C) 2018 by Ilya Kotov * + * forkotov02@ya.ru * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program 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 General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * + ***************************************************************************/ +#ifndef TASKBARHELPER_H +#define TASKBARHELPER_H + +#include +#include +#include + +class QAction; +class QWinTaskbarButton; +class SoundCore; + +/** + @author Ilya Kotov +*/ + +class TaskbarHelper : public QObject +{ +Q_OBJECT +public: + TaskbarHelper(QObject *parent = 0); + ~TaskbarHelper(); + +private slots: + void init(); + void onStateChanged(Qmmp::State state); + void onElapsedChanged(qint64 elapsed); + +private: + QPointer m_button; + +}; + +#endif -- cgit v1.2.3-13-gbd6f