Mercurial > hg > easaier-soundaccess
changeset 126:c26c73ca6d37
the result list is better now.
it's not the final version.
the final version.... is coming soon
| author | benoitrigolleau |
|---|---|
| date | Tue, 23 Oct 2007 15:24:06 +0000 |
| parents | 66af7c1b10d9 |
| children | 541b3e357979 |
| files | sv/icons/musicIcon.png sv/main/MainWindow.cpp widgets/ListResultGeneralItemWidget.cpp widgets/ListResultGeneralItemWidget.h widgets/QueryResultsWidget.cpp widgets/QueryResultsWidget.h |
| diffstat | 6 files changed, 50 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/sv/main/MainWindow.cpp Mon Oct 22 13:59:27 2007 +0000 +++ b/sv/main/MainWindow.cpp Tue Oct 23 15:24:06 2007 +0000 @@ -49,6 +49,7 @@ #include "widgets/ConnectionStatus.h" #include "widgets/LayerViewerWidget.h" + #include "audioio/AudioCallbackPlaySource.h" #include "audioio/AudioCallbackPlayTarget.h" #include "audioio/AudioTargetFactory.h"
--- a/widgets/ListResultGeneralItemWidget.cpp Mon Oct 22 13:59:27 2007 +0000 +++ b/widgets/ListResultGeneralItemWidget.cpp Tue Oct 23 15:24:06 2007 +0000 @@ -31,9 +31,9 @@ m_labelRank = new QLabel(); m_labelIcon = new QLabel(); m_labelTitleArtist = new QLabel(); - label4 = new QLabel("4"); - label5 = new QLabel("le super mega truc des options que même que c'est trop bien"); - + label4 = new QLabel(""); // for the icons + label5 = new QLabel(""); // for the options + m_buttonPrev = new QPushButton(); m_buttonSimilar = new QPushButton(); @@ -160,11 +160,26 @@ hLayout3->addWidget(m_buttonSimilar); connect(m_buttonSimilar, SIGNAL(clicked()), this, SLOT(displayCriteria())); + connect(m_labelTitleArtist, SIGNAL(linkActivated(QString)), this, SIGNAL(linkActivated(QString))); } -void ListResultGeneralItemWidget::setTitleAndAuthorName(QString author,QString title){ - m_labelTitleArtist->setText(author+" - \""+title+"\""); +void ListResultGeneralItemWidget::setTitleAndAuthorName(QString author,QString title, QString uri){ + QString aux = title; + if(aux.length() > 50){ + aux.truncate(47); + aux+="..."; + } + + QString label; + label = author+" - \""; + label += "<a href=\""; + label += uri; + label += "\">"; + label += aux; + label += "</a>"; + m_labelTitleArtist->setText(label); + m_labelTitleArtist->setToolTip(title); } void ListResultGeneralItemWidget::setRank(int rank){
--- a/widgets/ListResultGeneralItemWidget.h Mon Oct 22 13:59:27 2007 +0000 +++ b/widgets/ListResultGeneralItemWidget.h Tue Oct 23 15:24:06 2007 +0000 @@ -24,6 +24,8 @@ #include <QPushButton> #include <QHBoxLayout> #include <QVBoxLayout> +#include <QString> + class ListResultGeneralItemWidget : public QWidget{ @@ -31,11 +33,14 @@ public: ListResultGeneralItemWidget(QWidget *parent=0); - void setTitleAndAuthorName(QString author,QString title); + void setTitleAndAuthorName(QString author,QString title, QString uri); void setRank(int rank); void setType(int type); void addConfidence(int confidence, QString confidenceName); +signals: + void linkActivated(const QString& link); + private: QVBoxLayout *vLayout1; QVBoxLayout *vLayout2;
--- a/widgets/QueryResultsWidget.cpp Mon Oct 22 13:59:27 2007 +0000 +++ b/widgets/QueryResultsWidget.cpp Tue Oct 23 15:24:06 2007 +0000 @@ -13,13 +13,13 @@ #include "QueryResultsWidget.h" -#include <QScrollArea> #include <QLabel> #include <QApplication> #include <iostream> #include "sv/main/MainWindow.h" +#include "widgets/ListResultGeneralItemWidget.h" QueryResultsWidget::QueryResultsWidget() : QWidget(), m_ndResults(0) @@ -29,12 +29,12 @@ QWidget *resultsWidget = new QWidget; resultsWidget->setLayout(m_resultsLayout); - QScrollArea * scrollArea = new QScrollArea; - scrollArea->setWidget(resultsWidget); - scrollArea->setWidgetResizable(true); + m_scrollArea = new QScrollArea; + m_scrollArea->setWidget(resultsWidget); + m_scrollArea->setWidgetResizable(true); QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(scrollArea); + mainLayout->addWidget(m_scrollArea); setLayout(mainLayout); } @@ -70,10 +70,13 @@ { std::vector<Info>::iterator iter; - QLabel* result = new QLabel(); + QString author = ""; + QString title = ""; + QString uri = ""; - QString text; - QString uri = ""; + ListResultGeneralItemWidget *itemResult = new ListResultGeneralItemWidget(); + itemResult->setRank(m_ndResults); + itemResult->setType(0); for (iter = m_curResult.begin(); iter != m_curResult.end(); iter++) { @@ -88,29 +91,23 @@ { if ((*iter).name != "identification") { - text += "<br>" ; - text += (*iter).name; - text += " : " ; + if((*iter).name == "author"){ + author = (*iter).value; + } if ((*iter).name == "title") { - text += "<a href=\""; - text += uri; - text += "\">"; - text += (*iter).value; - text += "</a>"; - } else - { - text += (*iter).value; + title += (*iter).value; } - text += "</br>" ; } } - - connect(result, SIGNAL(linkActivated(QString)), MainWindow::instance(), SLOT(importEasaierFile(QString))); + itemResult->setTitleAndAuthorName(author,title,uri ); + itemResult->addConfidence(100,"contains"); - result->setText(text); + connect(itemResult, SIGNAL(linkActivated(QString)), MainWindow::instance(), SLOT(importEasaierFile(QString))); - m_resultsLayout->addWidget(result,m_ndResults,0); + + m_resultsLayout->addWidget(itemResult,m_ndResults,0); + m_resultsLayout->setSpacing(0); m_ndResults++; }
--- a/widgets/QueryResultsWidget.h Mon Oct 22 13:59:27 2007 +0000 +++ b/widgets/QueryResultsWidget.h Tue Oct 23 15:24:06 2007 +0000 @@ -16,6 +16,7 @@ #include <QWidget> #include <QGridLayout> +#include <QScrollArea> #include <vector> @@ -34,7 +35,7 @@ void reset(); protected: - + QScrollArea * m_scrollArea; QGridLayout *m_resultsLayout; int m_ndResults;