From 01df53f1f7547bc891aa1fa987ee21ca39146d0e Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 1 Jul 2015 16:59:18 +0000 Subject: skinned fixed regression git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5195 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Ui/skinned/listwidget.cpp | 6 ------ src/plugins/Ui/skinned/listwidget.h | 1 - src/plugins/Ui/skinned/playlistheader.cpp | 6 +++--- src/plugins/Ui/skinned/playlistheader.h | 3 --- 4 files changed, 3 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/plugins/Ui/skinned/listwidget.cpp b/src/plugins/Ui/skinned/listwidget.cpp index 0ee82576b..c0ac85ee2 100644 --- a/src/plugins/Ui/skinned/listwidget.cpp +++ b/src/plugins/Ui/skinned/listwidget.cpp @@ -70,7 +70,6 @@ ListWidget::ListWidget(QWidget *parent) connect(m_skin, SIGNAL(skinChanged()), SLOT(updateSkin())); connect(m_ui_settings, SIGNAL(repeatableTrackChanged(bool)), SLOT(updateRepeatIndicator())); connect(m_timer, SIGNAL(timeout()), SLOT(autoscroll())); - connect(m_header, SIGNAL(resizeColumnRequest()), SLOT(updateColumns())); SET_ACTION(ActionManager::PL_SHOW_HEADER, this, SLOT(readSettings())); } @@ -389,11 +388,6 @@ void ListWidget::updateList(int flags) update(); } -void ListWidget::updateColumns() -{ - updateList(PlayListModel::METADATA); -} - void ListWidget::autoscroll() { SimpleSelection sel = m_model->getSelection(m_pressed_index); diff --git a/src/plugins/Ui/skinned/listwidget.h b/src/plugins/Ui/skinned/listwidget.h index b5f9f6324..395b658c5 100644 --- a/src/plugins/Ui/skinned/listwidget.h +++ b/src/plugins/Ui/skinned/listwidget.h @@ -68,7 +68,6 @@ public: public slots: void readSettings(); void updateList(int flags); - void updateColumns(); void scroll(int); //0-99 void recenterCurrent(); void setModel(PlayListModel *selected, PlayListModel *previous = 0); diff --git a/src/plugins/Ui/skinned/playlistheader.cpp b/src/plugins/Ui/skinned/playlistheader.cpp index 04a063710..502f98a98 100644 --- a/src/plugins/Ui/skinned/playlistheader.cpp +++ b/src/plugins/Ui/skinned/playlistheader.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include "skin.h" #include "playlistheader.h" @@ -322,6 +321,7 @@ void PlayListHeader::showTrackState(bool yes) } m_model->setData(m_pressed_column, TRACK_STATE, yes); + PlayListManager::instance()->selectedPlayList()->updateMetaData(); } void PlayListHeader::restoreSize() @@ -332,7 +332,7 @@ void PlayListHeader::restoreSize() m_model->setData(m_pressed_column, SIZE, INITAL_SIZE); adjustColumns(); updateColumns(); - emit resizeColumnRequest(); + PlayListManager::instance()->selectedPlayList()->updateMetaData(); } void PlayListHeader::onColumnAdded(int index) @@ -417,7 +417,7 @@ void PlayListHeader::mouseMoveEvent(QMouseEvent *e) adjustColumns(); updateColumns(); - emit resizeColumnRequest(); + PlayListManager::instance()->selectedPlayList()->updateMetaData(); } else if(m_task == MOVE) { diff --git a/src/plugins/Ui/skinned/playlistheader.h b/src/plugins/Ui/skinned/playlistheader.h index 0a73082f4..1e6138b11 100644 --- a/src/plugins/Ui/skinned/playlistheader.h +++ b/src/plugins/Ui/skinned/playlistheader.h @@ -50,9 +50,6 @@ public: QList sizes() const; int trackStateColumn() const; -signals: - void resizeColumnRequest(); - public slots: void updateColumns(); void showSortIndicator(int column, bool reverted); -- cgit v1.2.3-13-gbd6f