From e83e63bc9edb60980daa66bacf284297aa5a565f Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 21 Oct 2020 21:06:43 +0000 Subject: lyrics: added widget for qsui git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9515 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/lyrics/lyrics.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/plugins/General/lyrics/lyrics.cpp') diff --git a/src/plugins/General/lyrics/lyrics.cpp b/src/plugins/General/lyrics/lyrics.cpp index 24e0131fb..4ef1fe4e9 100644 --- a/src/plugins/General/lyrics/lyrics.cpp +++ b/src/plugins/General/lyrics/lyrics.cpp @@ -25,15 +25,16 @@ #include #include #include -#include "lyricswindow.h" +#include "lyricswidget.h" #include "lyrics.h" -Lyrics::Lyrics(QObject *parent) : QObject(parent) +Lyrics::Lyrics(QPointer *lyricsWidget, QObject *parent) : QObject(parent) { + m_lyricsWidget = lyricsWidget; m_action = new QAction(tr("View Lyrics"), this); m_action->setShortcut(tr("Ctrl+L")); UiHelper::instance()->addAction(m_action, UiHelper::PLAYLIST_MENU); - connect (m_action, SIGNAL(triggered ()), SLOT(showLyrics())); + connect(m_action, SIGNAL(triggered ()), SLOT(showLyrics())); } Lyrics::~Lyrics() @@ -46,8 +47,17 @@ void Lyrics::showLyrics() if (!tracks.isEmpty()) { if (tracks.at(0)->value(Qmmp::ARTIST).isEmpty() || tracks.at(0)->value(Qmmp::TITLE).isEmpty()) - return; - LyricsWindow *w = new LyricsWindow(tracks.first(), qApp->activeWindow ()); + return; + + if(!m_lyricsWidget->isNull() && m_lyricsWidget->data()->isVisible()) + { + m_lyricsWidget->data()->fetch(tracks.first()); + } + else + { + LyricsWidget *w = new LyricsWidget(true, qApp->activeWindow()); + w->fetch(tracks.first()); w->show(); + } } } -- cgit v1.2.3-13-gbd6f