diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a9dcd028b..8921a6e0d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -125,6 +125,7 @@ set(SOURCES
widgets/fileviewlist.cpp
widgets/lineedit.cpp
widgets/multiloadingindicator.cpp
+ widgets/nowplayingwidget.cpp
widgets/osd.cpp
widgets/osdpretty.cpp
widgets/progressitemdelegate.cpp
@@ -225,6 +226,7 @@ set(HEADERS
widgets/fileviewlist.h
widgets/lineedit.h
widgets/multiloadingindicator.h
+ widgets/nowplayingwidget.h
widgets/osd.h
widgets/osdpretty.h
widgets/progressitemdelegate.h
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 5d2dec9e8..8a133be5c 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -456,6 +456,15 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
ui_->status_bar_stack->setCurrentWidget(ui_->playlist_summary_page);
connect(ui_->multi_loading_indicator, SIGNAL(TaskCountChange(int)), SLOT(TaskCountChanged(int)));
+ // Now playing widget
+ ui_->now_playing->set_network(network);
+ ui_->now_playing->set_ideal_height(ui_->status_bar->sizeHint().height() +
+ ui_->status_bar_line->sizeHint().height() +
+ ui_->player_controls->sizeHint().height() +
+ 1); // Don't question the 1
+ connect(playlists_, SIGNAL(CurrentSongChanged(Song)), ui_->now_playing, SLOT(NowPlaying(Song)));
+ connect(player_, SIGNAL(Stopped()), ui_->now_playing, SLOT(Stopped()));
+
// Load theme
StyleSheetLoader* css_loader = new StyleSheetLoader(this);
css_loader->SetStyleSheet(this, ":mainwindow.css");
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index 20174c1e8..7e91b3a4b 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -18,7 +18,7 @@
:/icon.png:/icon.png
-
+
0
@@ -30,100 +30,112 @@
Qt::Horizontal
-
-
- QTabWidget::North
-
-
- 0
-
-
- false
-
-
- true
-
-
- false
-
-
- true
-
-
-
- Library
-
-
-
- 0
-
-
- 0
-
- -
-
-
- -
-
-
- true
-
-
- QAbstractItemView::DragOnly
-
-
- true
-
-
- QAbstractItemView::ExtendedSelection
-
-
- true
-
-
- false
-
-
- false
-
-
-
-
-
-
-
- Files
-
-
-
- 0
-
-
- 0
-
- -
-
-
-
-
-
-
- Internet
-
-
-
- 0
-
-
- 0
-
- -
-
-
-
-
-
+
+
+ 0
+
+ -
+
+
+ QTabWidget::North
+
+
+ 0
+
+
+ false
+
+
+ true
+
+
+ false
+
+
+ true
+
+
+
+ Library
+
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ -
+
+
+ true
+
+
+ QAbstractItemView::DragOnly
+
+
+ true
+
+
+ QAbstractItemView::ExtendedSelection
+
+
+ true
+
+
+ false
+
+
+ false
+
+
+
+
+
+
+
+ Files
+
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+
+
+
+ Internet
+
+
+
+ 0
+
+
+ 0
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
0
@@ -339,11 +351,11 @@
-
-
-
- Qt::Horizontal
-
-
+
+
+ Qt::Horizontal
+
+
-
@@ -417,7 +429,7 @@
0
0
804
- 25
+ 23