Mercurial > hg > easaier-soundaccess
changeset 155:708c00883180
add the RelatedMediaWidget in the InfoWidget
author | lbajardsilogic |
---|---|
date | Thu, 15 Nov 2007 10:59:02 +0000 |
parents | 1b8f08375391 |
children | c3296b15c43e |
files | widgets/InfoWidget.cpp widgets/RelatedMediaWidget.cpp widgets/RelatedMediaWidget.h |
diffstat | 3 files changed, 13 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/widgets/InfoWidget.cpp Thu Nov 15 10:46:57 2007 +0000 +++ b/widgets/InfoWidget.cpp Thu Nov 15 10:59:02 2007 +0000 @@ -20,6 +20,7 @@ #include "sv/main/MainWindow.h" #include "RelatedMediaWidget.h" +#include "AdvancedToolBox.h" InfoWidget::InfoWidget(RelatedMediaWidget * relMediaWidget) : QWidget() { @@ -31,10 +32,14 @@ QScrollArea * scrollArea = new QScrollArea; scrollArea->setWidget(infoWidget); scrollArea->setWidgetResizable(true); + scrollArea->setMinimumHeight(250); + + AdvancedToolBox * toolBox= new AdvancedToolBox; + toolBox->addItem("File Information", scrollArea); + toolBox->addItem("Related Media", relMediaWidget); QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(scrollArea, Qt::AlignTop); - mainLayout->addWidget(relMediaWidget, Qt::AlignTop); + mainLayout->addWidget(toolBox); setLayout(mainLayout); }
--- a/widgets/RelatedMediaWidget.cpp Thu Nov 15 10:46:57 2007 +0000 +++ b/widgets/RelatedMediaWidget.cpp Thu Nov 15 10:59:02 2007 +0000 @@ -15,11 +15,11 @@ #include <QLayoutItem> #include <QLinearGradient> +#include <QScrollArea> #include <iostream> #include "sv/main/MainWindow.h" -#include "AdvancedToolBox.h" RelatedMediaWidget::RelatedMediaWidget() : QWidget() , m_nbRelMedia(0), @@ -31,16 +31,13 @@ QWidget *mediaWidget = new QWidget; mediaWidget->setLayout(m_relMediaLayout); - m_scrollArea = new QScrollArea; - m_scrollArea->setWidget(mediaWidget); - m_scrollArea->setWidgetResizable(true); - m_scrollArea->setMinimumHeight(m_relMediaMaxHeight + 50); - - AdvancedToolBox * toolBox= new AdvancedToolBox; - toolBox->addItem("Related Media", m_scrollArea); + QScrollArea * scrollArea = new QScrollArea; + scrollArea->setWidget(mediaWidget); + scrollArea->setWidgetResizable(true); + scrollArea->setMinimumHeight(m_relMediaMaxHeight + 50); QVBoxLayout *mainLayout = new QVBoxLayout; - mainLayout->addWidget(toolBox); + mainLayout->addWidget(scrollArea); mainLayout->setSpacing(0); mainLayout->setMargin(0);
--- a/widgets/RelatedMediaWidget.h Thu Nov 15 10:46:57 2007 +0000 +++ b/widgets/RelatedMediaWidget.h Thu Nov 15 10:59:02 2007 +0000 @@ -17,7 +17,6 @@ #include <QWidget> #include <QPainter> #include <QGridLayout> -#include <QScrollArea> //#include "data/model/AudioSourceInfoModel.h" @@ -40,8 +39,6 @@ QPainter * m_painter; - QScrollArea * m_scrollArea; - int m_nbRelMedia; int m_relMediaMaxHeight;