MainWindow: Add function to display progress on taskbar
This commit is contained in:
@@ -73,6 +73,10 @@
|
|||||||
#include <QToolButton>
|
#include <QToolButton>
|
||||||
#include <QCheckBox>
|
#include <QCheckBox>
|
||||||
#include <QClipboard>
|
#include <QClipboard>
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
# include <QDBusConnection>
|
||||||
|
# include <QDBusMessage>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "core/logging.h"
|
#include "core/logging.h"
|
||||||
|
|
||||||
@@ -1269,6 +1273,11 @@ void MainWindow::Exit() {
|
|||||||
return; // Don't quit the application now: wait for the fadeout finished signal
|
return; // Don't quit the application now: wait for the fadeout finished signal
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
UpdateTaskbarProgress(false, 0, 0);
|
||||||
|
#endif
|
||||||
|
|
||||||
DoExit();
|
DoExit();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1321,6 +1330,10 @@ void MainWindow::MediaStopped() {
|
|||||||
tray_icon_->SetProgress(0);
|
tray_icon_->SetProgress(0);
|
||||||
tray_icon_->SetStopped();
|
tray_icon_->SetStopped();
|
||||||
|
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
UpdateTaskbarProgress(false, 0, 0);
|
||||||
|
#endif
|
||||||
|
|
||||||
song_playing_ = Song();
|
song_playing_ = Song();
|
||||||
song_ = Song();
|
song_ = Song();
|
||||||
album_cover_ = AlbumCoverImageResult();
|
album_cover_ = AlbumCoverImageResult();
|
||||||
@@ -1397,6 +1410,10 @@ void MainWindow::SongChanged(const Song &song) {
|
|||||||
setWindowTitle(song.PrettyTitleWithArtist());
|
setWindowTitle(song.PrettyTitleWithArtist());
|
||||||
tray_icon_->SetProgress(0);
|
tray_icon_->SetProgress(0);
|
||||||
|
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
UpdateTaskbarProgress(false, 0, 0);
|
||||||
|
#endif
|
||||||
|
|
||||||
SendNowPlaying();
|
SendNowPlaying();
|
||||||
|
|
||||||
const bool enable_change_art = song.is_collection_song() && !song.effective_albumartist().isEmpty() && !song.album().isEmpty();
|
const bool enable_change_art = song.is_collection_song() && !song.effective_albumartist().isEmpty() && !song.album().isEmpty();
|
||||||
@@ -1686,6 +1703,10 @@ void MainWindow::Seeked(const qint64 microseconds) {
|
|||||||
const qint64 length = app_->player()->GetCurrentItem()->Metadata().length_nanosec() / kNsecPerSec;
|
const qint64 length = app_->player()->GetCurrentItem()->Metadata().length_nanosec() / kNsecPerSec;
|
||||||
tray_icon_->SetProgress(static_cast<int>(static_cast<double>(position) / static_cast<double>(length) * 100.0));
|
tray_icon_->SetProgress(static_cast<int>(static_cast<double>(position) / static_cast<double>(length) * 100.0));
|
||||||
|
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
UpdateTaskbarProgress(true, position, length);
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::UpdateTrackPosition() {
|
void MainWindow::UpdateTrackPosition() {
|
||||||
@@ -1700,6 +1721,10 @@ void MainWindow::UpdateTrackPosition() {
|
|||||||
// Update the tray icon every 10 seconds
|
// Update the tray icon every 10 seconds
|
||||||
if (position % 10 == 0) tray_icon_->SetProgress(static_cast<int>(static_cast<double>(position) / static_cast<double>(length) * 100.0));
|
if (position % 10 == 0) tray_icon_->SetProgress(static_cast<int>(static_cast<double>(position) / static_cast<double>(length) * 100.0));
|
||||||
|
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
UpdateTaskbarProgress(true, position, length);
|
||||||
|
#endif
|
||||||
|
|
||||||
// Send Scrobble
|
// Send Scrobble
|
||||||
if (app_->scrobbler()->enabled() && item->Metadata().is_metadata_good()) {
|
if (app_->scrobbler()->enabled() && item->Metadata().is_metadata_good()) {
|
||||||
Playlist *playlist = app_->playlist_manager()->active();
|
Playlist *playlist = app_->playlist_manager()->active();
|
||||||
@@ -1726,6 +1751,21 @@ void MainWindow::UpdateTrackSliderPosition() {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
void MainWindow::UpdateTaskbarProgress(const bool visible, const double position, const double length) {
|
||||||
|
|
||||||
|
QVariantMap map;
|
||||||
|
QDBusMessage msg = QDBusMessage::createSignal(QStringLiteral("/org/strawberrymusicplayer/strawberry"), QStringLiteral("com.canonical.Unity.LauncherEntry"), QStringLiteral("Update"));
|
||||||
|
|
||||||
|
map.insert(QStringLiteral("progress-visible"), visible);
|
||||||
|
map.insert(QStringLiteral("progress"), position / length);
|
||||||
|
msg << QString("application://org.strawberrymusicplayer.strawberry.desktop") << map;
|
||||||
|
|
||||||
|
QDBusConnection::sessionBus().send(msg);
|
||||||
|
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void MainWindow::ApplyAddBehaviour(const BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) {
|
void MainWindow::ApplyAddBehaviour(const BehaviourSettingsPage::AddBehaviour b, MimeData *mimedata) {
|
||||||
|
|
||||||
switch (b) {
|
switch (b) {
|
||||||
|
|||||||
@@ -290,6 +290,10 @@ class MainWindow : public QMainWindow, public PlatformInterface {
|
|||||||
|
|
||||||
void SetToggleScrobblingIcon(const bool value);
|
void SetToggleScrobblingIcon(const bool value);
|
||||||
|
|
||||||
|
#ifdef HAVE_DBUS
|
||||||
|
void UpdateTaskbarProgress(const bool visible, const double position, const double length);
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui_MainWindow *ui_;
|
Ui_MainWindow *ui_;
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
|
|||||||
Reference in New Issue
Block a user