aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ui/mainwindow.cpp2
-rw-r--r--src/ui/playlist.cpp24
-rw-r--r--src/ui/playlist.h1
-rw-r--r--src/ui/playlisttitlebar.h4
4 files changed, 11 insertions, 20 deletions
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 8d36b0f4b..c7589d1bc 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -346,7 +346,7 @@ void MainWindow::showMetaData()
if (m_playlist->currentItem())
{
m_playlist->currentItem()->updateMetaData(m_core->metaData());
- m_playlist->listWidget()->updateList();
+ m_playlist->updateList();
}
}
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index f4490fbec..42d560b2d 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -469,29 +469,17 @@ void PlayList::setTime(qint64 time)
}
}
-//void PlayList::setInfo (const OutputState &st,int length_current, int length_total)
-//{
-/*if (st.type() == OutputState::Info)
-{
- m_current_time->display (formatTime (st.elapsedSeconds()));
- m_current_time->update();
- QString str_length = formatTime (length_current) + "/" + formatTime (length_total);
- m_length_totalLength->display (str_length);
- m_length_totalLength->update();
-}
-else if (st.type() == OutputState::Playing)
+void PlayList::updateList()
{
- m_listWidget->updateList(); //removes progress message from TextScroller
-}*/
-//}
+ m_listWidget->updateList();
+ m_titleBar->showCurrent();
+}
+
PlayListItem *PlayList::currentItem()
{
- if (m_playListModel)
- return m_playListModel->currentItem();
- else
- return 0;
+ return m_playListModel ? m_playListModel->currentItem() : 0;
}
void PlayList::showPlaylistMenu()
diff --git a/src/ui/playlist.h b/src/ui/playlist.h
index a34f4e7b3..8e527b95a 100644
--- a/src/ui/playlist.h
+++ b/src/ui/playlist.h
@@ -71,6 +71,7 @@ class PlayList : public QWidget
public slots:
void setTime(qint64 time);
+ void updateList();
private slots:
void showAddMenu();
diff --git a/src/ui/playlisttitlebar.h b/src/ui/playlisttitlebar.h
index f50018371..c82df5ad3 100644
--- a/src/ui/playlisttitlebar.h
+++ b/src/ui/playlisttitlebar.h
@@ -44,10 +44,12 @@ public:
void setModel(PlayListModel *model);
void readSettings();
+public slots:
+ void showCurrent();
+
private slots:
void updateSkin();
void shade();
- void showCurrent();
private:
void drawPixmap(int);