diff --git a/src/ui/PlayerInterface.cpp b/src/ui/PlayerInterface.cpp index babfdcaed0d089ab7d444b8ddc7f6ef9dd96fb28..b5b8e0b056296428104cdb81da93988549cd27c7 100644 --- a/src/ui/PlayerInterface.cpp +++ b/src/ui/PlayerInterface.cpp @@ -22,6 +22,8 @@ #include "../GroovePlayer.h" #include #include +#include +#include PlayerInterface::PlayerInterface(WebInterface* app) { @@ -30,8 +32,11 @@ PlayerInterface::PlayerInterface(WebInterface* app) this->setLayout(interfaceLayout); playControlLayout = new Wt::WHBoxLayout(); voteControlLayout = new Wt::WVBoxLayout(); + playControlWidget = new Wt::WContainerWidget(); + playControlWidget->setLayout(playControlLayout); currentTrackProgress = new Wt::WProgressBar(); + currentTrackProgress->decorationStyle().setBackgroundColor(Wt::WColor("#B20A5E")); currentTrackProgress->setFormat(""); trackProgress = new Wt::WTimer(); trackProgress->setInterval(1000); @@ -43,10 +48,12 @@ PlayerInterface::PlayerInterface(WebInterface* app) isPaused = groove_playlist_playing(GroovePlayerMgr::getInstance()->currentPlaylist)==0; playpause->clicked().connect(this, &PlayerInterface::playpauseClicked); - interfaceLayout->addLayout(playControlLayout); + interfaceLayout->addWidget(playControlWidget); interfaceLayout->addWidget(currentTrackProgress); interfaceLayout->addLayout(voteControlLayout); - playControlLayout->addWidget(playpause,0,Wt::AlignmentFlag::AlignCenter | Wt::AlignmentFlag::AlignMiddle); + playControlWidget->decorationStyle().setBorder(Wt::WBorder::Outset); + playControlWidget->decorationStyle().setBackgroundColor(Wt::WColor("#00B200")); + playControlLayout->addWidget(playpause,0,Wt::AlignmentFlag::AlignLeft | Wt::AlignmentFlag::AlignMiddle); playControlLayout->addWidget(currentTrackDetails); } diff --git a/src/ui/PlayerInterface.h b/src/ui/PlayerInterface.h index 7bd14bcc5b9f8cf648d5ffc1c45e4a75c855d72d..e672a580f65d133c5d582b1f555648f427d70d03 100644 --- a/src/ui/PlayerInterface.h +++ b/src/ui/PlayerInterface.h @@ -38,6 +38,7 @@ public: Wt::WVBoxLayout* interfaceLayout; Wt::WHBoxLayout* playControlLayout; + Wt::WContainerWidget* playControlWidget; Wt::WVBoxLayout* voteControlLayout; //Play controls diff --git a/src/ui/TrackDetails.cpp b/src/ui/TrackDetails.cpp index f44b496e05c0a2cd8c9409113b856c079129cca2..8ad7d771308bea1c6a41f16b6ed3220c765ccd32 100644 --- a/src/ui/TrackDetails.cpp +++ b/src/ui/TrackDetails.cpp @@ -19,26 +19,32 @@ #include "TrackDetails.h" #include +#include TrackDetails::TrackDetails() { + this->setMaximumSize(Wt::WLength(600, Wt::WLength::Pixel),Wt::WLength(200, Wt::WLength::Pixel)); + this->decorationStyle().setBorder(Wt::WBorder::Ridge); + this->decorationStyle().setBackgroundColor(Wt::WColor("#6FFF6F")); mainLayout = new Wt::WHBoxLayout(); this->setLayout(mainLayout); - metaContainer = new Wt::WContainerWidget(); metaLayout = new Wt::WVBoxLayout(); - metaContainer->setLayout(metaLayout); coverData = new Wt::WMemoryResource(); albumCover = new Wt::WImage(); albumCover->setMinimumSize(Wt::WLength(100,Wt::WLength::Pixel),Wt::WLength(100,Wt::WLength::Pixel)); albumCover->setMaximumSize(Wt::WLength(200,Wt::WLength::Pixel),Wt::WLength(200,Wt::WLength::Pixel)); mainLayout->addWidget(albumCover); - mainLayout->addWidget(metaContainer); + mainLayout->addSpacing(Wt::WLength(20, Wt::WLength::Pixel)); + mainLayout->addLayout(metaLayout); trackTitle = new Wt::WText(); + trackTitle->decorationStyle().setTextDecoration(Wt::WCssDecorationStyle::Underline); + trackTitle->decorationStyle().font().setSize(Wt::WFont::Size::Large); + trackTitle->decorationStyle().font().setWeight(Wt::WFont::Weight::Bold); trackArtist = new Wt::WText(); trackAlbum = new Wt::WText(); - metaLayout->addWidget(trackTitle); - metaLayout->addWidget(trackArtist); - metaLayout->addWidget(trackAlbum); + metaLayout->addWidget(trackTitle,2); + metaLayout->addWidget(trackAlbum,1,Wt::AlignmentFlag::AlignBottom); + metaLayout->addWidget(trackArtist,1,Wt::AlignmentFlag::AlignBottom); } void TrackDetails::updateWithTrackDetails(AudioTrack track) diff --git a/src/ui/TrackDetails.h b/src/ui/TrackDetails.h index 08c37b59764d53fcab53d2bb8cf7f14006e6fe6b..f7baf544e38899c66766ccb81a44badc0bd73bb8 100644 --- a/src/ui/TrackDetails.h +++ b/src/ui/TrackDetails.h @@ -33,7 +33,6 @@ class TrackDetails : public Wt::WContainerWidget public: TrackDetails(); Wt::WHBoxLayout* mainLayout; - Wt::WContainerWidget* metaContainer; Wt::WVBoxLayout* metaLayout; Wt::WImage* albumCover;