From 088a0426ee71244af997872b7bb1e67c7b47ba08 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 11 Mar 2015 18:02:36 +0000 Subject: fixed "Jump to Track dialog" git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4795 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/jumptotrackdialog.cpp | 9 +++++---- src/qmmpui/jumptotrackdialog_p.h | 4 +++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/qmmpui/jumptotrackdialog.cpp b/src/qmmpui/jumptotrackdialog.cpp index 57d192233..0c7c872dd 100644 --- a/src/qmmpui/jumptotrackdialog.cpp +++ b/src/qmmpui/jumptotrackdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2013 by Ilya Kotov * + * Copyright (C) 2007-2015 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -39,6 +39,7 @@ JumpToTrackDialog::JumpToTrackDialog(PlayListModel *model, QWidget* parent) m_model = model; m_pl_manager = PlayListManager::instance(); m_listModel = new QStringListModel(this); + m_titleFormatter.setPattern("%if(%p,%p - %t,%t)"); m_proxyModel = new QSortFilterProxyModel(this); m_proxyModel->setDynamicSortFilter(true); @@ -105,7 +106,7 @@ void JumpToTrackDialog::on_jumpToPushButton_clicked() void JumpToTrackDialog::refresh() { - /*filterLineEdit->clear(); + filterLineEdit->clear(); m_indexes.clear(); QStringList titles; QList items = m_model->items(); @@ -113,11 +114,11 @@ void JumpToTrackDialog::refresh() { if(items[i]->isGroup()) continue; - titles.append(items[i]->formattedTitle()); + titles.append(m_titleFormatter.format(dynamic_cast(items[i]))); m_indexes.append(i); } m_listModel->setStringList(titles); - filterLineEdit->setFocus();*/ + filterLineEdit->setFocus(); } void JumpToTrackDialog::jumpTo(const QModelIndex & index) diff --git a/src/qmmpui/jumptotrackdialog_p.h b/src/qmmpui/jumptotrackdialog_p.h index e541866f5..94fcaad64 100644 --- a/src/qmmpui/jumptotrackdialog_p.h +++ b/src/qmmpui/jumptotrackdialog_p.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2007-2013 by Ilya Kotov * + * Copyright (C) 2007-2015 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -23,6 +23,7 @@ #include #include +#include "metadataformatter.h" #include "ui_jumptotrackdialog.h" class QStringListModel; @@ -58,6 +59,7 @@ private: PlayListManager *m_pl_manager; PlayListModel *m_model; QList m_indexes; + MetaDataFormatter m_titleFormatter; }; #endif //JUMPTOTRACKDIALOG_P_H -- cgit v1.2.3-13-gbd6f