Made 2 toolbars into one with vboxlayout.

1 files changed, 11 insertions, 6 deletions

diff --git a/PlayerWindow.cpp b/PlayerWindow.cpp
index af74b20..2954af2 100644
--- a/PlayerWindow.cpp
+++ b/PlayerWindow.cpp
@@ -48,8 +48,10 @@ void PlayerWindow::setupUi()
 	m_nextAction->setDisabled(true);
 	m_previousAction->setDisabled(true);
 	
-	QToolBar *toolBar = new QToolBar(this);
-	toolBar->setIconSize(QSize(16, 16));
+	QVBoxLayout *toolBars = new QVBoxLayout;
+	toolBars->setSpacing(0);
+	toolBars->setMargin(0);
+	QToolBar *toolBar = new QToolBar;
 	toolBar->addAction(m_previousAction);
 	toolBar->addAction(m_playAction); //TODO: make it play/pause one button
 	toolBar->addAction(m_pauseAction);
@@ -63,10 +65,9 @@ void PlayerWindow::setupUi()
 	m_volumeSlider = new Phonon::VolumeSlider(this);
 	m_volumeSlider->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
 	toolBar->addWidget(m_volumeSlider);
+	toolBar->setIconSize(QSize(16, 16));
 	toolBar->setMovable(false);
-	addToolBar(toolBar);
-	addToolBarBreak();
-	toolBar = new QToolBar(this);
+	toolBars->addWidget(toolBar);
 	m_searchEdit = new SearchLineEdit(this);
 	m_searchEdit->setDisabled(true);
 	m_searchEdit->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
@@ -74,8 +75,12 @@ void PlayerWindow::setupUi()
 	m_searchTimer.setSingleShot(true);
 	m_searchTimer.setInterval(300);
 	connect(&m_searchTimer, SIGNAL(timeout()), this, SLOT(updateSearch()));
-	toolBar->addWidget(m_searchEdit);
+	toolBars->addWidget(m_searchEdit);
+	toolBar = new QToolBar;
 	toolBar->setMovable(false);
+	QWidget *toolBarWidget = new QWidget;
+	toolBarWidget->setLayout(toolBars);
+	toolBar->addWidget(toolBarWidget);
 	addToolBar(toolBar);
 	setUnifiedTitleAndToolBarOnMac(true);
 	setMinimumSize(500, 400);