# HG changeset patch # User lbajardsilogic # Date 1195145778 0 # Node ID 77f4ef621c54624dd6e89440063e430f1079ef8f # Parent faafebcf67a2bab596f6929c385ce7fc502c198a add FlowLayout.h diff -r faafebcf67a2 -r 77f4ef621c54 widgets/RelatedMediaWidget.cpp --- a/widgets/RelatedMediaWidget.cpp Thu Nov 15 16:48:50 2007 +0000 +++ b/widgets/RelatedMediaWidget.cpp Thu Nov 15 16:56:18 2007 +0000 @@ -16,6 +16,7 @@ #include #include #include +#include #include @@ -26,18 +27,19 @@ m_painter(0), m_relMediaMaxHeight(150) { - m_relMediaLayout = new QGridLayout; + m_relMediaLayout = new FlowLayout; QWidget *mediaWidget = new QWidget; mediaWidget->setLayout(m_relMediaLayout); - QScrollArea * scrollArea = new QScrollArea; + /*QScrollArea * scrollArea = new QScrollArea; scrollArea->setWidget(mediaWidget); scrollArea->setWidgetResizable(true); - scrollArea->setMinimumHeight(m_relMediaMaxHeight + 70); + scrollArea->setMinimumHeight(m_relMediaMaxHeight + 70);*/ QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(scrollArea); + //mainLayout->addWidget(scrollArea); + mainLayout->addWidget(mediaWidget); mainLayout->setSpacing(0); mainLayout->setMargin(0); @@ -93,8 +95,14 @@ QLabel *textLabel = new QLabel(); textLabel->setText("Info may be added here ..."); - m_relMediaLayout->addWidget(mediaLabel, 0, m_nbRelMedia); - m_relMediaLayout->addWidget(textLabel, 1, m_nbRelMedia); + QVBoxLayout *mediaLayout = new QVBoxLayout; + mediaLayout->addWidget(mediaLabel); + mediaLayout->addWidget(textLabel); + + QWidget *mediaWidget = new QWidget; + mediaWidget->setLayout(mediaLayout); + + m_relMediaLayout->addWidget(mediaWidget); m_nbRelMedia++; } diff -r faafebcf67a2 -r 77f4ef621c54 widgets/RelatedMediaWidget.h --- a/widgets/RelatedMediaWidget.h Thu Nov 15 16:48:50 2007 +0000 +++ b/widgets/RelatedMediaWidget.h Thu Nov 15 16:56:18 2007 +0000 @@ -18,6 +18,8 @@ #include #include +#include "FlowLayout.h" + //#include "data/model/AudioSourceInfoModel.h" class RelatedMediaWidget : public QWidget { @@ -33,7 +35,7 @@ protected: - QGridLayout *m_relMediaLayout; + FlowLayout *m_relMediaLayout; QWidget *m_mediaWidget; diff -r faafebcf67a2 -r 77f4ef621c54 widgets/svwidgets.vcproj --- a/widgets/svwidgets.vcproj Thu Nov 15 16:48:50 2007 +0000 +++ b/widgets/svwidgets.vcproj Thu Nov 15 16:56:18 2007 +0000 @@ -206,6 +206,10 @@ > + + @@ -578,6 +582,32 @@ + + + + + + + + + + diff -r faafebcf67a2 -r 77f4ef621c54 widgets/widgets.pro --- a/widgets/widgets.pro Thu Nov 15 16:48:50 2007 +0000 +++ b/widgets/widgets.pro Thu Nov 15 16:56:18 2007 +0000 @@ -58,7 +58,8 @@ WaitingWidget.h \ CriteriaDialog.h \ Slider.h \ - RelatedMediaWidget.h + RelatedMediaWidget.h \ + FlowLayout.h SOURCES += AudioDial.cpp \ Fader.cpp \ ItemEditDialog.cpp \ @@ -102,5 +103,6 @@ WaitingWidget.cpp \ CriteriaDialog.cpp \ Slider.cpp \ - RelatedMediaWidget.cpp + RelatedMediaWidget.cpp \ + FlowLayout.cpp